diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-08 16:56:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-08 16:56:09 +1100 |
| commit | f2f2ebe6295a4bf77a1ab2a8ea5f5047102c4317 (patch) | |
| tree | 6ba69f33f3d06adc9a5f23cbbc4f7db507f0cdc6 | |
| parent | 95867e12b5371d8c40b1ad7aa7577ad44143d4b0 (diff) | |
Add linux-next specific files for 20090108next-20090108
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 131 | ||||
| -rw-r--r-- | Next/Trees | 133 | ||||
| -rw-r--r-- | Next/merge.log | 5204 | ||||
| -rw-r--r-- | Next/quilt-import.log | 277 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5746 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..199bc2c704d1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,131 @@ +Name SHA1 +---- ---- +origin 8903709b054a8dafe4e8c6d9a6444034d7aba36f +arm-current b58602a4bac012b5f4fc12fe6b46ab237b610d5d +m68k-current fe0bdec68b77020281dc814805edfe594ae89e0f +powerpc-merge b58602a4bac012b5f4fc12fe6b46ab237b610d5d +sparc-current 3f4528d6e91cffde49894f5252e6657d420d3d74 +scsi-rc-fixes 508859405e33797342d42cda3e731464c2bcd7a8 +net-current 3537d54c0c39de5738bba8d19f128478b0b96a71 +sound-current 167968199089435c63ad1140ccfb8c6179274a0a +pci-current ede6f5aea054d3fb67c78857f7abdee602302043 +wireless-current 3298a7388c00227e736d1037328788073c80c7b4 +kbuild-current acd3e0a851291d46046bfddd7dc1eec1bc319b50 +driver-core.current ede6f5aea054d3fb67c78857f7abdee602302043 +usb.current 67debd681a75cf3ad02f6c6a040780e185b91494 +cpufreq-current bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e +input-current 9334e90d5ac5ee1fa6d8b75acb7c64a8907787d1 +md-current a2ed9615e3222645007fc19991aedf30eed3ecfd +audit-current c05a63c58c2884c4db00308ba5eb0dbac2fb5ac9 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm eaae1ab082993b16d59e78a9609682971eabbdd4 +avr32 52435bfc665716fdf9a02f0d08e7ce50ddb9bf45 +blackfin 06af15e086e39a5a2a2413973a64af8e10122f28 +cris 0db42c6b23ce26b05b235dbe2e0aa096db194e33 +ia64 8b1fae4e4200388b64dd88065639413cb3f1051c +m68k 5f79b5812d9a8e5c12396ff83542fd184b89b1c3 +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc ae16489eb1175066c8f3008fc3c0396c525e1906 +powerpc 4aa12f7b927c3cac0e0cf3503642597527d0ece0 +4xx b58602a4bac012b5f4fc12fe6b46ab237b610d5d +galak 6fd8be4bf72879b3039654388e985cabf8449af5 +pxa 9a8585e138d7d6285d50ab3cf3cce4fdb9d4dbd1 +s390 d80178ad0a4fe6869803f4580430932bc0b039bf +sh f82a7712036b96cd82a26f54a51a6ba22db00af1 +sparc 6680598b44ed3c0052d155522eb21fc5a00de5f3 +x86 226cf6bc3b83a3c3d2434c9b9061021a302b0c9f +xtensa 8903709b054a8dafe4e8c6d9a6444034d7aba36f +driver-core 8c5dbc12049ee7eaaa6b74fdace18b70d3395a84 +usb 9e8790464a3e7f562228ed84f70202053bcbda34 +tip-core fdbc0450df12cc9cb397f3497db4b0cad7c1a8ff +cpus4096 3869f98858df8674d9aca87de54717837c2a09dc +ftrace f5d94186ca202693152770ebd93cf1b36076e338 +genirq 1faa44855f8f1e9b2cd46e9227ad23c3301556c1 +safe-poison-pointers 286c12f72ad295bbc27cfe67b0922bfc09732af7 +sched d9be28ea9110c596a05bd2d56afa94251bd19818 +stackprotector a9de18eb761f7c1c860964b2e5addc1a35c7e861 +timers 74541be1cd6480943f84ae9116bfad1c90f1d3c0 +pci f6dc1e5e3d4b523e1616b43beddb04e4fb1d376a +device-mapper 86c92a35d1e5cf1bb1d60ea52d5a8ec2d3365c44 +hid 0f4a107482860cfbc8a7a14d938bb0dfe4e27878 +i2c 0240740f7edc0afa2a09eb366ca505cac3b01950 +jdelvare-hwmon 29c3f5208e1dc721b6a623cf907e12694bd1771f +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb 1878e72afe00dc96fbd9169610cae15839cc1e99 +jfs d69e83d99cf87e3328c47bb54684360e32aef17d +kbuild b67ff8ce122f3353bd741db48ce1756c12fb5f2d +ide e998f2694c269c84085f6c6ee0450b1b4e50c689 +libata ede6f5aea054d3fb67c78857f7abdee602302043 +nfs ede6f5aea054d3fb67c78857f7abdee602302043 +xfs 0a8c5395f90f06d128247844b2515c8bf3f2826b +infiniband f8f01f8005f9c05e2e5d1e00d01f423c9681f433 +acpi c7b84be7611b447a1a70ff4313f21a2b40bb9705 +nfsd fc6bf4744d58501d8eb778ac6d82479b0b310b52 +ieee1394 faefafff7d07a1aacbe6c2db2f8dd375afcfdfbd +ubi f2863c54f30cccb50661697a6e4bdcd0ad0b0a6c +kvm e0aabc6fa017ec408f18784ca1aac0d3c2ca8f43 +dlm 722d74219ea21223c74e5e894b0afcc5e4ca75a7 +scsi ffda8c7dc492e2170bb263f7c56f286992ceb54b +ocfs2 658871c538a02965b428957da2fa15cef5840971 +ext4 4b905671d2ea09fd48fed72c581df17e40823f39 +async_tx b9bdcbba010c2e49c8f837ea7a49fe006b636f41 +udf 0f675c1b6ef06b8f08c2a78ad99efd4e50c2603d +net 3c92ec8ae91ecf59d88c798301833d7cf83f2179 +mtd a808ad3b0d28411e2838117c5b2ae680ae42483c +wireless 9cf7f247bd0cd21e475c71a4e018bb612ef02aab +crypto 0ee4a96902dd7858e65f378c86f428a0355bd841 +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound 6e9168ab0852653213119f7e82484a7ac9aaa194 +cpufreq 187d9f4ed4fc089f1f25a875fb485e27626972f9 +v9fs f1d9e4586e79e1fc7b26d1c567599a904013f199 +rr 3db9b863fa5cd6c65da4248d896654c6c81345a1 +cifs 5cbd04ae36fcb8fd1f38c71dacbbe59f3166f074 +mmc 418f19ea17a99421b22a64e101e14b6a16bed66d +gfs2 e3c9014223a90325890533dee9adbcf56b812753 +input e941da3110422c4e57c3d05759fb9475b28f45f6 +bkl-removal 877d79ef6ad6a67bb8582b7013e0d6f56a77e5ba +ubifs 8e5033adc78ff4fbeab7052134e7af1f6ff04187 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block d3f761104b097738932afcc310fbbbbfb007ef92 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 26b06189dcf12e67f3552327ae2ba5e3053730fe +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds d528785f4a5583ddd7a921e4b2501e71243c61b8 +backlight bf1fd5da75006877efdd11d5f90beef74ea7053e +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab 3c506efd7e0f615bd9603ce8c06bc4a896952599 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 774c910d35402b9fced9a9f16a094fd5fb9c8100 +kmemcheck 72accebb513bcb4ab345719135baf5d242464dac +generic-ipi 6a94cb73064c952255336cc57731904174b2c58f +mfd 3f874b6643e189d3d07618928ceed0013d71593e +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm a75f28419a7efff611a81293d41d0e2137d7591e +voltage 7065361a0970753f0ea7234dfdc0c7b736244cdc +security-testing c8334dc8fb6413b363df3e1419e287f5b25bce32 +lblnet ede6f5aea054d3fb67c78857f7abdee602302043 +ttydev 7afb3a948b2ae0818a69f6c434aa8ea283184544 +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +oprofile 6a94cb73064c952255336cc57731904174b2c58f +fastboot 6a94cb73064c952255336cc57731904174b2c58f +sparseirq ac8931efd29418a669d66831a818e2ff736e4e82 +iommu 322957b8ca8c9d2e18c93f88527e84ce6960ad39 +uwb a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c +watchdog 619b2669a3d6de35743dd5577ef55359e4407241 +proc 230e40fbda242544389a5428a2efac568178ddfe +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b4e7781aee2f03a6f9577a4268c96d6072be59d +cpu_alloc c905c8806c7df091085a66bab590c3ee499b86cc +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd 5fad3378bd56a3b2863e8da681d1d18462a30682 +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 5d9ec854bfb6f1e122b1d96b344164a71eac5be8 +jc_docs 2884f00b94be73a6a7875bada739bf9bb2f9a1b6 +nommu d10f9907ba3626261f45dbb498867f441f06c486 +trivial 8903709b054a8dafe4e8c6d9a6444034d7aba36f +audit b3985e2bf6ce51ae943208af4bd336287fb34ed6 +squashfs fc55584175589b70f4c30cb594f09f4bd6ad5d40 +staging 9e8790464a3e7f562228ed84f70202053bcbda34 +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..7fc51fe16c76 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,133 @@ +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 +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 +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 +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.osdl.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 +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +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/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/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 +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +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 +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +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 +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +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 +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +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 +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +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 +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +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 +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#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 +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-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 +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +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 +cpu_alloc git git://git.kernel.org/pub/scm/linux/kernel/git/christoph/work.git#cpu_alloc +cputime git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-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 +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 +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +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..fafbb31e5ad7 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5204 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 238c6d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm +Merging origin/master +$ git merge origin/master +Updating 238c6d5..8903709 +Fast forward + .mailmap | 1 + + CREDITS | 2 +- + Documentation/ABI/testing/sysfs-devices-memory | 51 +- + Documentation/DMA-mapping.txt | 2 +- + Documentation/DocBook/uio-howto.tmpl | 101 +- + Documentation/blackfin/00-INDEX | 3 + + Documentation/blackfin/bfin-gpio-notes.txt | 71 + + Documentation/dell_rbu.txt | 4 +- + Documentation/feature-removal-schedule.txt | 20 + + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/proc.txt | 27 +- + Documentation/hwmon/abituguru-datasheet | 6 +- + Documentation/hwmon/adt7470 | 19 +- + Documentation/hwmon/f71882fg | 89 + + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/lm70 | 12 +- + Documentation/hwmon/lm85 | 2 +- + Documentation/hwmon/ltc4245 | 81 + + Documentation/ide/warm-plug-howto.txt | 5 + + Documentation/input/walkera0701.txt | 109 + + Documentation/ioctl/ioctl-number.txt | 8 +- + Documentation/kernel-doc-nano-HOWTO.txt | 34 + + Documentation/kernel-parameters.txt | 29 +- + Documentation/kobject.txt | 4 +- + Documentation/kprobes.txt | 5 +- + Documentation/laptops/thinkpad-acpi.txt | 2 +- + Documentation/magic-number.txt | 6 +- + Documentation/memory-hotplug.txt | 16 +- + Documentation/mips/AU1xxx_IDE.README | 2 +- + Documentation/networking/rxrpc.txt | 2 +- + Documentation/networking/tuntap.txt | 2 +- + Documentation/powerpc/cpu_features.txt | 2 +- + Documentation/s390/Debugging390.txt | 2 +- + Documentation/s390/cds.txt | 2 +- + Documentation/s390/s390dbf.txt | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + Documentation/scsi/ChangeLog.ncr53c8xx | 2 +- + Documentation/scsi/ChangeLog.sym53c8xx | 2 +- + Documentation/spi/spi-lm70llp | 10 + + Documentation/sysctl/vm.txt | 3 +- + Documentation/vm/unevictable-lru.txt | 63 +- + Documentation/x86/zero-page.txt | 2 +- + MAINTAINERS | 12 +- + Makefile | 2 +- + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/atomic.h | 9 +- + arch/alpha/include/asm/byteorder.h | 42 +- + arch/alpha/include/asm/swab.h | 42 + + arch/arm/Kconfig | 2 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/atomic.h | 3 +- + arch/arm/include/asm/byteorder.h | 33 +- + arch/arm/include/asm/swab.h | 50 + + arch/arm/kernel/ecard.c | 2 +- + arch/arm/kernel/kprobes.c | 2 - + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 6 +- + arch/arm/mach-integrator/core.c | 10 +- + arch/arm/mach-integrator/integrator_cp.c | 6 +- + arch/arm/mach-lh7a40x/clcd.c | 2 +- + arch/arm/mach-netx/fb.c | 2 +- + arch/arm/mach-pxa/include/mach/pxa930_rotary.h | 20 + + arch/arm/mach-pxa/include/mach/pxa930_trkball.h | 10 + + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-s3c2410/include/mach/spi.h | 2 +- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/plat-omap/include/mach/memory.h | 2 +- + arch/avr32/Kconfig | 19 + + arch/avr32/Makefile | 1 + + arch/avr32/boards/atngw100/setup.c | 2 +- + arch/avr32/boards/atstk1000/atstk1002.c | 20 +- + arch/avr32/boards/atstk1000/atstk1003.c | 20 +- + arch/avr32/boards/atstk1000/atstk1004.c | 2 +- + arch/avr32/boards/favr-32/setup.c | 31 +- + arch/avr32/boards/hammerhead/Kconfig | 43 + + arch/avr32/boards/hammerhead/Makefile | 1 + + arch/avr32/boards/hammerhead/flash.c | 377 + + arch/avr32/boards/hammerhead/flash.h | 6 + + arch/avr32/boards/hammerhead/setup.c | 245 + + arch/avr32/boards/mimc200/setup.c | 4 +- + arch/avr32/configs/atngw100_defconfig | 2 +- + arch/avr32/configs/atstk1002_defconfig | 2 +- + arch/avr32/configs/atstk1003_defconfig | 2 +- + arch/avr32/configs/atstk1006_defconfig | 2 +- + arch/avr32/configs/hammerhead_defconfig | 1467 ++++ + arch/avr32/include/asm/Kbuild | 1 + + arch/avr32/include/asm/atomic.h | 2 +- + arch/avr32/include/asm/byteorder.h | 31 +- + arch/avr32/include/asm/kdebug.h | 1 + + arch/avr32/include/asm/swab.h | 35 + + arch/avr32/include/asm/syscalls.h | 39 + + arch/avr32/kernel/process.c | 1 + + arch/avr32/kernel/signal.c | 1 + + arch/avr32/kernel/sys_avr32.c | 1 + + arch/avr32/kernel/traps.c | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 6 +- + arch/avr32/mach-at32ap/clock.c | 4 +- + arch/avr32/mach-at32ap/clock.h | 3 + + arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 3 + + arch/avr32/mach-at32ap/include/mach/portmux.h | 2 +- + arch/avr32/mach-at32ap/pio.c | 19 +- + arch/avr32/mm/cache.c | 1 + + arch/avr32/mm/init.c | 1 - + arch/blackfin/Kconfig | 204 +- + arch/blackfin/Kconfig.debug | 30 +- + arch/blackfin/Makefile | 18 +- + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1191 +++ + arch/blackfin/configs/BF526-EZBRD_defconfig | 345 +- + arch/blackfin/configs/BF527-EZKIT_defconfig | 551 +- + arch/blackfin/configs/BF533-EZKIT_defconfig | 316 +- + arch/blackfin/configs/BF533-STAMP_defconfig | 403 +- + arch/blackfin/configs/BF537-STAMP_defconfig | 463 +- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1368 +++ + arch/blackfin/configs/BF548-EZKIT_defconfig | 518 +- + arch/blackfin/configs/BF561-EZKIT_defconfig | 321 +- + arch/blackfin/configs/BlackStamp_defconfig | 3 +- + arch/blackfin/configs/CM-BF527_defconfig | 24 +- + arch/blackfin/configs/CM-BF533_defconfig | 6 +- + arch/blackfin/configs/CM-BF537E_defconfig | 22 +- + arch/blackfin/configs/CM-BF537U_defconfig | 22 +- + arch/blackfin/configs/CM-BF548_defconfig | 10 +- + arch/blackfin/configs/CM-BF561_defconfig | 6 +- + arch/blackfin/configs/H8606_defconfig | 3 +- + arch/blackfin/configs/IP0X_defconfig | 3 +- + arch/blackfin/configs/PNAV-10_defconfig | 596 +- + arch/blackfin/configs/SRV1_defconfig | 21 +- + arch/blackfin/configs/TCM-BF537_defconfig | 165 +- + arch/blackfin/include/asm/Kbuild | 1 + + arch/blackfin/include/asm/atomic.h | 155 +- + arch/blackfin/include/asm/bfin-global.h | 7 +- + arch/blackfin/include/asm/bfin5xx_spi.h | 28 +- + arch/blackfin/include/asm/bfin_sdh.h | 19 + + arch/blackfin/include/asm/bfin_sport.h | 3 - + arch/blackfin/include/asm/bfrom.h | 5 + + arch/blackfin/include/asm/bitops.h | 203 +- + arch/blackfin/include/asm/blackfin.h | 10 +- + arch/blackfin/include/asm/byteorder.h | 43 +- + arch/blackfin/include/asm/cache.h | 29 + + arch/blackfin/include/asm/cacheflush.h | 20 +- + arch/blackfin/include/asm/checksum.h | 3 +- + arch/blackfin/include/asm/context.S | 47 +- + arch/blackfin/include/asm/cplb-mpu.h | 61 - + arch/blackfin/include/asm/cplb.h | 25 +- + arch/blackfin/include/asm/cplbinit.h | 83 +- + arch/blackfin/include/asm/cpu.h | 41 + + arch/blackfin/include/asm/dma.h | 220 +- + arch/blackfin/include/asm/entry.h | 11 + + arch/blackfin/include/asm/gpio.h | 226 +- + arch/blackfin/include/asm/hardirq.h | 2 + + arch/blackfin/include/asm/io.h | 14 +- + arch/blackfin/include/asm/ipipe.h | 278 + + arch/blackfin/include/asm/ipipe_base.h | 80 + + arch/blackfin/include/asm/irq.h | 296 +- + arch/blackfin/include/asm/l1layout.h | 5 +- + .../include/mach => include/asm}/mem_init.h | 164 +- + arch/blackfin/include/asm/mem_map.h | 75 + + arch/blackfin/include/asm/mmu_context.h | 27 +- + arch/blackfin/include/asm/mutex-dec.h | 112 + + arch/blackfin/include/asm/mutex.h | 63 + + arch/blackfin/include/asm/pda.h | 70 + + arch/blackfin/include/asm/percpu.h | 12 +- + arch/blackfin/include/asm/pgtable.h | 1 + + arch/blackfin/include/asm/processor.h | 28 +- + arch/blackfin/include/asm/reboot.h | 4 +- + arch/blackfin/include/asm/rwlock.h | 6 + + arch/blackfin/include/asm/serial.h | 1 + + arch/blackfin/include/asm/smp.h | 44 + + arch/blackfin/include/asm/spinlock.h | 87 +- + arch/blackfin/include/asm/spinlock_types.h | 22 + + arch/blackfin/include/asm/swab.h | 48 + + arch/blackfin/include/asm/system.h | 185 +- + arch/blackfin/include/asm/thread_info.h | 5 +- + arch/blackfin/include/asm/uaccess.h | 89 +- + arch/blackfin/include/asm/xor.h | 1 + + arch/blackfin/kernel/Makefile | 7 +- + arch/blackfin/kernel/asm-offsets.c | 29 + + arch/blackfin/kernel/bfin_dma_5xx.c | 936 +-- + arch/blackfin/kernel/bfin_gpio.c | 448 +- + arch/blackfin/kernel/bfin_ksyms.c | 101 +- + arch/blackfin/kernel/cplb-mpu/Makefile | 6 +- + arch/blackfin/kernel/cplb-mpu/cacheinit.c | 4 +- + arch/blackfin/kernel/cplb-mpu/cplbinfo.c | 136 - + arch/blackfin/kernel/cplb-mpu/cplbinit.c | 48 +- + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 119 +- + arch/blackfin/kernel/cplb-nompu/Makefile | 8 +- + arch/blackfin/kernel/cplb-nompu/cacheinit.c | 25 +- + arch/blackfin/kernel/cplb-nompu/cplbhdlr.S | 130 - + arch/blackfin/kernel/cplb-nompu/cplbinfo.c | 195 - + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 521 +- + arch/blackfin/kernel/cplb-nompu/cplbmgr.S | 646 -- + arch/blackfin/kernel/cplb-nompu/cplbmgr.c | 283 + + arch/blackfin/kernel/cplbinfo.c | 177 + + arch/blackfin/kernel/early_printk.c | 4 +- + arch/blackfin/kernel/entry.S | 5 + + arch/blackfin/kernel/fixed_code.S | 6 +- + arch/blackfin/kernel/ipipe.c | 428 + + arch/blackfin/kernel/irqchip.c | 46 +- + arch/blackfin/kernel/kgdb.c | 127 +- + arch/blackfin/kernel/kgdb_test.c | 123 + + arch/blackfin/kernel/mcount.S | 70 + + arch/blackfin/kernel/module.c | 152 +- + arch/blackfin/kernel/process.c | 32 +- + arch/blackfin/kernel/ptrace.c | 17 +- + arch/blackfin/kernel/reboot.c | 24 +- + arch/blackfin/kernel/setup.c | 218 +- + arch/blackfin/kernel/time.c | 162 +- + arch/blackfin/kernel/traps.c | 75 +- + arch/blackfin/kernel/vmlinux.lds.S | 9 +- + arch/blackfin/lib/checksum.c | 4 + + arch/blackfin/lib/ins.S | 272 +- + arch/blackfin/lib/muldi3.S | 68 + + arch/blackfin/lib/muldi3.c | 99 - + arch/blackfin/mach-bf518/Kconfig | 233 + + arch/blackfin/mach-bf518/Makefile | 5 + + arch/blackfin/mach-bf518/boards/Kconfig | 12 + + arch/blackfin/mach-bf518/boards/Makefile | 5 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 669 ++ + arch/blackfin/mach-bf518/dma.c | 118 + + arch/blackfin/mach-bf518/include/mach/anomaly.h | 79 + + arch/blackfin/mach-bf518/include/mach/bf518.h | 132 + + .../mach-bf518/include/mach/bfin_serial_5xx.h | 169 + + arch/blackfin/mach-bf518/include/mach/blackfin.h | 105 + + arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 46 + + arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 48 + + arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 213 + + arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 282 + + .../mach-bf518/include/mach/cdefBF51x_base.h | 1208 +++ + arch/blackfin/mach-bf518/include/mach/defBF512.h | 42 + + arch/blackfin/mach-bf518/include/mach/defBF514.h | 113 + + arch/blackfin/mach-bf518/include/mach/defBF516.h | 490 ++ + arch/blackfin/mach-bf518/include/mach/defBF518.h | 651 ++ + .../mach-bf518/include/mach/defBF51x_base.h | 1940 +++++ + arch/blackfin/mach-bf518/include/mach/dma.h | 33 + + arch/blackfin/mach-bf518/include/mach/gpio.h | 60 + + arch/blackfin/mach-bf518/include/mach/irq.h | 260 + + arch/blackfin/mach-bf518/include/mach/mem_map.h | 108 + + arch/blackfin/mach-bf518/include/mach/portmux.h | 188 + + arch/blackfin/mach-bf518/ints-priority.c | 99 + + arch/blackfin/mach-bf527/Kconfig | 34 +- + arch/blackfin/mach-bf527/Makefile | 2 - + arch/blackfin/mach-bf527/boards/cm_bf527.c | 111 +- + arch/blackfin/mach-bf527/boards/ezbrd.c | 90 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 176 +- + arch/blackfin/mach-bf527/dma.c | 2 +- + arch/blackfin/mach-bf527/head.S | 146 - + arch/blackfin/mach-bf527/include/mach/anomaly.h | 10 +- + arch/blackfin/mach-bf527/include/mach/bf527.h | 8 +- + arch/blackfin/mach-bf527/include/mach/bfin_sir.h | 142 - + .../mach-bf527/include/mach/cdefBF52x_base.h | 102 +- + arch/blackfin/mach-bf527/include/mach/dma.h | 32 +- + arch/blackfin/mach-bf527/include/mach/gpio.h | 68 + + arch/blackfin/mach-bf527/include/mach/irq.h | 32 +- + arch/blackfin/mach-bf527/include/mach/mem_map.h | 6 + + arch/blackfin/mach-bf527/ints-priority.c | 16 +- + arch/blackfin/mach-bf533/Kconfig | 2 +- + arch/blackfin/mach-bf533/Makefile | 2 - + arch/blackfin/mach-bf533/boards/H8606.c | 24 +- + arch/blackfin/mach-bf533/boards/blackstamp.c | 24 +- + arch/blackfin/mach-bf533/boards/cm_bf533.c | 39 +- + arch/blackfin/mach-bf533/boards/ezkit.c | 26 +- + arch/blackfin/mach-bf533/boards/generic_board.c | 35 + + arch/blackfin/mach-bf533/boards/ip0x.c | 24 +- + arch/blackfin/mach-bf533/boards/stamp.c | 58 +- + arch/blackfin/mach-bf533/dma.c | 2 +- + arch/blackfin/mach-bf533/head.S | 137 - + arch/blackfin/mach-bf533/include/mach/anomaly.h | 11 +- + arch/blackfin/mach-bf533/include/mach/bf533.h | 4 +- + arch/blackfin/mach-bf533/include/mach/bfin_sir.h | 125 - + arch/blackfin/mach-bf533/include/mach/blackfin.h | 7 + + arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 177 +- + arch/blackfin/mach-bf533/include/mach/dma.h | 40 +- + arch/blackfin/mach-bf533/include/mach/gpio.h | 34 + + arch/blackfin/mach-bf533/include/mach/irq.h | 14 +- + arch/blackfin/mach-bf533/include/mach/mem_init.h | 297 - + arch/blackfin/mach-bf533/include/mach/mem_map.h | 6 + + arch/blackfin/mach-bf537/Kconfig | 34 +- + arch/blackfin/mach-bf537/Makefile | 2 - + arch/blackfin/mach-bf537/boards/cm_bf537.c | 63 +- + arch/blackfin/mach-bf537/boards/generic_board.c | 109 +- + arch/blackfin/mach-bf537/boards/minotaur.c | 48 +- + arch/blackfin/mach-bf537/boards/pnav10.c | 50 +- + arch/blackfin/mach-bf537/boards/stamp.c | 280 +- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 63 +- + arch/blackfin/mach-bf537/dma.c | 2 +- + arch/blackfin/mach-bf537/head.S | 146 - + arch/blackfin/mach-bf537/include/mach/anomaly.h | 13 +- + arch/blackfin/mach-bf537/include/mach/bf537.h | 2 +- + arch/blackfin/mach-bf537/include/mach/bfin_sir.h | 142 - + arch/blackfin/mach-bf537/include/mach/blackfin.h | 2 +- + arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 91 +- + arch/blackfin/mach-bf537/include/mach/dma.h | 32 +- + arch/blackfin/mach-bf537/include/mach/gpio.h | 68 + + arch/blackfin/mach-bf537/include/mach/irq.h | 32 +- + arch/blackfin/mach-bf537/include/mach/mem_init.h | 303 - + arch/blackfin/mach-bf537/include/mach/mem_map.h | 6 + + arch/blackfin/mach-bf537/ints-priority.c | 16 +- + arch/blackfin/mach-bf538/Kconfig | 164 + + arch/blackfin/mach-bf538/Makefile | 5 + + arch/blackfin/mach-bf538/boards/Kconfig | 12 + + arch/blackfin/mach-bf538/boards/Makefile | 5 + + arch/blackfin/mach-bf538/boards/ezkit.c | 606 ++ + arch/blackfin/mach-bf538/dma.c | 161 + + arch/blackfin/mach-bf538/include/mach/anomaly.h | 132 + + arch/blackfin/mach-bf538/include/mach/bf538.h | 124 + + .../mach-bf538/include/mach/bfin_serial_5xx.h | 183 + + arch/blackfin/mach-bf538/include/mach/blackfin.h | 101 + + arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 2108 +++++ + arch/blackfin/mach-bf538/include/mach/cdefBF539.h | 240 + + arch/blackfin/mach-bf538/include/mach/defBF539.h | 4243 ++++++++++ + arch/blackfin/mach-bf538/include/mach/dma.h | 41 + + arch/blackfin/mach-bf538/include/mach/gpio.h | 79 + + arch/blackfin/mach-bf538/include/mach/irq.h | 211 + + arch/blackfin/mach-bf538/include/mach/mem_map.h | 113 + + arch/blackfin/mach-bf538/include/mach/portmux.h | 106 + + arch/blackfin/mach-bf538/ints-priority.c | 94 + + arch/blackfin/mach-bf548/Kconfig | 2 +- + arch/blackfin/mach-bf548/Makefile | 2 - + arch/blackfin/mach-bf548/boards/cm_bf548.c | 166 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 156 +- + arch/blackfin/mach-bf548/dma.c | 2 +- + arch/blackfin/mach-bf548/head.S | 158 - + arch/blackfin/mach-bf548/include/mach/anomaly.h | 5 + + arch/blackfin/mach-bf548/include/mach/bf548.h | 2 +- + arch/blackfin/mach-bf548/include/mach/bfin_sir.h | 166 - + arch/blackfin/mach-bf548/include/mach/blackfin.h | 2 +- + .../mach-bf548/include/mach/cdefBF54x_base.h | 114 +- + arch/blackfin/mach-bf548/include/mach/dma.h | 32 +- + arch/blackfin/mach-bf548/include/mach/irq.h | 2 +- + arch/blackfin/mach-bf548/include/mach/mem_init.h | 255 - + arch/blackfin/mach-bf548/include/mach/mem_map.h | 6 + + arch/blackfin/mach-bf561/Kconfig | 8 +- + arch/blackfin/mach-bf561/Makefile | 3 +- + arch/blackfin/mach-bf561/atomic.S | 919 +++ + arch/blackfin/mach-bf561/boards/cm_bf561.c | 39 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 89 +- + arch/blackfin/mach-bf561/boards/generic_board.c | 35 + + arch/blackfin/mach-bf561/boards/tepla.c | 34 + + arch/blackfin/mach-bf561/dma.c | 2 +- + arch/blackfin/mach-bf561/head.S | 136 - + arch/blackfin/mach-bf561/include/mach/anomaly.h | 16 +- + arch/blackfin/mach-bf561/include/mach/bf561.h | 2 +- + arch/blackfin/mach-bf561/include/mach/bfin_sir.h | 125 - + arch/blackfin/mach-bf561/include/mach/blackfin.h | 4 + + arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 103 +- + arch/blackfin/mach-bf561/include/mach/defBF561.h | 3 + + arch/blackfin/mach-bf561/include/mach/dma.h | 16 +- + arch/blackfin/mach-bf561/include/mach/gpio.h | 68 + + arch/blackfin/mach-bf561/include/mach/mem_init.h | 295 - + arch/blackfin/mach-bf561/include/mach/mem_map.h | 80 + + arch/blackfin/mach-bf561/include/mach/smp.h | 22 + + arch/blackfin/mach-bf561/secondary.S | 215 + + arch/blackfin/mach-bf561/smp.c | 167 + + arch/blackfin/mach-common/Makefile | 4 +- + arch/blackfin/mach-common/cache-c.c | 24 + + arch/blackfin/mach-common/cache.S | 6 +- + arch/blackfin/mach-common/clocks-init.c | 93 + + arch/blackfin/mach-common/cpufreq.c | 6 +- + arch/blackfin/mach-common/dpmc_modes.S | 3 +- + arch/blackfin/mach-common/entry.S | 132 +- + arch/blackfin/mach-common/head.S | 117 +- + arch/blackfin/mach-common/interrupt.S | 80 +- + arch/blackfin/mach-common/ints-priority.c | 541 +- + arch/blackfin/mach-common/irqpanic.c | 12 - + arch/blackfin/mach-common/lock.S | 4 +- + arch/blackfin/mach-common/pm.c | 20 +- + arch/blackfin/mach-common/smp.c | 476 ++ + arch/blackfin/mm/init.c | 50 +- + arch/blackfin/mm/sram-alloc.c | 339 +- + arch/blackfin/oprofile/Makefile | 3 +- + arch/blackfin/oprofile/bfin_oprofile.c | 18 + + arch/blackfin/oprofile/common.c | 168 - + arch/blackfin/oprofile/op_blackfin.h | 98 - + arch/blackfin/oprofile/op_model_bf533.c | 161 - + arch/blackfin/oprofile/timer_int.c | 73 - + arch/cris/Kconfig | 2 + + arch/cris/arch-v32/drivers/iop_fw_load.c | 6 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/cris/include/asm/atomic.h | 4 +- + arch/h8300/Kconfig | 2 + + arch/h8300/include/asm/Kbuild | 1 + + arch/h8300/include/asm/atomic.h | 3 +- + arch/h8300/include/asm/byteorder.h | 8 +- + arch/h8300/include/asm/swab.h | 10 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/atomic.h | 6 - + arch/ia64/include/asm/byteorder.h | 37 +- + arch/ia64/include/asm/swab.h | 34 + + arch/ia64/include/asm/swiotlb.h | 39 +- + arch/ia64/kernel/kprobes.c | 10 +- + arch/ia64/kernel/pci-dma.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/ia64/sn/kernel/tiocx.c | 3 +- + arch/m68k/Kconfig | 2 +- + arch/m68k/kernel/traps.c | 2 +- + arch/m68knommu/include/asm/Kbuild | 2 + + arch/m68knommu/include/asm/atomic.h | 2 +- + arch/m68knommu/include/asm/byteorder.h | 22 +- + arch/m68knommu/include/asm/swab.h | 24 + + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/atomic.h | 5 +- + arch/mips/include/asm/byteorder.h | 52 +- + arch/mips/include/asm/swab.h | 55 + + arch/mips/kernel/stacktrace.c | 24 +- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | 2 +- + arch/parisc/include/asm/atomic.h | 11 +- + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/atomic.h | 4 +- + arch/powerpc/include/asm/byteorder.h | 83 +- + arch/powerpc/include/asm/hugetlb.h | 6 + + arch/powerpc/include/asm/swab.h | 90 + + arch/powerpc/kernel/kprobes.c | 9 +- + arch/powerpc/mm/hugetlbpage.c | 7 + + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/atomic.h | 7 +- + arch/s390/include/asm/byteorder.h | 92 +- + arch/s390/include/asm/s390_rdev.h | 15 - + arch/s390/include/asm/swab.h | 91 + + arch/s390/kernel/kprobes.c | 9 +- + arch/s390/mm/init.c | 2 +- + arch/sh/include/asm/Kbuild | 1 + + arch/sh/include/asm/atomic.h | 7 +- + arch/sh/include/asm/byteorder.h | 62 +- + arch/sh/include/asm/swab.h | 60 + + arch/sh/kernel/traps_32.c | 1 + + arch/sh/mm/init.c | 3 +- + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/atomic_32.h | 2 - + arch/sparc/include/asm/atomic_64.h | 3 - + arch/sparc/include/asm/byteorder.h | 46 +- + arch/sparc/include/asm/swab.h | 45 + + arch/sparc/kernel/kprobes.c | 2 +- + arch/um/kernel/trap.c | 24 +- + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/atomic_32.h | 10 +- + arch/x86/include/asm/atomic_64.h | 18 +- + arch/x86/include/asm/byteorder.h | 62 +- + arch/x86/include/asm/swab.h | 61 + + arch/x86/include/asm/swiotlb.h | 38 +- + arch/x86/include/asm/unwind.h | 13 - + arch/x86/kernel/kprobes.c | 9 +- + arch/x86/kernel/mfgpt_32.c | 2 +- + arch/x86/kernel/pci-swiotlb_64.c | 2 +- + arch/x86/kernel/traps.c | 2 - + arch/x86/mm/fault.c | 24 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/xtensa/Makefile | 28 +- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + arch/xtensa/include/asm/Kbuild | 3 + + .../xtensa/include/asm}/asmmacro.h | 2 +- + .../xtensa/include/asm}/atomic.h | 3 +- + .../xtensa/include/asm}/auxvec.h | 0 + .../xtensa/include/asm}/bitops.h | 0 + .../xtensa/include/asm}/bootparam.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 + arch/xtensa/include/asm/byteorder.h | 14 + + .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- + .../xtensa/include/asm}/cacheasm.h | 0 + .../xtensa/include/asm}/cacheflush.h | 0 + .../xtensa/include/asm}/checksum.h | 2 +- + .../xtensa/include/asm}/coprocessor.h | 4 +- + .../xtensa/include/asm}/cpumask.h | 0 + .../xtensa/include/asm}/cputime.h | 0 + .../xtensa/include/asm}/current.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 + .../xtensa/include/asm}/device.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 + .../xtensa/include/asm}/dma-mapping.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 + .../xtensa/include/asm}/emergency-restart.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 + .../xtensa/include/asm}/hardirq.h | 0 + .../xtensa/include/asm}/highmem.h | 0 + .../xtensa/include/asm}/hw_irq.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 + .../xtensa/include/asm}/ioctls.h | 0 + .../xtensa/include/asm}/ipcbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- + .../xtensa/include/asm}/irq_regs.h | 0 + .../xtensa/include/asm}/kdebug.h | 0 + .../xtensa/include/asm}/kmap_types.h | 0 + .../xtensa/include/asm}/linkage.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 + .../xtensa/include/asm}/mmu_context.h | 0 + .../xtensa/include/asm}/module.h | 0 + .../xtensa/include/asm}/msgbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 + .../xtensa/include/asm}/pci-bridge.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 + .../xtensa/include/asm}/percpu.h | 0 + .../xtensa/include/asm}/pgalloc.h | 0 + .../xtensa/include/asm}/pgtable.h | 0 + .../xtensa/include/asm}/platform.h | 2 - + .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 + .../xtensa/include/asm}/posix_types.h | 0 + .../xtensa/include/asm}/processor.h | 2 +- + .../xtensa/include/asm}/ptrace.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 + .../xtensa/include/asm}/resource.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 + .../xtensa/include/asm}/scatterlist.h | 0 + .../xtensa/include/asm}/sections.h | 0 + .../xtensa/include/asm}/segment.h | 0 + .../xtensa/include/asm}/sembuf.h | 0 + .../xtensa/include/asm}/serial.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 + .../xtensa/include/asm}/shmbuf.h | 0 + .../xtensa/include/asm}/shmparam.h | 0 + .../xtensa/include/asm}/sigcontext.h | 0 + .../xtensa/include/asm}/siginfo.h | 0 + .../xtensa/include/asm}/signal.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 + .../xtensa/include/asm}/socket.h | 0 + .../xtensa/include/asm}/sockios.h | 0 + .../xtensa/include/asm}/spinlock.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 + .../xtensa/include/asm}/statfs.h | 0 + .../xtensa/include/asm}/string.h | 0 + .../byteorder.h => arch/xtensa/include/asm/swab.h | 32 +- + .../xtensa/include/asm}/syscall.h | 0 + .../xtensa/include/asm}/system.h | 0 + .../xtensa/include/asm}/termbits.h | 0 + .../xtensa/include/asm}/termios.h | 0 + .../xtensa/include/asm}/thread_info.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 + .../xtensa/include/asm}/tlbflush.h | 0 + .../xtensa/include/asm}/topology.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 + .../xtensa/include/asm}/uaccess.h | 0 + .../xtensa/include/asm}/ucontext.h | 0 + .../xtensa/include/asm}/unaligned.h | 12 +- + .../xtensa/include/asm}/unistd.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/console.c | 4 +- + .../platforms/iss/include/platform}/hardware.h | 0 + .../platforms/iss/include/platform}/simcall.h | 0 + arch/xtensa/platforms/iss/io.c | 2 +- + arch/xtensa/platforms/iss/network.c | 4 +- + arch/xtensa/platforms/xt2000/Makefile | 5 + + .../platforms/xt2000/include/platform/hardware.h | 55 + + .../platforms/xt2000/include/platform/serial.h | 28 + + arch/xtensa/platforms/xt2000/setup.c | 181 + + .../xtensa/variants/dc232b/include/variant}/core.h | 0 + .../variants/dc232b/include/variant}/tie-asm.h | 0 + .../xtensa/variants/dc232b/include/variant}/tie.h | 0 + .../xtensa/variants/fsf/include/variant}/core.h | 0 + .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 + .../xtensa/variants/fsf/include/variant}/tie.h | 0 + block/bsg.c | 6 +- + block/genhd.c | 2 +- + drivers/acpi/acpi_memhotplug.c | 2 +- + drivers/acpi/executer/exprep.c | 2 +- + drivers/acpi/executer/exresolv.c | 2 +- + drivers/acpi/executer/exstore.c | 2 +- + drivers/acpi/processor_idle.c | 1 + + drivers/acpi/resources/rscreate.c | 2 +- + drivers/acpi/utilities/utobject.c | 4 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/base/Kconfig | 2 +- + drivers/base/attribute_container.c | 2 +- + drivers/base/base.h | 26 + + drivers/base/bus.c | 52 +- + drivers/base/core.c | 197 +- + drivers/base/dd.c | 26 +- + drivers/base/driver.c | 13 +- + drivers/base/firmware_class.c | 8 +- + drivers/base/isa.c | 7 +- + drivers/base/memory.c | 19 +- + drivers/base/node.c | 103 + + drivers/base/platform.c | 130 +- + drivers/base/power/main.c | 21 +- + drivers/base/power/trace.c | 4 +- + drivers/char/Kconfig | 2 +- + drivers/char/consolemap.c | 2 +- + drivers/char/epca.c | 2 +- + drivers/char/mem.c | 3 - + drivers/char/mwave/mwavedd.c | 2 +- + drivers/char/random.c | 5 +- + drivers/char/sysrq.c | 20 +- + drivers/cpufreq/Kconfig | 4 +- + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/edac_device.c | 2 +- + drivers/edac/edac_mc.c | 2 +- + drivers/edac/edac_pci.c | 2 +- + drivers/edac/edac_pci_sysfs.c | 6 +- + drivers/edac/i5400_edac.c | 1476 ++++ + drivers/edac/i82875p_edac.c | 4 +- + drivers/edac/mpc85xx_edac.c | 74 +- + drivers/firewire/fw-card.c | 20 +- + drivers/firewire/fw-device.c | 8 +- + drivers/firewire/fw-device.h | 2 + + drivers/firewire/fw-sbp2.c | 21 +- + drivers/firewire/fw-topology.c | 16 +- + drivers/firewire/fw-transaction.c | 2 + + drivers/firewire/fw-transaction.h | 13 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/firmware/dmi_scan.c | 6 +- + drivers/gpio/Kconfig | 7 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/gpio/pca953x.c | 12 +- + drivers/gpio/twl4030-gpio.c | 54 +- + drivers/gpu/drm/drm_drv.c | 6 +- + drivers/gpu/drm/drm_fops.c | 4 + + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_dma.c | 46 +- + drivers/gpu/drm/i915/i915_drv.h | 2 + + drivers/gpu/drm/i915/i915_gem.c | 15 +- + drivers/gpu/drm/i915/i915_reg.h | 25 +- + drivers/gpu/drm/i915/intel_display.c | 48 +- + drivers/gpu/drm/i915/intel_drv.h | 5 +- + drivers/gpu/drm/i915/intel_hdmi.c | 280 + + drivers/gpu/drm/i915/intel_sdvo.c | 8 +- + drivers/hid/usbhid/hiddev.c | 2 + + drivers/hwmon/Kconfig | 47 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adt7462.c | 14 +- + drivers/hwmon/adt7470.c | 227 +- + drivers/hwmon/adt7473.c | 10 +- + drivers/hwmon/applesmc.c | 10 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/dme1737.c | 5 + + drivers/hwmon/f71805f.c | 5 + + drivers/hwmon/f71882fg.c | 1549 +++- + drivers/hwmon/fschmd.c | 450 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/i5k_amb.c | 7 + + drivers/hwmon/ibmpex.c | 2 +- + drivers/hwmon/it87.c | 37 +- + drivers/hwmon/lm70.c | 91 +- + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/ltc4245.c | 567 ++ + drivers/hwmon/pc87360.c | 6 + + drivers/hwmon/pc87427.c | 5 + + drivers/hwmon/sis5595.c | 5 + + drivers/hwmon/smsc47b397.c | 5 + + drivers/hwmon/smsc47m1.c | 5 + + drivers/hwmon/via686a.c | 5 + + drivers/hwmon/vt1211.c | 5 + + drivers/hwmon/vt8231.c | 5 + + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 5 + + drivers/hwmon/w83781d.c | 5 +- + drivers/hwmon/w83791d.c | 5 +- + drivers/hwmon/w83792d.c | 5 +- + drivers/hwmon/w83793.c | 5 +- + drivers/i2c/busses/i2c-ali1563.c | 4 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-amd756.c | 5 +- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 50 +- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 4 +- + drivers/i2c/busses/i2c-sis630.c | 4 +- + drivers/i2c/i2c-core.c | 8 +- + drivers/ide/Kconfig | 7 + + drivers/ide/Makefile | 1 + + drivers/ide/aec62xx.c | 4 +- + drivers/ide/alim15x3.c | 10 +- + drivers/ide/amd74xx.c | 4 +- + drivers/ide/au1xxx-ide.c | 11 +- + drivers/ide/cmd640.c | 5 +- + drivers/ide/cmd64x.c | 23 +- + drivers/ide/cs5520.c | 2 +- + drivers/ide/cy82c693.c | 2 +- + drivers/ide/falconide.c | 1 - + drivers/ide/hpt366.c | 23 +- + drivers/ide/icside.c | 12 +- + drivers/ide/ide-acpi.c | 22 +- + drivers/ide/ide-atapi.c | 13 +- + drivers/ide/ide-cd.c | 118 +- + drivers/ide/ide-cd.h | 34 +- + drivers/ide/ide-disk.c | 4 +- + drivers/ide/ide-dma-sff.c | 63 +- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/ide/ide-gd.c | 3 +- + drivers/ide/ide-gd.h | 10 +- + drivers/ide/ide-h8300.c | 1 - + drivers/ide/ide-io.c | 410 +- + drivers/ide/ide-iops.c | 100 +- + drivers/ide/ide-lib.c | 9 +- + drivers/ide/ide-park.c | 16 +- + drivers/ide/ide-pm.c | 8 +- + drivers/ide/ide-probe.c | 474 +- + drivers/ide/ide-proc.c | 23 +- + drivers/ide/ide-tape.c | 20 +- + drivers/ide/ide-taskfile.c | 14 +- + drivers/ide/ide.c | 187 +- + drivers/ide/it8172.c | 166 + + drivers/ide/it8213.c | 4 +- + drivers/ide/it821x.c | 13 +- + drivers/ide/ns87415.c | 14 +- + drivers/ide/palm_bk3710.c | 3 +- + drivers/ide/pdc202xx_new.c | 4 +- + drivers/ide/pdc202xx_old.c | 14 +- + drivers/ide/piix.c | 8 +- + drivers/ide/pmac.c | 7 +- + drivers/ide/q40ide.c | 1 - + drivers/ide/qd65xx.c | 7 +- + drivers/ide/qd65xx.h | 4 +- + drivers/ide/sc1200.c | 9 +- + drivers/ide/scc_pata.c | 33 +- + drivers/ide/serverworks.c | 2 +- + drivers/ide/setup-pci.c | 12 +- + drivers/ide/sgiioc4.c | 15 +- + drivers/ide/siimage.c | 11 +- + drivers/ide/sis5513.c | 2 +- + drivers/ide/sl82c105.c | 5 +- + drivers/ide/slc90e66.c | 4 +- + drivers/ide/tc86c001.c | 17 +- + drivers/ide/triflex.c | 2 +- + drivers/ide/trm290.c | 10 +- + drivers/ide/tx4939ide.c | 23 +- + drivers/ide/umc8672.c | 13 +- + drivers/ide/via82cxxx.c | 2 +- + drivers/idle/i7300_idle.c | 2 +- + drivers/ieee1394/csr.c | 12 +- + drivers/ieee1394/csr.h | 10 +- + drivers/ieee1394/csr1212.c | 45 +- + drivers/ieee1394/csr1212.h | 9 +- + drivers/ieee1394/dv1394-private.h | 44 +- + drivers/ieee1394/dv1394.c | 12 +- + drivers/ieee1394/eth1394.c | 28 +- + drivers/ieee1394/eth1394.h | 16 +- + drivers/ieee1394/highlevel.c | 9 +- + drivers/ieee1394/highlevel.h | 7 +- + drivers/ieee1394/hosts.c | 6 +- + drivers/ieee1394/hosts.h | 2 +- + drivers/ieee1394/ieee1394.h | 3 + + drivers/ieee1394/nodemgr.c | 20 +- + drivers/ieee1394/nodemgr.h | 3 - + drivers/ieee1394/ohci1394.c | 26 +- + drivers/ieee1394/pcilynx.c | 2 +- + drivers/ieee1394/pcilynx.h | 2 +- + drivers/ieee1394/raw1394.c | 2 +- + drivers/ieee1394/sbp2.c | 4 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/hw/mlx4/cq.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/input/Makefile | 2 +- + drivers/input/evbug.c | 6 +- + drivers/input/evdev.c | 199 +- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input-compat.c | 135 + + drivers/input/input-compat.h | 94 + + drivers/input/input.c | 4 +- + drivers/input/joydev.c | 2 +- + drivers/input/joystick/Kconfig | 24 + + drivers/input/joystick/Makefile | 2 + + drivers/input/joystick/maplecontrol.c | 193 + + drivers/input/joystick/walkera0701.c | 292 + + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atkbd.c | 62 +- + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/hil_kbd.c | 1 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/keyboard/pxa930_rotary.c | 212 + + drivers/input/misc/apanel.c | 81 +- + drivers/input/misc/pcspkr.c | 4 +- + drivers/input/misc/uinput.c | 172 +- + drivers/input/mouse/Kconfig | 6 + + drivers/input/mouse/Makefile | 27 +- + drivers/input/mouse/appletouch.c | 274 +- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/mouse/hgpk.c | 32 +- + drivers/input/mouse/hil_ptr.c | 2 +- + drivers/input/mouse/pxa930_trkball.c | 269 + + drivers/input/mouse/synaptics.c | 16 +- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/hil_mlc.c | 1 + + drivers/input/serio/i8042-x86ia64io.h | 15 + + drivers/input/serio/libps2.c | 20 +- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 220 +- + drivers/input/tablet/gtco.c | 2 +- + drivers/input/tablet/wacom_wac.c | 2 +- + drivers/input/touchscreen/Kconfig | 32 + + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ads7846.c | 6 +- + drivers/input/touchscreen/da9034-ts.c | 390 + + drivers/input/touchscreen/tsc2007.c | 381 + + drivers/input/touchscreen/usbtouchscreen.c | 5 +- + drivers/input/touchscreen/wacom_w8001.c | 325 + + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/lguest/lguest_device.c | 10 +- + drivers/macintosh/Kconfig | 2 +- + drivers/macintosh/macio_asic.c | 24 +- + drivers/macintosh/therm_adt746x.c | 8 +- + drivers/media/dvb/dvb-core/dvbdev.c | 5 + + drivers/media/video/cafe_ccic.c | 1 - + drivers/media/video/ov7670.c | 1 - + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + drivers/media/video/v4l1-compat.c | 4 +- + drivers/media/video/w9968cf.c | 1 - + drivers/memstick/core/memstick.c | 5 +- + drivers/memstick/core/mspro_block.c | 14 +- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/message/i2o/device.c | 10 +- + drivers/message/i2o/driver.c | 1 - + drivers/message/i2o/i2o_proc.c | 2 +- + drivers/message/i2o/i2o_scsi.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/misc/ibmasm/module.c | 3 +- + drivers/misc/ioc4.c | 36 + + drivers/misc/phantom.c | 2 +- + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/misc/sgi-xp/xp_main.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 8 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/misc/tifm_7xx1.c | 5 +- + drivers/misc/tifm_core.c | 7 +- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/mtd/devices/m25p80.c | 16 +- + drivers/mtd/devices/mtd_dataflash.c | 30 +- + drivers/mtd/devices/pmc551.c | 2 +- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 4 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/physmap.c | 6 +- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/onenand/omap2.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 4 +- + drivers/mtd/ubi/vmt.c | 4 +- + drivers/mtd/ubi/vtbl.c | 2 +- + drivers/mtd/ubi/wl.c | 4 +- + drivers/net/bnx2x_link.c | 2 +- + drivers/net/e1000/e1000_hw.c | 4 +- + drivers/net/slip.h | 2 +- + drivers/net/tehuti.c | 4 +- + drivers/net/tokenring/smctr.c | 2 +- + drivers/net/wireless/atmel.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 +- + drivers/net/wireless/strip.c | 2 +- + drivers/parport/ieee1284.c | 2 +- + drivers/pci/pci-driver.c | 132 +- + drivers/pnp/card.c | 7 +- + drivers/pnp/core.c | 5 +- + drivers/pnp/system.c | 2 +- + drivers/power/ds2760_battery.c | 4 +- + drivers/rapidio/rio-driver.c | 1 - + drivers/rtc/Kconfig | 94 +- + drivers/rtc/Makefile | 4 + + drivers/rtc/class.c | 16 +- + drivers/rtc/interface.c | 16 +- + drivers/rtc/rtc-at32ap700x.c | 4 +- + drivers/rtc/rtc-au1xxx.c | 153 + + drivers/rtc/rtc-bfin.c | 2 +- + drivers/rtc/rtc-cmos.c | 15 +- + drivers/rtc/rtc-ds1216.c | 30 +- + drivers/rtc/rtc-ds1390.c | 72 +- + drivers/rtc/rtc-ds1511.c | 21 +- + drivers/rtc/rtc-ds1553.c | 15 +- + drivers/rtc/rtc-ds1672.c | 22 - + drivers/rtc/rtc-ds3234.c | 172 +- + drivers/rtc/rtc-ep93xx.c | 13 - + drivers/rtc/rtc-m48t59.c | 2 +- + drivers/rtc/rtc-max6902.c | 176 +- + drivers/rtc/rtc-mv.c | 163 + + drivers/rtc/rtc-pxa.c | 489 ++ + drivers/rtc/rtc-s3c.c | 3 + + drivers/rtc/rtc-sh.c | 13 +- + drivers/rtc/rtc-stk17ta8.c | 17 +- + drivers/rtc/rtc-test.c | 8 +- + drivers/rtc/rtc-twl4030.c | 5 +- + drivers/rtc/rtc-tx4939.c | 317 + + drivers/rtc/rtc-vr41xx.c | 11 +- + drivers/s390/Makefile | 2 +- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/block/dcssblk.c | 11 +- + drivers/s390/char/vmlogrdr.c | 4 +- + drivers/s390/crypto/ap_bus.c | 7 +- + drivers/s390/kvm/kvm_virtio.c | 5 +- + drivers/s390/net/cu3088.c | 7 +- + drivers/s390/net/qeth_core_main.c | 7 +- + drivers/s390/net/qeth_l2_main.c | 2 - + drivers/s390/net/qeth_l3_main.c | 2 - + drivers/s390/s390_rdev.c | 51 - + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 +- + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/qla1280.c | 4 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/serial/8250.c | 2 +- + drivers/serial/crisv10.c | 4 +- + drivers/serial/serial_core.c | 4 +- + drivers/spi/Kconfig | 18 +- + drivers/spi/Makefile | 1 + + drivers/spi/atmel_spi.c | 131 +- + drivers/spi/pxa2xx_spi.c | 3 +- + drivers/spi/spi.c | 20 +- + drivers/spi/spi_bitbang.c | 2 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_gpio.c | 360 + + drivers/spi/spi_lm70llp.c | 35 +- + drivers/spi/spi_s3c24xx.c | 38 +- + drivers/staging/Kconfig | 32 + + drivers/staging/Makefile | 16 + + drivers/staging/agnx/Kconfig | 5 + + drivers/staging/agnx/Makefile | 8 + + drivers/staging/agnx/TODO | 22 + + drivers/staging/agnx/agnx.h | 154 + + drivers/staging/agnx/debug.h | 418 + + drivers/staging/agnx/pci.c | 644 ++ + drivers/staging/agnx/phy.c | 960 +++ + drivers/staging/agnx/phy.h | 409 + + drivers/staging/agnx/rf.c | 894 ++ + drivers/staging/agnx/sta.c | 219 + + drivers/staging/agnx/sta.h | 222 + + drivers/staging/agnx/table.c | 168 + + drivers/staging/agnx/table.h | 10 + + drivers/staging/agnx/xmit.c | 819 ++ + drivers/staging/agnx/xmit.h | 250 + + drivers/staging/altpciechdma/Kconfig | 10 + + drivers/staging/altpciechdma/Makefile | 2 + + drivers/staging/altpciechdma/TODO | 15 + + drivers/staging/altpciechdma/altpciechdma.c | 1184 +++ + drivers/staging/android/Kconfig | 86 + + drivers/staging/android/Makefile | 5 + + drivers/staging/android/TODO | 10 + + drivers/staging/android/binder.c | 3503 ++++++++ + drivers/staging/android/binder.h | 330 + + drivers/staging/android/logger.c | 607 ++ + drivers/staging/android/logger.h | 48 + + drivers/staging/android/lowmemorykiller.c | 119 + + drivers/staging/android/ram_console.c | 395 + + drivers/staging/android/timed_gpio.c | 177 + + drivers/staging/android/timed_gpio.h | 31 + + drivers/staging/asus_oled/Kconfig | 6 + + drivers/staging/asus_oled/Makefile | 1 + + drivers/staging/asus_oled/README | 156 + + drivers/staging/asus_oled/TODO | 10 + + drivers/staging/asus_oled/asus_oled.c | 745 ++ + drivers/staging/asus_oled/linux.txt | 33 + + drivers/staging/asus_oled/linux_f.txt | 18 + + drivers/staging/asus_oled/linux_fr.txt | 33 + + drivers/staging/asus_oled/tux.txt | 33 + + drivers/staging/asus_oled/tux_r.txt | 33 + + drivers/staging/asus_oled/tux_r2.txt | 33 + + drivers/staging/asus_oled/zig.txt | 33 + + drivers/staging/at76_usb/Kconfig | 2 +- + drivers/staging/at76_usb/at76_usb.c | 4640 +++--------- + drivers/staging/at76_usb/at76_usb.h | 227 +- + drivers/staging/benet/Kconfig | 7 + + drivers/staging/benet/MAINTAINERS | 6 + + drivers/staging/benet/Makefile | 14 + + drivers/staging/benet/TODO | 6 + + drivers/staging/benet/asyncmesg.h | 82 + + drivers/staging/benet/be_cm.h | 134 + + drivers/staging/benet/be_common.h | 53 + + drivers/staging/benet/be_ethtool.c | 348 + + drivers/staging/benet/be_init.c | 1382 ++++ + drivers/staging/benet/be_int.c | 863 ++ + drivers/staging/benet/be_netif.c | 705 ++ + drivers/staging/benet/benet.h | 429 + + drivers/staging/benet/bestatus.h | 103 + + drivers/staging/benet/cev.h | 243 + + drivers/staging/benet/cq.c | 211 + + drivers/staging/benet/descriptors.h | 71 + + drivers/staging/benet/doorbells.h | 179 + + drivers/staging/benet/ep.h | 66 + + drivers/staging/benet/eq.c | 299 + + drivers/staging/benet/eth.c | 1273 +++ + drivers/staging/benet/etx_context.h | 55 + + drivers/staging/benet/funcobj.c | 565 ++ + drivers/staging/benet/fwcmd_common.h | 222 + + drivers/staging/benet/fwcmd_common_bmap.h | 717 ++ + drivers/staging/benet/fwcmd_eth_bmap.h | 280 + + drivers/staging/benet/fwcmd_hdr_bmap.h | 54 + + drivers/staging/benet/fwcmd_mcc.h | 94 + + drivers/staging/benet/fwcmd_opcodes.h | 244 + + drivers/staging/benet/fwcmd_types_bmap.h | 29 + + drivers/staging/benet/host_struct.h | 182 + + drivers/staging/benet/hwlib.h | 830 ++ + drivers/staging/benet/mpu.c | 1364 +++ + drivers/staging/benet/mpu.h | 74 + + drivers/staging/benet/mpu_context.h | 46 + + drivers/staging/benet/pcicfg.h | 825 ++ + drivers/staging/benet/post_codes.h | 111 + + drivers/staging/benet/regmap.h | 68 + + drivers/staging/comedi/Kconfig | 27 + + drivers/staging/comedi/Makefile | 17 + + drivers/staging/comedi/TODO | 14 + + drivers/staging/comedi/comedi.h | 916 +++ + drivers/staging/comedi/comedi_compat32.c | 597 ++ + drivers/staging/comedi/comedi_compat32.h | 58 + + drivers/staging/comedi/comedi_fops.c | 2244 +++++ + drivers/staging/comedi/comedi_fops.h | 8 + + drivers/staging/comedi/comedi_ksyms.c | 77 + + drivers/staging/comedi/comedi_rt.h | 150 + + drivers/staging/comedi/comedidev.h | 537 ++ + drivers/staging/comedi/comedilib.h | 192 + + drivers/staging/comedi/drivers.c | 846 ++ + drivers/staging/comedi/drivers/Makefile | 21 + + drivers/staging/comedi/drivers/comedi_bond.c | 535 ++ + drivers/staging/comedi/drivers/comedi_fc.c | 118 + + drivers/staging/comedi/drivers/comedi_fc.h | 76 + + drivers/staging/comedi/drivers/comedi_parport.c | 390 + + drivers/staging/comedi/drivers/comedi_pci.h | 60 + + drivers/staging/comedi/drivers/comedi_test.c | 527 ++ + drivers/staging/comedi/drivers/dt9812.c | 1162 +++ + drivers/staging/comedi/drivers/icp_multi.c | 1085 +++ + drivers/staging/comedi/drivers/icp_multi.h | 278 + + drivers/staging/comedi/drivers/me4000.c | 2362 ++++++ + drivers/staging/comedi/drivers/me4000.h | 446 + + drivers/staging/comedi/drivers/me_daq.c | 845 ++ + drivers/staging/comedi/drivers/mite.c | 809 ++ + drivers/staging/comedi/drivers/mite.h | 453 + + drivers/staging/comedi/drivers/plx9080.h | 429 + + drivers/staging/comedi/drivers/rtd520.c | 2283 ++++++ + drivers/staging/comedi/drivers/rtd520.h | 412 + + drivers/staging/comedi/drivers/s626.c | 3254 ++++++++ + drivers/staging/comedi/drivers/s626.h | 802 ++ + drivers/staging/comedi/drivers/usbdux.c | 2932 +++++++ + drivers/staging/comedi/drivers/usbduxfast.c | 1778 ++++ + drivers/staging/comedi/interrupt.h | 60 + + drivers/staging/comedi/kcomedilib/Makefile | 8 + + drivers/staging/comedi/kcomedilib/data.c | 89 + + drivers/staging/comedi/kcomedilib/dio.c | 95 + + drivers/staging/comedi/kcomedilib/get.c | 294 + + .../staging/comedi/kcomedilib/kcomedilib_main.c | 567 ++ + drivers/staging/comedi/kcomedilib/ksyms.c | 144 + + drivers/staging/comedi/pci_ids.h | 31 + + drivers/staging/comedi/proc.c | 102 + + drivers/staging/comedi/range.c | 161 + + drivers/staging/comedi/rt.c | 412 + + drivers/staging/comedi/rt_pend_tq.c | 113 + + drivers/staging/comedi/rt_pend_tq.h | 10 + + drivers/staging/comedi/wrapper.h | 25 + + drivers/staging/echo/TODO | 2 - + drivers/staging/echo/echo.h | 4 +- + drivers/staging/echo/fir.h | 44 +- + drivers/staging/echo/mmx.h | 8 +- + drivers/staging/epl/Benchmark.h | 437 + + drivers/staging/epl/Debug.h | 734 ++ + drivers/staging/epl/Edrv8139.c | 1252 +++ + drivers/staging/epl/EdrvFec.h | 114 + + drivers/staging/epl/EdrvFec5282.h | 340 + + drivers/staging/epl/EdrvSim.h | 89 + + drivers/staging/epl/Epl.h | 273 + + drivers/staging/epl/EplAmi.h | 362 + + drivers/staging/epl/EplApiGeneric.c | 2060 +++++ + drivers/staging/epl/EplApiLinux.h | 141 + + drivers/staging/epl/EplApiLinuxKernel.c | 1260 +++ + drivers/staging/epl/EplApiProcessImage.c | 347 + + drivers/staging/epl/EplCfg.h | 196 + + drivers/staging/epl/EplDef.h | 355 + + drivers/staging/epl/EplDll.h | 205 + + drivers/staging/epl/EplDllCal.h | 123 + + drivers/staging/epl/EplDllk.c | 4054 +++++++++ + drivers/staging/epl/EplDllkCal.c | 1260 +++ + drivers/staging/epl/EplDlluCal.c | 529 ++ + drivers/staging/epl/EplErrDef.h | 294 + + drivers/staging/epl/EplErrorHandlerk.c | 810 ++ + drivers/staging/epl/EplEvent.h | 279 + + drivers/staging/epl/EplEventk.c | 853 ++ + drivers/staging/epl/EplEventu.c | 814 ++ + drivers/staging/epl/EplFrame.h | 344 + + drivers/staging/epl/EplIdentu.c | 488 ++ + drivers/staging/epl/EplInc.h | 385 + + drivers/staging/epl/EplInstDef.h | 377 + + drivers/staging/epl/EplLed.h | 92 + + drivers/staging/epl/EplNmt.h | 230 + + drivers/staging/epl/EplNmtCnu.c | 704 ++ + drivers/staging/epl/EplNmtMnu.c | 2835 +++++++ + drivers/staging/epl/EplNmtk.c | 1842 +++++ + drivers/staging/epl/EplNmtkCal.c | 149 + + drivers/staging/epl/EplNmtu.c | 708 ++ + drivers/staging/epl/EplNmtuCal.c | 158 + + drivers/staging/epl/EplObd.c | 3262 ++++++++ + drivers/staging/epl/EplObd.h | 464 ++ + drivers/staging/epl/EplObdMacro.h | 354 + + drivers/staging/epl/EplObdkCal.c | 147 + + drivers/staging/epl/EplObdu.c | 517 ++ + drivers/staging/epl/EplObduCal.c | 558 ++ + drivers/staging/epl/EplObjDef.h | 208 + + drivers/staging/epl/EplPdo.h | 117 + + drivers/staging/epl/EplPdok.c | 694 ++ + drivers/staging/epl/EplPdokCal.c | 266 + + drivers/staging/epl/EplPdou.c | 565 ++ + drivers/staging/epl/EplSdo.h | 245 + + drivers/staging/epl/EplSdoAc.h | 111 + + drivers/staging/epl/EplSdoAsndu.c | 483 ++ + drivers/staging/epl/EplSdoAsySequ.c | 2522 ++++++ + drivers/staging/epl/EplSdoComu.c | 3346 ++++++++ + drivers/staging/epl/EplSdoUdpu.c | 790 ++ + drivers/staging/epl/EplStatusu.c | 380 + + drivers/staging/epl/EplTarget.h | 233 + + drivers/staging/epl/EplTimer.h | 117 + + drivers/staging/epl/EplTimeruLinuxKernel.c | 446 + + drivers/staging/epl/EplTimeruNull.c | 312 + + drivers/staging/epl/EplTimeruWin32.c | 513 ++ + drivers/staging/epl/EplVersion.h | 98 + + drivers/staging/epl/Kconfig | 6 + + drivers/staging/epl/Makefile | 41 + + drivers/staging/epl/SharedBuff.c | 1799 ++++ + drivers/staging/epl/SharedBuff.h | 204 + + drivers/staging/epl/ShbIpc-LinuxKernel.c | 966 +++ + drivers/staging/epl/ShbIpc-Win32.c | 1202 +++ + drivers/staging/epl/ShbIpc.h | 125 + + drivers/staging/epl/ShbLinuxKernel.h | 68 + + drivers/staging/epl/SocketLinuxKernel.c | 197 + + drivers/staging/epl/SocketLinuxKernel.h | 105 + + drivers/staging/epl/TimerHighReskX86.c | 522 ++ + drivers/staging/epl/VirtualEthernetLinux.c | 342 + + drivers/staging/epl/amix86.c | 905 ++ + drivers/staging/epl/demo_main.c | 961 +++ + drivers/staging/epl/edrv.h | 167 + + drivers/staging/epl/global.h | 1391 ++++ + drivers/staging/epl/kernel/EplDllk.h | 165 + + drivers/staging/epl/kernel/EplDllkCal.h | 141 + + drivers/staging/epl/kernel/EplErrorHandlerk.h | 100 + + drivers/staging/epl/kernel/EplEventk.h | 108 + + drivers/staging/epl/kernel/EplNmtk.h | 105 + + drivers/staging/epl/kernel/EplNmtkCal.h | 89 + + drivers/staging/epl/kernel/EplObdk.h | 196 + + drivers/staging/epl/kernel/EplObdkCal.h | 89 + + drivers/staging/epl/kernel/EplPdok.h | 110 + + drivers/staging/epl/kernel/EplPdokCal.h | 99 + + drivers/staging/epl/kernel/EplTimerHighResk.h | 109 + + drivers/staging/epl/kernel/EplTimerk.h | 118 + + drivers/staging/epl/kernel/VirtualEthernet.h | 96 + + drivers/staging/epl/proc_fs.c | 409 + + drivers/staging/epl/proc_fs.h | 89 + + drivers/staging/epl/user/EplCfgMau.h | 284 + + drivers/staging/epl/user/EplDllu.h | 108 + + drivers/staging/epl/user/EplDlluCal.h | 117 + + drivers/staging/epl/user/EplEventu.h | 108 + + drivers/staging/epl/user/EplIdentu.h | 108 + + drivers/staging/epl/user/EplLedu.h | 109 + + drivers/staging/epl/user/EplNmtCnu.h | 108 + + drivers/staging/epl/user/EplNmtMnu.h | 131 + + drivers/staging/epl/user/EplNmtu.h | 155 + + drivers/staging/epl/user/EplNmtuCal.h | 91 + + drivers/staging/epl/user/EplObdu.h | 192 + + drivers/staging/epl/user/EplObduCal.h | 148 + + drivers/staging/epl/user/EplPdou.h | 108 + + drivers/staging/epl/user/EplSdoAsndu.h | 107 + + drivers/staging/epl/user/EplSdoAsySequ.h | 111 + + drivers/staging/epl/user/EplSdoComu.h | 126 + + drivers/staging/epl/user/EplSdoUdpu.h | 109 + + drivers/staging/epl/user/EplStatusu.h | 104 + + drivers/staging/epl/user/EplTimeru.h | 107 + + drivers/staging/et131x/et1310_tx.c | 3 - + drivers/staging/et131x/et131x_debug.h | 160 +- + drivers/staging/frontier/Kconfig | 6 + + drivers/staging/frontier/Makefile | 2 + + drivers/staging/frontier/README | 28 + + drivers/staging/frontier/TODO | 9 + + drivers/staging/frontier/alphatrack.c | 853 ++ + drivers/staging/frontier/alphatrack.h | 92 + + drivers/staging/frontier/frontier_compat.h | 63 + + drivers/staging/frontier/surface_sysfs.h | 100 + + drivers/staging/frontier/tranzport.c | 1006 +++ + drivers/staging/go7007/Kconfig | 10 + + drivers/staging/go7007/Makefile | 15 +- + drivers/staging/go7007/go7007-driver.c | 5 +- + drivers/staging/go7007/go7007-fw.c | 30 +- + drivers/staging/go7007/go7007-priv.h | 2 + + drivers/staging/go7007/go7007-usb.c | 95 +- + drivers/staging/go7007/go7007-v4l2.c | 1703 +++-- + drivers/staging/go7007/go7007.txt | 481 ++ + drivers/staging/go7007/s2250-board.c | 630 ++ + drivers/staging/go7007/s2250-loader.c | 188 + + drivers/staging/go7007/saa7134-go7007.c | 52 +- + drivers/staging/go7007/wis-i2c.h | 1 + + drivers/staging/go7007/wis-sony-tuner.c | 2 +- + drivers/staging/me4000/me4000.c | 99 +- + drivers/staging/meilhaus/Kconfig | 127 + + drivers/staging/meilhaus/Makefile | 43 + + drivers/staging/meilhaus/TODO | 10 + + drivers/staging/meilhaus/me0600_device.c | 215 + + drivers/staging/meilhaus/me0600_device.h | 97 + + drivers/staging/meilhaus/me0600_dio.c | 415 + + drivers/staging/meilhaus/me0600_dio.h | 68 + + drivers/staging/meilhaus/me0600_dio_reg.h | 41 + + drivers/staging/meilhaus/me0600_ext_irq.c | 478 ++ + drivers/staging/meilhaus/me0600_ext_irq.h | 58 + + drivers/staging/meilhaus/me0600_ext_irq_reg.h | 18 + + drivers/staging/meilhaus/me0600_optoi.c | 243 + + drivers/staging/meilhaus/me0600_optoi.h | 58 + + drivers/staging/meilhaus/me0600_optoi_reg.h | 35 + + drivers/staging/meilhaus/me0600_relay.c | 359 + + drivers/staging/meilhaus/me0600_relay.h | 63 + + drivers/staging/meilhaus/me0600_relay_reg.h | 36 + + drivers/staging/meilhaus/me0600_ttli.c | 238 + + drivers/staging/meilhaus/me0600_ttli.h | 58 + + drivers/staging/meilhaus/me0600_ttli_reg.h | 35 + + drivers/staging/meilhaus/me0900_device.c | 180 + + drivers/staging/meilhaus/me0900_device.h | 92 + + drivers/staging/meilhaus/me0900_di.c | 246 + + drivers/staging/meilhaus/me0900_di.h | 65 + + drivers/staging/meilhaus/me0900_do.c | 314 + + drivers/staging/meilhaus/me0900_do.h | 68 + + drivers/staging/meilhaus/me0900_reg.h | 40 + + drivers/staging/meilhaus/me1000_device.c | 208 + + drivers/staging/meilhaus/me1000_device.h | 59 + + drivers/staging/meilhaus/me1000_dio.c | 438 + + drivers/staging/meilhaus/me1000_dio.h | 71 + + drivers/staging/meilhaus/me1000_dio_reg.h | 50 + + drivers/staging/meilhaus/me1400_device.c | 256 + + drivers/staging/meilhaus/me1400_device.h | 108 + + drivers/staging/meilhaus/me1400_ext_irq.c | 517 ++ + drivers/staging/meilhaus/me1400_ext_irq.h | 62 + + drivers/staging/meilhaus/me1400_ext_irq_reg.h | 56 + + drivers/staging/meilhaus/me1600_ao.c | 1033 +++ + drivers/staging/meilhaus/me1600_ao.h | 132 + + drivers/staging/meilhaus/me1600_ao_reg.h | 66 + + drivers/staging/meilhaus/me1600_device.c | 261 + + drivers/staging/meilhaus/me1600_device.h | 101 + + drivers/staging/meilhaus/me4600_ai.c | 3434 ++++++++ + drivers/staging/meilhaus/me4600_ai.h | 180 + + drivers/staging/meilhaus/me4600_ai_reg.h | 107 + + drivers/staging/meilhaus/me4600_ao.c | 6011 ++++++++++++++ + drivers/staging/meilhaus/me4600_ao.h | 263 + + drivers/staging/meilhaus/me4600_ao_reg.h | 113 + + drivers/staging/meilhaus/me4600_device.c | 373 + + drivers/staging/meilhaus/me4600_device.h | 151 + + drivers/staging/meilhaus/me4600_di.c | 256 + + drivers/staging/meilhaus/me4600_di.h | 64 + + drivers/staging/meilhaus/me4600_dio.c | 510 ++ + drivers/staging/meilhaus/me4600_dio.h | 69 + + drivers/staging/meilhaus/me4600_dio_reg.h | 63 + + drivers/staging/meilhaus/me4600_do.c | 433 + + drivers/staging/meilhaus/me4600_do.h | 65 + + drivers/staging/meilhaus/me4600_ext_irq.c | 467 ++ + drivers/staging/meilhaus/me4600_ext_irq.h | 78 + + drivers/staging/meilhaus/me4600_ext_irq_reg.h | 41 + + drivers/staging/meilhaus/me4600_reg.h | 46 + + drivers/staging/meilhaus/me6000_ao.c | 3739 +++++++++ + drivers/staging/meilhaus/me6000_ao.h | 200 + + drivers/staging/meilhaus/me6000_ao_reg.h | 177 + + drivers/staging/meilhaus/me6000_device.c | 211 + + drivers/staging/meilhaus/me6000_device.h | 149 + + drivers/staging/meilhaus/me6000_dio.c | 415 + + drivers/staging/meilhaus/me6000_dio.h | 68 + + drivers/staging/meilhaus/me6000_dio_reg.h | 43 + + drivers/staging/meilhaus/me6000_reg.h | 35 + + drivers/staging/meilhaus/me8100_device.c | 187 + + drivers/staging/meilhaus/me8100_device.h | 97 + + drivers/staging/meilhaus/me8100_di.c | 693 ++ + drivers/staging/meilhaus/me8100_di.h | 89 + + drivers/staging/meilhaus/me8100_di_reg.h | 47 + + drivers/staging/meilhaus/me8100_do.c | 391 + + drivers/staging/meilhaus/me8100_do.h | 70 + + drivers/staging/meilhaus/me8100_do_reg.h | 36 + + drivers/staging/meilhaus/me8100_reg.h | 41 + + drivers/staging/meilhaus/me8200_device.c | 194 + + drivers/staging/meilhaus/me8200_device.h | 97 + + drivers/staging/meilhaus/me8200_di.c | 857 ++ + drivers/staging/meilhaus/me8200_di.h | 92 + + drivers/staging/meilhaus/me8200_di_reg.h | 75 + + drivers/staging/meilhaus/me8200_dio.c | 418 + + drivers/staging/meilhaus/me8200_dio.h | 68 + + drivers/staging/meilhaus/me8200_dio_reg.h | 43 + + drivers/staging/meilhaus/me8200_do.c | 600 ++ + drivers/staging/meilhaus/me8200_do.h | 75 + + drivers/staging/meilhaus/me8200_do_reg.h | 40 + + drivers/staging/meilhaus/me8200_reg.h | 46 + + drivers/staging/meilhaus/me8254.c | 1176 +++ + drivers/staging/meilhaus/me8254.h | 80 + + drivers/staging/meilhaus/me8254_reg.h | 172 + + drivers/staging/meilhaus/me8255.c | 462 ++ + drivers/staging/meilhaus/me8255.h | 59 + + drivers/staging/meilhaus/me8255_reg.h | 50 + + drivers/staging/meilhaus/mecirc_buf.h | 131 + + drivers/staging/meilhaus/mecommon.h | 26 + + drivers/staging/meilhaus/medebug.h | 125 + + drivers/staging/meilhaus/medefines.h | 449 + + drivers/staging/meilhaus/medevice.c | 1740 ++++ + drivers/staging/meilhaus/medevice.h | 304 + + drivers/staging/meilhaus/medlist.c | 127 + + drivers/staging/meilhaus/medlist.h | 91 + + drivers/staging/meilhaus/medlock.c | 195 + + drivers/staging/meilhaus/medlock.h | 76 + + drivers/staging/meilhaus/medriver.h | 350 + + drivers/staging/meilhaus/medummy.c | 1266 +++ + drivers/staging/meilhaus/medummy.h | 40 + + drivers/staging/meilhaus/meerror.h | 100 + + drivers/staging/meilhaus/mefirmware.c | 137 + + drivers/staging/meilhaus/mefirmware.h | 57 + + drivers/staging/meilhaus/meids.h | 31 + + drivers/staging/meilhaus/meinternal.h | 363 + + drivers/staging/meilhaus/meioctl.h | 515 ++ + drivers/staging/meilhaus/memain.c | 2022 +++++ + drivers/staging/meilhaus/memain.h | 460 ++ + drivers/staging/meilhaus/meplx_reg.h | 53 + + drivers/staging/meilhaus/meslist.c | 173 + + drivers/staging/meilhaus/meslist.h | 108 + + drivers/staging/meilhaus/meslock.c | 136 + + drivers/staging/meilhaus/meslock.h | 73 + + drivers/staging/meilhaus/mesubdevice.c | 317 + + drivers/staging/meilhaus/mesubdevice.h | 197 + + drivers/staging/meilhaus/metempl_device.c | 137 + + drivers/staging/meilhaus/metempl_device.h | 92 + + drivers/staging/meilhaus/metempl_sub.c | 149 + + drivers/staging/meilhaus/metempl_sub.h | 64 + + drivers/staging/meilhaus/metempl_sub_reg.h | 35 + + drivers/staging/meilhaus/metypes.h | 95 + + drivers/staging/mimio/Kconfig | 10 + + drivers/staging/mimio/Makefile | 1 + + drivers/staging/mimio/mimio.c | 914 +++ + drivers/staging/otus/80211core/amsdu.c | 134 + + drivers/staging/otus/80211core/cagg.c | 3611 ++++++++ + drivers/staging/otus/80211core/cagg.h | 435 + + drivers/staging/otus/80211core/ccmd.c | 1861 +++++ + drivers/staging/otus/80211core/cfunc.c | 1227 +++ + drivers/staging/otus/80211core/cfunc.h | 449 + + drivers/staging/otus/80211core/chb.c | 200 + + drivers/staging/otus/80211core/cic.c | 496 ++ + drivers/staging/otus/80211core/cinit.c | 1911 +++++ + drivers/staging/otus/80211core/cmm.c | 2141 +++++ + drivers/staging/otus/80211core/cmmap.c | 2402 ++++++ + drivers/staging/otus/80211core/cmmsta.c | 5782 +++++++++++++ + drivers/staging/otus/80211core/coid.c | 2695 ++++++ + drivers/staging/otus/80211core/cprecomp.h | 32 + + drivers/staging/otus/80211core/cpsmgr.c | 731 ++ + drivers/staging/otus/80211core/cscanmgr.c | 535 ++ + drivers/staging/otus/80211core/ctkip.c | 598 ++ + drivers/staging/otus/80211core/ctxrx.c | 4096 +++++++++ + drivers/staging/otus/80211core/cwep.c | 299 + + drivers/staging/otus/80211core/cwm.c | 131 + + drivers/staging/otus/80211core/cwm.h | 45 + + drivers/staging/otus/80211core/freqctrl.c | 259 + + drivers/staging/otus/80211core/ledmgr.c | 557 ++ + drivers/staging/otus/80211core/performance.c | 431 + + drivers/staging/otus/80211core/performance.h | 97 + + drivers/staging/otus/80211core/pub_usb.h | 102 + + drivers/staging/otus/80211core/pub_zfi.h | 821 ++ + drivers/staging/otus/80211core/pub_zfw.h | 93 + + drivers/staging/otus/80211core/queue.c | 303 + + drivers/staging/otus/80211core/queue.h | 37 + + drivers/staging/otus/80211core/ratectrl.c | 874 ++ + drivers/staging/otus/80211core/ratectrl.h | 37 + + drivers/staging/otus/80211core/struct.h | 1315 +++ + drivers/staging/otus/80211core/wlan.h | 595 ++ + drivers/staging/otus/Kconfig | 32 + + drivers/staging/otus/Makefile | 67 + + drivers/staging/otus/TODO | 9 + + drivers/staging/otus/apdbg.c | 457 + + drivers/staging/otus/athr_common.h | 141 + + drivers/staging/otus/hal/hpDKfwu.c | 832 ++ + drivers/staging/otus/hal/hpani.c | 732 ++ + drivers/staging/otus/hal/hpani.h | 420 + + drivers/staging/otus/hal/hpfw2.c | 1018 +++ + drivers/staging/otus/hal/hpfwbu.c | 5269 ++++++++++++ + drivers/staging/otus/hal/hpfwspiu.c | 655 ++ + drivers/staging/otus/hal/hpfwu.c | 1017 +++ + drivers/staging/otus/hal/hpfwu.c.drv_ba_resend | 742 ++ + drivers/staging/otus/hal/hpfwu_2k.c | 1016 +++ + drivers/staging/otus/hal/hpfwu_BA.c | 874 ++ + drivers/staging/otus/hal/hpfwu_FB50_mdk.c | 721 ++ + drivers/staging/otus/hal/hpfwu_OTUS_RC.c | 715 ++ + drivers/staging/otus/hal/hpfwu_txstream.c | 1017 +++ + drivers/staging/otus/hal/hpfwuinit.c | 240 + + drivers/staging/otus/hal/hpmain.c | 4643 +++++++++++ + drivers/staging/otus/hal/hpreg.c | 2481 ++++++ + drivers/staging/otus/hal/hpreg.h | 524 ++ + drivers/staging/otus/hal/hprw.c | 1557 ++++ + drivers/staging/otus/hal/hpusb.c | 1584 ++++ + drivers/staging/otus/hal/hpusb.h | 437 + + drivers/staging/otus/hal/otus.ini | 414 + + drivers/staging/otus/ioctl.c | 2913 +++++++ + drivers/staging/otus/oal_dt.h | 60 + + drivers/staging/otus/oal_marc.h | 135 + + drivers/staging/otus/usbdrv.c | 1148 +++ + drivers/staging/otus/usbdrv.h | 252 + + drivers/staging/otus/wrap_buf.c | 114 + + drivers/staging/otus/wrap_dbg.c | 101 + + drivers/staging/otus/wrap_ev.c | 283 + + drivers/staging/otus/wrap_mem.c | 101 + + drivers/staging/otus/wrap_mis.c | 109 + + drivers/staging/otus/wrap_pkt.c | 173 + + drivers/staging/otus/wrap_sec.c | 127 + + drivers/staging/otus/wrap_usb.c | 191 + + drivers/staging/otus/wwrap.c | 1134 +++ + drivers/staging/otus/zdcompat.h | 62 + + drivers/staging/otus/zdusb.c | 239 + + drivers/staging/otus/zdusb.h | 43 + + drivers/staging/panel/Kconfig | 278 + + drivers/staging/panel/Makefile | 1 + + drivers/staging/panel/TODO | 9 + + drivers/staging/panel/lcd-panel-cgram.txt | 24 + + drivers/staging/panel/panel.c | 2193 +++++ + drivers/staging/poch/README | 9 +- + drivers/staging/poch/poch.c | 104 +- + drivers/staging/rspiusb/Kconfig | 6 + + drivers/staging/rspiusb/Makefile | 1 + + drivers/staging/rspiusb/TODO | 22 + + drivers/staging/rspiusb/rspiusb.c | 887 ++ + drivers/staging/rspiusb/rspiusb.h | 25 + + drivers/staging/rt2860/2860_main_dev.c | 1377 ++++ + drivers/staging/rt2860/Kconfig | 5 + + drivers/staging/rt2860/Makefile | 43 + + drivers/staging/rt2860/TODO | 17 + + drivers/staging/rt2860/aironet.h | 210 + + drivers/staging/rt2860/ap.h | 557 ++ + drivers/staging/rt2860/chlist.h | 1296 +++ + drivers/staging/rt2860/common/2860_rtmp_init.c | 922 +++ + drivers/staging/rt2860/common/action.c | 1031 +++ + drivers/staging/rt2860/common/action.h | 68 + + drivers/staging/rt2860/common/ba_action.c | 1802 ++++ + drivers/staging/rt2860/common/cmm_data.c | 3466 ++++++++ + drivers/staging/rt2860/common/cmm_data_2860.c | 1240 +++ + drivers/staging/rt2860/common/cmm_info.c | 3417 ++++++++ + drivers/staging/rt2860/common/cmm_sanity.c | 1633 ++++ + drivers/staging/rt2860/common/cmm_sync.c | 702 ++ + drivers/staging/rt2860/common/cmm_wpa.c | 1606 ++++ + drivers/staging/rt2860/common/dfs.c | 453 + + drivers/staging/rt2860/common/eeprom.c | 244 + + drivers/staging/rt2860/common/firmware.h | 558 ++ + drivers/staging/rt2860/common/md5.c | 1427 ++++ + drivers/staging/rt2860/common/mlme.c | 8667 ++++++++++++++++++++ + drivers/staging/rt2860/common/netif_block.c | 144 + + drivers/staging/rt2860/common/netif_block.h | 58 + + drivers/staging/rt2860/common/rtmp_init.c | 3744 +++++++++ + drivers/staging/rt2860/common/rtmp_tkip.c | 1607 ++++ + drivers/staging/rt2860/common/rtmp_wep.c | 499 ++ + drivers/staging/rt2860/common/spectrum.c | 1877 +++++ + drivers/staging/rt2860/config.mk | 245 + + drivers/staging/rt2860/dfs.h | 100 + + drivers/staging/rt2860/leap.h | 215 + + drivers/staging/rt2860/link_list.h | 134 + + drivers/staging/rt2860/md4.h | 42 + + drivers/staging/rt2860/md5.h | 107 + + drivers/staging/rt2860/mlme.h | 1447 ++++ + drivers/staging/rt2860/oid.h | 995 +++ + drivers/staging/rt2860/rt2860.h | 349 + + drivers/staging/rt2860/rt28xx.h | 2714 ++++++ + drivers/staging/rt2860/rt_ate.c | 6025 ++++++++++++++ + drivers/staging/rt2860/rt_ate.h | 353 + + drivers/staging/rt2860/rt_config.h | 101 + + drivers/staging/rt2860/rt_linux.c | 1054 +++ + drivers/staging/rt2860/rt_linux.h | 926 +++ + drivers/staging/rt2860/rt_main_dev.c | 1686 ++++ + drivers/staging/rt2860/rt_profile.c | 1981 +++++ + drivers/staging/rt2860/rtmp.h | 7177 ++++++++++++++++ + drivers/staging/rt2860/rtmp_ckipmic.h | 113 + + drivers/staging/rt2860/rtmp_def.h | 1588 ++++ + drivers/staging/rt2860/rtmp_type.h | 94 + + drivers/staging/rt2860/spectrum.h | 322 + + drivers/staging/rt2860/spectrum_def.h | 95 + + drivers/staging/rt2860/sta/aironet.c | 1312 +++ + drivers/staging/rt2860/sta/assoc.c | 1826 +++++ + drivers/staging/rt2860/sta/auth.c | 474 ++ + drivers/staging/rt2860/sta/auth_rsp.c | 167 + + drivers/staging/rt2860/sta/connect.c | 2751 +++++++ + drivers/staging/rt2860/sta/dls.c | 2201 +++++ + drivers/staging/rt2860/sta/rtmp_data.c | 2614 ++++++ + drivers/staging/rt2860/sta/sanity.c | 420 + + drivers/staging/rt2860/sta/sync.c | 1959 +++++ + drivers/staging/rt2860/sta/wpa.c | 2086 +++++ + drivers/staging/rt2860/sta_ioctl.c | 6944 ++++++++++++++++ + drivers/staging/rt2860/wpa.h | 356 + + drivers/staging/rt2870/2870_main_dev.c | 1612 ++++ + drivers/staging/rt2870/Kconfig | 6 + + drivers/staging/rt2870/Makefile | 47 + + drivers/staging/rt2870/TODO | 10 + + drivers/staging/rt2870/aironet.h | 210 + + drivers/staging/rt2870/ap.h | 562 ++ + drivers/staging/rt2870/chlist.h | 1296 +++ + drivers/staging/rt2870/common/2870_rtmp_init.c | 1778 ++++ + drivers/staging/rt2870/common/action.c | 1046 +++ + drivers/staging/rt2870/common/action.h | 68 + + drivers/staging/rt2870/common/ba_action.c | 1798 ++++ + drivers/staging/rt2870/common/cmm_data.c | 2734 ++++++ + drivers/staging/rt2870/common/cmm_data_2870.c | 963 +++ + drivers/staging/rt2870/common/cmm_info.c | 3712 +++++++++ + drivers/staging/rt2870/common/cmm_sanity.c | 1663 ++++ + drivers/staging/rt2870/common/cmm_sync.c | 711 ++ + drivers/staging/rt2870/common/cmm_wpa.c | 1654 ++++ + drivers/staging/rt2870/common/dfs.c | 453 + + drivers/staging/rt2870/common/eeprom.c | 254 + + drivers/staging/rt2870/common/firmware.h | 558 ++ + drivers/staging/rt2870/common/md5.c | 1427 ++++ + drivers/staging/rt2870/common/mlme.c | 8609 +++++++++++++++++++ + drivers/staging/rt2870/common/netif_block.c | 144 + + drivers/staging/rt2870/common/rtmp_init.c | 4132 ++++++++++ + drivers/staging/rt2870/common/rtmp_tkip.c | 1613 ++++ + drivers/staging/rt2870/common/rtmp_wep.c | 508 ++ + drivers/staging/rt2870/common/rtusb_bulk.c | 1981 +++++ + drivers/staging/rt2870/common/rtusb_data.c | 229 + + drivers/staging/rt2870/common/rtusb_io.c | 2006 +++++ + drivers/staging/rt2870/common/spectrum.c | 1876 +++++ + drivers/staging/rt2870/dfs.h | 100 + + drivers/staging/rt2870/leap.h | 215 + + drivers/staging/rt2870/link_list.h | 134 + + drivers/staging/rt2870/md4.h | 42 + + drivers/staging/rt2870/md5.h | 107 + + drivers/staging/rt2870/mlme.h | 1471 ++++ + drivers/staging/rt2870/netif_block.h | 58 + + drivers/staging/rt2870/oid.h | 1091 +++ + drivers/staging/rt2870/rt2870.h | 761 ++ + drivers/staging/rt2870/rt28xx.h | 2689 ++++++ + drivers/staging/rt2870/rt_ate.c | 6452 +++++++++++++++ + drivers/staging/rt2870/rt_ate.h | 315 + + drivers/staging/rt2870/rt_config.h | 104 + + drivers/staging/rt2870/rt_linux.c | 1095 +++ + drivers/staging/rt2870/rt_linux.h | 908 ++ + drivers/staging/rt2870/rt_main_dev.c | 1863 +++++ + drivers/staging/rt2870/rt_profile.c | 2020 +++++ + drivers/staging/rt2870/rtmp.h | 7586 +++++++++++++++++ + drivers/staging/rt2870/rtmp_ckipmic.h | 113 + + drivers/staging/rt2870/rtmp_def.h | 1622 ++++ + drivers/staging/rt2870/rtmp_type.h | 94 + + drivers/staging/rt2870/spectrum.h | 322 + + drivers/staging/rt2870/spectrum_def.h | 95 + + drivers/staging/rt2870/sta/aironet.c | 1312 +++ + drivers/staging/rt2870/sta/assoc.c | 2039 +++++ + drivers/staging/rt2870/sta/auth.c | 474 ++ + drivers/staging/rt2870/sta/auth_rsp.c | 166 + + drivers/staging/rt2870/sta/connect.c | 2822 +++++++ + drivers/staging/rt2870/sta/dls.c | 2210 +++++ + drivers/staging/rt2870/sta/rtmp_data.c | 2619 ++++++ + drivers/staging/rt2870/sta/sanity.c | 420 + + drivers/staging/rt2870/sta/sync.c | 1753 ++++ + drivers/staging/rt2870/sta/wpa.c | 2107 +++++ + drivers/staging/rt2870/sta_ioctl.c | 7068 ++++++++++++++++ + drivers/staging/rt2870/sta_ioctl.c.patch | 18 + + drivers/staging/rt2870/tmp60 | 7037 ++++++++++++++++ + drivers/staging/rt2870/tmp61 | 7037 ++++++++++++++++ + drivers/staging/rt2870/wpa.h | 357 + + drivers/staging/rtl8187se/Kconfig | 5 + + drivers/staging/rtl8187se/Makefile | 55 + + drivers/staging/rtl8187se/dot11d.h | 101 + + drivers/staging/rtl8187se/ieee80211.h | 1755 ++++ + drivers/staging/rtl8187se/ieee80211/dot11d.c | 246 + + drivers/staging/rtl8187se/ieee80211/dot11d.h | 102 + + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1755 ++++ + .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 265 + + .../staging/rtl8187se/ieee80211/ieee80211_crypt.h | 86 + + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 533 ++ + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 1001 +++ + .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 394 + + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 301 + + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 1971 +++++ + .../rtl8187se/ieee80211/ieee80211_softmac.c | 4029 +++++++++ + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 602 ++ + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 828 ++ + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 884 ++ + drivers/staging/rtl8187se/ieee80211/internal.h | 115 + + drivers/staging/rtl8187se/ieee80211/rtl_crypto.h | 399 + + drivers/staging/rtl8187se/ieee80211_crypt.h | 86 + + drivers/staging/rtl8187se/r8180.h | 761 ++ + drivers/staging/rtl8187se/r8180_93cx6.c | 146 + + drivers/staging/rtl8187se/r8180_93cx6.h | 59 + + drivers/staging/rtl8187se/r8180_core.c | 6828 +++++++++++++++ + drivers/staging/rtl8187se/r8180_dm.c | 1725 ++++ + drivers/staging/rtl8187se/r8180_dm.h | 41 + + drivers/staging/rtl8187se/r8180_gct.c | 296 + + drivers/staging/rtl8187se/r8180_gct.h | 25 + + drivers/staging/rtl8187se/r8180_hw.h | 956 +++ + drivers/staging/rtl8187se/r8180_max2820.c | 240 + + drivers/staging/rtl8187se/r8180_max2820.h | 21 + + drivers/staging/rtl8187se/r8180_pm.c | 90 + + drivers/staging/rtl8187se/r8180_pm.h | 28 + + drivers/staging/rtl8187se/r8180_rtl8225.c | 933 +++ + drivers/staging/rtl8187se/r8180_rtl8225.h | 44 + + drivers/staging/rtl8187se/r8180_rtl8225z2.c | 1587 ++++ + drivers/staging/rtl8187se/r8180_rtl8255.c | 1838 +++++ + drivers/staging/rtl8187se/r8180_rtl8255.h | 19 + + drivers/staging/rtl8187se/r8180_sa2400.c | 233 + + drivers/staging/rtl8187se/r8180_sa2400.h | 26 + + drivers/staging/rtl8187se/r8180_wx.c | 1644 ++++ + drivers/staging/rtl8187se/r8180_wx.h | 21 + + drivers/staging/rtl8187se/r8185b_init.c | 3342 ++++++++ + drivers/staging/slicoss/slic.h | 34 + + drivers/staging/slicoss/slicoss.c | 84 +- + drivers/staging/sxg/README | 2 - + drivers/staging/sxg/sxg.c | 316 +- + drivers/staging/sxg/sxg.h | 121 +- + drivers/staging/sxg/sxg_os.h | 24 +- + drivers/staging/sxg/sxgdbg.h | 15 +- + drivers/staging/sxg/sxghif.h | 139 +- + drivers/staging/sxg/sxghw.h | 40 +- + drivers/staging/sxg/sxgphycode.h | 2 +- + drivers/staging/usbip/stub.h | 2 +- + drivers/staging/usbip/stub_dev.c | 2 +- + drivers/staging/usbip/stub_main.c | 21 +- + drivers/staging/usbip/stub_rx.c | 9 +- + drivers/staging/usbip/stub_tx.c | 1 - + drivers/staging/usbip/vhci_hcd.c | 2 +- + drivers/staging/usbip/vhci_sysfs.c | 2 +- + drivers/staging/winbond/Kconfig | 12 +- + drivers/staging/winbond/Makefile | 17 +- + drivers/staging/winbond/adapter.h | 23 - + drivers/staging/winbond/bss_f.h | 80 +- + drivers/staging/winbond/bssdscpt.h | 20 +- + drivers/staging/winbond/common.h | 27 + + drivers/staging/winbond/core.h | 42 + + drivers/staging/winbond/ds_tkip.h | 12 +- + drivers/staging/winbond/gl_80211.h | 3 +- + drivers/staging/winbond/linux/common.h | 128 - + drivers/staging/winbond/linux/sysdef.h | 73 - + drivers/staging/winbond/linux/wb35rx_f.h | 17 - + drivers/staging/winbond/linux/wb35tx_f.h | 20 - + drivers/staging/winbond/linux/wbusb.c | 391 - + drivers/staging/winbond/linux/wbusb_f.h | 34 - + drivers/staging/winbond/localpara.h | 11 +- + drivers/staging/winbond/mac_structures.h | 7 +- + drivers/staging/winbond/mds.c | 831 +- + drivers/staging/winbond/mds_f.h | 42 +- + drivers/staging/winbond/mds_s.h | 42 +- + drivers/staging/winbond/mlme_mib.h | 20 +- + drivers/staging/winbond/mlme_s.h | 11 +- + drivers/staging/winbond/mlmetxrx.c | 113 +- + drivers/staging/winbond/mlmetxrx_f.h | 25 +- + drivers/staging/winbond/mto.c | 991 +--- + drivers/staging/winbond/mto.h | 27 +- + drivers/staging/winbond/mto_f.h | 12 +- + drivers/staging/winbond/os_common.h | 2 +- + drivers/staging/winbond/phy_calibration.c | 40 +- + drivers/staging/winbond/phy_calibration.h | 6 + + drivers/staging/winbond/reg.c | 349 +- + drivers/staging/winbond/rxisr.c | 30 - + drivers/staging/winbond/scan_s.h | 22 +- + drivers/staging/winbond/sme_api.c | 14 - + drivers/staging/winbond/sme_api.h | 7 +- + drivers/staging/winbond/sme_s.h | 16 +- + drivers/staging/winbond/sysdef.h | 40 + + drivers/staging/winbond/{linux => }/wb35reg.c | 531 +- + drivers/staging/winbond/{linux => }/wb35reg_f.h | 9 +- + drivers/staging/winbond/{linux => }/wb35reg_s.h | 46 +- + drivers/staging/winbond/{linux => }/wb35rx.c | 421 +- + drivers/staging/winbond/wb35rx_f.h | 15 + + drivers/staging/winbond/{linux => }/wb35rx_s.h | 2 +- + drivers/staging/winbond/{linux => }/wb35tx.c | 248 +- + drivers/staging/winbond/wb35tx_f.h | 21 + + drivers/staging/winbond/{linux => }/wb35tx_s.h | 14 +- + drivers/staging/winbond/wbhal.c | 830 +-- + drivers/staging/winbond/wbhal_f.h | 49 +- + drivers/staging/winbond/wbhal_s.h | 33 +- + drivers/staging/winbond/wblinux.c | 275 - + drivers/staging/winbond/wblinux_f.h | 21 +- + drivers/staging/winbond/wblinux_s.h | 45 - + drivers/staging/winbond/wbusb.c | 438 + + drivers/staging/winbond/{linux => }/wbusb_s.h | 17 +- + drivers/staging/wlan-ng/Kconfig | 6 +- + drivers/staging/wlan-ng/Makefile | 3 +- + drivers/staging/wlan-ng/README | 1 - + drivers/staging/wlan-ng/hfa384x.c | 4018 --------- + drivers/staging/wlan-ng/hfa384x.h | 2491 +++---- + drivers/staging/wlan-ng/hfa384x_usb.c | 655 +-- + drivers/staging/wlan-ng/p80211conv.c | 43 +- + drivers/staging/wlan-ng/p80211conv.h | 76 +- + drivers/staging/wlan-ng/p80211hdr.h | 90 +- + drivers/staging/wlan-ng/p80211ioctl.h | 6 +- + drivers/staging/wlan-ng/p80211meta.h | 46 +- + drivers/staging/wlan-ng/p80211metadef.h | 1785 +---- + drivers/staging/wlan-ng/p80211metamib.h | 2 +- + drivers/staging/wlan-ng/p80211metamsg.h | 2 +- + drivers/staging/wlan-ng/p80211metastruct.h | 463 +- + drivers/staging/wlan-ng/p80211mgmt.h | 194 +- + drivers/staging/wlan-ng/p80211mod.c | 216 - + drivers/staging/wlan-ng/p80211msg.h | 14 +- + drivers/staging/wlan-ng/p80211netdev.c | 357 +- + drivers/staging/wlan-ng/p80211netdev.h | 180 +- + drivers/staging/wlan-ng/p80211req.c | 39 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 208 +- + drivers/staging/wlan-ng/p80211wep.c | 21 +- + drivers/staging/wlan-ng/p80211wext.c | 353 +- + drivers/staging/wlan-ng/prism2_cs.c | 1487 ---- + drivers/staging/wlan-ng/prism2_pci.c | 332 - + drivers/staging/wlan-ng/prism2_plx.c | 472 -- + drivers/staging/wlan-ng/prism2mgmt.c | 1673 +---- + drivers/staging/wlan-ng/prism2mgmt.h | 59 +- + drivers/staging/wlan-ng/prism2mib.c | 2790 +------ + drivers/staging/wlan-ng/prism2sta.c | 338 +- + .../staging/wlan-ng/{prism2_usb.c => prism2usb.c} | 77 +- + drivers/staging/wlan-ng/version.h | 64 - + drivers/staging/wlan-ng/wlan_compat.h | 570 +-- + drivers/thermal/thermal_sys.c | 6 +- + drivers/uio/uio.c | 159 +- + drivers/uio/uio_cif.c | 3 +- + drivers/uio/uio_pdrv_genirq.c | 5 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/lh7a40x_udc.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/uwb/i1480/dfu/usb.c | 2 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/bfin-t350mcqb-fb.c | 6 +- + drivers/video/carminefb.c | 2 +- + drivers/video/console/vgacon.c | 2 +- + drivers/video/cyber2000fb.c | 3 +- + drivers/video/fbmem.c | 4 + + drivers/video/gbefb.c | 7 +- + drivers/video/geode/gx1fb_core.c | 3 +- + drivers/video/geode/gxfb_core.c | 8 +- + drivers/video/geode/lxfb_core.c | 9 +- + drivers/video/gxt4500.c | 4 +- + drivers/video/i810/i810_accel.c | 18 +- + drivers/video/intelfb/intelfbdrv.c | 24 +- + drivers/video/modedb.c | 2 +- + drivers/video/neofb.c | 6 +- + drivers/video/nvidia/nv_accel.c | 12 +- + drivers/video/output.c | 2 +- + drivers/video/pm3fb.c | 6 +- + drivers/video/sm501fb.c | 6 +- + drivers/video/via/viafbdev.c | 18 +- + drivers/virtio/virtio_pci.c | 17 +- + drivers/w1/w1.c | 19 +- + drivers/w1/w1_int.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 27 +- + drivers/xen/xenbus/xenbus_probe.h | 4 +- + firmware/dsp56k/bootstrap.asm | 26 +- + fs/Kconfig | 17 +- + fs/autofs4/autofs_i.h | 2 - + fs/autofs4/dev-ioctl.c | 75 +- + fs/autofs4/expire.c | 4 +- + fs/autofs4/inode.c | 14 +- + fs/autofs4/waitq.c | 8 +- + fs/bfs/inode.c | 45 + + fs/binfmt_misc.c | 2 +- + fs/block_dev.c | 2 +- + fs/buffer.c | 1 - + fs/char_dev.c | 2 +- + fs/compat.c | 6 + + fs/direct-io.c | 13 + + fs/ecryptfs/crypto.c | 514 +- + fs/ecryptfs/ecryptfs_kernel.h | 105 +- + fs/ecryptfs/file.c | 30 +- + fs/ecryptfs/inode.c | 297 +- + fs/ecryptfs/keystore.c | 651 ++- + fs/ecryptfs/main.c | 126 +- + fs/ecryptfs/messaging.c | 4 +- + fs/ecryptfs/miscdev.c | 18 +- + fs/exec.c | 29 +- + fs/ext4/ext4.h | 6 +- + fs/ext4/inode.c | 2 +- + fs/fs-writeback.c | 92 +- + fs/fuse/control.c | 6 +- + fs/fuse/dev.c | 113 +- + fs/fuse/dir.c | 48 +- + fs/fuse/file.c | 457 +- + fs/fuse/fuse_i.h | 83 +- + fs/fuse/inode.c | 157 +- + fs/gfs2/Kconfig | 2 +- + fs/gfs2/ops_address.c | 1 + + fs/gfs2/ops_file.c | 2 +- + fs/hugetlbfs/inode.c | 12 +- + fs/inode.c | 12 +- + fs/minix/dir.c | 2 +- + fs/mpage.c | 6 +- + fs/ncpfs/getopt.c | 1 - + fs/ncpfs/ioctl.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/partitions/check.c | 11 +- + fs/proc/base.c | 231 +- + fs/proc/generic.c | 8 +- + fs/proc/inode.c | 3 - + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +- + fs/proc/task_mmu.c | 8 +- + fs/proc/task_nommu.c | 2 +- + fs/select.c | 76 +- + fs/sync.c | 2 +- + fs/ubifs/Kconfig | 2 +- + fs/ubifs/budget.c | 4 +- + fs/ubifs/gc.c | 2 +- + fs/ubifs/journal.c | 2 +- + fs/ubifs/shrinker.c | 2 +- + fs/ubifs/super.c | 9 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/acpi/acmacros.h | 4 +- + include/acpi/actypes.h | 2 +- + include/asm-frv/Kbuild | 1 + + include/asm-frv/atomic.h | 4 - + include/asm-frv/byteorder.h | 8 +- + include/asm-frv/swab.h | 10 + + include/asm-generic/bug.h | 17 + + include/asm-generic/local.h | 1 - + include/asm-generic/memory_model.h | 7 - + include/asm-m32r/Kbuild | 1 + + include/asm-m32r/atomic.h | 8 +- + include/asm-m32r/byteorder.h | 7 +- + include/asm-m32r/swab.h | 10 + + include/asm-m68k/Kbuild | 1 + + include/asm-m68k/atomic.h | 3 +- + include/asm-m68k/byteorder.h | 16 +- + include/asm-m68k/swab.h | 16 + + include/asm-mn10300/Kbuild | 1 + + include/asm-mn10300/atomic.h | 9 - + include/asm-mn10300/byteorder.h | 41 +- + include/asm-mn10300/swab.h | 42 + + include/asm-xtensa/Kbuild | 1 - + include/linux/Kbuild | 1 - + .../include/asm => include/linux}/atmel-mci.h | 6 +- + include/linux/auto_dev-ioctl.h | 75 +- + include/linux/auto_fs4.h | 62 +- + include/linux/binfmts.h | 3 +- + include/linux/byteorder.h | 372 - + include/linux/byteorder/Kbuild | 2 - + include/linux/byteorder/big_endian.h | 3 +- + include/linux/byteorder/little_endian.h | 3 +- + include/linux/byteorder/swab.h | 222 - + include/linux/byteorder/swabb.h | 135 - + include/linux/capability.h | 17 +- + include/linux/cgroup.h | 14 +- + include/linux/cpuset.h | 6 + + include/linux/device.h | 39 +- + include/linux/fs.h | 1 - + include/linux/fuse.h | 79 +- + include/linux/gfp.h | 6 - + include/linux/gpio_keys.h | 1 + + include/linux/hugetlb.h | 6 + + include/linux/i2c.h | 4 - + include/linux/i2c/tsc2007.h | 17 + + include/linux/i2c/twl4030.h | 9 +- + include/linux/ide.h | 171 +- + include/linux/interrupt.h | 4 +- + include/linux/irqnr.h | 7 +- + include/linux/kernel.h | 14 +- + include/linux/klist.h | 2 - + include/linux/kprobes.h | 15 +- + include/linux/libps2.h | 2 + + include/linux/map_to_7segment.h | 2 +- + include/linux/memory.h | 6 +- + include/linux/memory_hotplug.h | 2 +- + include/linux/migrate.h | 4 + + include/linux/miscdevice.h | 42 +- + include/linux/mm.h | 5 + + include/linux/module.h | 15 +- + include/linux/mtd/concat.h | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/ncp_fs.h | 2 +- + include/linux/node.h | 13 + + include/linux/page-flags.h | 26 +- + include/linux/pagevec.h | 7 - + include/linux/pci.h | 1 - + include/linux/pci_ids.h | 1 + + include/linux/percpu_counter.h | 22 +- + include/linux/platform_device.h | 1 - + include/linux/pm.h | 88 +- + include/linux/poll.h | 15 +- + include/linux/rcupdate.h | 12 - + include/linux/rio_drv.h | 1 - + include/linux/rmap.h | 5 +- + include/linux/sched.h | 10 +- + include/linux/security.h | 41 +- + include/linux/serio.h | 1 + + include/linux/spi/spi.h | 4 +- + include/linux/spi/spi_gpio.h | 60 + + include/linux/swab.h | 52 +- + include/linux/swap.h | 54 +- + include/linux/swiotlb.h | 3 +- + include/linux/time.h | 1 + + include/linux/types.h | 13 +- + include/linux/uio_driver.h | 30 +- + include/linux/unwind.h | 68 - + include/linux/vmalloc.h | 4 + + include/linux/writeback.h | 16 +- + include/mtd/ubi-user.h | 2 +- + include/net/cipso_ipv4.h | 6 +- + include/net/netlabel.h | 86 +- + include/sound/soc-dapm.h | 15 + + include/sound/soc.h | 30 + + init/Kconfig | 48 +- + init/do_mounts.c | 4 +- + init/do_mounts_md.c | 2 +- + init/main.c | 12 +- + ipc/ipc_sysctl.c | 46 +- + ipc/sem.c | 1 - + ipc/shm.c | 15 +- + kernel/capability.c | 2 +- + kernel/cgroup.c | 33 - + kernel/compat.c | 5 +- + kernel/cpu.c | 6 +- + kernel/cpuset.c | 34 + + kernel/dma-coherent.c | 42 +- + kernel/exit.c | 21 +- + kernel/fork.c | 17 +- + kernel/futex.c | 72 +- + kernel/hrtimer.c | 142 +- + kernel/kmod.c | 4 +- + kernel/kprobes.c | 281 +- + kernel/ksysfs.c | 4 +- + kernel/module.c | 33 +- + kernel/panic.c | 2 + + kernel/pid.c | 2 +- + kernel/power/main.c | 6 +- + kernel/printk.c | 2 +- + kernel/profile.c | 1 - + kernel/rcupdate.c | 11 +- + kernel/rcupreempt.c | 11 +- + kernel/rcutorture.c | 18 +- + kernel/rcutree.c | 13 +- + kernel/sched.c | 18 +- + kernel/sched_clock.c | 5 +- + kernel/sched_cpupri.c | 2 +- + kernel/sched_fair.c | 30 +- + kernel/signal.c | 3 +- + kernel/sys.c | 4 + + kernel/sysctl.c | 27 +- + kernel/test_kprobes.c | 210 +- + kernel/time.c | 4 +- + kernel/time/jiffies.c | 2 +- + kernel/time/timekeeping.c | 7 +- + kernel/tsacct.c | 4 +- + lib/bust_spinlocks.c | 2 + + lib/dynamic_printk.c | 58 +- + lib/fault-inject.c | 1 - + lib/klist.c | 43 +- + lib/kobject_uevent.c | 8 +- + lib/percpu_counter.c | 36 +- + lib/prio_heap.c | 2 +- + lib/proportions.c | 8 +- + lib/radix-tree.c | 13 +- + lib/swiotlb.c | 239 +- + lib/vsprintf.c | 4 + + mm/Kconfig | 6 - + mm/Makefile | 4 +- + mm/backing-dev.c | 8 +- + mm/bootmem.c | 8 +- + mm/filemap.c | 30 +- + mm/filemap_xip.c | 2 +- + mm/fremap.c | 2 +- + mm/hugetlb.c | 46 +- + mm/internal.h | 2 + + mm/memcontrol.c | 3 +- + mm/memory.c | 176 +- + mm/memory_hotplug.c | 20 +- + mm/migrate.c | 89 +- + mm/mlock.c | 9 +- + mm/mmap.c | 22 +- + mm/mprotect.c | 6 +- + mm/oom_kill.c | 109 +- + mm/page-writeback.c | 245 +- + mm/page_alloc.c | 135 +- + mm/page_cgroup.c | 2 +- + mm/page_io.c | 6 +- + mm/rmap.c | 60 +- + mm/shmem.c | 82 +- + mm/slub.c | 2 +- + mm/swap.c | 44 +- + mm/swap_state.c | 31 +- + mm/swapfile.c | 576 +- + mm/tiny-shmem.c | 134 - + mm/vmalloc.c | 50 +- + mm/vmscan.c | 143 +- + net/ipv4/cipso_ipv4.c | 88 +- + net/iucv/iucv.c | 7 +- + net/netlabel/netlabel_cipso_v4.c | 61 +- + net/netlabel/netlabel_domainhash.c | 67 + + net/netlabel/netlabel_domainhash.h | 4 + + net/netlabel/netlabel_kapi.c | 347 +- + net/netlabel/netlabel_unlabeled.c | 26 +- + net/netlabel/netlabel_unlabeled.h | 15 + + net/sctp/auth.c | 4 +- + net/sctp/sm_statefuns.c | 6 +- + net/sctp/socket.c | 2 +- + net/sctp/tsnmap.c | 2 +- + samples/firmware_class/firmware_sample_driver.c | 2 +- + samples/kobject/kobject-example.c | 4 +- + samples/kobject/kset-example.c | 4 +- + samples/markers/marker-example.c | 4 +- + samples/tracepoints/tracepoint-probe-sample.c | 4 +- + samples/tracepoints/tracepoint-probe-sample2.c | 4 +- + samples/tracepoints/tracepoint-sample.c | 4 +- + scripts/checkpatch.pl | 172 +- + scripts/markup_oops.pl | 162 + + security/commoncap.c | 29 +- + security/keys/keyctl.c | 2 +- + security/security.c | 26 +- + security/selinux/Kconfig | 27 - + security/selinux/avc.c | 16 +- + security/selinux/hooks.c | 22 +- + security/selinux/include/avc_ss.h | 4 +- + security/selinux/selinuxfs.c | 16 +- + security/selinux/ss/context.h | 2 +- + security/smack/smack.h | 31 +- + security/smack/smack_access.c | 28 +- + security/smack/smack_lsm.c | 310 +- + security/smack/smackfs.c | 369 +- + sound/arm/pxa2xx-ac97-lib.c | 25 +- + sound/core/sound.c | 4 + + sound/oss/aedsp16.c | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 4 +- + sound/soc/codecs/Kconfig | 20 +- + sound/soc/codecs/twl4030.c | 118 +- + sound/soc/davinci/davinci-evm.c | 19 +- + sound/soc/omap/Kconfig | 1 + + sound/soc/omap/omap3pandora.c | 13 + + sound/soc/soc-core.c | 107 + + sound/soc/soc-dapm.c | 197 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + 2044 files changed, 526888 insertions(+), 45396 deletions(-) + create mode 100644 Documentation/blackfin/bfin-gpio-notes.txt + create mode 100644 Documentation/hwmon/f71882fg + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 Documentation/input/walkera0701.txt + create mode 100644 arch/alpha/include/asm/swab.h + create mode 100644 arch/arm/include/asm/swab.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_rotary.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_trkball.h + create mode 100644 arch/avr32/boards/hammerhead/Kconfig + create mode 100644 arch/avr32/boards/hammerhead/Makefile + create mode 100644 arch/avr32/boards/hammerhead/flash.c + create mode 100644 arch/avr32/boards/hammerhead/flash.h + create mode 100644 arch/avr32/boards/hammerhead/setup.c + create mode 100644 arch/avr32/configs/hammerhead_defconfig + create mode 100644 arch/avr32/include/asm/swab.h + create mode 100644 arch/avr32/include/asm/syscalls.h + create mode 100644 arch/blackfin/configs/BF518F-EZBRD_defconfig + create mode 100644 arch/blackfin/configs/BF538-EZKIT_defconfig + create mode 100644 arch/blackfin/include/asm/bfin_sdh.h + delete mode 100644 arch/blackfin/include/asm/cplb-mpu.h + create mode 100644 arch/blackfin/include/asm/cpu.h + create mode 100644 arch/blackfin/include/asm/ipipe.h + create mode 100644 arch/blackfin/include/asm/ipipe_base.h + rename arch/blackfin/{mach-bf527/include/mach => include/asm}/mem_init.h (67%) + create mode 100644 arch/blackfin/include/asm/mutex-dec.h + create mode 100644 arch/blackfin/include/asm/pda.h + create mode 100644 arch/blackfin/include/asm/rwlock.h + create mode 100644 arch/blackfin/include/asm/smp.h + create mode 100644 arch/blackfin/include/asm/spinlock_types.h + create mode 100644 arch/blackfin/include/asm/swab.h + create mode 100644 arch/blackfin/include/asm/xor.h + delete mode 100644 arch/blackfin/kernel/cplb-mpu/cplbinfo.c + delete mode 100644 arch/blackfin/kernel/cplb-nompu/cplbhdlr.S + delete mode 100644 arch/blackfin/kernel/cplb-nompu/cplbinfo.c + delete mode 100644 arch/blackfin/kernel/cplb-nompu/cplbmgr.S + create mode 100644 arch/blackfin/kernel/cplb-nompu/cplbmgr.c + create mode 100644 arch/blackfin/kernel/cplbinfo.c + create mode 100644 arch/blackfin/kernel/ipipe.c + create mode 100644 arch/blackfin/kernel/kgdb_test.c + create mode 100644 arch/blackfin/kernel/mcount.S + create mode 100644 arch/blackfin/lib/muldi3.S + delete mode 100644 arch/blackfin/lib/muldi3.c + create mode 100644 arch/blackfin/mach-bf518/Kconfig + create mode 100644 arch/blackfin/mach-bf518/Makefile + create mode 100644 arch/blackfin/mach-bf518/boards/Kconfig + create mode 100644 arch/blackfin/mach-bf518/boards/Makefile + create mode 100644 arch/blackfin/mach-bf518/boards/ezbrd.c + create mode 100644 arch/blackfin/mach-bf518/dma.c + create mode 100644 arch/blackfin/mach-bf518/include/mach/anomaly.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/bf518.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/blackfin.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF512.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF514.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF516.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF518.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/defBF512.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/defBF514.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/defBF516.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/defBF518.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/defBF51x_base.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/dma.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/gpio.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/irq.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/mem_map.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/portmux.h + create mode 100644 arch/blackfin/mach-bf518/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf527/head.S + delete mode 100644 arch/blackfin/mach-bf527/include/mach/bfin_sir.h + create mode 100644 arch/blackfin/mach-bf527/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf533/head.S + delete mode 100644 arch/blackfin/mach-bf533/include/mach/bfin_sir.h + create mode 100644 arch/blackfin/mach-bf533/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/mem_init.h + delete mode 100644 arch/blackfin/mach-bf537/head.S + delete mode 100644 arch/blackfin/mach-bf537/include/mach/bfin_sir.h + create mode 100644 arch/blackfin/mach-bf537/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf537/include/mach/mem_init.h + create mode 100644 arch/blackfin/mach-bf538/Kconfig + create mode 100644 arch/blackfin/mach-bf538/Makefile + create mode 100644 arch/blackfin/mach-bf538/boards/Kconfig + create mode 100644 arch/blackfin/mach-bf538/boards/Makefile + create mode 100644 arch/blackfin/mach-bf538/boards/ezkit.c + create mode 100644 arch/blackfin/mach-bf538/dma.c + create mode 100644 arch/blackfin/mach-bf538/include/mach/anomaly.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/bf538.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/blackfin.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/cdefBF538.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/cdefBF539.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/defBF539.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/dma.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/gpio.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/irq.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/mem_map.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/portmux.h + create mode 100644 arch/blackfin/mach-bf538/ints-priority.c + delete mode 100644 arch/blackfin/mach-bf548/head.S + delete mode 100644 arch/blackfin/mach-bf548/include/mach/bfin_sir.h + delete mode 100644 arch/blackfin/mach-bf548/include/mach/mem_init.h + create mode 100644 arch/blackfin/mach-bf561/atomic.S + delete mode 100644 arch/blackfin/mach-bf561/head.S + delete mode 100644 arch/blackfin/mach-bf561/include/mach/bfin_sir.h + create mode 100644 arch/blackfin/mach-bf561/include/mach/gpio.h + delete mode 100644 arch/blackfin/mach-bf561/include/mach/mem_init.h + create mode 100644 arch/blackfin/mach-bf561/include/mach/smp.h + create mode 100644 arch/blackfin/mach-bf561/secondary.S + create mode 100644 arch/blackfin/mach-bf561/smp.c + create mode 100644 arch/blackfin/mach-common/cache-c.c + create mode 100644 arch/blackfin/mach-common/clocks-init.c + create mode 100644 arch/blackfin/mach-common/smp.c + create mode 100644 arch/blackfin/oprofile/bfin_oprofile.c + delete mode 100644 arch/blackfin/oprofile/common.c + delete mode 100644 arch/blackfin/oprofile/op_blackfin.h + delete mode 100644 arch/blackfin/oprofile/op_model_bf533.c + delete mode 100644 arch/blackfin/oprofile/timer_int.c + create mode 100644 arch/h8300/include/asm/swab.h + create mode 100644 arch/ia64/include/asm/swab.h + create mode 100644 arch/m68knommu/include/asm/swab.h + create mode 100644 arch/mips/include/asm/swab.h + create mode 100644 arch/powerpc/include/asm/swab.h + delete mode 100644 arch/s390/include/asm/s390_rdev.h + create mode 100644 arch/s390/include/asm/swab.h + create mode 100644 arch/sh/include/asm/swab.h + create mode 100644 arch/sparc/include/asm/swab.h + create mode 100644 arch/x86/include/asm/swab.h + delete mode 100644 arch/x86/include/asm/unwind.h + create mode 100644 arch/xtensa/include/asm/Kbuild + rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) + create mode 100644 arch/xtensa/include/asm/byteorder.h + rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) + rename include/asm-xtensa/byteorder.h => arch/xtensa/include/asm/swab.h (72%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (80%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) + create mode 100644 arch/xtensa/platforms/xt2000/Makefile + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xt2000/setup.c + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) + create mode 100644 drivers/edac/i5400_edac.c + create mode 100644 drivers/gpu/drm/i915/intel_hdmi.c + create mode 100644 drivers/hwmon/ltc4245.c + create mode 100644 drivers/ide/it8172.c + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h + create mode 100644 drivers/input/joystick/maplecontrol.c + create mode 100644 drivers/input/joystick/walkera0701.c + create mode 100644 drivers/input/keyboard/pxa930_rotary.c + create mode 100644 drivers/input/mouse/pxa930_trkball.c + create mode 100644 drivers/input/touchscreen/da9034-ts.c + create mode 100644 drivers/input/touchscreen/tsc2007.c + create mode 100644 drivers/input/touchscreen/wacom_w8001.c + create mode 100644 drivers/rtc/rtc-au1xxx.c + create mode 100644 drivers/rtc/rtc-mv.c + create mode 100644 drivers/rtc/rtc-pxa.c + create mode 100644 drivers/rtc/rtc-tx4939.c + delete mode 100644 drivers/s390/s390_rdev.c + create mode 100644 drivers/spi/spi_gpio.c + create mode 100644 drivers/staging/agnx/Kconfig + create mode 100644 drivers/staging/agnx/Makefile + create mode 100644 drivers/staging/agnx/TODO + create mode 100644 drivers/staging/agnx/agnx.h + create mode 100644 drivers/staging/agnx/debug.h + create mode 100644 drivers/staging/agnx/pci.c + create mode 100644 drivers/staging/agnx/phy.c + create mode 100644 drivers/staging/agnx/phy.h + create mode 100644 drivers/staging/agnx/rf.c + create mode 100644 drivers/staging/agnx/sta.c + create mode 100644 drivers/staging/agnx/sta.h + create mode 100644 drivers/staging/agnx/table.c + create mode 100644 drivers/staging/agnx/table.h + create mode 100644 drivers/staging/agnx/xmit.c + create mode 100644 drivers/staging/agnx/xmit.h + create mode 100644 drivers/staging/altpciechdma/Kconfig + create mode 100644 drivers/staging/altpciechdma/Makefile + create mode 100644 drivers/staging/altpciechdma/TODO + create mode 100644 drivers/staging/altpciechdma/altpciechdma.c + create mode 100644 drivers/staging/android/Kconfig + create mode 100644 drivers/staging/android/Makefile + create mode 100644 drivers/staging/android/TODO + create mode 100644 drivers/staging/android/binder.c + create mode 100644 drivers/staging/android/binder.h + create mode 100644 drivers/staging/android/logger.c + create mode 100644 drivers/staging/android/logger.h + create mode 100644 drivers/staging/android/lowmemorykiller.c + create mode 100644 drivers/staging/android/ram_console.c + create mode 100644 drivers/staging/android/timed_gpio.c + create mode 100644 drivers/staging/android/timed_gpio.h + create mode 100644 drivers/staging/asus_oled/Kconfig + create mode 100644 drivers/staging/asus_oled/Makefile + create mode 100644 drivers/staging/asus_oled/README + create mode 100644 drivers/staging/asus_oled/TODO + create mode 100644 drivers/staging/asus_oled/asus_oled.c + create mode 100644 drivers/staging/asus_oled/linux.txt + create mode 100644 drivers/staging/asus_oled/linux_f.txt + create mode 100644 drivers/staging/asus_oled/linux_fr.txt + create mode 100644 drivers/staging/asus_oled/tux.txt + create mode 100644 drivers/staging/asus_oled/tux_r.txt + create mode 100644 drivers/staging/asus_oled/tux_r2.txt + create mode 100644 drivers/staging/asus_oled/zig.txt + create mode 100644 drivers/staging/benet/Kconfig + create mode 100644 drivers/staging/benet/MAINTAINERS + create mode 100644 drivers/staging/benet/Makefile + create mode 100644 drivers/staging/benet/TODO + create mode 100644 drivers/staging/benet/asyncmesg.h + create mode 100644 drivers/staging/benet/be_cm.h + create mode 100644 drivers/staging/benet/be_common.h + create mode 100644 drivers/staging/benet/be_ethtool.c + create mode 100644 drivers/staging/benet/be_init.c + create mode 100644 drivers/staging/benet/be_int.c + create mode 100644 drivers/staging/benet/be_netif.c + create mode 100644 drivers/staging/benet/benet.h + create mode 100644 drivers/staging/benet/bestatus.h + create mode 100644 drivers/staging/benet/cev.h + create mode 100644 drivers/staging/benet/cq.c + create mode 100644 drivers/staging/benet/descriptors.h + create mode 100644 drivers/staging/benet/doorbells.h + create mode 100644 drivers/staging/benet/ep.h + create mode 100644 drivers/staging/benet/eq.c + create mode 100644 drivers/staging/benet/eth.c + create mode 100644 drivers/staging/benet/etx_context.h + create mode 100644 drivers/staging/benet/funcobj.c + create mode 100644 drivers/staging/benet/fwcmd_common.h + create mode 100644 drivers/staging/benet/fwcmd_common_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_eth_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_hdr_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_mcc.h + create mode 100644 drivers/staging/benet/fwcmd_opcodes.h + create mode 100644 drivers/staging/benet/fwcmd_types_bmap.h + create mode 100644 drivers/staging/benet/host_struct.h + create mode 100644 drivers/staging/benet/hwlib.h + create mode 100644 drivers/staging/benet/mpu.c + create mode 100644 drivers/staging/benet/mpu.h + create mode 100644 drivers/staging/benet/mpu_context.h + create mode 100644 drivers/staging/benet/pcicfg.h + create mode 100644 drivers/staging/benet/post_codes.h + create mode 100644 drivers/staging/benet/regmap.h + create mode 100644 drivers/staging/comedi/Kconfig + create mode 100644 drivers/staging/comedi/Makefile + create mode 100644 drivers/staging/comedi/TODO + create mode 100644 drivers/staging/comedi/comedi.h + create mode 100644 drivers/staging/comedi/comedi_compat32.c + create mode 100644 drivers/staging/comedi/comedi_compat32.h + create mode 100644 drivers/staging/comedi/comedi_fops.c + create mode 100644 drivers/staging/comedi/comedi_fops.h + create mode 100644 drivers/staging/comedi/comedi_ksyms.c + create mode 100644 drivers/staging/comedi/comedi_rt.h + create mode 100644 drivers/staging/comedi/comedidev.h + create mode 100644 drivers/staging/comedi/comedilib.h + create mode 100644 drivers/staging/comedi/drivers.c + create mode 100644 drivers/staging/comedi/drivers/Makefile + create mode 100644 drivers/staging/comedi/drivers/comedi_bond.c + create mode 100644 drivers/staging/comedi/drivers/comedi_fc.c + create mode 100644 drivers/staging/comedi/drivers/comedi_fc.h + create mode 100644 drivers/staging/comedi/drivers/comedi_parport.c + create mode 100644 drivers/staging/comedi/drivers/comedi_pci.h + create mode 100644 drivers/staging/comedi/drivers/comedi_test.c + create mode 100644 drivers/staging/comedi/drivers/dt9812.c + create mode 100644 drivers/staging/comedi/drivers/icp_multi.c + create mode 100644 drivers/staging/comedi/drivers/icp_multi.h + create mode 100644 drivers/staging/comedi/drivers/me4000.c + create mode 100644 drivers/staging/comedi/drivers/me4000.h + create mode 100644 drivers/staging/comedi/drivers/me_daq.c + create mode 100644 drivers/staging/comedi/drivers/mite.c + create mode 100644 drivers/staging/comedi/drivers/mite.h + create mode 100644 drivers/staging/comedi/drivers/plx9080.h + create mode 100644 drivers/staging/comedi/drivers/rtd520.c + create mode 100644 drivers/staging/comedi/drivers/rtd520.h + create mode 100644 drivers/staging/comedi/drivers/s626.c + create mode 100644 drivers/staging/comedi/drivers/s626.h + create mode 100644 drivers/staging/comedi/drivers/usbdux.c + create mode 100644 drivers/staging/comedi/drivers/usbduxfast.c + create mode 100644 drivers/staging/comedi/interrupt.h + create mode 100644 drivers/staging/comedi/kcomedilib/Makefile + create mode 100644 drivers/staging/comedi/kcomedilib/data.c + create mode 100644 drivers/staging/comedi/kcomedilib/dio.c + create mode 100644 drivers/staging/comedi/kcomedilib/get.c + create mode 100644 drivers/staging/comedi/kcomedilib/kcomedilib_main.c + create mode 100644 drivers/staging/comedi/kcomedilib/ksyms.c + create mode 100644 drivers/staging/comedi/pci_ids.h + create mode 100644 drivers/staging/comedi/proc.c + create mode 100644 drivers/staging/comedi/range.c + create mode 100644 drivers/staging/comedi/rt.c + create mode 100644 drivers/staging/comedi/rt_pend_tq.c + create mode 100644 drivers/staging/comedi/rt_pend_tq.h + create mode 100644 drivers/staging/comedi/wrapper.h + create mode 100644 drivers/staging/epl/Benchmark.h + create mode 100644 drivers/staging/epl/Debug.h + create mode 100644 drivers/staging/epl/Edrv8139.c + create mode 100644 drivers/staging/epl/EdrvFec.h + create mode 100644 drivers/staging/epl/EdrvFec5282.h + create mode 100644 drivers/staging/epl/EdrvSim.h + create mode 100644 drivers/staging/epl/Epl.h + create mode 100644 drivers/staging/epl/EplAmi.h + create mode 100644 drivers/staging/epl/EplApiGeneric.c + create mode 100644 drivers/staging/epl/EplApiLinux.h + create mode 100644 drivers/staging/epl/EplApiLinuxKernel.c + create mode 100644 drivers/staging/epl/EplApiProcessImage.c + create mode 100644 drivers/staging/epl/EplCfg.h + create mode 100644 drivers/staging/epl/EplDef.h + create mode 100644 drivers/staging/epl/EplDll.h + create mode 100644 drivers/staging/epl/EplDllCal.h + create mode 100644 drivers/staging/epl/EplDllk.c + create mode 100644 drivers/staging/epl/EplDllkCal.c + create mode 100644 drivers/staging/epl/EplDlluCal.c + create mode 100644 drivers/staging/epl/EplErrDef.h + create mode 100644 drivers/staging/epl/EplErrorHandlerk.c + create mode 100644 drivers/staging/epl/EplEvent.h + create mode 100644 drivers/staging/epl/EplEventk.c + create mode 100644 drivers/staging/epl/EplEventu.c + create mode 100644 drivers/staging/epl/EplFrame.h + create mode 100644 drivers/staging/epl/EplIdentu.c + create mode 100644 drivers/staging/epl/EplInc.h + create mode 100644 drivers/staging/epl/EplInstDef.h + create mode 100644 drivers/staging/epl/EplLed.h + create mode 100644 drivers/staging/epl/EplNmt.h + create mode 100644 drivers/staging/epl/EplNmtCnu.c + create mode 100644 drivers/staging/epl/EplNmtMnu.c + create mode 100644 drivers/staging/epl/EplNmtk.c + create mode 100644 drivers/staging/epl/EplNmtkCal.c + create mode 100644 drivers/staging/epl/EplNmtu.c + create mode 100644 drivers/staging/epl/EplNmtuCal.c + create mode 100644 drivers/staging/epl/EplObd.c + create mode 100644 drivers/staging/epl/EplObd.h + create mode 100644 drivers/staging/epl/EplObdMacro.h + create mode 100644 drivers/staging/epl/EplObdkCal.c + create mode 100644 drivers/staging/epl/EplObdu.c + create mode 100644 drivers/staging/epl/EplObduCal.c + create mode 100644 drivers/staging/epl/EplObjDef.h + create mode 100644 drivers/staging/epl/EplPdo.h + create mode 100644 drivers/staging/epl/EplPdok.c + create mode 100644 drivers/staging/epl/EplPdokCal.c + create mode 100644 drivers/staging/epl/EplPdou.c + create mode 100644 drivers/staging/epl/EplSdo.h + create mode 100644 drivers/staging/epl/EplSdoAc.h + create mode 100644 drivers/staging/epl/EplSdoAsndu.c + create mode 100644 drivers/staging/epl/EplSdoAsySequ.c + create mode 100644 drivers/staging/epl/EplSdoComu.c + create mode 100644 drivers/staging/epl/EplSdoUdpu.c + create mode 100644 drivers/staging/epl/EplStatusu.c + create mode 100644 drivers/staging/epl/EplTarget.h + create mode 100644 drivers/staging/epl/EplTimer.h + create mode 100644 drivers/staging/epl/EplTimeruLinuxKernel.c + create mode 100644 drivers/staging/epl/EplTimeruNull.c + create mode 100644 drivers/staging/epl/EplTimeruWin32.c + create mode 100644 drivers/staging/epl/EplVersion.h + create mode 100644 drivers/staging/epl/Kconfig + create mode 100644 drivers/staging/epl/Makefile + create mode 100644 drivers/staging/epl/SharedBuff.c + create mode 100644 drivers/staging/epl/SharedBuff.h + create mode 100644 drivers/staging/epl/ShbIpc-LinuxKernel.c + create mode 100644 drivers/staging/epl/ShbIpc-Win32.c + create mode 100644 drivers/staging/epl/ShbIpc.h + create mode 100644 drivers/staging/epl/ShbLinuxKernel.h + create mode 100644 drivers/staging/epl/SocketLinuxKernel.c + create mode 100644 drivers/staging/epl/SocketLinuxKernel.h + create mode 100644 drivers/staging/epl/TimerHighReskX86.c + create mode 100644 drivers/staging/epl/VirtualEthernetLinux.c + create mode 100644 drivers/staging/epl/amix86.c + create mode 100644 drivers/staging/epl/demo_main.c + create mode 100644 drivers/staging/epl/edrv.h + create mode 100644 drivers/staging/epl/global.h + create mode 100644 drivers/staging/epl/kernel/EplDllk.h + create mode 100644 drivers/staging/epl/kernel/EplDllkCal.h + create mode 100644 drivers/staging/epl/kernel/EplErrorHandlerk.h + create mode 100644 drivers/staging/epl/kernel/EplEventk.h + create mode 100644 drivers/staging/epl/kernel/EplNmtk.h + create mode 100644 drivers/staging/epl/kernel/EplNmtkCal.h + create mode 100644 drivers/staging/epl/kernel/EplObdk.h + create mode 100644 drivers/staging/epl/kernel/EplObdkCal.h + create mode 100644 drivers/staging/epl/kernel/EplPdok.h + create mode 100644 drivers/staging/epl/kernel/EplPdokCal.h + create mode 100644 drivers/staging/epl/kernel/EplTimerHighResk.h + create mode 100644 drivers/staging/epl/kernel/EplTimerk.h + create mode 100644 drivers/staging/epl/kernel/VirtualEthernet.h + create mode 100644 drivers/staging/epl/proc_fs.c + create mode 100644 drivers/staging/epl/proc_fs.h + create mode 100644 drivers/staging/epl/user/EplCfgMau.h + create mode 100644 drivers/staging/epl/user/EplDllu.h + create mode 100644 drivers/staging/epl/user/EplDlluCal.h + create mode 100644 drivers/staging/epl/user/EplEventu.h + create mode 100644 drivers/staging/epl/user/EplIdentu.h + create mode 100644 drivers/staging/epl/user/EplLedu.h + create mode 100644 drivers/staging/epl/user/EplNmtCnu.h + create mode 100644 drivers/staging/epl/user/EplNmtMnu.h + create mode 100644 drivers/staging/epl/user/EplNmtu.h + create mode 100644 drivers/staging/epl/user/EplNmtuCal.h + create mode 100644 drivers/staging/epl/user/EplObdu.h + create mode 100644 drivers/staging/epl/user/EplObduCal.h + create mode 100644 drivers/staging/epl/user/EplPdou.h + create mode 100644 drivers/staging/epl/user/EplSdoAsndu.h + create mode 100644 drivers/staging/epl/user/EplSdoAsySequ.h + create mode 100644 drivers/staging/epl/user/EplSdoComu.h + create mode 100644 drivers/staging/epl/user/EplSdoUdpu.h + create mode 100644 drivers/staging/epl/user/EplStatusu.h + create mode 100644 drivers/staging/epl/user/EplTimeru.h + create mode 100644 drivers/staging/frontier/Kconfig + create mode 100644 drivers/staging/frontier/Makefile + create mode 100644 drivers/staging/frontier/README + create mode 100644 drivers/staging/frontier/TODO + create mode 100644 drivers/staging/frontier/alphatrack.c + create mode 100644 drivers/staging/frontier/alphatrack.h + create mode 100644 drivers/staging/frontier/frontier_compat.h + create mode 100644 drivers/staging/frontier/surface_sysfs.h + create mode 100644 drivers/staging/frontier/tranzport.c + create mode 100644 drivers/staging/go7007/go7007.txt + create mode 100644 drivers/staging/go7007/s2250-board.c + create mode 100644 drivers/staging/go7007/s2250-loader.c + create mode 100644 drivers/staging/meilhaus/Kconfig + create mode 100644 drivers/staging/meilhaus/Makefile + create mode 100644 drivers/staging/meilhaus/TODO + create mode 100644 drivers/staging/meilhaus/me0600_device.c + create mode 100644 drivers/staging/meilhaus/me0600_device.h + create mode 100644 drivers/staging/meilhaus/me0600_dio.c + create mode 100644 drivers/staging/meilhaus/me0600_dio.h + create mode 100644 drivers/staging/meilhaus/me0600_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_optoi.c + create mode 100644 drivers/staging/meilhaus/me0600_optoi.h + create mode 100644 drivers/staging/meilhaus/me0600_optoi_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_relay.c + create mode 100644 drivers/staging/meilhaus/me0600_relay.h + create mode 100644 drivers/staging/meilhaus/me0600_relay_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_ttli.c + create mode 100644 drivers/staging/meilhaus/me0600_ttli.h + create mode 100644 drivers/staging/meilhaus/me0600_ttli_reg.h + create mode 100644 drivers/staging/meilhaus/me0900_device.c + create mode 100644 drivers/staging/meilhaus/me0900_device.h + create mode 100644 drivers/staging/meilhaus/me0900_di.c + create mode 100644 drivers/staging/meilhaus/me0900_di.h + create mode 100644 drivers/staging/meilhaus/me0900_do.c + create mode 100644 drivers/staging/meilhaus/me0900_do.h + create mode 100644 drivers/staging/meilhaus/me0900_reg.h + create mode 100644 drivers/staging/meilhaus/me1000_device.c + create mode 100644 drivers/staging/meilhaus/me1000_device.h + create mode 100644 drivers/staging/meilhaus/me1000_dio.c + create mode 100644 drivers/staging/meilhaus/me1000_dio.h + create mode 100644 drivers/staging/meilhaus/me1000_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me1400_device.c + create mode 100644 drivers/staging/meilhaus/me1400_device.h + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me1600_ao.c + create mode 100644 drivers/staging/meilhaus/me1600_ao.h + create mode 100644 drivers/staging/meilhaus/me1600_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me1600_device.c + create mode 100644 drivers/staging/meilhaus/me1600_device.h + create mode 100644 drivers/staging/meilhaus/me4600_ai.c + create mode 100644 drivers/staging/meilhaus/me4600_ai.h + create mode 100644 drivers/staging/meilhaus/me4600_ai_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_ao.c + create mode 100644 drivers/staging/meilhaus/me4600_ao.h + create mode 100644 drivers/staging/meilhaus/me4600_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_device.c + create mode 100644 drivers/staging/meilhaus/me4600_device.h + create mode 100644 drivers/staging/meilhaus/me4600_di.c + create mode 100644 drivers/staging/meilhaus/me4600_di.h + create mode 100644 drivers/staging/meilhaus/me4600_dio.c + create mode 100644 drivers/staging/meilhaus/me4600_dio.h + create mode 100644 drivers/staging/meilhaus/me4600_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_do.c + create mode 100644 drivers/staging/meilhaus/me4600_do.h + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_ao.c + create mode 100644 drivers/staging/meilhaus/me6000_ao.h + create mode 100644 drivers/staging/meilhaus/me6000_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_device.c + create mode 100644 drivers/staging/meilhaus/me6000_device.h + create mode 100644 drivers/staging/meilhaus/me6000_dio.c + create mode 100644 drivers/staging/meilhaus/me6000_dio.h + create mode 100644 drivers/staging/meilhaus/me6000_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_device.c + create mode 100644 drivers/staging/meilhaus/me8100_device.h + create mode 100644 drivers/staging/meilhaus/me8100_di.c + create mode 100644 drivers/staging/meilhaus/me8100_di.h + create mode 100644 drivers/staging/meilhaus/me8100_di_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_do.c + create mode 100644 drivers/staging/meilhaus/me8100_do.h + create mode 100644 drivers/staging/meilhaus/me8100_do_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_device.c + create mode 100644 drivers/staging/meilhaus/me8200_device.h + create mode 100644 drivers/staging/meilhaus/me8200_di.c + create mode 100644 drivers/staging/meilhaus/me8200_di.h + create mode 100644 drivers/staging/meilhaus/me8200_di_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_dio.c + create mode 100644 drivers/staging/meilhaus/me8200_dio.h + create mode 100644 drivers/staging/meilhaus/me8200_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_do.c + create mode 100644 drivers/staging/meilhaus/me8200_do.h + create mode 100644 drivers/staging/meilhaus/me8200_do_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_reg.h + create mode 100644 drivers/staging/meilhaus/me8254.c + create mode 100644 drivers/staging/meilhaus/me8254.h + create mode 100644 drivers/staging/meilhaus/me8254_reg.h + create mode 100644 drivers/staging/meilhaus/me8255.c + create mode 100644 drivers/staging/meilhaus/me8255.h + create mode 100644 drivers/staging/meilhaus/me8255_reg.h + create mode 100644 drivers/staging/meilhaus/mecirc_buf.h + create mode 100644 drivers/staging/meilhaus/mecommon.h + create mode 100644 drivers/staging/meilhaus/medebug.h + create mode 100644 drivers/staging/meilhaus/medefines.h + create mode 100644 drivers/staging/meilhaus/medevice.c + create mode 100644 drivers/staging/meilhaus/medevice.h + create mode 100644 drivers/staging/meilhaus/medlist.c + create mode 100644 drivers/staging/meilhaus/medlist.h + create mode 100644 drivers/staging/meilhaus/medlock.c + create mode 100644 drivers/staging/meilhaus/medlock.h + create mode 100644 drivers/staging/meilhaus/medriver.h + create mode 100644 drivers/staging/meilhaus/medummy.c + create mode 100644 drivers/staging/meilhaus/medummy.h + create mode 100644 drivers/staging/meilhaus/meerror.h + create mode 100644 drivers/staging/meilhaus/mefirmware.c + create mode 100644 drivers/staging/meilhaus/mefirmware.h + create mode 100644 drivers/staging/meilhaus/meids.h + create mode 100644 drivers/staging/meilhaus/meinternal.h + create mode 100644 drivers/staging/meilhaus/meioctl.h + create mode 100644 drivers/staging/meilhaus/memain.c + create mode 100644 drivers/staging/meilhaus/memain.h + create mode 100644 drivers/staging/meilhaus/meplx_reg.h + create mode 100644 drivers/staging/meilhaus/meslist.c + create mode 100644 drivers/staging/meilhaus/meslist.h + create mode 100644 drivers/staging/meilhaus/meslock.c + create mode 100644 drivers/staging/meilhaus/meslock.h + create mode 100644 drivers/staging/meilhaus/mesubdevice.c + create mode 100644 drivers/staging/meilhaus/mesubdevice.h + create mode 100644 drivers/staging/meilhaus/metempl_device.c + create mode 100644 drivers/staging/meilhaus/metempl_device.h + create mode 100644 drivers/staging/meilhaus/metempl_sub.c + create mode 100644 drivers/staging/meilhaus/metempl_sub.h + create mode 100644 drivers/staging/meilhaus/metempl_sub_reg.h + create mode 100644 drivers/staging/meilhaus/metypes.h + create mode 100644 drivers/staging/mimio/Kconfig + create mode 100644 drivers/staging/mimio/Makefile + create mode 100644 drivers/staging/mimio/mimio.c + create mode 100644 drivers/staging/otus/80211core/amsdu.c + create mode 100644 drivers/staging/otus/80211core/cagg.c + create mode 100644 drivers/staging/otus/80211core/cagg.h + create mode 100644 drivers/staging/otus/80211core/ccmd.c + create mode 100644 drivers/staging/otus/80211core/cfunc.c + create mode 100644 drivers/staging/otus/80211core/cfunc.h + create mode 100644 drivers/staging/otus/80211core/chb.c + create mode 100644 drivers/staging/otus/80211core/cic.c + create mode 100644 drivers/staging/otus/80211core/cinit.c + create mode 100644 drivers/staging/otus/80211core/cmm.c + create mode 100644 drivers/staging/otus/80211core/cmmap.c + create mode 100644 drivers/staging/otus/80211core/cmmsta.c + create mode 100644 drivers/staging/otus/80211core/coid.c + create mode 100644 drivers/staging/otus/80211core/cprecomp.h + create mode 100644 drivers/staging/otus/80211core/cpsmgr.c + create mode 100644 drivers/staging/otus/80211core/cscanmgr.c + create mode 100644 drivers/staging/otus/80211core/ctkip.c + create mode 100644 drivers/staging/otus/80211core/ctxrx.c + create mode 100644 drivers/staging/otus/80211core/cwep.c + create mode 100644 drivers/staging/otus/80211core/cwm.c + create mode 100644 drivers/staging/otus/80211core/cwm.h + create mode 100644 drivers/staging/otus/80211core/freqctrl.c + create mode 100644 drivers/staging/otus/80211core/ledmgr.c + create mode 100644 drivers/staging/otus/80211core/performance.c + create mode 100644 drivers/staging/otus/80211core/performance.h + create mode 100644 drivers/staging/otus/80211core/pub_usb.h + create mode 100644 drivers/staging/otus/80211core/pub_zfi.h + create mode 100644 drivers/staging/otus/80211core/pub_zfw.h + create mode 100644 drivers/staging/otus/80211core/queue.c + create mode 100644 drivers/staging/otus/80211core/queue.h + create mode 100644 drivers/staging/otus/80211core/ratectrl.c + create mode 100644 drivers/staging/otus/80211core/ratectrl.h + create mode 100644 drivers/staging/otus/80211core/struct.h + create mode 100644 drivers/staging/otus/80211core/wlan.h + create mode 100644 drivers/staging/otus/Kconfig + create mode 100644 drivers/staging/otus/Makefile + create mode 100644 drivers/staging/otus/TODO + create mode 100644 drivers/staging/otus/apdbg.c + create mode 100644 drivers/staging/otus/athr_common.h + create mode 100644 drivers/staging/otus/hal/hpDKfwu.c + create mode 100644 drivers/staging/otus/hal/hpani.c + create mode 100644 drivers/staging/otus/hal/hpani.h + create mode 100644 drivers/staging/otus/hal/hpfw2.c + create mode 100644 drivers/staging/otus/hal/hpfwbu.c + create mode 100644 drivers/staging/otus/hal/hpfwspiu.c + create mode 100644 drivers/staging/otus/hal/hpfwu.c + create mode 100644 drivers/staging/otus/hal/hpfwu.c.drv_ba_resend + create mode 100644 drivers/staging/otus/hal/hpfwu_2k.c + create mode 100644 drivers/staging/otus/hal/hpfwu_BA.c + create mode 100644 drivers/staging/otus/hal/hpfwu_FB50_mdk.c + create mode 100644 drivers/staging/otus/hal/hpfwu_OTUS_RC.c + create mode 100644 drivers/staging/otus/hal/hpfwu_txstream.c + create mode 100644 drivers/staging/otus/hal/hpfwuinit.c + create mode 100644 drivers/staging/otus/hal/hpmain.c + create mode 100644 drivers/staging/otus/hal/hpreg.c + create mode 100644 drivers/staging/otus/hal/hpreg.h + create mode 100644 drivers/staging/otus/hal/hprw.c + create mode 100644 drivers/staging/otus/hal/hpusb.c + create mode 100644 drivers/staging/otus/hal/hpusb.h + create mode 100644 drivers/staging/otus/hal/otus.ini + create mode 100644 drivers/staging/otus/ioctl.c + create mode 100644 drivers/staging/otus/oal_dt.h + create mode 100644 drivers/staging/otus/oal_marc.h + create mode 100644 drivers/staging/otus/usbdrv.c + create mode 100644 drivers/staging/otus/usbdrv.h + create mode 100644 drivers/staging/otus/wrap_buf.c + create mode 100644 drivers/staging/otus/wrap_dbg.c + create mode 100644 drivers/staging/otus/wrap_ev.c + create mode 100644 drivers/staging/otus/wrap_mem.c + create mode 100644 drivers/staging/otus/wrap_mis.c + create mode 100644 drivers/staging/otus/wrap_pkt.c + create mode 100644 drivers/staging/otus/wrap_sec.c + create mode 100644 drivers/staging/otus/wrap_usb.c + create mode 100644 drivers/staging/otus/wwrap.c + create mode 100644 drivers/staging/otus/zdcompat.h + create mode 100644 drivers/staging/otus/zdusb.c + create mode 100644 drivers/staging/otus/zdusb.h + create mode 100644 drivers/staging/panel/Kconfig + create mode 100644 drivers/staging/panel/Makefile + create mode 100644 drivers/staging/panel/TODO + create mode 100644 drivers/staging/panel/lcd-panel-cgram.txt + create mode 100644 drivers/staging/panel/panel.c + create mode 100644 drivers/staging/rspiusb/Kconfig + create mode 100644 drivers/staging/rspiusb/Makefile + create mode 100644 drivers/staging/rspiusb/TODO + create mode 100644 drivers/staging/rspiusb/rspiusb.c + create mode 100644 drivers/staging/rspiusb/rspiusb.h + create mode 100644 drivers/staging/rt2860/2860_main_dev.c + create mode 100644 drivers/staging/rt2860/Kconfig + create mode 100644 drivers/staging/rt2860/Makefile + create mode 100644 drivers/staging/rt2860/TODO + create mode 100644 drivers/staging/rt2860/aironet.h + create mode 100644 drivers/staging/rt2860/ap.h + create mode 100644 drivers/staging/rt2860/chlist.h + create mode 100644 drivers/staging/rt2860/common/2860_rtmp_init.c + create mode 100644 drivers/staging/rt2860/common/action.c + create mode 100644 drivers/staging/rt2860/common/action.h + create mode 100644 drivers/staging/rt2860/common/ba_action.c + create mode 100644 drivers/staging/rt2860/common/cmm_data.c + create mode 100644 drivers/staging/rt2860/common/cmm_data_2860.c + create mode 100644 drivers/staging/rt2860/common/cmm_info.c + create mode 100644 drivers/staging/rt2860/common/cmm_sanity.c + create mode 100644 drivers/staging/rt2860/common/cmm_sync.c + create mode 100644 drivers/staging/rt2860/common/cmm_wpa.c + create mode 100644 drivers/staging/rt2860/common/dfs.c + create mode 100644 drivers/staging/rt2860/common/eeprom.c + create mode 100644 drivers/staging/rt2860/common/firmware.h + create mode 100644 drivers/staging/rt2860/common/md5.c + create mode 100644 drivers/staging/rt2860/common/mlme.c + create mode 100644 drivers/staging/rt2860/common/netif_block.c + create mode 100644 drivers/staging/rt2860/common/netif_block.h + create mode 100644 drivers/staging/rt2860/common/rtmp_init.c + create mode 100644 drivers/staging/rt2860/common/rtmp_tkip.c + create mode 100644 drivers/staging/rt2860/common/rtmp_wep.c + create mode 100644 drivers/staging/rt2860/common/spectrum.c + create mode 100644 drivers/staging/rt2860/config.mk + create mode 100644 drivers/staging/rt2860/dfs.h + create mode 100644 drivers/staging/rt2860/leap.h + create mode 100644 drivers/staging/rt2860/link_list.h + create mode 100644 drivers/staging/rt2860/md4.h + create mode 100644 drivers/staging/rt2860/md5.h + create mode 100644 drivers/staging/rt2860/mlme.h + create mode 100644 drivers/staging/rt2860/oid.h + create mode 100644 drivers/staging/rt2860/rt2860.h + create mode 100644 drivers/staging/rt2860/rt28xx.h + create mode 100644 drivers/staging/rt2860/rt_ate.c + create mode 100644 drivers/staging/rt2860/rt_ate.h + create mode 100644 drivers/staging/rt2860/rt_config.h + create mode 100644 drivers/staging/rt2860/rt_linux.c + create mode 100644 drivers/staging/rt2860/rt_linux.h + create mode 100644 drivers/staging/rt2860/rt_main_dev.c + create mode 100644 drivers/staging/rt2860/rt_profile.c + create mode 100644 drivers/staging/rt2860/rtmp.h + create mode 100644 drivers/staging/rt2860/rtmp_ckipmic.h + create mode 100644 drivers/staging/rt2860/rtmp_def.h + create mode 100644 drivers/staging/rt2860/rtmp_type.h + create mode 100644 drivers/staging/rt2860/spectrum.h + create mode 100644 drivers/staging/rt2860/spectrum_def.h + create mode 100644 drivers/staging/rt2860/sta/aironet.c + create mode 100644 drivers/staging/rt2860/sta/assoc.c + create mode 100644 drivers/staging/rt2860/sta/auth.c + create mode 100644 drivers/staging/rt2860/sta/auth_rsp.c + create mode 100644 drivers/staging/rt2860/sta/connect.c + create mode 100644 drivers/staging/rt2860/sta/dls.c + create mode 100644 drivers/staging/rt2860/sta/rtmp_data.c + create mode 100644 drivers/staging/rt2860/sta/sanity.c + create mode 100644 drivers/staging/rt2860/sta/sync.c + create mode 100644 drivers/staging/rt2860/sta/wpa.c + create mode 100644 drivers/staging/rt2860/sta_ioctl.c + create mode 100644 drivers/staging/rt2860/wpa.h + create mode 100644 drivers/staging/rt2870/2870_main_dev.c + create mode 100644 drivers/staging/rt2870/Kconfig + create mode 100644 drivers/staging/rt2870/Makefile + create mode 100644 drivers/staging/rt2870/TODO + create mode 100644 drivers/staging/rt2870/aironet.h + create mode 100644 drivers/staging/rt2870/ap.h + create mode 100644 drivers/staging/rt2870/chlist.h + create mode 100644 drivers/staging/rt2870/common/2870_rtmp_init.c + create mode 100644 drivers/staging/rt2870/common/action.c + create mode 100644 drivers/staging/rt2870/common/action.h + create mode 100644 drivers/staging/rt2870/common/ba_action.c + create mode 100644 drivers/staging/rt2870/common/cmm_data.c + create mode 100644 drivers/staging/rt2870/common/cmm_data_2870.c + create mode 100644 drivers/staging/rt2870/common/cmm_info.c + create mode 100644 drivers/staging/rt2870/common/cmm_sanity.c + create mode 100644 drivers/staging/rt2870/common/cmm_sync.c + create mode 100644 drivers/staging/rt2870/common/cmm_wpa.c + create mode 100644 drivers/staging/rt2870/common/dfs.c + create mode 100644 drivers/staging/rt2870/common/eeprom.c + create mode 100644 drivers/staging/rt2870/common/firmware.h + create mode 100644 drivers/staging/rt2870/common/md5.c + create mode 100644 drivers/staging/rt2870/common/mlme.c + create mode 100644 drivers/staging/rt2870/common/netif_block.c + create mode 100644 drivers/staging/rt2870/common/rtmp_init.c + create mode 100644 drivers/staging/rt2870/common/rtmp_tkip.c + create mode 100644 drivers/staging/rt2870/common/rtmp_wep.c + create mode 100644 drivers/staging/rt2870/common/rtusb_bulk.c + create mode 100644 drivers/staging/rt2870/common/rtusb_data.c + create mode 100644 drivers/staging/rt2870/common/rtusb_io.c + create mode 100644 drivers/staging/rt2870/common/spectrum.c + create mode 100644 drivers/staging/rt2870/dfs.h + create mode 100644 drivers/staging/rt2870/leap.h + create mode 100644 drivers/staging/rt2870/link_list.h + create mode 100644 drivers/staging/rt2870/md4.h + create mode 100644 drivers/staging/rt2870/md5.h + create mode 100644 drivers/staging/rt2870/mlme.h + create mode 100644 drivers/staging/rt2870/netif_block.h + create mode 100644 drivers/staging/rt2870/oid.h + create mode 100644 drivers/staging/rt2870/rt2870.h + create mode 100644 drivers/staging/rt2870/rt28xx.h + create mode 100644 drivers/staging/rt2870/rt_ate.c + create mode 100644 drivers/staging/rt2870/rt_ate.h + create mode 100644 drivers/staging/rt2870/rt_config.h + create mode 100644 drivers/staging/rt2870/rt_linux.c + create mode 100644 drivers/staging/rt2870/rt_linux.h + create mode 100644 drivers/staging/rt2870/rt_main_dev.c + create mode 100644 drivers/staging/rt2870/rt_profile.c + create mode 100644 drivers/staging/rt2870/rtmp.h + create mode 100644 drivers/staging/rt2870/rtmp_ckipmic.h + create mode 100644 drivers/staging/rt2870/rtmp_def.h + create mode 100644 drivers/staging/rt2870/rtmp_type.h + create mode 100644 drivers/staging/rt2870/spectrum.h + create mode 100644 drivers/staging/rt2870/spectrum_def.h + create mode 100644 drivers/staging/rt2870/sta/aironet.c + create mode 100644 drivers/staging/rt2870/sta/assoc.c + create mode 100644 drivers/staging/rt2870/sta/auth.c + create mode 100644 drivers/staging/rt2870/sta/auth_rsp.c + create mode 100644 drivers/staging/rt2870/sta/connect.c + create mode 100644 drivers/staging/rt2870/sta/dls.c + create mode 100644 drivers/staging/rt2870/sta/rtmp_data.c + create mode 100644 drivers/staging/rt2870/sta/sanity.c + create mode 100644 drivers/staging/rt2870/sta/sync.c + create mode 100644 drivers/staging/rt2870/sta/wpa.c + create mode 100644 drivers/staging/rt2870/sta_ioctl.c + create mode 100644 drivers/staging/rt2870/sta_ioctl.c.patch + create mode 100644 drivers/staging/rt2870/tmp60 + create mode 100644 drivers/staging/rt2870/tmp61 + create mode 100644 drivers/staging/rt2870/wpa.h + create mode 100644 drivers/staging/rtl8187se/Kconfig + create mode 100644 drivers/staging/rtl8187se/Makefile + create mode 100644 drivers/staging/rtl8187se/dot11d.h + create mode 100644 drivers/staging/rtl8187se/ieee80211.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/dot11d.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/dot11d.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_module.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/internal.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/rtl_crypto.h + create mode 100644 drivers/staging/rtl8187se/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8187se/r8180.h + create mode 100644 drivers/staging/rtl8187se/r8180_93cx6.c + create mode 100644 drivers/staging/rtl8187se/r8180_93cx6.h + create mode 100644 drivers/staging/rtl8187se/r8180_core.c + create mode 100644 drivers/staging/rtl8187se/r8180_dm.c + create mode 100644 drivers/staging/rtl8187se/r8180_dm.h + create mode 100644 drivers/staging/rtl8187se/r8180_gct.c + create mode 100644 drivers/staging/rtl8187se/r8180_gct.h + create mode 100644 drivers/staging/rtl8187se/r8180_hw.h + create mode 100644 drivers/staging/rtl8187se/r8180_max2820.c + create mode 100644 drivers/staging/rtl8187se/r8180_max2820.h + create mode 100644 drivers/staging/rtl8187se/r8180_pm.c + create mode 100644 drivers/staging/rtl8187se/r8180_pm.h + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.c + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.h + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8225z2.c + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.c + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.h + create mode 100644 drivers/staging/rtl8187se/r8180_sa2400.c + create mode 100644 drivers/staging/rtl8187se/r8180_sa2400.h + create mode 100644 drivers/staging/rtl8187se/r8180_wx.c + create mode 100644 drivers/staging/rtl8187se/r8180_wx.h + create mode 100644 drivers/staging/rtl8187se/r8185b_init.c + delete mode 100644 drivers/staging/winbond/adapter.h + create mode 100644 drivers/staging/winbond/common.h + create mode 100644 drivers/staging/winbond/core.h + delete mode 100644 drivers/staging/winbond/linux/common.h + delete mode 100644 drivers/staging/winbond/linux/sysdef.h + delete mode 100644 drivers/staging/winbond/linux/wb35rx_f.h + delete mode 100644 drivers/staging/winbond/linux/wb35tx_f.h + delete mode 100644 drivers/staging/winbond/linux/wbusb.c + delete mode 100644 drivers/staging/winbond/linux/wbusb_f.h + delete mode 100644 drivers/staging/winbond/rxisr.c + delete mode 100644 drivers/staging/winbond/sme_api.c + create mode 100644 drivers/staging/winbond/sysdef.h + rename drivers/staging/winbond/{linux => }/wb35reg.c (52%) + rename drivers/staging/winbond/{linux => }/wb35reg_f.h (95%) + rename drivers/staging/winbond/{linux => }/wb35reg_s.h (90%) + rename drivers/staging/winbond/{linux => }/wb35rx.c (77%) + create mode 100644 drivers/staging/winbond/wb35rx_f.h + rename drivers/staging/winbond/{linux => }/wb35rx_s.h (96%) + rename drivers/staging/winbond/{linux => }/wb35tx.c (73%) + create mode 100644 drivers/staging/winbond/wb35tx_f.h + rename drivers/staging/winbond/{linux => }/wb35tx_s.h (82%) + delete mode 100644 drivers/staging/winbond/wblinux.c + delete mode 100644 drivers/staging/winbond/wblinux_s.h + create mode 100644 drivers/staging/winbond/wbusb.c + rename drivers/staging/winbond/{linux => }/wbusb_s.h (68%) + delete mode 100644 drivers/staging/wlan-ng/hfa384x.c + delete mode 100644 drivers/staging/wlan-ng/p80211mod.c + delete mode 100644 drivers/staging/wlan-ng/prism2_cs.c + delete mode 100644 drivers/staging/wlan-ng/prism2_pci.c + delete mode 100644 drivers/staging/wlan-ng/prism2_plx.c + rename drivers/staging/wlan-ng/{prism2_usb.c => prism2usb.c} (84%) + delete mode 100644 drivers/staging/wlan-ng/version.h + create mode 100644 include/asm-frv/swab.h + create mode 100644 include/asm-m32r/swab.h + create mode 100644 include/asm-m68k/swab.h + create mode 100644 include/asm-mn10300/swab.h + delete mode 100644 include/asm-xtensa/Kbuild + rename {arch/avr32/include/asm => include/linux}/atmel-mci.h (91%) + delete mode 100644 include/linux/byteorder.h + delete mode 100644 include/linux/byteorder/swab.h + delete mode 100644 include/linux/byteorder/swabb.h + create mode 100644 include/linux/i2c/tsc2007.h + create mode 100644 include/linux/spi/spi_gpio.h + delete mode 100644 include/linux/unwind.h + delete mode 100644 mm/tiny-shmem.c + create mode 100644 scripts/markup_oops.pl +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 +Merge made by recursive. + arch/sparc/include/asm/timer_64.h | 2 +- + arch/sparc/include/asm/types.h | 2 +- + arch/sparc/kernel/ds.c | 34 +++++++++++++------------- + arch/sparc/kernel/iommu.c | 2 +- + arch/sparc/kernel/ldc.c | 23 +++++++++-------- + arch/sparc/kernel/mdesc.c | 14 +++++----- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/pci_common.c | 2 +- + arch/sparc/kernel/pci_msi.c | 4 +- + arch/sparc/kernel/pci_schizo.c | 2 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/power.c | 2 +- + arch/sparc/kernel/prom_irqtrans.c | 2 +- + arch/sparc/kernel/psycho_common.c | 14 +++++----- + arch/sparc/kernel/smp_64.c | 4 +- + arch/sparc/kernel/time_64.c | 12 ++++---- + arch/sparc/kernel/traps_64.c | 20 +++++++------- + arch/sparc/kernel/vio.c | 4 +- + arch/sparc/kernel/viohs.c | 6 +++- + arch/sparc/mm/fault_32.c | 3 +- + arch/sparc/mm/init_64.c | 48 ++++++++++++++++++++++-------------- + drivers/block/sunvdc.c | 8 +++--- + drivers/char/hw_random/n2-drv.c | 2 +- + drivers/net/sunvnet.c | 8 +++--- + drivers/sbus/char/display7seg.c | 2 +- + sound/sparc/cs4231.c | 2 +- + 27 files changed, 121 insertions(+), 107 deletions(-) +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. +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 +Auto-merged Makefile +Merge made by recursive. + Documentation/kbuild/kbuild.txt | 7 ++ + Documentation/kbuild/modules.txt | 4 +- + Makefile | 1 + + firmware/.gitignore | 1 - + firmware/Makefile | 10 +-- + include/linux/qnx4_fs.h | 4 +- + include/linux/qnxtypes.h | 5 +- + scripts/.gitignore | 1 + + scripts/Makefile | 3 +- + scripts/bootgraph.pl | 16 +++- + scripts/config | 154 ++++++++++++++++++++++++++++++++++++++ + {firmware => scripts}/ihex2fw.c | 0 + scripts/tags.sh | 18 +++- + 13 files changed, 198 insertions(+), 26 deletions(-) + create mode 100755 scripts/config + rename {firmware => scripts}/ihex2fw.c (100%) +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/storage/unusual_devs.h | 30 +++++++++++++++++++++++++++++- + 1 files changed, 29 insertions(+), 1 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Auto-merged drivers/char/tty_audit.c +CONFLICT (content): Merge conflict in drivers/char/tty_audit.c +Auto-merged drivers/char/tty_io.c +Auto-merged include/linux/audit.h +Auto-merged include/linux/tty.h +Auto-merged kernel/auditsc.c +CONFLICT (content): Merge conflict in kernel/auditsc.c +Auto-merged kernel/fork.c +Resolved 'drivers/char/tty_audit.c' using previous resolution. +Resolved 'kernel/auditsc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit eb88edf: Merge commit 'audit-current/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/configs/clps7500_defconfig +Merge made by recursive. + arch/arm/configs/clps7500_defconfig | 801 ----------------------------------- + arch/arm/mach-clps711x/edb7211-mm.c | 1 - + arch/arm/mach-clps711x/fortunet.c | 1 - + arch/arm/mach-footbridge/common.c | 7 + + arch/arm/mach-pxa/e750.c | 52 +++ + 5 files changed, 59 insertions(+), 803 deletions(-) + delete mode 100644 arch/arm/configs/clps7500_defconfig +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 +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Removed drivers/video/c2p.c +Merge made by recursive. + arch/m68k/amiga/amiints.c | 12 ++- + arch/m68k/amiga/cia.c | 4 +- + arch/m68k/amiga/config.c | 3 +- + arch/m68k/apollo/config.c | 7 +- + arch/m68k/atari/atakeyb.c | 10 +- + arch/m68k/atari/stdma.c | 5 +- + arch/m68k/atari/time.c | 5 +- + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/time.c | 3 +- + arch/m68k/kernel/.gitignore | 1 + + arch/m68k/kernel/entry.S | 2 +- + arch/m68k/kernel/setup.c | 11 +- + arch/m68k/kernel/signal.c | 15 +++ + arch/m68k/kernel/vmlinux-sun3.lds | 1 + + arch/m68k/mac/baboon.c | 3 +- + arch/m68k/mac/config.c | 12 -- + arch/m68k/mac/debug.c | 1 - + arch/m68k/mac/iop.c | 10 +- + arch/m68k/mac/macints.c | 15 +-- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mac/oss.c | 25 +++-- + arch/m68k/mac/psc.c | 12 ++- + arch/m68k/mac/via.c | 35 +++-- + arch/m68k/math-emu/fp_log.c | 1 - + arch/m68k/mm/init.c | 4 +- + arch/m68k/mm/motorola.c | 7 +- + arch/m68k/mvme147/config.c | 6 +- + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 3 - + arch/m68k/sun3/config.c | 8 +- + arch/m68k/sun3/mmu_emu.c | 1 - + arch/m68k/sun3/sun3ints.c | 9 +- + arch/m68k/sun3x/config.c | 1 - + drivers/block/amiflop.c | 40 +++---- + drivers/char/amiserial.c | 36 +++++- + drivers/char/ser_a2232.c | 12 ++- + drivers/char/vme_scc.c | 166 ++++++++++++++++++++----- + drivers/dio/dio-sysfs.c | 19 ++- + drivers/dio/dio.c | 18 +++- + drivers/video/Makefile | 4 +- + drivers/video/amifb.c | 6 +- + drivers/video/atafb.c | 112 +++++++---------- + drivers/video/c2p.c | 232 ----------------------------------- + drivers/video/c2p.h | 11 +- + drivers/video/c2p_core.h | 153 +++++++++++++++++++++++ + drivers/video/c2p_iplan2.c | 153 +++++++++++++++++++++++ + drivers/video/c2p_planar.c | 156 +++++++++++++++++++++++ + drivers/video/console/fbcon.c | 38 ------ + drivers/zorro/.gitignore | 2 + + drivers/zorro/zorro-sysfs.c | 20 ++-- + drivers/zorro/zorro.c | 23 +++- + drivers/zorro/zorro.h | 2 +- + include/asm-m68k/unistd.h | 4 +- + include/linux/dio.h | 2 +- + sound/oss/dmasound/dmasound_atari.c | 5 +- + sound/oss/dmasound/dmasound_q40.c | 16 ++- + 56 files changed, 912 insertions(+), 553 deletions(-) + create mode 100644 arch/m68k/kernel/.gitignore + delete mode 100644 drivers/video/c2p.c + create mode 100644 drivers/video/c2p_core.h + create mode 100644 drivers/video/c2p_iplan2.c + create mode 100644 drivers/video/c2p_planar.c + create mode 100644 drivers/zorro/.gitignore +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Merge made by recursive. + arch/parisc/Makefile | 2 +- + arch/parisc/include/asm/byteorder.h | 37 ++++++------------ + arch/parisc/include/asm/checksum.h | 2 +- + arch/parisc/include/asm/io.h | 12 +---- + arch/parisc/include/asm/mmu_context.h | 13 ++++-- + arch/parisc/include/asm/processor.h | 4 +- + arch/parisc/include/asm/uaccess.h | 2 + + arch/parisc/kernel/drivers.c | 40 ++++++++++++++++--- + arch/parisc/kernel/hpmc.S | 8 +++- + arch/parisc/kernel/irq.c | 11 +++-- + arch/parisc/kernel/pdc_cons.c | 2 +- + arch/parisc/kernel/perf.c | 4 +- + arch/parisc/kernel/processor.c | 68 +++++++++++++++++---------------- + arch/parisc/kernel/setup.c | 11 +---- + arch/parisc/kernel/smp.c | 32 +++++++-------- + arch/parisc/kernel/time.c | 4 +- + arch/parisc/kernel/topology.c | 4 +- + arch/parisc/kernel/traps.c | 9 +++- + arch/parisc/kernel/unwind.c | 2 +- + arch/parisc/lib/iomap.c | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + arch/parisc/mm/fault.c | 58 +++++++++++++++------------- + drivers/parisc/asp.c | 3 +- + drivers/parisc/ccio-dma.c | 4 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/hppb.c | 2 +- + drivers/parisc/lasi.c | 5 +- + drivers/parisc/lba_pci.c | 2 +- + drivers/parisc/sba_iommu.c | 9 +--- + drivers/parisc/wax.c | 3 +- + drivers/rtc/rtc-parisc.c | 3 +- + 31 files changed, 191 insertions(+), 173 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/board.txt | 32 ++++- + arch/powerpc/boot/dts/mpc836x_mds.dts | 43 +++++- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 19 ++- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 56 ++++--- + arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 43 +++-- + arch/powerpc/include/asm/qe.h | 37 ++++- + arch/powerpc/include/asm/qe_ic.h | 21 ++- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 9 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 81 +++++++++- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 6 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 - + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 - + arch/powerpc/platforms/83xx/mpc83xx.h | 1 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 7 + + arch/powerpc/platforms/85xx/smp.c | 1 + + arch/powerpc/platforms/Kconfig | 11 ++ + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/fsl_pci.c | 7 +- + arch/powerpc/sysdev/fsl_soc.h | 5 + + arch/powerpc/sysdev/qe_lib/Kconfig | 3 +- + arch/powerpc/sysdev/qe_lib/gpio.c | 195 ++++++++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.c | 155 +++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.h | 12 ++ + 26 files changed, 686 insertions(+), 71 deletions(-) + create mode 100644 arch/powerpc/sysdev/simple_gpio.c + create mode 100644 arch/powerpc/sysdev/simple_gpio.h +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Auto-merged arch/powerpc/kernel/asm-offsets.c +Merge made by recursive. + arch/powerpc/boot/dts/mpc8544ds.dts | 4 +- + arch/powerpc/boot/dts/mpc8572ds.dts | 4 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 2 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 2 +- + arch/powerpc/include/asm/qe.h | 19 ++++- + arch/powerpc/kernel/asm-offsets.c | 7 ++ + arch/powerpc/kernel/head_fsl_booke.S | 6 +- + arch/powerpc/mm/fsl_booke_mmu.c | 9 +-- + arch/powerpc/mm/mmu_decl.h | 11 ++- + arch/powerpc/platforms/fsl_uli1575.c | 1 + + arch/powerpc/sysdev/fsl_pci.c | 107 ++++++++++++++++------- + 11 files changed, 117 insertions(+), 55 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Merge made by recursive. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/posix_types.h | 4 ---- + arch/s390/include/asm/ptrace.h | 7 +++++-- + arch/s390/kernel/vdso32/gettimeofday.S | 4 ---- + drivers/s390/char/Kconfig | 2 +- + 4 files changed, 6 insertions(+), 11 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/boards/Kconfig | 6 +- + arch/sh/boards/board-ap325rxa.c | 53 ++++- + arch/sh/boards/board-magicpanelr2.c | 23 ++- + arch/sh/boards/mach-highlander/Kconfig | 2 +- + arch/sh/boards/mach-migor/setup.c | 171 +++++++-------- + arch/sh/boards/mach-rsk/Kconfig | 2 +- + arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- + arch/sh/boards/mach-x3proto/setup.c | 1 + + arch/sh/configs/ap325rxa_defconfig | 21 ++- + arch/sh/configs/magicpanelr2_defconfig | 21 ++- + arch/sh/configs/rsk7203_defconfig | 21 ++- + arch/sh/include/asm/gpio.h | 70 ++++--- + arch/sh/include/asm/posix_types_32.h | 8 +- + arch/sh/include/asm/posix_types_64.h | 8 +- + arch/sh/kernel/gpio.c | 338 ++++++++++++++++++----------- + arch/sh/kernel/process_64.c | 2 - + arch/sh/kernel/traps_32.c | 1 + + arch/sh/mm/ioremap_64.c | 2 +- + drivers/serial/sh-sci.h | 2 +- + 19 files changed, 470 insertions(+), 306 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Already uptodate! +Merge made by recursive. +Merging xtensa/master +$ git merge xtensa/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged init/main.c +Merge made by recursive. + drivers/misc/enclosure.c | 8 +++--- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/hosts.c | 6 +--- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_dump.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/raid_class.c | 3 +- + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_scan.c | 7 ++--- + drivers/scsi/scsi_sysfs.c | 12 +++----- + drivers/scsi/scsi_transport_fc.c | 18 ++++++------ + drivers/scsi/scsi_transport_iscsi.c | 11 +++----- + drivers/scsi/scsi_transport_sas.c | 42 +++++++++++++++-------------- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + include/linux/init.h | 1 + + init/main.c | 9 ++++++ + lib/kobject.c | 50 +++++++++++++++++++++++++++++++++++ + 22 files changed, 123 insertions(+), 69 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Auto-merged CREDITS +Auto-merged MAINTAINERS +Removed drivers/usb/storage/dpcm.c +Removed drivers/usb/storage/dpcm.h +Merge made by recursive. + CREDITS | 17 + + Documentation/DocBook/networking.tmpl | 8 + + Documentation/kernel-parameters.txt | 36 + + Documentation/usb/power-management.txt | 22 +- + Documentation/wimax/README.i2400m | 260 ++ + Documentation/wimax/README.wimax | 81 + + MAINTAINERS | 17 + + arch/arm/plat-mxc/include/mach/usb.h | 23 + + arch/arm/plat-omap/usb.c | 32 - + arch/powerpc/boot/dts/sequoia.dts | 2 +- + drivers/Makefile | 1 + + drivers/block/ub.c | 11 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/i2c/chips/Kconfig | 12 - + drivers/i2c/chips/Makefile | 1 - + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 1 + + drivers/net/usb/kaweth.c | 6 +- + drivers/net/usb/pegasus.c | 12 +- + drivers/net/wimax/Kconfig | 17 + + drivers/net/wimax/Makefile | 5 + + drivers/net/wimax/i2400m/Kconfig | 49 + + drivers/net/wimax/i2400m/Makefile | 29 + + drivers/net/wimax/i2400m/control.c | 1291 ++++++++ + drivers/net/wimax/i2400m/debug-levels.h | 45 + + drivers/net/wimax/i2400m/debugfs.c | 392 +++ + drivers/net/wimax/i2400m/driver.c | 728 +++++ + drivers/net/wimax/i2400m/fw.c | 1095 +++++++ + drivers/net/wimax/i2400m/i2400m-sdio.h | 132 + + drivers/net/wimax/i2400m/i2400m-usb.h | 264 ++ + drivers/net/wimax/i2400m/i2400m.h | 755 +++++ + drivers/net/wimax/i2400m/netdev.c | 524 ++++ + drivers/net/wimax/i2400m/op-rfkill.c | 207 ++ + drivers/net/wimax/i2400m/rx.c | 534 ++++ + drivers/net/wimax/i2400m/sdio-debug-levels.h | 22 + + drivers/net/wimax/i2400m/sdio-fw.c | 224 ++ + drivers/net/wimax/i2400m/sdio-rx.c | 255 ++ + drivers/net/wimax/i2400m/sdio-tx.c | 153 + + drivers/net/wimax/i2400m/sdio.c | 511 ++++ + drivers/net/wimax/i2400m/tx.c | 817 +++++ + drivers/net/wimax/i2400m/usb-debug-levels.h | 42 + + drivers/net/wimax/i2400m/usb-fw.c | 340 +++ + drivers/net/wimax/i2400m/usb-notif.c | 269 ++ + drivers/net/wimax/i2400m/usb-rx.c | 417 +++ + drivers/net/wimax/i2400m/usb-tx.c | 229 ++ + drivers/net/wimax/i2400m/usb.c | 591 ++++ + drivers/usb/Kconfig | 2 + + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usbtmc.c | 9 +- + drivers/usb/core/devio.c | 7 +- + drivers/usb/core/driver.c | 181 +- + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/generic.c | 10 +- + drivers/usb/core/hcd-pci.c | 201 +- + drivers/usb/core/hcd.c | 20 +- + drivers/usb/core/hcd.h | 16 +- + drivers/usb/core/hub.c | 142 +- + drivers/usb/core/message.c | 164 +- + drivers/usb/core/sysfs.c | 49 +- + drivers/usb/core/urb.c | 43 +- + drivers/usb/core/usb.c | 79 +- + drivers/usb/core/usb.h | 24 +- + drivers/usb/gadget/Kconfig | 43 +- + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/ci13xxx_udc.c | 2830 ++++++++++++++++++ + drivers/usb/gadget/ci13xxx_udc.h | 195 ++ + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/file_storage.c | 177 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/gadget_chips.h | 8 +- + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/imx_udc.c | 1516 ++++++++++ + drivers/usb/gadget/imx_udc.h | 344 +++ + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 - + drivers/usb/gadget/s3c2410_udc.c | 34 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-pci.c | 12 +- + drivers/usb/host/ehci-ppc-of.c | 45 +- + drivers/usb/host/ehci.h | 34 + + drivers/usb/host/isp1760-hcd.c | 13 +- + drivers/usb/host/isp1760-hcd.h | 1 - + drivers/usb/host/isp1760-if.c | 116 +- + drivers/usb/host/ohci-hcd.c | 12 +- + drivers/usb/host/ohci-pci.c | 6 +- + drivers/usb/host/ohci-pnx4008.c | 85 +- + drivers/usb/host/ohci-ppc-of.c | 25 + + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 3985 +++++++++++++++++++++++++ + drivers/usb/host/oxu210hp.h | 447 +++ + drivers/usb/host/pci-quirks.c | 14 +- + drivers/usb/host/r8a66597-hcd.c | 8 +- + drivers/usb/host/uhci-hcd.c | 2 + + drivers/usb/image/microtek.c | 11 +- + drivers/usb/misc/berry_charge.c | 5 + + drivers/usb/misc/emi26.c | 2 +- + drivers/usb/misc/usbtest.c | 2 - + drivers/usb/mon/Kconfig | 13 +- + drivers/usb/mon/Makefile | 3 +- + drivers/usb/musb/Kconfig | 12 +- + drivers/usb/musb/Makefile | 8 + + drivers/usb/musb/blackfin.c | 320 ++ + drivers/usb/musb/blackfin.h | 52 + + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 84 +- + drivers/usb/musb/musb_core.h | 73 +- + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/musb_host.c | 45 +- + drivers/usb/musb/musb_io.h | 26 +- + drivers/usb/musb/musb_regs.h | 397 ++- + drivers/usb/musb/musbhsdma.c | 84 +- + drivers/usb/musb/musbhsdma.h | 149 + + drivers/usb/musb/omap2430.c | 15 +- + drivers/usb/musb/tusb6010.c | 7 +- + drivers/usb/otg/Kconfig | 54 + + drivers/usb/otg/Makefile | 15 + + drivers/usb/otg/gpio_vbus.c | 335 +++ + drivers/{i2c/chips => usb/otg}/isp1301_omap.c | 0 + drivers/usb/otg/otg.c | 65 + + drivers/usb/otg/twl4030-usb.c | 721 +++++ + drivers/usb/serial/Kconfig | 17 + + drivers/usb/serial/Makefile | 2 + + drivers/usb/serial/digi_acceleport.c | 28 +- + drivers/usb/serial/garmin_gps.c | 2 +- + drivers/usb/serial/ipw.c | 4 +- + drivers/usb/serial/iuu_phoenix.c | 38 +- + drivers/usb/serial/mos7840.c | 38 +- + drivers/usb/serial/opticon.c | 358 +++ + drivers/usb/serial/option.c | 11 +- + drivers/usb/serial/siemens_mpi.c | 77 + + drivers/usb/serial/spcp8x5.c | 20 +- + drivers/usb/serial/usb_debug.c | 2 +- + drivers/usb/storage/Kconfig | 11 +- + drivers/usb/storage/Makefile | 3 +- + drivers/usb/storage/dpcm.c | 86 - + drivers/usb/storage/dpcm.h | 32 - + drivers/usb/storage/libusual.c | 7 + + drivers/usb/storage/option_ms.c | 147 + + drivers/usb/storage/option_ms.h | 4 + + drivers/usb/storage/protocol.c | 24 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/scsiglue.c | 43 + + drivers/usb/storage/sddr09.c | 43 + + drivers/usb/storage/sddr09.h | 5 +- + drivers/usb/storage/transport.c | 219 +- + drivers/usb/storage/transport.h | 2 - + drivers/usb/storage/unusual_devs.h | 338 +-- + drivers/usb/storage/usb.c | 106 +- + drivers/usb/storage/usb.h | 5 +- + drivers/usb/wusbcore/rh.c | 2 +- + fs/debugfs/file.c | 32 + + include/linux/Kbuild | 2 + + include/linux/debugfs.h | 2 + + include/linux/oxu210hp.h | 7 + + include/linux/usb.h | 30 +- + include/linux/usb/association.h | 22 +- + include/linux/usb/gpio_vbus.h | 30 + + include/linux/usb/musb.h | 5 + + include/linux/usb/otg.h | 1 + + include/linux/usb_usual.h | 7 +- + include/linux/wimax.h | 234 ++ + include/linux/wimax/Kbuild | 1 + + include/linux/wimax/debug.h | 453 +++ + include/linux/wimax/i2400m.h | 512 ++++ + include/net/wimax.h | 520 ++++ + net/Kconfig | 2 + + net/Makefile | 1 + + net/netlink/genetlink.c | 1 + + net/wimax/Kconfig | 38 + + net/wimax/Makefile | 13 + + net/wimax/debug-levels.h | 42 + + net/wimax/debugfs.c | 90 + + net/wimax/id-table.c | 142 + + net/wimax/op-msg.c | 421 +++ + net/wimax/op-reset.c | 143 + + net/wimax/op-rfkill.c | 532 ++++ + net/wimax/stack.c | 599 ++++ + net/wimax/wimax-internal.h | 91 + + 186 files changed, 28260 insertions(+), 1396 deletions(-) + create mode 100644 Documentation/wimax/README.i2400m + create mode 100644 Documentation/wimax/README.wimax + create mode 100644 arch/arm/plat-mxc/include/mach/usb.h + create mode 100644 drivers/net/wimax/Kconfig + create mode 100644 drivers/net/wimax/Makefile + create mode 100644 drivers/net/wimax/i2400m/Kconfig + create mode 100644 drivers/net/wimax/i2400m/Makefile + create mode 100644 drivers/net/wimax/i2400m/control.c + create mode 100644 drivers/net/wimax/i2400m/debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/debugfs.c + create mode 100644 drivers/net/wimax/i2400m/driver.c + create mode 100644 drivers/net/wimax/i2400m/fw.c + create mode 100644 drivers/net/wimax/i2400m/i2400m-sdio.h + create mode 100644 drivers/net/wimax/i2400m/i2400m-usb.h + create mode 100644 drivers/net/wimax/i2400m/i2400m.h + create mode 100644 drivers/net/wimax/i2400m/netdev.c + create mode 100644 drivers/net/wimax/i2400m/op-rfkill.c + create mode 100644 drivers/net/wimax/i2400m/rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/sdio-fw.c + create mode 100644 drivers/net/wimax/i2400m/sdio-rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-tx.c + create mode 100644 drivers/net/wimax/i2400m/sdio.c + create mode 100644 drivers/net/wimax/i2400m/tx.c + create mode 100644 drivers/net/wimax/i2400m/usb-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/usb-fw.c + create mode 100644 drivers/net/wimax/i2400m/usb-notif.c + create mode 100644 drivers/net/wimax/i2400m/usb-rx.c + create mode 100644 drivers/net/wimax/i2400m/usb-tx.c + create mode 100644 drivers/net/wimax/i2400m/usb.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.h + create mode 100644 drivers/usb/gadget/imx_udc.c + create mode 100644 drivers/usb/gadget/imx_udc.h + create mode 100644 drivers/usb/host/oxu210hp-hcd.c + create mode 100644 drivers/usb/host/oxu210hp.h + create mode 100644 drivers/usb/musb/blackfin.c + create mode 100644 drivers/usb/musb/blackfin.h + create mode 100644 drivers/usb/musb/musbhsdma.h + create mode 100644 drivers/usb/otg/Kconfig + create mode 100644 drivers/usb/otg/Makefile + create mode 100644 drivers/usb/otg/gpio_vbus.c + rename drivers/{i2c/chips => usb/otg}/isp1301_omap.c (100%) + create mode 100644 drivers/usb/otg/otg.c + create mode 100644 drivers/usb/otg/twl4030-usb.c + create mode 100644 drivers/usb/serial/opticon.c + create mode 100644 drivers/usb/serial/siemens_mpi.c + delete mode 100644 drivers/usb/storage/dpcm.c + delete mode 100644 drivers/usb/storage/dpcm.h + create mode 100644 drivers/usb/storage/option_ms.c + create mode 100644 drivers/usb/storage/option_ms.h + create mode 100644 include/linux/oxu210hp.h + create mode 100644 include/linux/usb/gpio_vbus.h + create mode 100644 include/linux/wimax.h + create mode 100644 include/linux/wimax/Kbuild + create mode 100644 include/linux/wimax/debug.h + create mode 100644 include/linux/wimax/i2400m.h + create mode 100644 include/net/wimax.h + create mode 100644 net/wimax/Kconfig + create mode 100644 net/wimax/Makefile + create mode 100644 net/wimax/debug-levels.h + create mode 100644 net/wimax/debugfs.c + create mode 100644 net/wimax/id-table.c + create mode 100644 net/wimax/op-msg.c + create mode 100644 net/wimax/op-reset.c + create mode 100644 net/wimax/op-rfkill.c + create mode 100644 net/wimax/stack.c + create mode 100644 net/wimax/wimax-internal.h +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Already up-to-date. +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kernel/cpuid.c +Auto-merged arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged kernel/rcuclassic.c +CONFLICT (content): Merge conflict in kernel/rcuclassic.c +Auto-merged kernel/sched.c +Auto-merged kernel/time/tick-sched.c +Resolved 'kernel/rcuclassic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 23a61e0: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/smp.h | 32 +++++++- + arch/x86/kernel/cpu/common.c | 26 +++++- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 23 ++++-- + arch/x86/kernel/microcode_core.c | 83 ++++++++++---------- + arch/x86/kernel/setup_percpu.c | 25 ++++++- + arch/x86/kernel/smp.c | 17 +++- + arch/x86/kernel/smpboot.c | 128 ++++++++++++++++--------------- + 7 files changed, 210 insertions(+), 124 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged init/main.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/vm/kmemtrace.txt | 126 ++++ + MAINTAINERS | 6 + + arch/x86/kvm/Kconfig | 3 +- + drivers/char/sysrq.c | 2 +- + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 +++ + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/trace/Kconfig | 21 + + kernel/trace/Makefile | 3 + + kernel/trace/ftrace.c | 4 +- + kernel/trace/kmemtrace.c | 350 +++++++++++ + kernel/trace/trace.c | 741 ++---------------------- + kernel/trace/trace.h | 61 ++- + kernel/trace/trace_boot.c | 1 + + kernel/trace/trace_branch.c | 295 ++++++---- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hw_branches.c | 1 + + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ + kernel/trace/trace_output.h | 59 ++ + kernel/trace/trace_power.c | 1 + + kernel/trace/trace_selftest.c | 1 - + kernel/trace/trace_stat.c | 243 ++++++++ + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 +++- + 32 files changed, 2368 insertions(+), 879 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/trace/kmemtrace.h + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_stat.c +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged kernel/irq/chip.c +Merge made by recursive. + kernel/irq/chip.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already up-to-date. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/clockchips.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/time/tick-common.c +CONFLICT (content): Merge conflict in kernel/time/tick-common.c +Resolved 'kernel/time/tick-common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d779533: Merge commit 'timers/auto-timers-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/clockchips.h | 1 + + kernel/hrtimer.c | 34 +++++++++++++++++++++++++++++++++- + kernel/time/tick-common.c | 26 +++++++++++++++++++------- + 3 files changed, 53 insertions(+), 8 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/parisc/dino.c +Merge made by recursive. + Documentation/PCI/pci.txt | 3 +- + Documentation/kernel-parameters.txt | 4 + + arch/alpha/kernel/pci.c | 18 -- + arch/alpha/kernel/pci_impl.h | 13 +- + arch/alpha/kernel/sys_dp264.c | 2 +- + arch/alpha/kernel/sys_eiger.c | 2 +- + arch/alpha/kernel/sys_miata.c | 2 +- + arch/alpha/kernel/sys_noritake.c | 2 +- + arch/alpha/kernel/sys_ruffian.c | 2 +- + arch/alpha/kernel/sys_sable.c | 2 +- + arch/arm/include/asm/mach/pci.h | 2 +- + arch/arm/kernel/bios32.c | 27 -- + arch/arm/mach-integrator/pci.c | 11 +- + arch/mips/pci/pci-ip27.c | 6 - + arch/mips/pci/pci.c | 24 +-- + arch/powerpc/kernel/prom_parse.c | 7 +- + arch/sh/drivers/pci/ops-cayman.c | 9 +- + arch/sh/drivers/pci/pci.c | 22 +-- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/init_32.c | 2 + + arch/x86/mm/init_64.c | 2 + + arch/x86/pci/acpi.c | 7 +- + arch/x86/pci/common.c | 12 +- + arch/x86/pci/i386.c | 4 +- + arch/x86/pci/init.c | 3 +- + arch/x86/pci/irq.c | 54 ++-- + arch/x86/pci/visws.c | 20 +-- + drivers/acpi/pci_root.c | 20 ++ + drivers/net/e1000e/netdev.c | 2 +- + drivers/net/sfc/falcon.c | 4 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/iosapic.c | 3 +- + drivers/pci/Kconfig | 9 + + drivers/pci/Makefile | 2 + + drivers/pci/access.c | 226 ++++++++++----- + drivers/pci/bus.c | 87 ++++--- + drivers/pci/hotplug/Makefile | 3 + + drivers/pci/hotplug/acpi_pcihp.c | 69 +++++ + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 117 ++------ + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 6 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/fakephp.c | 1 + + drivers/pci/hotplug/pciehp.h | 15 +- + drivers/pci/hotplug/pciehp_acpi.c | 141 +++++++++ + drivers/pci/hotplug/pciehp_core.c | 1 + + drivers/pci/hotplug/pciehp_ctrl.c | 26 +- + drivers/pci/hotplug/pciehp_hpc.c | 329 ++++++-------------- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 +-- + drivers/pci/pci-acpi.c | 82 +++--- + drivers/pci/pci-driver.c | 420 ++++++++++++++++---------- + drivers/pci/pci-stub.c | 47 +++ + drivers/pci/pci-sysfs.c | 95 +++---- + drivers/pci/pci.c | 513 +++++++++++++++++++++++++------- + drivers/pci/pci.h | 34 ++- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aer/aerdrv_errprint.c | 2 +- + drivers/pci/pcie/aspm.c | 165 ++++++++--- + drivers/pci/pcie/portdrv_bus.c | 32 +-- + drivers/pci/pcie/portdrv_core.c | 240 +++++++++------ + drivers/pci/pcie/portdrv_pci.c | 21 +- + drivers/pci/probe.c | 40 ++- + drivers/pci/proc.c | 18 +- + drivers/pci/quirks.c | 112 ++++++-- + drivers/pci/setup-bus.c | 5 +- + drivers/pci/setup-res.c | 24 +- + include/linux/ioport.h | 11 +- + include/linux/pci-acpi.h | 23 +- + include/linux/pci.h | 90 ++++-- + include/linux/pci_hotplug.h | 2 + + include/linux/pci_regs.h | 76 +++++- + kernel/resource.c | 61 ++++- + 74 files changed, 2150 insertions(+), 1332 deletions(-) + create mode 100644 drivers/pci/hotplug/pciehp_acpi.c + create mode 100644 drivers/pci/pci-stub.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-ioctl.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged drivers/hwmon/fschmd.c +Merge made by recursive. + drivers/hwmon/k8temp.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merged MAINTAINERS +Removed drivers/media/video/pxa_camera.h +Auto-merged drivers/staging/go7007/go7007-v4l2.c +Merge made by recursive. + MAINTAINERS | 65 ++++++++++------ + drivers/media/common/tuners/tda8290.c | 6 +- + drivers/media/dvb/dm1105/Kconfig | 1 + + drivers/media/dvb/dvb-core/dvb_frontend.c | 26 ++++--- + drivers/media/dvb/dvb-usb/anysee.c | 2 +- + drivers/media/dvb/frontends/cx24116.c | 2 +- + drivers/media/dvb/frontends/stb0899_algo.c | 4 +- + drivers/media/dvb/frontends/stb0899_drv.c | 6 +- + drivers/media/dvb/ttpci/budget-ci.c | 2 +- + drivers/media/video/cx88/Kconfig | 5 + + drivers/media/video/cx88/Makefile | 3 +- + drivers/media/video/cx88/cx88-dvb.c | 46 +++++++++++ + drivers/media/video/cx88/cx88-i2c.c | 24 +----- + drivers/media/video/cx88/cx88-mpeg.c | 30 +------ + drivers/media/video/cx88/cx88.h | 4 +- + drivers/media/video/em28xx/em28xx-cards.c | 5 +- + drivers/media/video/em28xx/em28xx-core.c | 2 +- + drivers/media/video/em28xx/em28xx-input.c | 2 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2 +- + drivers/media/video/pxa_camera.c | 4 +- + drivers/media/video/pxa_camera.h | 95 ----------------------- + drivers/media/video/usbvideo/ibmcam.c | 2 +- + drivers/media/video/usbvideo/konicawc.c | 2 +- + drivers/media/video/usbvideo/ultracam.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 3 +- + drivers/media/video/v4l2-device.c | 4 +- + drivers/media/video/videobuf-dma-sg.c | 3 +- + drivers/staging/go7007/go7007-v4l2.c | 3 +- + 28 files changed, 148 insertions(+), 207 deletions(-) + delete mode 100644 drivers/media/video/pxa_camera.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Merge made by recursive. + Documentation/mips/AU1xxx_IDE.README | 6 +---- + drivers/ide/Kconfig | 5 ---- + drivers/ide/ide-atapi.c | 21 +++++++++++++++- + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-io.c | 20 --------------- + drivers/ide/ide-iops.c | 2 +- + drivers/ide/ide-probe.c | 45 +++++++++++---------------------- + drivers/ide/it821x.c | 15 ++++++++++- + drivers/ide/sl82c105.c | 4 --- + drivers/ide/via82cxxx.c | 2 - + include/linux/ide.h | 2 - + include/linux/pci_ids.h | 1 + + 12 files changed, 52 insertions(+), 73 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/amso1100/c2.c | 20 ++++++++++++-------- + drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++++++++------- + drivers/infiniband/hw/nes/nes_nic.c | 22 +++++++++++++--------- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 ++++++++++++-------- + 4 files changed, 45 insertions(+), 32 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/e820.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged drivers/Makefile +Auto-merged drivers/power/power_supply_sysfs.c +Auto-merged include/acpi/actypes.h +Auto-merged include/linux/power_supply.h +Auto-merged kernel/power/disk.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/boot.c | 11 + + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 84 ----- + drivers/acpi/Makefile | 3 - + drivers/acpi/battery.c | 14 +- + drivers/acpi/dispatcher/dsmethod.c | 3 + + drivers/acpi/dispatcher/dsopcode.c | 53 +++- + drivers/acpi/ec.c | 43 ++-- + drivers/acpi/events/evevent.c | 14 +- + drivers/acpi/events/evgpe.c | 36 +- + drivers/acpi/events/evgpeblk.c | 38 ++- + drivers/acpi/events/evmisc.c | 51 ++-- + drivers/acpi/events/evregion.c | 133 ++++---- + drivers/acpi/events/evrgnini.c | 41 +-- + drivers/acpi/events/evsci.c | 10 +- + drivers/acpi/events/evxface.c | 2 +- + drivers/acpi/events/evxfevnt.c | 12 +- + drivers/acpi/executer/exfldio.c | 11 +- + drivers/acpi/hardware/hwsleep.c | 77 ++--- + drivers/acpi/namespace/nsaccess.c | 11 +- + drivers/acpi/namespace/nseval.c | 70 +--- + drivers/acpi/namespace/nspredef.c | 256 ++++++++++++--- + drivers/acpi/namespace/nsutils.c | 8 +- + drivers/acpi/parser/psparse.c | 12 + + drivers/acpi/parser/psxface.c | 33 ++ + drivers/acpi/pci_link.c | 39 +-- + drivers/acpi/sbs.c | 31 +- + drivers/acpi/sleep/main.c | 67 ++++- + drivers/acpi/sleep/proc.c | 53 ++-- + drivers/acpi/tables/tbfadt.c | 38 ++- + drivers/acpi/tables/tbutils.c | 27 ++- + drivers/acpi/utilities/uteval.c | 6 +- + drivers/acpi/utilities/utglobal.c | 3 +- + drivers/acpi/utilities/utxface.c | 11 + + drivers/acpi/video.c | 15 + + drivers/misc/Kconfig | 284 +---------------- + drivers/misc/Makefile | 13 - + drivers/platform/Kconfig | 5 + + drivers/platform/Makefile | 5 + + drivers/platform/x86/Kconfig | 375 +++++++++++++++++++++ + drivers/platform/x86/Makefile | 19 + + drivers/{misc => platform/x86}/acer-wmi.c | 0 + drivers/{misc => platform/x86}/asus-laptop.c | 0 + drivers/{acpi => platform/x86}/asus_acpi.c | 0 + drivers/{misc => platform/x86}/compal-laptop.c | 0 + drivers/{misc => platform/x86}/eeepc-laptop.c | 0 + drivers/{misc => platform/x86}/fujitsu-laptop.c | 0 + drivers/{misc => platform/x86}/hp-wmi.c | 0 + drivers/{misc => platform/x86}/intel_menlow.c | 0 + drivers/{misc => platform/x86}/msi-laptop.c | 0 + drivers/{misc => platform/x86}/panasonic-laptop.c | 0 + drivers/{misc => platform/x86}/sony-laptop.c | 0 + drivers/{misc => platform/x86}/tc1100-wmi.c | 0 + drivers/{misc => platform/x86}/thinkpad_acpi.c | 0 + drivers/{acpi => platform/x86}/toshiba_acpi.c | 0 + drivers/{acpi => platform/x86}/wmi.c | 0 + drivers/power/power_supply_sysfs.c | 2 + + include/acpi/acconfig.h | 6 +- + include/acpi/acexcep.h | 4 +- + include/acpi/acglobal.h | 1 + + include/acpi/aclocal.h | 1 + + include/acpi/acnamesp.h | 5 +- + include/acpi/acpixf.h | 6 +- + include/acpi/actables.h | 2 + + include/acpi/actypes.h | 8 +- + include/linux/acpi.h | 1 + + include/linux/power_supply.h | 2 + + include/linux/suspend.h | 13 + + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 370 +++++++++++---------- + kernel/power/swsusp.c | 122 +++++++ + 77 files changed, 1597 insertions(+), 1010 deletions(-) + create mode 100644 drivers/platform/Kconfig + create mode 100644 drivers/platform/Makefile + create mode 100644 drivers/platform/x86/Kconfig + create mode 100644 drivers/platform/x86/Makefile + rename drivers/{misc => platform/x86}/acer-wmi.c (100%) + rename drivers/{misc => platform/x86}/asus-laptop.c (100%) + rename drivers/{acpi => platform/x86}/asus_acpi.c (100%) + rename drivers/{misc => platform/x86}/compal-laptop.c (100%) + rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%) + rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%) + rename drivers/{misc => platform/x86}/hp-wmi.c (100%) + rename drivers/{misc => platform/x86}/intel_menlow.c (100%) + rename drivers/{misc => platform/x86}/msi-laptop.c (100%) + rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%) + rename drivers/{misc => platform/x86}/sony-laptop.c (100%) + rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%) + rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%) + rename drivers/{acpi => platform/x86}/toshiba_acpi.c (100%) + rename drivers/{acpi => platform/x86}/wmi.c (100%) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Removed include/linux/lockd/sm_inter.h +Merge made by recursive. + fs/lockd/clntproc.c | 7 +- + fs/lockd/host.c | 170 ++----------- + fs/lockd/mon.c | 569 ++++++++++++++++++++++++++++++---------- + fs/lockd/svc.c | 72 ++++-- + fs/lockd/svc4proc.c | 13 +- + fs/lockd/svcproc.c | 13 +- + fs/lockd/svcsubs.c | 1 - + fs/lockd/xdr.c | 5 +- + fs/lockd/xdr4.c | 5 +- + fs/nfsd/auth.c | 4 +- + fs/nfsd/nfs4callback.c | 3 - + fs/nfsd/nfs4proc.c | 5 + + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4state.c | 79 ++++-- + fs/nfsd/nfs4xdr.c | 2 - + fs/nfsd/nfsctl.c | 479 +++++++++++++++++++++++++++++++-- + fs/nfsd/nfsfh.c | 36 ++- + fs/nfsd/nfsproc.c | 1 + + fs/nfsd/vfs.c | 34 +++- + include/linux/lockd/lockd.h | 68 +++-- + include/linux/lockd/sm_inter.h | 48 ---- + include/linux/lockd/xdr.h | 15 +- + include/linux/nfs4.h | 2 + + include/linux/nfsd/nfsd.h | 1 - + include/linux/nfsd/nfsfh.h | 4 + + include/linux/sunrpc/svc.h | 5 +- + net/sunrpc/cache.c | 20 +- + net/sunrpc/stats.c | 6 +- + net/sunrpc/svc.c | 14 +- + net/sunrpc/svc_xprt.c | 58 +++-- + net/sunrpc/svcauth.c | 14 +- + net/sunrpc/svcauth_unix.c | 12 +- + net/sunrpc/svcsock.c | 30 ++- + 33 files changed, 1225 insertions(+), 572 deletions(-) + delete mode 100644 include/linux/lockd/sm_inter.h +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/media/dvb/Kconfig +Merge made by recursive. + drivers/firewire/fw-card.c | 68 +-- + drivers/firewire/fw-cdev.c | 355 ++++++---- + drivers/firewire/fw-device.c | 43 +- + drivers/firewire/fw-device.h | 7 +- + drivers/firewire/fw-iso.c | 43 +- + drivers/firewire/fw-ohci.c | 236 ++++---- + drivers/firewire/fw-sbp2.c | 57 +- + drivers/firewire/fw-topology.c | 28 +- + drivers/firewire/fw-topology.h | 13 +- + drivers/firewire/fw-transaction.c | 151 ++--- + drivers/firewire/fw-transaction.h | 123 +--- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 10 +- + drivers/ieee1394/nodemgr.h | 18 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + include/linux/firewire-cdev.h | 4 +- + 36 files changed, 3911 insertions(+), 593 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/powerpc/kernel/asm-offsets.c +Auto-merged arch/x86/kvm/Kconfig +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 14 + + arch/ia64/include/asm/kvm_host.h | 8 +- + arch/ia64/kvm/Kconfig | 4 + + arch/ia64/kvm/kvm-ia64.c | 100 ++++- + arch/ia64/kvm/process.c | 15 - + arch/ia64/kvm/vcpu.c | 39 +-- + arch/ia64/kvm/vtlb.c | 5 - + arch/powerpc/include/asm/kvm.h | 7 + + arch/powerpc/include/asm/kvm_44x.h | 7 + + arch/powerpc/include/asm/kvm_asm.h | 7 +- + arch/powerpc/include/asm/kvm_e500.h | 67 +++ + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_ppc.h | 15 +- + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x.c | 72 +--- + arch/powerpc/kvm/44x_emulate.c | 217 +-------- + arch/powerpc/kvm/44x_tlb.c | 39 ++- + arch/powerpc/kvm/44x_tlb.h | 9 - + arch/powerpc/kvm/Kconfig | 16 + + arch/powerpc/kvm/Makefile | 10 + + arch/powerpc/kvm/booke.c | 50 ++- + arch/powerpc/kvm/booke.h | 35 +- + arch/powerpc/kvm/booke_emulate.c | 266 +++++++++++ + arch/powerpc/kvm/booke_interrupts.S | 5 + + arch/powerpc/kvm/e500.c | 169 +++++++ + arch/powerpc/kvm/e500_emulate.c | 196 ++++++++ + arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++++++ + arch/powerpc/kvm/e500_tlb.h | 184 ++++++++ + arch/powerpc/kvm/emulate.c | 93 +++-- + arch/powerpc/kvm/powerpc.c | 35 +-- + arch/s390/include/asm/kvm.h | 7 + + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/Kconfig | 3 + + arch/s390/kvm/kvm-s390.c | 8 +- + arch/x86/include/asm/kvm.h | 23 + + arch/x86/include/asm/kvm_host.h | 54 ++- + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/svm.h | 4 - + arch/x86/include/asm/virtext.h | 2 +- + arch/x86/include/asm/vmx.h | 5 +- + arch/x86/kvm/Kconfig | 4 + + arch/x86/kvm/i8254.c | 23 +- + arch/x86/kvm/i8254.h | 2 + + arch/x86/kvm/kvm_svm.h | 16 +- + arch/x86/kvm/mmu.c | 186 ++++---- + arch/x86/kvm/paging_tmpl.h | 209 ++++----- + arch/x86/kvm/svm.c | 866 +++++++++++++++++++++++++++++++---- + arch/x86/kvm/vmx.c | 303 ++++++++----- + arch/x86/kvm/x86.c | 273 ++++++++---- + arch/x86/kvm/x86_emulate.c | 56 ++- + include/linux/kvm.h | 61 ++- + include/linux/kvm_host.h | 25 +- + include/linux/kvm_types.h | 13 - + virt/kvm/ioapic.c | 6 + + virt/kvm/irq_comm.c | 24 + + virt/kvm/kvm_main.c | 67 +++- + 56 files changed, 3628 insertions(+), 1068 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_e500.h + create mode 100644 arch/powerpc/kvm/booke_emulate.c + create mode 100644 arch/powerpc/kvm/e500.c + create mode 100644 arch/powerpc/kvm/e500_emulate.c + create mode 100644 arch/powerpc/kvm/e500_tlb.c + create mode 100644 arch/powerpc/kvm/e500_tlb.h +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/scsi_error.c +Auto-merged drivers/scsi/scsi_ioctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c +Auto-merged drivers/scsi/scsi_transport_fc.c +Resolved 'drivers/scsi/scsi_ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4d0b63f: Merge commit 'scsi/master' +$ git diff -M --stat --summary HEAD^.. + block/blk-map.c | 19 +- + drivers/message/fusion/mptctl.c | 5 +- + drivers/scsi/NCR_D700.c | 2 +- + drivers/scsi/a2091.c | 18 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 1 + + drivers/scsi/gvp11.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 16 +- + drivers/scsi/lasi700.c | 3 +- + drivers/scsi/libsas/sas_host_smp.c | 12 +- + drivers/scsi/lpfc/lpfc_init.c | 3 +- + drivers/scsi/mvsas.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 26 ++- + drivers/scsi/qla2xxx/qla_dbg.c | 462 +++++++++++++++++++++++++++++---- + drivers/scsi/qla2xxx/qla_dbg.h | 40 +++ + drivers/scsi/qla2xxx/qla_def.h | 33 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 3 +- + drivers/scsi/qla2xxx/qla_fw.h | 294 +++++++++++++++++++++- + drivers/scsi/qla2xxx/qla_gbl.h | 10 +- + drivers/scsi/qla2xxx/qla_gs.c | 9 +- + drivers/scsi/qla2xxx/qla_init.c | 295 ++++++++++++++++++++- + drivers/scsi/qla2xxx/qla_iocb.c | 12 +- + drivers/scsi/qla2xxx/qla_isr.c | 82 ++++-- + drivers/scsi/qla2xxx/qla_mbx.c | 41 ++-- + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 139 +++++++---- + drivers/scsi/qla2xxx/qla_sup.c | 263 ++++++------------- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/scsi.c | 4 - + drivers/scsi/scsi_error.c | 24 +-- + drivers/scsi/scsi_ioctl.c | 10 +- + drivers/scsi/scsi_lib.c | 117 ++++++--- + drivers/scsi/scsi_transport_fc.c | 21 ++- + drivers/scsi/sd_dif.c | 17 +- + drivers/scsi/sg.c | 2 + + drivers/scsi/sgiwd93.c | 3 +- + drivers/scsi/sim710.c | 4 +- + drivers/scsi/sni_53c710.c | 3 +- + drivers/scsi/st.c | 492 ++++++++++++++++-------------------- + drivers/scsi/st.h | 14 +- + drivers/scsi/zalon.c | 4 +- + fs/bio.c | 36 ++- + include/linux/blkdev.h | 2 + + include/scsi/scsi_transport_fc.h | 1 + + 46 files changed, 1789 insertions(+), 791 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merged fs/ocfs2/cluster/heartbeat.c +Merge made by recursive. + fs/configfs/dir.c | 59 +++++++++++++ + fs/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++++++- + fs/ocfs2/cluster/heartbeat.h | 3 +- + fs/ocfs2/cluster/nodemanager.c | 9 ++- + fs/ocfs2/ocfs2.h | 1 + + fs/ocfs2/super.c | 176 ++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 340 insertions(+), 4 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 4d0b63f Merge commit 'scsi/master' +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/block_dev.c +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/ext4.h +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/super.c +Auto-merged fs/jbd2/commit.c +Auto-merged fs/jbd2/journal.c +Auto-merged fs/jbd2/transaction.c +Auto-merged include/linux/fs.h +Auto-merged include/linux/jbd2.h +Merge made by recursive. + Documentation/filesystems/ext4.txt | 85 ++++- + block/Kconfig | 6 + + fs/block_dev.c | 15 + + fs/ext3/hash.c | 77 ++++- + fs/ext3/namei.c | 11 +- + fs/ext3/super.c | 33 ++ + fs/ext4/balloc.c | 293 ++++++------------ + fs/ext4/bitmap.c | 5 +- + fs/ext4/dir.c | 10 +- + fs/ext4/ext4.h | 152 +++++++-- + fs/ext4/ext4_extents.h | 5 - + fs/ext4/ext4_i.h | 16 +- + fs/ext4/ext4_jbd2.c | 83 ++++-- + fs/ext4/ext4_jbd2.h | 87 ++++- + fs/ext4/ext4_sb.h | 6 +- + fs/ext4/extents.c | 60 ++-- + fs/ext4/file.c | 3 - + fs/ext4/hash.c | 77 ++++- + fs/ext4/ialloc.c | 324 +++++++++++-------- + fs/ext4/inode.c | 309 +++++++++++++----- + fs/ext4/ioctl.c | 2 +- + fs/ext4/mballoc.c | 629 ++++++++++++++++++++++++++---------- + fs/ext4/mballoc.h | 71 +---- + fs/ext4/migrate.c | 19 +- + fs/ext4/namei.c | 92 +++--- + fs/ext4/resize.c | 113 ++----- + fs/ext4/super.c | 622 ++++++++++++++++++++++------------- + fs/ext4/xattr.c | 25 +- + fs/ioprio.c | 3 +- + fs/jbd2/checkpoint.c | 24 +- + fs/jbd2/commit.c | 58 +++- + fs/jbd2/journal.c | 124 +++----- + fs/jbd2/transaction.c | 60 +++- + fs/super.c | 2 + + include/linux/ext3_fs.h | 28 ++- + include/linux/ext3_fs_sb.h | 1 + + include/linux/fs.h | 2 + + include/linux/ioprio.h | 2 + + include/linux/jbd2.h | 38 ++- + 39 files changed, 2271 insertions(+), 1301 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Renamed arch/avr32/include/asm/atmel-mci.h => include/linux/atmel-mci.h +Auto-merged include/linux/atmel-mci.h +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Auto-merged drivers/mmc/host/atmel-mci.c +Auto-merged include/linux/netdevice.h +Auto-merged net/core/dev.c +Auto-merged net/ipv4/tcp.c +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 96 ++--- + Documentation/dmaengine.txt | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 15 +- + crypto/async_tx/async_tx.c | 350 +--------------- + drivers/dca/dca-core.c | 2 +- + drivers/dma/Kconfig | 2 - + drivers/dma/dmaengine.c | 778 ++++++++++++++++++++++++--------- + drivers/dma/dmatest.c | 129 ++---- + drivers/dma/dw_dmac.c | 119 +++--- + drivers/dma/fsldma.c | 5 +- + drivers/dma/ioat.c | 92 ++--- + drivers/dma/ioat_dma.c | 18 +- + drivers/dma/iop-adma.c | 30 +-- + drivers/dma/mv_xor.c | 11 +- + drivers/mmc/host/atmel-mci.c | 103 ++---- + include/linux/async_tx.h | 17 +- + include/linux/atmel-mci.h | 6 +- + include/linux/dmaengine.h | 181 +++------ + include/linux/dw_dmac.h | 31 +- + include/linux/netdevice.h | 3 - + include/net/netdma.h | 11 - + net/core/dev.c | 149 +------ + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 26 files changed, 900 insertions(+), 1260 deletions(-) + create mode 100644 Documentation/dmaengine.txt +Merging udf/for_next +$ git merge udf/for_next +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 663 insertions(+), 590 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merged drivers/mtd/devices/m25p80.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c +Auto-merged drivers/mtd/devices/mtd_dataflash.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/mtd_dataflash.c +Auto-merged drivers/mtd/maps/physmap.c +Auto-merged drivers/mtd/mtdconcat.c +Auto-merged drivers/mtd/ubi/build.c +Auto-merged include/linux/mtd/mtd.h +Resolved 'drivers/mtd/devices/m25p80.c' using previous resolution. +Resolved 'drivers/mtd/devices/mtd_dataflash.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ab05736: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/dts-bindings/4xx/ndfc.txt | 39 ++ + arch/arm/mach-pxa/corgi.c | 54 ++ + arch/arm/mach-pxa/poodle.c | 51 ++ + arch/arm/mach-pxa/spitz.c | 77 +++ + drivers/mtd/Kconfig | 10 + + drivers/mtd/Makefile | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 12 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 14 +- + drivers/mtd/chips/fwh_lock.h | 4 +- + drivers/mtd/devices/lart.c | 6 +- + drivers/mtd/devices/m25p80.c | 41 +- + drivers/mtd/devices/mtd_dataflash.c | 24 +- + drivers/mtd/ftl.c | 100 ++-- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/inftlmount.c | 4 +- + drivers/mtd/lpddr/Kconfig | 22 + + drivers/mtd/lpddr/Makefile | 6 + + drivers/mtd/lpddr/lpddr_cmds.c | 796 +++++++++++++++++++++++ + drivers/mtd/lpddr/qinfo_probe.c | 255 ++++++++ + drivers/mtd/maps/Kconfig | 21 +- + drivers/mtd/maps/alchemy-flash.c | 2 +- + drivers/mtd/maps/amd76xrom.c | 4 +- + drivers/mtd/maps/cfi_flagadm.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 4 +- + drivers/mtd/maps/dbox2-flash.c | 2 +- + drivers/mtd/maps/edb7312.c | 2 +- + drivers/mtd/maps/esb2rom.c | 4 +- + drivers/mtd/maps/fortunet.c | 2 +- + drivers/mtd/maps/h720x-flash.c | 2 +- + drivers/mtd/maps/ichxrom.c | 4 +- + drivers/mtd/maps/impa7.c | 2 +- + drivers/mtd/maps/ipaq-flash.c | 2 +- + drivers/mtd/maps/mbx860.c | 2 +- + drivers/mtd/maps/nettel.c | 5 +- + drivers/mtd/maps/octagon-5066.c | 2 +- + drivers/mtd/maps/physmap.c | 41 +- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/redwood.c | 2 +- + drivers/mtd/maps/rpxlite.c | 2 +- + drivers/mtd/maps/sbc8240.c | 2 +- + drivers/mtd/maps/scb2_flash.c | 8 +- + drivers/mtd/maps/sharpsl-flash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/maps/uclinux.c | 4 +- + drivers/mtd/maps/vmax301.c | 2 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 +- + drivers/mtd/mtdchar.c | 6 +- + drivers/mtd/mtdconcat.c | 35 +- + drivers/mtd/mtdcore.c | 16 +- + drivers/mtd/mtdoops.c | 9 +- + drivers/mtd/mtdpart.c | 34 +- + drivers/mtd/nand/Kconfig | 7 + + drivers/mtd/nand/alauda.c | 6 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/nand_base.c | 25 +- + drivers/mtd/nand/nand_bbt.c | 31 +- + drivers/mtd/nand/nandsim.c | 339 +++++++++-- + drivers/mtd/nand/ndfc.c | 269 ++++---- + drivers/mtd/nand/pxa3xx_nand.c | 6 +- + drivers/mtd/nand/sharpsl.c | 247 ++++---- + drivers/mtd/nftlcore.c | 2 +- + drivers/mtd/nftlmount.c | 4 +- + drivers/mtd/onenand/onenand_base.c | 8 +- + drivers/mtd/rfd_ftl.c | 29 +- + drivers/mtd/ssfdc.c | 7 +- + drivers/mtd/tests/Makefile | 7 + + drivers/mtd/tests/mtd_oobtest.c | 742 +++++++++++++++++++++ + drivers/mtd/tests/mtd_pagetest.c | 632 ++++++++++++++++++ + drivers/mtd/tests/mtd_readtest.c | 253 +++++++ + drivers/mtd/tests/mtd_speedtest.c | 502 ++++++++++++++ + drivers/mtd/tests/mtd_stresstest.c | 330 ++++++++++ + drivers/mtd/tests/mtd_subpagetest.c | 525 +++++++++++++++ + drivers/mtd/tests/mtd_torturetest.c | 530 +++++++++++++++ + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/gluebi.c | 17 +- + fs/jffs2/compr_rubin.c | 120 ++-- + fs/jffs2/erase.c | 5 +- + include/linux/mtd/ftl.h | 38 +- + include/linux/mtd/map.h | 1 + + include/linux/mtd/mtd.h | 75 ++- + include/linux/mtd/nand.h | 7 +- + include/linux/mtd/partitions.h | 6 +- + include/linux/mtd/pfow.h | 159 +++++ + include/linux/mtd/physmap.h | 1 + + include/linux/mtd/qinfo.h | 91 +++ + include/linux/mtd/sharpsl.h | 20 + + 87 files changed, 6127 insertions(+), 678 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/4xx/ndfc.txt + create mode 100644 drivers/mtd/lpddr/Kconfig + create mode 100644 drivers/mtd/lpddr/Makefile + create mode 100644 drivers/mtd/lpddr/lpddr_cmds.c + create mode 100644 drivers/mtd/lpddr/qinfo_probe.c + create mode 100644 drivers/mtd/tests/Makefile + create mode 100644 drivers/mtd/tests/mtd_oobtest.c + create mode 100644 drivers/mtd/tests/mtd_pagetest.c + create mode 100644 drivers/mtd/tests/mtd_readtest.c + create mode 100644 drivers/mtd/tests/mtd_speedtest.c + create mode 100644 drivers/mtd/tests/mtd_stresstest.c + create mode 100644 drivers/mtd/tests/mtd_subpagetest.c + create mode 100644 drivers/mtd/tests/mtd_torturetest.c + create mode 100644 include/linux/mtd/pfow.h + create mode 100644 include/linux/mtd/qinfo.h + create mode 100644 include/linux/mtd/sharpsl.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_analog.c | 5 +++-- + sound/pci/hda/patch_nvhdmi.c | 2 ++ + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kvm/svm.c +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged init/Kconfig +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/cpu.c +Auto-merged kernel/module.c +Auto-merged kernel/sched.c +Auto-merged kernel/stop_machine.c +Resolved 'init/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4c78969: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 8 + + arch/alpha/include/asm/percpu.h | 21 ++- + arch/cris/arch-v10/kernel/entry.S | 2 +- + arch/cris/arch-v32/mm/mmu.S | 2 +- + arch/ia64/include/asm/percpu.h | 5 +- + arch/ia64/kernel/crash.c | 4 +- + arch/ia64/kernel/ia64_ksyms.c | 4 +- + arch/ia64/kernel/setup.c | 8 +- + arch/ia64/mm/discontig.c | 2 +- + arch/mn10300/kernel/kprobes.c | 2 +- + arch/parisc/lib/fixup.S | 8 +- + arch/powerpc/kernel/sysfs.c | 43 ++---- + arch/powerpc/platforms/cell/interrupt.c | 14 +- + arch/powerpc/platforms/pseries/hvCall.S | 2 +- + arch/sparc/kernel/rtrap_64.S | 8 +- + arch/x86/include/asm/percpu.h | 24 ++- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/timer.h | 5 +- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +- + arch/x86/kernel/dumpstack_64.c | 2 +- + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/tsc.c | 4 +- + arch/x86/kvm/svm.c | 14 +- + arch/x86/xen/xen-asm_32.S | 4 +- + block/blktrace.c | 2 +- + drivers/acpi/processor_perflib.c | 4 +- + drivers/acpi/processor_throttling.c | 72 ++++---- + drivers/cpufreq/cpufreq.c | 16 +- + drivers/firmware/dcdbas.c | 44 ++--- + drivers/s390/net/netiucv.c | 8 +- + include/asm-generic/percpu.h | 60 ++++++- + include/linux/compiler.h | 4 +- + include/linux/percpu.h | 117 +++++++------ + include/net/snmp.h | 12 +- + init/main.c | 9 + + kernel/lockdep.c | 11 +- + kernel/module.c | 154 +---------------- + kernel/sched.c | 20 ++- + kernel/softirq.c | 4 +- + kernel/softlockup.c | 20 +- + kernel/stop_machine.c | 2 +- + kernel/workqueue.c | 2 +- + mm/allocpercpu.c | 265 +++++++++++++++++----------- + mm/vmstat.c | 6 +- + net/ipv4/af_inet.c | 14 +- + net/ipv4/ip_input.c | 3 +- + net/ipv4/route.c | 4 +- + 50 files changed, 520 insertions(+), 535 deletions(-) +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/mount.h +Merge made by recursive. + fs/gfs2/locking.c | 82 +++++++++++++++++++++++++++++++++++++ + fs/gfs2/mount.c | 111 +++++++++----------------------------------------- + fs/gfs2/mount.h | 17 -------- + fs/gfs2/ops_fstype.c | 11 ++++- + fs/gfs2/ops_super.c | 41 ++++++++++++++----- + fs/gfs2/super.h | 26 ++++++----- + 6 files changed, 155 insertions(+), 133 deletions(-) + delete mode 100644 fs/gfs2/mount.h +Merging input/next +$ git merge input/next +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged fs/fcntl.c +Auto-merged fs/ioctl.c +CONFLICT (content): Merge conflict in fs/ioctl.c +Resolved 'fs/ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit bfec43f: Merge commit 'bkl-removal/bkl-removal' +$ git diff -M --stat --summary HEAD^.. + drivers/char/rtc.c | 17 ++++------------- + 1 files changed, 4 insertions(+), 13 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +CONFLICT (content): Merge conflict in drivers/net/starfire.c +Auto-merged drivers/net/tg3.c +CONFLICT (content): Merge conflict in drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +CONFLICT (content): Merge conflict in firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/net/starfire.c' using previous resolution. +Resolved 'drivers/net/tg3.c' using previous resolution. +Resolved 'firmware/Makefile' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b263332: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 9 + + firmware/WHENCE | 71 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 35 files changed, 9889 insertions(+), 21370 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merged drivers/mfd/wm8350-core.c +Auto-merged drivers/regulator/wm8350-regulator.c +Auto-merged include/linux/mfd/wm8350/pmic.h +Merge made by recursive. + drivers/leds/Kconfig | 15 ++- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 25 +-- + drivers/leds/leds-alix2.c | 209 +++++++++++++++++++++ + drivers/leds/leds-ams-delta.c | 4 +- + drivers/leds/leds-pca9532.c | 77 ++++++-- + drivers/leds/leds-wm8350.c | 333 ++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-timer.c | 92 +++++----- + drivers/mfd/wm8350-core.c | 3 + + drivers/regulator/wm8350-regulator.c | 91 +++++++++ + include/linux/leds-pca9532.h | 2 + + include/linux/leds.h | 2 +- + include/linux/mfd/wm8350/pmic.h | 36 ++++ + 13 files changed, 803 insertions(+), 88 deletions(-) + create mode 100644 drivers/leds/leds-alix2.c + create mode 100644 drivers/leds/leds-wm8350.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merged drivers/video/backlight/backlight.c +Auto-merged drivers/video/backlight/lcd.c +Merge made by recursive. + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/backlight.c | 33 +++++++++---------- + drivers/video/backlight/cr_bllcd.c | 18 ++++------ + drivers/video/backlight/{da903x.c => da903x_bl.c} | 0 + drivers/video/backlight/hp680_bl.c | 20 +++++------- + drivers/video/backlight/lcd.c | 36 +++++++++----------- + drivers/video/backlight/progear_bl.c | 20 +++++------- + drivers/video/backlight/tosa_lcd.c | 27 ++++++++++++++- + drivers/video/backlight/vgg2432a4.c | 2 +- + 9 files changed, 81 insertions(+), 77 deletions(-) + rename drivers/video/backlight/{da903x.c => da903x_bl.c} (100%) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merged fs/block_dev.c +Merge made by recursive. + drivers/md/bitmap.c | 3 +- + drivers/md/faulty.c | 3 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 418 +++++++++++++++++++++++++++++++------------- + drivers/md/multipath.c | 3 +- + drivers/md/raid0.c | 178 +++++++++---------- + drivers/md/raid1.c | 11 +- + drivers/md/raid10.c | 3 +- + drivers/md/raid5.c | 8 +- + fs/block_dev.c | 14 ++ + include/linux/raid/md_k.h | 20 ++- + include/linux/raid/md_p.h | 2 + + include/linux/raid/raid0.h | 10 +- + 13 files changed, 431 insertions(+), 245 deletions(-) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/head_32.S +Auto-merged arch/x86/kernel/traps.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged include/linux/gfp.h +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2757335: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + 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_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/kmemcheck.h | 42 ++ + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + 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/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 136 +++---- + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/regulator.tmpl | 304 +++++++++++++++ + drivers/Makefile | 4 +- + drivers/regulator/core.c | 474 ++++++++++++++--------- + drivers/regulator/da903x.c | 12 +- + include/linux/regulator/consumer.h | 8 +- + include/linux/regulator/driver.h | 40 ++- + include/linux/regulator/machine.h | 41 ++ + 9 files changed, 749 insertions(+), 272 deletions(-) + create mode 100644 Documentation/DocBook/regulator.tmpl +Merging security-testing/next +$ git merge security-testing/next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Merge made by recursive. + drivers/char/pty.c | 4 +--- + drivers/serial/jsm/jsm_neo.c | 3 --- + drivers/usb/serial/usb-serial.c | 3 --- + 3 files changed, 1 insertions(+), 9 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Auto-merged lib/swiotlb.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged drivers/usb/wusbcore/rh.c +Merge made by recursive. + drivers/usb/host/whci/asl.c | 9 +++++++-- + drivers/usb/host/whci/hw.c | 15 +++++++++++++++ + drivers/usb/host/whci/pzl.c | 9 +++++++-- + drivers/usb/host/whci/whcd.h | 1 + + drivers/usb/wusbcore/devconnect.c | 1 + + drivers/usb/wusbcore/rh.c | 3 +++ + drivers/uwb/allocator.c | 1 - + drivers/uwb/rsv.c | 17 +++++++++++++---- + 8 files changed, 47 insertions(+), 9 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + arch/powerpc/boot/dts/gef_sbc610.dts | 15 + + arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 + + drivers/watchdog/Kconfig | 6 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/gef_wdt.c | 330 ++++++++++++++++++++++++ + 5 files changed, 353 insertions(+), 0 deletions(-) + create mode 100644 drivers/watchdog/gef_wdt.c +Merging proc/proc +$ git merge proc/proc +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merged include/linux/dma_remapping.h +CONFLICT (content): Merge conflict in include/linux/dma_remapping.h +Auto-merged include/linux/intel-iommu.h +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Resolved 'include/linux/dma_remapping.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9a7741d: Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/scsi_scan.c +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 +++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 45 + + drivers/scsi/osd/Kconfig | 53 ++ + drivers/scsi/osd/Makefile | 37 + + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_uld.c | 457 +++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 ++++++++ + include/scsi/osd_initiator.h | 428 ++++++++++ + include/scsi/osd_protocol.h | 579 ++++++++++++++ + include/scsi/osd_sec.h | 45 + + include/scsi/osd_sense.h | 260 ++++++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4640 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_sense.h + create mode 100644 include/scsi/osd_types.h +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 jc_docs/docs-next +$ git merge jc_docs/docs-next +Auto-merged Documentation/RCU/00-INDEX +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 + + Documentation/RCU/rcubarrier.txt | 304 ++++++++++++++++++++++++++++++++++++++ + Documentation/bad_memory.txt | 45 ++++++ + 3 files changed, 351 insertions(+), 0 deletions(-) + create mode 100644 Documentation/RCU/rcubarrier.txt + create mode 100644 Documentation/bad_memory.txt +Merging nommu/master +$ git merge nommu/master +Auto-merged Documentation/sysctl/vm.txt +Auto-merged arch/blackfin/kernel/ptrace.c +Auto-merged arch/blackfin/kernel/traps.c +Auto-merged arch/powerpc/lib/dma-noncoherent.c +Auto-merged fs/binfmt_elf_fdpic.c +Auto-merged fs/binfmt_flat.c +Auto-merged fs/proc/task_nommu.c +Auto-merged include/linux/mm.h +Auto-merged include/linux/mm_types.h +Auto-merged ipc/shm.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/mmap.c +Auto-merged mm/nommu.c +CONFLICT (delete/modify): mm/tiny-shmem.c deleted in HEAD and modified in nommu/master. Version nommu/master of mm/tiny-shmem.c left in tree. +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f mm/tiny-shmem.c +kernel/fork.c: needs merge +mm/tiny-shmem.c: needs merge +rm 'mm/tiny-shmem.c' +rm 'mm/tiny-shmem.c' +$ git commit -v -a +Created commit 9a9c3d2: Merge commit 'nommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/nommu-mmap.txt | 31 +- + Documentation/sysctl/vm.txt | 18 + + arch/arm/include/asm/mmu.h | 1 - + arch/arm/mm/dma-mapping.c | 28 +- + arch/blackfin/include/asm/mmu.h | 1 - + arch/blackfin/kernel/ptrace.c | 6 +- + arch/blackfin/kernel/traps.c | 11 +- + arch/frv/kernel/ptrace.c | 11 +- + arch/h8300/include/asm/mmu.h | 1 - + arch/m68knommu/include/asm/mmu.h | 1 - + arch/sh/include/asm/mmu.h | 1 - + fs/binfmt_elf_fdpic.c | 35 +-- + fs/binfmt_flat.c | 34 +- + fs/proc/internal.h | 2 - + fs/proc/meminfo.c | 6 + + fs/proc/nommu.c | 71 ++-- + fs/proc/task_nommu.c | 120 ++++-- + include/asm-frv/mmu.h | 1 - + include/asm-m32r/mmu.h | 1 - + include/linux/mm.h | 26 +- + include/linux/mm_types.h | 19 +- + init/initramfs.c | 1 + + ipc/shm.c | 12 + + kernel/fork.c | 4 +- + kernel/sysctl.c | 14 + + lib/Kconfig.debug | 7 + + mm/mmap.c | 10 + + mm/nommu.c | 1027 ++++++++++++++++++++++++++------------ + 28 files changed, 982 insertions(+), 518 deletions(-) +Merging trivial/for-next +$ git merge trivial/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Auto-merged MAINTAINERS +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Merge made by recursive. + Documentation/filesystems/squashfs.txt | 225 ++++++++++++++ + MAINTAINERS | 7 + + fs/Kconfig | 52 ++++ + fs/Makefile | 1 + + fs/squashfs/Makefile | 8 + + fs/squashfs/block.c | 274 +++++++++++++++++ + fs/squashfs/cache.c | 412 ++++++++++++++++++++++++++ + fs/squashfs/dir.c | 235 +++++++++++++++ + fs/squashfs/export.c | 155 ++++++++++ + fs/squashfs/file.c | 502 ++++++++++++++++++++++++++++++++ + fs/squashfs/fragment.c | 98 +++++++ + fs/squashfs/id.c | 94 ++++++ + fs/squashfs/inode.c | 346 ++++++++++++++++++++++ + fs/squashfs/namei.c | 242 +++++++++++++++ + fs/squashfs/squashfs.h | 90 ++++++ + fs/squashfs/squashfs_fs.h | 381 ++++++++++++++++++++++++ + fs/squashfs/squashfs_fs_i.h | 45 +++ + fs/squashfs/squashfs_fs_sb.h | 76 +++++ + fs/squashfs/super.c | 440 ++++++++++++++++++++++++++++ + fs/squashfs/symlink.c | 118 ++++++++ + init/do_mounts_rd.c | 14 + + 21 files changed, 3815 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/squashfs.txt + create mode 100644 fs/squashfs/Makefile + create mode 100644 fs/squashfs/block.c + create mode 100644 fs/squashfs/cache.c + create mode 100644 fs/squashfs/dir.c + create mode 100644 fs/squashfs/export.c + create mode 100644 fs/squashfs/file.c + create mode 100644 fs/squashfs/fragment.c + create mode 100644 fs/squashfs/id.c + create mode 100644 fs/squashfs/inode.c + create mode 100644 fs/squashfs/namei.c + create mode 100644 fs/squashfs/squashfs.h + create mode 100644 fs/squashfs/squashfs_fs.h + create mode 100644 fs/squashfs/squashfs_fs_i.h + create mode 100644 fs/squashfs/squashfs_fs_sb.h + create mode 100644 fs/squashfs/super.c + create mode 100644 fs/squashfs/symlink.c +Merging quilt/staging +$ git merge quilt/staging +Already up-to-date. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git cherry-pick b13d3720ecd29d5044334fdbbae3432f26802bae +Finished one cherry-pick. +Created commit 95867e1: topology: Fix sparc64 build. + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..c920677aa015 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,277 @@ +Importing driver-core.current based on 2.6.28-git9 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current ede6f5aea054d3fb67c78857f7abdee602302043 +Importing usb.current based on quilt/driver-core.current +$ git checkout quilt/usb.current +Switched to branch "quilt/usb.current" +$ git reset --hard ede6f5aea054d3fb67c78857f7abdee602302043 +HEAD is now at ede6f5a Fix up 64-bit byte swaps for most 32-bit architectures +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-unusual_devs.h-additions-for-pentax-k10d.patch +usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch +usb-storage-extend-unusual-range-for-067b-3507.patch +usb-storage-recognizing-and-enabling-nokia-5200-cell-phoes.patch +usb-storage-unusual_devs.h-additions-for-macpower-masterbox.patch +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 67debd681a75cf3ad02f6c6a040780e185b91494 +HEAD is now at 67debd6 USB: storage: unusual_devs.h additions for Macpower MasterBox +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +bus_id-scsi.patch +warn-when-statically-allocated-kobjects-are-used.patch +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard 8c5dbc12049ee7eaaa6b74fdace18b70d3395a84 +HEAD is now at 8c5dbc1 warn when statically-allocated kobjects are used +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-clean-up-redundant-tests-on-unsigned.patch +usb-use-pci_ioremap_bar-in-drivers-usb.patch +usb-avoid-20ms-delay-in-ehci-resume.patch +usb-host-oxford-oxu210hp-hcd-driver.patch +usb-protect-hcd.h-from-multiple-inclusions.patch +usb-avoid-needless-address-taking-of-function-parameters.patch +usb-straighten-out-inline-code-in-sysfs.c.patch +usb-ehci-pci-quirks.c-don-t-wait-so-long-for-bios-handoff.patch +usb-wusb-annotate-association-types-withe-proper-endianness.patch +usb-remove-restrictions-on-signal-numbers-in-devio.c.patch +usb-power-availability-check-for-berry_charge.patch +usb-usbtmc-indent-braces-disagree-something-else-is-desired.patch +usb-change-interface-to-usb_lock_device_for_reset.patch +usb-fsl_qe_udc-check-for-muram-allocation-errors.patch +usb-powerpc-workaround-for-the-ppc440epx-usbh_23-errata.patch +usb-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch +usb-oxu210hp-hcd.c-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch +usb-usb-storage-add-quirks-module-parameter.patch +usb-add-asynchronous-autosuspend-autoresume-support.patch +usb-introduce-usb_queue_reset-to-do-resets-from-atomic-contexts-v7.patch +usb-convert-ohci-pnx4008-to-a-new-style-i2c-driver.patch +usb-m66592-and-r8a66597-resource-changes.patch +usb-gadget-pxa27x_udc.c-cleanup-kernel-doc.patch +usb-serial-ipw.c-mark-__init-__exit-for-usb_ipw_-init-exit.patch +usb-allow-usbmon-as-a-module-even-if-usbcore-is-builtin.patch +usb-announce-new-devices-earlier.patch +usb-storage-clean-up-unusual_devs.h.patch +usb-usb-storage-remove-us-sensebuf.patch +usb-storage-devices-and-sat.patch +usb-storage-flag-devices-known-to-support-sane_sense.patch +usb-g_file_storage-add-cd-rom-emulation.patch +usb-usb-storage-merge-cb-and-cbi-transport-routines.patch +usb-usb-storage-merge-atapi-and-qic-157-protocol-routines.patch +usb-storage-set-bounce-limit-for-non-dma-capable-host-controllers.patch +usb-don-t-use-__module_param_call.patch +usb-gadget-change-simple_strtol-to-simple_strtoul.patch +usb-gadget-mips-ci13xxx_udc.patch +usb-musb-sysfs-mode-updates.patch +usb-musb-build-fixes-for-davinci.patch +usb-musb-minor-locking-fix.patch +usb-musb-host-side-diagnostics-tweaks.patch +usb-musb-add-musb-git-tree-to-maintainers-entry.patch +usb-musb-check-if-set_irq_wake-succeded-and-remember-it.patch +usb-gadget-pxa25x_udc-vbus-sense-initialization.patch +usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch +usb-move-isp1301_omap-to-drivers-usb-otg.patch +usb-otg-gpio_vbus-transceiver-stub.patch +usb-otg-add-otg_put_transceiver.patch +usb-otg-sharable-otg-transceiver-ops.patch +usb-utilize-round_jiffies_up_relative.patch +usb-enhance-usage-of-pm_message_t.patch +usb-serial-usb_debug-make-static.patch +usb-gadget-don-t-wait-for-completion-twice.patch +usb-isp1760-use-a-specific-plx-bridge-instead-of-any-bdridge.patch +usb-isp1760-fix-probe-in-pci-glue-code.patch +usb-serial-fix-up-urb-status-usage.patch +usb-option-increase-outgoing-buffer-size-and-number.patch +usb-usb-storage-merge-dpcm-support-into-sddr09.patch +usb-musb-use-new-platform-data-interface-of-musb-to-replace-old-one.patch +usb-musb-add-blackfin-driver-to-musb-framework.patch +usb-musb-make-sure-we-program-the-correct-values-in-only-when-necessary.patch +usb-musb-add-blackfin-version-low-level-register-accessing-helper-functions.patch +usb-musb-enable-low-level-dma-operation-for-blackfin.patch +usb-musb-add-blackfin-specific-configuration-to-musb.patch +usb-musb-add-blackfin-kconfig-options-and-makefile.patch +usb-musb-blackfin-provides-read-write-i-o-accessor-in-header-files.patch +usb-musb-kill-some-compiling-warning-in-musb-blackfin-part.patch +usb-make-printk-messages-more-searchable.patch +usb-utilize-the-bus-notifiers.patch +usb-mark-reject-field-of-struct-urb-as-atomic_t.patch +usb-unusual-dev-for-option-n.v.-zerocd-modems.patch +usb-isp1760-don-t-auto-disable-port1-on-isp1761.patch +usb-extension-of-anchor-api-to-unpoison-an-anchor.patch +usb-add-imx-udc-gadget-driver.patch +/home/sfr/kernels/next/next/.git/rebase-apply/patch:348: space before tab in indent. + if (!temp & EPSTAT_STALL) +/home/sfr/kernels/next/next/.git/rebase-apply/patch:349: space before tab in indent. + break; +/home/sfr/kernels/next/next/.git/rebase-apply/patch:350: space before tab in indent. + udelay(20); +/home/sfr/kernels/next/next/.git/rebase-apply/patch:351: space before tab in indent. + } +warning: 4 lines add whitespace errors. +usb-otg-twl4030-transceiver-driver.patch +usb-storage-add-last-sector-hacks.patch +usb-storage-make-the-quirks-module-parameter-writable.patch +usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch +usb-fix-up-suspend-and-resume-for-pci-host-controllers.patch +usb-automatically-enable-wakeup-for-pci-host-controllers.patch +usb-cancel-pending-set-config-requests-if-userspace-gets-there-first.patch +usb-re-enable-interface-after-driver-unbinds.patch +usb-fix-minor-nit-in-usbfs-checking.patch +usb-fix-goku_udc-usb-speed-handling.patch +usb-emi26-fix-oops-on-load.patch +usb-add-new-opticon-serial-driver.patch +usb-add-siemens_mpi-usb-serial-stub-driver.patch +usb-remove-warn-macro-from-usb.h.patch +usb-remove-info-macro-from-usb.h.patch +debugfs-add-helpers-for-exporting-a-size_t-simple-value.patch +wimax-documentation-for-the-stack.patch +wimax-headers-for-kernel-api-and-user-space-interaction.patch +wimax-internal-api-for-the-kernel-space-wimax-stack.patch +wimax-debug-macros-and-debug-settings-for-the-wimax-stack.patch +wimax-generic-device-management.patch +genetlink-export-genl_unregister_mc_group.patch +wimax-basic-api-kernel-user-messaging-rfkill-and-reset.patch +wimax-debugfs-controls.patch +wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch +i2400m-documentation-and-instructions-for-usage.patch +i2400m-host-device-procotol-and-core-driver-definitions.patch +i2400m-generic-probe-disconnect-reset-and-message-passing.patch +i2400m-linkage-to-the-networking-stack.patch +i2400m-firmware-loading-and-bootrom-initialization.patch +i2400m-rx-and-tx-data-control-paths.patch +i2400m-various-functions-for-device-management.patch +i2400m-debugfs-controls.patch +i2400m-usb-header-for-the-usb-bus-driver.patch +i2400m-usb-probe-disconnect-dev-init-shutdown-and-reset-backends.patch +i2400m-usb-firmware-upload-backend.patch +i2400m-usb-tx-and-rx-path-backends.patch +i2400m-sdio-header-for-the-sdio-subdriver.patch +i2400m-sdio-probe-disconnect-dev-init-shutdown-and-reset-backends.patch +i2400m-sdio-firmware-upload-backend.patch +i2400m-sdio-tx-and-rx-path-backends.patch +i2400m-makefile-and-kconfig.patch +wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch +wimax-i2400m-add-credits-and-maintainers-entries.patch +Importing device-mapper based on v2.6.28-6127-g238c6d5 +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 238c6d54830c624f34ac9cf123ac04aebfca5013 +HEAD is now at 238c6d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-ioctl-validate-name-length-when-renaming.patch +dm-table-rework-reference-counting-fix.patch +Importing i2c based on 2.6.28-git9 +$ git checkout quilt/i2c +Switched to branch "quilt/i2c" +$ git reset --hard ede6f5aea054d3fb67c78857f7abdee602302043 +HEAD is now at ede6f5a Fix up 64-bit byte swaps for most 32-bit architectures +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-replace-bus_id-with-dev_name-dev_set_name-part-1.patch +i2c-replace-bus_id-with-dev_name-dev_set_name-part-2.patch +i2c-drop-I2C_CLASS_ALL.patch +i2c-drop-I2C_CLASS_CAM_ANALOG-and-I2C_CLASS_SOUND.patch +i2c-drop-I2C_CLASS_CAM_DIGITAL.patch +i2c-apanel-convert-to-new-style.patch +i2c-busses-use-snprintf.patch +Importing jdelvare-hwmon based on 2.6.28-git9 +$ git checkout quilt/jdelvare-hwmon +Switched to branch "quilt/jdelvare-hwmon" +$ git reset --hard ede6f5aea054d3fb67c78857f7abdee602302043 +HEAD is now at ede6f5a Fix up 64-bit byte swaps for most 32-bit architectures +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-f71882fg-01-use-sensor_device_attribute_2.patch +hwmon-f71882fg-02-misc-cleanups.patch +hwmon-f71882fg-03-add-pwm-support.patch +hwmon-f71882fg-04-style-cleanups.patch +hwmon-f71882fg-05-add-f71862fg-support.patch +hwmon-f71882fg-06-no-io-to-unreserved-ports.patch +hwmon-f71882fg-07-f8000-prep.patch +hwmon-f71882fg-08-fix-store-functions.patch +hwmon-f71882fg-09-simplify-hyst-functions.patch +hwmon-f71882fg-10-check-for-powerdown.patch +hwmon-f71882fg-11-separate-max-crit-alarm-and-beep.patch +hwmon-f71882fg-12-remove-fan_mode-modoption.patch +hwmon-f71882fg-13-add-f8000-support.patch +hwmon-f71882fg-14-add-f71862fg-pwm3.patch +hwmon-f71882fg-15-fix-f8000-auto_channels_temp.patch +hwmon-f71882fg-16-add-and-update-doc.patch +hwmon-f71882fg-17-printout-fan-modes.patch +hwmon-f71882fg-18-fix-fan-reg-funcs.patch +hwmon-add-ltc4245-driver.patch +hwmon-dont-overuse-I2C_CLIENT_MODULE_PARM.patch +hwmon-it87-add-it8720f-support.patch +hwmon-i5k_amb-load-automatically-on-all-5000-5400-chipsets.patch +hwmon-fschmd-01-cleanup.patch +hwmon-fschmd-02-watchdog-v4.patch +hwmon-fschmd-03-deprecate-pos-her.patch +hwmon-lm70-01-fix-byte-order.patch +hwmon-lm70-02-ti-tmp121-support.patch +hwmon-acpi-check-conflict.patch +hwmon-typos.patch +hwmon-k8temp-01-warn-about-errata.patch +Unchanged quilt series kernel-doc +Importing ide based on ede6f5aea054d3fb67c78857f7abdee602302043 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard ede6f5aea054d3fb67c78857f7abdee602302043 +HEAD is now at ede6f5a Fix up 64-bit byte swaps for most 32-bit architectures +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-fix-accidental-lockdep-breakage-caused-by-local_irq_set-removal.patch +it821x-add-ultra_mask-quirk-for-vortex86sx.patch +it821x-use-dev-revision-instead-of-pci_read_config_byte.patch +ide-cant-use-ssd-non-rotational-queue-flag-for-all-cfa-devices.patch +via82cxxx-fix-cable-warning-message.patch +sl82c105-remove-dead-code.patch +ide-remove-unused-config_blk_dev_ide_au1xxx_seqts_per_rq.patch +ide-fix-ide_dflag_no_io_32bit-handling.patch +ide-move-ide_pktcmd_tf_load-to-ide-atapi-c.patch +ide-no-need-to-touch-local-irqs-in-ide_probe_port.patch +ide-move-rqsize-init-from-init_irq-to-ide_init_port.patch +ide-move-lock-and-timer-init-from-init_irq-to-ide_init_port_data.patch +ide-init_irq-doesnt-need-to-hold-ide_cfg_mtx.patch +Importing rr based on v2.6.28-5716-gfe0bdec +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard fe0bdec68b77020281dc814805edfe594ae89e0f +HEAD is now at fe0bdec Merge branch 'audit.b61' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +module:remove_config_kmod.patch +module:compare-sym-values-for-export-mark-in-proc-kallsyms.patch +module:print_unload_info-no-proc.patch +module:parisc_fix_loading_failure_of_large_kernel_modules.patch +module:parisc-fix-large-modules.patch +stop_machine:introduce_stop_machine_create_destroy.patch +module:convert_to_stop_machine_create_destroy.patch +misc:work_on_cpu-acpi.patch +misc:work_on_cpu-dcdbas.patch +misc:work_on_cpu-pci.patch +misc:work_on_cpu-powerpc-sysfs.patch +cpualloc:big_percpu_alloc.patch +cpualloc:move-net-to-big_alloc_percpu.patch +cpualloc:remove-alignment-on-cpu_workqueue_struct.patch +cpualloc:remove-percpu_ptr-users.patch +cpualloc:add-align-arg-to-__alloc_percpu.patch +cpualloc:make_the_per_cpu_reserve_configurable.patch +cpualloc:parse-percpu-earlier.patch +cpualloc:generalize-percpu_modalloc-percpu_modfree.patch +cpualloc:expose-module-percpu-allocator.patch +cpualloc:use-module-allocator.patch +cpualloc:documentation.patch +cpualloc:get_cpu_ptr.patch +cpualloc:read_percpu.patch +cpualloc:rename-per_cpu-vars.patch +cpualloc:remove-per_cpu__-prefix.patch +cpualloc:__percpu-annotation-for-sparse.patch +Importing ttydev based on ede6f5aea054d3fb67c78857f7abdee602302043 +$ git checkout quilt/ttydev +Switched to branch "quilt/ttydev" +$ git reset --hard ede6f5aea054d3fb67c78857f7abdee602302043 +HEAD is now at ede6f5a Fix up 64-bit byte swaps for most 32-bit architectures +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +pty-doc-fix +serial-neo-removenullcheck +usb-serial-remove-nullcheck +Importing staging based on quilt/usb + quilt series is empty +$ git update-ref refs/heads/quilt/staging 9e8790464a3e7f562228ed84f70202053bcbda34 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..475fef97db86 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090108 |