diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-06 16:29:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-06 16:29:54 +1000 |
| commit | 417cb1351e3ee5daa76de4d13fa6c84ba9899238 (patch) | |
| tree | 267d51f91c228c5d8d4107197d3b20fb823aa6cc | |
| parent | c133fb346e78a3951bcfa7361caaae9695a07f3f (diff) | |
Add linux-next specific files for 20090406next-20090406
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 134 | ||||
| -rw-r--r-- | Next/Trees | 136 | ||||
| -rw-r--r-- | Next/merge.log | 4560 | ||||
| -rw-r--r-- | Next/quilt-import.log | 78 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4909 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..da7e00e721f6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,134 @@ +Name SHA1 +---- ---- +origin 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c +arm-current 6bb597507f9839b13498781e481f5458aea33620 +m68k-current 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 +powerpc-merge 15f7176eb1cccec0a332541285ee752b935c1c85 +sparc-current ed223129a30de7d244ca9b59819f5532c9caf039 +scsi-rc-fixes ee568b25ee9e160b32d1aef73d8b2ee9c05d34db +net-current 57579f7629a3d46c307405fbd2ea6bdb650d692f +sound-current c441c2971de52b7045acb708cc9959815f554f66 +pci-current a1e4ee22863d41a6fbb24310d7951836cb6dafe7 +wireless-current 8a5117d80fe93de5df5b56480054f7df1fd20755 +kbuild-current 32fb6c17566ec66de87324a834c7776f40e35e78 +driver-core.current 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 +usb.current 4c5e9f0893b2e96d0bd7b1998cc3c67a384ce6aa +cpufreq-current 753b7aea8e4611433c13ac157f944d8b4bf42482 +input-current ab96ddec7213004b632d24dc2cdcd2df5f16f50b +md-current c8f517c444e4f9f55b5b5ca202b8404691a35805 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 0d44dc59b2b434b29aafeae581d06f81efac7c83 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 9759d22c8348343b0da4e25d6150c41712686c14 +avr32 8e706c4d0dab214c625a2df84a0ca69a76bae65d +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris 276e79ee6b3ff670dc9c041178da4b61af456a27 +ia64 833bb3046b6cb320e775ea2160ddca87d53260d5 +m68k 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 +m68knommu 6bb597507f9839b13498781e481f5458aea33620 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc b609308e1415efebdf79ebd553f4dd47b0ff2722 +powerpc 15f7176eb1cccec0a332541285ee752b935c1c85 +4xx 3239572d8f3091fef59eb82f3d6ee2b5ccac150d +galak e60f57f50f861f29052e0e3563ac453da53f2181 +pxa 126ee52ad3fd0c20c9418f68f3bc88a0f646aa17 +s390 99f6a570eedc885675b6aa36b7acdbdcc3a7f55b +sh 68b42d1b548be1840aff7122fdebeb804daf0fa3 +sparc 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 +x86 b8d0be0f47972d214a5a8e158d0fec4930af01eb +xtensa 8903709b054a8dafe4e8c6d9a6444034d7aba36f +tip-core f1797d4384f2adabbdf7b7c13c93584f08733f09 +cpus4096 c7b16712f76b93eaefb4eb71b7af2a64203b5176 +tracing 39b244e228798a847db3c8227f8996586a8bd27b +genirq b6c02a408e57289faffd381d79996d148ae9b894 +safe-poison-pointers 8ed8819917312f1a117337c0280ad55721fd3894 +sched 5c37875321fe4e0fb3fd14068afb33ef7c770f54 +stackprotector 705bb9dc72b2464a7e421ee45d5e4a3f206d5c75 +timers cf96c1fe8639bda48d3c685e63d37a323a5f6021 +pci eeafda70bf2807544e96fa4e52b2433cd470ff46 +device-mapper 108268c8ea7e442bb09deb1f960e11490790ceb9 +hid 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +i2c d0bdd4729ea28ccd903c4bb116c9a93cab5b178a +jdelvare-hwmon 48a1ebf6c5a2d7ec5ad24f7d4095b5aa64c815fe +kernel-doc b463a50ec72a13a99270c76b6d20642ea5403614 +v4l-dvb 73467239bdb4e0e7159ab2169d436dd0b41dbea7 +quota 2fa7d11f2b3bcde8391eb55e1cdc7f22c3df5267 +jfs dfbbe89e197a77f2c8046a51c74e33e35f878080 +kbuild 32fb6c17566ec66de87324a834c7776f40e35e78 +ide 034690892e61a8ad75157ca00ac60e64ab330d27 +libata 15f7176eb1cccec0a332541285ee752b935c1c85 +nfs 2dd03dd07274fd5bd31dcb64f326651db91451e1 +xfs 1aacc064e029f0017384e463121b98f06d3a2cc3 +infiniband 7077782234e5f40a704244d102aa58b98e1f4740 +acpi f9de6e38333f5713ae18bfa8037da64740f81ce2 +nfsd 3ef1728898f0285c13aa6901f412b52835e23578 +ieee1394 32a0f488ce5e8a9a148491f15edc508ab5e8265b +ubi 1b24bc3aaba899f4e7f681cbbc3b93cadcf4d770 +kvm 1d0cdf1323a28b812ddbe8b698e259da5fa3e812 +dlm 1fecb1c4b62881e3689ba2dcf93072ae301b597c +scsi 015640edb1f346e0b2eda703587c4cd1c310ec1d +ocfs2 22c69cf4015f07ad39f2ce84c6ad1c27e213c763 +ext4 06705bff9114531a997a7d0c2520bea0f2927410 +async_tx 8c6db1bbf80123839ec87bdd6cb364aea384623d +udf 146bca72c7e6ba52de82a63b1fce7934dc103dbc +net 7c757eb9f804782fb39d0ae2c1a88ffb9309138e +wireless 7c757eb9f804782fb39d0ae2c1a88ffb9309138e +mtd c451c7c4c9c4f59c7808a7d397d32bef160c14d9 +crypto 7738f47ee60fd1a6d5e2aea61e86a0a5ab00bfd7 +vfs ced117c73edc917e96dea7cca98c91383f0792f7 +sound c441c2971de52b7045acb708cc9959815f554f66 +cpufreq 36e8abf3edcd2d207193ec5741d1a2a645d470a5 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +rr f548e749c9e32cf9d1397bc4019d221e21893e96 +cifs a8c7cd418ccef37d813a6f972591200cd0729758 +mmc 32ab83a56fdf42f543b86c349143c2a86ead9707 +gfs2 df3647b24510e23523f81a77bb179cd9ae3d613b +input 74f733c7257ca878bf0a4b9365a454ef3fefd196 +bkl-removal 4a6a4499693a419a20559c41e33a7bd70bf20a6f +ubifs de0975781a1a8bc92e07eb7681d10ef9bb5e6df9 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block ba348088af68b7fd5aa4dc625bad04ff8c766331 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware f0c996e7399bb6aca523119a568b56c98bbe16df +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery 5bf2b994bfe11bfe86231050897b2d881ca544d9 +leds 56478e0a9e4caffff54d3abd5384717d8364d534 +backlight a555e4cf4643681e5d735dbbe6997f1816103d22 +kgdb 4cc984538631d1f47c61f7e556e2031e0d31a1ae +slab 5c0cceb3705cff925e7c48b5afbaadabc13a225c +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md c8f517c444e4f9f55b5b5ca202b8404691a35805 +mfd fa15ce8ad59e9653d50b8596596cb02d3566d4aa +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29 +voltage d6bb69cfa88b8ac9f952de4fada5b216d5ba8830 +security-testing b5f22a59c0356655a501190959db9f7f5dd07e3f +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +ttydev c946e60ed7a79f85f3e8dc57e75f0ab59b099db5 +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +generic-ipi ee568b25ee9e160b32d1aef73d8b2ee9c05d34db +oprofile 5f062da729d7d5edcce94dd3e87d7ccbea7cea78 +fastboot ee568b25ee9e160b32d1aef73d8b2ee9c05d34db +sparseirq 15c1ac564462a00eee1d3ba49366cc6610b56275 +iommu 84be58d4601c86306cd939ebf58a9b90989883a4 +uwb a3c1239eb59c0a907f8be5587d42e950f44543f8 +watchdog 59018fae63aec30f0a5eaf1c928ae24dc031b4c7 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 276dbf997043cbf38f0087624e0f9c51742c8885 +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd 0d8fe329a80714e0f729ae48cba8d64cbe5701cb +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse fc280c9692031ee41545d6bea00bbb7c7dec97a9 +jc_docs 7ead643f665c618d4bbd9efb68595fa41b2eb93b +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial e5370afa280462bfa5d19a1072e8da0aaa0a31ac +audit def57543418a5f47debae28a0a9dea2effc11692 +squashfs 363911d027d1de1c6df79eb3f487f5476b9619f4 +omap 833bb3046b6cb320e775ea2160ddca87d53260d5 +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +kmemleak 2c2e98331488a1811355842855968cb65078e633 +suspend 8efb8c76fcdccf5050c0ea059dac392789baaff2 +driver-core ca771fa36de4bcd53fb0305f32914d644a80b6f9 +usb 3b18cb140431d454d3c2428b480ef2f656b0631d +staging 99dff82aba65ddcae3bf4401851d0d8dd23c3f91 +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..17633ec0f027 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,136 @@ +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 +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +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 +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 +tracing git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-tracing-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://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next +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 +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +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 +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 +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-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 +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +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 +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..cb5b279bbae2 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4560 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 833bb30 serial: fixup /proc/tty/driver/serial after proc_fops conversion +Merging origin/master +$ git merge origin/master +Updating 833bb30..0221c81 +Fast forward + CREDITS | 10 +- + Documentation/00-INDEX | 4 +- + Documentation/ABI/testing/debugfs-kmemtrace | 71 + + Documentation/ABI/testing/sysfs-class-regulator | 57 +- + Documentation/DocBook/.gitignore | 4 + + Documentation/RCU/listRCU.txt | 6 +- + Documentation/RCU/rcu.txt | 2 +- + Documentation/RCU/rculist_nulls.txt | 4 +- + Documentation/cgroups/00-INDEX | 18 + + Documentation/cgroups/cgroups.txt | 36 +- + Documentation/cgroups/cpusets.txt | 12 +- + Documentation/cgroups/devices.txt | 2 +- + Documentation/cgroups/memcg_test.txt | 22 +- + Documentation/cgroups/memory.txt | 2 +- + Documentation/devices.txt | 121 +- + Documentation/feature-removal-schedule.txt | 17 +- + Documentation/filesystems/caching/backend-api.txt | 658 ++ + Documentation/filesystems/caching/cachefiles.txt | 501 ++ + Documentation/filesystems/caching/fscache.txt | 333 + + Documentation/filesystems/caching/netfs-api.txt | 778 ++ + Documentation/filesystems/caching/object.txt | 313 + + Documentation/filesystems/caching/operations.txt | 213 + + Documentation/filesystems/exofs.txt | 176 + + Documentation/filesystems/ext3.txt | 14 +- + .../filesystems/pohmelfs/design_notes.txt | 70 + + Documentation/filesystems/pohmelfs/info.txt | 86 + + .../filesystems/pohmelfs/network_protocol.txt | 227 + + Documentation/filesystems/proc.txt | 1097 +--- + Documentation/filesystems/udf.txt | 2 + + Documentation/ftrace.txt | 1134 ++- + Documentation/gpio.txt | 23 +- + Documentation/ia64/kvm.txt | 2 +- + Documentation/kernel-parameters.txt | 41 +- + Documentation/laptops/acer-wmi.txt | 10 +- + Documentation/laptops/thinkpad-acpi.txt | 144 +- + Documentation/md.txt | 37 +- + Documentation/networking/vxge.txt | 100 + + .../dts-bindings/fsl/cpm_qe/qe/firmware.txt | 2 +- + Documentation/scheduler/sched-rt-group.txt | 2 +- + Documentation/slow-work.txt | 174 + + Documentation/sysctl/00-INDEX | 2 + + Documentation/sysctl/fs.txt | 74 +- + Documentation/sysctl/kernel.txt | 53 + + Documentation/sysctl/net.txt | 175 + + Documentation/sysrq.txt | 2 + + Documentation/tracepoints.txt | 21 +- + Documentation/vm/kmemtrace.txt | 126 + + Documentation/vm/numa_memory_policy.txt | 3 +- + Documentation/vm/page_migration | 3 +- + Documentation/x86/x86_64/fake-numa-for-cpusets | 5 +- + MAINTAINERS | 68 +- + arch/Kconfig | 1 + + arch/alpha/include/asm/ftrace.h | 1 + + arch/alpha/include/asm/hardirq.h | 13 - + arch/alpha/include/asm/spinlock.h | 3 + + arch/alpha/kernel/process.c | 2 +- + arch/arm/boot/compressed/misc.c | 5 +- + arch/arm/configs/omap_ldp_defconfig | 24 +- + arch/arm/configs/pcm037_defconfig | 23 +- + arch/arm/configs/realview-smp_defconfig | 24 +- + arch/arm/configs/realview_defconfig | 24 +- + arch/arm/include/asm/spinlock.h | 3 + + arch/arm/kernel/process.c | 2 +- + arch/arm/mach-at91/pm.c | 8 +- + arch/arm/mach-gemini/include/mach/system.h | 2 +- + arch/arm/mach-mmp/include/mach/system.h | 2 +- + arch/arm/mach-mx3/pcm037.c | 23 +- + arch/arm/mach-netx/include/mach/netx-regs.h | 2 +- + arch/arm/mach-omap1/Kconfig | 2 +- + arch/arm/mach-omap2/Makefile | 2 + + arch/arm/mach-omap2/board-ldp.c | 47 +- + arch/arm/mach-omap2/board-overo.c | 65 + + arch/arm/mach-pxa/magician.c | 1 - + arch/arm/mach-realview/core.c | 17 +- + arch/arm/mach-realview/localtimer.c | 1 + + arch/arm/mm/abort-ev6.S | 4 +- + arch/arm/mm/cache-feroceon-l2.c | 9 +- + arch/arm/vfp/entry.S | 23 +- + arch/arm/vfp/vfphw.S | 12 + + arch/arm/vfp/vfpmodule.c | 6 +- + arch/avr32/Kconfig | 20 +- + arch/avr32/Makefile | 1 + + arch/avr32/boards/atngw100/evklcd10x.c | 50 +- + arch/avr32/boards/atngw100/setup.c | 7 +- + arch/avr32/boards/atstk1000/atstk1002.c | 6 +- + arch/avr32/boards/atstk1000/atstk1003.c | 6 +- + arch/avr32/boards/atstk1000/atstk1004.c | 6 +- + arch/avr32/boards/favr-32/setup.c | 9 +- + arch/avr32/boards/hammerhead/setup.c | 6 +- + arch/avr32/boards/merisc/Kconfig | 5 + + arch/avr32/boards/merisc/Makefile | 1 + + arch/avr32/boards/merisc/display.c | 65 + + arch/avr32/boards/merisc/flash.c | 139 + + arch/avr32/boards/merisc/merisc.h | 18 + + arch/avr32/boards/merisc/merisc_sysfs.c | 65 + + arch/avr32/boards/merisc/setup.c | 297 + + arch/avr32/boards/mimc200/setup.c | 8 +- + arch/avr32/configs/merisc_defconfig | 1237 +++ + arch/avr32/include/asm/ftrace.h | 1 + + arch/avr32/include/asm/hardirq.h | 11 - + arch/avr32/kernel/process.c | 2 +- + arch/avr32/mach-at32ap/at32ap700x.c | 112 +- + arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 52 +- + arch/avr32/mach-at32ap/include/mach/board.h | 24 +- + arch/blackfin/Kconfig | 6 +- + arch/blackfin/include/asm/ftrace.h | 1 + + arch/blackfin/kernel/process.c | 2 +- + arch/cris/Kconfig | 6 +- + arch/cris/arch-v10/kernel/irq.c | 2 +- + arch/cris/arch-v10/kernel/process.c | 2 +- + arch/cris/arch-v32/Kconfig | 2 +- + arch/cris/arch-v32/boot/compressed/Makefile | 6 +- + arch/cris/arch-v32/drivers/Kconfig | 2 +- + arch/cris/arch-v32/kernel/irq.c | 2 +- + arch/cris/arch-v32/kernel/process.c | 2 +- + arch/cris/arch-v32/kernel/smp.c | 10 +- + arch/cris/arch-v32/mach-fs/Kconfig | 2 +- + arch/cris/arch-v32/mm/tlb.c | 2 +- + arch/cris/include/arch-v32/arch/spinlock.h | 2 + + arch/cris/include/asm/ftrace.h | 1 + + arch/cris/kernel/process.c | 1 - + arch/cris/kernel/setup.c | 2 +- + arch/cris/mm/init.c | 3 +- + arch/frv/kernel/process.c | 2 +- + arch/h8300/include/asm/ftrace.h | 1 + + arch/h8300/kernel/process.c | 2 +- + arch/h8300/kernel/timer/tpu.c | 2 +- + arch/ia64/Kconfig | 3 + + arch/ia64/configs/generic_defconfig | 3 - + arch/ia64/include/asm/ftrace.h | 28 + + arch/ia64/include/asm/hardirq.h | 10 - + arch/ia64/include/asm/spinlock.h | 77 +- + arch/ia64/include/asm/uv/uv_hub.h | 6 + + arch/ia64/include/asm/uv/uv_mmrs.h | 158 +- + arch/ia64/kernel/Makefile | 5 + + arch/ia64/kernel/entry.S | 100 + + arch/ia64/kernel/ftrace.c | 206 + + arch/ia64/kernel/ia64_ksyms.c | 6 + + arch/ia64/kernel/process.c | 2 +- + arch/m32r/kernel/process.c | 2 +- + arch/m68k/include/asm/bootinfo.h | 381 +- + arch/m68k/include/asm/bootinfo_mm.h | 378 - + arch/m68k/include/asm/bootinfo_no.h | 2 - + arch/m68k/include/asm/bug.h | 31 +- + arch/m68k/include/asm/bug_mm.h | 29 - + arch/m68k/include/asm/bug_no.h | 4 - + arch/m68k/include/asm/bugs.h | 21 +- + arch/m68k/include/asm/bugs_mm.h | 14 - + arch/m68k/include/asm/bugs_no.h | 16 - + arch/m68k/include/asm/cache.h | 14 +- + arch/m68k/include/asm/cache_mm.h | 11 - + arch/m68k/include/asm/cache_no.h | 12 - + arch/m68k/include/asm/current.h | 31 +- + arch/m68k/include/asm/current_mm.h | 6 - + arch/m68k/include/asm/current_no.h | 24 - + arch/m68k/include/asm/div64.h | 37 +- + arch/m68k/include/asm/div64_mm.h | 28 - + arch/m68k/include/asm/div64_no.h | 1 - + arch/m68k/include/asm/dma-mapping.h | 113 +- + arch/m68k/include/asm/dma-mapping_mm.h | 112 - + arch/m68k/include/asm/dma-mapping_no.h | 6 - + arch/m68k/include/asm/elf.h | 120 +- + arch/m68k/include/asm/elf_mm.h | 119 - + arch/m68k/include/asm/elf_no.h | 110 - + arch/m68k/include/asm/fb.h | 41 +- + arch/m68k/include/asm/fb_mm.h | 34 - + arch/m68k/include/asm/fb_no.h | 12 - + arch/m68k/include/asm/fpu.h | 22 +- + arch/m68k/include/asm/fpu_mm.h | 21 - + arch/m68k/include/asm/fpu_no.h | 21 - + arch/m68k/include/asm/ftrace.h | 1 + + arch/m68k/include/asm/hw_irq.h | 9 +- + arch/m68k/include/asm/hw_irq_mm.h | 6 - + arch/m68k/include/asm/hw_irq_no.h | 4 - + arch/m68k/include/asm/kmap_types.h | 26 +- + arch/m68k/include/asm/kmap_types_mm.h | 21 - + arch/m68k/include/asm/kmap_types_no.h | 21 - + arch/m68k/include/asm/m532xsim.h | 1 + + arch/m68k/include/asm/mc146818rtc.h | 31 +- + arch/m68k/include/asm/mc146818rtc_mm.h | 26 - + arch/m68k/include/asm/mc146818rtc_no.h | 9 - + arch/m68k/include/asm/mcfpci.h | 119 - + arch/m68k/include/asm/mmu.h | 14 +- + arch/m68k/include/asm/mmu_context.h | 176 +- + arch/m68k/include/asm/mmu_context_mm.h | 154 - + arch/m68k/include/asm/mmu_context_no.h | 33 - + arch/m68k/include/asm/mmu_mm.h | 7 - + arch/m68k/include/asm/mmu_no.h | 10 - + arch/m68k/include/asm/module.h | 51 +- + arch/m68k/include/asm/module_mm.h | 39 - + arch/m68k/include/asm/module_no.h | 11 - + arch/m68k/include/asm/page_offset.h | 12 +- + arch/m68k/include/asm/page_offset_mm.h | 8 - + arch/m68k/include/asm/page_offset_no.h | 5 - + arch/m68k/include/asm/pci.h | 17 +- + arch/m68k/include/asm/pci_mm.h | 12 - + arch/m68k/include/asm/pci_no.h | 29 - + arch/m68k/include/asm/pgalloc.h | 20 +- + arch/m68k/include/asm/pgalloc_mm.h | 19 - + arch/m68k/include/asm/pgalloc_no.h | 8 - + arch/m68k/include/asm/pgtable_no.h | 2 + + arch/m68k/include/asm/rtc.h | 7 +- + arch/m68k/include/asm/scatterlist.h | 26 +- + arch/m68k/include/asm/scatterlist_mm.h | 23 - + arch/m68k/include/asm/scatterlist_no.h | 22 - + arch/m68k/include/asm/segment.h | 64 +- + arch/m68k/include/asm/segment_mm.h | 57 - + arch/m68k/include/asm/segment_no.h | 51 - + arch/m68k/include/asm/timex.h | 21 +- + arch/m68k/include/asm/timex_mm.h | 18 - + arch/m68k/include/asm/timex_no.h | 23 - + arch/m68k/include/asm/tlbflush.h | 268 +- + arch/m68k/include/asm/tlbflush_mm.h | 219 - + arch/m68k/include/asm/tlbflush_no.h | 55 - + arch/m68k/include/asm/ucontext.h | 33 +- + arch/m68k/include/asm/ucontext_mm.h | 30 - + arch/m68k/include/asm/ucontext_no.h | 32 - + arch/m68k/include/asm/unaligned.h | 26 +- + arch/m68k/include/asm/unaligned_mm.h | 13 - + arch/m68k/include/asm/unaligned_no.h | 25 - + arch/m68k/kernel/process.c | 2 +- + arch/m68k/kernel/time.c | 18 + + arch/m68knommu/Makefile | 14 +- + arch/m68knommu/kernel/dma.c | 8 +- + arch/m68knommu/kernel/irq.c | 2 +- + arch/m68knommu/kernel/process.c | 2 +- + arch/m68knommu/mm/init.c | 6 +- + arch/m68knommu/platform/5249/config.c | 11 +- + arch/m68knommu/platform/5307/config.c | 8 +- + arch/m68knommu/platform/5407/config.c | 8 +- + arch/m68knommu/platform/coldfire/Makefile | 2 +- + arch/m68knommu/platform/coldfire/clk.c | 40 + + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/ftrace.h | 1 + + arch/mips/include/asm/spinlock.h | 2 + + arch/mips/include/asm/unistd.h | 18 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/scall32-o32.S | 2 + + arch/mips/kernel/scall64-64.S | 2 + + arch/mips/kernel/scall64-n32.S | 2 + + arch/mips/kernel/scall64-o32.S | 2 + + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mn10300/kernel/process.c | 2 +- + arch/parisc/Kconfig | 12 +- + arch/parisc/Makefile | 4 +- + arch/parisc/include/asm/atomic.h | 18 +- + arch/parisc/include/asm/cacheflush.h | 3 + + arch/parisc/include/asm/elf.h | 10 + + arch/parisc/include/asm/ftrace.h | 25 + + arch/parisc/include/asm/page.h | 13 +- + arch/parisc/include/asm/pdc.h | 4 + + arch/parisc/include/asm/pgtable.h | 15 +- + arch/parisc/include/asm/smp.h | 3 +- + arch/parisc/include/asm/spinlock.h | 3 + + arch/parisc/kernel/Makefile | 15 + + arch/parisc/kernel/entry.S | 60 +- + arch/parisc/kernel/firmware.c | 6 +- + arch/parisc/kernel/ftrace.c | 185 + + arch/parisc/kernel/irq.c | 4 +- + arch/parisc/kernel/module.c | 18 - + arch/parisc/kernel/parisc_ksyms.c | 5 + + arch/parisc/kernel/process.c | 31 +- + arch/parisc/kernel/processor.c | 13 +- + arch/parisc/kernel/smp.c | 21 +- + arch/parisc/kernel/stacktrace.c | 63 + + arch/parisc/kernel/syscall.S | 58 +- + arch/parisc/kernel/time.c | 9 +- + arch/parisc/kernel/traps.c | 5 +- + arch/parisc/kernel/vmlinux.lds.S | 2 + + arch/parisc/mm/init.c | 7 + + arch/powerpc/Kconfig | 2 +- + arch/powerpc/Kconfig.debug | 10 - + arch/powerpc/include/asm/mmzone.h | 1 + + arch/powerpc/include/asm/ps3.h | 3 + + arch/powerpc/include/asm/spinlock.h | 3 + + arch/powerpc/kernel/ftrace.c | 6 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/time.c | 16 + + arch/powerpc/kernel/vio.c | 2 +- + arch/powerpc/platforms/Kconfig | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/powerpc/platforms/ps3/os-area.c | 2 + + arch/powerpc/platforms/ps3/platform.h | 2 - + arch/powerpc/platforms/ps3/setup.c | 2 - + arch/powerpc/platforms/ps3/time.c | 26 +- + arch/powerpc/sysdev/bestcomm/Kconfig | 4 +- + arch/s390/Kconfig.debug | 9 - + arch/s390/include/asm/smp.h | 6 - + arch/s390/include/asm/spinlock.h | 3 + + arch/s390/kernel/process.c | 2 +- + arch/sh/Kconfig | 10 +- + arch/sh/boards/board-ap325rxa.c | 57 +- + arch/sh/boards/board-urquell.c | 4 + + arch/sh/boards/mach-migor/setup.c | 4 +- + arch/sh/configs/ap325rxa_defconfig | 70 +- + arch/sh/configs/cayman_defconfig | 235 +- + arch/sh/configs/dreamcast_defconfig | 71 +- + arch/sh/configs/edosk7705_defconfig | 29 +- + arch/sh/configs/edosk7760_defconfig | 78 +- + arch/sh/configs/espt_defconfig | 39 +- + arch/sh/configs/hp6xx_defconfig | 54 +- + arch/sh/configs/landisk_defconfig | 97 +- + arch/sh/configs/lboxre2_defconfig | 69 +- + arch/sh/configs/magicpanelr2_defconfig | 73 +- + arch/sh/configs/microdev_defconfig | 74 +- + arch/sh/configs/migor_defconfig | 82 +- + arch/sh/configs/polaris_defconfig | 31 +- + arch/sh/configs/r7780mp_defconfig | 91 +- + arch/sh/configs/r7785rp_defconfig | 96 +- + arch/sh/configs/rsk7201_defconfig | 57 +- + arch/sh/configs/rsk7203_defconfig | 94 +- + arch/sh/configs/rts7751r2d1_defconfig | 83 +- + arch/sh/configs/rts7751r2dplus_defconfig | 83 +- + arch/sh/configs/sdk7780_defconfig | 78 +- + arch/sh/configs/se7206_defconfig | 82 +- + arch/sh/configs/se7343_defconfig | 89 +- + arch/sh/configs/se7619_defconfig | 55 +- + arch/sh/configs/se7705_defconfig | 75 +- + arch/sh/configs/se7712_defconfig | 79 +- + arch/sh/configs/se7721_defconfig | 82 +- + arch/sh/configs/se7722_defconfig | 76 +- + arch/sh/configs/se7750_defconfig | 71 +- + arch/sh/configs/se7751_defconfig | 74 +- + arch/sh/configs/se7780_defconfig | 78 +- + arch/sh/configs/sh03_defconfig | 79 +- + arch/sh/configs/sh7710voipgw_defconfig | 69 +- + arch/sh/configs/sh7763rdp_defconfig | 82 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 42 +- + arch/sh/configs/sh7785lcr_defconfig | 90 +- + arch/sh/configs/shmin_defconfig | 73 +- + arch/sh/configs/shx3_defconfig | 99 +- + arch/sh/configs/snapgear_defconfig | 62 +- + arch/sh/configs/systemh_defconfig | 54 +- + arch/sh/configs/titan_defconfig | 101 +- + arch/sh/configs/ul2_defconfig | 93 +- + arch/sh/configs/urquell_defconfig | 45 +- + arch/sh/drivers/dma/Kconfig | 20 +- + arch/sh/drivers/pci/ops-sh7785lcr.c | 9 +- + arch/sh/drivers/pci/pci-sh7780.c | 16 +- + arch/sh/include/asm/mmu.h | 35 +- + arch/sh/include/asm/processor_32.h | 13 + + arch/sh/include/asm/ptrace.h | 8 - + arch/sh/include/asm/spinlock.h | 3 + + arch/sh/include/asm/system.h | 1 + + arch/sh/include/asm/system_32.h | 170 +- + arch/sh/include/cpu-sh4/cpu/sh7786.h | 214 +- + arch/sh/kernel/cpu/sh3/entry.S | 85 +- + arch/sh/kernel/cpu/sh4/probe.c | 5 - + arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 185 +- + arch/sh/kernel/idle.c | 2 +- + arch/sh/kernel/io_trapped.c | 13 + + arch/sh/kernel/process_32.c | 16 +- + arch/sh/kernel/process_64.c | 2 +- + arch/sh/kernel/ptrace_32.c | 6 +- + arch/sh/kernel/setup.c | 5 +- + arch/sh/kernel/traps_32.c | 2 + + arch/sh/mm/Kconfig | 12 - + arch/sparc/Kconfig.debug | 9 - + arch/sparc/include/asm/mmzone.h | 2 + + arch/sparc/include/asm/spinlock_32.h | 2 + + arch/sparc/include/asm/spinlock_64.h | 2 + + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/process_32.c | 2 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/ubd_kern.c | 12 +- + arch/um/include/asm/ftrace.h | 1 + + arch/um/kernel/process.c | 2 +- + arch/um/kernel/syscall.c | 3 +- + arch/um/sys-i386/sys_call_table.S | 11 + + arch/x86/Kconfig | 10 +- + arch/x86/Kconfig.debug | 9 - + arch/x86/boot/Makefile | 3 +- + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/include/asm/cacheflush.h | 5 + + arch/x86/include/asm/cpumask.h | 18 - + arch/x86/include/asm/fixmap.h | 2 + + arch/x86/include/asm/ftrace.h | 7 + + arch/x86/include/asm/pci.h | 41 +- + arch/x86/include/asm/pci_32.h | 34 - + arch/x86/include/asm/pci_64.h | 22 - + arch/x86/include/asm/processor.h | 3 +- + arch/x86/include/asm/ptrace-abi.h | 3 - + arch/x86/include/asm/smp.h | 13 +- + arch/x86/include/asm/spinlock.h | 3 + + arch/x86/include/asm/thread_info.h | 9 +- + arch/x86/include/asm/topology.h | 87 +- + arch/x86/include/asm/unistd_32.h | 2 + + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/include/asm/uv/uv_hub.h | 14 + + arch/x86/include/asm/uv/uv_mmrs.h | 153 + + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/acpi/boot.c | 65 +- + arch/x86/kernel/alternative.c | 29 +- + arch/x86/kernel/amd_iommu.c | 7 + + arch/x86/kernel/apic/bigsmp_32.c | 16 +- + arch/x86/kernel/apic/es7000_32.c | 17 +- + arch/x86/kernel/apic/nmi.c | 11 +- + arch/x86/kernel/apic/numaq_32.c | 11 +- + arch/x86/kernel/apic/probe_32.c | 3 +- + arch/x86/kernel/apic/summit_32.c | 21 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 9 +- + arch/x86/kernel/apm_32.c | 248 +- + arch/x86/kernel/cpu/common.c | 13 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 16 +- + arch/x86/kernel/cpu/cpufreq/longhaul.c | 6 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 2 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 +- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 2 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 24 +- + arch/x86/kernel/cpu/mcheck/mce_64.c | 10 +- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 3 - + arch/x86/kernel/cpu/proc.c | 6 +- + arch/x86/kernel/dumpstack.c | 6 + + arch/x86/kernel/ftrace.c | 192 +- + arch/x86/kernel/kprobes.c | 17 +- + arch/x86/kernel/microcode_amd.c | 43 +- + arch/x86/kernel/microcode_core.c | 160 +- + arch/x86/kernel/microcode_intel.c | 83 +- + arch/x86/kernel/process.c | 25 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/ptrace.c | 9 +- + arch/x86/kernel/setup_percpu.c | 16 +- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/smpboot.c | 70 +- + arch/x86/kernel/syscall_table_32.S | 2 + + arch/x86/kernel/tlb_uv.c | 9 +- + arch/x86/kvm/Kconfig | 3 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/highmem_32.c | 1 - + arch/x86/mm/init_32.c | 35 +- + arch/x86/mm/init_64.c | 37 +- + arch/x86/mm/iomap_32.c | 4 +- + arch/x86/mm/mmio-mod.c | 19 +- + arch/x86/mm/numa.c | 67 + + arch/x86/mm/numa_64.c | 111 +- + arch/x86/mm/srat_64.c | 30 + + arch/x86/oprofile/op_model_p4.c | 2 +- + arch/x86/pci/i386.c | 46 - + arch/x86/power/Makefile | 5 + + arch/x86/xen/smp.c | 6 +- + arch/xtensa/Kconfig | 184 +- + arch/xtensa/Makefile | 15 +- + arch/xtensa/configs/s6105_defconfig | 530 ++ + arch/xtensa/include/asm/cacheflush.h | 10 +- + arch/xtensa/include/asm/dma.h | 3 +- + arch/xtensa/include/asm/flat.h | 12 + + arch/xtensa/include/asm/ftrace.h | 1 + + arch/xtensa/include/asm/gpio.h | 56 + + arch/xtensa/include/asm/io.h | 9 +- + arch/xtensa/include/asm/irq.h | 7 + + arch/xtensa/include/asm/mmu.h | 5 + + arch/xtensa/include/asm/mmu_context.h | 9 +- + arch/xtensa/include/asm/nommu.h | 3 + + arch/xtensa/include/asm/nommu_context.h | 25 + + arch/xtensa/include/asm/page.h | 14 +- + arch/xtensa/include/asm/pgtable.h | 13 +- + arch/xtensa/include/asm/platform.h | 11 - + arch/xtensa/include/asm/processor.h | 8 + + arch/xtensa/kernel/entry.S | 3 +- + arch/xtensa/kernel/head.S | 5 +- + arch/xtensa/kernel/irq.c | 14 + + arch/xtensa/kernel/platform.c | 2 - + arch/xtensa/kernel/process.c | 2 +- + arch/xtensa/kernel/setup.c | 7 + + arch/xtensa/kernel/time.c | 131 +- + arch/xtensa/kernel/traps.c | 16 +- + arch/xtensa/kernel/vectors.S | 4 + + arch/xtensa/kernel/vmlinux.lds.S | 3 + + arch/xtensa/mm/Makefile | 3 +- + arch/xtensa/mm/init.c | 78 +- + arch/xtensa/mm/misc.S | 2 + + arch/xtensa/mm/mmu.c | 70 + + arch/xtensa/platforms/s6105/Makefile | 3 + + arch/xtensa/platforms/s6105/device.c | 67 + + .../xtensa/platforms/s6105/include/platform/gpio.h | 27 + + .../platforms/s6105/include/platform/hardware.h | 11 + + .../platforms/s6105/include/platform/serial.h | 8 + + arch/xtensa/platforms/s6105/setup.c | 61 + + .../platforms/xt2000/include/platform/hardware.h | 1 - + arch/xtensa/variants/s6000/Makefile | 3 + + arch/xtensa/variants/s6000/gpio.c | 71 + + arch/xtensa/variants/s6000/include/variant/core.h | 431 + + .../variants/s6000/include/variant/hardware.h | 259 + + arch/xtensa/variants/s6000/include/variant/irq.h | 9 + + .../variants/s6000/include/variant/tie-asm.h | 304 + + arch/xtensa/variants/s6000/include/variant/tie.h | 191 + + arch/xtensa/variants/s6000/irq.c | 74 + + block/Kconfig | 16 - + block/Makefile | 1 - + block/blk-softirq.c | 2 +- + block/blk.h | 2 +- + block/blktrace.c | 860 -- + crypto/async_tx/async_tx.c | 6 +- + crypto/async_tx/async_xor.c | 7 +- + crypto/shash.c | 3 + + crypto/xor.c | 2 +- + drivers/acpi/Kconfig | 150 +- + drivers/acpi/Makefile | 52 +- + drivers/acpi/acpica/Makefile | 4 +- + drivers/acpi/acpica/acglobal.h | 11 +- + drivers/acpi/acpica/achware.h | 12 +- + drivers/acpi/acpica/aclocal.h | 60 +- + drivers/acpi/acpica/acmacros.h | 4 - + drivers/acpi/acpica/acobject.h | 1 - + drivers/acpi/acpica/acpredef.h | 41 +- + drivers/acpi/acpica/actables.h | 9 +- + drivers/acpi/acpica/acutils.h | 15 + + drivers/acpi/acpica/dsinit.c | 16 +- + drivers/acpi/acpica/dsmthdat.c | 2 +- + drivers/acpi/acpica/dsobject.c | 6 +- + drivers/acpi/acpica/dsopcode.c | 32 +- + drivers/acpi/acpica/dsutils.c | 2 +- + drivers/acpi/acpica/dswexec.c | 5 +- + drivers/acpi/acpica/evevent.c | 18 +- + drivers/acpi/acpica/evgpe.c | 7 +- + drivers/acpi/acpica/evgpeblk.c | 70 +- + drivers/acpi/acpica/evmisc.c | 16 +- + drivers/acpi/acpica/evregion.c | 5 +- + drivers/acpi/acpica/evrgnini.c | 22 +- + drivers/acpi/acpica/evxface.c | 3 +- + drivers/acpi/acpica/evxfevnt.c | 24 +- + drivers/acpi/acpica/evxfregn.c | 3 +- + drivers/acpi/acpica/exconfig.c | 17 +- + drivers/acpi/acpica/exconvrt.c | 11 +- + drivers/acpi/acpica/exdump.c | 59 +- + drivers/acpi/acpica/exfield.c | 29 +- + drivers/acpi/acpica/exfldio.c | 14 +- + drivers/acpi/acpica/exmisc.c | 14 +- + drivers/acpi/acpica/exoparg1.c | 13 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 7 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 4 +- + drivers/acpi/acpica/exresnte.c | 8 +- + drivers/acpi/acpica/exresolv.c | 9 +- + drivers/acpi/acpica/exresop.c | 23 +- + drivers/acpi/acpica/exstore.c | 18 +- + drivers/acpi/acpica/exstoren.c | 29 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 9 +- + drivers/acpi/acpica/hwgpe.c | 21 +- + drivers/acpi/acpica/hwregs.c | 322 +- + drivers/acpi/acpica/hwsleep.c | 130 +- + drivers/acpi/acpica/hwvalid.c | 258 + + drivers/acpi/acpica/hwxface.c | 279 +- + drivers/acpi/acpica/nsaccess.c | 54 +- + drivers/acpi/acpica/nsalloc.c | 24 +- + drivers/acpi/acpica/nsdump.c | 24 +- + drivers/acpi/acpica/nseval.c | 2 +- + drivers/acpi/acpica/nsinit.c | 19 +- + drivers/acpi/acpica/nsload.c | 4 +- + drivers/acpi/acpica/nsobject.c | 18 +- + drivers/acpi/acpica/nsparse.c | 10 +- + drivers/acpi/acpica/nspredef.c | 38 +- + drivers/acpi/acpica/nssearch.c | 14 +- + drivers/acpi/acpica/nsutils.c | 27 +- + drivers/acpi/acpica/nswalk.c | 12 +- + drivers/acpi/acpica/nsxfeval.c | 36 +- + drivers/acpi/acpica/rscalc.c | 7 +- + drivers/acpi/acpica/rscreate.c | 15 +- + drivers/acpi/acpica/tbfadt.c | 363 +- + drivers/acpi/acpica/tbinstal.c | 82 +- + drivers/acpi/acpica/tbutils.c | 106 +- + drivers/acpi/acpica/tbxface.c | 71 +- + drivers/acpi/acpica/tbxfroot.c | 4 +- + drivers/acpi/acpica/utcopy.c | 30 +- + drivers/acpi/acpica/utdelete.c | 6 +- + drivers/acpi/acpica/uteval.c | 98 +- + drivers/acpi/acpica/utglobal.c | 17 +- + drivers/acpi/acpica/utlock.c | 175 + + drivers/acpi/acpica/utmisc.c | 3 +- + drivers/acpi/acpica/utmutex.c | 23 +- + drivers/acpi/acpica/utobject.c | 11 +- + drivers/acpi/battery.c | 29 +- + drivers/acpi/bus.c | 15 + + drivers/acpi/button.c | 77 +- + drivers/acpi/debug.c | 19 +- + drivers/acpi/dock.c | 3 +- + drivers/acpi/ec.c | 39 +- + drivers/acpi/fan.c | 20 +- + drivers/acpi/glue.c | 6 +- + drivers/acpi/internal.h | 43 + + drivers/acpi/numa.c | 46 +- + drivers/acpi/osl.c | 6 +- + drivers/acpi/pci_irq.c | 18 +- + drivers/acpi/pci_link.c | 147 +- + drivers/acpi/power.c | 12 +- + drivers/acpi/proc.c | 7 +- + drivers/acpi/processor_core.c | 45 +- + drivers/acpi/processor_idle.c | 124 +- + drivers/acpi/processor_perflib.c | 46 +- + drivers/acpi/processor_thermal.c | 22 +- + drivers/acpi/processor_throttling.c | 8 +- + drivers/acpi/sbs.c | 41 +- + drivers/acpi/scan.c | 94 +- + drivers/acpi/sleep.c | 13 +- + drivers/acpi/system.c | 64 +- + drivers/acpi/tables.c | 30 + + drivers/acpi/thermal.c | 541 +- + drivers/acpi/video.c | 336 +- + drivers/acpi/video_detect.c | 3 + + drivers/acpi/wakeup.c | 9 +- + drivers/ata/Kconfig | 2 +- + drivers/base/iommu.c | 7 + + drivers/base/node.c | 2 +- + drivers/base/sys.c | 2 +- + drivers/block/aoe/aoecmd.c | 23 +- + drivers/block/floppy.c | 8 + + drivers/block/hd.c | 2 + + drivers/block/nbd.c | 112 +- + drivers/block/xsysace.c | 30 +- + drivers/char/bsr.c | 2 +- + drivers/char/hpet.c | 22 +- + drivers/char/hw_random/timeriomem-rng.c | 39 +- + drivers/char/random.c | 3 +- + drivers/char/synclink_gt.c | 58 +- + drivers/char/sysrq.c | 2 +- + drivers/char/tty_audit.c | 2 - + drivers/char/tty_io.c | 6 +- + drivers/char/tty_ldisc.c | 1 - + drivers/clocksource/sh_cmt.c | 3 +- + drivers/crypto/hifn_795x.c | 2 +- + drivers/crypto/ixp4xx_crypto.c | 182 +- + drivers/dma/Kconfig | 11 + + drivers/dma/dmaengine.c | 60 +- + drivers/dma/dmatest.c | 307 +- + drivers/dma/dw_dmac.c | 333 +- + drivers/dma/dw_dmac_regs.h | 7 +- + drivers/dma/fsldma.c | 1 - + drivers/dma/ioat_dma.c | 1 - + drivers/dma/iop-adma.c | 1 - + drivers/dma/ipu/ipu_idmac.c | 371 +- + drivers/dma/ipu/ipu_irq.c | 2 +- + drivers/dma/mv_xor.c | 1 - + drivers/edac/Kconfig | 36 +- + drivers/edac/Makefile | 2 +- + drivers/edac/amd8111_edac.c | 595 ++ + drivers/edac/amd8111_edac.h | 130 + + drivers/edac/amd8131_edac.c | 379 + + drivers/edac/amd8131_edac.h | 119 + + drivers/edac/edac_core.h | 16 +- + drivers/edac/edac_pci.c | 14 + + drivers/edac/ppc4xx_edac.c | 1448 ++++ + drivers/edac/ppc4xx_edac.h | 172 + + drivers/gpio/Kconfig | 6 +- + drivers/gpio/gpiolib.c | 19 +- + drivers/gpu/drm/drm_crtc_helper.c | 31 +- + drivers/gpu/drm/drm_edid.c | 8 +- + drivers/gpu/drm/drm_gem.c | 7 +- + drivers/gpu/drm/drm_sysfs.c | 1 + + drivers/gpu/drm/i915/i915_dma.c | 16 +- + drivers/gpu/drm/i915/i915_drv.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 9 +- + drivers/gpu/drm/i915/i915_gem.c | 38 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 2 + + drivers/gpu/drm/i915/i915_gem_debugfs.c | 6 + + drivers/gpu/drm/i915/i915_gem_tiling.c | 16 + + drivers/gpu/drm/i915/i915_irq.c | 67 +- + drivers/gpu/drm/i915/i915_opregion.c | 65 +- + drivers/gpu/drm/i915/i915_reg.h | 11 + + drivers/gpu/drm/i915/intel_crt.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 22 +- + drivers/gpu/drm/i915/intel_modes.c | 1 + + drivers/gpu/drm/i915/intel_sdvo.c | 193 +- + drivers/gpu/drm/i915/intel_sdvo_regs.h | 3 + + drivers/gpu/drm/i915/intel_tv.c | 30 +- + drivers/gpu/drm/radeon/r600_cp.c | 8 +- + drivers/hid/Kconfig | 42 +- + drivers/hid/Makefile | 7 +- + drivers/hid/hid-a4tech.c | 2 - + drivers/hid/hid-apple.c | 26 +- + drivers/hid/hid-belkin.c | 2 - + drivers/hid/hid-cherry.c | 2 - + drivers/hid/hid-chicony.c | 2 - + drivers/hid/hid-core.c | 37 +- + drivers/hid/hid-cypress.c | 2 - + drivers/hid/hid-drff.c | 188 + + drivers/hid/hid-dummy.c | 78 - + drivers/hid/hid-ezkey.c | 2 - + drivers/hid/hid-gaff.c | 2 - + drivers/hid/hid-gyration.c | 2 - + drivers/hid/hid-ids.h | 10 + + drivers/hid/hid-kensington.c | 63 + + drivers/hid/hid-kye.c | 69 + + drivers/hid/hid-lg.c | 2 - + drivers/hid/hid-microsoft.c | 2 - + drivers/hid/hid-monterey.c | 2 - + drivers/hid/hid-ntrig.c | 2 - + drivers/hid/hid-petalynx.c | 2 - + drivers/hid/hid-pl.c | 52 +- + drivers/hid/hid-samsung.c | 2 - + drivers/hid/hid-sony.c | 2 - + drivers/hid/hid-sunplus.c | 2 - + drivers/hid/hid-tmff.c | 2 - + drivers/hid/hid-topseed.c | 2 - + drivers/hid/hid-zpff.c | 2 - + drivers/hid/hidraw.c | 17 +- + drivers/hid/usbhid/hid-core.c | 475 +- + drivers/hid/usbhid/hiddev.c | 22 +- + drivers/hid/usbhid/usbhid.h | 14 +- + drivers/hwmon/f75375s.c | 4 +- + drivers/input/Kconfig | 2 +- + drivers/input/keyboard/sh_keysc.c | 17 +- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/mouse/hgpk.c | 2 +- + drivers/input/touchscreen/ads7846.c | 2 +- + drivers/input/touchscreen/migor_ts.c | 23 + + drivers/isdn/mISDN/Kconfig | 10 +- + drivers/isdn/mISDN/l1oip_codec.c | 2 +- + drivers/leds/Kconfig | 6 +- + drivers/leds/leds-pca9532.c | 4 +- + drivers/md/Kconfig | 31 +- + drivers/md/Makefile | 16 +- + drivers/md/bitmap.c | 49 +- + {include/linux/raid => drivers/md}/bitmap.h | 0 + drivers/md/dm-bio-list.h | 10 + + drivers/md/dm-bio-record.h | 26 + + drivers/md/dm-crypt.c | 6 +- + drivers/md/dm-exception-store.c | 252 + + drivers/md/dm-exception-store.h | 58 +- + drivers/md/dm-io.c | 5 +- + drivers/md/dm-log.c | 75 +- + drivers/md/dm-path-selector.c | 21 +- + drivers/md/dm-raid1.c | 50 +- + drivers/md/dm-snap-persistent.c | 153 +- + drivers/md/dm-snap-transient.c | 86 +- + drivers/md/dm-snap.c | 384 +- + drivers/md/dm-snap.h | 105 - + drivers/md/dm-table.c | 26 +- + drivers/md/dm-target.c | 104 +- + drivers/md/dm.c | 134 +- + drivers/md/dm.h | 2 +- + drivers/md/faulty.c | 19 +- + drivers/md/linear.c | 25 +- + {include/linux/raid => drivers/md}/linear.h | 2 - + drivers/md/md.c | 615 +- + include/linux/raid/md_k.h => drivers/md/md.h | 66 +- + drivers/md/mktables.c | 14 +- + drivers/md/multipath.c | 17 +- + {include/linux/raid => drivers/md}/multipath.h | 2 - + drivers/md/raid0.c | 66 +- + {include/linux/raid => drivers/md}/raid0.h | 2 - + drivers/md/raid1.c | 35 +- + {include/linux/raid => drivers/md}/raid1.h | 2 - + drivers/md/raid10.c | 42 +- + {include/linux/raid => drivers/md}/raid10.h | 2 - + drivers/md/raid5.c | 1494 +++- + {include/linux/raid => drivers/md}/raid5.h | 110 +- + drivers/md/raid6algos.c | 21 +- + drivers/md/raid6altivec.uc | 4 +- + drivers/md/raid6int.uc | 4 +- + drivers/md/raid6mmx.c | 4 +- + drivers/md/raid6recov.c | 13 +- + drivers/md/raid6sse1.c | 4 +- + drivers/md/raid6sse2.c | 4 +- + drivers/md/raid6test/Makefile | 2 +- + drivers/md/raid6test/test.c | 2 +- + drivers/md/raid6x86.h | 2 +- + drivers/media/common/tuners/Kconfig | 2 +- + drivers/media/dvb/frontends/Kconfig | 2 +- + drivers/media/dvb/frontends/drx397xD.c | 2 +- + drivers/mfd/Kconfig | 3 +- + drivers/mfd/da903x.c | 2 +- + drivers/mfd/htc-pasic3.c | 169 +- + drivers/mfd/pcf50633-core.c | 1 - + drivers/mfd/t7l66xb.c | 4 +- + drivers/mfd/tc6393xb.c | 2 +- + drivers/mfd/twl4030-core.c | 2 - + drivers/mfd/twl4030-irq.c | 2 +- + drivers/mfd/wm8350-core.c | 39 +- + drivers/misc/Kconfig | 10 +- + drivers/misc/eeprom/at24.c | 67 +- + drivers/misc/eeprom/at25.c | 58 +- + drivers/misc/sgi-gru/Makefile | 2 +- + drivers/misc/sgi-gru/gru_instructions.h | 22 +- + drivers/misc/sgi-gru/grufault.c | 130 +- + drivers/misc/sgi-gru/grufile.c | 36 +- + drivers/misc/sgi-gru/gruhandles.c | 183 + + drivers/misc/sgi-gru/gruhandles.h | 178 +- + drivers/misc/sgi-gru/grukservices.c | 131 +- + drivers/misc/sgi-gru/grukservices.h | 33 +- + drivers/misc/sgi-gru/grumain.c | 84 +- + drivers/misc/sgi-gru/gruprocfs.c | 45 +- + drivers/misc/sgi-gru/grutables.h | 41 +- + drivers/misc/sgi-gru/grutlbpurge.c | 7 +- + drivers/misc/sgi-xp/xpc.h | 33 +- + drivers/misc/sgi-xp/xpc_channel.c | 8 +- + drivers/misc/sgi-xp/xpc_main.c | 6 +- + drivers/misc/sgi-xp/xpc_sn2.c | 20 +- + drivers/misc/sgi-xp/xpc_uv.c | 229 +- + drivers/mmc/card/block.c | 2 + + drivers/mmc/core/bus.c | 8 + + drivers/mmc/core/core.c | 118 + + drivers/mmc/core/debugfs.c | 67 + + drivers/mmc/core/sdio_cis.c | 8 + + drivers/mmc/core/sdio_ops.c | 8 + + drivers/mmc/host/Kconfig | 31 +- + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/mmc/host/mmc_spi.c | 40 +- + drivers/mmc/host/mvsdio.c | 885 ++ + drivers/mmc/host/mvsdio.h | 190 + + drivers/mmc/host/omap_hsmmc.c | 355 +- + drivers/mmc/host/sdhci-of.c | 309 + + drivers/mmc/host/sdhci.c | 317 +- + drivers/mmc/host/sdhci.h | 112 + + drivers/mmc/host/tmio_mmc.c | 6 +- + drivers/mmc/host/tmio_mmc.h | 3 + + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + drivers/mtd/nand/diskonchip.c | 2 +- + drivers/mtd/nand/nand_base.c | 4 +- + drivers/mtd/tests/mtd_oobtest.c | 24 +- + drivers/mtd/tests/mtd_readtest.c | 2 +- + drivers/net/Kconfig | 19 +- + drivers/net/Makefile | 1 + + drivers/net/dm9000.c | 2 +- + drivers/net/dnet.c | 1 - + drivers/net/fec_mpc52xx.c | 77 +- + drivers/net/fsl_pq_mdio.c | 3 +- + drivers/net/gianfar.h | 1 - + drivers/net/hamradio/yam.c | 64 +- + drivers/net/hamradio/yam1200.h | 343 - + drivers/net/hamradio/yam9600.h | 343 - + drivers/net/igb/e1000_phy.c | 7 +- + drivers/net/igb/igb_ethtool.c | 14 +- + drivers/net/igb/igb_main.c | 54 +- + drivers/net/ixgbe/ixgbe_82598.c | 3 +- + drivers/net/ixgbe/ixgbe_common.c | 3 +- + drivers/net/ixgbe/ixgbe_common.h | 9 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 6 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 129 +- + drivers/net/ixgbe/ixgbe_main.c | 110 +- + drivers/net/ixgbe/ixgbe_type.h | 1 + + drivers/net/mlx4/en_netdev.c | 2 +- + drivers/net/mlx4/en_rx.c | 2 +- + drivers/net/mlx4/sense.c | 2 +- + drivers/net/pcmcia/ositech.h | 358 - + drivers/net/pcmcia/smc91c92_cs.c | 44 +- + drivers/net/phy/phy.c | 3 +- + drivers/net/qlge/qlge_ethtool.c | 1 - + drivers/net/r8169.c | 5 +- + drivers/net/sb1250-mac.c | 2 +- + drivers/net/sfc/efx.c | 7 +- + drivers/net/skfp/h/hwmtm.h | 2 +- + drivers/net/tc35815.c | 2 +- + drivers/net/tg3.c | 2 +- + drivers/net/tokenring/3c359.c | 63 +- + drivers/net/tokenring/3c359.h | 3 + + drivers/net/tokenring/3c359_microcode.h | 1581 ---- + drivers/net/ucc_geth.c | 22 +- + drivers/net/ucc_geth.h | 4 +- + drivers/net/ucc_geth_ethtool.c | 1 - + drivers/net/usb/hso.c | 40 +- + drivers/net/usb/kaweth.c | 7 +- + drivers/net/vxge/Makefile | 7 + + drivers/net/vxge/vxge-config.c | 5264 +++++++++++ + drivers/net/vxge/vxge-config.h | 2259 +++++ + drivers/net/vxge/vxge-ethtool.c | 1148 +++ + drivers/net/vxge/vxge-ethtool.h | 67 + + drivers/net/vxge/vxge-main.c | 4502 ++++++++++ + drivers/net/vxge/vxge-main.h | 557 ++ + drivers/net/vxge/vxge-reg.h | 4608 ++++++++++ + drivers/net/vxge/vxge-traffic.c | 2528 ++++++ + drivers/net/vxge/vxge-traffic.h | 2409 ++++++ + drivers/net/vxge/vxge-version.h | 23 + + drivers/net/wan/farsync.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- + drivers/net/wireless/libertas/cmd.c | 2 +- + drivers/oprofile/buffer_sync.c | 20 +- + drivers/oprofile/buffer_sync.h | 4 - + drivers/oprofile/cpu_buffer.c | 5 +- + drivers/oprofile/oprof.c | 9 +- + drivers/parisc/asp.c | 2 +- + drivers/parisc/ccio-dma.c | 16 +- + drivers/parisc/dino.c | 7 +- + drivers/parisc/eisa.c | 2 +- + drivers/parisc/eisa_enumerator.c | 4 +- + drivers/parisc/iosapic.c | 2 +- + drivers/parisc/led.c | 26 +- + drivers/parport/parport_serial.c | 30 +- + drivers/pci/intel-iommu.c | 115 +- + drivers/pci/pci-acpi.c | 4 +- + drivers/pci/pci-driver.c | 3 +- + drivers/pci/pci.c | 2 +- + drivers/pcmcia/pxa2xx_cm_x255.c | 2 +- + drivers/platform/x86/Kconfig | 35 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 35 +- + drivers/platform/x86/dell-wmi.c | 210 + + drivers/platform/x86/hp-wmi.c | 25 + + drivers/platform/x86/intel_menlow.c | 29 +- + drivers/platform/x86/panasonic-laptop.c | 9 +- + drivers/platform/x86/sony-laptop.c | 531 +- + drivers/platform/x86/tc1100-wmi.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 737 ++- + drivers/pnp/pnpacpi/core.c | 23 +- + drivers/pnp/pnpbios/core.c | 16 +- + drivers/power/bq27x00_battery.c | 2 +- + drivers/power/power_supply_sysfs.c | 2 + + drivers/regulator/Kconfig | 13 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/bq24022.c | 3 +- + drivers/regulator/core.c | 386 +- + drivers/regulator/da903x.c | 3 +- + drivers/regulator/fixed.c | 3 +- + drivers/regulator/pcf50633-regulator.c | 3 +- + drivers/regulator/twl4030-regulator.c | 500 ++ + drivers/regulator/virtual.c | 14 +- + drivers/regulator/wm8350-regulator.c | 57 +- + drivers/regulator/wm8400-regulator.c | 36 +- + drivers/rtc/Kconfig | 33 +- + drivers/rtc/Makefile | 4 +- + drivers/rtc/rtc-generic.c | 84 + + drivers/rtc/rtc-m41t80.c | 18 +- + drivers/rtc/rtc-parisc.c | 86 - + drivers/rtc/rtc-ppc.c | 69 - + drivers/rtc/rtc-ps3.c | 104 + + drivers/rtc/rtc-sh.c | 36 + + drivers/rtc/rtc-v3020.c | 190 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/scsi/Kconfig | 4 +- + drivers/serial/Kconfig | 2 +- + drivers/serial/atmel_serial.c | 9 +- + drivers/serial/mcf.c | 2 +- + drivers/sh/intc.c | 68 + + drivers/spi/spi_gpio.c | 21 +- + drivers/staging/Kconfig | 26 +- + drivers/staging/Makefile | 11 + + drivers/staging/agnx/agnx.h | 14 +- + drivers/staging/agnx/debug.h | 21 +- + drivers/staging/agnx/pci.c | 75 +- + drivers/staging/agnx/phy.c | 32 +- + drivers/staging/agnx/rf.c | 23 +- + drivers/staging/agnx/sta.c | 21 +- + drivers/staging/agnx/sta.h | 2 +- + drivers/staging/agnx/table.c | 12 +- + drivers/staging/agnx/xmit.c | 216 +- + drivers/staging/altpciechdma/altpciechdma.c | 80 +- + drivers/staging/android/binder.c | 18 +- + drivers/staging/android/ram_console.c | 8 +- + drivers/staging/asus_oled/asus_oled.c | 149 +- + drivers/staging/at76_usb/TODO | 9 +- + drivers/staging/at76_usb/at76_usb.c | 21 +- + drivers/staging/at76_usb/at76_usb.h | 87 + + drivers/staging/b3dfg/Kconfig | 9 + + drivers/staging/b3dfg/Makefile | 1 + + drivers/staging/b3dfg/TODO | 4 + + drivers/staging/b3dfg/b3dfg.c | 1119 +++ + drivers/staging/comedi/Kconfig | 18 +- + drivers/staging/comedi/comedi.h | 83 +- + drivers/staging/comedi/comedi_compat32.c | 128 +- + drivers/staging/comedi/comedi_fops.c | 293 +- + drivers/staging/comedi/comedi_fops.h | 1 + + drivers/staging/comedi/comedi_ksyms.c | 12 +- + drivers/staging/comedi/comedi_rt.h | 9 +- + drivers/staging/comedi/comedidev.h | 202 +- + drivers/staging/comedi/comedilib.h | 114 +- + drivers/staging/comedi/drivers.c | 187 +- + drivers/staging/comedi/drivers/8253.h | 420 + + drivers/staging/comedi/drivers/8255.c | 442 + + drivers/staging/comedi/drivers/8255.h | 57 + + drivers/staging/comedi/drivers/Makefile | 113 +- + drivers/staging/comedi/drivers/acl7225b.c | 149 + + .../comedi/drivers/addi-data/APCI1710_82x54.c | 1047 +++ + .../comedi/drivers/addi-data/APCI1710_82x54.h | 73 + + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2032 +++++ + .../comedi/drivers/addi-data/APCI1710_Chrono.h | 74 + + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 1020 +++ + .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 46 + + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 5363 ++++++++++++ + .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 271 + + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 861 ++ + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 47 + + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 3588 ++++++++ + .../comedi/drivers/addi-data/APCI1710_Pwm.h | 76 + + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 848 ++ + .../comedi/drivers/addi-data/APCI1710_Ssi.h | 43 + + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2049 +++++ + .../comedi/drivers/addi-data/APCI1710_Tor.h | 57 + + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 1038 +++ + .../comedi/drivers/addi-data/APCI1710_Ttl.h | 44 + + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 203 + + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 27 + + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 476 + + .../staging/comedi/drivers/addi-data/addi_common.c | 3062 +++++++ + .../staging/comedi/drivers/addi-data/addi_common.h | 462 + + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1158 +++ + .../comedi/drivers/addi-data/amcc_s5933_58.h | 457 + + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 1265 +++ + .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 71 + + .../comedi/drivers/addi-data/hwdrv_apci035.c | 600 ++ + .../comedi/drivers/addi-data/hwdrv_apci035.h | 123 + + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 285 + + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 63 + + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 3045 +++++++ + .../comedi/drivers/addi-data/hwdrv_apci1500.h | 165 + + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 542 ++ + .../comedi/drivers/addi-data/hwdrv_apci1516.h | 64 + + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 1105 +++ + .../comedi/drivers/addi-data/hwdrv_apci1564.h | 119 + + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 780 ++ + .../comedi/drivers/addi-data/hwdrv_apci16xx.h | 94 + + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 460 + + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 70 + + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 579 ++ + .../comedi/drivers/addi-data/hwdrv_apci2032.h | 81 + + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 549 ++ + .../comedi/drivers/addi-data/hwdrv_apci2200.h | 61 + + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2697 ++++++ + .../comedi/drivers/addi-data/hwdrv_apci3120.h | 241 + + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 3642 ++++++++ + .../comedi/drivers/addi-data/hwdrv_apci3200.h | 187 + + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 742 ++ + .../comedi/drivers/addi-data/hwdrv_apci3501.h | 94 + + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 1691 ++++ + .../comedi/drivers/addi-data/hwdrv_apci3xxx.h | 62 + + drivers/staging/comedi/drivers/addi_apci_035.c | 5 + + drivers/staging/comedi/drivers/addi_apci_1032.c | 3 + + drivers/staging/comedi/drivers/addi_apci_1500.c | 3 + + drivers/staging/comedi/drivers/addi_apci_1516.c | 3 + + drivers/staging/comedi/drivers/addi_apci_1564.c | 3 + + drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 + + drivers/staging/comedi/drivers/addi_apci_1710.c | 3 + + drivers/staging/comedi/drivers/addi_apci_2016.c | 3 + + drivers/staging/comedi/drivers/addi_apci_2032.c | 3 + + drivers/staging/comedi/drivers/addi_apci_2200.c | 3 + + drivers/staging/comedi/drivers/addi_apci_3001.c | 3 + + drivers/staging/comedi/drivers/addi_apci_3120.c | 3 + + drivers/staging/comedi/drivers/addi_apci_3200.c | 3 + + drivers/staging/comedi/drivers/addi_apci_3300.c | 3 + + drivers/staging/comedi/drivers/addi_apci_3501.c | 3 + + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 + + drivers/staging/comedi/drivers/addi_apci_all.c | 18 + + drivers/staging/comedi/drivers/adl_pci6208.c | 391 + + drivers/staging/comedi/drivers/adl_pci7296.c | 174 + + drivers/staging/comedi/drivers/adl_pci7432.c | 202 + + drivers/staging/comedi/drivers/adl_pci8164.c | 512 ++ + drivers/staging/comedi/drivers/adl_pci9111.c | 1391 +++ + drivers/staging/comedi/drivers/adl_pci9118.c | 2100 +++++ + drivers/staging/comedi/drivers/adq12b.c | 394 + + drivers/staging/comedi/drivers/adv_pci1710.c | 1568 ++++ + drivers/staging/comedi/drivers/adv_pci1723.c | 465 + + drivers/staging/comedi/drivers/adv_pci_dio.c | 1077 +++ + drivers/staging/comedi/drivers/aio_aio12_8.c | 226 + + drivers/staging/comedi/drivers/aio_iiro_16.c | 177 + + drivers/staging/comedi/drivers/am9513.h | 79 + + drivers/staging/comedi/drivers/amcc_s5933.h | 172 + + drivers/staging/comedi/drivers/amplc_dio200.c | 1483 ++++ + drivers/staging/comedi/drivers/amplc_pc236.c | 654 ++ + drivers/staging/comedi/drivers/amplc_pc263.c | 431 + + drivers/staging/comedi/drivers/amplc_pci224.c | 1545 ++++ + drivers/staging/comedi/drivers/amplc_pci230.c | 2977 +++++++ + drivers/staging/comedi/drivers/c6xdigio.c | 517 ++ + drivers/staging/comedi/drivers/cb_das16_cs.c | 976 +++ + drivers/staging/comedi/drivers/cb_pcidas.c | 1831 ++++ + drivers/staging/comedi/drivers/cb_pcidas64.c | 4222 +++++++++ + drivers/staging/comedi/drivers/cb_pcidda.c | 841 ++ + drivers/staging/comedi/drivers/cb_pcidio.c | 294 + + drivers/staging/comedi/drivers/cb_pcimdas.c | 484 ++ + drivers/staging/comedi/drivers/cb_pcimdda.c | 474 + + drivers/staging/comedi/drivers/comedi_bond.c | 56 +- + drivers/staging/comedi/drivers/comedi_fc.c | 14 +- + drivers/staging/comedi/drivers/comedi_fc.h | 18 +- + drivers/staging/comedi/drivers/comedi_parport.c | 44 +- + drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 ++ + drivers/staging/comedi/drivers/comedi_test.c | 80 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 230 + + drivers/staging/comedi/drivers/daqboard2000.c | 877 ++ + drivers/staging/comedi/drivers/das08.c | 1068 +++ + drivers/staging/comedi/drivers/das08.h | 78 + + drivers/staging/comedi/drivers/das08_cs.c | 488 ++ + drivers/staging/comedi/drivers/das16.c | 1730 ++++ + drivers/staging/comedi/drivers/das16m1.c | 765 ++ + drivers/staging/comedi/drivers/das1800.c | 1758 ++++ + drivers/staging/comedi/drivers/das6402.c | 354 + + drivers/staging/comedi/drivers/das800.c | 894 ++ + drivers/staging/comedi/drivers/dmm32at.c | 1081 +++ + drivers/staging/comedi/drivers/dt2801.c | 697 ++ + drivers/staging/comedi/drivers/dt2811.c | 604 ++ + drivers/staging/comedi/drivers/dt2814.c | 383 + + drivers/staging/comedi/drivers/dt2815.c | 264 + + drivers/staging/comedi/drivers/dt2817.c | 178 + + drivers/staging/comedi/drivers/dt282x.c | 1471 ++++ + drivers/staging/comedi/drivers/dt3000.c | 983 +++ + drivers/staging/comedi/drivers/dt9812.c | 40 +- + drivers/staging/comedi/drivers/fl512.c | 186 + + drivers/staging/comedi/drivers/gsc_hpdi.c | 1060 +++ + drivers/staging/comedi/drivers/icp_multi.c | 392 +- + drivers/staging/comedi/drivers/icp_multi.h | 19 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 612 ++ + drivers/staging/comedi/drivers/jr3_pci.c | 976 +++ + drivers/staging/comedi/drivers/jr3_pci.h | 681 ++ + drivers/staging/comedi/drivers/ke_counter.c | 254 + + drivers/staging/comedi/drivers/me4000.c | 296 +- + drivers/staging/comedi/drivers/me4000.h | 268 +- + drivers/staging/comedi/drivers/me_daq.c | 55 +- + drivers/staging/comedi/drivers/mite.c | 63 +- + drivers/staging/comedi/drivers/mite.h | 68 +- + drivers/staging/comedi/drivers/mpc624.c | 386 + + drivers/staging/comedi/drivers/mpc8260cpm.c | 169 + + drivers/staging/comedi/drivers/multiq3.c | 333 + + drivers/staging/comedi/drivers/ni_6527.c | 489 ++ + drivers/staging/comedi/drivers/ni_65xx.c | 809 ++ + drivers/staging/comedi/drivers/ni_660x.c | 1324 +++ + drivers/staging/comedi/drivers/ni_670x.c | 337 + + drivers/staging/comedi/drivers/ni_at_a2150.c | 909 ++ + drivers/staging/comedi/drivers/ni_at_ao.c | 454 + + drivers/staging/comedi/drivers/ni_atmio.c | 513 ++ + drivers/staging/comedi/drivers/ni_atmio16d.c | 860 ++ + drivers/staging/comedi/drivers/ni_daq_700.c | 841 ++ + drivers/staging/comedi/drivers/ni_daq_dio24.c | 598 ++ + drivers/staging/comedi/drivers/ni_labpc.c | 2005 +++++ + drivers/staging/comedi/drivers/ni_labpc.h | 85 + + drivers/staging/comedi/drivers/ni_labpc_cs.c | 573 ++ + drivers/staging/comedi/drivers/ni_mio_common.c | 5862 +++++++++++++ + drivers/staging/comedi/drivers/ni_mio_cs.c | 551 ++ + drivers/staging/comedi/drivers/ni_pcidio.c | 1302 +++ + drivers/staging/comedi/drivers/ni_pcimio.c | 1788 ++++ + drivers/staging/comedi/drivers/ni_stc.h | 1498 ++++ + drivers/staging/comedi/drivers/ni_tio.c | 1691 ++++ + drivers/staging/comedi/drivers/ni_tio.h | 163 + + drivers/staging/comedi/drivers/ni_tio_internal.h | 774 ++ + drivers/staging/comedi/drivers/ni_tiocmd.c | 523 ++ + drivers/staging/comedi/drivers/pcl711.c | 623 ++ + drivers/staging/comedi/drivers/pcl724.c | 222 + + drivers/staging/comedi/drivers/pcl725.c | 111 + + drivers/staging/comedi/drivers/pcl726.c | 377 + + drivers/staging/comedi/drivers/pcl730.c | 168 + + drivers/staging/comedi/drivers/pcl812.c | 1605 ++++ + drivers/staging/comedi/drivers/pcl816.c | 1251 +++ + drivers/staging/comedi/drivers/pcl818.c | 1988 +++++ + drivers/staging/comedi/drivers/pcm3724.c | 307 + + drivers/staging/comedi/drivers/pcm3730.c | 152 + + drivers/staging/comedi/drivers/pcmad.c | 173 + + drivers/staging/comedi/drivers/pcmda12.c | 306 + + drivers/staging/comedi/drivers/pcmmio.c | 1333 +++ + drivers/staging/comedi/drivers/pcmuio.c | 1101 +++ + drivers/staging/comedi/drivers/plx9052.h | 86 + + drivers/staging/comedi/drivers/plx9080.h | 80 +- + drivers/staging/comedi/drivers/poc.c | 247 + + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1363 +++ + drivers/staging/comedi/drivers/rtd520.c | 277 +- + drivers/staging/comedi/drivers/rtd520.h | 676 +- + drivers/staging/comedi/drivers/rti800.c | 458 + + drivers/staging/comedi/drivers/rti802.c | 151 + + drivers/staging/comedi/drivers/s526.c | 977 +++ + drivers/staging/comedi/drivers/s626.c | 2538 +++--- + drivers/staging/comedi/drivers/s626.h | 1226 ++-- + drivers/staging/comedi/drivers/serial2002.c | 870 ++ + drivers/staging/comedi/drivers/skel.c | 624 ++ + drivers/staging/comedi/drivers/ssv_dnp.c | 311 + + drivers/staging/comedi/drivers/unioxx5.c | 515 ++ + drivers/staging/comedi/drivers/usbdux.c | 304 +- + drivers/staging/comedi/drivers/usbduxfast.c | 2028 +++-- + drivers/staging/comedi/interrupt.h | 9 - + drivers/staging/comedi/kcomedilib/data.c | 22 +- + drivers/staging/comedi/kcomedilib/dio.c | 18 +- + drivers/staging/comedi/kcomedilib/get.c | 132 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 138 +- + drivers/staging/comedi/kcomedilib/ksyms.c | 4 - + drivers/staging/comedi/pci_ids.h | 2 +- + drivers/staging/comedi/proc.c | 17 +- + drivers/staging/comedi/range.c | 35 +- + drivers/staging/comedi/rt.c | 29 +- + drivers/staging/comedi/rt_pend_tq.c | 8 +- + drivers/staging/dst/Kconfig | 67 + + drivers/staging/dst/Makefile | 3 + + drivers/staging/dst/crypto.c | 731 ++ + drivers/staging/dst/dcore.c | 995 +++ + drivers/staging/dst/export.c | 657 ++ + drivers/staging/dst/state.c | 839 ++ + drivers/staging/dst/thread_pool.c | 345 + + drivers/staging/dst/trans.c | 335 + + drivers/staging/echo/bit_operations.h | 30 +- + drivers/staging/echo/echo.c | 42 +- + drivers/staging/echo/echo.h | 2 - + drivers/staging/echo/fir.h | 28 +- + drivers/staging/echo/mmx.h | 408 +- + drivers/staging/epl/Benchmark.h | 12 - + drivers/staging/epl/Debug.h | 48 +- + drivers/staging/epl/Edrv8139.c | 108 +- + drivers/staging/epl/EdrvFec.h | 6 +- + drivers/staging/epl/EdrvFec5282.h | 340 - + drivers/staging/epl/EdrvSim.h | 4 +- + drivers/staging/epl/Epl.h | 139 +- + drivers/staging/epl/EplAmi.h | 121 +- + drivers/staging/epl/EplApiGeneric.c | 188 +- + drivers/staging/epl/EplApiLinuxKernel.c | 105 +- + drivers/staging/epl/EplApiProcessImage.c | 31 +- + drivers/staging/epl/EplDll.h | 50 +- + drivers/staging/epl/EplDllCal.h | 2 +- + drivers/staging/epl/EplDllk.c | 134 +- + drivers/staging/epl/EplDllkCal.c | 14 +- + drivers/staging/epl/EplDlluCal.c | 6 +- + drivers/staging/epl/EplErrorHandlerk.c | 36 +- + drivers/staging/epl/EplEvent.h | 8 +- + drivers/staging/epl/EplEventk.c | 24 +- + drivers/staging/epl/EplEventu.c | 25 +- + drivers/staging/epl/EplFrame.h | 166 +- + drivers/staging/epl/EplIdentu.c | 26 +- + drivers/staging/epl/EplInc.h | 23 +- + drivers/staging/epl/EplInstDef.h | 60 +- + drivers/staging/epl/EplNmt.h | 2 +- + drivers/staging/epl/EplNmtCnu.c | 39 +- + drivers/staging/epl/EplNmtMnu.c | 121 +- + drivers/staging/epl/EplNmtk.c | 30 +- + drivers/staging/epl/EplNmtkCal.c | 2 - + drivers/staging/epl/EplNmtu.c | 22 +- + drivers/staging/epl/EplNmtuCal.c | 2 +- + drivers/staging/epl/EplObd.c | 444 +- + drivers/staging/epl/EplObd.h | 58 +- + drivers/staging/epl/EplObdMacro.h | 40 +- + drivers/staging/epl/EplObdkCal.c | 1 - + drivers/staging/epl/EplObdu.c | 69 +- + drivers/staging/epl/EplObduCal.c | 75 +- + drivers/staging/epl/EplObjDef.h | 208 - + drivers/staging/epl/EplPdo.h | 6 +- + drivers/staging/epl/EplPdok.c | 73 +- + drivers/staging/epl/EplPdou.c | 34 +- + drivers/staging/epl/EplSdo.h | 24 +- + drivers/staging/epl/EplSdoAsndu.c | 26 +- + drivers/staging/epl/EplSdoAsySequ.c | 72 +- + drivers/staging/epl/EplSdoComu.c | 153 +- + drivers/staging/epl/EplSdoUdpu.c | 163 +- + drivers/staging/epl/EplStatusu.c | 19 +- + drivers/staging/epl/EplTarget.h | 109 +- + drivers/staging/epl/EplTimer.h | 3 +- + drivers/staging/epl/EplTimeruLinuxKernel.c | 26 +- + drivers/staging/epl/EplTimeruNull.c | 312 - + drivers/staging/epl/EplTimeruWin32.c | 513 -- + drivers/staging/epl/SharedBuff.c | 111 +- + drivers/staging/epl/SharedBuff.h | 17 - + drivers/staging/epl/ShbIpc-LinuxKernel.c | 48 +- + drivers/staging/epl/ShbIpc-Win32.c | 1202 --- + drivers/staging/epl/ShbIpc.h | 26 - + drivers/staging/epl/TimerHighReskX86.c | 34 +- + drivers/staging/epl/VirtualEthernetLinux.c | 5 +- + drivers/staging/epl/amix86.c | 316 +- + drivers/staging/epl/demo_main.c | 84 +- + drivers/staging/epl/edrv.h | 22 +- + drivers/staging/epl/global.h | 1253 +--- + drivers/staging/epl/kernel/EplDllk.h | 24 +- + drivers/staging/epl/kernel/EplDllkCal.h | 14 +- + drivers/staging/epl/kernel/EplErrorHandlerk.h | 20 +- + drivers/staging/epl/kernel/EplEventk.h | 28 +- + drivers/staging/epl/kernel/EplNmtk.h | 25 +- + drivers/staging/epl/kernel/EplNmtkCal.h | 89 - + drivers/staging/epl/kernel/EplObdk.h | 122 +- + drivers/staging/epl/kernel/EplObdkCal.h | 89 - + drivers/staging/epl/kernel/EplPdok.h | 12 - + drivers/staging/epl/kernel/EplPdokCal.h | 13 - + drivers/staging/epl/kernel/EplTimerHighResk.h | 43 +- + drivers/staging/epl/kernel/EplTimerk.h | 36 +- + drivers/staging/epl/kernel/VirtualEthernet.h | 16 +- + drivers/staging/epl/proc_fs.c | 23 +- + drivers/staging/epl/user/EplCfgMau.h | 80 +- + drivers/staging/epl/user/EplDllu.h | 14 +- + drivers/staging/epl/user/EplDlluCal.h | 15 +- + drivers/staging/epl/user/EplEventu.h | 28 +- + drivers/staging/epl/user/EplIdentu.h | 34 +- + drivers/staging/epl/user/EplLedu.h | 32 +- + drivers/staging/epl/user/EplNmtCnu.h | 32 +- + drivers/staging/epl/user/EplNmtMnu.h | 42 +- + drivers/staging/epl/user/EplNmtu.h | 38 +- + drivers/staging/epl/user/EplNmtuCal.h | 17 +- + drivers/staging/epl/user/EplObdu.h | 83 +- + drivers/staging/epl/user/EplObduCal.h | 94 +- + drivers/staging/epl/user/EplPdou.h | 22 +- + drivers/staging/epl/user/EplSdoAsndu.h | 33 +- + drivers/staging/epl/user/EplSdoAsySequ.h | 41 +- + drivers/staging/epl/user/EplSdoComu.h | 48 +- + drivers/staging/epl/user/EplSdoUdpu.h | 34 +- + drivers/staging/epl/user/EplStatusu.h | 32 +- + drivers/staging/epl/user/EplTimeru.h | 38 +- + drivers/staging/et131x/et1310_rx.c | 3 +- + drivers/staging/frontier/README | 53 +- + drivers/staging/frontier/alphatrack.c | 383 +- + drivers/staging/frontier/alphatrack.h | 80 +- + drivers/staging/frontier/frontier_compat.h | 63 - + drivers/staging/frontier/surface_sysfs.h | 100 - + drivers/staging/frontier/tranzport.c | 685 +- + drivers/staging/go7007/Kconfig | 4 +- + drivers/staging/go7007/go7007-v4l2.c | 1 - + drivers/staging/go7007/s2250-board.c | 7 +- + drivers/staging/heci/Kconfig | 6 + + drivers/staging/heci/Makefile | 9 + + drivers/staging/heci/TODO | 6 + + drivers/staging/heci/heci.h | 176 + + drivers/staging/heci/heci_data_structures.h | 530 ++ + drivers/staging/heci/heci_init.c | 1077 +++ + drivers/staging/heci/heci_interface.c | 485 ++ + drivers/staging/heci/heci_interface.h | 170 + + drivers/staging/heci/heci_main.c | 1564 ++++ + drivers/staging/heci/heci_version.h | 54 + + drivers/staging/heci/interrupt.c | 1553 ++++ + drivers/staging/heci/io_heci.c | 847 ++ + drivers/staging/line6/Kconfig | 21 + + drivers/staging/line6/Makefile | 15 + + drivers/staging/line6/audio.c | 72 + + drivers/staging/line6/audio.h | 24 + + drivers/staging/line6/capture.c | 372 + + drivers/staging/line6/capture.h | 32 + + drivers/staging/line6/config.h | 48 + + drivers/staging/line6/control.c | 840 ++ + drivers/staging/line6/control.h | 187 + + drivers/staging/line6/driver.c | 1102 +++ + drivers/staging/line6/driver.h | 204 + + drivers/staging/line6/dumprequest.c | 151 + + drivers/staging/line6/dumprequest.h | 90 + + drivers/staging/line6/midi.c | 422 + + drivers/staging/line6/midi.h | 87 + + drivers/staging/line6/midibuf.c | 262 + + drivers/staging/line6/midibuf.h | 39 + + drivers/staging/line6/pcm.c | 301 + + drivers/staging/line6/pcm.h | 222 + + drivers/staging/line6/playback.c | 427 + + drivers/staging/line6/playback.h | 30 + + drivers/staging/line6/pod.c | 1151 +++ + drivers/staging/line6/pod.h | 204 + + drivers/staging/line6/revision.h | 4 + + drivers/staging/line6/toneport.c | 241 + + drivers/staging/line6/toneport.h | 45 + + drivers/staging/line6/usbdefs.h | 74 + + drivers/staging/line6/variax.c | 546 ++ + drivers/staging/line6/variax.h | 108 + + drivers/staging/me4000/me4000.c | 193 +- + drivers/staging/meilhaus/me0600_device.c | 4 +- + drivers/staging/meilhaus/me0600_dio.c | 18 +- + drivers/staging/meilhaus/me0600_ext_irq.c | 8 +- + drivers/staging/meilhaus/me0600_optoi.c | 14 +- + drivers/staging/meilhaus/me0600_relay.c | 14 +- + drivers/staging/meilhaus/me0600_ttli.c | 12 +- + drivers/staging/meilhaus/me0900_device.c | 4 +- + drivers/staging/meilhaus/me0900_di.c | 12 +- + drivers/staging/meilhaus/me0900_do.c | 14 +- + drivers/staging/meilhaus/me1000_device.c | 8 +- + drivers/staging/meilhaus/me1000_dio.c | 4 +- + drivers/staging/meilhaus/me1400_device.c | 4 +- + drivers/staging/meilhaus/me1400_ext_irq.c | 7 +- + drivers/staging/meilhaus/me1600_ao.c | 70 +- + drivers/staging/meilhaus/me1600_ao.h | 4 - + drivers/staging/meilhaus/me1600_device.c | 8 +- + drivers/staging/meilhaus/me4600_ai.c | 157 +- + drivers/staging/meilhaus/me4600_ai.h | 4 - + drivers/staging/meilhaus/me4600_ao.c | 191 +- + drivers/staging/meilhaus/me4600_ao.h | 4 - + drivers/staging/meilhaus/me4600_device.c | 4 +- + drivers/staging/meilhaus/me4600_di.c | 14 +- + drivers/staging/meilhaus/me4600_dio.c | 16 +- + drivers/staging/meilhaus/me4600_do.c | 16 +- + drivers/staging/meilhaus/me4600_ext_irq.c | 21 +- + drivers/staging/meilhaus/me6000_ao.c | 146 +- + drivers/staging/meilhaus/me6000_ao.h | 4 - + drivers/staging/meilhaus/me6000_device.c | 4 +- + drivers/staging/meilhaus/me6000_dio.c | 16 +- + drivers/staging/meilhaus/me8100_device.c | 4 +- + drivers/staging/meilhaus/me8100_di.c | 24 +- + drivers/staging/meilhaus/me8100_do.c | 16 +- + drivers/staging/meilhaus/me8200_device.c | 4 +- + drivers/staging/meilhaus/me8200_di.c | 58 +- + drivers/staging/meilhaus/me8200_dio.c | 16 +- + drivers/staging/meilhaus/me8200_do.c | 26 +- + drivers/staging/meilhaus/me8254.c | 14 +- + drivers/staging/meilhaus/me8255.c | 4 +- + drivers/staging/meilhaus/mecirc_buf.h | 16 +- + drivers/staging/meilhaus/medevice.c | 14 +- + drivers/staging/meilhaus/medlist.c | 6 +- + drivers/staging/meilhaus/medlock.c | 4 +- + drivers/staging/meilhaus/medummy.c | 84 +- + drivers/staging/meilhaus/memain.c | 34 +- + drivers/staging/meilhaus/meslist.c | 6 +- + drivers/staging/meilhaus/meslock.c | 2 +- + drivers/staging/meilhaus/mesubdevice.c | 12 +- + drivers/staging/meilhaus/metempl_device.c | 4 +- + drivers/staging/meilhaus/metempl_sub.c | 10 +- + drivers/staging/mimio/Kconfig | 2 +- + drivers/staging/otus/80211core/amsdu.c | 145 +- + drivers/staging/otus/80211core/cmmsta.c | 5 +- + drivers/staging/otus/80211core/coid.c | 8 +- + drivers/staging/otus/80211core/cwm.c | 6 +- + drivers/staging/otus/TODO | 9 +- + drivers/staging/otus/hal/hpani.c | 46 +- + drivers/staging/otus/hal/hpmain.c | 101 +- + drivers/staging/otus/hal/hpreg.c | 9 +- + drivers/staging/otus/hal/hprw.c | 30 +- + drivers/staging/otus/hal/hpusb.c | 11 +- + drivers/staging/otus/ioctl.c | 4789 +++++------ + drivers/staging/otus/usbdrv.c | 12 +- + drivers/staging/otus/wwrap.c | 6 +- + drivers/staging/otus/zdcompat.h | 7 - + drivers/staging/p9auth/Kconfig | 9 + + drivers/staging/p9auth/Makefile | 1 + + drivers/staging/p9auth/p9auth.c | 383 + + drivers/staging/panel/Kconfig | 2 +- + drivers/staging/phison/Kconfig | 5 + + drivers/staging/phison/Makefile | 1 + + drivers/staging/phison/phison.c | 106 + + drivers/staging/pohmelfs/Kconfig | 28 + + drivers/staging/pohmelfs/Makefile | 3 + + drivers/staging/pohmelfs/config.c | 478 + + drivers/staging/pohmelfs/crypto.c | 880 ++ + drivers/staging/pohmelfs/dir.c | 1093 +++ + drivers/staging/pohmelfs/inode.c | 1976 +++++ + drivers/staging/pohmelfs/lock.c | 182 + + drivers/staging/pohmelfs/mcache.c | 171 + + drivers/staging/pohmelfs/net.c | 1247 +++ + drivers/staging/pohmelfs/netfs.h | 932 ++ + drivers/staging/pohmelfs/path_entry.c | 114 + + drivers/staging/pohmelfs/trans.c | 715 ++ + drivers/staging/rspiusb/rspiusb.c | 5 +- + drivers/staging/rt2860/2860_main_dev.c | 50 +- + drivers/staging/rt2860/Makefile | 1 - + drivers/staging/rt2860/TODO | 4 +- + drivers/staging/rt2860/common/cmm_data.c | 27 +- + drivers/staging/rt2860/common/cmm_data_2860.c | 144 +- + drivers/staging/rt2860/common/cmm_info.c | 6 - + drivers/staging/rt2860/common/cmm_sync.c | 2 +- + drivers/staging/rt2860/common/cmm_wpa.c | 40 +- + drivers/staging/rt2860/common/mlme.c | 289 +- + drivers/staging/rt2860/common/rtmp_init.c | 157 +- + drivers/staging/rt2860/common/spectrum.c | 2 +- + drivers/staging/rt2860/config.mk | 4 - + drivers/staging/rt2860/oid.h | 2 + + drivers/staging/rt2860/rt2860.h | 22 +- + drivers/staging/rt2860/rt28xx.h | 4 - + drivers/staging/rt2860/rt_ate.c | 18 +- + drivers/staging/rt2860/rt_ate.h | 6 - + drivers/staging/rt2860/rt_config.h | 2 - + drivers/staging/rt2860/rt_linux.c | 29 +- + drivers/staging/rt2860/rt_linux.h | 49 +- + drivers/staging/rt2860/rt_main_dev.c | 149 +- + drivers/staging/rt2860/rt_profile.c | 2 +- + drivers/staging/rt2860/rtmp.h | 61 +- + drivers/staging/rt2860/rtmp_def.h | 29 +- + drivers/staging/rt2860/sta/assoc.c | 23 +- + drivers/staging/rt2860/sta/connect.c | 45 +- + drivers/staging/rt2860/sta/dls.c | 4 - + drivers/staging/rt2860/sta/rtmp_data.c | 29 +- + drivers/staging/rt2860/sta/sync.c | 16 +- + drivers/staging/rt2860/sta/wpa.c | 10 +- + drivers/staging/rt2860/sta_ioctl.c | 96 +- + drivers/staging/rt2860/wpa.h | 1 + + drivers/staging/rt2870/2870_main_dev.c | 67 +- + drivers/staging/rt2870/TODO | 9 +- + drivers/staging/rt2870/common/2870_rtmp_init.c | 35 +- + drivers/staging/rt2870/common/cmm_data.c | 3 - + drivers/staging/rt2870/common/rtmp_init.c | 2 +- + drivers/staging/rt2870/common/rtusb_io.c | 3 +- + drivers/staging/rt2870/common/spectrum.c | 2 +- + drivers/staging/rt2870/rt2870.h | 7 +- + drivers/staging/rt2870/rt_linux.c | 2 +- + drivers/staging/rt2870/rt_linux.h | 12 +- + drivers/staging/rt2870/sta_ioctl.c | 2 +- + drivers/staging/rt3070/2870_main_dev.c | 1627 ++++ + drivers/staging/rt3070/Kconfig | 6 + + drivers/staging/rt3070/Makefile | 47 + + drivers/staging/rt3070/action.h | 68 + + drivers/staging/rt3070/aironet.h | 210 + + drivers/staging/rt3070/ap.h | 557 ++ + drivers/staging/rt3070/chlist.h | 1253 +++ + drivers/staging/rt3070/common/2870_rtmp_init.c | 1762 ++++ + drivers/staging/rt3070/common/action.c | 1038 +++ + drivers/staging/rt3070/common/ba_action.c | 1810 ++++ + drivers/staging/rt3070/common/cmm_data.c | 2827 ++++++ + drivers/staging/rt3070/common/cmm_data_2870.c | 980 +++ + drivers/staging/rt3070/common/cmm_info.c | 3395 ++++++++ + drivers/staging/rt3070/common/cmm_sanity.c | 1669 ++++ + drivers/staging/rt3070/common/cmm_sync.c | 711 ++ + drivers/staging/rt3070/common/cmm_wpa.c | 1606 ++++ + drivers/staging/rt3070/common/dfs.c | 441 + + drivers/staging/rt3070/common/eeprom.c | 1498 ++++ + drivers/staging/rt3070/common/md5.c | 1427 +++ + drivers/staging/rt3070/common/mlme.c | 9136 ++++++++++++++++++++ + drivers/staging/rt3070/common/netif_block.c | 136 + + drivers/staging/rt3070/common/rtmp_init.c | 4197 +++++++++ + drivers/staging/rt3070/common/rtmp_tkip.c | 1613 ++++ + drivers/staging/rt3070/common/rtmp_wep.c | 508 ++ + drivers/staging/rt3070/common/rtusb_bulk.c | 1382 +++ + drivers/staging/rt3070/common/rtusb_data.c | 218 + + drivers/staging/rt3070/common/rtusb_io.c | 1908 ++++ + drivers/staging/rt3070/common/spectrum.c | 1876 ++++ + drivers/staging/rt3070/dfs.h | 100 + + drivers/staging/rt3070/firmware.h | 558 ++ + drivers/staging/rt3070/leap.h | 215 + + drivers/staging/rt3070/link_list.h | 134 + + drivers/staging/rt3070/md4.h | 42 + + drivers/staging/rt3070/md5.h | 107 + + drivers/staging/rt3070/mlme.h | 1468 ++++ + drivers/staging/rt3070/netif_block.h | 58 + + drivers/staging/rt3070/oid.h | 1142 +++ + drivers/staging/rt3070/rt2870.h | 756 ++ + drivers/staging/rt3070/rt28xx.h | 2725 ++++++ + drivers/staging/rt3070/rt_ate.c | 6506 ++++++++++++++ + drivers/staging/rt3070/rt_ate.h | 294 + + drivers/staging/rt3070/rt_config.h | 121 + + drivers/staging/rt3070/rt_linux.c | 1063 +++ + drivers/staging/rt3070/rt_linux.h | 887 ++ + drivers/staging/rt3070/rt_main_dev.c | 1800 ++++ + drivers/staging/rt3070/rt_profile.c | 2041 +++++ + drivers/staging/rt3070/rtmp.h | 7728 +++++++++++++++++ + drivers/staging/rt3070/rtmp_ckipmic.h | 113 + + drivers/staging/rt3070/rtmp_def.h | 1559 ++++ + drivers/staging/rt3070/rtmp_type.h | 95 + + drivers/staging/rt3070/spectrum.h | 322 + + drivers/staging/rt3070/spectrum_def.h | 95 + + drivers/staging/rt3070/sta/aironet.c | 1312 +++ + drivers/staging/rt3070/sta/assoc.c | 2060 +++++ + drivers/staging/rt3070/sta/auth.c | 475 + + drivers/staging/rt3070/sta/auth_rsp.c | 167 + + drivers/staging/rt3070/sta/connect.c | 2857 ++++++ + drivers/staging/rt3070/sta/dls.c | 2170 +++++ + drivers/staging/rt3070/sta/rtmp_data.c | 2637 ++++++ + drivers/staging/rt3070/sta/sanity.c | 420 + + drivers/staging/rt3070/sta/sync.c | 1755 ++++ + drivers/staging/rt3070/sta/wpa.c | 2099 +++++ + drivers/staging/rt3070/sta_ioctl.c | 7203 +++++++++++++++ + drivers/staging/rt3070/wpa.h | 356 + + drivers/staging/rtl8187se/dot11d.h | 202 +- + drivers/staging/rtl8187se/ieee80211/dot11d.c | 492 +- + drivers/staging/rtl8187se/ieee80211/dot11d.h | 204 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 8 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 4 +- + drivers/staging/rtl8187se/r8180_core.c | 10 +- + drivers/staging/rtl8187se/r8180_dm.c | 3450 ++++---- + drivers/staging/rtl8187se/r8180_dm.h | 82 +- + drivers/staging/rtl8187se/r8180_wx.c | 12 +- + drivers/staging/serqt_usb/Kconfig | 9 + + drivers/staging/serqt_usb/Makefile | 1 + + drivers/staging/serqt_usb/TODO | 8 + + drivers/staging/serqt_usb/serqt_usb.c | 2779 ++++++ + drivers/staging/slicoss/gbdownload.h | 8215 ------------------ + drivers/staging/slicoss/gbrcvucode.h | 238 - + drivers/staging/slicoss/oasisdbgdownload.h | 6850 --------------- + drivers/staging/slicoss/oasisdownload.h | 6848 --------------- + drivers/staging/slicoss/oasisrcvucode.h | 205 - + drivers/staging/slicoss/slic.h | 86 +- + drivers/staging/slicoss/slic_os.h | 84 - + drivers/staging/slicoss/slicbuild.h | 96 - + drivers/staging/slicoss/slicdbg.h | 100 - + drivers/staging/slicoss/slicdump.h | 278 - + drivers/staging/slicoss/slichw.h | 1038 ++-- + drivers/staging/slicoss/slicinc.h | 185 - + drivers/staging/slicoss/slicoss.c | 2913 ++----- + drivers/staging/stlc45xx/Kconfig | 8 + + drivers/staging/stlc45xx/Makefile | 1 + + drivers/staging/stlc45xx/stlc45xx.c | 2606 ++++++ + drivers/staging/stlc45xx/stlc45xx.h | 283 + + drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 + + drivers/staging/sxg/Kconfig | 2 +- + drivers/staging/sxg/Makefile | 4 +- + drivers/staging/sxg/saharadbgdownload.h | 4854 ----------- + drivers/staging/sxg/sxg.c | 2885 ++++--- + drivers/staging/sxg/sxg.h | 919 +- + drivers/staging/sxg/sxg_ethtool.c | 328 + + drivers/staging/sxg/sxg_os.h | 100 +- + drivers/staging/sxg/sxgdbg.h | 129 +- + drivers/staging/sxg/sxghif.h | 1110 ++- + drivers/staging/sxg/sxghw.h | 1564 ++-- + drivers/staging/sxg/sxgphycode-1.2.h | 130 + + drivers/staging/sxg/sxgphycode.h | 349 - + drivers/staging/uc2322/Kconfig | 10 + + drivers/staging/uc2322/Makefile | 1 + + drivers/staging/uc2322/TODO | 7 + + drivers/staging/uc2322/aten2011.c | 2452 ++++++ + drivers/staging/usbip/stub_rx.c | 4 +- + drivers/staging/usbip/vhci_sysfs.c | 3 +- + drivers/staging/winbond/bss_f.h | 63 - + drivers/staging/winbond/bssdscpt.h | 164 - + drivers/staging/winbond/common.h | 27 - + drivers/staging/winbond/core.h | 7 +- + drivers/staging/winbond/ds_tkip.h | 37 - + drivers/staging/winbond/gl_80211.h | 126 - + drivers/staging/winbond/ioctls.h | 678 -- + drivers/staging/winbond/mds.c | 26 +- + drivers/staging/winbond/mds_s.h | 24 +- + drivers/staging/winbond/mlme_mib.h | 84 - + drivers/staging/winbond/mlmetxrx.c | 2 +- + drivers/staging/winbond/mto.c | 24 +- + drivers/staging/winbond/mto.h | 12 +- + drivers/staging/winbond/mto_f.h | 13 - + drivers/staging/winbond/os_common.h | 2 - + drivers/staging/winbond/phy_calibration.c | 28 +- + drivers/staging/winbond/phy_calibration.h | 2 +- + drivers/staging/winbond/reg.c | 81 +- + drivers/staging/winbond/sme_api.h | 3 - + drivers/staging/winbond/sme_s.h | 236 - + drivers/staging/winbond/wb35_ver.h | 30 - + drivers/staging/winbond/wb35reg.c | 41 +- + drivers/staging/winbond/wb35reg_f.h | 70 +- + drivers/staging/winbond/wb35rx.c | 43 +- + drivers/staging/winbond/wb35rx_f.h | 6 +- + drivers/staging/winbond/wb35rx_s.h | 8 +- + drivers/staging/winbond/wb35tx.c | 54 +- + drivers/staging/winbond/wb35tx_f.h | 8 +- + drivers/staging/winbond/wb35tx_s.h | 6 +- + drivers/staging/winbond/wbhal.c | 50 +- + drivers/staging/winbond/wbhal_f.h | 94 +- + drivers/staging/winbond/wbhal_s.h | 87 +- + drivers/staging/winbond/wbusb.c | 20 +- + drivers/staging/winbond/wbusb_s.h | 16 +- + drivers/staging/wlan-ng/README | 4 +- + drivers/staging/wlan-ng/hfa384x.h | 2638 ++----- + drivers/staging/wlan-ng/hfa384x_usb.c | 2295 ++--- + drivers/staging/wlan-ng/p80211conv.c | 377 +- + drivers/staging/wlan-ng/p80211conv.h | 131 +- + drivers/staging/wlan-ng/p80211hdr.h | 146 +- + drivers/staging/wlan-ng/p80211ioctl.h | 46 +- + drivers/staging/wlan-ng/p80211meta.h | 110 +- + drivers/staging/wlan-ng/p80211metadef.h | 544 -- + drivers/staging/wlan-ng/p80211metamib.h | 105 - + drivers/staging/wlan-ng/p80211metamsg.h | 105 - + drivers/staging/wlan-ng/p80211metastruct.h | 424 +- + drivers/staging/wlan-ng/p80211mgmt.h | 441 +- + drivers/staging/wlan-ng/p80211msg.h | 48 +- + drivers/staging/wlan-ng/p80211netdev.c | 411 +- + drivers/staging/wlan-ng/p80211netdev.h | 218 +- + drivers/staging/wlan-ng/p80211req.c | 235 +- + drivers/staging/wlan-ng/p80211req.h | 17 +- + drivers/staging/wlan-ng/p80211types.h | 505 +- + drivers/staging/wlan-ng/p80211wep.c | 24 +- + drivers/staging/wlan-ng/p80211wext.c | 1214 ++-- + drivers/staging/wlan-ng/prism2mgmt.c | 899 +- + drivers/staging/wlan-ng/prism2mgmt.h | 69 +- + drivers/staging/wlan-ng/prism2mib.c | 905 +-- + drivers/staging/wlan-ng/prism2sta.c | 1561 ++-- + drivers/staging/wlan-ng/prism2usb.c | 158 +- + drivers/staging/wlan-ng/wlan_compat.h | 193 - + drivers/thermal/thermal_sys.c | 356 +- + drivers/usb/atm/ueagle-atm.c | 2 +- + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 14 +- + drivers/usb/serial/ChangeLog.history | 2 +- + drivers/usb/serial/Kconfig | 4 +- + drivers/usb/storage/isd200.c | 239 +- + drivers/usb/wusbcore/devconnect.c | 2 +- + drivers/usb/wusbcore/security.c | 2 +- + drivers/uwb/Kconfig | 4 +- + drivers/video/nvidia/nv_setup.c | 1 + + drivers/w1/masters/ds1wm.c | 58 +- + drivers/w1/w1_io.c | 16 +- + drivers/xen/Kconfig | 2 +- + drivers/xen/cpu_hotplug.c | 4 +- + firmware/3com/3C359.bin.ihex | 1573 ++++ + firmware/Makefile | 9 + + firmware/WHENCE | 103 + + firmware/ositech/Xilinx7OD.bin.ihex | 177 + + firmware/slicoss/gbdownload.sys.ihex | 6148 +++++++++++++ + firmware/slicoss/gbrcvucode.sys.ihex | 162 + + firmware/slicoss/oasisdbgdownload.sys.ihex | 5124 +++++++++++ + firmware/slicoss/oasisdownload.sys.ihex | 5124 +++++++++++ + firmware/slicoss/oasisrcvucode.sys.ihex | 162 + + firmware/sxg/saharadbgdownloadB.sys.ihex | 3937 +++++++++ + firmware/sxg/saharadownloadB.sys.ihex | 3385 ++++++++ + firmware/yam/1200.bin.ihex | 342 + + firmware/yam/9600.bin.ihex | 342 + + fs/Kconfig | 9 + + fs/Makefile | 5 +- + fs/adfs/super.c | 16 +- + fs/affs/super.c | 4 + + fs/afs/Kconfig | 8 + + fs/afs/Makefile | 3 + + fs/afs/cache.c | 503 +- + fs/afs/cache.h | 15 +- + fs/afs/cell.c | 16 +- + fs/afs/file.c | 220 +- + fs/afs/inode.c | 31 +- + fs/afs/internal.h | 53 +- + fs/afs/main.c | 27 +- + fs/afs/mntpt.c | 4 +- + fs/afs/vlocation.c | 25 +- + fs/afs/volume.c | 14 +- + fs/afs/write.c | 21 + + fs/befs/linuxvfs.c | 3 + + fs/binfmt_elf.c | 22 +- + fs/binfmt_elf_fdpic.c | 25 +- + fs/binfmt_som.c | 7 - + fs/bio.c | 3 +- + fs/block_dev.c | 1 + + fs/btrfs/acl.c | 2 +- + fs/btrfs/async-thread.c | 7 +- + fs/btrfs/ctree.c | 312 +- + fs/btrfs/ctree.h | 84 +- + fs/btrfs/delayed-ref.c | 1 - + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent-tree.c | 398 +- + fs/btrfs/extent_io.c | 16 +- + fs/btrfs/extent_map.c | 1 - + fs/btrfs/free-space-cache.c | 530 +- + fs/btrfs/free-space-cache.h | 44 + + fs/btrfs/inode.c | 5 +- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/locking.c | 4 +- + fs/btrfs/super.c | 54 +- + fs/btrfs/transaction.c | 7 +- + fs/btrfs/tree-log.c | 12 +- + fs/btrfs/volumes.c | 43 +- + fs/btrfs/volumes.h | 2 +- + fs/buffer.c | 12 +- + fs/cachefiles/Kconfig | 39 + + fs/cachefiles/Makefile | 18 + + fs/cachefiles/bind.c | 286 + + fs/cachefiles/daemon.c | 755 ++ + fs/cachefiles/interface.c | 449 + + fs/cachefiles/internal.h | 360 + + fs/cachefiles/key.c | 159 + + fs/cachefiles/main.c | 106 + + fs/cachefiles/namei.c | 771 ++ + fs/cachefiles/proc.c | 134 + + fs/cachefiles/rdwr.c | 879 ++ + fs/cachefiles/security.c | 116 + + fs/cachefiles/xattr.c | 291 + + fs/cifs/dir.c | 4 +- + fs/cifs/inode.c | 4 +- + fs/compat.c | 105 +- + fs/compat_ioctl.c | 2 +- + fs/cramfs/inode.c | 39 +- + fs/cramfs/uncompress.c | 2 +- + fs/dcache.c | 2 +- + fs/debugfs/inode.c | 16 + + fs/drop_caches.c | 2 +- + fs/efs/super.c | 20 +- + fs/exec.c | 35 +- + fs/exofs/BUGS | 3 + + fs/exofs/Kbuild | 16 + + fs/exofs/Kconfig | 13 + + fs/exofs/common.h | 184 + + fs/exofs/dir.c | 672 ++ + fs/exofs/exofs.h | 180 + + fs/exofs/file.c | 87 + + fs/exofs/inode.c | 1303 +++ + fs/exofs/namei.c | 342 + + fs/exofs/osd.c | 153 + + fs/exofs/super.c | 584 ++ + fs/exofs/symlink.c | 57 + + fs/ext2/acl.c | 2 +- + fs/ext3/acl.c | 2 +- + fs/ext3/dir.c | 2 +- + fs/ext3/file.c | 6 +- + fs/ext3/inode.c | 142 +- + fs/ext3/ioctl.c | 59 +- + fs/ext3/namei.c | 35 +- + fs/ext4/Kconfig | 2 +- + fs/ext4/acl.c | 2 +- + fs/fat/inode.c | 8 +- + fs/file_table.c | 1 - + fs/fs-writeback.c | 31 +- + fs/fs_struct.c | 177 + + fs/fscache/Kconfig | 56 + + fs/fscache/Makefile | 19 + + fs/fscache/cache.c | 415 + + fs/fscache/cookie.c | 500 ++ + fs/fscache/fsdef.c | 144 + + fs/fscache/histogram.c | 109 + + fs/fscache/internal.h | 380 + + fs/fscache/main.c | 124 + + fs/fscache/netfs.c | 103 + + fs/fscache/object.c | 810 ++ + fs/fscache/operation.c | 459 + + fs/fscache/page.c | 816 ++ + fs/fscache/proc.c | 68 + + fs/fscache/stats.c | 212 + + fs/fuse/dir.c | 1 + + fs/fuse/file.c | 54 +- + fs/generic_acl.c | 2 +- + fs/gfs2/acl.c | 2 +- + fs/hfs/super.c | 3 + + fs/hfsplus/options.c | 2 +- + fs/hfsplus/super.c | 3 + + fs/hpfs/super.c | 5 +- + fs/hppfs/hppfs.c | 7 +- + fs/internal.h | 8 +- + fs/isofs/inode.c | 3 + + fs/jbd/commit.c | 23 +- + fs/jbd/journal.c | 34 +- + fs/jbd/transaction.c | 2 + + fs/jffs2/acl.c | 2 +- + fs/jfs/acl.c | 2 +- + fs/minix/inode.c | 11 +- + fs/mpage.c | 13 +- + fs/namei.c | 14 +- + fs/namespace.c | 61 +- + fs/nfs/Kconfig | 8 + + fs/nfs/Makefile | 1 + + fs/nfs/client.c | 14 +- + fs/nfs/file.c | 38 +- + fs/nfs/fscache-index.c | 337 + + fs/nfs/fscache.c | 523 ++ + fs/nfs/fscache.h | 220 + + fs/nfs/inode.c | 14 + + fs/nfs/internal.h | 4 + + fs/nfs/iostat.h | 18 + + fs/nfs/nfs3proc.c | 6 +- + fs/nfs/nfs4proc.c | 2 +- + fs/nfs/read.c | 27 +- + fs/nfs/super.c | 45 +- + fs/nfsd/nfssvc.c | 7 +- + fs/ocfs2/acl.c | 2 +- + fs/ocfs2/alloc.c | 57 + + fs/ocfs2/alloc.h | 3 + + fs/ocfs2/aops.c | 23 +- + fs/ocfs2/cluster/heartbeat.c | 96 +- + fs/ocfs2/cluster/heartbeat.h | 3 +- + fs/ocfs2/cluster/nodemanager.c | 9 +- + fs/ocfs2/dir.c | 2806 ++++++- + fs/ocfs2/dir.h | 57 +- + fs/ocfs2/dlm/dlmcommon.h | 58 +- + fs/ocfs2/dlm/dlmdebug.c | 87 +- + fs/ocfs2/dlm/dlmdomain.c | 29 +- + fs/ocfs2/dlm/dlmmaster.c | 387 +- + fs/ocfs2/dlm/dlmthread.c | 20 +- + fs/ocfs2/dlmglue.c | 46 + + fs/ocfs2/dlmglue.h | 2 + + fs/ocfs2/export.c | 84 +- + fs/ocfs2/inode.c | 48 +- + fs/ocfs2/inode.h | 5 + + fs/ocfs2/journal.c | 173 +- + fs/ocfs2/journal.h | 77 +- + fs/ocfs2/localalloc.c | 86 - + fs/ocfs2/namei.c | 250 +- + fs/ocfs2/ocfs2.h | 76 +- + fs/ocfs2/ocfs2_fs.h | 136 +- + fs/ocfs2/ocfs2_lockid.h | 4 + + fs/ocfs2/suballoc.c | 254 +- + fs/ocfs2/suballoc.h | 4 + + fs/ocfs2/super.c | 188 + + fs/ocfs2/xattr.c | 8 +- + fs/ocfs2/xattr.h | 2 +- + fs/omfs/inode.c | 7 +- + fs/open.c | 1 + + fs/partitions/check.c | 4 + + fs/proc/base.c | 1 + + fs/proc/meminfo.c | 2 +- + fs/proc/nommu.c | 2 +- + fs/proc/task_nommu.c | 7 +- + fs/qnx4/inode.c | 3 + + fs/quota/dquot.c | 2 +- + fs/read_write.c | 56 + + fs/reiserfs/Kconfig | 1 + + fs/reiserfs/super.c | 5 + + fs/reiserfs/xattr_acl.c | 2 +- + fs/splice.c | 3 +- + fs/squashfs/super.c | 3 + + fs/super.c | 1 + + fs/sysv/inode.c | 3 + + fs/ubifs/Kconfig | 4 +- + fs/udf/balloc.c | 150 +- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 +- + fs/udf/ecma_167.h | 416 +- + fs/udf/ialloc.c | 9 +- + 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 | 605 +- + fs/udf/truncate.c | 44 +- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 9 +- + fs/udf/udfdecl.h | 57 +- + fs/udf/udfend.h | 28 +- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 62 +- + fs/ufs/super.c | 3 + + fs/xfs/Makefile | 1 + + fs/xfs/linux-2.6/mutex.h | 25 - + fs/xfs/linux-2.6/xfs_aops.c | 1 + + fs/xfs/linux-2.6/xfs_ioctl.c | 117 +- + fs/xfs/linux-2.6/xfs_iops.c | 37 +- + fs/xfs/linux-2.6/xfs_linux.h | 13 +- + fs/xfs/linux-2.6/xfs_quotaops.c | 157 + + fs/xfs/linux-2.6/xfs_super.c | 137 +- + fs/xfs/linux-2.6/xfs_super.h | 1 + + fs/xfs/linux-2.6/xfs_sync.h | 1 + + fs/xfs/linux-2.6/xfs_vnode.h | 32 - + fs/xfs/quota/xfs_dquot.c | 28 +- + fs/xfs/quota/xfs_dquot.h | 18 +- + fs/xfs/quota/xfs_qm.c | 212 +- + fs/xfs/quota/xfs_qm.h | 26 +- + fs/xfs/quota/xfs_qm_bhv.c | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 190 +- + fs/xfs/quota/xfs_quota_priv.h | 38 +- + fs/xfs/quota/xfs_trans_dquot.c | 16 +- + fs/xfs/support/debug.c | 1 + + fs/xfs/support/uuid.c | 71 - + fs/xfs/support/uuid.h | 4 - + fs/xfs/xfs_ag.h | 4 +- + fs/xfs/xfs_alloc.c | 26 +- + fs/xfs/xfs_alloc.h | 6 + + fs/xfs/xfs_attr_leaf.c | 58 +- + fs/xfs/xfs_bmap.c | 76 +- + fs/xfs/xfs_bmap.h | 6 +- + fs/xfs/xfs_btree.c | 4 +- + fs/xfs/xfs_btree.h | 2 +- + fs/xfs/xfs_da_btree.c | 2 +- + fs/xfs/xfs_da_btree.h | 9 +- + fs/xfs/xfs_dfrag.c | 68 +- + fs/xfs/xfs_dinode.h | 4 +- + fs/xfs/xfs_dir2.c | 2 - + fs/xfs/xfs_dir2_block.c | 7 +- + fs/xfs/xfs_dir2_data.h | 2 +- + fs/xfs/xfs_dir2_leaf.c | 17 +- + fs/xfs/xfs_dir2_node.c | 2 +- + fs/xfs/xfs_dir2_sf.c | 13 +- + fs/xfs/xfs_extfree_item.h | 6 - + fs/xfs/xfs_filestream.c | 9 +- + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_ialloc.c | 12 +- + fs/xfs/xfs_ialloc_btree.c | 2 +- + fs/xfs/xfs_ialloc_btree.h | 22 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_inode_item.h | 2 - + fs/xfs/xfs_iomap.h | 2 +- + fs/xfs/xfs_itable.c | 9 +- + fs/xfs/xfs_log.c | 67 +- + fs/xfs/xfs_log.h | 3 +- + fs/xfs/xfs_log_priv.h | 3 +- + fs/xfs/xfs_log_recover.c | 308 +- + fs/xfs/xfs_mount.c | 253 +- + fs/xfs/xfs_mount.h | 19 +- + fs/xfs/xfs_qmops.c | 1 - + fs/xfs/xfs_quota.h | 3 +- + fs/xfs/xfs_rtalloc.c | 10 + + fs/xfs/xfs_rtalloc.h | 8 +- + fs/xfs/xfs_trans.h | 24 +- + fs/xfs/xfs_trans_ail.c | 4 +- + fs/xfs/xfs_trans_item.c | 2 +- + fs/xfs/xfs_trans_space.h | 2 +- + fs/xfs/xfs_types.h | 8 - + fs/xfs/xfs_utils.c | 2 +- + fs/xfs/xfs_vnodeops.c | 408 +- + fs/xfs/xfs_vnodeops.h | 3 - + include/acpi/acexcep.h | 6 +- + include/acpi/acpi_bus.h | 18 +- + include/acpi/acpi_drivers.h | 33 +- + include/acpi/acpiosxf.h | 4 - + include/acpi/acpixf.h | 16 +- + include/acpi/actbl.h | 74 +- + include/acpi/actbl1.h | 6 +- + include/acpi/actypes.h | 18 +- + include/acpi/processor.h | 4 +- + include/acpi/video.h | 11 + + include/asm-frv/ftrace.h | 1 + + include/asm-generic/gpio.h | 5 + + include/asm-generic/vmlinux.lds.h | 29 +- + include/asm-m32r/ftrace.h | 1 + + include/asm-m32r/spinlock.h | 3 + + include/asm-mn10300/ftrace.h | 1 + + include/drm/drm_crtc_helper.h | 3 +- + include/drm/drm_os_linux.h | 4 +- + include/linux/Kbuild | 1 + + include/linux/acpi.h | 1 + + include/linux/async_tx.h | 9 + + include/linux/binfmts.h | 3 +- + include/linux/blktrace_api.h | 5 + + include/linux/buffer_head.h | 12 - + include/linux/cgroup.h | 142 +- + include/linux/compat.h | 6 + + include/linux/compiler.h | 6 +- + include/linux/connector.h | 4 +- + include/linux/cpu.h | 16 - + include/linux/cpuset.h | 33 +- + include/linux/debugfs.h | 8 + + include/linux/device-mapper.h | 3 + + include/linux/dm-dirty-log.h | 13 + + include/linux/dma_remapping.h | 1 + + include/linux/dmaengine.h | 30 +- + include/linux/ds1wm.h | 12 - + include/linux/dst.h | 587 ++ + include/linux/dw_dmac.h | 19 + + include/linux/ext3_fs.h | 6 +- + include/linux/fs.h | 14 + + include/linux/fs_struct.h | 10 +- + include/linux/fscache-cache.h | 505 ++ + include/linux/fscache.h | 618 ++ + include/linux/ftrace.h | 244 +- + include/linux/ftrace_irq.h | 2 +- + include/linux/gfp.h | 1 + + include/linux/hardirq.h | 73 +- + include/linux/hdreg.h | 66 +- + include/linux/hid.h | 23 +- + include/linux/highmem.h | 29 +- + include/linux/i2c/at24.h | 4 + + include/linux/i2c/twl4030.h | 47 + + include/linux/idr.h | 1 + + include/linux/intel-iommu.h | 2 +- + include/linux/interrupt.h | 5 + + include/linux/iommu.h | 13 + + include/linux/irqflags.h | 8 +- + include/linux/jbd.h | 7 +- + include/linux/kallsyms.h | 15 + + include/linux/kernel.h | 154 + + include/linux/kmod.h | 11 +- + include/linux/libata.h | 2 +- + include/linux/lockdep.h | 17 + + include/linux/memcontrol.h | 20 +- + include/linux/memory.h | 17 + + include/linux/mfd/ds1wm.h | 6 + + include/linux/mfd/htc-pasic3.h | 1 - + include/linux/mfd/wm8350/core.h | 2 + + include/linux/mm.h | 2 +- + include/linux/mm_types.h | 6 +- + include/linux/mmc/host.h | 5 + + include/linux/mmzone.h | 6 - + include/linux/mnt_namespace.h | 2 + + include/linux/module.h | 68 +- + include/linux/moduleparam.h | 10 + + include/linux/mpage.h | 10 - + include/linux/nfs_fs.h | 13 + + include/linux/nfs_fs_sb.h | 11 + + include/linux/nfs_iostat.h | 12 + + include/linux/nsproxy.h | 1 + + include/linux/page-flags.h | 40 +- + include/linux/page_cgroup.h | 13 +- + include/linux/pagemap.h | 17 +- + include/linux/pci_ids.h | 1 + + include/linux/power_supply.h | 2 + + include/linux/ptrace.h | 1 + + include/linux/pwm.h | 2 +- + include/linux/raid/md.h | 81 - + include/linux/raid/md_u.h | 35 + + drivers/md/raid6.h => include/linux/raid/pq.h | 28 +- + include/linux/raid/xor.h | 2 - + include/linux/regulator/bq24022.h | 3 + + include/linux/regulator/consumer.h | 6 +- + include/linux/regulator/driver.h | 81 +- + include/linux/regulator/fixed.h | 3 + + include/linux/regulator/machine.h | 12 +- + include/linux/ring_buffer.h | 38 +- + include/linux/rtc-v3020.h | 6 + + include/linux/sched.h | 80 +- + include/linux/slab_def.h | 68 +- + include/linux/slob_def.h | 9 +- + include/linux/slow-work.h | 95 + + include/linux/slub_def.h | 53 +- + include/linux/smp.h | 7 +- + include/linux/sonypi.h | 8 + + include/linux/spi/eeprom.h | 6 + + include/linux/spi/spi_gpio.h | 6 + + include/linux/spinlock.h | 6 + + include/linux/string.h | 16 + + include/linux/synclink.h | 1 + + include/linux/syscalls.h | 64 +- + include/linux/thermal.h | 48 +- + include/linux/timeriomem-rng.h | 2 +- + include/linux/topology.h | 11 +- + include/linux/trace_clock.h | 19 + + include/linux/tracehook.h | 15 +- + include/linux/tracepoint.h | 116 +- + include/linux/usb/wusb.h | 3 +- + include/linux/workqueue.h | 5 + + include/net/tcp.h | 15 - + include/trace/block.h | 70 +- + include/trace/irq.h | 9 + + include/trace/irq_event_types.h | 55 + + include/trace/kmemtrace.h | 75 + + include/trace/lockdep.h | 9 + + include/trace/lockdep_event_types.h | 44 + + include/trace/power.h | 32 + + include/trace/sched.h | 49 +- + include/trace/sched_event_types.h | 337 + + include/trace/skb.h | 4 +- + include/trace/trace_event_types.h | 5 + + include/trace/trace_events.h | 5 + + include/trace/workqueue.h | 25 + + init/Kconfig | 26 +- + init/do_mounts.c | 1 + + init/do_mounts.h | 1 + + init/do_mounts_md.c | 5 +- + init/initramfs.c | 7 +- + init/main.c | 5 +- + ipc/ipc_sysctl.c | 2 +- + ipc/mqueue.c | 2 +- + ipc/shm.c | 6 +- + kernel/Makefile | 1 + + kernel/audit.c | 9 +- + kernel/audit_tree.c | 2 + + kernel/auditfilter.c | 16 +- + kernel/auditsc.c | 34 +- + kernel/cgroup.c | 430 +- + kernel/cgroup_debug.c | 2 - + kernel/cpuset.c | 254 +- + kernel/exec_domain.c | 23 +- + kernel/exit.c | 245 +- + kernel/extable.c | 48 +- + kernel/fork.c | 70 +- + kernel/irq/handle.c | 6 + + kernel/kallsyms.c | 19 + + kernel/kexec.c | 3 +- + kernel/kmod.c | 10 +- + kernel/kprobes.c | 19 +- + kernel/lockdep.c | 33 +- + kernel/module.c | 274 +- + kernel/ns_cgroup.c | 14 +- + kernel/panic.c | 115 +- + kernel/params.c | 26 +- + kernel/pid.c | 33 +- + kernel/pid_namespace.c | 15 +- + kernel/power/disk.c | 4 +- + kernel/printk.c | 26 +- + kernel/ptrace.c | 103 +- + kernel/rcupdate.c | 44 + + kernel/relay.c | 12 +- + kernel/sched.c | 53 +- + kernel/sched_clock.c | 12 + + kernel/signal.c | 63 +- + kernel/slow-work.c | 640 ++ + kernel/smp.c | 432 +- + kernel/softirq.c | 34 +- + kernel/spinlock.c | 18 +- + kernel/sys.c | 5 +- + kernel/sysctl.c | 24 +- + kernel/trace/Kconfig | 132 +- + kernel/trace/Makefile | 13 + + kernel/trace/blktrace.c | 1549 ++++ + kernel/trace/events.c | 14 + + kernel/trace/ftrace.c | 1133 ++- + kernel/trace/kmemtrace.c | 339 + + kernel/trace/ring_buffer.c | 693 ++- + kernel/trace/trace.c | 3034 ++++--- + kernel/trace/trace.h | 315 +- + kernel/trace/trace_boot.c | 36 +- + kernel/trace/trace_branch.c | 278 +- + kernel/trace/trace_clock.c | 109 + + kernel/trace/trace_event_profile.c | 31 + + kernel/trace/trace_event_types.h | 173 + + kernel/trace/trace_events.c | 824 ++ + kernel/trace/trace_events_filter.c | 427 + + kernel/trace/trace_events_stage_1.h | 39 + + kernel/trace/trace_events_stage_2.h | 176 + + kernel/trace/trace_events_stage_3.h | 281 + + kernel/trace/trace_export.c | 102 + + kernel/trace/trace_functions.c | 369 +- + kernel/trace/trace_functions_graph.c | 570 +- + kernel/trace/trace_hw_branches.c | 185 +- + kernel/trace/trace_irqsoff.c | 54 +- + kernel/trace/trace_mmiotrace.c | 45 +- + kernel/trace/trace_nop.c | 6 +- + kernel/trace/trace_output.c | 1017 +++ + kernel/trace/trace_output.h | 71 + + kernel/trace/trace_power.c | 194 +- + kernel/trace/trace_printk.c | 270 + + kernel/trace/trace_sched_switch.c | 24 +- + kernel/trace/trace_sched_wakeup.c | 96 +- + kernel/trace/trace_selftest.c | 169 +- + kernel/trace/trace_stack.c | 19 +- + kernel/trace/trace_stat.c | 326 + + kernel/trace/trace_stat.h | 31 + + kernel/trace/trace_syscalls.c | 250 + + kernel/trace/trace_sysprof.c | 23 +- + kernel/trace/trace_workqueue.c | 288 + + kernel/tracepoint.c | 7 +- + kernel/utsname_sysctl.c | 2 +- + kernel/workqueue.c | 57 +- + lib/Kconfig | 3 + + lib/cpumask.c | 4 +- + lib/debugobjects.c | 127 +- + lib/idr.c | 46 + + lib/locking-selftest.c | 4 +- + lib/vsprintf.c | 1005 ++- + mm/Kconfig.debug | 9 + + mm/filemap.c | 23 + + mm/filemap_xip.c | 4 +- + mm/memcontrol.c | 687 +- + mm/migrate.c | 10 +- + mm/mmap.c | 3 - + mm/nommu.c | 52 +- + mm/oom_kill.c | 1 + + mm/page_alloc.c | 8 +- + mm/page_cgroup.c | 37 +- + mm/quicklist.c | 2 +- + mm/readahead.c | 40 +- + mm/slab.c | 76 +- + mm/slob.c | 35 +- + mm/slub.c | 83 +- + mm/swap.c | 4 +- + mm/truncate.c | 10 +- + mm/vmscan.c | 12 +- + mm/vmstat.c | 5 +- + net/Kconfig | 2 +- + net/core/dev.c | 5 +- + net/core/ethtool.c | 3 +- + net/ipv4/netfilter/arp_tables.c | 4 +- + net/ipv4/netfilter/ip_tables.c | 4 +- + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_output.c | 73 +- + net/ipv6/Kconfig | 18 +- + net/ipv6/netfilter/ip6_tables.c | 4 +- + net/mac80211/Kconfig | 2 +- + net/netfilter/Kconfig | 2 +- + net/phonet/Kconfig | 2 +- + net/rds/ib.c | 5 +- + net/rds/ib.h | 28 +- + net/rds/ib_cm.c | 43 +- + net/rds/ib_rdma.c | 43 +- + net/rds/ib_recv.c | 37 +- + net/rds/iw.c | 5 +- + net/rds/iw.h | 28 +- + net/rds/iw_cm.c | 44 +- + net/rds/iw_rdma.c | 44 +- + net/rds/iw_recv.c | 37 +- + net/rds/rds.h | 4 + + net/rds/send.c | 6 +- + net/sunrpc/Kconfig | 2 +- + net/sunrpc/svc.c | 3 +- + net/unix/af_unix.c | 2 +- + net/wimax/Kconfig | 2 +- + samples/tracepoints/tp-samples-trace.h | 8 +- + samples/tracepoints/tracepoint-sample.c | 24 +- + scripts/Makefile.build | 13 +- + scripts/kallsyms.c | 57 + + scripts/mod/modpost.c | 4 +- + scripts/package/buildtar | 4 + + scripts/recordmcount.pl | 37 +- + security/device_cgroup.c | 21 +- + security/security.c | 2 + + security/tomoyo/realpath.c | 1 + + sound/oss/pss.c | 2 +- + sound/sh/aica.c | 2 +- + sound/soc/blackfin/Kconfig | 2 +- + usr/Kconfig | 15 +- + usr/Makefile | 3 - + 2230 files changed, 414122 insertions(+), 91211 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/cgroups/00-INDEX + create mode 100644 Documentation/filesystems/caching/backend-api.txt + create mode 100644 Documentation/filesystems/caching/cachefiles.txt + create mode 100644 Documentation/filesystems/caching/fscache.txt + create mode 100644 Documentation/filesystems/caching/netfs-api.txt + create mode 100644 Documentation/filesystems/caching/object.txt + create mode 100644 Documentation/filesystems/caching/operations.txt + create mode 100644 Documentation/filesystems/exofs.txt + create mode 100644 Documentation/filesystems/pohmelfs/design_notes.txt + create mode 100644 Documentation/filesystems/pohmelfs/info.txt + create mode 100644 Documentation/filesystems/pohmelfs/network_protocol.txt + create mode 100644 Documentation/networking/vxge.txt + create mode 100644 Documentation/slow-work.txt + create mode 100644 Documentation/sysctl/net.txt + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 arch/alpha/include/asm/ftrace.h + create mode 100644 arch/avr32/boards/merisc/Kconfig + create mode 100644 arch/avr32/boards/merisc/Makefile + create mode 100644 arch/avr32/boards/merisc/display.c + create mode 100644 arch/avr32/boards/merisc/flash.c + create mode 100644 arch/avr32/boards/merisc/merisc.h + create mode 100644 arch/avr32/boards/merisc/merisc_sysfs.c + create mode 100644 arch/avr32/boards/merisc/setup.c + create mode 100644 arch/avr32/configs/merisc_defconfig + create mode 100644 arch/avr32/include/asm/ftrace.h + create mode 100644 arch/blackfin/include/asm/ftrace.h + create mode 100644 arch/cris/include/asm/ftrace.h + create mode 100644 arch/h8300/include/asm/ftrace.h + create mode 100644 arch/ia64/include/asm/ftrace.h + create mode 100644 arch/ia64/kernel/ftrace.c + delete mode 100644 arch/m68k/include/asm/bootinfo_mm.h + delete mode 100644 arch/m68k/include/asm/bootinfo_no.h + delete mode 100644 arch/m68k/include/asm/bug_mm.h + delete mode 100644 arch/m68k/include/asm/bug_no.h + delete mode 100644 arch/m68k/include/asm/bugs_mm.h + delete mode 100644 arch/m68k/include/asm/bugs_no.h + delete mode 100644 arch/m68k/include/asm/cache_mm.h + delete mode 100644 arch/m68k/include/asm/cache_no.h + delete mode 100644 arch/m68k/include/asm/current_mm.h + delete mode 100644 arch/m68k/include/asm/current_no.h + delete mode 100644 arch/m68k/include/asm/div64_mm.h + delete mode 100644 arch/m68k/include/asm/div64_no.h + delete mode 100644 arch/m68k/include/asm/dma-mapping_mm.h + delete mode 100644 arch/m68k/include/asm/dma-mapping_no.h + delete mode 100644 arch/m68k/include/asm/elf_mm.h + delete mode 100644 arch/m68k/include/asm/elf_no.h + delete mode 100644 arch/m68k/include/asm/fb_mm.h + delete mode 100644 arch/m68k/include/asm/fb_no.h + delete mode 100644 arch/m68k/include/asm/fpu_mm.h + delete mode 100644 arch/m68k/include/asm/fpu_no.h + create mode 100644 arch/m68k/include/asm/ftrace.h + delete mode 100644 arch/m68k/include/asm/hw_irq_mm.h + delete mode 100644 arch/m68k/include/asm/hw_irq_no.h + delete mode 100644 arch/m68k/include/asm/kmap_types_mm.h + delete mode 100644 arch/m68k/include/asm/kmap_types_no.h + delete mode 100644 arch/m68k/include/asm/mc146818rtc_mm.h + delete mode 100644 arch/m68k/include/asm/mc146818rtc_no.h + delete mode 100644 arch/m68k/include/asm/mcfpci.h + delete mode 100644 arch/m68k/include/asm/mmu_context_mm.h + delete mode 100644 arch/m68k/include/asm/mmu_context_no.h + delete mode 100644 arch/m68k/include/asm/mmu_mm.h + delete mode 100644 arch/m68k/include/asm/mmu_no.h + delete mode 100644 arch/m68k/include/asm/module_mm.h + delete mode 100644 arch/m68k/include/asm/module_no.h + delete mode 100644 arch/m68k/include/asm/page_offset_mm.h + delete mode 100644 arch/m68k/include/asm/page_offset_no.h + delete mode 100644 arch/m68k/include/asm/pci_mm.h + delete mode 100644 arch/m68k/include/asm/pci_no.h + delete mode 100644 arch/m68k/include/asm/pgalloc_mm.h + delete mode 100644 arch/m68k/include/asm/pgalloc_no.h + delete mode 100644 arch/m68k/include/asm/scatterlist_mm.h + delete mode 100644 arch/m68k/include/asm/scatterlist_no.h + delete mode 100644 arch/m68k/include/asm/segment_mm.h + delete mode 100644 arch/m68k/include/asm/segment_no.h + delete mode 100644 arch/m68k/include/asm/timex_mm.h + delete mode 100644 arch/m68k/include/asm/timex_no.h + delete mode 100644 arch/m68k/include/asm/tlbflush_mm.h + delete mode 100644 arch/m68k/include/asm/tlbflush_no.h + delete mode 100644 arch/m68k/include/asm/ucontext_mm.h + delete mode 100644 arch/m68k/include/asm/ucontext_no.h + delete mode 100644 arch/m68k/include/asm/unaligned_mm.h + delete mode 100644 arch/m68k/include/asm/unaligned_no.h + create mode 100644 arch/m68knommu/platform/coldfire/clk.c + create mode 100644 arch/mips/include/asm/ftrace.h + create mode 100644 arch/parisc/include/asm/ftrace.h + create mode 100644 arch/parisc/kernel/ftrace.c + create mode 100644 arch/parisc/kernel/stacktrace.c + create mode 100644 arch/um/include/asm/ftrace.h + delete mode 100644 arch/x86/include/asm/pci_32.h + create mode 100644 arch/x86/mm/numa.c + create mode 100644 arch/xtensa/configs/s6105_defconfig + create mode 100644 arch/xtensa/include/asm/flat.h + create mode 100644 arch/xtensa/include/asm/ftrace.h + create mode 100644 arch/xtensa/include/asm/gpio.h + create mode 100644 arch/xtensa/include/asm/nommu.h + create mode 100644 arch/xtensa/include/asm/nommu_context.h + create mode 100644 arch/xtensa/mm/mmu.c + create mode 100644 arch/xtensa/platforms/s6105/Makefile + create mode 100644 arch/xtensa/platforms/s6105/device.c + create mode 100644 arch/xtensa/platforms/s6105/include/platform/gpio.h + create mode 100644 arch/xtensa/platforms/s6105/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/s6105/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/s6105/setup.c + create mode 100644 arch/xtensa/variants/s6000/Makefile + create mode 100644 arch/xtensa/variants/s6000/gpio.c + create mode 100644 arch/xtensa/variants/s6000/include/variant/core.h + create mode 100644 arch/xtensa/variants/s6000/include/variant/hardware.h + create mode 100644 arch/xtensa/variants/s6000/include/variant/irq.h + create mode 100644 arch/xtensa/variants/s6000/include/variant/tie-asm.h + create mode 100644 arch/xtensa/variants/s6000/include/variant/tie.h + create mode 100644 arch/xtensa/variants/s6000/irq.c + delete mode 100644 block/blktrace.c + create mode 100644 drivers/acpi/acpica/hwvalid.c + create mode 100644 drivers/acpi/acpica/utlock.c + create mode 100644 drivers/acpi/internal.h + create mode 100644 drivers/edac/amd8111_edac.c + create mode 100644 drivers/edac/amd8111_edac.h + create mode 100644 drivers/edac/amd8131_edac.c + create mode 100644 drivers/edac/amd8131_edac.h + create mode 100644 drivers/edac/ppc4xx_edac.c + create mode 100644 drivers/edac/ppc4xx_edac.h + create mode 100644 drivers/hid/hid-drff.c + delete mode 100644 drivers/hid/hid-dummy.c + create mode 100644 drivers/hid/hid-kensington.c + create mode 100644 drivers/hid/hid-kye.c + rename {include/linux/raid => drivers/md}/bitmap.h (100%) + delete mode 100644 drivers/md/dm-snap.h + rename {include/linux/raid => drivers/md}/linear.h (95%) + rename include/linux/raid/md_k.h => drivers/md/md.h (83%) + rename {include/linux/raid => drivers/md}/multipath.h (96%) + rename {include/linux/raid => drivers/md}/raid0.h (96%) + rename {include/linux/raid => drivers/md}/raid1.h (99%) + rename {include/linux/raid => drivers/md}/raid10.h (99%) + rename {include/linux/raid => drivers/md}/raid5.h (81%) + create mode 100644 drivers/misc/sgi-gru/gruhandles.c + create mode 100644 drivers/mmc/host/mvsdio.c + create mode 100644 drivers/mmc/host/mvsdio.h + create mode 100644 drivers/mmc/host/sdhci-of.c + delete mode 100644 drivers/net/hamradio/yam1200.h + delete mode 100644 drivers/net/hamradio/yam9600.h + delete mode 100644 drivers/net/pcmcia/ositech.h + delete mode 100644 drivers/net/tokenring/3c359_microcode.h + create mode 100644 drivers/net/vxge/Makefile + create mode 100644 drivers/net/vxge/vxge-config.c + create mode 100644 drivers/net/vxge/vxge-config.h + create mode 100644 drivers/net/vxge/vxge-ethtool.c + create mode 100644 drivers/net/vxge/vxge-ethtool.h + create mode 100644 drivers/net/vxge/vxge-main.c + create mode 100644 drivers/net/vxge/vxge-main.h + create mode 100644 drivers/net/vxge/vxge-reg.h + create mode 100644 drivers/net/vxge/vxge-traffic.c + create mode 100644 drivers/net/vxge/vxge-traffic.h + create mode 100644 drivers/net/vxge/vxge-version.h + create mode 100644 drivers/platform/x86/dell-wmi.c + create mode 100644 drivers/regulator/twl4030-regulator.c + create mode 100644 drivers/rtc/rtc-generic.c + delete mode 100644 drivers/rtc/rtc-parisc.c + delete mode 100644 drivers/rtc/rtc-ppc.c + create mode 100644 drivers/rtc/rtc-ps3.c + create mode 100644 drivers/staging/b3dfg/Kconfig + create mode 100644 drivers/staging/b3dfg/Makefile + create mode 100644 drivers/staging/b3dfg/TODO + create mode 100644 drivers/staging/b3dfg/b3dfg.c + create mode 100644 drivers/staging/comedi/drivers/8253.h + create mode 100644 drivers/staging/comedi/drivers/8255.c + create mode 100644 drivers/staging/comedi/drivers/8255.h + create mode 100644 drivers/staging/comedi/drivers/acl7225b.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_eeprom.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c + create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h + create mode 100644 drivers/staging/comedi/drivers/addi_apci_035.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_1032.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_1500.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_1516.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_1564.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_16xx.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_1710.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_2016.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_2032.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_2200.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_3120.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_3200.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_3300.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_3501.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_3xxx.c + create mode 100644 drivers/staging/comedi/drivers/addi_apci_all.c + create mode 100644 drivers/staging/comedi/drivers/adl_pci6208.c + create mode 100644 drivers/staging/comedi/drivers/adl_pci7296.c + create mode 100644 drivers/staging/comedi/drivers/adl_pci7432.c + create mode 100644 drivers/staging/comedi/drivers/adl_pci8164.c + create mode 100644 drivers/staging/comedi/drivers/adl_pci9111.c + create mode 100644 drivers/staging/comedi/drivers/adl_pci9118.c + create mode 100644 drivers/staging/comedi/drivers/adq12b.c + create mode 100644 drivers/staging/comedi/drivers/adv_pci1710.c + create mode 100644 drivers/staging/comedi/drivers/adv_pci1723.c + create mode 100644 drivers/staging/comedi/drivers/adv_pci_dio.c + create mode 100644 drivers/staging/comedi/drivers/aio_aio12_8.c + create mode 100644 drivers/staging/comedi/drivers/aio_iiro_16.c + create mode 100644 drivers/staging/comedi/drivers/am9513.h + create mode 100644 drivers/staging/comedi/drivers/amcc_s5933.h + create mode 100644 drivers/staging/comedi/drivers/amplc_dio200.c + create mode 100644 drivers/staging/comedi/drivers/amplc_pc236.c + create mode 100644 drivers/staging/comedi/drivers/amplc_pc263.c + create mode 100644 drivers/staging/comedi/drivers/amplc_pci224.c + create mode 100644 drivers/staging/comedi/drivers/amplc_pci230.c + create mode 100644 drivers/staging/comedi/drivers/c6xdigio.c + create mode 100644 drivers/staging/comedi/drivers/cb_das16_cs.c + create mode 100644 drivers/staging/comedi/drivers/cb_pcidas.c + create mode 100644 drivers/staging/comedi/drivers/cb_pcidas64.c + create mode 100644 drivers/staging/comedi/drivers/cb_pcidda.c + create mode 100644 drivers/staging/comedi/drivers/cb_pcidio.c + create mode 100644 drivers/staging/comedi/drivers/cb_pcimdas.c + create mode 100644 drivers/staging/comedi/drivers/cb_pcimdda.c + create mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c + create mode 100644 drivers/staging/comedi/drivers/contec_pci_dio.c + create mode 100644 drivers/staging/comedi/drivers/daqboard2000.c + create mode 100644 drivers/staging/comedi/drivers/das08.c + create mode 100644 drivers/staging/comedi/drivers/das08.h + create mode 100644 drivers/staging/comedi/drivers/das08_cs.c + create mode 100644 drivers/staging/comedi/drivers/das16.c + create mode 100644 drivers/staging/comedi/drivers/das16m1.c + create mode 100644 drivers/staging/comedi/drivers/das1800.c + create mode 100644 drivers/staging/comedi/drivers/das6402.c + create mode 100644 drivers/staging/comedi/drivers/das800.c + create mode 100644 drivers/staging/comedi/drivers/dmm32at.c + create mode 100644 drivers/staging/comedi/drivers/dt2801.c + create mode 100644 drivers/staging/comedi/drivers/dt2811.c + create mode 100644 drivers/staging/comedi/drivers/dt2814.c + create mode 100644 drivers/staging/comedi/drivers/dt2815.c + create mode 100644 drivers/staging/comedi/drivers/dt2817.c + create mode 100644 drivers/staging/comedi/drivers/dt282x.c + create mode 100644 drivers/staging/comedi/drivers/dt3000.c + create mode 100644 drivers/staging/comedi/drivers/fl512.c + create mode 100644 drivers/staging/comedi/drivers/gsc_hpdi.c + create mode 100644 drivers/staging/comedi/drivers/ii_pci20kc.c + create mode 100644 drivers/staging/comedi/drivers/jr3_pci.c + create mode 100644 drivers/staging/comedi/drivers/jr3_pci.h + create mode 100644 drivers/staging/comedi/drivers/ke_counter.c + create mode 100644 drivers/staging/comedi/drivers/mpc624.c + create mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c + create mode 100644 drivers/staging/comedi/drivers/multiq3.c + create mode 100644 drivers/staging/comedi/drivers/ni_6527.c + create mode 100644 drivers/staging/comedi/drivers/ni_65xx.c + create mode 100644 drivers/staging/comedi/drivers/ni_660x.c + create mode 100644 drivers/staging/comedi/drivers/ni_670x.c + create mode 100644 drivers/staging/comedi/drivers/ni_at_a2150.c + create mode 100644 drivers/staging/comedi/drivers/ni_at_ao.c + create mode 100644 drivers/staging/comedi/drivers/ni_atmio.c + create mode 100644 drivers/staging/comedi/drivers/ni_atmio16d.c + create mode 100644 drivers/staging/comedi/drivers/ni_daq_700.c + create mode 100644 drivers/staging/comedi/drivers/ni_daq_dio24.c + create mode 100644 drivers/staging/comedi/drivers/ni_labpc.c + create mode 100644 drivers/staging/comedi/drivers/ni_labpc.h + create mode 100644 drivers/staging/comedi/drivers/ni_labpc_cs.c + create mode 100644 drivers/staging/comedi/drivers/ni_mio_common.c + create mode 100644 drivers/staging/comedi/drivers/ni_mio_cs.c + create mode 100644 drivers/staging/comedi/drivers/ni_pcidio.c + create mode 100644 drivers/staging/comedi/drivers/ni_pcimio.c + create mode 100644 drivers/staging/comedi/drivers/ni_stc.h + create mode 100644 drivers/staging/comedi/drivers/ni_tio.c + create mode 100644 drivers/staging/comedi/drivers/ni_tio.h + create mode 100644 drivers/staging/comedi/drivers/ni_tio_internal.h + create mode 100644 drivers/staging/comedi/drivers/ni_tiocmd.c + create mode 100644 drivers/staging/comedi/drivers/pcl711.c + create mode 100644 drivers/staging/comedi/drivers/pcl724.c + create mode 100644 drivers/staging/comedi/drivers/pcl725.c + create mode 100644 drivers/staging/comedi/drivers/pcl726.c + create mode 100644 drivers/staging/comedi/drivers/pcl730.c + create mode 100644 drivers/staging/comedi/drivers/pcl812.c + create mode 100644 drivers/staging/comedi/drivers/pcl816.c + create mode 100644 drivers/staging/comedi/drivers/pcl818.c + create mode 100644 drivers/staging/comedi/drivers/pcm3724.c + create mode 100644 drivers/staging/comedi/drivers/pcm3730.c + create mode 100644 drivers/staging/comedi/drivers/pcmad.c + create mode 100644 drivers/staging/comedi/drivers/pcmda12.c + create mode 100644 drivers/staging/comedi/drivers/pcmmio.c + create mode 100644 drivers/staging/comedi/drivers/pcmuio.c + create mode 100644 drivers/staging/comedi/drivers/plx9052.h + create mode 100644 drivers/staging/comedi/drivers/poc.c + create mode 100644 drivers/staging/comedi/drivers/quatech_daqp_cs.c + create mode 100644 drivers/staging/comedi/drivers/rti800.c + create mode 100644 drivers/staging/comedi/drivers/rti802.c + create mode 100644 drivers/staging/comedi/drivers/s526.c + create mode 100644 drivers/staging/comedi/drivers/serial2002.c + create mode 100644 drivers/staging/comedi/drivers/skel.c + create mode 100644 drivers/staging/comedi/drivers/ssv_dnp.c + create mode 100644 drivers/staging/comedi/drivers/unioxx5.c + create mode 100644 drivers/staging/dst/Kconfig + create mode 100644 drivers/staging/dst/Makefile + create mode 100644 drivers/staging/dst/crypto.c + create mode 100644 drivers/staging/dst/dcore.c + create mode 100644 drivers/staging/dst/export.c + create mode 100644 drivers/staging/dst/state.c + create mode 100644 drivers/staging/dst/thread_pool.c + create mode 100644 drivers/staging/dst/trans.c + delete mode 100644 drivers/staging/epl/EdrvFec5282.h + delete mode 100644 drivers/staging/epl/EplObjDef.h + delete mode 100644 drivers/staging/epl/EplTimeruNull.c + delete mode 100644 drivers/staging/epl/EplTimeruWin32.c + delete mode 100644 drivers/staging/epl/ShbIpc-Win32.c + delete mode 100644 drivers/staging/epl/kernel/EplNmtkCal.h + delete mode 100644 drivers/staging/epl/kernel/EplObdkCal.h + delete mode 100644 drivers/staging/frontier/frontier_compat.h + delete mode 100644 drivers/staging/frontier/surface_sysfs.h + create mode 100644 drivers/staging/heci/Kconfig + create mode 100644 drivers/staging/heci/Makefile + create mode 100644 drivers/staging/heci/TODO + create mode 100644 drivers/staging/heci/heci.h + create mode 100644 drivers/staging/heci/heci_data_structures.h + create mode 100644 drivers/staging/heci/heci_init.c + create mode 100644 drivers/staging/heci/heci_interface.c + create mode 100644 drivers/staging/heci/heci_interface.h + create mode 100644 drivers/staging/heci/heci_main.c + create mode 100644 drivers/staging/heci/heci_version.h + create mode 100644 drivers/staging/heci/interrupt.c + create mode 100644 drivers/staging/heci/io_heci.c + create mode 100644 drivers/staging/line6/Kconfig + create mode 100644 drivers/staging/line6/Makefile + create mode 100644 drivers/staging/line6/audio.c + create mode 100644 drivers/staging/line6/audio.h + create mode 100644 drivers/staging/line6/capture.c + create mode 100644 drivers/staging/line6/capture.h + create mode 100644 drivers/staging/line6/config.h + create mode 100644 drivers/staging/line6/control.c + create mode 100644 drivers/staging/line6/control.h + create mode 100644 drivers/staging/line6/driver.c + create mode 100644 drivers/staging/line6/driver.h + create mode 100644 drivers/staging/line6/dumprequest.c + create mode 100644 drivers/staging/line6/dumprequest.h + create mode 100644 drivers/staging/line6/midi.c + create mode 100644 drivers/staging/line6/midi.h + create mode 100644 drivers/staging/line6/midibuf.c + create mode 100644 drivers/staging/line6/midibuf.h + create mode 100644 drivers/staging/line6/pcm.c + create mode 100644 drivers/staging/line6/pcm.h + create mode 100644 drivers/staging/line6/playback.c + create mode 100644 drivers/staging/line6/playback.h + create mode 100644 drivers/staging/line6/pod.c + create mode 100644 drivers/staging/line6/pod.h + create mode 100644 drivers/staging/line6/revision.h + create mode 100644 drivers/staging/line6/toneport.c + create mode 100644 drivers/staging/line6/toneport.h + create mode 100644 drivers/staging/line6/usbdefs.h + create mode 100644 drivers/staging/line6/variax.c + create mode 100644 drivers/staging/line6/variax.h + create mode 100644 drivers/staging/p9auth/Kconfig + create mode 100644 drivers/staging/p9auth/Makefile + create mode 100644 drivers/staging/p9auth/p9auth.c + create mode 100644 drivers/staging/phison/Kconfig + create mode 100644 drivers/staging/phison/Makefile + create mode 100644 drivers/staging/phison/phison.c + create mode 100644 drivers/staging/pohmelfs/Kconfig + create mode 100644 drivers/staging/pohmelfs/Makefile + create mode 100644 drivers/staging/pohmelfs/config.c + create mode 100644 drivers/staging/pohmelfs/crypto.c + create mode 100644 drivers/staging/pohmelfs/dir.c + create mode 100644 drivers/staging/pohmelfs/inode.c + create mode 100644 drivers/staging/pohmelfs/lock.c + create mode 100644 drivers/staging/pohmelfs/mcache.c + create mode 100644 drivers/staging/pohmelfs/net.c + create mode 100644 drivers/staging/pohmelfs/netfs.h + create mode 100644 drivers/staging/pohmelfs/path_entry.c + create mode 100644 drivers/staging/pohmelfs/trans.c + create mode 100644 drivers/staging/rt3070/2870_main_dev.c + create mode 100644 drivers/staging/rt3070/Kconfig + create mode 100644 drivers/staging/rt3070/Makefile + create mode 100644 drivers/staging/rt3070/action.h + create mode 100644 drivers/staging/rt3070/aironet.h + create mode 100644 drivers/staging/rt3070/ap.h + create mode 100644 drivers/staging/rt3070/chlist.h + create mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c + create mode 100644 drivers/staging/rt3070/common/action.c + create mode 100644 drivers/staging/rt3070/common/ba_action.c + create mode 100644 drivers/staging/rt3070/common/cmm_data.c + create mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c + create mode 100644 drivers/staging/rt3070/common/cmm_info.c + create mode 100644 drivers/staging/rt3070/common/cmm_sanity.c + create mode 100644 drivers/staging/rt3070/common/cmm_sync.c + create mode 100644 drivers/staging/rt3070/common/cmm_wpa.c + create mode 100644 drivers/staging/rt3070/common/dfs.c + create mode 100644 drivers/staging/rt3070/common/eeprom.c + create mode 100644 drivers/staging/rt3070/common/md5.c + create mode 100644 drivers/staging/rt3070/common/mlme.c + create mode 100644 drivers/staging/rt3070/common/netif_block.c + create mode 100644 drivers/staging/rt3070/common/rtmp_init.c + create mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c + create mode 100644 drivers/staging/rt3070/common/rtmp_wep.c + create mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c + create mode 100644 drivers/staging/rt3070/common/rtusb_data.c + create mode 100644 drivers/staging/rt3070/common/rtusb_io.c + create mode 100644 drivers/staging/rt3070/common/spectrum.c + create mode 100644 drivers/staging/rt3070/dfs.h + create mode 100644 drivers/staging/rt3070/firmware.h + create mode 100644 drivers/staging/rt3070/leap.h + create mode 100644 drivers/staging/rt3070/link_list.h + create mode 100644 drivers/staging/rt3070/md4.h + create mode 100644 drivers/staging/rt3070/md5.h + create mode 100644 drivers/staging/rt3070/mlme.h + create mode 100644 drivers/staging/rt3070/netif_block.h + create mode 100644 drivers/staging/rt3070/oid.h + create mode 100644 drivers/staging/rt3070/rt2870.h + create mode 100644 drivers/staging/rt3070/rt28xx.h + create mode 100644 drivers/staging/rt3070/rt_ate.c + create mode 100644 drivers/staging/rt3070/rt_ate.h + create mode 100644 drivers/staging/rt3070/rt_config.h + create mode 100644 drivers/staging/rt3070/rt_linux.c + create mode 100644 drivers/staging/rt3070/rt_linux.h + create mode 100644 drivers/staging/rt3070/rt_main_dev.c + create mode 100644 drivers/staging/rt3070/rt_profile.c + create mode 100644 drivers/staging/rt3070/rtmp.h + create mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h + create mode 100644 drivers/staging/rt3070/rtmp_def.h + create mode 100644 drivers/staging/rt3070/rtmp_type.h + create mode 100644 drivers/staging/rt3070/spectrum.h + create mode 100644 drivers/staging/rt3070/spectrum_def.h + create mode 100644 drivers/staging/rt3070/sta/aironet.c + create mode 100644 drivers/staging/rt3070/sta/assoc.c + create mode 100644 drivers/staging/rt3070/sta/auth.c + create mode 100644 drivers/staging/rt3070/sta/auth_rsp.c + create mode 100644 drivers/staging/rt3070/sta/connect.c + create mode 100644 drivers/staging/rt3070/sta/dls.c + create mode 100644 drivers/staging/rt3070/sta/rtmp_data.c + create mode 100644 drivers/staging/rt3070/sta/sanity.c + create mode 100644 drivers/staging/rt3070/sta/sync.c + create mode 100644 drivers/staging/rt3070/sta/wpa.c + create mode 100644 drivers/staging/rt3070/sta_ioctl.c + create mode 100644 drivers/staging/rt3070/wpa.h + create mode 100644 drivers/staging/serqt_usb/Kconfig + create mode 100644 drivers/staging/serqt_usb/Makefile + create mode 100644 drivers/staging/serqt_usb/TODO + create mode 100644 drivers/staging/serqt_usb/serqt_usb.c + delete mode 100644 drivers/staging/slicoss/gbdownload.h + delete mode 100644 drivers/staging/slicoss/gbrcvucode.h + delete mode 100644 drivers/staging/slicoss/oasisdbgdownload.h + delete mode 100644 drivers/staging/slicoss/oasisdownload.h + delete mode 100644 drivers/staging/slicoss/oasisrcvucode.h + delete mode 100644 drivers/staging/slicoss/slic_os.h + delete mode 100644 drivers/staging/slicoss/slicbuild.h + delete mode 100644 drivers/staging/slicoss/slicdbg.h + delete mode 100644 drivers/staging/slicoss/slicdump.h + delete mode 100644 drivers/staging/slicoss/slicinc.h + create mode 100644 drivers/staging/stlc45xx/Kconfig + create mode 100644 drivers/staging/stlc45xx/Makefile + create mode 100644 drivers/staging/stlc45xx/stlc45xx.c + create mode 100644 drivers/staging/stlc45xx/stlc45xx.h + create mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h + delete mode 100644 drivers/staging/sxg/saharadbgdownload.h + create mode 100644 drivers/staging/sxg/sxg_ethtool.c + create mode 100644 drivers/staging/sxg/sxgphycode-1.2.h + delete mode 100644 drivers/staging/sxg/sxgphycode.h + create mode 100644 drivers/staging/uc2322/Kconfig + create mode 100644 drivers/staging/uc2322/Makefile + create mode 100644 drivers/staging/uc2322/TODO + create mode 100644 drivers/staging/uc2322/aten2011.c + delete mode 100644 drivers/staging/winbond/bss_f.h + delete mode 100644 drivers/staging/winbond/bssdscpt.h + delete mode 100644 drivers/staging/winbond/common.h + delete mode 100644 drivers/staging/winbond/ds_tkip.h + delete mode 100644 drivers/staging/winbond/gl_80211.h + delete mode 100644 drivers/staging/winbond/ioctls.h + delete mode 100644 drivers/staging/winbond/mlme_mib.h + delete mode 100644 drivers/staging/winbond/mto_f.h + delete mode 100644 drivers/staging/winbond/os_common.h + delete mode 100644 drivers/staging/winbond/sme_s.h + delete mode 100644 drivers/staging/winbond/wb35_ver.h + delete mode 100644 drivers/staging/wlan-ng/p80211metamib.h + delete mode 100644 drivers/staging/wlan-ng/p80211metamsg.h + delete mode 100644 drivers/staging/wlan-ng/wlan_compat.h + create mode 100644 firmware/3com/3C359.bin.ihex + create mode 100644 firmware/ositech/Xilinx7OD.bin.ihex + create mode 100644 firmware/slicoss/gbdownload.sys.ihex + create mode 100644 firmware/slicoss/gbrcvucode.sys.ihex + create mode 100644 firmware/slicoss/oasisdbgdownload.sys.ihex + create mode 100644 firmware/slicoss/oasisdownload.sys.ihex + create mode 100644 firmware/slicoss/oasisrcvucode.sys.ihex + create mode 100644 firmware/sxg/saharadbgdownloadB.sys.ihex + create mode 100644 firmware/sxg/saharadownloadB.sys.ihex + create mode 100644 firmware/yam/1200.bin.ihex + create mode 100644 firmware/yam/9600.bin.ihex + create mode 100644 fs/btrfs/free-space-cache.h + create mode 100644 fs/cachefiles/Kconfig + create mode 100644 fs/cachefiles/Makefile + create mode 100644 fs/cachefiles/bind.c + create mode 100644 fs/cachefiles/daemon.c + create mode 100644 fs/cachefiles/interface.c + create mode 100644 fs/cachefiles/internal.h + create mode 100644 fs/cachefiles/key.c + create mode 100644 fs/cachefiles/main.c + create mode 100644 fs/cachefiles/namei.c + create mode 100644 fs/cachefiles/proc.c + create mode 100644 fs/cachefiles/rdwr.c + create mode 100644 fs/cachefiles/security.c + create mode 100644 fs/cachefiles/xattr.c + create mode 100644 fs/exofs/BUGS + create mode 100644 fs/exofs/Kbuild + create mode 100644 fs/exofs/Kconfig + create mode 100644 fs/exofs/common.h + create mode 100644 fs/exofs/dir.c + create mode 100644 fs/exofs/exofs.h + create mode 100644 fs/exofs/file.c + create mode 100644 fs/exofs/inode.c + create mode 100644 fs/exofs/namei.c + create mode 100644 fs/exofs/osd.c + create mode 100644 fs/exofs/super.c + create mode 100644 fs/exofs/symlink.c + create mode 100644 fs/fs_struct.c + create mode 100644 fs/fscache/Kconfig + create mode 100644 fs/fscache/Makefile + create mode 100644 fs/fscache/cache.c + create mode 100644 fs/fscache/cookie.c + create mode 100644 fs/fscache/fsdef.c + create mode 100644 fs/fscache/histogram.c + create mode 100644 fs/fscache/internal.h + create mode 100644 fs/fscache/main.c + create mode 100644 fs/fscache/netfs.c + create mode 100644 fs/fscache/object.c + create mode 100644 fs/fscache/operation.c + create mode 100644 fs/fscache/page.c + create mode 100644 fs/fscache/proc.c + create mode 100644 fs/fscache/stats.c + create mode 100644 fs/nfs/fscache-index.c + create mode 100644 fs/nfs/fscache.c + create mode 100644 fs/nfs/fscache.h + delete mode 100644 fs/xfs/linux-2.6/mutex.h + create mode 100644 fs/xfs/linux-2.6/xfs_quotaops.c + create mode 100644 include/acpi/video.h + create mode 100644 include/asm-frv/ftrace.h + create mode 100644 include/asm-m32r/ftrace.h + create mode 100644 include/asm-mn10300/ftrace.h + delete mode 100644 include/linux/ds1wm.h + create mode 100644 include/linux/dst.h + create mode 100644 include/linux/fscache-cache.h + create mode 100644 include/linux/fscache.h + create mode 100644 include/linux/mfd/ds1wm.h + delete mode 100644 include/linux/raid/md.h + rename drivers/md/raid6.h => include/linux/raid/pq.h (86%) + create mode 100644 include/linux/slow-work.h + create mode 100644 include/linux/trace_clock.h + create mode 100644 include/trace/irq.h + create mode 100644 include/trace/irq_event_types.h + create mode 100644 include/trace/kmemtrace.h + create mode 100644 include/trace/lockdep.h + create mode 100644 include/trace/lockdep_event_types.h + create mode 100644 include/trace/power.h + create mode 100644 include/trace/sched_event_types.h + create mode 100644 include/trace/trace_event_types.h + create mode 100644 include/trace/trace_events.h + create mode 100644 include/trace/workqueue.h + create mode 100644 kernel/slow-work.c + create mode 100644 kernel/trace/blktrace.c + create mode 100644 kernel/trace/events.c + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_clock.c + create mode 100644 kernel/trace/trace_event_profile.c + create mode 100644 kernel/trace/trace_event_types.h + create mode 100644 kernel/trace/trace_events.c + create mode 100644 kernel/trace/trace_events_filter.c + create mode 100644 kernel/trace/trace_events_stage_1.h + create mode 100644 kernel/trace/trace_events_stage_2.h + create mode 100644 kernel/trace/trace_events_stage_3.h + create mode 100644 kernel/trace/trace_export.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_printk.c + create mode 100644 kernel/trace/trace_stat.c + create mode 100644 kernel/trace/trace_stat.h + create mode 100644 kernel/trace/trace_syscalls.c + create mode 100644 kernel/trace/trace_workqueue.c +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Removing drivers/net/bnx2_fw2.h +Removing drivers/net/myri_code.h +Auto-merging firmware/Makefile +Auto-merging firmware/WHENCE +Auto-merging net/socket.c +Merge made by recursive. + drivers/net/Kconfig | 2 +- + drivers/net/b44.c | 6 +- + drivers/net/bnx2.c | 351 ++- + drivers/net/bnx2.h | 71 +- + drivers/net/bnx2_fw.h | 4378 +---------------------- + drivers/net/bnx2_fw2.h | 4547 ---------------------- + drivers/net/e1000/e1000_main.c | 34 +- + drivers/net/myri_code.h | 5006 ------------------------- + drivers/net/myri_sbus.c | 37 +- + drivers/net/virtio_net.c | 10 +- + drivers/net/vxge/vxge-main.c | 1 + + firmware/Makefile | 5 + + firmware/WHENCE | 30 + + firmware/bnx2/bnx2-mips-06-4.6.16.fw.ihex | 5805 ++++++++++++++++++++++++++++ + firmware/bnx2/bnx2-mips-09-4.6.17.fw.ihex | 5816 +++++++++++++++++++++++++++++ + firmware/bnx2/bnx2-rv2p-06-4.6.16.fw.ihex | 441 +++ + firmware/bnx2/bnx2-rv2p-09-4.6.15.fw.ihex | 490 +++ + firmware/myricom/lanai.bin.ihex | 4771 +++++++++++++++++++++++ + net/socket.c | 6 +- + 19 files changed, 17671 insertions(+), 14136 deletions(-) + delete mode 100644 drivers/net/bnx2_fw2.h + delete mode 100644 drivers/net/myri_code.h + create mode 100644 firmware/bnx2/bnx2-mips-06-4.6.16.fw.ihex + create mode 100644 firmware/bnx2/bnx2-mips-09-4.6.17.fw.ihex + create mode 100644 firmware/bnx2/bnx2-rv2p-06-4.6.16.fw.ihex + create mode 100644 firmware/bnx2/bnx2-rv2p-09-4.6.15.fw.ihex + create mode 100644 firmware/myricom/lanai.bin.ihex +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Auto-merging drivers/usb/core/message.c +Auto-merging drivers/usb/gadget/f_rndis.c +Auto-merging drivers/usb/storage/scsiglue.c +Merge made by recursive. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/configs/40x/acadia_defconfig | 2 +- + arch/powerpc/configs/40x/ep405_defconfig | 2 +- + arch/powerpc/configs/40x/kilauea_defconfig | 2 +- + arch/powerpc/configs/40x/makalu_defconfig | 2 +- + arch/powerpc/configs/40x/virtex_defconfig | 2 +- + arch/powerpc/configs/44x/arches_defconfig | 2 +- + arch/powerpc/configs/44x/bamboo_defconfig | 2 +- + arch/powerpc/configs/44x/canyonlands_defconfig | 6 +++--- + arch/powerpc/configs/44x/ebony_defconfig | 2 +- + arch/powerpc/configs/44x/katmai_defconfig | 2 +- + arch/powerpc/configs/44x/rainier_defconfig | 2 +- + arch/powerpc/configs/44x/redwood_defconfig | 2 +- + arch/powerpc/configs/44x/sam440ep_defconfig | 2 +- + arch/powerpc/configs/44x/sequoia_defconfig | 2 +- + arch/powerpc/configs/44x/taishan_defconfig | 2 +- + arch/powerpc/configs/44x/virtex5_defconfig | 2 +- + 16 files changed, 18 insertions(+), 18 deletions(-) +Merging galak/next +$ git merge galak/next +Auto-merging arch/powerpc/Kconfig +Auto-merging include/linux/fsl_devices.h +Merge made by recursive. + arch/powerpc/Kconfig | 1 + + arch/powerpc/boot/dts/ksi8560.dts | 4 ++-- + arch/powerpc/boot/dts/sbc8548.dts | 4 ++-- + arch/powerpc/boot/dts/sbc8560.dts | 4 ++-- + arch/powerpc/boot/dts/socrates.dts | 1 + + arch/powerpc/boot/dts/stx_gp3_8560.dts | 4 ++-- + arch/powerpc/boot/dts/tqm8540.dts | 4 ++-- + arch/powerpc/boot/dts/tqm8541.dts | 4 ++-- + arch/powerpc/boot/dts/tqm8555.dts | 4 ++-- + arch/powerpc/boot/dts/tqm8560.dts | 4 ++-- + arch/powerpc/include/asm/reg.h | 30 ++++++++++++++++++++++++++++++ + arch/powerpc/include/asm/reg_booke.h | 30 ------------------------------ + arch/powerpc/include/asm/sfp-machine.h | 6 +++--- + include/linux/fsl_devices.h | 22 ---------------------- + 14 files changed, 51 insertions(+), 71 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-pxa/magician.c +Merge made by recursive. + MAINTAINERS | 2 +- + arch/arm/configs/magician_defconfig | 6 +- + arch/arm/mach-pxa/Kconfig | 9 + + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/cm-x2xx.c | 2 +- + arch/arm/mach-pxa/colibri-pxa300.c | 11 +- + arch/arm/mach-pxa/colibri-pxa320.c | 10 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 35 +++ + arch/arm/mach-pxa/corgi.c | 55 +--- + arch/arm/mach-pxa/csb701.c | 5 + + arch/arm/mach-pxa/em-x270.c | 86 +++++- + arch/arm/mach-pxa/include/mach/colibri.h | 7 + + arch/arm/mach-pxa/include/mach/magician.h | 4 +- + arch/arm/mach-pxa/include/mach/palmld.h | 1 + + arch/arm/mach-pxa/include/mach/palmt5.h | 1 + + arch/arm/mach-pxa/include/mach/palmte2.h | 68 +++++ + arch/arm/mach-pxa/include/mach/palmtx.h | 2 + + arch/arm/mach-pxa/magician.c | 84 +++--- + arch/arm/mach-pxa/palmld.c | 36 ++- + arch/arm/mach-pxa/palmt5.c | 35 ++- + arch/arm/mach-pxa/palmte2.c | 466 +++++++++++++++++++++++++++++ + arch/arm/mach-pxa/palmtx.c | 35 ++- + arch/arm/mach-pxa/poodle.c | 18 +- + arch/arm/mach-pxa/spitz.c | 63 +--- + arch/arm/mach-pxa/tosa.c | 2 + + arch/arm/mm/mmu.c | 11 + + 26 files changed, 871 insertions(+), 184 deletions(-) + create mode 100644 arch/arm/mach-pxa/include/mach/palmte2.h + create mode 100644 arch/arm/mach-pxa/palmte2.c +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Resolved 'arch/x86/kernel/cpu/intel_cacheinfo.c' using previous resolution. +Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_cacheinfo.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f1e0a7a] Merge commit 'x86/auto-x86-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/k8.h | 4 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 182 ++++++++++++++------------------ + 2 files changed, 84 insertions(+), 102 deletions(-) +Merging xtensa/master +$ git merge xtensa/master +Already up-to-date. +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Recorded preimage for 'kernel/sysctl.c' +Resolved 'include/linux/netfilter/xt_limit.h' using previous resolution. +Resolved 'include/linux/netfilter/xt_statistic.h' using previous resolution. +Auto-merging arch/parisc/kernel/irq.c +Auto-merging include/drm/radeon_drm.h +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/netfilter/nfnetlink.h +Auto-merging include/linux/netfilter/x_tables.h +Auto-merging include/linux/netfilter/xt_limit.h +CONFLICT (content): Merge conflict in include/linux/netfilter/xt_limit.h +Auto-merging include/linux/netfilter/xt_statistic.h +CONFLICT (content): Merge conflict in include/linux/netfilter/xt_statistic.h +Auto-merging include/linux/sched.h +Auto-merging include/sound/asound.h +Auto-merging kernel/Makefile +Auto-merging kernel/fork.c +Auto-merging kernel/lockdep.c +Auto-merging kernel/sched.c +Auto-merging kernel/softirq.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/slob.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/sysctl.c'. +[master d93439c] Merge commit 'tip-core/auto-core-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/hrtimer.h | 5 + + include/linux/interrupt.h | 14 +++ + include/linux/pkt_sched.h | 2 +- + include/linux/sched.h | 18 ++-- + kernel/Makefile | 1 + + kernel/fork.c | 8 +- + kernel/hrtimer.c | 55 +++++++----- + kernel/hung_task.c | 217 +++++++++++++++++++++++++++++++++++++++++++++ + kernel/lockdep.c | 5 + + kernel/mutex.c | 4 +- + kernel/sched.c | 26 +++--- + kernel/softirq.c | 11 +++ + kernel/softlockup.c | 100 --------------------- + kernel/sysctl.c | 19 ++++- + lib/Kconfig.debug | 38 ++++++++ + 15 files changed, 374 insertions(+), 149 deletions(-) + create mode 100644 kernel/hung_task.c +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merging arch/parisc/kernel/irq.c +Merge made by recursive. +Merging tracing/auto-tracing-next +$ git merge tracing/auto-tracing-next +Recorded preimage for 'kernel/trace/blktrace.c' +Recorded preimage for 'kernel/trace/trace_output.h' +Recorded preimage for 'mm/slob.c' +Auto-merging fs/libfs.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/security.h +Auto-merging include/linux/slub_def.h +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/trace/blktrace.c +CONFLICT (content): Merge conflict in kernel/trace/blktrace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace_output.c +Auto-merging kernel/trace/trace_output.h +CONFLICT (content): Merge conflict in kernel/trace/trace_output.h +Auto-merging mm/slab.c +Auto-merging mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merging mm/slub.c +Auto-merging mm/util.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/trace/blktrace.c'. +Recorded resolution for 'kernel/trace/trace_output.h'. +Recorded resolution for 'mm/slob.c'. +[master 369a7f2] Merge commit 'tracing/auto-tracing-next' +$ git diff -M --stat --summary HEAD^.. + fs/befs/debug.c | 1 + + fs/libfs.c | 16 + + fs/squashfs/export.c | 1 + + include/linux/fdtable.h | 4 +- + include/linux/fs.h | 35 +-- + include/linux/ftrace.h | 3 +- + include/linux/key.h | 1 + + include/linux/rcuclassic.h | 16 +- + include/linux/rcupdate.h | 1 - + include/linux/rcupreempt.h | 53 +--- + include/linux/rcutree.h | 27 +-- + include/linux/security.h | 24 ++ + include/linux/slab_def.h | 10 +- + include/linux/slub_def.h | 12 +- + include/trace/kmemtrace.h | 92 +++--- + kernel/rcuclassic.c | 23 ++- + kernel/rcupreempt.c | 48 +++- + kernel/rcutree.c | 20 ++ + kernel/rcutree.h | 10 + + kernel/rcutree_trace.c | 2 + + kernel/trace/Kconfig | 15 + + kernel/trace/ftrace.c | 581 +++++++++++++++++++++++++++++++++- + kernel/trace/kmemtrace.c | 319 +++++++++++++------ + kernel/trace/trace.c | 15 +- + kernel/trace/trace.h | 10 +- + kernel/trace/trace_branch.c | 4 +- + kernel/trace/trace_functions_graph.c | 25 +- + kernel/trace/trace_output.c | 10 + + kernel/trace/trace_output.h | 2 + + kernel/trace/trace_stat.c | 2 +- + kernel/trace/trace_stat.h | 2 +- + kernel/trace/trace_workqueue.c | 2 +- + lib/decompress_bunzip2.c | 1 + + lib/decompress_inflate.c | 1 + + lib/decompress_unlzma.c | 1 + + mm/failslab.c | 1 + + mm/slab.c | 26 +- + mm/slob.c | 30 +- + mm/slub.c | 32 +-- + mm/util.c | 16 + + 40 files changed, 1127 insertions(+), 367 deletions(-) + create mode 100644 kernel/rcutree.h +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Already uptodate! +Merge made by recursive. +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merging arch/x86/Kconfig +Auto-merging include/linux/poison.h +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 uptodate! +Merge made by recursive. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Already up-to-date. +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Already uptodate! +Merge made by recursive. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-ioctl.c | 21 +++++ + drivers/md/dm-linear.c | 1 - + drivers/md/dm-table.c | 59 ++++++++---- + drivers/md/dm.c | 199 +++++++++++++++++++++++++++++------------ + drivers/md/dm.h | 1 - + include/linux/device-mapper.h | 1 - + 6 files changed, 203 insertions(+), 79 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Removing drivers/i2c/algos/i2c-algo-sgi.c +Removing include/linux/i2c-algo-sgi.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 12 ++- + drivers/i2c/algos/Kconfig | 4 - + drivers/i2c/algos/Makefile | 1 - + drivers/i2c/algos/i2c-algo-sgi.c | 179 ---------------------------- + drivers/i2c/busses/Kconfig | 6 +- + include/linux/i2c-algo-sgi.h | 26 ---- + include/linux/i2c-id.h | 37 ------ + include/linux/i2c.h | 4 +- + 8 files changed, 17 insertions(+), 252 deletions(-) + delete mode 100644 drivers/i2c/algos/i2c-algo-sgi.c + delete mode 100644 include/linux/i2c-algo-sgi.h +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging drivers/acpi/acpica/nsxfeval.c +Auto-merging include/acpi/acpixf.h +Merge made by recursive. + drivers/acpi/acpica/nsxfeval.c | 3 +- + drivers/hwmon/Kconfig | 12 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asus_atk0110.c | 1009 ++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/lm95241.c | 121 ++--- + include/acpi/acpixf.h | 2 - + 6 files changed, 1069 insertions(+), 79 deletions(-) + create mode 100644 drivers/hwmon/asus_atk0110.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Recorded preimage for 'Documentation/kernel-parameters.txt' +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/kernel-parameters.txt'. +[master 3c6b245] Merge branch 'quilt/kernel-doc' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 533 ++++++++++++++++++----------------- + 1 files changed, 268 insertions(+), 265 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Recorded preimage for 'include/linux/i2c-id.h' +Resolved 'arch/sh/boards/board-ap325rxa.c' using previous resolution. +Resolved 'arch/sh/boards/mach-migor/setup.c' using previous resolution. +Resolved 'drivers/media/video/cx25840/cx25840-audio.c' using previous resolution. +Resolved 'drivers/media/video/em28xx/em28xx-audio.c' using previous resolution. +Renaming drivers/media/dvb/frontends/au8522.c->drivers/media/dvb/frontends/au8522_dig.c +Auto-merging drivers/media/dvb/frontends/au8522_dig.c +Renaming drivers/media/video/pvrusb2/pvrusb2-tuner.h->drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h +Auto-merging drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c +Auto-merging arch/sh/boards/board-ap325rxa.c +CONFLICT (content): Merge conflict in arch/sh/boards/board-ap325rxa.c +Auto-merging arch/sh/boards/mach-migor/setup.c +CONFLICT (content): Merge conflict in arch/sh/boards/mach-migor/setup.c +Auto-merging drivers/media/common/tuners/Kconfig +Auto-merging drivers/media/dvb/firewire/firedtv-avc.c +Auto-merging drivers/media/dvb/frontends/Kconfig +Auto-merging drivers/media/video/Kconfig +Auto-merging drivers/media/video/Makefile +Auto-merging drivers/media/video/cx25840/cx25840-audio.c +CONFLICT (content): Merge conflict in drivers/media/video/cx25840/cx25840-audio.c +Auto-merging drivers/media/video/cx25840/cx25840-core.c +Auto-merging drivers/media/video/cx25840/cx25840-core.h +Auto-merging drivers/media/video/em28xx/em28xx-audio.c +CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-audio.c +Auto-merging drivers/media/video/omap24xxcam.c +Auto-merging drivers/media/video/pxa_camera.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/i2c-id.h +CONFLICT (content): Merge conflict in include/linux/i2c-id.h +Auto-merging sound/pci/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/i2c-id.h'. +[master ec884c6] Merge commit 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/siano/smssdio.c | 356 ++++ + drivers/media/video/Kconfig | 2 + + drivers/media/video/Makefile | 1 + + drivers/media/video/cx231xx/Kconfig | 35 + + drivers/media/video/cx231xx/Makefile | 14 + + drivers/media/video/cx231xx/cx231xx-audio.c | 585 ++++++ + drivers/media/video/cx231xx/cx231xx-avcore.c | 2581 ++++++++++++++++++++++++ + drivers/media/video/cx231xx/cx231xx-cards.c | 919 +++++++++ + drivers/media/video/cx231xx/cx231xx-conf-reg.h | 494 +++++ + drivers/media/video/cx231xx/cx231xx-core.c | 1200 +++++++++++ + drivers/media/video/cx231xx/cx231xx-dvb.c | 559 +++++ + drivers/media/video/cx231xx/cx231xx-i2c.c | 555 +++++ + drivers/media/video/cx231xx/cx231xx-input.c | 246 +++ + drivers/media/video/cx231xx/cx231xx-pcb-cfg.c | 795 ++++++++ + drivers/media/video/cx231xx/cx231xx-pcb-cfg.h | 231 +++ + drivers/media/video/cx231xx/cx231xx-reg.h | 1564 ++++++++++++++ + drivers/media/video/cx231xx/cx231xx-vbi.c | 701 +++++++ + drivers/media/video/cx231xx/cx231xx-vbi.h | 65 + + drivers/media/video/cx231xx/cx231xx-video.c | 2439 ++++++++++++++++++++++ + drivers/media/video/cx231xx/cx231xx.h | 779 +++++++ + drivers/media/video/cx25840/cx25840-audio.c | 66 +- + drivers/media/video/cx25840/cx25840-core.c | 165 ++- + drivers/media/video/cx25840/cx25840-core.h | 1 + + drivers/media/video/cx25840/cx25840-firmware.c | 11 +- + include/linux/i2c-id.h | 1 + + include/linux/mmc/sdio_ids.h | 8 + + linux/drivers/media/dvb/siano/smssdio.c | 354 ++++ + 27 files changed, 14664 insertions(+), 63 deletions(-) + create mode 100644 drivers/media/dvb/siano/smssdio.c + create mode 100644 drivers/media/video/cx231xx/Kconfig + create mode 100644 drivers/media/video/cx231xx/Makefile + create mode 100644 drivers/media/video/cx231xx/cx231xx-audio.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-avcore.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-cards.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-conf-reg.h + create mode 100644 drivers/media/video/cx231xx/cx231xx-core.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-dvb.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-i2c.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-input.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-pcb-cfg.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-pcb-cfg.h + create mode 100644 drivers/media/video/cx231xx/cx231xx-reg.h + create mode 100644 drivers/media/video/cx231xx/cx231xx-vbi.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-vbi.h + create mode 100644 drivers/media/video/cx231xx/cx231xx-video.c + create mode 100644 drivers/media/video/cx231xx/cx231xx.h + create mode 100644 linux/drivers/media/dvb/siano/smssdio.c +Merging quota/for_next +$ git merge quota/for_next +Recorded preimage for 'fs/Kconfig' +Recorded preimage for 'fs/udf/balloc.c' +Resolved 'fs/ext4/ext4.h' using previous resolution. +Resolved 'fs/ext4/inode.c' using previous resolution. +Resolved 'fs/quota/dquot.c' using previous resolution. +Resolved 'fs/reiserfs/namei.c' using previous resolution. +Resolved 'fs/reiserfs/stree.c' using previous resolution. +Renaming fs/dquot.c->fs/quota/dquot.c +Auto-merging fs/quota/dquot.c +CONFLICT (content): merge conflict in fs/quota/dquot.c +Renaming fs/quota.c->fs/quota/quota.c +Auto-merging fs/quota/quota.c +Renaming fs/quota_tree.c->fs/quota/quota_tree.c +Auto-merging fs/quota/quota_tree.c +Renaming fs/quota_v1.c->fs/quota/quota_v1.c +Auto-merging fs/quota/quota_v1.c +Renaming fs/quota_v2.c->fs/quota/quota_v2.c +Auto-merging fs/quota/quota_v2.c +Auto-merging fs/Kconfig +CONFLICT (content): Merge conflict in fs/Kconfig +Auto-merging fs/Makefile +Auto-merging fs/ext2/super.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext3/namei.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/balloc.c +Auto-merging fs/ext4/ext4.h +CONFLICT (content): Merge conflict in fs/ext4/ext4.h +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inode.c +CONFLICT (content): Merge conflict in fs/ext4/inode.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/super.c +Auto-merging fs/inode.c +Auto-merging fs/jfs/acl.c +Auto-merging fs/jfs/jfs_extent.c +Auto-merging fs/jfs/jfs_xtree.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/open.c +Auto-merging fs/ramfs/file-nommu.c +Auto-merging fs/reiserfs/bitmap.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/reiserfs/namei.c +CONFLICT (content): Merge conflict in fs/reiserfs/namei.c +Auto-merging fs/reiserfs/stree.c +CONFLICT (content): Merge conflict in fs/reiserfs/stree.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/super.c +Auto-merging fs/sync.c +Auto-merging fs/udf/balloc.c +CONFLICT (content): Merge conflict in fs/udf/balloc.c +Auto-merging fs/udf/ialloc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/Kconfig'. +Recorded resolution for 'fs/udf/balloc.c'. +[master eebf00c] Merge commit 'quota/for_next' +$ git diff -M --stat --summary HEAD^.. +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. + drivers/ide/at91_ide.c | 78 +--------------------------------- + drivers/ide/falconide.c | 13 ++++-- + drivers/ide/ide-cd.c | 103 +++++++++++++++++++++++--------------------- + drivers/ide/ide-dma-sff.c | 9 +--- + drivers/ide/ide-h8300.c | 101 +------------------------------------------- + drivers/ide/ide-probe.c | 1 + + drivers/ide/q40ide.c | 14 ++++-- + drivers/ide/scc_pata.c | 2 - + drivers/ide/tx4939ide.c | 6 +- + 9 files changed, 84 insertions(+), 243 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/Kconfig | 9 + + fs/nfs/client.c | 124 ++++- + fs/nfs/direct.c | 9 + + fs/nfs/internal.h | 51 ++ + fs/nfs/nfs4_fs.h | 37 ++- + fs/nfs/nfs4proc.c | 1241 ++++++++++++++++++++++++++++++++++++++++-- + fs/nfs/nfs4renewd.c | 6 +- + fs/nfs/nfs4state.c | 130 ++++- + fs/nfs/nfs4xdr.c | 1078 ++++++++++++++++++++++++++++++++----- + fs/nfs/read.c | 33 +- + fs/nfs/super.c | 12 + + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 31 +- + include/linux/nfs4.h | 146 +++++- + include/linux/nfs_fs_sb.h | 67 +++- + include/linux/nfs_xdr.h | 174 ++++++ + include/linux/nfsd/state.h | 1 - + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 1 + + net/sunrpc/clnt.c | 13 + + net/sunrpc/sched.c | 2 +- + 21 files changed, 2966 insertions(+), 220 deletions(-) +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/core/cma.c | 4 + + drivers/infiniband/hw/cxgb3/cxio_hal.c | 10 +- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 6 ++ + drivers/infiniband/hw/cxgb3/iwch.c | 11 ++- + drivers/infiniband/hw/cxgb3/iwch.h | 5 + + drivers/infiniband/hw/cxgb3/iwch_cm.c | 116 ++++++++++++++++++++--------- + drivers/infiniband/hw/cxgb3/iwch_cm.h | 3 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- + drivers/infiniband/hw/mlx4/main.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 25 ++++--- + drivers/net/mlx4/port.c | 5 +- + 11 files changed, 132 insertions(+), 60 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + arch/x86/kernel/reboot.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Recorded preimage for 'include/linux/nfs4.h' +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfssvc.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/nfs4.h +CONFLICT (content): Merge conflict in include/linux/nfs4.h +Auto-merging include/linux/nfsd/state.h +Auto-merging include/linux/sunrpc/svc.h +Auto-merging include/linux/sunrpc/svc_xprt.h +Auto-merging net/sunrpc/svc.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging net/sunrpc/svcsock.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/nfs4.h'. +[master acddc36] Merge commit 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/knfsd-stats.txt | 159 ++++ + Documentation/filesystems/nfs41-server.txt | 161 ++++ + fs/lockd/svclock.c | 13 +- + fs/nfsd/Kconfig | 1 + + fs/nfsd/nfs3proc.c | 10 +- + fs/nfsd/nfs4callback.c | 47 +- + fs/nfsd/nfs4proc.c | 246 ++++-- + fs/nfsd/nfs4recover.c | 74 +- + fs/nfsd/nfs4state.c | 1196 +++++++++++++++++++++++----- + fs/nfsd/nfs4xdr.c | 633 ++++++++++++++- + fs/nfsd/nfsctl.c | 38 +- + fs/nfsd/nfsproc.c | 3 +- + fs/nfsd/nfssvc.c | 86 ++- + fs/nfsd/vfs.c | 37 +- + include/linux/lockd/xdr.h | 12 +- + include/linux/lockd/xdr4.h | 10 +- + include/linux/nfs.h | 1 - + include/linux/nfs4.h | 10 +- + include/linux/nfsd/cache.h | 1 + + include/linux/nfsd/nfsd.h | 228 ++++-- + include/linux/nfsd/nfsfh.h | 7 + + include/linux/nfsd/state.h | 84 ++- + include/linux/nfsd/stats.h | 9 +- + include/linux/nfsd/xdr4.h | 129 +++- + include/linux/sunrpc/svc.h | 16 + + include/linux/sunrpc/xdr.h | 42 +- + net/sunrpc/svc.c | 3 +- + net/sunrpc/svc_xprt.c | 127 +++- + net/sunrpc/svcsock.c | 35 +- + 29 files changed, 2864 insertions(+), 554 deletions(-) + create mode 100644 Documentation/filesystems/knfsd-stats.txt + create mode 100644 Documentation/filesystems/nfs41-server.txt +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/cdev.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merging arch/ia64/kvm/kvm-ia64.c +Auto-merging arch/ia64/kvm/vcpu.c +Auto-merging arch/ia64/kvm/vtlb.c +Auto-merging arch/x86/kernel/kvm.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 5 +- + arch/ia64/include/asm/pgtable.h | 2 + + arch/ia64/kvm/kvm-ia64.c | 159 +++++++--- + arch/ia64/kvm/kvm_fw.c | 28 ++- + arch/ia64/kvm/lapic.h | 6 +- + arch/ia64/kvm/optvfault.S | 30 ++ + arch/ia64/kvm/process.c | 5 + + arch/ia64/kvm/vcpu.c | 20 +- + arch/ia64/kvm/vmm.c | 12 +- + arch/ia64/kvm/vmm_ivt.S | 18 +- + arch/ia64/kvm/vtlb.c | 3 +- + arch/powerpc/kvm/powerpc.c | 6 + + arch/s390/kvm/interrupt.c | 6 + + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 7 +- + arch/x86/kernel/kvm.c | 4 + + arch/x86/kvm/Makefile | 2 +- + arch/x86/kvm/i8254.c | 95 +++--- + arch/x86/kvm/i8254.h | 12 +- + arch/x86/kvm/kvm_timer.h | 18 + + arch/x86/kvm/lapic.c | 251 +++++---------- + arch/x86/kvm/lapic.h | 12 +- + arch/x86/kvm/mmu.c | 77 ++++- + arch/x86/kvm/paging_tmpl.h | 10 +- + arch/x86/kvm/svm.c | 43 +-- + arch/x86/kvm/timer.c | 46 +++ + arch/x86/kvm/vmx.c | 205 +++++++------ + arch/x86/kvm/x86.c | 88 ++++-- + arch/x86/kvm/x86.h | 18 + + include/linux/kvm.h | 40 +++- + include/linux/kvm_host.h | 20 +- + include/linux/kvm_types.h | 27 ++ + virt/kvm/ioapic.c | 153 ++-------- + virt/kvm/ioapic.h | 27 +-- + virt/kvm/irq_comm.c | 109 ++++--- + virt/kvm/kvm_main.c | 642 +++++++++++++++++++++++++++----------- + 36 files changed, 1373 insertions(+), 834 deletions(-) + create mode 100644 arch/x86/kvm/kvm_timer.h + create mode 100644 arch/x86/kvm/timer.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Recorded preimage for 'firmware/WHENCE' +Auto-merging drivers/scsi/Kconfig +Removing drivers/scsi/fcoe/fc_transport_fcoe.c +Removing drivers/scsi/fcoe/fcoe_sw.c +Removing drivers/scsi/ql1040_fw.h +Removing drivers/scsi/ql12160_fw.h +Removing drivers/scsi/ql1280_fw.h +Removing drivers/scsi/qlogicpti_asm.c +Auto-merging firmware/Makefile +Auto-merging firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Removing include/scsi/fc_transport_fcoe.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'firmware/WHENCE'. +[master 1cef60b] Merge commit 'scsi/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/aacraid.txt | 15 +- + drivers/message/fusion/mptsas.c | 5 +- + drivers/scsi/Kconfig | 17 +- + drivers/scsi/Makefile | 1 + + drivers/scsi/a2091.c | 6 +- + drivers/scsi/a2091.h | 3 - + drivers/scsi/a3000.c | 6 +- + drivers/scsi/a3000.h | 3 - + drivers/scsi/aacraid/aachba.c | 40 +- + drivers/scsi/aacraid/aacraid.h | 9 +- + drivers/scsi/aacraid/comminit.c | 14 +- + drivers/scsi/aacraid/linit.c | 8 +- + drivers/scsi/advansys.c | 1731 ++------------------------ + drivers/scsi/aic7xxx/aic79xx_core.c | 12 +- + drivers/scsi/aic7xxx/aic79xx_inline.h | 32 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 102 +- + drivers/scsi/aic7xxx/aic79xx_pci.c | 8 +- + drivers/scsi/aic7xxx/aic7xxx_inline.h | 5 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 104 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 10 +- + drivers/scsi/aic7xxx/aiclib.h | 4 +- + drivers/scsi/cxgb3i/Kbuild | 4 +- + drivers/scsi/cxgb3i/cxgb3i.h | 10 +- + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 275 ++--- + drivers/scsi/cxgb3i/cxgb3i_ddp.h | 6 +- + drivers/scsi/cxgb3i/cxgb3i_init.c | 31 +- + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 129 ++- + drivers/scsi/cxgb3i/cxgb3i_offload.c | 101 +- + drivers/scsi/cxgb3i/cxgb3i_offload.h | 13 +- + drivers/scsi/fcoe/Makefile | 8 +- + drivers/scsi/fcoe/fc_transport_fcoe.c | 443 ------- + drivers/scsi/fcoe/fcoe.c | 1878 ++++++++++++++++++++++++++++ + drivers/scsi/fcoe/fcoe.h | 75 ++ + drivers/scsi/fcoe/fcoe_sw.c | 561 --------- + drivers/scsi/fcoe/libfcoe.c | 2216 ++++++++++++++++----------------- + drivers/scsi/ibmvscsi/ibmvfc.c | 126 ++- + drivers/scsi/ibmvscsi/ibmvfc.h | 16 +- + drivers/scsi/libfc/fc_fcp.c | 10 +- + drivers/scsi/libfc/fc_lport.c | 11 +- + drivers/scsi/libiscsi.c | 4 +- + drivers/scsi/osd/osd_initiator.c | 42 +- + drivers/scsi/osd/osd_uld.c | 6 - + 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/qla2xxx/qla_attr.c | 295 +++++- + drivers/scsi/qla2xxx/qla_def.h | 136 +-- + drivers/scsi/qla2xxx/qla_dfs.c | 4 +- + drivers/scsi/qla2xxx/qla_fw.h | 42 +- + drivers/scsi/qla2xxx/qla_gbl.h | 25 +- + drivers/scsi/qla2xxx/qla_init.c | 136 +-- + drivers/scsi/qla2xxx/qla_iocb.c | 37 +- + drivers/scsi/qla2xxx/qla_isr.c | 32 +- + drivers/scsi/qla2xxx/qla_mbx.c | 238 ++++- + drivers/scsi/qla2xxx/qla_mid.c | 12 +- + drivers/scsi/qla2xxx/qla_os.c | 258 ++--- + drivers/scsi/qla2xxx/qla_sup.c | 103 ++- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ----------------- + drivers/scsi/scsi.c | 4 +- + drivers/scsi/scsi_lib.c | 17 +- + drivers/scsi/sd.c | 6 - + drivers/scsi/ses.c | 2 + + drivers/scsi/sg.c | 37 +- + drivers/scsi/sr.c | 9 - + drivers/scsi/stex.c | 742 +++++++++--- + drivers/scsi/sym53c8xx_2/sym_glue.h | 6 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.h | 6 +- + drivers/scsi/sym53c8xx_2/sym_malloc.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_misc.h | 18 +- + firmware/Makefile | 5 + + firmware/WHENCE | 36 + + 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/qlogic/1040.bin.ihex | 2111 +++++++++++++++++++++++++++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++++++++++++++++++++++ + firmware/qlogic/1280.bin.ihex | 2008 +++++++++++++++++++++++++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 +++++++++++++++++ + include/scsi/fc/fc_fip.h | 237 ++++ + include/scsi/fc_transport_fcoe.h | 54 - + include/scsi/libfc.h | 45 +- + include/scsi/libfcoe.h | 227 ++-- + 88 files changed, 14088 insertions(+), 12367 deletions(-) + delete mode 100644 drivers/scsi/fcoe/fc_transport_fcoe.c + create mode 100644 drivers/scsi/fcoe/fcoe.c + create mode 100644 drivers/scsi/fcoe/fcoe.h + delete mode 100644 drivers/scsi/fcoe/fcoe_sw.c + 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/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 include/scsi/fc/fc_fip.h + delete mode 100644 include/scsi/fc_transport_fcoe.h +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Recorded preimage for 'fs/ocfs2/dir.c' +Auto-merging fs/ocfs2/dir.c +CONFLICT (content): Merge conflict in fs/ocfs2/dir.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/ocfs2/dir.c'. +[master ae7bbdd] Merge commit 'ocfs2/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/ocfs2/dir.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/maps/Makefile' using previous resolution. +Auto-merging arch/blackfin/kernel/process.c +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/maps/Makefile +CONFLICT (content): Merge conflict in drivers/mtd/maps/Makefile +Auto-merging drivers/mtd/maps/sa1100-flash.c +Removing drivers/mtd/maps/sharpsl-flash.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/mxc_nand.c +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/mtd/nand/pxa3xx_nand.c +Auto-merging fs/jffs2/acl.c +Removing fs/romfs/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 21157b4] Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/include/mach/nand.h | 80 +++ + arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 3 + + arch/blackfin/kernel/process.c | 2 +- + arch/mips/include/asm/txx9/ndfmc.h | 30 ++ + arch/mips/include/asm/txx9/rbtx4939.h | 9 + + arch/mips/include/asm/txx9/tx4938.h | 1 + + arch/mips/include/asm/txx9/tx4939.h | 2 + + arch/mips/txx9/generic/setup.c | 21 + + arch/mips/txx9/generic/setup_tx4938.c | 21 + + arch/mips/txx9/generic/setup_tx4939.c | 17 + + arch/mips/txx9/rbtx4938/setup.c | 2 + + arch/mips/txx9/rbtx4939/setup.c | 161 +++++++ + drivers/mtd/Makefile | 2 +- + drivers/mtd/ar7part.c | 6 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- + drivers/mtd/chips/jedec_probe.c | 16 + + drivers/mtd/chips/map_ram.c | 17 + + drivers/mtd/chips/map_rom.c | 17 + + drivers/mtd/cmdlinepart.c | 6 +- + drivers/mtd/devices/doc2000.c | 1 - + drivers/mtd/devices/doc2001.c | 1 - + drivers/mtd/devices/doc2001plus.c | 1 - + drivers/mtd/devices/docecc.c | 1 - + drivers/mtd/devices/m25p80.c | 19 +- + drivers/mtd/devices/mtd_dataflash.c | 18 +- + drivers/mtd/devices/mtdram.c | 14 + + drivers/mtd/inftlmount.c | 1 - + drivers/mtd/internal.h | 17 + + drivers/mtd/maps/Kconfig | 12 +- + drivers/mtd/maps/Makefile | 2 +- + drivers/mtd/maps/omap_nor.c | 2 + + drivers/mtd/maps/physmap.c | 1 + + drivers/mtd/maps/plat-ram.c | 1 + + drivers/mtd/maps/rbtx4939-flash.c | 208 ++++++++ + drivers/mtd/maps/sa1100-flash.c | 2 +- + drivers/mtd/maps/sharpsl-flash.c | 116 ----- + drivers/mtd/mtd_blkdevs.c | 4 +- + drivers/mtd/mtdbdi.c | 43 ++ + drivers/mtd/mtdchar.c | 111 +++-- + drivers/mtd/mtdconcat.c | 47 ++ + drivers/mtd/mtdcore.c | 199 ++++++++ + drivers/mtd/mtdoops.c | 16 +- + drivers/mtd/mtdpart.c | 24 +- + drivers/mtd/nand/Kconfig | 15 +- + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/bf5xx_nand.c | 18 +- + drivers/mtd/nand/cafe_nand.c | 1 + + drivers/mtd/nand/davinci_nand.c | 570 ++++++++++++++++++++++ + drivers/mtd/nand/mxc_nand.c | 1 + + drivers/mtd/nand/nand_base.c | 107 ++++- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 119 +++++- + drivers/mtd/nand/sh_flctl.c | 18 +- + drivers/mtd/nand/txx9ndfmc.c | 428 +++++++++++++++++ + drivers/mtd/nftlcore.c | 3 +- + drivers/mtd/ofpart.c | 7 + + drivers/mtd/onenand/omap2.c | 6 + + drivers/mtd/onenand/onenand_base.c | 145 ++++-- + fs/jffs2/acl.c | 4 +- + fs/jffs2/malloc.c | 6 +- + fs/romfs/Kconfig | 48 ++- + fs/romfs/Makefile | 9 +- + fs/romfs/inode.c | 665 -------------------------- + fs/romfs/internal.h | 47 ++ + fs/romfs/mmap-nommu.c | 75 +++ + fs/romfs/storage.c | 261 ++++++++++ + fs/romfs/super.c | 648 +++++++++++++++++++++++++ + include/linux/mtd/mtd.h | 21 + + include/linux/mtd/partitions.h | 12 + + 69 files changed, 3563 insertions(+), 957 deletions(-) + create mode 100644 arch/arm/mach-davinci/include/mach/nand.h + create mode 100644 arch/mips/include/asm/txx9/ndfmc.h + create mode 100644 drivers/mtd/internal.h + create mode 100644 drivers/mtd/maps/rbtx4939-flash.c + delete mode 100644 drivers/mtd/maps/sharpsl-flash.c + create mode 100644 drivers/mtd/mtdbdi.c + create mode 100644 drivers/mtd/nand/davinci_nand.c + create mode 100644 drivers/mtd/nand/txx9ndfmc.c + delete mode 100644 fs/romfs/inode.c + create mode 100644 fs/romfs/internal.h + create mode 100644 fs/romfs/mmap-nommu.c + create mode 100644 fs/romfs/storage.c + create mode 100644 fs/romfs/super.c +Merging crypto/master +$ git merge crypto/master +Auto-merging drivers/char/hw_random/omap-rng.c +Merge made by recursive. + arch/x86/crypto/Makefile | 2 + + arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++++- + arch/x86/crypto/fpu.c | 166 +++++++++ + crypto/Kconfig | 10 + + crypto/api.c | 5 +- + crypto/cryptd.c | 14 +- + crypto/pcompress.c | 1 + + crypto/tcrypt.c | 16 +- + crypto/testmgr.c | 6 +- + drivers/char/hw_random/omap-rng.c | 2 +- + drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++---------- + 11 files changed, 987 insertions(+), 215 deletions(-) + create mode 100644 arch/x86/crypto/fpu.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Already up-to-date. +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'net/9p/protocol.c' using previous resolution. +Auto-merging net/9p/protocol.c +CONFLICT (content): Merge conflict in net/9p/protocol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 30126c0] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/rr +$ git merge quilt/rr +Recorded preimage for 'kernel/extable.c' +Recorded preimage for 'kernel/module.c' +Recorded preimage for 'kernel/params.c' +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/video/uvesafb.c +Auto-merging include/linux/compiler.h +Auto-merging include/linux/cpu.h +Auto-merging include/linux/module.h +Auto-merging include/linux/moduleparam.h +Auto-merging include/linux/string.h +Auto-merging init/main.c +Auto-merging kernel/extable.c +CONFLICT (content): Merge conflict in kernel/extable.c +Auto-merging kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merging kernel/params.c +CONFLICT (content): Merge conflict in kernel/params.c +Auto-merging kernel/workqueue.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/extable.c'. +Recorded resolution for 'kernel/module.c'. +Recorded resolution for 'kernel/params.c'. +[master 208b9d3] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/cyber2000fb.c | 9 +++---- + drivers/video/uvesafb.c | 10 +++----- + include/asm-frv/gdb-stub.h | 1 - + include/asm-mn10300/gdb-stub.h | 1 - + include/linux/compiler.h | 5 ++++ + include/linux/cpu.h | 5 ---- + include/linux/moduleparam.h | 40 +++++++++++++++++++++++++--------- + init/main.c | 1 - + kernel/cpu.c | 11 ++------- + kernel/kthread.c | 26 ++++++++++------------ + kernel/params.c | 46 +++++++++++++++++++++++++++------------- + kernel/workqueue.c | 36 ++++++++++++++++-------------- + 13 files changed, 108 insertions(+), 85 deletions(-) +Merging cifs/master +$ git merge cifs/master +Auto-merging fs/cifs/dir.c +Auto-merging fs/cifs/inode.c +Merge made by recursive. + fs/cifs/CHANGES | 3 +- + fs/cifs/cifsfs.c | 1 + + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifspdu.h | 8 +- + fs/cifs/cifssmb.c | 6 +- + fs/cifs/connect.c | 192 +++++++++++++++++++++++++++++++++++++--------------- + fs/cifs/dir.c | 6 +- + fs/cifs/file.c | 64 ++++++++++++++---- + fs/cifs/inode.c | 74 +++++++++++--------- + fs/cifs/readdir.c | 6 +- + 10 files changed, 245 insertions(+), 116 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging input/next +$ git merge input/next +Auto-merging drivers/input/input.c +Auto-merging drivers/input/mouse/Kconfig +Auto-merging drivers/input/mouse/hgpk.c +Merge made by recursive. + Documentation/input/rotary-encoder.txt | 101 +++ + arch/mips/include/asm/mach-rc32434/gpio.h | 3 + + arch/mips/rb532/devices.c | 19 +- + drivers/input/input.c | 13 +- + drivers/input/keyboard/atkbd.c | 135 ++--- + drivers/input/keyboard/bf54x-keys.c | 4 +- + drivers/input/keyboard/hilkbd.c | 140 +++-- + drivers/input/misc/Kconfig | 23 + + drivers/input/misc/Makefile | 28 +- + drivers/input/misc/ati_remote2.c | 277 ++++++++- + drivers/input/misc/rb532_button.c | 120 ++++ + drivers/input/misc/rotary_encoder.c | 221 +++++++ + drivers/input/mouse/Kconfig | 11 + + drivers/input/mouse/Makefile | 9 +- + drivers/input/mouse/hgpk.c | 2 +- + drivers/input/mouse/maplemouse.c | 147 +++++ + drivers/input/mouse/pc110pad.c | 5 +- + drivers/input/touchscreen/Kconfig | 58 ++ + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ad7877.c | 844 ++++++++++++++++++++++++++ + drivers/input/touchscreen/ad7879.c | 782 ++++++++++++++++++++++++ + drivers/input/touchscreen/mainstone-wm97xx.c | 3 +- + drivers/input/touchscreen/ucb1400_ts.c | 5 +- + drivers/input/touchscreen/wm97xx-core.c | 13 +- + drivers/input/touchscreen/zylonite-wm97xx.c | 240 ++++++++ + include/linux/rotary_encoder.h | 13 + + include/linux/spi/ad7879.h | 35 ++ + 27 files changed, 3054 insertions(+), 200 deletions(-) + create mode 100644 Documentation/input/rotary-encoder.txt + create mode 100644 drivers/input/misc/rb532_button.c + create mode 100644 drivers/input/misc/rotary_encoder.c + create mode 100644 drivers/input/mouse/maplemouse.c + create mode 100644 drivers/input/touchscreen/ad7877.c + create mode 100644 drivers/input/touchscreen/ad7879.c + create mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c + create mode 100644 include/linux/rotary_encoder.h + create mode 100644 include/linux/spi/ad7879.h +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/file.c +Auto-merging fs/ubifs/super.c +Merge made by recursive. + fs/ubifs/budget.c | 37 ++--- + fs/ubifs/debug.c | 6 +- + fs/ubifs/file.c | 16 ++- + fs/ubifs/find.c | 12 +- + fs/ubifs/gc.c | 428 +++++++++++++++++++++++++++++++++--------------- + fs/ubifs/journal.c | 7 +- + fs/ubifs/key.h | 6 +- + fs/ubifs/log.c | 5 +- + fs/ubifs/lpt_commit.c | 34 ++-- + fs/ubifs/recovery.c | 70 +++------ + fs/ubifs/replay.c | 2 +- + fs/ubifs/sb.c | 36 ++++- + fs/ubifs/shrinker.c | 6 +- + fs/ubifs/super.c | 37 +++- + fs/ubifs/tnc.c | 2 +- + fs/ubifs/ubifs-media.h | 30 +++- + fs/ubifs/ubifs.h | 13 +- + 17 files changed, 482 insertions(+), 265 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging block/blk.h +Merge made by recursive. + Documentation/blockdev/00-INDEX | 2 + + Documentation/blockdev/mflash.txt | 84 +++ + block/blk-core.c | 13 +- + block/blk-merge.c | 29 +- + block/blk-sysfs.c | 4 + + block/blk.h | 14 +- + block/elevator.c | 42 +- + drivers/block/Kconfig | 17 + + drivers/block/Makefile | 1 + + drivers/block/cciss.c | 117 ++++- + drivers/block/cciss.h | 2 + + drivers/block/cciss_cmd.h | 23 + + drivers/block/mg_disk.c | 1005 +++++++++++++++++++++++++++++++++++++ + include/linux/elevator.h | 1 + + include/linux/mg_disk.h | 206 ++++++++ + 15 files changed, 1513 insertions(+), 47 deletions(-) + create mode 100644 Documentation/blockdev/mflash.txt + create mode 100644 drivers/block/mg_disk.c + create mode 100644 include/linux/mg_disk.h +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Recorded preimage for 'firmware/Makefile' +Recorded preimage for 'firmware/WHENCE' +Resolved 'sound/isa/Kconfig' using previous resolution. +Auto-merging drivers/media/dvb/ttpci/Kconfig +Auto-merging drivers/media/dvb/ttpci/av7110.c +Removing drivers/media/dvb/ttpci/fdump.c +Auto-merging firmware/Makefile +CONFLICT (content): Merge conflict in firmware/Makefile +Auto-merging firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Auto-merging sound/isa/Kconfig +CONFLICT (content): Merge conflict in sound/isa/Kconfig +Removing sound/isa/wavefront/yss225.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'firmware/Makefile'. +Recorded resolution for 'firmware/WHENCE'. +[master 7382ce3] 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 - + firmware/.gitignore | 1 + + firmware/Makefile | 24 +- + firmware/WHENCE | 59 + + firmware/av7110/Boot.S | 109 ++ + firmware/av7110/bootcode.bin.ihex | 15 + + {scripts => firmware}/ihex2fw.c | 0 + firmware/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ + scripts/.gitignore | 1 - + scripts/Makefile | 3 +- + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 ----------------------------- + 18 files changed, 1222 insertions(+), 2883 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + rename {scripts => firmware}/ihex2fw.c (100%) + 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 +Merge made by recursive. + drivers/power/pcf50633-charger.c | 88 +++++++++++++++++++++++++++++------- + drivers/power/pda_power.c | 89 ++++++++++++++++++++++++++++++++----- + include/linux/mfd/pcf50633/core.h | 2 + + include/linux/mfd/pcf50633/mbc.h | 1 - + include/linux/pda_power.h | 2 + + 5 files changed, 152 insertions(+), 30 deletions(-) +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/leds-pca9532.c +Merge made by recursive. + Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++- + drivers/leds/Kconfig | 75 +++- + drivers/leds/Makefile | 7 + + drivers/leds/led-class.c | 21 +- + drivers/leds/led-triggers.c | 10 +- + drivers/leds/leds-bd2802.c | 765 +++++++++++++++++++++++ + drivers/leds/leds-dac124s085.c | 150 +++++ + drivers/leds/leds-gpio.c | 225 ++++++-- + drivers/leds/leds-h1940.c | 2 +- + drivers/leds/leds-pca9532.c | 2 +- + drivers/leds/leds-pwm.c | 153 +++++ + drivers/leds/leds-rb532.c | 77 +++ + drivers/leds/leds-s3c24xx.c | 7 +- + drivers/leds/leds.h | 4 +- + drivers/leds/ledtrig-default-on.c | 2 +- + drivers/leds/ledtrig-gpio.c | 239 +++++++ + drivers/leds/ledtrig-heartbeat.c | 4 +- + drivers/leds/ledtrig-ide-disk.c | 3 +- + drivers/leds/ledtrig-timer.c | 2 +- + include/linux/leds-bd2802.h | 26 + + include/linux/leds.h | 4 +- + include/linux/leds_pwm.h | 21 + + 22 files changed, 1772 insertions(+), 73 deletions(-) + create mode 100644 drivers/leds/leds-bd2802.c + create mode 100644 drivers/leds/leds-dac124s085.c + create mode 100644 drivers/leds/leds-pwm.c + create mode 100644 drivers/leds/leds-rb532.c + create mode 100644 drivers/leds/ledtrig-gpio.c + create mode 100644 include/linux/leds-bd2802.h + create mode 100644 include/linux/leds_pwm.h +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/Kconfig | 18 +++ + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/jornada720_bl.c | 161 +++++++++++++++++++++++++ + drivers/video/backlight/jornada720_lcd.c | 153 ++++++++++++++++++++++++ + drivers/video/backlight/mbp_nvidia_bl.c | 191 ++++++++++++++++++++++++------ + drivers/video/backlight/pwm_bl.c | 4 +- + 6 files changed, 491 insertions(+), 38 deletions(-) + create mode 100644 drivers/video/backlight/jornada720_bl.c + create mode 100644 drivers/video/backlight/jornada720_lcd.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging arch/x86/kernel/kgdb.c +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 2 +- + arch/x86/kernel/kgdb.c | 3 +- + include/linux/kgdb.h | 50 +++++++++++++++++++++++++++++++++----- + kernel/kgdb.c | 6 ++-- + 4 files changed, 49 insertions(+), 12 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging include/linux/rcupdate.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1054 +++++++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 296 ++++ + init/Kconfig | 9 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3622 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5027 insertions(+), 14 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +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 +Already up-to-date. +Merging security-testing/next +$ git merge security-testing/next +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging kernel/module.c +Auto-merging kernel/sysctl.c +Merge made by recursive. + Documentation/sysctl/kernel.txt | 11 +++++++++++ + kernel/module.c | 7 +++++-- + kernel/sysctl.c | 12 ++++++++++++ + security/commoncap.c | 32 ++++++++++++++++++++++++++++++++ + security/selinux/avc.c | 2 +- + security/selinux/include/security.h | 4 +++- + security/selinux/selinuxfs.c | 4 ++-- + security/selinux/ss/services.c | 30 +++++------------------------- + 8 files changed, 71 insertions(+), 31 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Resolved 'fs/devpts/inode.c' using previous resolution. +Auto-merging arch/x86/kernel/kprobes.c +Auto-merging drivers/char/cyclades.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/serial/Kconfig +Auto-merging fs/devpts/inode.c +CONFLICT (content): Merge conflict in fs/devpts/inode.c +Auto-merging include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 60c6f99] Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + drivers/char/applicom.c | 1 + + drivers/char/cyclades.c | 2 + + drivers/char/isicom.c | 1 + + drivers/char/moxa.c | 9 +- + drivers/char/mxser.c | 1 - + drivers/char/rio/rio_linux.c | 2 +- + drivers/char/riscom8.c | 2 + + drivers/char/specialix.c | 1 + + drivers/serial/8250_pci.c | 411 +++++++++++++++++++++++++++++++++++++++ + drivers/serial/8250_pnp.c | 7 +- + drivers/serial/Kconfig | 4 +- + drivers/serial/bfin_5xx.c | 22 ++- + drivers/serial/icom.c | 14 +-- + drivers/serial/jsm/jsm_driver.c | 9 +- + drivers/serial/jsm/jsm_tty.c | 4 +- + drivers/serial/ucc_uart.c | 1 + + drivers/usb/class/cdc-acm.c | 2 +- + include/linux/pci_ids.h | 26 +++ + include/linux/serial_core.h | 2 +- + 19 files changed, 484 insertions(+), 37 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already uptodate! +Merge made by recursive. +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 +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Auto-merging drivers/watchdog/Kconfig +Merge made by recursive. + drivers/watchdog/Kconfig | 2 - + drivers/watchdog/Makefile | 2 - + drivers/watchdog/i6300esb.c | 155 ++++++++++++++++++++-------------------- + drivers/watchdog/orion5x_wdt.c | 57 +++++++++++---- + 4 files changed, 119 insertions(+), 97 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merging arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/apic.h | 3 + + arch/x86/include/asm/io_apic.h | 11 +- + arch/x86/kernel/apic/apic.c | 70 +++++++++++-- + arch/x86/kernel/apic/io_apic.c | 140 ++++++++++++++++-------- + drivers/pci/dmar.c | 71 ++++++++++--- + drivers/pci/intel-iommu.c | 238 +++++++++++++++++++++++++++++++++++----- + drivers/pci/intr_remapping.c | 83 ++++++++++++++- + include/linux/dmar.h | 11 ++ + include/linux/intel-iommu.h | 13 ++ + 10 files changed, 537 insertions(+), 105 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/SubmittingPatches | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging fs/compat.c +Merge made by recursive. + fs/compat.c | 2 +- + fs/ext2/ext2.h | 2 +- + fs/inode.c | 2 +- + sound/usb/usbmixer.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Already up-to-date. +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Recorded preimage for 'mm/slob.c' +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging fs/block_dev.c +Auto-merging include/linux/slab.h +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging kernel/module.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/page_alloc.c +Auto-merging mm/slab.c +Auto-merging mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merging mm/slub.c +Auto-merging mm/vmalloc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/slob.c'. +[master 3e9ca7b] Merge commit 'kmemleak/kmemleak' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 4 + + Documentation/kmemleak.txt | 142 ++++ + MAINTAINERS | 6 + + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + drivers/char/vt.c | 7 + + fs/block_dev.c | 6 + + include/linux/kmemleak.h | 96 +++ + include/linux/percpu.h | 5 + + include/linux/slab.h | 2 + + init/main.c | 4 +- + kernel/module.c | 56 ++ + lib/Kconfig.debug | 33 + + mm/Makefile | 2 + + mm/kmemleak-test.c | 111 +++ + mm/kmemleak.c | 1498 +++++++++++++++++++++++++++++++++++ + mm/page_alloc.c | 11 + + mm/slab.c | 32 +- + mm/slob.c | 7 + + mm/slub.c | 5 +- + mm/vmalloc.c | 30 +- + 22 files changed, 2054 insertions(+), 7 deletions(-) + create mode 100644 Documentation/kmemleak.txt + create mode 100644 include/linux/kmemleak.h + create mode 100644 mm/kmemleak-test.c + create mode 100644 mm/kmemleak.c +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Recorded preimage for 'drivers/spi/spi_gpio.c' +Resolved 'drivers/media/video/v4l2-device.c' using previous resolution. +Resolved 'drivers/mtd/maps/pxa2xx-flash.c' using previous resolution. +Resolved 'drivers/net/wimax/i2400m/usb-notif.c' using previous resolution. +Resolved 'drivers/sh/maple/maple.c' using previous resolution. +Resolved 'drivers/spi/spi_mpc83xx.c' using previous resolution. +Resolved 'fs/sysfs/bin.c' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/acpi/dock.c +Auto-merging drivers/base/power/main.c +Auto-merging drivers/base/sys.c +Auto-merging drivers/block/floppy.c +Auto-merging drivers/char/vt.c +Auto-merging drivers/dma/dw_dmac.c +Auto-merging drivers/gpu/drm/drm_sysfs.c +Auto-merging drivers/i2c/i2c-core.c +Auto-merging drivers/ide/au1xxx-ide.c +Auto-merging drivers/media/video/v4l2-device.c +CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c +Auto-merging drivers/mmc/host/atmel-mci.c +Auto-merging drivers/mtd/maps/pxa2xx-flash.c +CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c +Auto-merging drivers/net/au1000_eth.c +Auto-merging drivers/net/bmac.c +Auto-merging drivers/net/cpmac.c +Auto-merging drivers/net/depca.c +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/macb.c +Auto-merging drivers/net/mv643xx_eth.c +Auto-merging drivers/net/sb1250-mac.c +Auto-merging drivers/net/smc91x.c +Auto-merging drivers/net/smsc911x.c +Auto-merging drivers/net/smsc9420.c +Auto-merging drivers/net/tc35815.c +Auto-merging drivers/net/wimax/i2400m/driver.c +Auto-merging drivers/net/wimax/i2400m/usb-notif.c +CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c +Auto-merging drivers/s390/cio/ccwgroup.c +Auto-merging drivers/s390/cio/css.c +Auto-merging drivers/s390/cio/device.c +Auto-merging drivers/s390/net/qeth_l3_main.c +Auto-merging drivers/sh/maple/maple.c +CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c +Auto-merging drivers/spi/omap2_mcspi.c +Auto-merging drivers/spi/omap_uwire.c +Auto-merging drivers/spi/pxa2xx_spi.c +Auto-merging drivers/spi/spi_gpio.c +CONFLICT (content): Merge conflict in drivers/spi/spi_gpio.c +Auto-merging drivers/spi/spi_mpc83xx.c +CONFLICT (content): Merge conflict in drivers/spi/spi_mpc83xx.c +Auto-merging drivers/usb/gadget/ci13xxx_udc.c +Auto-merging drivers/usb/gadget/imx_udc.c +Auto-merging drivers/video/sh_mobile_lcdcfb.c +Auto-merging fs/partitions/check.c +Auto-merging fs/sysfs/bin.c +CONFLICT (content): Merge conflict in fs/sysfs/bin.c +Auto-merging fs/sysfs/dir.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/kernel.h +Auto-merging init/main.c +Auto-merging kernel/module.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/kobject.c +Auto-merging lib/kobject_uevent.c +Auto-merging net/bluetooth/rfcomm/tty.c +Auto-merging net/netfilter/nf_conntrack_pptp.c +Auto-merging scripts/Makefile.lib +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/spi/spi_gpio.c'. +[master abaa79c] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + include/linux/init.h | 1 + + init/main.c | 9 +++++++++ + lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+), 0 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Renaming arch/arm/mach-s3c2410/include/mach/usb-control.h->arch/arm/plat-s3c/include/plat/usb-control.h +Auto-merging arch/arm/plat-s3c/include/plat/usb-control.h +CONFLICT (rename/delete): Rename drivers/usb/misc/phidget.h->arch/arm/mach-gemini/include/mach/vmalloc.h in HEAD and deleted in quilt/usb +Renaming drivers/usb/serial/cp2101.c->drivers/usb/serial/cp210x.c +Auto-merging drivers/usb/serial/cp210x.c +Renaming drivers/usb/storage/cypress_atacb.h->drivers/usb/storage/unusual_freecom.h +Auto-merging drivers/usb/storage/unusual_freecom.h +Renaming drivers/usb/storage/freecom.h->drivers/usb/storage/unusual_alauda.h +Auto-merging drivers/usb/storage/unusual_alauda.h +Renaming drivers/usb/storage/isd200.h->drivers/usb/storage/unusual_karma.h +Auto-merging drivers/usb/storage/unusual_karma.h +Renaming drivers/usb/storage/sddr55.h->drivers/usb/storage/unusual_onetouch.h +Auto-merging drivers/usb/storage/unusual_onetouch.h +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/gadget/atmel_usba_udc.c +Auto-merging drivers/usb/gadget/file_storage.c +Auto-merging drivers/usb/gadget/gmidi.c +Auto-merging drivers/usb/host/ohci-hcd.c +Auto-merging drivers/usb/serial/Kconfig +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/usb/storage/isd200.c +Auto-merging drivers/usb/storage/transport.c +Auto-merging drivers/usb/wusbcore/devconnect.c +Auto-merging drivers/usb/wusbcore/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eae0b55] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/staging +$ git merge quilt/staging +Recorded preimage for 'drivers/staging/pohmelfs/path_entry.c' +Recorded preimage for 'drivers/staging/serqt_usb/serqt_usb.c' +Recorded preimage for 'firmware/WHENCE' +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/comedi/Kconfig +Auto-merging drivers/staging/otus/hal/hpmain.c +Auto-merging drivers/staging/pohmelfs/path_entry.c +CONFLICT (add/add): Merge conflict in drivers/staging/pohmelfs/path_entry.c +Auto-merging drivers/staging/rtl8187se/r8180_core.c +Auto-merging drivers/staging/serqt_usb/serqt_usb.c +CONFLICT (add/add): Merge conflict in drivers/staging/serqt_usb/serqt_usb.c +Auto-merging firmware/Makefile +Auto-merging firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Auto-merging include/linux/connector.h +Auto-merging mm/filemap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/staging/pohmelfs/path_entry.c'. +Recorded resolution for 'drivers/staging/serqt_usb/serqt_usb.c'. +Recorded resolution for 'firmware/WHENCE'. +[master 5a7c704] Merge branch 'quilt/staging' +$ git diff -M --stat --summary HEAD^.. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-nfs-build-fix-for-client.c.patch +Applying: nfs: build fix for client.c +$ git revert c105a9f16f11aaa9fcb9f75f8342b89c5d9665cf +Finished one revert. +[master c133fb3] Revert "nfs41: use rpc prepare call state for session reset" + 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..a9df19744220 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,78 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Importing device-mapper based on v2.6.29-7764-g20bec8a +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 20bec8ab1458c24bed0d5492ee15d87807fc415a +HEAD is now at 20bec8a Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-add-integrity-support.patch +dm-remove-limited-barrier-support.patch +dm-rearrange-dm_wq_work.patch +dm-split-DMF_BLOCK_IO-flag-into-two.patch +dm-simplify-dm_request-loop.patch +dm-rework-queueing-and-suspension.patch +dm-remove-dm_request-loop.patch +dm-implement-basic-barrier-support.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + 2bdcde8...108268c master -> quilt/device-mapper (forced update) +Importing i2c based on 2.6.29-git12 +$ cd ../quilt-tmp +$ git reset --hard 6bb597507f9839b13498781e481f5458aea33620 +HEAD is now at 6bb5975 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-voodoo3-deprecate.patch +i2c-deprecate-client-register.patch +i2c-delete-unused-ids.patch +i2c-algo-sgi-delete.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + b2bec75...d0bdd47 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.29-git12 +$ cd ../quilt-tmp +$ git reset --hard 6bb597507f9839b13498781e481f5458aea33620 +HEAD is now at 6bb5975 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-lm95241-convert-to-new-i2c.patch +hwmon-asus_atk0110-new-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + 833bb30..48a1ebf master -> quilt/jdelvare-hwmon +Importing kernel-doc based on 2.6.29-git11 +$ cd ../quilt-tmp +$ git reset --hard 20bec8ab1458c24bed0d5492ee15d87807fc415a +HEAD is now at 20bec8a Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 +$ git quiltimport --author Randy Dunlap <randy.dunlap@oracle.com> --patches ../quilt/kernel-doc +docum-kernprms-alpha7.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/kernel-doc +From ../quilt-tmp + + 32a316f...b463a50 master -> quilt/kernel-doc (forced update) +Importing ide based on 6bb597507f9839b13498781e481f5458aea33620 +$ cd ../quilt-tmp +$ git reset --hard 6bb597507f9839b13498781e481f5458aea33620 +HEAD is now at 6bb5975 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-fix-host-drivers-that-need-irqf_shared.patch +ide-falconide_q40ide-use-__ide_mm_-in-out-sw-for-data-transfer.patch +ide-remove-wmb-from-ide-dma-sff-c-and-scc_pata-c.patch +tx4939ide-remove-wmb.patch +ide-h8300-remove-mm_-inw-outw.patch +at91_ide-remove-custom-tf_-read-load-methods.patch +ide-h8300-remove-custom-tf_-read-load-methods.patch +ide-cd-move_status_checking_into_the_irq_handler.patch +ide-cd-carve_out_an_ide_cd_breathe-helper_for_fs_write_requests.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/ide +From ../quilt-tmp + + 919a3dc...0346908 master -> quilt/ide (forced update) +Unchanged quilt series rr +Unchanged quilt series ttydev +Unchanged quilt series aoe +Unchanged quilt series driver-core +Unchanged quilt series usb +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ffae3ca022d5 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090406 |