diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-22 18:04:59 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-22 18:04:59 +1000 |
commit | 6086edf6d9e7d65c7c79af6f44fc548a871abd2e (patch) | |
tree | d02082217f2855f5cee673a817a7da4bbd0269c5 | |
parent | 0ba42448f25c4814200e380a42c42433e0ac0034 (diff) |
Add linux-next specific files for 20090622next-20090622
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 132 | ||||
-rw-r--r-- | Next/Trees | 134 | ||||
-rw-r--r-- | Next/merge.log | 2993 | ||||
-rw-r--r-- | Next/quilt-import.log | 617 | ||||
-rw-r--r-- | localversion-next | 1 |
5 files changed, 3877 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..429e72f59d0e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,132 @@ +Name SHA1 +---- ---- +origin f234012f52a37e48f2330e1ca2df69800e797c3b +fixes 2453d6ff6ffc5f0d496b7b14f509a26f99bf115e +arm-current 2453d6ff6ffc5f0d496b7b14f509a26f99bf115e +m68k-current adfe7c69891128f5e238a5e6823709b4bb85b340 +powerpc-merge b71a107c66ad952c9d35ec046a803efc89a80556 +sparc-current 6373fffc5d555caf3acf7c5796cec9820aaf7479 +scsi-rc-fixes d3748ec99c2e4a0824a7b21b176a4ece94784246 +net-current 52ea3a56a3268bc2a5a7c75e98c81463004e38ef +sound-current 47166281d2dc9daf7da9a5ad88491ae94366e852 +pci-current 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 +wireless-current aeeab4ff06b8e29cfe2fe730ba626f7e2487ba03 +kbuild-current e34e7dbb35474ffc75f639eca64a18a15f4f8688 +driver-core.current 0732f87761dbe417cb6e084b712d07e879e876ef +usb.current 0732f87761dbe417cb6e084b712d07e879e876ef +cpufreq-current 8e7c25971b1590776a90b249de3d859dd45e7414 +input-current eef3e4cab72eaf5345e3c73b2975c194a714f6cd +md-current 48606a9f2fc034f0b308d088c1f7ab6d407c462c +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current b6f34d44cb341ad32f08717d1a2c418e6053a031 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 3eadd3b21cec340dacdc24dd1f9735344290ca62 +davinci 95596e5e8958473c2c8088ff72d02a3c4d89b518 +pxa d78ff0a50aac6a1bfe445969dd963e6486e49f56 +avr32 4024533e60787a5507818b0c0fdb44ddb522cdf5 +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris 768c31495abe49227a96261b5aa19f34b30882b1 +ia64 1d89b30cc9be41af87881682ec82e2c107849dbe +m68k 9c6948da2e55f787b942946d830eb3018323b7b7 +m68knommu 9b344bc47839634ad3009d6b97c6261e19eefb84 +microblaze ace1e8017d5d5ce06bb9fb9d2ebff4639ee5e481 +mips 82e55f64130a74d2c2c4d83695151de4a58ff376 +parisc b609308e1415efebdf79ebd553f4dd47b0ff2722 +powerpc b71a107c66ad952c9d35ec046a803efc89a80556 +4xx 336ff735425d2709c4bb3f2a55f7565e8170ce7a +galak ac2e5adee4d5941cbd4b029f1d4c84316b44f9da +s390 085868189cfbc20050208cad7e891db00e857e6a +sh 5b5628e97037fd9e980bb08a968771a9f079f103 +sparc b99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +cifs 361ea1ae5451040cd254eee0b6df64581080b2cc +configfs 8af7d5ffe1b6468ed0de1c2bb5335ad40b755ba3 +ext4 536fc240e7147858255bdb08e7a999a3351a9fb4 +fatfs 3e107603aecf886e1e5bda9dacbd9796eb2a2171 +fuse 151060ac13144208bd7601d17e4c92c59b98072f +gfs2 3ea400581f2b595afd91207bbd79c11cb38598e0 +jfs f7c52fd17a7dda42fc9e88c2b2678403419bfe63 +nfs e9f029855865e917821ef6034b31e340a4cfc815 +nfsd 47fcb03fefee2501e79176932a4184fc24d6f8ec +nilfs2 4c4ec80744f77147f0d40350b18e6da3d1b9398b +ocfs2 9467a42fc144229653b2f30bf571deb71f831695 +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +ubifs f2c5dbd7b7396457efc114f825acfdd4db4608f8 +xfs e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 +reiserfs-bkl cfcb7d059be7c2441b2c3ac56e0015631396ead6 +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci 2af5066f664cb011cf17d2e4414491fe24597e07 +hid 45e3e1935e2857c54783291107d33323b3ef33c8 +i2c 633acf86c8e259761942061692d9177da27a486a +jdelvare-hwmon aabf938ff05f1e511b51d943f2dc4d76129b3259 +kernel-doc 612392307cb09e49051225092cbbd7049bd8db93 +v4l-dvb c8fde2aba501895f5bde3c5791bc3b01b81c4f05 +quota a069e9cee1dba2f847839d325f46ce6976ed1b76 +kbuild 300df7dc89cc276377fc020704e34875d5c473b6 +ide 920d44ed965b1fb842ae65fad1a51fc7570e1181 +libata 10d4be2bbb6c017bcbda80fb342dbade51468bc6 +infiniband 45e3e1935e2857c54783291107d33323b3ef33c8 +acpi fea70adab29d046fd2d56197b14d8798427feb9d +ieee1394 0c53decdd0a9f9c459ccabe0b5f79660bde5375b +ubi d9dd0887cc5c6df0dbbe5a307284610607eea7ab +kvm 4631e094c00446f4e0ace8bcb4d60306ac8156c1 +dlm 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 +scsi 3c559ea8fd003962d9a28c64b2dd5c6d83ca6edb +async_tx b787f2e2a37a373a045f4d9b9bed941ccff01663 +udf 146bca72c7e6ba52de82a63b1fce7934dc103dbc +net 6be832529a8129c9d90a1d3a78c5d503a710b6fc +wireless a97f4424fb4cddecf9b13c9b0e3f79924b624a7f +mtd c90173f0907486fe4010c2a8cef534e2473db43f +crypto 215ccd6f55a2144bd553e0a3d12e1386f02309fd +sound 47166281d2dc9daf7da9a5ad88491ae94366e852 +cpufreq 8e7c25971b1590776a90b249de3d859dd45e7414 +rr 7ad613eb4d867245f0964e395e6087ae7f126b95 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input eef3e4cab72eaf5345e3c73b2975c194a714f6cd +bkl-removal 4a6a4499693a419a20559c41e33a7bd70bf20a6f +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block b363ab2e6f0dfdc81647e22be9976da2759c3dff +device-mapper 1df0db523fcc9b11f7549ce19d22fad5ac523671 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery a35d01a5d2ac533edab94a8e3b6749ab213c91c5 +leds a0be718a7e7ca79d2e3da0a7eebe0f31212a9c2c +backlight 65795efbd380a832ae508b04dba8f8e53f0b84d9 +kgdb 98ddb33cecfe5752836a3359148ec0469617c8b6 +slab 8dd81c7c44a91db60f8ff3af6235068b2b8f4d32 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 48606a9f2fc034f0b308d088c1f7ab6d407c462c +mfd 2021de874e9f09774616772cfdefdab0e6193b09 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29 +voltage 808a0875e835b7c5bde0473a54ebb19cff8c63e3 +security-testing 56f8c9bc410deb55f21698e6a0d59f559ae1d794 +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +ttydev f5bc5adb42a758509f3d4f98bbf516cc18dee50e +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +uwb b81c087f6deb049023e41ce00717202a953f3939 +watchdog c57d87a6d46c29f08d5a572b0b982bf4e1435444 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 008fe148cb0fb51d266baabe2c09997b21cf90c6 +cputime 524f8fdb6a2041afd0f777ce2ee2156bf2298bde +osd 7cbf433133a2d245d60028dbafb36cd3cdfd81dd +jc_docs f89d7eaf6c34828070f407d0e04b73127f176ec5 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 6c7803606c032245825246d9b96c4a23d2aa553c +audit def57543418a5f47debae28a0a9dea2effc11692 +omap 59a3759d0fe8d969888c741bb33f4946e4d3750d +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +suspend f3ad116588151b3371ae4e092290e4f48e62b8bb +bluetooth 3c4bdc4bd4af791a72147b6ebc29553808f53cea +edac-amd c476c23b45a41eb4e3ea63af786cc4d74762fe11 +fsnotify 528da3e9e237059a84a2625e942811cf824a6efd +irda e0057975e09a85ac92be81e975d0d0a911b1c4c6 +hwlat 332283f9b37029a7dd676709afbbd858431ff0a5 +tip 29502313eb7093ad1ce4b44c34ad669b7ccbe53c +asm-generic 32a9ff9cc55b42543a84bca90b070df92af72671 +driver-core 47c0383bc4f4c1595465c0ae22fa93f02d579ae2 +usb 47c0383bc4f4c1595465c0ae22fa93f02d579ae2 +staging 1bc8c752b15b41a9b4e7b51b32c444ad22674e54 +scsi-post-merge e349792a385ed47390d156155b1a1e19af1bf163 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a32551ba5f68 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,134 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl-rc6 +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +hwlat git git://git.kernel.org/pub/scm/linux/kernel/git/jcm/linux-2.6-hwlat.git#for-linus +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..25896968e1cb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2993 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 0732f87 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 +Merging origin/master +$ git merge origin/master +Updating 0732f87..f234012 +Fast forward + Documentation/SubmitChecklist | 2 +- + Documentation/feature-removal-schedule.txt | 10 - + Documentation/i2c/instantiating-devices | 44 + + Documentation/i2c/writing-clients | 16 +- + Documentation/input/input.txt | 2 +- + Documentation/input/rotary-encoder.txt | 9 +- + Documentation/ja_JP/SubmitChecklist | 2 +- + Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 2 + + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + MAINTAINERS | 39 +- + arch/alpha/mm/fault.c | 2 +- + arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 42 + + arch/arm/mm/fault.c | 2 +- + arch/avr32/mm/fault.c | 2 +- + arch/blackfin/include/asm/atomic.h | 109 +- + arch/blackfin/include/asm/auxvec.h | 5 +- + arch/blackfin/include/asm/bitops.h | 198 +- + arch/blackfin/include/asm/bugs.h | 17 +- + arch/blackfin/include/asm/cputime.h | 5 - + arch/blackfin/include/asm/current.h | 24 +- + arch/blackfin/include/asm/device.h | 6 - + arch/blackfin/include/asm/elf.h | 2 +- + arch/blackfin/include/asm/emergency-restart.h | 5 - + arch/blackfin/include/asm/errno.h | 7 +- + arch/blackfin/include/asm/fb.h | 13 +- + arch/blackfin/include/asm/futex.h | 5 - + arch/blackfin/include/asm/hardirq.h | 42 +- + arch/blackfin/include/asm/hw_irq.h | 7 +- + arch/blackfin/include/asm/io.h | 1 - + arch/blackfin/include/asm/ioctls.h | 84 +- + arch/blackfin/include/asm/ipcbuf.h | 31 +- + arch/blackfin/include/asm/irq.h | 5 +- + arch/blackfin/include/asm/kmap_types.h | 5 - + arch/blackfin/include/asm/local.h | 5 - + arch/blackfin/include/asm/mman.h | 44 +- + arch/blackfin/include/asm/msgbuf.h | 32 +- + arch/blackfin/include/asm/mutex.h | 2 +- + arch/blackfin/include/asm/page.h | 85 +- + arch/blackfin/include/asm/param.h | 23 +- + arch/blackfin/include/asm/percpu.h | 5 - + arch/blackfin/include/asm/pgalloc.h | 9 +- + arch/blackfin/include/asm/poll.h | 21 +- + arch/blackfin/include/asm/posix_types.h | 56 +- + arch/blackfin/include/asm/processor.h | 35 +- + arch/blackfin/include/asm/resource.h | 5 - + arch/blackfin/include/asm/sembuf.h | 26 +- + arch/blackfin/include/asm/serial.h | 6 +- + arch/blackfin/include/asm/setup.h | 18 +- + arch/blackfin/include/asm/shmbuf.h | 43 +- + arch/blackfin/include/asm/shmparam.h | 7 +- + arch/blackfin/include/asm/signal.h | 159 +- + arch/blackfin/include/asm/socket.h | 60 +- + arch/blackfin/include/asm/sockios.h | 14 +- + arch/blackfin/include/asm/spinlock.h | 6 + + arch/blackfin/include/asm/statfs.h | 5 - + arch/blackfin/include/asm/swab.h | 6 +- + arch/blackfin/include/asm/termbits.h | 199 +- + arch/blackfin/include/asm/termios.h | 95 +- + arch/blackfin/include/asm/tlbflush.h | 57 +- + arch/blackfin/include/asm/topology.h | 5 - + arch/blackfin/include/asm/types.h | 37 +- + arch/blackfin/include/asm/ucontext.h | 18 +- + arch/blackfin/include/asm/unaligned.h | 12 +- + arch/blackfin/include/asm/user.h | 90 +- + arch/blackfin/kernel/bfin_ksyms.c | 1 + + arch/blackfin/kernel/process.c | 23 + + arch/blackfin/mach-common/Makefile | 3 +- + arch/blackfin/mach-common/ints-priority.c | 4 +- + arch/blackfin/mach-common/irqpanic.c | 11 +- + arch/cris/mm/fault.c | 2 +- + arch/frv/mm/fault.c | 2 +- + arch/ia64/mm/fault.c | 2 +- + arch/m32r/mm/fault.c | 2 +- + arch/m68k/mm/fault.c | 2 +- + arch/microblaze/kernel/init_task.c | 2 - + arch/microblaze/kernel/vmlinux.lds.S | 11 +- + arch/microblaze/mm/fault.c | 2 +- + arch/mips/mm/fault.c | 2 +- + arch/mn10300/mm/fault.c | 2 +- + arch/parisc/mm/fault.c | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 17 + + arch/powerpc/boot/cuboot-85xx.c | 2 + + arch/powerpc/boot/dts/asp834x-redboot.dts | 2 +- + arch/powerpc/boot/dts/gef_sbc610.dts | 10 + + arch/powerpc/boot/dts/kmeter1.dts | 520 + + arch/powerpc/boot/dts/mpc8272ads.dts | 19 +- + arch/powerpc/boot/dts/mpc8315erdb.dts | 15 + + arch/powerpc/boot/dts/mpc8349emitx.dts | 2 +- + arch/powerpc/boot/dts/mpc834x_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8377_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8378_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8379_mds.dts | 2 +- + arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8569mds.dts | 87 +- + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 32 + + arch/powerpc/boot/dts/pcm030.dts | 26 +- + arch/powerpc/boot/dts/sbc8349.dts | 2 +- + arch/powerpc/boot/dts/xcalibur1501.dts | 696 ++ + arch/powerpc/boot/dts/xpedite5200.dts | 466 + + arch/powerpc/boot/dts/xpedite5200_xmon.dts | 506 + + arch/powerpc/boot/dts/xpedite5301.dts | 640 + + arch/powerpc/boot/dts/xpedite5330.dts | 707 ++ + arch/powerpc/boot/dts/xpedite5370.dts | 638 + + arch/powerpc/boot/wrapper | 4 + + arch/powerpc/configs/83xx/kmeter1_defconfig | 908 ++ + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 1821 +++ + arch/powerpc/include/asm/delay.h | 36 + + arch/powerpc/include/asm/fsl_lbc.h | 4 +- + arch/powerpc/include/asm/hw_irq.h | 6 +- + arch/powerpc/include/asm/mpc52xx.h | 2 +- + arch/powerpc/include/asm/{mpc512x.h => mpc5xxx.h} | 10 +- + arch/powerpc/include/asm/perf_counter.h | 52 +- + arch/powerpc/include/asm/reg.h | 3 +- + arch/powerpc/include/asm/reg_booke.h | 2 + + arch/powerpc/kernel/Makefile | 10 +- + arch/powerpc/kernel/cpu_setup_6xx.S | 3 + + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 49 +- + arch/powerpc/kernel/ftrace.c | 2 +- + arch/powerpc/kernel/mpc7450-pmu.c | 417 + + arch/powerpc/kernel/perf_counter.c | 257 +- + arch/powerpc/kernel/power4-pmu.c | 89 +- + arch/powerpc/kernel/power5+-pmu.c | 95 +- + arch/powerpc/kernel/power5-pmu.c | 98 +- + arch/powerpc/kernel/power6-pmu.c | 72 +- + arch/powerpc/kernel/power7-pmu.c | 61 +- + arch/powerpc/kernel/ppc970-pmu.c | 63 +- + arch/powerpc/kernel/time.c | 25 + + arch/powerpc/kvm/Makefile | 2 + + arch/powerpc/lib/Makefile | 2 + + arch/powerpc/mm/Makefile | 2 + + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/oprofile/Makefile | 2 + + arch/powerpc/platforms/44x/warp.c | 8 +- + arch/powerpc/platforms/512x/clock.c | 10 +- + arch/powerpc/platforms/512x/mpc512x.h | 1 - + arch/powerpc/platforms/512x/mpc512x_shared.c | 23 - + arch/powerpc/platforms/52xx/mpc52xx_common.c | 32 +- + arch/powerpc/platforms/83xx/Kconfig | 7 + + arch/powerpc/platforms/83xx/Makefile | 1 + + arch/powerpc/platforms/83xx/kmeter1.c | 191 + + arch/powerpc/platforms/83xx/mpc83xx.h | 4 +- + arch/powerpc/platforms/83xx/usb.c | 10 +- + arch/powerpc/platforms/85xx/Kconfig | 13 + + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/mpc8536_ds.c | 17 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 19 + + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 20 + + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 282 + + arch/powerpc/platforms/86xx/Kconfig | 1 + + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 4 + + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 15 + + arch/powerpc/platforms/Kconfig.cputype | 21 +- + arch/powerpc/platforms/Makefile | 2 + + arch/powerpc/platforms/cell/spu_fault.c | 2 +- + arch/powerpc/sysdev/Makefile | 5 + + arch/powerpc/sysdev/mpc5xxx_clocks.c | 33 + + arch/powerpc/xmon/Makefile | 2 + + arch/s390/kernel/ftrace.c | 2 +- + arch/s390/lib/uaccess_pt.c | 2 +- + arch/s390/mm/fault.c | 2 +- + arch/sh/mm/fault_32.c | 2 +- + arch/sh/mm/tlbflush_64.c | 2 +- + arch/sparc/mm/fault_32.c | 4 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/sparc/mm/init_64.c | 6 + + arch/um/kernel/trap.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/bioscall.S | 2 +- + arch/x86/crypto/aesni-intel_asm.S | 5 +- + arch/x86/crypto/aesni-intel_glue.c | 4 + + arch/x86/crypto/fpu.c | 4 +- + arch/x86/include/asm/amd_iommu.h | 2 + + arch/x86/include/asm/atomic_32.h | 3 +- + arch/x86/include/asm/desc.h | 26 - + arch/x86/include/asm/mce.h | 63 +- + arch/x86/include/asm/msr.h | 7 +- + arch/x86/include/asm/page_64_types.h | 2 +- + arch/x86/include/asm/perf_counter.h | 5 - + arch/x86/include/asm/pgtable_32.h | 8 +- + arch/x86/include/asm/pgtable_64.h | 5 +- + arch/x86/include/asm/therm_throt.h | 9 - + arch/x86/include/asm/timer.h | 6 +- + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/kernel/amd_iommu.c | 16 + + arch/x86/kernel/amd_iommu_init.c | 26 +- + arch/x86/kernel/apic/io_apic.c | 9 +- + arch/x86/kernel/apic/probe_32.c | 11 - + arch/x86/kernel/apic/summit_32.c | 1 - + arch/x86/kernel/cpu/common.c | 5 +- + arch/x86/kernel/cpu/mcheck/Makefile | 9 +- + arch/x86/kernel/cpu/mcheck/k7.c | 3 +- + arch/x86/kernel/cpu/mcheck/mce.c | 233 +- + arch/x86/kernel/cpu/mcheck/mce.h | 38 - + .../kernel/cpu/mcheck/{mce_amd_64.c => mce_amd.c} | 0 + arch/x86/kernel/cpu/mcheck/mce_intel.c | 250 +- + arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 248 - + arch/x86/kernel/cpu/mcheck/non-fatal.c | 3 +- + arch/x86/kernel/cpu/mcheck/p4.c | 48 +- + arch/x86/kernel/cpu/mcheck/p5.c | 15 +- + arch/x86/kernel/cpu/mcheck/p6.c | 3 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 106 +- + arch/x86/kernel/cpu/mcheck/winchip.c | 3 +- + arch/x86/kernel/cpu/perf_counter.c | 138 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 12 +- + arch/x86/kernel/crash.c | 6 + + arch/x86/kernel/efi.c | 31 +- + arch/x86/kernel/entry_32.S | 66 +- + arch/x86/kernel/entry_64.S | 2 + + arch/x86/kernel/ftrace.c | 6 +- + arch/x86/kernel/head_32.S | 1 - + arch/x86/kernel/head_64.S | 1 - + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/pci-dma.c | 2 + + arch/x86/kernel/traps.c | 3 +- + arch/x86/kernel/tsc.c | 8 +- + arch/x86/lib/usercopy_64.c | 2 +- + arch/x86/mm/fault.c | 5 +- + arch/x86/mm/gup.c | 67 +- + arch/x86/mm/init_64.c | 2 +- + arch/xtensa/mm/fault.c | 2 +- + block/Kconfig | 4 +- + block/blk-settings.c | 4 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/block/hd.c | 10 +- + drivers/char/agp/agp.h | 12 +- + drivers/char/agp/ali-agp.c | 28 +- + drivers/char/agp/amd-k7-agp.c | 2 +- + drivers/char/agp/amd64-agp.c | 2 +- + drivers/char/agp/ati-agp.c | 23 +- + drivers/char/agp/backend.c | 8 +- + drivers/char/agp/efficeon-agp.c | 5 +- + drivers/char/agp/generic.c | 69 +- + drivers/char/agp/hp-agp.c | 9 +- + drivers/char/agp/i460-agp.c | 47 +- + drivers/char/agp/intel-agp.c | 49 +- + drivers/char/agp/nvidia-agp.c | 2 +- + drivers/char/agp/parisc-agp.c | 20 +- + drivers/char/agp/sgi-agp.c | 9 +- + drivers/char/agp/sworks-agp.c | 2 +- + drivers/char/agp/uninorth-agp.c | 30 +- + drivers/char/dtlk.c | 6 +- + drivers/char/hvc_iseries.c | 2 +- + drivers/char/hvc_vio.c | 2 +- + drivers/char/hvcs.c | 2 +- + drivers/char/istallion.c | 2 +- + drivers/char/keyboard.c | 2 - + drivers/char/moxa.c | 7 +- + drivers/crypto/padlock-aes.c | 138 +- + drivers/gpio/Kconfig | 6 + + drivers/gpio/Makefile | 1 + + drivers/gpio/pl061.c | 341 + + drivers/gpu/drm/drm_agpsupport.c | 14 +- + drivers/gpu/drm/drm_auth.c | 4 +- + drivers/gpu/drm/drm_bufs.c | 140 +- + drivers/gpu/drm/drm_context.c | 4 +- + drivers/gpu/drm/drm_debugfs.c | 9 +- + drivers/gpu/drm/drm_dma.c | 31 +- + drivers/gpu/drm/drm_drawable.c | 25 +- + drivers/gpu/drm/drm_drv.c | 18 +- + drivers/gpu/drm/drm_edid.c | 100 +- + drivers/gpu/drm/drm_fops.c | 8 +- + drivers/gpu/drm/drm_gem.c | 8 +- + drivers/gpu/drm/drm_hashtab.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 14 +- + drivers/gpu/drm/drm_irq.c | 44 +- + drivers/gpu/drm/drm_memory.c | 33 +- + drivers/gpu/drm/drm_mm.c | 48 +- + drivers/gpu/drm/drm_pci.c | 53 +- + drivers/gpu/drm/drm_proc.c | 8 +- + drivers/gpu/drm/drm_scatter.c | 33 +- + drivers/gpu/drm/drm_sman.c | 29 +- + drivers/gpu/drm/drm_stub.c | 19 +- + drivers/gpu/drm/drm_vm.c | 12 +- + drivers/gpu/drm/i810/i810_dma.c | 6 +- + drivers/gpu/drm/i830/i830_dma.c | 6 +- + drivers/gpu/drm/i915/i915_dma.c | 45 +- + drivers/gpu/drm/i915/i915_drv.h | 2 + + drivers/gpu/drm/i915/i915_gem.c | 86 +- + drivers/gpu/drm/i915/i915_gem_debugfs.c | 4 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 67 +- + drivers/gpu/drm/i915/i915_mem.c | 24 +- + drivers/gpu/drm/i915/intel_bios.c | 6 +- + drivers/gpu/drm/i915/intel_display.c | 20 +- + drivers/gpu/drm/i915/intel_fb.c | 6 +- + drivers/gpu/drm/i915/intel_tv.c | 11 +- + drivers/gpu/drm/mga/mga_dma.c | 14 +- + drivers/gpu/drm/r128/r128_cce.c | 12 +- + drivers/gpu/drm/r128/r128_state.c | 84 +- + drivers/gpu/drm/radeon/r100.c | 85 +- + drivers/gpu/drm/radeon/r300.c | 478 +- + drivers/gpu/drm/radeon/r300.h | 36 + + drivers/gpu/drm/radeon/radeon.h | 9 +- + drivers/gpu/drm/radeon/radeon_asic.h | 15 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 2 - + drivers/gpu/drm/radeon/radeon_combios.c | 9 + + drivers/gpu/drm/radeon/radeon_cp.c | 9 +- + drivers/gpu/drm/radeon/radeon_device.c | 4 + + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 6 +- + drivers/gpu/drm/radeon/radeon_kms.c | 4 +- + drivers/gpu/drm/radeon/radeon_mem.c | 24 +- + drivers/gpu/drm/radeon/radeon_reg.h | 1 + + drivers/gpu/drm/radeon/radeon_state.c | 16 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/radeon/rv515.c | 58 + + drivers/gpu/drm/savage/savage_bci.c | 21 +- + drivers/gpu/drm/savage/savage_state.c | 17 +- + drivers/gpu/drm/sis/sis_drv.c | 6 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo.c | 11 +- + drivers/gpu/drm/ttm/ttm_tt.c | 11 +- + drivers/gpu/drm/via/via_map.c | 8 +- + drivers/i2c/busses/i2c-mpc.c | 2 +- + drivers/i2c/i2c-boardinfo.c | 7 +- + drivers/i2c/i2c-core.c | 557 +- + drivers/i2c/i2c-core.h | 4 +- + drivers/ide/at91_ide.c | 3 +- + drivers/ide/buddha.c | 40 +- + drivers/ide/cmd640.c | 13 + + drivers/ide/cmd64x.c | 103 +- + drivers/ide/cs5536.c | 23 +- + drivers/ide/falconide.c | 1 - + drivers/ide/gayle.c | 33 +- + drivers/ide/ht6560b.c | 33 +- + drivers/ide/icside.c | 10 +- + drivers/ide/ide-atapi.c | 138 +- + drivers/ide/ide-cd.c | 78 +- + drivers/ide/ide-disk.c | 9 +- + drivers/ide/ide-floppy.c | 56 +- + drivers/ide/ide-floppy_ioctl.c | 43 +- + drivers/ide/ide-io.c | 8 +- + drivers/ide/ide-ioctls.c | 13 +- + drivers/ide/ide-probe.c | 17 +- + drivers/ide/ide-tape.c | 186 +- + drivers/ide/ide-xfer-mode.c | 12 + + drivers/ide/it8172.c | 2 +- + drivers/ide/it8213.c | 2 +- + drivers/ide/macide.c | 30 +- + drivers/ide/opti621.c | 8 +- + drivers/ide/pdc202xx_old.c | 24 +- + drivers/ide/piix.c | 2 +- + drivers/ide/q40ide.c | 7 +- + drivers/ide/qd65xx.c | 11 +- + drivers/ide/qd65xx.h | 11 +- + drivers/ide/sgiioc4.c | 119 +- + drivers/ide/siimage.c | 42 +- + drivers/ide/sl82c105.c | 32 +- + drivers/ide/slc90e66.c | 2 +- + drivers/input/evdev.c | 21 +- + drivers/input/gameport/fm801-gp.c | 1 + + drivers/input/gameport/gameport.c | 25 +- + drivers/input/joydev.c | 14 +- + drivers/input/keyboard/Kconfig | 21 + + drivers/input/keyboard/Makefile | 2 + + drivers/input/keyboard/ep93xx_keypad.c | 470 + + drivers/input/keyboard/gpio_keys.c | 35 +- + drivers/input/keyboard/lm8323.c | 878 ++ + drivers/input/misc/Kconfig | 19 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/ati_remote2.c | 16 +- + drivers/input/misc/dm355evm_keys.c | 329 + + drivers/input/misc/rotary_encoder.c | 61 +- + drivers/input/misc/twl4030-pwrbutton.c | 145 + + drivers/input/misc/uinput.c | 94 +- + drivers/input/mouse/Kconfig | 18 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/alps.c | 31 +- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/mouse/lifebook.c | 25 +- + drivers/input/mouse/psmouse-base.c | 4 +- + drivers/input/mouse/synaptics.c | 28 + + drivers/input/mouse/synaptics.h | 2 + + drivers/input/mouse/synaptics_i2c.c | 676 ++ + drivers/input/mousedev.c | 9 +- + drivers/input/serio/i8042.c | 17 +- + drivers/input/serio/serio.c | 58 +- + drivers/input/tablet/gtco.c | 1 + + drivers/input/tablet/wacom.h | 5 +- + drivers/input/tablet/wacom_sys.c | 13 + + drivers/input/tablet/wacom_wac.c | 171 +- + drivers/input/tablet/wacom_wac.h | 3 + + drivers/input/touchscreen/Kconfig | 32 + + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ads7846.c | 23 +- + drivers/input/touchscreen/atmel-wm97xx.c | 446 + + drivers/input/touchscreen/eeti_ts.c | 286 + + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/w90p910_ts.c | 350 + + drivers/md/dm-exception-store.h | 2 +- + drivers/message/fusion/mptbase.c | 8 +- + drivers/mfd/ucb1400_core.c | 20 + + drivers/mmc/host/Kconfig | 36 + + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/sdhci-of.c | 3 + + drivers/mmc/host/sdhci-pci.c | 20 + + drivers/mmc/host/sdhci-s3c.c | 428 + + drivers/mmc/host/sdhci.c | 52 +- + drivers/mmc/host/sdhci.h | 6 + + drivers/mmc/host/via-sdmmc.c | 1362 +++ + drivers/net/fec_mpc52xx.c | 2 +- + drivers/net/fec_mpc52xx_phy.c | 2 +- + drivers/net/igbvf/netdev.c | 13 +- + drivers/net/ixgbe/ixgbe_fcoe.c | 2 +- + drivers/net/ps3_gelic_net.c | 22 +- + drivers/net/ps3_gelic_wireless.c | 6 +- + drivers/rapidio/rio-scan.c | 43 +- + drivers/rapidio/rio-sysfs.c | 6 +- + drivers/rtc/interface.c | 12 +- + drivers/rtc/rtc-dev.c | 6 +- + drivers/rtc/rtc-ds1305.c | 3 - + drivers/rtc/rtc-ds1307.c | 5 - + drivers/rtc/rtc-ds1374.c | 5 - + drivers/rtc/rtc-test.c | 2 - + drivers/scsi/ps3rom.c | 10 +- + drivers/serial/mpc52xx_uart.c | 5 +- + drivers/serial/of_serial.c | 2 +- + drivers/serial/ucc_uart.c | 19 +- + drivers/spi/Kconfig | 16 +- + drivers/spi/Makefile | 2 +- + drivers/spi/{spi_mpc83xx.c => spi_mpc8xxx.c} | 511 +- + drivers/staging/Kconfig | 14 +- + drivers/staging/Makefile | 7 +- + drivers/staging/agnx/debug.h | 9 +- + drivers/staging/agnx/pci.c | 57 +- + drivers/staging/agnx/phy.c | 4 +- + drivers/staging/agnx/phy.h | 2 +- + drivers/staging/agnx/sta.c | 2 +- + drivers/staging/agnx/sta.h | 2 +- + drivers/staging/altpciechdma/altpciechdma.c | 34 +- + drivers/staging/android/Kconfig | 10 +- + drivers/staging/android/Makefile | 1 + + drivers/staging/android/binder.c | 436 +- + drivers/staging/android/logger.c | 12 +- + drivers/staging/android/lowmemorykiller.c | 101 +- + drivers/staging/android/ram_console.c | 9 +- + drivers/staging/android/timed_gpio.c | 98 +- + drivers/staging/android/timed_gpio.h | 4 +- + drivers/staging/android/timed_output.c | 121 + + drivers/staging/android/timed_output.h | 37 + + drivers/staging/asus_oled/asus_oled.c | 2 +- + drivers/staging/b3dfg/b3dfg.c | 3 +- + drivers/staging/comedi/Kconfig | 11 +- + drivers/staging/comedi/Makefile | 5 - + drivers/staging/comedi/comedi.h | 1 - + drivers/staging/comedi/comedi_fops.c | 504 +- + drivers/staging/comedi/comedi_ksyms.c | 7 - + drivers/staging/comedi/comedi_rt.h | 149 - + drivers/staging/comedi/comedidev.h | 17 +- + drivers/staging/comedi/drivers.c | 19 +- + drivers/staging/comedi/drivers/8253.h | 50 +- + drivers/staging/comedi/drivers/8255.c | 23 +- + drivers/staging/comedi/drivers/8255.h | 14 +- + drivers/staging/comedi/drivers/Makefile | 5 +- + drivers/staging/comedi/drivers/acl7225b.c | 22 +- + .../comedi/drivers/addi-data/APCI1710_82x54.c | 372 +- + .../comedi/drivers/addi-data/APCI1710_82x54.h | 32 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 402 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.h | 36 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 309 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 1012 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 188 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 204 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 1314 ++-- + .../comedi/drivers/addi-data/APCI1710_Pwm.h | 70 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 230 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.h | 6 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 432 +- + .../comedi/drivers/addi-data/APCI1710_Tor.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 198 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.h | 8 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 119 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 6 +- + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 12 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 191 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 356 +- + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 438 +- + .../comedi/drivers/addi-data/amcc_s5933_58.h | 43 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 169 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 214 +- + .../comedi/drivers/addi-data/hwdrv_apci035.h | 34 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 106 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 532 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.h | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 507 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.h | 52 +- + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 134 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 136 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 176 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.h | 32 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 1055 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.h | 142 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 1701 ++-- + .../comedi/drivers/addi-data/hwdrv_apci3200.h | 176 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 225 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.h | 44 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 274 +- + drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 177 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 22 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 325 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 135 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 648 +- + drivers/staging/comedi/drivers/adq12b.c | 82 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 348 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 122 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 112 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 46 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 44 +- + drivers/staging/comedi/drivers/am9513.h | 16 +- + drivers/staging/comedi/drivers/amcc_s5933.h | 10 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 226 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 138 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 82 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 131 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 306 +- + drivers/staging/comedi/drivers/c6xdigio.c | 140 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 160 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 842 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 1755 ++-- + drivers/staging/comedi/drivers/cb_pcidda.c | 323 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 75 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 187 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 71 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/comedi/drivers/comedi_fc.c | 2 +- + drivers/staging/comedi/drivers/comedi_parport.c | 9 +- + drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 -- + drivers/staging/comedi/drivers/comedi_test.c | 3 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 46 +- + drivers/staging/comedi/drivers/daqboard2000.c | 230 +- + drivers/staging/comedi/drivers/das08.c | 542 +- + drivers/staging/comedi/drivers/das08.h | 24 +- + drivers/staging/comedi/drivers/das08_cs.c | 65 +- + drivers/staging/comedi/drivers/das16.c | 816 +- + drivers/staging/comedi/drivers/das16m1.c | 152 +- + drivers/staging/comedi/drivers/das1800.c | 689 +- + drivers/staging/comedi/drivers/das6402.c | 47 +- + drivers/staging/comedi/drivers/das800.c | 213 +- + drivers/staging/comedi/drivers/dmm32at.c | 128 +- + drivers/staging/comedi/drivers/dt2801.c | 214 +- + drivers/staging/comedi/drivers/dt2811.c | 92 +- + drivers/staging/comedi/drivers/dt2814.c | 48 +- + drivers/staging/comedi/drivers/dt2815.c | 36 +- + drivers/staging/comedi/drivers/dt2817.c | 27 +- + drivers/staging/comedi/drivers/dt282x.c | 391 +- + drivers/staging/comedi/drivers/dt3000.c | 220 +- + drivers/staging/comedi/drivers/fl512.c | 42 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 234 +- + drivers/staging/comedi/drivers/icp_multi.c | 15 +- + drivers/staging/comedi/drivers/icp_multi.h | 12 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 83 +- + drivers/staging/comedi/drivers/jr3_pci.c | 211 +- + drivers/staging/comedi/drivers/jr3_pci.h | 8 +- + drivers/staging/comedi/drivers/ke_counter.c | 47 +- + drivers/staging/comedi/drivers/me4000.c | 9 +- + drivers/staging/comedi/drivers/me_daq.c | 1 + + drivers/staging/comedi/drivers/mite.c | 28 +- + drivers/staging/comedi/drivers/mite.h | 2 +- + drivers/staging/comedi/drivers/mpc624.c | 218 +- + drivers/staging/comedi/drivers/mpc8260cpm.c | 32 +- + drivers/staging/comedi/drivers/multiq3.c | 43 +- + drivers/staging/comedi/drivers/ni_6527.c | 73 +- + drivers/staging/comedi/drivers/ni_65xx.c | 251 +- + drivers/staging/comedi/drivers/ni_660x.c | 232 +- + drivers/staging/comedi/drivers/ni_670x.c | 84 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 275 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 90 +- + drivers/staging/comedi/drivers/ni_atmio.c | 327 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 117 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 113 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 110 +- + drivers/staging/comedi/drivers/ni_labpc.c | 693 +- + drivers/staging/comedi/drivers/ni_labpc.h | 50 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 105 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 970 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 256 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 188 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 139 +- + drivers/staging/comedi/drivers/ni_stc.h | 148 +- + drivers/staging/comedi/drivers/ni_tio.c | 18 +- + drivers/staging/comedi/drivers/ni_tio.h | 18 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 40 +- + drivers/staging/comedi/drivers/pcl711.c | 68 +- + drivers/staging/comedi/drivers/pcl724.c | 54 +- + drivers/staging/comedi/drivers/pcl725.c | 24 +- + drivers/staging/comedi/drivers/pcl726.c | 72 +- + drivers/staging/comedi/drivers/pcl730.c | 34 +- + drivers/staging/comedi/drivers/pcl812.c | 320 +- + drivers/staging/comedi/drivers/pcl816.c | 417 +- + drivers/staging/comedi/drivers/pcl818.c | 578 +- + drivers/staging/comedi/drivers/pcm3724.c | 67 +- + drivers/staging/comedi/drivers/pcm3730.c | 28 +- + drivers/staging/comedi/drivers/pcm_common.c | 111 + + drivers/staging/comedi/drivers/pcm_common.h | 8 + + drivers/staging/comedi/drivers/pcmad.c | 42 +- + drivers/staging/comedi/drivers/pcmda12.c | 45 +- + drivers/staging/comedi/drivers/pcmmio.c | 268 +- + drivers/staging/comedi/drivers/pcmuio.c | 241 +- + drivers/staging/comedi/drivers/plx9080.h | 8 +- + drivers/staging/comedi/drivers/poc.c | 104 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 79 +- + drivers/staging/comedi/drivers/rtd520.c | 78 +- + drivers/staging/comedi/drivers/rti800.c | 77 +- + drivers/staging/comedi/drivers/rti802.c | 24 +- + drivers/staging/comedi/drivers/s526.c | 386 +- + drivers/staging/comedi/drivers/s626.c | 282 +- + drivers/staging/comedi/drivers/s626.h | 2 +- + drivers/staging/comedi/drivers/serial2002.c | 100 +- + drivers/staging/comedi/drivers/skel.c | 90 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 49 +- + drivers/staging/comedi/drivers/unioxx5.c | 86 +- + drivers/staging/comedi/drivers/usbdux.c | 181 +- + drivers/staging/comedi/drivers/usbduxfast.c | 213 +- + drivers/staging/comedi/drivers/vmk80xx.c | 1399 +++ + drivers/staging/comedi/interrupt.h | 51 - + drivers/staging/comedi/kcomedilib/data.c | 5 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 33 +- + drivers/staging/comedi/kcomedilib/ksyms.c | 49 +- + drivers/staging/comedi/range.c | 9 +- + drivers/staging/comedi/rt.c | 411 - + drivers/staging/comedi/rt_pend_tq.c | 113 - + drivers/staging/comedi/rt_pend_tq.h | 10 - + drivers/staging/cpc-usb/Kconfig | 4 + + drivers/staging/cpc-usb/Makefile | 3 + + drivers/staging/{serqt_usb => cpc-usb}/TODO | 5 +- + drivers/staging/cpc-usb/cpc-usb_drv.c | 1185 ++ + drivers/staging/cpc-usb/cpc.h | 440 + + drivers/staging/cpc-usb/cpc_int.h | 83 + + drivers/staging/cpc-usb/cpcusb.h | 86 + + drivers/staging/cpc-usb/sja2m16c.h | 41 + + drivers/staging/cpc-usb/sja2m16c_2.c | 452 + + drivers/staging/echo/echo.c | 2 +- + drivers/staging/epl/EplSdoUdpu.c | 3 +- + drivers/staging/epl/ShbIpc-LinuxKernel.c | 8 +- + drivers/staging/frontier/alphatrack.c | 1 - + drivers/staging/frontier/tranzport.c | 1 - + drivers/staging/go7007/wis-sony-tuner.c | 2 +- + drivers/staging/heci/heci.h | 1 - + drivers/staging/heci/heci_data_structures.h | 1 - + drivers/staging/heci/heci_init.c | 14 +- + drivers/staging/heci/heci_interface.c | 17 +- + drivers/staging/heci/heci_interface.h | 2 +- + drivers/staging/heci/heci_main.c | 50 +- + drivers/staging/heci/interrupt.c | 28 +- + drivers/staging/heci/io_heci.c | 47 +- + drivers/staging/meilhaus/me0600_ext_irq.c | 5 - + drivers/staging/meilhaus/me0900_di.c | 1 - + drivers/staging/meilhaus/me1400_device.c | 1 - + drivers/staging/meilhaus/me1400_ext_irq.c | 5 - + drivers/staging/meilhaus/me4600_ai.c | 4 - + drivers/staging/meilhaus/me4600_ai.h | 1 - + drivers/staging/meilhaus/me4600_ao.c | 6 +- + drivers/staging/meilhaus/me4600_ext_irq.c | 5 - + drivers/staging/meilhaus/me6000_ao.c | 4 - + drivers/staging/meilhaus/me6000_ao.h | 1 - + drivers/staging/meilhaus/me8100_di.c | 5 - + drivers/staging/meilhaus/me8200_di.c | 9 - + drivers/staging/meilhaus/me8200_do.c | 5 - + drivers/staging/meilhaus/memain.c | 184 +- + drivers/staging/meilhaus/memain.h | 194 - + drivers/staging/otus/80211core/ccmd.c | 2982 +++--- + drivers/staging/otus/80211core/coid.c | 2 +- + drivers/staging/p9auth/p9auth.c | 24 +- + drivers/staging/pata_rdc/Kconfig | 6 + + drivers/staging/pata_rdc/Makefile | 2 + + drivers/staging/pata_rdc/pata_rdc.c | 955 ++ + drivers/staging/pata_rdc/pata_rdc.h | 144 + + drivers/staging/pohmelfs/crypto.c | 3 +- + drivers/staging/pohmelfs/dir.c | 9 +- + drivers/staging/pohmelfs/inode.c | 15 +- + drivers/staging/pohmelfs/net.c | 7 +- + drivers/staging/pohmelfs/netfs.h | 65 +- + drivers/staging/pohmelfs/trans.c | 7 +- + drivers/staging/rspiusb/rspiusb.c | 559 +- + drivers/staging/rspiusb/rspiusb.h | 28 +- + drivers/staging/rt2860/2860_main_dev.c | 41 +- + drivers/staging/rt2860/Makefile | 5 +- + drivers/staging/rt2860/ap.h | 40 +- + drivers/staging/rt2860/chlist.h | 56 +- + drivers/staging/rt2860/common/2860_rtmp_init.c | 25 - + drivers/staging/rt2860/common/action.c | 444 +- + drivers/staging/rt2860/common/action.h | 7 - + drivers/staging/rt2860/common/ba_action.c | 179 +- + drivers/staging/rt2860/common/cmm_data.c | 647 +- + drivers/staging/rt2860/common/cmm_data_2860.c | 105 +- + drivers/staging/rt2860/common/cmm_info.c | 273 +- + drivers/staging/rt2860/common/cmm_sanity.c | 401 +- + drivers/staging/rt2860/common/cmm_sync.c | 113 +- + drivers/staging/rt2860/common/cmm_wpa.c | 28 +- + drivers/staging/rt2860/common/dfs.c | 21 - + drivers/staging/rt2860/common/eeprom.c | 1268 ++- + drivers/staging/rt2860/common/md5.c | 12 - + drivers/staging/rt2860/common/mlme.c | 1890 ++-- + drivers/staging/rt2860/common/netif_block.c | 144 - + drivers/staging/rt2860/common/netif_block.h | 58 - + drivers/staging/rt2860/common/rtmp_init.c | 1253 ++- + drivers/staging/rt2860/common/rtmp_tkip.c | 21 - + drivers/staging/rt2860/common/rtmp_wep.c | 2 - + drivers/staging/rt2860/common/spectrum.c | 57 +- + drivers/staging/rt2860/leap.h | 215 - + drivers/staging/rt2860/mlme.h | 309 - + drivers/staging/rt2860/oid.h | 173 +- + drivers/staging/rt2860/rt28xx.h | 1218 +-- + drivers/staging/rt2860/rt_ate.c | 6009 ---------- + drivers/staging/rt2860/rt_ate.h | 347 - + drivers/staging/rt2860/rt_config.h | 33 +- + drivers/staging/rt2860/rt_linux.c | 45 +- + drivers/staging/rt2860/rt_linux.h | 188 +- + drivers/staging/rt2860/rt_main_dev.c | 717 +- + drivers/staging/rt2860/rt_profile.c | 161 +- + drivers/staging/rt2860/rtmp.h | 1831 ++-- + drivers/staging/rt2860/rtmp_def.h | 210 +- + drivers/staging/rt2860/spectrum.h | 30 - + drivers/staging/rt2860/sta/assoc.c | 586 +- + drivers/staging/rt2860/sta/auth.c | 14 - + drivers/staging/rt2860/sta/auth_rsp.c | 19 - + drivers/staging/rt2860/sta/connect.c | 602 +- + drivers/staging/rt2860/sta/dls.c | 2197 ---- + drivers/staging/rt2860/sta/rtmp_data.c | 336 +- + drivers/staging/rt2860/sta/sanity.c | 2 - + drivers/staging/rt2860/sta/sync.c | 290 +- + drivers/staging/rt2860/sta/wpa.c | 12 +- + drivers/staging/rt2860/sta_ioctl.c | 1236 +-- + drivers/staging/rt2860/wpa.h | 31 +- + drivers/staging/rt2870/2870_main_dev.c | 264 +- + drivers/staging/rt2870/Makefile | 4 - + drivers/staging/rt2870/aironet.h | 211 +- + drivers/staging/rt2870/ap.h | 563 +- + drivers/staging/rt2870/chlist.h | 1297 +-- + drivers/staging/rt2870/common/2870_rtmp_init.c | 123 +- + drivers/staging/rt2870/common/action.c | 1047 +-- + drivers/staging/rt2870/common/action.h | 69 +- + drivers/staging/rt2870/common/ba_action.c | 1799 +--- + drivers/staging/rt2870/common/cmm_data.c | 2732 +----- + drivers/staging/rt2870/common/cmm_data_2870.c | 73 +- + drivers/staging/rt2870/common/cmm_info.c | 3713 +------ + drivers/staging/rt2870/common/cmm_sanity.c | 1664 +--- + drivers/staging/rt2870/common/cmm_sync.c | 712 +-- + drivers/staging/rt2870/common/cmm_wpa.c | 1655 +--- + drivers/staging/rt2870/common/dfs.c | 454 +- + drivers/staging/rt2870/common/eeprom.c | 255 +- + drivers/staging/rt2870/common/md5.c | 1428 +--- + drivers/staging/rt2870/common/mlme.c | 8610 +-------------- + drivers/staging/rt2870/common/netif_block.c | 144 - + drivers/staging/rt2870/common/rtmp_init.c | 4133 +------- + drivers/staging/rt2870/common/rtmp_tkip.c | 1614 +--- + drivers/staging/rt2870/common/rtmp_wep.c | 509 +- + drivers/staging/rt2870/common/rtusb_bulk.c | 775 +-- + drivers/staging/rt2870/common/rtusb_data.c | 13 - + drivers/staging/rt2870/common/rtusb_io.c | 211 +- + drivers/staging/rt2870/common/spectrum.c | 1877 +--- + drivers/staging/rt2870/dfs.h | 101 +- + drivers/staging/rt2870/leap.h | 215 - + drivers/staging/rt2870/link_list.h | 135 +- + drivers/staging/rt2870/md5.h | 108 +- + drivers/staging/rt2870/mlme.h | 1472 +--- + drivers/staging/rt2870/netif_block.h | 58 - + drivers/staging/rt2870/oid.h | 1092 +-- + drivers/staging/rt2870/rt2870.h | 252 +- + drivers/staging/rt2870/rt28xx.h | 2690 +----- + drivers/staging/rt2870/rt_ate.c | 6452 ---------- + drivers/staging/rt2870/rt_ate.h | 315 - + drivers/staging/rt2870/rt_config.h | 105 +- + drivers/staging/rt2870/rt_linux.c | 1096 +-- + drivers/staging/rt2870/rt_linux.h | 907 +-- + drivers/staging/rt2870/rt_main_dev.c | 1866 +--- + drivers/staging/rt2870/rt_profile.c | 2021 +---- + drivers/staging/rt2870/rtmp.h | 7587 +------------ + drivers/staging/rt2870/rtmp_ckipmic.h | 114 +- + drivers/staging/rt2870/rtmp_def.h | 1623 +--- + drivers/staging/rt2870/rtmp_type.h | 95 +- + drivers/staging/rt2870/spectrum.h | 323 +- + drivers/staging/rt2870/spectrum_def.h | 96 +- + drivers/staging/rt2870/sta/aironet.c | 1313 +-- + drivers/staging/rt2870/sta/assoc.c | 2040 +---- + drivers/staging/rt2870/sta/auth.c | 475 +- + drivers/staging/rt2870/sta/auth_rsp.c | 167 +- + drivers/staging/rt2870/sta/connect.c | 2823 +----- + drivers/staging/rt2870/sta/dls.c | 2210 ---- + drivers/staging/rt2870/sta/rtmp_data.c | 2620 +---- + drivers/staging/rt2870/sta/sanity.c | 421 +- + drivers/staging/rt2870/sta/sync.c | 1754 +--- + drivers/staging/rt2870/sta/wpa.c | 2108 +---- + drivers/staging/rt2870/sta_ioctl.c | 7069 +----------- + drivers/staging/rt2870/sta_ioctl.c.patch | 18 - + drivers/staging/rt2870/tmp60 | 7037 ----------- + drivers/staging/rt2870/tmp61 | 7037 ----------- + drivers/staging/rt2870/wpa.h | 358 +- + drivers/staging/rt3070/2870_main_dev.c | 1628 +--- + drivers/staging/rt3070/Makefile | 4 - + drivers/staging/rt3070/action.h | 69 +- + drivers/staging/rt3070/aironet.h | 211 +- + drivers/staging/rt3070/ap.h | 558 +- + drivers/staging/rt3070/chlist.h | 1254 +-- + drivers/staging/rt3070/common/2870_rtmp_init.c | 1763 +--- + drivers/staging/rt3070/common/action.c | 1039 +-- + drivers/staging/rt3070/common/ba_action.c | 1811 +--- + drivers/staging/rt3070/common/cmm_data.c | 2828 +----- + drivers/staging/rt3070/common/cmm_data_2870.c | 981 +-- + drivers/staging/rt3070/common/cmm_info.c | 3396 +------ + drivers/staging/rt3070/common/cmm_sanity.c | 1670 +--- + drivers/staging/rt3070/common/cmm_sync.c | 712 +-- + drivers/staging/rt3070/common/cmm_wpa.c | 1607 +--- + drivers/staging/rt3070/common/dfs.c | 442 +- + drivers/staging/rt3070/common/eeprom.c | 1499 +--- + drivers/staging/rt3070/common/md5.c | 1428 +--- + drivers/staging/rt3070/common/mlme.c | 9137 +-------------- + drivers/staging/rt3070/common/netif_block.c | 136 - + drivers/staging/rt3070/common/rtmp_init.c | 4198 +------- + drivers/staging/rt3070/common/rtmp_tkip.c | 1614 +--- + drivers/staging/rt3070/common/rtmp_wep.c | 509 +- + drivers/staging/rt3070/common/rtusb_bulk.c | 1383 +--- + drivers/staging/rt3070/common/rtusb_data.c | 219 +- + drivers/staging/rt3070/common/rtusb_io.c | 1909 +--- + drivers/staging/rt3070/common/spectrum.c | 1877 +--- + drivers/staging/rt3070/dfs.h | 101 +- + drivers/staging/rt3070/leap.h | 215 - + drivers/staging/rt3070/link_list.h | 135 +- + drivers/staging/rt3070/md5.h | 108 +- + drivers/staging/rt3070/mlme.h | 1469 +--- + drivers/staging/rt3070/netif_block.h | 58 - + drivers/staging/rt3070/oid.h | 1143 +-- + drivers/staging/rt3070/rt2870.h | 757 +-- + drivers/staging/rt3070/rt28xx.h | 2726 +----- + drivers/staging/rt3070/rt_ate.c | 6506 ---------- + drivers/staging/rt3070/rt_ate.h | 294 - + drivers/staging/rt3070/rt_config.h | 122 +- + drivers/staging/rt3070/rt_linux.c | 1064 +-- + drivers/staging/rt3070/rt_linux.h | 888 +-- + drivers/staging/rt3070/rt_main_dev.c | 1802 +--- + drivers/staging/rt3070/rt_profile.c | 2042 +---- + drivers/staging/rt3070/rtmp.h | 7729 +------------ + drivers/staging/rt3070/rtmp_ckipmic.h | 114 +- + drivers/staging/rt3070/rtmp_def.h | 1560 +--- + drivers/staging/rt3070/rtmp_type.h | 96 +- + drivers/staging/rt3070/spectrum.h | 323 +- + drivers/staging/rt3070/spectrum_def.h | 96 +- + drivers/staging/rt3070/sta/aironet.c | 1313 +-- + drivers/staging/rt3070/sta/assoc.c | 2061 +---- + drivers/staging/rt3070/sta/auth.c | 476 +- + drivers/staging/rt3070/sta/auth_rsp.c | 168 +- + drivers/staging/rt3070/sta/connect.c | 2857 +----- + drivers/staging/rt3070/sta/dls.c | 2170 ---- + drivers/staging/rt3070/sta/rtmp_data.c | 2638 +----- + drivers/staging/rt3070/sta/sanity.c | 421 +- + drivers/staging/rt3070/sta/sync.c | 1756 +--- + drivers/staging/rt3070/sta/wpa.c | 2100 +---- + drivers/staging/rt3070/sta_ioctl.c | 7204 +----------- + drivers/staging/rt3070/wpa.h | 357 +- + drivers/staging/rtl8187se/Kconfig | 2 +- + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +- + drivers/staging/rtl8187se/r8180_core.c | 25 +- + drivers/staging/rtl8187se/r8180_dm.c | 6 +- + drivers/staging/rtl8187se/r8180_pm.c | 6 +- + drivers/staging/rtl8192su/Kconfig | 6 + + drivers/staging/rtl8192su/Makefile | 66 + + drivers/staging/rtl8192su/authors | 1 + + drivers/staging/rtl8192su/dot11d.h | 102 + + drivers/staging/rtl8192su/ieee80211.h | 2901 +++++ + drivers/staging/rtl8192su/ieee80211/EndianFree.h | 199 + + drivers/staging/rtl8192su/ieee80211/Makefile | 31 + + drivers/staging/rtl8192su/ieee80211/aes.c | 469 + + drivers/staging/rtl8192su/ieee80211/api.c | 246 + + drivers/staging/rtl8192su/ieee80211/arc4.c | 103 + + drivers/staging/rtl8192su/ieee80211/autoload.c | 40 + + drivers/staging/rtl8192su/ieee80211/cipher.c | 299 + + drivers/staging/rtl8192su/ieee80211/compress.c | 64 + + .../staging/rtl8192su/ieee80211/crypto_compat.h | 90 + + drivers/staging/rtl8192su/ieee80211/digest.c | 108 + + drivers/staging/rtl8192su/ieee80211/dot11d.c | 239 + + drivers/staging/rtl8192su/ieee80211/dot11d.h | 102 + + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2901 +++++ + .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 273 + + .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 93 + + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 534 + + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 1034 ++ + .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 397 + + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 394 + + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2832 +++++ + .../rtl8192su/ieee80211/ieee80211_softmac.c | 3580 ++++++ + .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 711 ++ + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 947 ++ + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1032 ++ + drivers/staging/rtl8192su/ieee80211/internal.h | 115 + + drivers/staging/rtl8192su/ieee80211/kmap_types.h | 20 + + drivers/staging/rtl8192su/ieee80211/michael_mic.c | 194 + + drivers/staging/rtl8192su/ieee80211/proc.c | 116 + + drivers/staging/rtl8192su/ieee80211/readme | 162 + + drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h | 69 + + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 781 ++ + drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 517 + + .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2037 ++++ + drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 749 ++ + drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h | 56 + + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 667 ++ + drivers/staging/rtl8192su/ieee80211/rtl_crypto.h | 399 + + drivers/staging/rtl8192su/ieee80211/scatterwalk.c | 126 + + drivers/staging/rtl8192su/ieee80211/scatterwalk.h | 51 + + drivers/staging/rtl8192su/ieee80211_crypt.h | 86 + + drivers/staging/rtl8192su/r8180_93cx6.c | 146 + + drivers/staging/rtl8192su/r8180_93cx6.h | 45 + + drivers/staging/rtl8192su/r8190_rtl8256.c | 312 + + drivers/staging/rtl8192su/r8190_rtl8256.h | 27 + + drivers/staging/rtl8192su/r8192SU_HWImg.c | 4902 ++++++++ + drivers/staging/rtl8192su/r8192SU_HWImg.h | 44 + + drivers/staging/rtl8192su/r8192S_Efuse.c | 2442 ++++ + drivers/staging/rtl8192su/r8192S_Efuse.h | 101 + + drivers/staging/rtl8192su/r8192S_FwImgDTM.h | 3797 ++++++ + drivers/staging/rtl8192su/r8192S_firmware.c | 1023 ++ + drivers/staging/rtl8192su/r8192S_firmware.h | 212 + + drivers/staging/rtl8192su/r8192S_hw.h | 1677 +++ + drivers/staging/rtl8192su/r8192S_phy.c | 5028 ++++++++ + drivers/staging/rtl8192su/r8192S_phy.h | 138 + + drivers/staging/rtl8192su/r8192S_phyreg.h | 1033 ++ + drivers/staging/rtl8192su/r8192S_rtl6052.c | 946 ++ + drivers/staging/rtl8192su/r8192S_rtl6052.h | 134 + + drivers/staging/rtl8192su/r8192S_rtl8225.c | 292 + + drivers/staging/rtl8192su/r8192S_rtl8225.h | 30 + + drivers/staging/rtl8192su/r8192U.h | 2112 ++++ + drivers/staging/rtl8192su/r8192U_core.c |12460 ++++++++++++++++++++ + drivers/staging/rtl8192su/r8192U_dm.c | 4521 +++++++ + drivers/staging/rtl8192su/r8192U_dm.h | 309 + + drivers/staging/rtl8192su/r8192U_hw.h | 746 ++ + drivers/staging/rtl8192su/r8192U_pm.c | 77 + + drivers/staging/rtl8192su/r8192U_pm.h | 27 + + drivers/staging/rtl8192su/r8192U_wx.c | 1350 +++ + drivers/staging/rtl8192su/r8192U_wx.h | 23 + + drivers/staging/rtl8192su/r819xU_HTGen.h | 22 + + drivers/staging/rtl8192su/r819xU_HTType.h | 392 + + drivers/staging/rtl8192su/r819xU_cmdpkt.c | 826 ++ + drivers/staging/rtl8192su/r819xU_cmdpkt.h | 219 + + drivers/staging/rtl8192su/r819xU_firmware.c | 707 ++ + drivers/staging/rtl8192su/r819xU_firmware.h | 106 + + drivers/staging/rtl8192su/r819xU_firmware_img.c | 3447 ++++++ + drivers/staging/rtl8192su/r819xU_firmware_img.h | 35 + + drivers/staging/rtl8192su/r819xU_phy.c | 1826 +++ + drivers/staging/rtl8192su/r819xU_phy.h | 94 + + drivers/staging/rtl8192su/r819xU_phyreg.h | 871 ++ + drivers/staging/serqt_usb/Makefile | 1 - + drivers/staging/serqt_usb/serqt_usb.c | 2656 ----- + drivers/staging/{serqt_usb => serqt_usb2}/Kconfig | 4 +- + drivers/staging/serqt_usb2/Makefile | 1 + + drivers/staging/serqt_usb2/serqt_usb2.c | 1664 +++ + drivers/staging/slicoss/slicoss.c | 3 +- + drivers/staging/stlc45xx/stlc45xx.c | 11 +- + drivers/staging/sxg/sxg.c | 40 +- + drivers/staging/sxg/sxg_ethtool.c | 2 +- + drivers/staging/udlfb/Kconfig | 8 + + drivers/staging/udlfb/Makefile | 1 + + drivers/staging/udlfb/udlfb.c | 937 ++ + drivers/staging/udlfb/udlfb.h | 225 + + drivers/staging/vt6655/80211hdr.h | 357 + + drivers/staging/vt6655/80211mgr.c | 1050 ++ + drivers/staging/vt6655/80211mgr.h | 832 ++ + drivers/staging/vt6655/IEEE11h.c | 324 + + drivers/staging/vt6655/IEEE11h.h | 68 + + drivers/staging/vt6655/Kconfig | 6 + + drivers/staging/vt6655/Makefile | 38 + + drivers/staging/vt6655/Makefile.arm | 181 + + drivers/staging/vt6655/Makefile.x86 | 209 + + drivers/staging/vt6655/aes_ccmp.c | 410 + + drivers/staging/vt6655/aes_ccmp.h | 48 + + drivers/staging/vt6655/baseband.c | 2990 +++++ + drivers/staging/vt6655/baseband.h | 198 + + drivers/staging/vt6655/bssdb.c | 1786 +++ + drivers/staging/vt6655/bssdb.h | 380 + + drivers/staging/vt6655/card.c | 3126 +++++ + drivers/staging/vt6655/card.h | 273 + + drivers/staging/vt6655/country.h | 192 + + drivers/staging/vt6655/datarate.c | 455 + + drivers/staging/vt6655/datarate.h | 95 + + drivers/staging/vt6655/desc.h | 697 ++ + drivers/staging/vt6655/device.h | 1063 ++ + drivers/staging/vt6655/device_cfg.h | 142 + + drivers/staging/vt6655/device_main.c | 4074 +++++++ + drivers/staging/vt6655/dpc.c | 1668 +++ + drivers/staging/vt6655/dpc.h | 75 + + drivers/staging/vt6655/hostap.c | 914 ++ + drivers/staging/vt6655/hostap.h | 94 + + drivers/staging/vt6655/iocmd.h | 481 + + drivers/staging/vt6655/ioctl.c | 775 ++ + drivers/staging/vt6655/ioctl.h | 74 + + drivers/staging/vt6655/iowpa.h | 159 + + drivers/staging/vt6655/iwctl.c | 2397 ++++ + drivers/staging/vt6655/iwctl.h | 332 + + drivers/staging/vt6655/kcompat.h | 84 + + drivers/staging/vt6655/key.c | 836 ++ + drivers/staging/vt6655/key.h | 202 + + drivers/staging/vt6655/mac.c | 1752 +++ + drivers/staging/vt6655/mac.h | 1166 ++ + drivers/staging/vt6655/mib.c | 616 + + drivers/staging/vt6655/mib.h | 399 + + drivers/staging/vt6655/michael.c | 188 + + drivers/staging/vt6655/michael.h | 62 + + drivers/staging/vt6655/power.c | 441 + + drivers/staging/vt6655/power.h | 85 + + drivers/staging/vt6655/rc4.c | 86 + + drivers/staging/vt6655/rc4.h | 51 + + drivers/staging/vt6655/rf.c | 1283 ++ + drivers/staging/vt6655/rf.h | 118 + + drivers/staging/vt6655/rxtx.c | 3269 +++++ + drivers/staging/vt6655/rxtx.h | 132 + + drivers/staging/vt6655/srom.c | 437 + + drivers/staging/vt6655/srom.h | 179 + + drivers/staging/vt6655/tbit.h | 78 + + drivers/staging/vt6655/tcrc.c | 207 + + drivers/staging/vt6655/tcrc.h | 71 + + drivers/staging/vt6655/test | 9 + + drivers/staging/vt6655/tether.c | 123 + + drivers/staging/vt6655/tether.h | 256 + + drivers/staging/vt6655/tkip.c | 284 + + drivers/staging/vt6655/tkip.h | 76 + + drivers/staging/vt6655/tmacro.h | 152 + + drivers/staging/vt6655/tpci.h | 117 + + drivers/staging/vt6655/ttype.h | 386 + + drivers/staging/vt6655/umem.h | 75 + + drivers/staging/vt6655/upc.h | 171 + + drivers/staging/vt6655/vntconfiguration.dat | 1 + + drivers/staging/vt6655/vntwifi.c | 832 ++ + drivers/staging/vt6655/vntwifi.h | 330 + + drivers/staging/vt6655/wcmd.c | 1178 ++ + drivers/staging/vt6655/wcmd.h | 151 + + drivers/staging/vt6655/wctl.c | 261 + + drivers/staging/vt6655/wctl.h | 127 + + drivers/staging/vt6655/wmgr.c | 5088 ++++++++ + drivers/staging/vt6655/wmgr.h | 521 + + drivers/staging/vt6655/wpa.c | 339 + + drivers/staging/vt6655/wpa.h | 98 + + drivers/staging/vt6655/wpa2.c | 373 + + drivers/staging/vt6655/wpa2.h | 100 + + drivers/staging/vt6655/wpactl.c | 1017 ++ + drivers/staging/vt6655/wpactl.h | 89 + + drivers/staging/vt6655/wroute.c | 211 + + drivers/staging/vt6655/wroute.h | 65 + + drivers/staging/winbond/Makefile | 1 - + drivers/staging/winbond/mds.c | 2 +- + drivers/staging/winbond/mto.c | 2 +- + drivers/staging/winbond/phy_calibration.c | 19 + + drivers/staging/winbond/wbhal.c | 568 - + drivers/staging/winbond/wbhal_f.h | 21 - + drivers/staging/winbond/wbhal_s.h | 1 - + drivers/staging/winbond/wbusb.c | 785 +- + drivers/staging/wlan-ng/README | 1 - + drivers/staging/wlan-ng/hfa384x.h | 286 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 323 +- + drivers/staging/wlan-ng/p80211conv.c | 21 +- + drivers/staging/wlan-ng/p80211conv.h | 4 +- + drivers/staging/wlan-ng/p80211hdr.h | 3 - + drivers/staging/wlan-ng/p80211meta.h | 1 - + drivers/staging/wlan-ng/p80211metadef.h | 48 + + drivers/staging/wlan-ng/p80211mgmt.h | 42 +- + drivers/staging/wlan-ng/p80211msg.h | 1 - + drivers/staging/wlan-ng/p80211netdev.c | 99 +- + drivers/staging/wlan-ng/p80211netdev.h | 47 +- + drivers/staging/wlan-ng/p80211req.c | 20 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 7 +- + drivers/staging/wlan-ng/p80211wep.c | 198 +- + drivers/staging/wlan-ng/p80211wext.c | 147 +- + drivers/staging/wlan-ng/prism2fw.c | 1406 +++ + drivers/staging/wlan-ng/prism2mgmt.c | 117 +- + drivers/staging/wlan-ng/prism2mgmt.h | 48 +- + drivers/staging/wlan-ng/prism2mib.c | 159 +- + drivers/staging/wlan-ng/prism2sta.c | 268 +- + drivers/staging/wlan-ng/prism2usb.c | 14 +- + drivers/usb/host/ehci-ps3.c | 4 +- + drivers/usb/host/ohci-ps3.c | 4 +- + drivers/video/Kconfig | 6 +- + drivers/video/xilinxfb.c | 59 +- + drivers/watchdog/mpc5200_wdt.c | 2 +- + fs/anon_inodes.c | 15 + + fs/ext3/resize.c | 2 +- + fs/ext3/super.c | 2 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 10 +- + fs/fat/inode.c | 2 +- + fs/gfs2/Kconfig | 2 +- + fs/notify/inotify/inotify.h | 3 +- + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 32 +- + fs/ocfs2/super.c | 2 +- + fs/xfs/linux-2.6/xfs_linux.h | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/asm-generic/kmap_types.h | 5 +- + include/drm/drmP.h | 52 - + include/drm/drm_edid.h | 92 +- + include/drm/drm_memory_debug.h | 309 - + include/drm/drm_mm.h | 21 +- + include/linux/agp_backend.h | 2 +- + include/linux/amba/pl061.h | 15 + + include/linux/ata.h | 14 + + include/linux/dma-mapping.h | 43 +- + include/linux/ftrace.h | 4 +- + include/linux/gameport.h | 3 +- + include/linux/i2c.h | 72 +- + include/linux/i2c/lm8323.h | 46 + + include/linux/ide.h | 47 +- + include/linux/input.h | 2 + + include/linux/irq.h | 4 +- + include/linux/kernel.h | 2 +- + include/linux/mm.h | 10 +- + include/linux/perf_counter.h | 79 +- + include/linux/rotary_encoder.h | 2 + + include/linux/serio.h | 9 +- + include/linux/spi/ads7846.h | 1 + + include/linux/trace_seq.h | 2 + + include/linux/types.h | 2 +- + include/linux/ucb1400.h | 23 +- + ipc/util.h | 1 + + kernel/exit.c | 7 +- + kernel/irq/manage.c | 2 +- + kernel/perf_counter.c | 312 +- + kernel/sched.c | 5 +- + kernel/sched_cpupri.c | 2 +- + kernel/sched_debug.c | 6 +- + kernel/sched_fair.c | 3 +- + kernel/time/tick-sched.c | 12 +- + kernel/trace/Kconfig | 8 + + kernel/trace/ftrace.c | 7 + + kernel/trace/kmemtrace.c | 2 +- + kernel/trace/ring_buffer.c | 311 +- + kernel/trace/ring_buffer_benchmark.c | 45 +- + kernel/trace/trace.c | 8 +- + kernel/trace/trace_events_filter.c | 37 +- + kernel/trace/trace_functions.c | 8 +- + kernel/trace/trace_functions_graph.c | 36 +- + lib/Kconfig.debug | 2 +- + lib/dma-debug.c | 149 +- + mm/bootmem.c | 14 +- + mm/memory.c | 48 +- + mm/page_alloc.c | 9 +- + samples/trace_events/Makefile | 8 + + samples/trace_events/trace-events-sample.h | 27 +- + scripts/basic/docproc.c | 2 +- + scripts/kallsyms.c | 6 +- + scripts/kernel-doc | 19 + + sound/pci/hda/hda_codec.c | 2 - + sound/pci/hda/patch_realtek.c | 134 +- + sound/pci/lx6464es/lx6464es.c | 2 +- + sound/soc/txx9/txx9aclc.c | 4 +- + sound/usb/caiaq/audio.c | 5 +- + sound/usb/caiaq/device.c | 2 +- + tools/perf/Makefile | 10 +- + tools/perf/builtin-annotate.c | 262 +- + tools/perf/builtin-record.c | 163 +- + tools/perf/builtin-report.c | 439 +- + tools/perf/builtin-stat.c | 308 +- + tools/perf/builtin-top.c | 24 +- + tools/perf/perf.h | 7 + + tools/perf/types.h | 17 + + tools/perf/util/ctype.c | 17 +- + tools/perf/util/parse-events.c | 14 +- + tools/perf/util/string.c | 2 +- + tools/perf/util/string.h | 4 +- + tools/perf/util/symbol.c | 20 +- + tools/perf/util/symbol.h | 16 +- + tools/perf/util/util.h | 18 +- + 1174 files changed, 186591 insertions(+), 247256 deletions(-) + create mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h + create mode 100644 arch/powerpc/boot/dts/kmeter1.dts + create mode 100644 arch/powerpc/boot/dts/xcalibur1501.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5200.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5200_xmon.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5301.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5330.dts + create mode 100644 arch/powerpc/boot/dts/xpedite5370.dts + create mode 100644 arch/powerpc/configs/83xx/kmeter1_defconfig + create mode 100644 arch/powerpc/configs/85xx/xes_mpc85xx_defconfig + rename arch/powerpc/include/asm/{mpc512x.h => mpc5xxx.h} (65%) + create mode 100644 arch/powerpc/kernel/mpc7450-pmu.c + create mode 100644 arch/powerpc/platforms/83xx/kmeter1.c + create mode 100644 arch/powerpc/platforms/85xx/xes_mpc85xx.c + create mode 100644 arch/powerpc/sysdev/mpc5xxx_clocks.c + delete mode 100644 arch/x86/include/asm/therm_throt.h + delete mode 100644 arch/x86/kernel/cpu/mcheck/mce.h + rename arch/x86/kernel/cpu/mcheck/{mce_amd_64.c => mce_amd.c} (100%) + delete mode 100644 arch/x86/kernel/cpu/mcheck/mce_intel_64.c + create mode 100644 drivers/gpio/pl061.c + create mode 100644 drivers/gpu/drm/radeon/r300.h + create mode 100644 drivers/input/keyboard/ep93xx_keypad.c + create mode 100644 drivers/input/keyboard/lm8323.c + create mode 100644 drivers/input/misc/dm355evm_keys.c + create mode 100644 drivers/input/misc/twl4030-pwrbutton.c + create mode 100644 drivers/input/mouse/synaptics_i2c.c + create mode 100644 drivers/input/touchscreen/atmel-wm97xx.c + create mode 100644 drivers/input/touchscreen/eeti_ts.c + create mode 100644 drivers/input/touchscreen/w90p910_ts.c + create mode 100644 drivers/mmc/host/sdhci-s3c.c + create mode 100644 drivers/mmc/host/via-sdmmc.c + rename drivers/spi/{spi_mpc83xx.c => spi_mpc8xxx.c} (55%) + create mode 100644 drivers/staging/android/timed_output.c + create mode 100644 drivers/staging/android/timed_output.h + delete mode 100644 drivers/staging/comedi/comedi_rt.h + delete mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c + create mode 100644 drivers/staging/comedi/drivers/pcm_common.c + create mode 100644 drivers/staging/comedi/drivers/pcm_common.h + create mode 100644 drivers/staging/comedi/drivers/vmk80xx.c + delete mode 100644 drivers/staging/comedi/interrupt.h + delete mode 100644 drivers/staging/comedi/rt.c + delete mode 100644 drivers/staging/comedi/rt_pend_tq.c + delete mode 100644 drivers/staging/comedi/rt_pend_tq.h + create mode 100644 drivers/staging/cpc-usb/Kconfig + create mode 100644 drivers/staging/cpc-usb/Makefile + rename drivers/staging/{serqt_usb => cpc-usb}/TODO (63%) + create mode 100644 drivers/staging/cpc-usb/cpc-usb_drv.c + create mode 100644 drivers/staging/cpc-usb/cpc.h + create mode 100644 drivers/staging/cpc-usb/cpc_int.h + create mode 100644 drivers/staging/cpc-usb/cpcusb.h + create mode 100644 drivers/staging/cpc-usb/sja2m16c.h + create mode 100644 drivers/staging/cpc-usb/sja2m16c_2.c + create mode 100644 drivers/staging/pata_rdc/Kconfig + create mode 100644 drivers/staging/pata_rdc/Makefile + create mode 100644 drivers/staging/pata_rdc/pata_rdc.c + create mode 100644 drivers/staging/pata_rdc/pata_rdc.h + delete mode 100644 drivers/staging/rt2860/common/netif_block.c + delete mode 100644 drivers/staging/rt2860/common/netif_block.h + delete mode 100644 drivers/staging/rt2860/leap.h + delete mode 100644 drivers/staging/rt2860/rt_ate.c + delete mode 100644 drivers/staging/rt2860/rt_ate.h + delete mode 100644 drivers/staging/rt2860/sta/dls.c + delete mode 100644 drivers/staging/rt2870/common/netif_block.c + delete mode 100644 drivers/staging/rt2870/leap.h + delete mode 100644 drivers/staging/rt2870/netif_block.h + delete mode 100644 drivers/staging/rt2870/rt_ate.c + delete mode 100644 drivers/staging/rt2870/rt_ate.h + delete mode 100644 drivers/staging/rt2870/sta/dls.c + delete mode 100644 drivers/staging/rt2870/sta_ioctl.c.patch + delete mode 100644 drivers/staging/rt2870/tmp60 + delete mode 100644 drivers/staging/rt2870/tmp61 + delete mode 100644 drivers/staging/rt3070/common/netif_block.c + delete mode 100644 drivers/staging/rt3070/leap.h + delete mode 100644 drivers/staging/rt3070/netif_block.h + delete mode 100644 drivers/staging/rt3070/rt_ate.c + delete mode 100644 drivers/staging/rt3070/rt_ate.h + delete mode 100644 drivers/staging/rt3070/sta/dls.c + create mode 100644 drivers/staging/rtl8192su/Kconfig + create mode 100644 drivers/staging/rtl8192su/Makefile + create mode 100644 drivers/staging/rtl8192su/authors + create mode 100644 drivers/staging/rtl8192su/dot11d.h + create mode 100644 drivers/staging/rtl8192su/ieee80211.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/EndianFree.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/Makefile + create mode 100644 drivers/staging/rtl8192su/ieee80211/aes.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/api.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/arc4.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/autoload.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/cipher.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/compress.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/crypto_compat.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/digest.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_module.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/internal.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/kmap_types.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/michael_mic.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/proc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/readme + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl_crypto.h + create mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.c + create mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h + create mode 100644 drivers/staging/rtl8192su/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8192su/r8180_93cx6.c + create mode 100644 drivers/staging/rtl8192su/r8180_93cx6.h + create mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c + create mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.h + create mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.c + create mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.h + create mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.c + create mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.h + create mode 100644 drivers/staging/rtl8192su/r8192S_FwImgDTM.h + create mode 100644 drivers/staging/rtl8192su/r8192S_firmware.c + create mode 100644 drivers/staging/rtl8192su/r8192S_firmware.h + create mode 100644 drivers/staging/rtl8192su/r8192S_hw.h + create mode 100644 drivers/staging/rtl8192su/r8192S_phy.c + create mode 100644 drivers/staging/rtl8192su/r8192S_phy.h + create mode 100644 drivers/staging/rtl8192su/r8192S_phyreg.h + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.c + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.h + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.c + create mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.h + create mode 100644 drivers/staging/rtl8192su/r8192U.h + create mode 100644 drivers/staging/rtl8192su/r8192U_core.c + create mode 100644 drivers/staging/rtl8192su/r8192U_dm.c + create mode 100644 drivers/staging/rtl8192su/r8192U_dm.h + create mode 100644 drivers/staging/rtl8192su/r8192U_hw.h + create mode 100644 drivers/staging/rtl8192su/r8192U_pm.c + create mode 100644 drivers/staging/rtl8192su/r8192U_pm.h + create mode 100644 drivers/staging/rtl8192su/r8192U_wx.c + create mode 100644 drivers/staging/rtl8192su/r8192U_wx.h + create mode 100644 drivers/staging/rtl8192su/r819xU_HTGen.h + create mode 100644 drivers/staging/rtl8192su/r819xU_HTType.h + create mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.c + create mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.h + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware.c + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware.h + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.c + create mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.h + create mode 100644 drivers/staging/rtl8192su/r819xU_phy.c + create mode 100644 drivers/staging/rtl8192su/r819xU_phy.h + create mode 100644 drivers/staging/rtl8192su/r819xU_phyreg.h + delete mode 100644 drivers/staging/serqt_usb/Makefile + delete mode 100644 drivers/staging/serqt_usb/serqt_usb.c + rename drivers/staging/{serqt_usb => serqt_usb2}/Kconfig (76%) + create mode 100644 drivers/staging/serqt_usb2/Makefile + create mode 100644 drivers/staging/serqt_usb2/serqt_usb2.c + create mode 100644 drivers/staging/udlfb/Kconfig + create mode 100644 drivers/staging/udlfb/Makefile + create mode 100644 drivers/staging/udlfb/udlfb.c + create mode 100644 drivers/staging/udlfb/udlfb.h + create mode 100644 drivers/staging/vt6655/80211hdr.h + create mode 100644 drivers/staging/vt6655/80211mgr.c + create mode 100644 drivers/staging/vt6655/80211mgr.h + create mode 100644 drivers/staging/vt6655/IEEE11h.c + create mode 100644 drivers/staging/vt6655/IEEE11h.h + create mode 100644 drivers/staging/vt6655/Kconfig + create mode 100644 drivers/staging/vt6655/Makefile + create mode 100644 drivers/staging/vt6655/Makefile.arm + create mode 100644 drivers/staging/vt6655/Makefile.x86 + create mode 100644 drivers/staging/vt6655/aes_ccmp.c + create mode 100644 drivers/staging/vt6655/aes_ccmp.h + create mode 100644 drivers/staging/vt6655/baseband.c + create mode 100644 drivers/staging/vt6655/baseband.h + create mode 100644 drivers/staging/vt6655/bssdb.c + create mode 100644 drivers/staging/vt6655/bssdb.h + create mode 100644 drivers/staging/vt6655/card.c + create mode 100644 drivers/staging/vt6655/card.h + create mode 100644 drivers/staging/vt6655/country.h + create mode 100644 drivers/staging/vt6655/datarate.c + create mode 100644 drivers/staging/vt6655/datarate.h + create mode 100644 drivers/staging/vt6655/desc.h + create mode 100644 drivers/staging/vt6655/device.h + create mode 100644 drivers/staging/vt6655/device_cfg.h + create mode 100644 drivers/staging/vt6655/device_main.c + create mode 100644 drivers/staging/vt6655/dpc.c + create mode 100644 drivers/staging/vt6655/dpc.h + create mode 100644 drivers/staging/vt6655/hostap.c + create mode 100644 drivers/staging/vt6655/hostap.h + create mode 100644 drivers/staging/vt6655/iocmd.h + create mode 100644 drivers/staging/vt6655/ioctl.c + create mode 100644 drivers/staging/vt6655/ioctl.h + create mode 100644 drivers/staging/vt6655/iowpa.h + create mode 100644 drivers/staging/vt6655/iwctl.c + create mode 100644 drivers/staging/vt6655/iwctl.h + create mode 100644 drivers/staging/vt6655/kcompat.h + create mode 100644 drivers/staging/vt6655/key.c + create mode 100644 drivers/staging/vt6655/key.h + create mode 100644 drivers/staging/vt6655/mac.c + create mode 100644 drivers/staging/vt6655/mac.h + create mode 100644 drivers/staging/vt6655/mib.c + create mode 100644 drivers/staging/vt6655/mib.h + create mode 100644 drivers/staging/vt6655/michael.c + create mode 100644 drivers/staging/vt6655/michael.h + create mode 100644 drivers/staging/vt6655/power.c + create mode 100644 drivers/staging/vt6655/power.h + create mode 100644 drivers/staging/vt6655/rc4.c + create mode 100644 drivers/staging/vt6655/rc4.h + create mode 100644 drivers/staging/vt6655/rf.c + create mode 100644 drivers/staging/vt6655/rf.h + create mode 100644 drivers/staging/vt6655/rxtx.c + create mode 100644 drivers/staging/vt6655/rxtx.h + create mode 100644 drivers/staging/vt6655/srom.c + create mode 100644 drivers/staging/vt6655/srom.h + create mode 100644 drivers/staging/vt6655/tbit.h + create mode 100644 drivers/staging/vt6655/tcrc.c + create mode 100644 drivers/staging/vt6655/tcrc.h + create mode 100644 drivers/staging/vt6655/test + create mode 100644 drivers/staging/vt6655/tether.c + create mode 100644 drivers/staging/vt6655/tether.h + create mode 100644 drivers/staging/vt6655/tkip.c + create mode 100644 drivers/staging/vt6655/tkip.h + create mode 100644 drivers/staging/vt6655/tmacro.h + create mode 100644 drivers/staging/vt6655/tpci.h + create mode 100644 drivers/staging/vt6655/ttype.h + create mode 100644 drivers/staging/vt6655/umem.h + create mode 100644 drivers/staging/vt6655/upc.h + create mode 100644 drivers/staging/vt6655/vntconfiguration.dat + create mode 100644 drivers/staging/vt6655/vntwifi.c + create mode 100644 drivers/staging/vt6655/vntwifi.h + create mode 100644 drivers/staging/vt6655/wcmd.c + create mode 100644 drivers/staging/vt6655/wcmd.h + create mode 100644 drivers/staging/vt6655/wctl.c + create mode 100644 drivers/staging/vt6655/wctl.h + create mode 100644 drivers/staging/vt6655/wmgr.c + create mode 100644 drivers/staging/vt6655/wmgr.h + create mode 100644 drivers/staging/vt6655/wpa.c + create mode 100644 drivers/staging/vt6655/wpa.h + create mode 100644 drivers/staging/vt6655/wpa2.c + create mode 100644 drivers/staging/vt6655/wpa2.h + create mode 100644 drivers/staging/vt6655/wpactl.c + create mode 100644 drivers/staging/vt6655/wpactl.h + create mode 100644 drivers/staging/vt6655/wroute.c + create mode 100644 drivers/staging/vt6655/wroute.h + delete mode 100644 drivers/staging/winbond/wbhal.c + create mode 100644 drivers/staging/wlan-ng/prism2fw.c + delete mode 100644 include/drm/drm_memory_debug.h + create mode 100644 include/linux/amba/pl061.h + create mode 100644 include/linux/i2c/lm8323.h + create mode 100644 tools/perf/types.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/net/cnic.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/kernel-parameters.txt | 21 + + MAINTAINERS | 22 + + arch/arm/Kconfig | 6 +- + arch/arm/boot/compressed/head.S | 9 + + arch/arm/common/gic.c | 2 +- + arch/arm/common/vic.c | 8 +- + arch/arm/configs/mini2440_defconfig | 2097 ++++++++++++++++++++++++++++ + arch/arm/include/asm/unistd.h | 2 + + arch/arm/kernel/calls.S | 2 + + arch/arm/kernel/irq.c | 6 +- + arch/arm/kernel/process.c | 19 +- + arch/arm/kernel/unwind.c | 19 +- + arch/arm/kernel/vmlinux.lds.S | 8 + + arch/arm/mach-omap2/clock.c | 2 +- + arch/arm/mach-omap2/clock34xx.c | 42 +- + arch/arm/mach-omap2/io.c | 36 + + arch/arm/mach-omap2/powerdomain.c | 2 +- + arch/arm/mach-omap2/sram34xx.S | 129 ++- + arch/arm/mach-orion5x/addr-map.c | 2 +- + arch/arm/mach-orion5x/common.c | 10 +- + arch/arm/mach-orion5x/common.h | 1 - + arch/arm/mach-pxa/Kconfig | 10 + + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/corgi.c | 6 + + arch/arm/mach-pxa/em-x270.c | 63 +- + arch/arm/mach-pxa/hx4700.c | 41 + + arch/arm/mach-pxa/include/mach/palmz72.h | 5 +- + arch/arm/mach-pxa/include/mach/treo680.h | 49 + + arch/arm/mach-pxa/mioa701.c | 42 + + arch/arm/mach-pxa/palmz72.c | 65 +- + arch/arm/mach-pxa/poodle.c | 6 + + arch/arm/mach-pxa/treo680.c | 612 ++++++++ + arch/arm/mach-realview/realview_pbx.c | 1 + + arch/arm/mach-s3c2410/usb-simtec.c | 1 - + arch/arm/mach-s3c2440/Kconfig | 10 + + arch/arm/mach-s3c2440/Makefile | 1 + + arch/arm/mach-s3c2440/mach-mini2440.c | 703 ++++++++++ + arch/arm/mach-s3c2442/Kconfig | 12 + + arch/arm/mach-s3c2442/Makefile | 2 + + arch/arm/mach-s3c2442/include/mach/gta02.h | 84 ++ + arch/arm/mach-s3c2442/mach-gta02.c | 646 +++++++++ + arch/arm/mm/alignment.c | 139 ++- + arch/arm/mm/mmu.c | 7 + + arch/arm/plat-omap/include/mach/sram.h | 6 +- + arch/arm/plat-omap/sram.c | 8 +- + arch/arm/plat-s3c/Makefile | 1 + + arch/arm/plat-s3c/dev-audio.c | 68 + + arch/arm/plat-s3c/include/plat/devs.h | 5 +- + arch/arm/plat-s3c64xx/Makefile | 1 + + arch/arm/plat-s3c64xx/cpufreq.c | 262 ++++ + arch/arm/tools/mach-types | 39 +- + sound/soc/pxa/corgi.c | 36 - + sound/soc/pxa/poodle.c | 36 - + 53 files changed, 5224 insertions(+), 189 deletions(-) + create mode 100644 arch/arm/configs/mini2440_defconfig + create mode 100644 arch/arm/mach-pxa/include/mach/treo680.h + create mode 100644 arch/arm/mach-pxa/treo680.c + create mode 100644 arch/arm/mach-s3c2440/mach-mini2440.c + create mode 100644 arch/arm/mach-s3c2442/include/mach/gta02.h + create mode 100644 arch/arm/mach-s3c2442/mach-gta02.c + create mode 100644 arch/arm/plat-s3c/dev-audio.c + create mode 100644 arch/arm/plat-s3c64xx/cpufreq.c +Merging davinci/for-next +$ git merge davinci/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Auto-merging arch/cris/arch-v32/kernel/irq.c +Merge made by recursive. + arch/cris/arch-v32/drivers/cryptocop.c | 4 ++-- + arch/cris/arch-v32/kernel/irq.c | 2 +- + arch/cris/arch-v32/lib/Makefile | 2 +- + arch/cris/arch-v32/lib/strcmp.S | 21 +++++++++++++++++++++ + arch/cris/include/arch-v32/arch/spinlock.h | 6 +++--- + arch/cris/include/asm/string.h | 6 ++++++ + 6 files changed, 34 insertions(+), 7 deletions(-) + create mode 100644 arch/cris/arch-v32/lib/strcmp.S +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by recursive. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/checksum_mm.h +Removing arch/m68k/include/asm/checksum_no.h +Removing arch/m68k/include/asm/dma_mm.h +Removing arch/m68k/include/asm/dma_no.h +Removing arch/m68k/include/asm/hardirq_mm.h +Removing arch/m68k/include/asm/hardirq_no.h +Removing arch/m68k/include/asm/irq_mm.h +Removing arch/m68k/include/asm/irq_no.h +Removing arch/m68k/include/asm/processor_mm.h +Removing arch/m68k/include/asm/processor_no.h +Merge made by recursive. + arch/m68k/include/asm/checksum.h | 160 ++++++++- + arch/m68k/include/asm/checksum_mm.h | 148 -------- + arch/m68k/include/asm/checksum_no.h | 132 ------- + arch/m68k/include/asm/dma.h | 492 +++++++++++++++++++++++++- + arch/m68k/include/asm/dma_mm.h | 16 - + arch/m68k/include/asm/dma_no.h | 494 -------------------------- + arch/m68k/include/asm/hardirq.h | 21 +- + arch/m68k/include/asm/hardirq_mm.h | 16 - + arch/m68k/include/asm/hardirq_no.h | 27 -- + arch/m68k/include/asm/irq.h | 135 +++++++- + arch/m68k/include/asm/irq_mm.h | 126 ------- + arch/m68k/include/asm/irq_no.h | 26 -- + arch/m68k/include/asm/m5206sim.h | 22 +- + arch/m68k/include/asm/m520xsim.h | 21 +- + arch/m68k/include/asm/m5249sim.h | 33 +- + arch/m68k/include/asm/m5272sim.h | 5 + + arch/m68k/include/asm/m5307sim.h | 21 +- + arch/m68k/include/asm/m532xsim.h | 44 +-- + arch/m68k/include/asm/m5407sim.h | 18 +- + arch/m68k/include/asm/mcfintc.h | 89 +++++ + arch/m68k/include/asm/mcfsim.h | 93 +----- + arch/m68k/include/asm/processor.h | 171 +++++++++- + arch/m68k/include/asm/processor_mm.h | 130 ------- + arch/m68k/include/asm/processor_no.h | 143 -------- + arch/m68knommu/kernel/irq.c | 21 -- + arch/m68knommu/lib/checksum.c | 9 - + arch/m68knommu/platform/5206/config.c | 56 ++-- + arch/m68knommu/platform/5206e/config.c | 57 ++-- + arch/m68knommu/platform/520x/config.c | 30 -- + arch/m68knommu/platform/523x/config.c | 63 ---- + arch/m68knommu/platform/5249/Makefile | 2 +- + arch/m68knommu/platform/5249/config.c | 49 +-- + arch/m68knommu/platform/5249/intc2.c | 59 +++ + arch/m68knommu/platform/5272/config.c | 29 +-- + arch/m68knommu/platform/527x/config.c | 49 --- + arch/m68knommu/platform/528x/config.c | 51 +--- + arch/m68knommu/platform/5307/config.c | 65 ++--- + arch/m68knommu/platform/532x/config.c | 49 +--- + arch/m68knommu/platform/5407/config.c | 68 ++--- + arch/m68knommu/platform/68328/ints.c | 72 ++-- + arch/m68knommu/platform/68360/ints.c | 44 ++- + arch/m68knommu/platform/coldfire/Makefile | 22 +- + arch/m68knommu/platform/coldfire/intc-2.c | 93 +++++ + arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ + arch/m68knommu/platform/coldfire/intc.c | 153 ++++++++ + arch/m68knommu/platform/coldfire/pit.c | 8 - + arch/m68knommu/platform/coldfire/timers.c | 18 +- + arch/m68knommu/platform/coldfire/vectors.c | 20 +- + 48 files changed, 1704 insertions(+), 2044 deletions(-) + delete mode 100644 arch/m68k/include/asm/checksum_mm.h + delete mode 100644 arch/m68k/include/asm/checksum_no.h + delete mode 100644 arch/m68k/include/asm/dma_mm.h + delete mode 100644 arch/m68k/include/asm/dma_no.h + delete mode 100644 arch/m68k/include/asm/hardirq_mm.h + delete mode 100644 arch/m68k/include/asm/hardirq_no.h + delete mode 100644 arch/m68k/include/asm/irq_mm.h + delete mode 100644 arch/m68k/include/asm/irq_no.h + create mode 100644 arch/m68k/include/asm/mcfintc.h + delete mode 100644 arch/m68k/include/asm/processor_mm.h + delete mode 100644 arch/m68k/include/asm/processor_no.h + create mode 100644 arch/m68knommu/platform/5249/intc2.c + create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c + create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c + create mode 100644 arch/m68knommu/platform/coldfire/intc.c +Merging microblaze/next +$ git merge microblaze/next +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/cavium-octeon/executive/cvmx-helper-errata.c' using previous resolution. +Resolved 'arch/mips/mm/tlbex.c' using previous resolution. +Resolved 'arch/mips/sibyte/swarm/setup.c' using previous resolution. +Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. +Resolved 'drivers/char/hw_random/Makefile' using previous resolution. +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/mips/include/asm/cpu-features.h +Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h +Auto-merging arch/mips/mm/tlbex.c +CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c +Auto-merging arch/mips/sibyte/Kconfig +Auto-merging arch/mips/sibyte/swarm/setup.c +CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c +Auto-merging drivers/char/hw_random/Kconfig +CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig +Auto-merging drivers/char/hw_random/Makefile +CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8bbc1f6] Merge commit 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. +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 +Already up-to-date. +Merging galak/next +$ git merge galak/next +Merge made by recursive. + arch/powerpc/include/asm/cpm1.h | 2 -- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 + + arch/powerpc/platforms/85xx/socrates.c | 6 +++--- + arch/powerpc/sysdev/qe_lib/qe.c | 9 ++++++--- + 4 files changed, 10 insertions(+), 8 deletions(-) +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/debug.h | 9 --- + arch/s390/kernel/time.c | 16 +---- + arch/s390/kernel/vtime.c | 5 +- + drivers/s390/char/con3215.c | 22 +++---- + drivers/s390/char/con3270.c | 13 ++-- + drivers/s390/char/monreader.c | 6 +- + drivers/s390/char/raw3270.c | 36 +--------- + drivers/s390/char/sclp_con.c | 7 +- + drivers/s390/char/sclp_vt220.c | 18 ++---- + drivers/s390/char/tape_core.c | 2 +- + drivers/s390/char/vmlogrdr.c | 4 +- + drivers/s390/char/vmur.c | 2 +- + drivers/s390/cio/qdio.h | 11 +--- + drivers/s390/cio/qdio_debug.c | 3 +- + drivers/s390/cio/qdio_main.c | 135 +++++++++++++++++++++------------------ + drivers/s390/cio/qdio_thinint.c | 114 +++++---------------------------- + drivers/s390/crypto/ap_bus.c | 85 ++++++++++++++++++++++++- + drivers/s390/net/netiucv.c | 4 +- + 18 files changed, 215 insertions(+), 277 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 10 +++++++++- + arch/sh/include/asm/system.h | 1 + + arch/sh/kernel/cpu/sh4a/Makefile | 6 +++--- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 29 +++++++++-------------------- + arch/sh/kernel/idle.c | 23 ++++++++++++++++++++++- + arch/sh/mm/init.c | 4 +--- + 6 files changed, 45 insertions(+), 28 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsfs.c | 148 +++++++++++++++++++++++++------------------------ + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 21 +------ + fs/cifs/dns_resolve.c | 19 +------ + fs/cifs/netmisc.c | 34 ++++++++++- + 5 files changed, 113 insertions(+), 111 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Resolved 'fs/configfs/dir.c' using previous resolution. +Auto-merging fs/configfs/dir.c +CONFLICT (content): Merge conflict in fs/configfs/dir.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cf0b131] Merge commit 'configfs/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging ext4/next +$ git merge ext4/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 gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/lockd/clntproc.c | 4 +- + fs/lockd/mon.c | 19 +- + fs/nfs/Kconfig | 9 + + fs/nfs/callback.c | 218 ++++++-- + fs/nfs/callback.h | 68 ++- + fs/nfs/callback_proc.c | 127 ++++ + fs/nfs/callback_xdr.c | 280 ++++++++- + fs/nfs/client.c | 191 +++++- + fs/nfs/delegation.c | 32 +- + fs/nfs/direct.c | 9 + + fs/nfs/file.c | 37 +- + fs/nfs/internal.h | 70 ++ + fs/nfs/mount_clnt.c | 337 +++++++++-- + fs/nfs/nfs3acl.c | 2 - + fs/nfs/nfs4_fs.h | 37 +- + fs/nfs/nfs4proc.c | 1348 ++++++++++++++++++++++++++++++++++++++-- + fs/nfs/nfs4renewd.c | 6 +- + fs/nfs/nfs4state.c | 190 +++++- + fs/nfs/nfs4xdr.c | 1072 ++++++++++++++++++++++++++++---- + fs/nfs/nfsroot.c | 5 + + fs/nfs/read.c | 33 +- + fs/nfs/super.c | 295 ++++++---- + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 31 +- + include/linux/lockd/lockd.h | 2 +- + include/linux/nfs.h | 5 +- + include/linux/nfs2.h | 7 - + include/linux/nfs3.h | 5 - + include/linux/nfs4.h | 18 + + include/linux/nfs_fs_sb.h | 67 ++- + include/linux/nfs_xdr.h | 171 +++++ + include/linux/nfsd/state.h | 1 - + include/linux/sunrpc/bc_xprt.h | 49 ++ + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 3 + + include/linux/sunrpc/svc.h | 11 + + include/linux/sunrpc/svcsock.h | 2 + + include/linux/sunrpc/xprt.h | 38 ++- + net/sunrpc/Makefile | 1 + + net/sunrpc/backchannel_rqst.c | 281 +++++++++ + net/sunrpc/bc_svc.c | 81 +++ + net/sunrpc/clnt.c | 143 ++++- + net/sunrpc/sched.c | 2 +- + net/sunrpc/stats.c | 8 +- + net/sunrpc/sunrpc.h | 37 ++ + net/sunrpc/svc.c | 134 +++- + net/sunrpc/svcsock.c | 39 ++ + net/sunrpc/xprt.c | 60 ++- + net/sunrpc/xprtsock.c | 217 ++++++- + 49 files changed, 5220 insertions(+), 603 deletions(-) + create mode 100644 include/linux/sunrpc/bc_xprt.h + create mode 100644 net/sunrpc/backchannel_rqst.c + create mode 100644 net/sunrpc/bc_svc.c + create mode 100644 net/sunrpc/sunrpc.h +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/Kconfig +Auto-merging fs/nfs/Kconfig +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/nfsd/state.h +Auto-merging include/linux/sunrpc/svcsock.h +Auto-merging net/sunrpc/svcsock.c +Merge made by recursive. + Documentation/filesystems/00-INDEX | 4 + + fs/Kconfig | 2 + + fs/lockd/svclock.c | 2 + + fs/locks.c | 3 +- + fs/nfs/Kconfig | 2 +- + fs/nfsd/export.c | 13 +- + fs/nfsd/nfs3proc.c | 237 ++++++++++++++++++++++--- + fs/nfsd/nfs3xdr.c | 1 + + fs/nfsd/nfs4callback.c | 247 ++++++++++++++++---------- + fs/nfsd/nfs4proc.c | 129 +++++++++++--- + fs/nfsd/nfs4state.c | 171 ++++++++++-------- + fs/nfsd/nfs4xdr.c | 296 ++++++++++++++----------------- + fs/nfsd/nfscache.c | 33 +++-- + fs/nfsd/nfsctl.c | 294 +++++++++++++++++++------------ + fs/nfsd/nfsfh.c | 6 - + fs/nfsd/nfsproc.c | 198 +++++++++++++++++---- + fs/nfsd/nfssvc.c | 12 +- + fs/nfsd/vfs.c | 93 +++++----- + include/linux/fs.h | 1 + + include/linux/nfsd/cache.h | 3 +- + include/linux/nfsd/nfsfh.h | 7 + + include/linux/nfsd/state.h | 44 +++--- + include/linux/nfsd/xdr4.h | 28 ++-- + include/linux/sunrpc/svc_xprt.h | 7 +- + include/linux/sunrpc/svcsock.h | 7 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/svc_xprt.c | 57 ++++-- + net/sunrpc/svcsock.c | 122 +++++++++---- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 8 +- + 29 files changed, 1329 insertions(+), 700 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Auto-merging fs/nilfs2/cpfile.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nilfs2/the_nilfs.c +Merge made by recursive. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/super.c +Merge made by recursive. + fs/ocfs2/dlmglue.c | 16 +++++++++------- + fs/ocfs2/file.c | 6 +++--- + fs/ocfs2/journal.c | 15 +++++++++++++-- + fs/ocfs2/ocfs2.h | 6 ++++++ + fs/ocfs2/stack_o2cb.c | 11 +++++++++++ + fs/ocfs2/stack_user.c | 8 ++++++++ + fs/ocfs2/stackglue.c | 13 +++++++------ + fs/ocfs2/stackglue.h | 6 ++++++ + fs/ocfs2/suballoc.c | 28 ++++++++++++++++++++++++---- + fs/ocfs2/super.c | 37 +++++++++++++++++++++---------------- + 10 files changed, 108 insertions(+), 38 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'net/9p/protocol.c' using previous resolution. +Auto-merging net/9p/protocol.c +CONFLICT (content): Merge conflict in net/9p/protocol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6d8ddc2] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 +$ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 +Resolved 'fs/reiserfs/super.c' using previous resolution. +Auto-merging fs/reiserfs/dir.c +Auto-merging fs/reiserfs/do_balan.c +Auto-merging fs/reiserfs/super.c +CONFLICT (content): Merge conflict in fs/reiserfs/super.c +Auto-merging fs/reiserfs/xattr.c +Auto-merging include/linux/reiserfs_fs.h +Auto-merging include/linux/reiserfs_fs_sb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 98f4ffb] Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6' +$ git diff -M --stat --summary HEAD^.. + fs/reiserfs/Makefile | 2 +- + fs/reiserfs/bitmap.c | 4 ++ + fs/reiserfs/dir.c | 8 +++ + fs/reiserfs/do_balan.c | 17 ++---- + fs/reiserfs/fix_node.c | 19 ++++++-- + fs/reiserfs/inode.c | 73 ++++++++++++++++++--------- + fs/reiserfs/ioctl.c | 6 ++- + fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ + fs/reiserfs/lock.c | 89 ++++++++++++++++++++++++++++++++ + fs/reiserfs/namei.c | 13 ++++- + fs/reiserfs/prints.c | 4 -- + fs/reiserfs/resize.c | 2 + + fs/reiserfs/stree.c | 53 ++++++++++++++++--- + fs/reiserfs/super.c | 55 +++++++++++++++++--- + fs/reiserfs/xattr.c | 4 +- + include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- + include/linux/reiserfs_fs_sb.h | 20 +++++++ + 17 files changed, 441 insertions(+), 105 deletions(-) + create mode 100644 fs/reiserfs/lock.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/pci/Makefile +Auto-merging drivers/pci/hotplug/ibmphp_core.c +Auto-merging drivers/pci/hotplug/sgi_hotplug.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/setup-res.c +Auto-merging include/linux/pci.h +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-pci | 7 + + Documentation/PCI/pcieaer-howto.txt | 25 + + Documentation/kernel-parameters.txt | 11 +- + arch/powerpc/platforms/pseries/eeh_driver.c | 38 +- + arch/x86/include/asm/pci.h | 1 + + arch/x86/include/asm/pci_x86.h | 2 +- + arch/x86/pci/acpi.c | 35 +- + arch/x86/pci/amd_bus.c | 2 +- + arch/x86/pci/common.c | 4 +- + drivers/acpi/Kconfig | 1 + + drivers/pci/Makefile | 3 +- + drivers/pci/access.c | 19 + + drivers/pci/bus.c | 18 +- + drivers/pci/hotplug/Kconfig | 4 +- + drivers/pci/hotplug/acpiphp_core.c | 1 - + drivers/pci/hotplug/cpci_hotplug_core.c | 1 - + drivers/pci/hotplug/cpqphp.h | 167 +++-- + drivers/pci/hotplug/cpqphp_core.c | 1100 +++++++++++++-------------- + drivers/pci/hotplug/cpqphp_ctrl.c | 371 +++++----- + drivers/pci/hotplug/cpqphp_nvram.c | 97 ++-- + drivers/pci/hotplug/cpqphp_pci.c | 599 ++++++++-------- + drivers/pci/hotplug/ibmphp_core.c | 2 +- + drivers/pci/hotplug/pci_hotplug_core.c | 155 ++-- + drivers/pci/hotplug/pciehp.h | 3 - + drivers/pci/hotplug/pciehp_core.c | 112 +--- + drivers/pci/hotplug/pciehp_hpc.c | 31 - + drivers/pci/hotplug/pcihp_skeleton.c | 1 - + drivers/pci/hotplug/rpaphp_core.c | 1 - + drivers/pci/hotplug/sgi_hotplug.c | 1 - + drivers/pci/hotplug/shpchp_core.c | 1 - + drivers/pci/iov.c | 6 +- + drivers/pci/msi.c | 100 ++-- + drivers/pci/msi.h | 14 +- + drivers/pci/pci.c | 246 ++++--- + drivers/pci/pcie/aer/Kconfig | 15 + + drivers/pci/pcie/aer/Kconfig.debug | 18 + + drivers/pci/pcie/aer/Makefile | 3 + + drivers/pci/pcie/aer/aer_inject.c | 473 ++++++++++++ + drivers/pci/pcie/aer/aerdrv.c | 3 +- + drivers/pci/pcie/aer/aerdrv.h | 6 + + drivers/pci/pcie/aer/aerdrv_core.c | 278 +++++--- + drivers/pci/pcie/aer/ecrc.c | 131 ++++ + drivers/pci/pcie/aspm.c | 787 +++++++++---------- + drivers/pci/probe.c | 11 +- + drivers/pci/quirks.c | 24 + + drivers/pci/remove.c | 2 - + drivers/pci/search.c | 32 +- + drivers/pci/setup-bus.c | 53 +- + drivers/pci/setup-res.c | 49 +- + drivers/pci/slot.c | 39 + + include/linux/ioport.h | 2 + + include/linux/pci-acpi.h | 4 +- + include/linux/pci.h | 35 +- + include/linux/pci_hotplug.h | 23 +- + include/linux/pci_regs.h | 4 +- + 55 files changed, 3004 insertions(+), 2167 deletions(-) + create mode 100644 drivers/pci/pcie/aer/Kconfig.debug + create mode 100644 drivers/pci/pcie/aer/aer_inject.c + create mode 100644 drivers/pci/pcie/aer/ecrc.c +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + include/linux/i2c-id.h | 11 ----------- + include/linux/i2c.h | 2 -- + 2 files changed, 0 insertions(+), 13 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + drivers/hwmon/abituguru3.c | 6 +++--- + drivers/hwmon/hwmon-vid.c | 10 +++++++++- + drivers/hwmon/max6650.c | 1 + + 3 files changed, 13 insertions(+), 4 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + drivers/media/video/cx231xx/cx231xx-avcore.c | 17 ++----- + drivers/media/video/cx231xx/cx231xx-video.c | 26 ++------- + drivers/media/video/cx231xx/cx231xx.h | 3 - + drivers/media/video/cx23885/cx23885-video.c | 11 +--- + drivers/media/video/cx88/cx88-video.c | 11 +--- + drivers/media/video/em28xx/em28xx-video.c | 38 ++++--------- + drivers/media/video/mt9m001.c | 12 +--- + drivers/media/video/mt9t031.c | 14 +---- + drivers/media/video/mt9v022.c | 12 +--- + drivers/media/video/pxa_camera.c | 34 +++--------- + drivers/media/video/saa7134/saa7134-video.c | 11 +--- + drivers/media/video/sh_mobile_ceu_camera.c | 12 +---- + drivers/media/video/v4l2-common.c | 76 +++++++++++++++++++++++++- + drivers/media/video/vivi.c | 11 +--- + drivers/media/video/w9968cf.c | 35 +++++------- + drivers/media/video/zoran/zoran_driver.c | 14 ++---- + include/media/v4l2-common.h | 10 ++++ + 17 files changed, 151 insertions(+), 196 deletions(-) +Merging quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging ide/master +$ git merge ide/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merging drivers/ata/libata-eh.c +Merge made by recursive. + drivers/ata/libata-eh.c | 6 ++++-- + drivers/ata/sata_sil.c | 13 +++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging include/linux/pci_hotplug.h +Auto-merging init/main.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 8 - + Documentation/laptops/thinkpad-acpi.txt | 47 +++- + MAINTAINERS | 8 +- + arch/ia64/kernel/acpi-processor.c | 12 + + arch/x86/include/asm/acpi.h | 1 + + arch/x86/include/asm/pci_x86.h | 3 + + arch/x86/kernel/acpi/boot.c | 80 +------ + arch/x86/kernel/acpi/cstate.c | 16 +- + arch/x86/kernel/acpi/processor.c | 13 + + arch/x86/kernel/reboot.c | 2 +- + arch/x86/pci/mmconfig-shared.c | 65 +++++- + drivers/acpi/ac.c | 20 +- + drivers/acpi/acpica/evevent.c | 13 +- + drivers/acpi/acpica/hwsleep.c | 24 +-- + drivers/acpi/battery.c | 34 +-- + drivers/acpi/bus.c | 91 ++----- + drivers/acpi/glue.c | 40 --- + drivers/acpi/pci_bind.c | 313 +++------------------- + drivers/acpi/pci_irq.c | 17 +- + drivers/acpi/pci_root.c | 297 +++++++++++--------- + drivers/acpi/power.c | 28 +-- + drivers/acpi/processor_core.c | 34 ++- + drivers/acpi/processor_idle.c | 47 ++-- + drivers/acpi/scan.c | 49 ++-- + drivers/acpi/sleep.c | 14 - + drivers/acpi/video.c | 6 +- + drivers/acpi/video_detect.c | 9 +- + drivers/pci/hotplug/acpi_pcihp.c | 40 +--- + drivers/pci/hotplug/acpiphp_glue.c | 27 +-- + drivers/platform/x86/Kconfig | 19 +- + drivers/platform/x86/asus-laptop.c | 111 ++++---- + drivers/platform/x86/asus_acpi.c | 30 +-- + drivers/platform/x86/dell-wmi.c | 56 ++++- + drivers/platform/x86/eeepc-laptop.c | 459 +++++++++++++++++++++++-------- + drivers/platform/x86/hp-wmi.c | 87 ++++--- + drivers/platform/x86/thinkpad_acpi.c | 411 +++++++++++++++++++++++++--- + drivers/pnp/pnpacpi/rsparser.c | 46 +++- + include/acpi/acpi_bus.h | 7 +- + include/acpi/acpi_drivers.h | 13 +- + include/acpi/processor.h | 1 + + include/linux/acpi.h | 6 +- + include/linux/pci_hotplug.h | 1 - + init/main.c | 6 +- + 43 files changed, 1440 insertions(+), 1171 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/Kconfig | 60 +- + drivers/firewire/Makefile | 4 +- + drivers/firewire/core-card.c | 20 +- + drivers/firewire/core-iso.c | 11 +- + drivers/firewire/core.h | 87 --- + drivers/firewire/net.c | 1655 ++++++++++++++++++++++++++++++++++++++++++ + drivers/ieee1394/Kconfig | 19 +- + include/linux/firewire.h | 87 +++ + 8 files changed, 1807 insertions(+), 136 deletions(-) + create mode 100644 drivers/firewire/net.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Removing arch/x86/kvm/kvm_svm.h +Auto-merging arch/x86/kvm/vmx.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 1 - + arch/ia64/kvm/Kconfig | 8 +- + arch/ia64/kvm/kvm-ia64.c | 37 ++-- + arch/ia64/kvm/kvm_lib.c | 6 + + arch/ia64/kvm/vcpu.c | 4 +- + arch/powerpc/include/asm/kvm_host.h | 3 +- + arch/powerpc/kvm/44x.c | 4 +- + arch/powerpc/kvm/Kconfig | 3 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/e500.c | 7 +- + arch/powerpc/kvm/e500_emulate.c | 3 + + arch/powerpc/kvm/e500_tlb.c | 10 +- + arch/powerpc/kvm/e500_tlb.h | 6 +- + arch/powerpc/kvm/emulate.c | 4 +- + arch/powerpc/kvm/powerpc.c | 16 +- + arch/s390/include/asm/kvm_host.h | 9 +- + arch/s390/kvm/Kconfig | 6 +- + arch/s390/kvm/gaccess.h | 23 +- + arch/s390/kvm/intercept.c | 18 +- + arch/s390/kvm/kvm-s390.c | 80 +++---- + arch/s390/kvm/kvm-s390.h | 32 +++- + arch/s390/kvm/sigp.c | 60 +++-- + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 33 ++-- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/vmx.h | 8 + + arch/x86/kvm/Kconfig | 9 +- + arch/x86/kvm/Makefile | 36 ++-- + arch/x86/kvm/i8254.c | 70 ++++--- + arch/x86/kvm/i8254.h | 2 +- + arch/x86/kvm/i8259.c | 28 ++- + arch/x86/kvm/kvm_cache_regs.h | 9 + + arch/x86/kvm/kvm_svm.h | 51 ----- + arch/x86/kvm/kvm_timer.h | 2 +- + arch/x86/kvm/lapic.c | 78 +++++--- + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 325 +++++++++++++++++++--------- + arch/x86/kvm/mmu.h | 4 +- + arch/x86/kvm/paging_tmpl.h | 42 ++-- + arch/x86/kvm/svm-trace.h | 51 +++++ + arch/x86/kvm/svm.c | 206 ++++++++++-------- + arch/x86/kvm/timer.c | 16 +- + arch/x86/kvm/trace-arch.h | 129 +++++++++++ + arch/x86/kvm/trace.h | 144 ++++++++++++ + arch/x86/kvm/vmx-trace.h | 22 ++ + arch/x86/kvm/vmx.c | 409 ++++++++++++++++++++++++++--------- + arch/x86/kvm/x86.c | 398 ++++++++++++++++++++++++++-------- + arch/x86/kvm/x86_emulate.c | 19 ++- + fs/eventfd.c | 10 +- + include/linux/kvm.h | 62 +++++- + include/linux/kvm_host.h | 58 +++++- + include/trace/events/kvm.h | 55 +++++ + virt/kvm/Kconfig | 14 ++ + virt/kvm/coalesced_mmio.c | 44 +++-- + virt/kvm/coalesced_mmio.h | 1 + + virt/kvm/eventfd.c | 216 ++++++++++++++++++ + virt/kvm/ioapic.c | 31 ++- + virt/kvm/iodev.h | 29 ++- + virt/kvm/irq_comm.c | 45 +++- + virt/kvm/kvm_main.c | 155 +++++++++----- + 60 files changed, 2307 insertions(+), 849 deletions(-) + delete mode 100644 arch/x86/kvm/kvm_svm.h + create mode 100644 arch/x86/kvm/svm-trace.h + create mode 100644 arch/x86/kvm/trace-arch.h + create mode 100644 arch/x86/kvm/trace.h + create mode 100644 arch/x86/kvm/vmx-trace.h + create mode 100644 include/trace/events/kvm.h + create mode 100644 virt/kvm/Kconfig + create mode 100644 virt/kvm/eventfd.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/net/cnic.c +Merge made by recursive. + block/bsg.c | 3 - + drivers/net/cnic.c | 4 +- + drivers/net/cnic_if.h | 2 + + drivers/scsi/Kconfig | 13 ++- + drivers/scsi/bnx2i/Kconfig | 2 + + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 90 ++++++++++--- + drivers/scsi/cxgb3i/cxgb3i_ddp.h | 2 + + drivers/scsi/fcoe/fcoe.c | 108 ++++++++-------- + drivers/scsi/fcoe/fcoe.h | 24 ++++ + drivers/scsi/fcoe/libfcoe.c | 94 ++++++++------ + drivers/scsi/hosts.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 36 +++-- + drivers/scsi/ibmvscsi/ibmvfc.h | 1 + + drivers/scsi/ipr.c | 138 +++++++++++++++++--- + drivers/scsi/ipr.h | 10 +- + drivers/scsi/iscsi_tcp.c | 14 ++- + drivers/scsi/libfc/fc_disc.c | 83 +++++------- + drivers/scsi/libfc/fc_exch.c | 58 ++++----- + drivers/scsi/libfc/fc_fcp.c | 97 +++++++------- + drivers/scsi/libfc/fc_lport.c | 156 +++++++++++------------ + drivers/scsi/libfc/fc_rport.c | 120 +++++++---------- + drivers/scsi/libiscsi.c | 161 +++++++++++++++-------- + drivers/scsi/libiscsi_tcp.c | 6 +- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 2 +- + drivers/scsi/qla2xxx/qla_mbx.c | 28 +++-- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_debug.c | 30 ++++- + drivers/scsi/scsi_devinfo.c | 247 +++++++++++++++++++++++++++++++--- + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/scsi_priv.h | 17 +++- + drivers/scsi/scsi_sysfs.c | 17 --- + drivers/scsi/scsi_transport_fc.c | 44 ++++--- + drivers/scsi/scsi_transport_iscsi.c | 1 + + drivers/scsi/scsi_transport_sas.c | 4 +- + drivers/scsi/scsi_transport_spi.c | 51 +++++++- + drivers/scsi/sd.c | 74 ++++++++++- + drivers/scsi/sd.h | 1 + + drivers/scsi/sr.c | 1 + + drivers/scsi/sym53c8xx_2/sym_hipd.c | 5 +- + include/scsi/fc_encode.h | 2 - + include/scsi/libfc.h | 77 +++++++++-- + include/scsi/libiscsi.h | 4 + + include/scsi/scsi_driver.h | 1 + + 45 files changed, 1243 insertions(+), 600 deletions(-) +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 +Resolved 'drivers/platform/x86/eeepc-laptop.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/eeepc-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging net/iucv/af_iucv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f2c9f3f] Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/isdn/00-INDEX | 19 +-- + Documentation/rfkill.txt | 2 + + MAINTAINERS | 2 +- + drivers/net/benet/be.h | 102 ++++++--- + drivers/net/benet/be_cmds.c | 368 +++++++++++++++++++++------- + drivers/net/benet/be_cmds.h | 80 ++++++- + drivers/net/benet/be_hw.h | 8 +- + drivers/net/benet/be_main.c | 299 ++++++++++++++--------- + drivers/net/e1000e/netdev.c | 2 +- + drivers/net/mv643xx_eth.c | 7 +- + drivers/net/qla3xxx.c | 2 + + drivers/net/r8169.c | 3 - + drivers/net/usb/Kconfig | 4 +- + drivers/net/usb/cdc_ether.c | 25 ++ + drivers/net/usb/cdc_subset.c | 7 +- + drivers/net/usb/pegasus.c | 29 ++- + drivers/net/wireless/ath/ath5k/base.c | 11 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/ath9k/pci.c | 18 ++ + drivers/net/wireless/ath/ath9k/recv.c | 7 +- + drivers/net/wireless/iwmc3200wifi/iwm.h | 4 + + drivers/net/wireless/iwmc3200wifi/main.c | 64 +++++- + drivers/net/wireless/iwmc3200wifi/netdev.c | 49 +++-- + drivers/net/wireless/iwmc3200wifi/sdio.c | 11 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 1 + + drivers/platform/x86/acer-wmi.c | 4 +- + drivers/platform/x86/eeepc-laptop.c | 44 +++- + drivers/platform/x86/thinkpad_acpi.c | 14 +- + include/linux/rfkill.h | 33 ++- + include/net/iucv/af_iucv.h | 2 - + net/ieee802154/af_ieee802154.c | 12 +- + net/ipv4/route.c | 14 +- + net/iucv/af_iucv.c | 297 ++++++++++++++--------- + net/rfkill/core.c | 56 +++-- + net/wireless/nl80211.c | 95 ++++++-- + 35 files changed, 1196 insertions(+), 501 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Removing drivers/mtd/maps/pmcmsp-ramroot.c +Auto-merging drivers/mtd/mtd_blkdevs.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/davinci_nand.c +Auto-merging drivers/mtd/onenand/omap2.c +Auto-merging fs/compat_ioctl.c +Removing include/mtd/jffs2-user.h +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-mtd | 125 +++++ + Documentation/kernel-parameters.txt | 10 + + MAINTAINERS | 1 - + arch/arm/mach-davinci/include/mach/nand.h | 8 +- + arch/arm/plat-s3c/include/plat/nand.h | 31 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 26 +- + drivers/mtd/chips/jedec_probe.c | 13 + + drivers/mtd/devices/m25p80.c | 4 + + drivers/mtd/maps/Kconfig | 13 +- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/bfin-async-flash.c | 5 + + drivers/mtd/maps/integrator-flash.c | 226 ++++++-- + drivers/mtd/maps/physmap.c | 40 -- + drivers/mtd/maps/physmap_of.c | 199 +++++-- + drivers/mtd/maps/pmcmsp-ramroot.c | 104 ---- + drivers/mtd/maps/pxa2xx-flash.c | 22 - + drivers/mtd/maps/rbtx4939-flash.c | 23 - + drivers/mtd/maps/sa1100-flash.c | 23 - + drivers/mtd/maps/uclinux.c | 16 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/mtd/mtdchar.c | 303 +++++++--- + drivers/mtd/mtdcore.c | 47 ++- + drivers/mtd/mtdpart.c | 20 +- + drivers/mtd/nand/Kconfig | 24 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 11 +- + drivers/mtd/nand/bf5xx_nand.c | 17 +- + drivers/mtd/nand/davinci_nand.c | 342 ++++++++++-- + drivers/mtd/nand/mxc_nand.c | 66 ++- + drivers/mtd/nand/nand_base.c | 3 +- + drivers/mtd/nand/nand_ecc.c | 4 +- + drivers/mtd/nand/omap2.c | 776 ++++++++++++++++++++++++++ + drivers/mtd/nand/orion_nand.c | 23 + + drivers/mtd/nand/plat_nand.c | 19 +- + drivers/mtd/nand/s3c2410.c | 268 ++++++--- + drivers/mtd/nand/txx9ndfmc.c | 16 +- + drivers/mtd/onenand/omap2.c | 4 +- + drivers/mtd/onenand/onenand_base.c | 862 ++++++++++++++++++++++++++--- + drivers/mtd/onenand/onenand_bbt.c | 14 +- + drivers/mtd/onenand/onenand_sim.c | 81 +++- + fs/compat_ioctl.c | 52 -- + fs/jffs2/scan.c | 4 +- + include/linux/mtd/nand.h | 16 + + include/linux/mtd/onenand.h | 24 + + include/linux/mtd/onenand_regs.h | 20 +- + include/linux/mtd/partitions.h | 1 - + include/mtd/Kbuild | 1 - + include/mtd/jffs2-user.h | 34 -- + include/mtd/mtd-abi.h | 15 + + 49 files changed, 3133 insertions(+), 827 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-mtd + delete mode 100644 drivers/mtd/maps/pmcmsp-ramroot.c + create mode 100644 drivers/mtd/nand/omap2.c + delete mode 100644 include/mtd/jffs2-user.h +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/s390/crypto/des_s390.c | 11 ++++++----- + crypto/Kconfig | 2 +- + crypto/internal.h | 7 +------ + crypto/tcrypt.c | 15 ++++++++++++++- + drivers/char/random.c | 14 ++++++++++++++ + include/linux/fips.h | 10 ++++++++++ + 6 files changed, 46 insertions(+), 13 deletions(-) + create mode 100644 include/linux/fips.h +Merging sound/for-next +$ git merge sound/for-next +Already up-to-date. +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/x86/kernel/acpi/cstate.c +Auto-merging init/main.c +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + arch/alpha/include/asm/smp.h | 2 +- + arch/alpha/include/asm/topology.h | 18 - + arch/alpha/kernel/smp.c | 14 +- + arch/arm/include/asm/cacheflush.h | 8 +- + arch/arm/include/asm/mmu_context.h | 7 +- + arch/arm/include/asm/smp.h | 1 - + arch/arm/include/asm/tlbflush.h | 4 +- + arch/arm/kernel/smp.c | 10 +- + arch/arm/mm/context.c | 2 +- + arch/arm/mm/flush.c | 10 +- + arch/frv/include/asm/gdb-stub.h | 1 - + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 3 - + arch/ia64/kernel/smp.c | 2 +- + arch/m32r/include/asm/mmu_context.h | 4 +- + arch/m32r/include/asm/smp.h | 2 +- + arch/m32r/kernel/smp.c | 30 +- + arch/m32r/kernel/smpboot.c | 2 +- + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 2 - + arch/mips/include/asm/mmu_context.h | 10 +- + arch/mips/include/asm/smp-ops.h | 2 +- + arch/mips/include/asm/smp.h | 2 +- + arch/mips/kernel/smp-cmp.c | 9 +- + arch/mips/kernel/smp-mt.c | 4 +- + arch/mips/kernel/smp-up.c | 3 +- + arch/mips/kernel/smp.c | 4 +- + arch/mips/mipssim/sim_smtc.c | 5 +- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/mti-malta/malta-smtc.c | 4 +- + arch/mips/pmc-sierra/yosemite/smp.c | 4 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 4 +- + arch/mips/sibyte/bcm1480/smp.c | 5 +- + arch/mips/sibyte/sb1250/smp.c | 5 +- + arch/mn10300/include/asm/gdb-stub.h | 1 - + arch/mn10300/include/asm/mmu_context.h | 12 +- + arch/parisc/include/asm/smp.h | 1 - + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/topology.h | 12 - + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/topology.h | 1 - + arch/s390/kernel/smp.c | 4 +- + arch/sh/include/asm/smp.h | 1 - + arch/sh/include/asm/topology.h | 1 - + arch/sparc/include/asm/smp_64.h | 1 - + arch/sparc/include/asm/topology_64.h | 16 - + arch/um/include/asm/mmu_context.h | 4 +- + arch/um/kernel/smp.c | 2 +- + arch/x86/include/asm/lguest_hcall.h | 2 +- + arch/x86/include/asm/mmu_context.h | 6 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/acpi/cstate.c | 36 +- + arch/x86/kernel/apic/io_apic.c | 7 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/process.c | 6 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/smpboot.c | 9 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/mm/tlb.c | 15 +- + arch/x86/xen/mmu.c | 4 +- + drivers/acpi/processor_perflib.c | 3 +- + drivers/acpi/processor_throttling.c | 85 ++-- + drivers/firmware/dcdbas.c | 49 +-- + drivers/net/sfc/efx.c | 3 +- + drivers/oprofile/buffer_sync.c | 3 +- + include/asm-generic/topology.h | 17 - + include/linux/cpu.h | 5 - + include/linux/cpumask.h | 709 ++++++++++------------------ + include/linux/interrupt.h | 2 - + include/linux/lguest.h | 2 +- + include/linux/sched.h | 3 + + include/linux/smp.h | 11 - + include/linux/topology.h | 6 - + init/main.c | 6 - + kernel/cpu.c | 11 +- + kernel/module.c | 3 +- + kernel/smp.c | 7 - + kernel/trace/trace.c | 7 +- + mm/quicklist.c | 3 +- + virt/kvm/kvm_main.c | 3 +- + 84 files changed, 482 insertions(+), 809 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging drivers/char/mem.c +Auto-merging fs/nfs/client.c +Auto-merging include/linux/fs.h +Auto-merging kernel/cgroup.c +Removing mm/pdflush.c +Auto-merging mm/vmscan.c +Merge made by recursive. + block/blk-core.c | 1 + + drivers/block/aoe/aoeblk.c | 1 + + drivers/char/mem.c | 1 + + fs/btrfs/disk-io.c | 1 + + fs/buffer.c | 2 +- + fs/char_dev.c | 1 + + fs/configfs/inode.c | 1 + + fs/fs-writeback.c | 812 ++++++++++++++++++++++++++++++++++--------- + fs/fuse/inode.c | 1 + + fs/hugetlbfs/inode.c | 1 + + fs/nfs/client.c | 1 + + fs/ocfs2/dlm/dlmfs.c | 1 + + fs/ramfs/inode.c | 1 + + fs/super.c | 3 - + fs/sysfs/inode.c | 1 + + fs/ubifs/super.c | 1 + + include/linux/backing-dev.h | 71 ++++- + include/linux/fs.h | 11 +- + include/linux/writeback.h | 15 +- + kernel/cgroup.c | 1 + + mm/Makefile | 2 +- + mm/backing-dev.c | 532 ++++++++++++++++++++++++++++- + mm/page-writeback.c | 157 ++------- + mm/pdflush.c | 269 -------------- + mm/swap_state.c | 1 + + mm/vmscan.c | 2 +- + 26 files changed, 1294 insertions(+), 597 deletions(-) + delete mode 100644 mm/pdflush.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging include/linux/Kbuild +Merge made by recursive. + Documentation/device-mapper/dm-log.txt | 54 ++ + Documentation/device-mapper/dm-queue-length.txt | 39 + + Documentation/device-mapper/dm-service-time.txt | 91 ++ + drivers/md/Kconfig | 30 + + drivers/md/Makefile | 5 + + drivers/md/dm-crypt.c | 19 +- + drivers/md/dm-delay.c | 26 +- + drivers/md/dm-exception-store.c | 2 +- + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-io.c | 14 +- + drivers/md/dm-ioctl.c | 27 +- + drivers/md/dm-linear.c | 15 +- + drivers/md/dm-log-userspace-base.c | 696 ++++++++++++++ + drivers/md/dm-log-userspace-transfer.c | 276 ++++++ + drivers/md/dm-log-userspace-transfer.h | 18 + + drivers/md/dm-log.c | 9 +- + drivers/md/dm-mpath.c | 334 +++++--- + drivers/md/dm-path-selector.h | 8 +- + drivers/md/dm-queue-length.c | 263 ++++++ + drivers/md/dm-raid1.c | 17 +- + drivers/md/dm-region-hash.c | 2 +- + drivers/md/dm-round-robin.c | 2 +- + drivers/md/dm-service-time.c | 339 +++++++ + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 11 + + drivers/md/dm-stripe.c | 33 +- + drivers/md/dm-sysfs.c | 9 + + drivers/md/dm-table.c | 465 +++++++--- + drivers/md/dm.c | 1133 ++++++++++++++++++++--- + drivers/md/dm.h | 35 +- + include/linux/Kbuild | 1 + + include/linux/connector.h | 4 +- + include/linux/device-mapper.h | 47 +- + include/linux/dm-ioctl.h | 14 +- + include/linux/dm-log-userspace.h | 386 ++++++++ + 35 files changed, 3993 insertions(+), 435 deletions(-) + create mode 100644 Documentation/device-mapper/dm-log.txt + create mode 100644 Documentation/device-mapper/dm-queue-length.txt + create mode 100644 Documentation/device-mapper/dm-service-time.txt + create mode 100644 drivers/md/dm-log-userspace-base.c + create mode 100644 drivers/md/dm-log-userspace-transfer.c + create mode 100644 drivers/md/dm-log-userspace-transfer.h + create mode 100644 drivers/md/dm-queue-length.c + create mode 100644 drivers/md/dm-service-time.c + create mode 100644 include/linux/dm-log-userspace.h +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/power/Kconfig | 8 + + drivers/power/Makefile | 3 +- + drivers/power/da9030_battery.c | 19 ++- + drivers/power/ds2760_battery.c | 42 ++++- + drivers/power/max17040_battery.c | 309 ++++++++++++++++++++++++++++++++++++++ + drivers/w1/slaves/w1_ds2760.c | 30 ++++ + drivers/w1/slaves/w1_ds2760.h | 7 + + include/linux/max17040_battery.h | 19 +++ + 8 files changed, 420 insertions(+), 17 deletions(-) + create mode 100644 drivers/power/max17040_battery.c + create mode 100644 include/linux/max17040_battery.h +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 11 +----- + drivers/leds/leds-alix2.c | 7 +++- + drivers/leds/leds-bd2802.c | 96 ++++++++++++++++++++++++++++++++++---------- + drivers/leds/leds-gpio.c | 2 +- + include/linux/leds.h | 4 +- + 5 files changed, 86 insertions(+), 34 deletions(-) +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging arch/x86/kernel/kgdb.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 9 +++++++-- + include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ + kernel/kgdb.c | 6 +++--- + 3 files changed, 52 insertions(+), 11 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Resolved 'mm/Makefile' using previous resolution. +Auto-merging include/linux/slab.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fd3e373] Merge commit 'slab/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/vm/slqbinfo.c | 1047 ++++++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 298 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3765 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5182 insertions(+), 16 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 +$ git am -3 ../patches/0001-slqb-fix-for-macro-name-change.patch +Applying: slqb: fix for macro name change +$ git reset HEAD^ +mm/slqb.c: locally modified +$ git add . +$ git commit -v -a --amend +[master 7e783a2] Merge commit 'slab/for-next' +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 +Merge made by recursive. + drivers/regulator/core.c | 62 ++++++++++++++++++++++++++-------- + drivers/regulator/virtual.c | 44 +++++++++++++++--------- + drivers/regulator/wm8350-regulator.c | 2 + + include/linux/regulator/machine.h | 7 +++- + 4 files changed, 84 insertions(+), 31 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + security/selinux/avc.c | 2 +- + security/selinux/include/avc.h | 3 - + security/selinux/ss/services.c | 142 +++++++++++++++++++++++++++++++++------ + security/tomoyo/common.c | 30 +++++++++ + security/tomoyo/common.h | 2 - + security/tomoyo/domain.c | 42 ++---------- + security/tomoyo/tomoyo.c | 10 +-- + security/tomoyo/tomoyo.h | 3 +- + 8 files changed, 159 insertions(+), 75 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merging MAINTAINERS +Auto-merging drivers/char/tty_ldisc.c +Merge made by recursive. + drivers/char/bfin_jtag_comm.c | 30 +++++++++++++++--------------- + drivers/serial/s3c2400.c | 2 +- + drivers/serial/s3c2410.c | 2 +- + drivers/serial/s3c2412.c | 2 +- + drivers/serial/s3c2440.c | 2 +- + drivers/serial/s3c24a0.c | 2 +- + drivers/serial/s3c6400.c | 2 +- + drivers/serial/samsung.c | 2 +- + drivers/serial/samsung.h | 2 +- + 9 files changed, 23 insertions(+), 23 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Merge made by recursive. + drivers/uwb/hwa-rc.c | 2 +- + drivers/uwb/wlp/txrx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + Documentation/watchdog/hpwdt.txt | 19 +- + drivers/mfd/twl4030-core.c | 12 + + drivers/watchdog/Kconfig | 59 ++++- + drivers/watchdog/Makefile | 5 + + drivers/watchdog/bcm47xx_wdt.c | 286 ++++++++++++++++++++ + drivers/watchdog/coh901327_wdt.c | 537 ++++++++++++++++++++++++++++++++++++++ + drivers/watchdog/hpwdt.c | 26 ++- + drivers/watchdog/omap_wdt.c | 7 + + drivers/watchdog/pnx833x_wdt.c | 282 ++++++++++++++++++++ + drivers/watchdog/stmp3xxx_wdt.c | 296 +++++++++++++++++++++ + drivers/watchdog/twl4030_wdt.c | 272 +++++++++++++++++++ + drivers/watchdog/wdt_pci.c | 122 +++++----- + 12 files changed, 1840 insertions(+), 83 deletions(-) + create mode 100644 drivers/watchdog/bcm47xx_wdt.c + create mode 100644 drivers/watchdog/coh901327_wdt.c + create mode 100644 drivers/watchdog/pnx833x_wdt.c + create mode 100644 drivers/watchdog/stmp3xxx_wdt.c + create mode 100644 drivers/watchdog/twl4030_wdt.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Resolved 'drivers/pci/intr_remapping.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/ia64/kernel/pci-dma.c +Auto-merging arch/x86/kernel/pci-dma.c +Auto-merging arch/x86/kernel/pci-swiotlb.c +Auto-merging drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merging drivers/pci/intr_remapping.c +CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c +Auto-merging drivers/pci/iov.c +Auto-merging include/linux/dmar.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_regs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 49a866d] Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 1 + + arch/ia64/include/asm/iommu.h | 5 + + arch/ia64/kernel/pci-dma.c | 2 + + arch/ia64/kernel/pci-swiotlb.c | 2 +- + arch/x86/include/asm/iommu.h | 1 + + arch/x86/kernel/pci-dma.c | 6 + + arch/x86/kernel/pci-swiotlb.c | 3 +- + drivers/pci/dmar.c | 235 +++++++++++++++---- + drivers/pci/intel-iommu.c | 449 +++++++++++++++++++++++------------ + drivers/pci/intr_remapping.c | 8 +- + drivers/pci/iov.c | 155 ++++++++++++- + drivers/pci/pci.h | 39 +++ + include/linux/dma_remapping.h | 9 + + include/linux/dmar.h | 9 + + include/linux/intel-iommu.h | 35 ++- + include/linux/pci.h | 2 + + include/linux/pci_regs.h | 10 + + 17 files changed, 754 insertions(+), 217 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Merge made by recursive. + fs/proc/uptime.c | 34 ++++++++++++++++++++++++---------- + 1 files changed, 24 insertions(+), 10 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 5 +- + drivers/block/Kconfig | 16 ++ + drivers/block/Makefile | 1 + + drivers/block/osdblk.c | 670 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/exofs/common.h | 4 +- + fs/exofs/dir.c | 4 +- + fs/exofs/exofs.h | 7 +- + fs/exofs/file.c | 21 +- + fs/exofs/inode.c | 7 +- + fs/exofs/namei.c | 4 +- + fs/exofs/osd.c | 4 +- + fs/exofs/super.c | 6 +- + fs/exofs/symlink.c | 4 +- + 13 files changed, 719 insertions(+), 34 deletions(-) + create mode 100644 drivers/block/osdblk.c +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Merge made by recursive. + include/linux/capability.h | 2 +- + include/linux/namei.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Already up-to-date. +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 28 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1310 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/mm/fault.c +CONFLICT (content): Merge conflict in arch/x86/mm/fault.c +Auto-merging include/linux/sched.h +Auto-merging kernel/trace/ring_buffer.c +Auto-merging lib/Kconfig.debug +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/mm/fault.c'. +[master 6fe1d05] Merge commit 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 5 + + arch/x86/include/asm/ioctls.h | 95 +------------- + arch/x86/include/asm/ipcbuf.h | 29 +---- + arch/x86/include/asm/mman.h | 14 +-- + arch/x86/include/asm/module.h | 13 +-- + arch/x86/include/asm/msgbuf.h | 40 +------ + arch/x86/include/asm/param.h | 23 +--- + arch/x86/include/asm/scatterlist.h | 27 +---- + arch/x86/include/asm/shmbuf.h | 52 +------- + arch/x86/include/asm/socket.h | 61 +-------- + arch/x86/include/asm/sockios.h | 14 +-- + arch/x86/include/asm/termbits.h | 199 +-------------------------- + arch/x86/include/asm/termios.h | 115 +--------------- + arch/x86/include/asm/types.h | 12 +-- + arch/x86/include/asm/ucontext.h | 8 +- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/mm/fault.c | 2 + + arch/x86/oprofile/nmi_int.c | 101 +++++++------- + arch/x86/oprofile/op_model_amd.c | 267 ++++++++++++++++-------------------- + arch/x86/oprofile/op_model_p4.c | 60 ++++---- + arch/x86/oprofile/op_model_ppro.c | 95 ++++++------- + arch/x86/oprofile/op_x86_model.h | 47 ++++--- + drivers/oprofile/cpu_buffer.c | 16 ++- + drivers/oprofile/oprofile_stats.c | 1 + + include/linux/oprofile.h | 2 +- + include/linux/poison.h | 16 ++- + include/linux/sched.h | 6 + + kernel/futex.c | 51 ++++--- + kernel/irq/manage.c | 2 +- + kernel/sched.c | 54 ++++++- + 30 files changed, 403 insertions(+), 1026 deletions(-) +Merging asm-generic/next +$ git merge asm-generic/next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 8 ++++++++ + include/asm-generic/hardirq.h | 13 ------------- + include/asm-generic/uaccess.h | 14 ++++++++------ + include/asm-generic/unistd.h | 7 ++++++- + lib/checksum.c | 10 +++++++++- + 5 files changed, 31 insertions(+), 21 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging init/main.c +Merge made by recursive. + drivers/base/Kconfig | 25 +++ + drivers/base/Makefile | 1 + + drivers/base/base.h | 6 + + drivers/base/core.c | 3 + + drivers/base/devtmpfs.c | 367 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/base/init.c | 1 + + include/linux/device.h | 10 ++ + include/linux/shmem_fs.h | 3 + + init/do_mounts.c | 2 +- + init/main.c | 2 + + mm/shmem.c | 9 +- + 11 files changed, 422 insertions(+), 7 deletions(-) + create mode 100644 drivers/base/devtmpfs.c +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging quilt/staging +$ git merge quilt/staging +Renaming drivers/staging/serqt_usb/Kconfig->drivers/staging/serqt_usb2/Kconfig +Auto-merging drivers/staging/serqt_usb2/Kconfig +Renaming drivers/staging/serqt_usb/TODO->drivers/staging/cpc-usb/TODO +Auto-merging drivers/staging/cpc-usb/TODO +Auto-merging MAINTAINERS +Auto-merging drivers/staging/comedi/comedidev.h +Merge made by recursive. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-fbdev-work-around-old-compiler-bug.patch +Applying: fbdev: work around old compiler bug diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..cc63546ed3c3 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,617 @@ +Importing driver-core.current based on 2.6.30-git14 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current 0732f87761dbe417cb6e084b712d07e879e876ef +Importing usb.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 0732f87761dbe417cb6e084b712d07e879e876ef +Importing i2c based on 2.6.30-git17 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard c277331d5fbaae5772ed19862feefa91f4e477d3 +HEAD is now at c277331 mm: page_alloc: clear PG_locked before checking flags on free +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-drop-i2c_driver-id.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + b868bcb...633acf86 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.30-git17 +$ cd ../quilt-tmp +$ git reset --hard c277331d5fbaae5772ed19862feefa91f4e477d3 +HEAD is now at c277331 mm: page_alloc: clear PG_locked before checking flags on free +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-max6650-fix-lock-imbalance.patch +hwmon-vid-limit-AMD-0Fh-6-bit-VID.patch +hwmon-abituguru3-dmi-probing-for-ab9-ab9-quadqt-and-ix38-quadgt.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 8f31872...aabf938 master -> quilt/jdelvare-hwmon (forced update) +Unchanged quilt series kernel-doc +Importing rr based on v2.6.30-7734-gc277331 +$ cd ../quilt-tmp +$ git reset --hard c277331d5fbaae5772ed19862feefa91f4e477d3 +HEAD is now at c277331 mm: page_alloc: clear PG_locked before checking flags on free +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +module:use_symbol_prefix_with_layout.patch +cpumask:use_zalloc_cpumask_var_where_possible.patch +cpumask:remove-pcibus_to_cpumask-alpha.patch +cpumask:remove-pcibus_to_cpumask-mips.patch +cpumask:remove-pcibus_to_cpumask-powerpc.patch +cpumask:remove-node_to_cpumask.patch +cpumask:remove-CPU_MASK_ALL_PTR.patch +cpumask:remove-address-of-CPU_MASK_ALL-mips.patch +cpumask:remove-cpu_mask_all.patch +cpumask:remove-last-remaining-irqaction-mask.patch +cpumask:irqaction-remove-mask.patch +cpumask:remove_mask_field_from_comments.patch +cpumask:remove-set_cpus_allowed.patch +cpumask:ia64-smp_call_function_many.patch +cpumask:remove-smp_call_function_mask.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-sparc.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-s390.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-powerpc.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-ia64.patch +cpumask:arch_send_call_function_ipi_mask-alpha.patch +cpumask:arch_send_call_function_ipi_mask-m32r.patch +cpumask:arch_send_call_function_ipi_mask-mips.patch +cpumask:arch_send_call_function_ipi_mask-powerpc.patch +cpumask:arch_send_call_function_ipi_mask-s390.patch +cpumask:remove-arch_send_call_function_ipi.patch +cpumask:use-cpumap-accessors-m32r.patch +cpumask:use-cpumap-accessors-mips.patch +cpumask:use-cpumap-accessors-powerpc.patch +cpumask:use-cpumap-accessors-um.patch +cpumask:use-mm_cpumask-arm.patch +cpumask:use-mm_cpumask-m32r.patch +cpumask:use-mm_cpumask-mn10300.patch +cpumask:use-mm_cpumask-mips.patch +cpumask:use-mm_cpumask-um.patch +cpumask:use-mm_cpumask-x86.patch +cpumask:mm_quicklist-new-cpumask-ops.patch +cpumask:remove-unused-deprecated-functions.patch +cpumask:move-obsolete-functions-to-end-of-header.patch +lguest:fix_journey.patch +arch-x86-kernel-acpi-cstatec-avoid-using-work_on_cpu.patch +misc:work_on_cpu-acpi.patch +misc:work_on_cpu-dcdbas.patch +misc:remove-start_kernel-prototypes.patch +misc:cpuhotplug_remove_cpu_hotplug_init.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 1edd54f...7ad613e master -> quilt/rr (forced update) +Importing device-mapper based on block/for-next +$ cd ../quilt-tmp +$ git reset --hard b363ab2e6f0dfdc81647e22be9976da2759c3dff +HEAD is now at b363ab2 Merge branch 'for-linus' into for-next +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-mpath-validate-table-argument-count.patch +dm-mpath-validate-hw_handler-argument-count.patch +dm-sysfs-skip-output-when-device-is-being-destroyed.patch +dm-mpath-change-attached-scsi_dh.patch +dm-mpath-call-activate-fn-for-each-path-in-pg_init.patch +dm-raid1-keep-retrying-alloc-if-mempool_alloc-failed.patch +dm-mpath-flush-keventd-queue-in-destructor.patch +dm-avoid-unsupported-spanning-of-md-stripe-boundaries.patch +dm-use-i_size_read.patch +dm-exception-store-fix-exstore-lookup-to-be-case-insensitive.patch +dm-rename-suspended_bdev-to-bdev.patch +dm-always-hold-bdev-reference.patch +dm-make-dm_flush-return-void.patch +dm-process-requeue-in-dm_wq_work.patch +dm-store-only-first-barrier-error.patch +dm-remove-EOPNOTSUPP-for-barriers.patch +dm-remove-check-that-prevents-mapping-empty-bios.patch +dm-introduce-num_flush_requests.patch +dm-initialise-tio-in-alloc_tio.patch +dm-send-empty-barriers-to-targets-in-dm_flush.patch +dm-linear-support-flush.patch +dm-stripe-support-flush.patch +dm-crypt-support-flush.patch +dm-delay-support-barriers.patch +dm-mpath-support-barriers.patch +dm-snapshot-support-barriers.patch +dm-io-record-eopnotsupp.patch +dm-io-retry-after-barrier-error.patch +dm-snapshot-use-barrier-when-writing-exception-store.patch +dm-mpath-add-start_io-and-nr_bytes-to-path-selectors.patch +dm-mpath-add-queue-length-load-balancer.patch +dm-mpath-add-service-time-load-balancer.patch +dm-table-improve-warning-message-when-devices-not-freed-before-destruction.patch +dm-sysfs-add-suspended-attribute.patch +dm-ioctl-support-cookies-for-udev.patch +dm-table-ensure-targets-are-aligned-to-logical_block_size.patch +dm-table-validate-device-logical_block_size.patch +dm-table-replace-struct-io_restrictions-with-struct-queue_limits.patch +dm-table-establish-queue-limits-by-copying-table-limits.patch +dm-targets-introduce-iterate-devices-fn.patch +dm-log-fix-create_log_context-to-use-logical_block_size-of-log-device.patch +dm-calculate-queue-limits-during-resume-not-load.patch +dm-raid1-add-userspace-log.patch +dm-prepare-for-request-based-option.patch +dm-enable-request-based-option.patch +dm-do-not-set-QUEUE_ORDERED_DRAIN-if-request-based.patch +dm-disable-interrupt-when-taking-map_lock.patch +dm-mpath-change-to-be-request-based.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + 58242ef...1df0db5 master -> quilt/device-mapper (forced update) +Unchanged quilt series ttydev +Unchanged quilt series aoe +Importing driver-core based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard 0732f87761dbe417cb6e084b712d07e879e876ef +HEAD is now at 0732f87 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + 9a71a36...47c0383 master -> quilt/driver-core (forced update) +Importing usb based on quilt/driver-core + quilt series is empty +$ git update-ref refs/heads/quilt/usb 47c0383bc4f4c1595465c0ae22fa93f02d579ae2 +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard 47c0383bc4f4c1595465c0ae22fa93f02d579ae2 +HEAD is now at 47c0383 Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-add-mailing-list-address-for-staging-tree.patch +staging-comedi-remove-ni_board-typedef.patch +staging-comedi-remove-ni_private-typedef.patch +staging-comedi-remove-local_info_t-typedef-in-ni_labpc_cs.patch +staging-comedi-remove-dio24_board_struct-typedef.patch +staging-comedi-remove-local_info_t-typedef-in-ni_daq_dio24.patch +staging-comedi-remove-byte-and-pbyte-typedefs-in-addi-data.patch +staging-comedi-remove-short-and-pshort-typedefs-in-addi-data.patch +staging-comedi-remove-ushort-and-pushort-typedefs-in-addi-data.patch +staging-comedi-remove-word-and-pword-typedefs-in-addi-data.patch +staging-comedi-remove-int-and-pint-typedefs-in-addi-data.patch +staging-comedi-remove-uint-and-puint-typedefs-in-addi-data.patch +staging-comedi-remove-long-and-plong-typedefs-in-addi-data.patch +staging-comedi-remove-ulong-and-pulong-typedefs-in-addi-data.patch +staging-comedi-remove-dword-and-pdword-typedefs-in-addi-data.patch +staging-comedi-remove-ulong_ptr-typedef-in-addi-data.patch +staging-comedi-remove-pcrange-typedef-in-addi-data.patch +staging-comedi-remove-boardtype-typedef-in-addi-data.patch +staging-comedi-remove-str_moduleinfo-typedef-in-addi-data.patch +staging-comedi-remove-addi_private-typedef-in-addi-data.patch +staging-comedi-remove-str_mainheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_digitalinputheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_digitaloutputheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_timerdetails-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_timermainheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_analogreadinformation-typedef-in-addi-data-hwdrv_apci3120.h.patch +staging-comedi-remove-str_module-typedef-in-addi-data-hwdrv_apci3200.h.patch +staging-comedi-remove-str_boardinfos-typedef-in-addi-data-hwdrv_apci3200.patch +staging-comedi-remove-str_addidata_rtdstruct-typedef-in-addi-data-hwdrv_apci3200.patch +staging-comedi-remove-labpc_board_struct-typedef.patch +staging-comedi-remove-labpc_private-typedef.patch +staging-comedi-remove-str_analoginputheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-c99-comments-in-8253.h.patch +staging-comedi-remove-c99-comments-in-acl7225b.c.patch +staging-comedi-remove-c99-comments-in-apci1710_82x54.c.patch +staging-comedi-remove-c99-comments-in-das1800.c.patch +staging-comedi-remove-c99-comments-in-pcl818.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci1500.c.patch +staging-comedi-remove-c99-comments-in-apci1710_pwm.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci1564.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci3200.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci3120.c.patch +staging-comedi-remove-c99-comments-in-adl_pci6208.c.patch +staging-comedi-remove-c99-comments-in-adl_pci9118.c.patch +staging-comedi-remove-c99-comments-in-adv_pci1723.c.patch +staging-comedi-remove-c99-comments-in-c6xdigio.c.patch +staging-comedi-remove-c99-comments-in-cb_pcidas64.c.patch +staging-comedi-remove-c99-comments-in-cb_pcidas.c.patch +staging-comedi-remove-c99-comments-in-cb_pcimdas.c.patch +staging-comedi-remove-c99-comments-in-gsc_hpdi.c.patch +staging-comedi-remove-c99-comments-in-mpc624.c.patch +staging-comedi-remove-c99-comments-in-ni_at_a2150.c.patch +staging-comedi-remove-c99-comments-in-ni_labpc.c.patch +staging-comedi-remove-c99-comments-in-pcl724.c.patch +staging-comedi-remove-c99-comments-in-pcl816.c.patch +staging-comedi-remove-c99-comments-in-s526.c.patch +staging-comedi-remove-interrupt.h.patch +staging-comedi-remove-c99-comments.patch +staging-comedi-finish-removing-ni_private-typedef.patch +staging-comedi-pcmcia_parse_tuple-now-has-two-arguments-not-three.patch +staging-comedi-fix-build-errors-in-pcmcia-comedi-drivers.patch +staging-comedi-set-pci-and-pcmcia-defines.patch +staging-comedi-fixed-kconfig-option-for-comedi_pcmcia_drivers.patch +staging-comedi-pcl818-fix-option-handling-for-fifo-mode.patch +staging-comedi-pcl818-tidy-up-ai-command-after-channel-dropout-or-similar-error.patch +staging-comedi-ni_600x-added-support-for-comedi_poll.patch +staging-comedi-work-around-malformed-rtai_version_code.patch +staging-comedi-undo-stupid-commit-made-3-months-ago.patch +staging-comedi-amplc_pc236-corrected-documentation.patch +staging-comedi-added-sysfs-attribute-files-for-setting-and-querying-subdevice-buffer-sizes.patch +staging-comedi-jr3_pci-use-struct-device-from-pci_dev-for-firmware-loading.patch +staging-comedi-replace-__function__-usages.patch +staging-comedi-remove-dupilcated-include.patch +staging-comedi-fix-foo-bar-should-be-foo-bar.patch +staging-comedi-add-spaces-after-commas.patch +staging-comedi-fix-spacing-around-parens.patch +staging-comedi-change-space-indentation-to-tabs.patch +staging-comedi-add-vmk80xx-usb-driver.patch +staging-comedi-vmk80xx.c-get-the-driver-to-build-properly.patch +staging-comedi-makefile-changes.patch +staging-comedi-non-working-tests-on-unsigned-cmd-convert_arg.patch +staging-comedi-remove-assignment-in-conditionals.patch +staging-comedi-remove-parens-around-return-values.patch +staging-comedi-fix-the-way-structs-are-initialized.patch +staging-comedi-more-remove-c99-comments.patch +staging-comedi-remove-space-after-ampersand.patch +staging-comedi-more-fix-foo-bar-should-be-foo-bar.patch +staging-comedi-more-fix-the-way-structs-are-initialized.patch +staging-comedi-make-use-of-array_size-macro.patch +staging-comedi-comment-out-useless-if.patch +staging-comedi-move-while-to-same-line-as-in-do-loops.patch +staging-comedi-convert-usbdux-to-use-firmware_request.patch +staging-comedi-remove-comedi-specific-wrappers.patch +staging-comedi-remove-rt-code.patch +staging-comedi-remove-some-rt-code-that-lingered.patch +staging-comedi-replace-for-loop-with-msleep.patch +staging-comedi-simply-read-and-write-functions-in-adl_pci8164.patch +staging-comedi-vmk80xx-add-k8061-support.patch +staging-comedi-fix-pcmcia-build-breakage.patch +staging-comedi-comedi_test.c-should-include-timer.h.patch +staging-comedi-data.c-should-include-delay.h.patch +staging-comedi-fix-missing-parentheses.patch +staging-comedi-remove-min-macro.patch +staging-comedi-move-pcm-do_cmdtest-function-into-a-single-source-file.patch +staging-comedi-usbdux-buffer-overflow-error-handling.patch +staging-comedi-cb_pcidas.c-fix-build-warning.patch +staging-comedi-uses-udelay-needs-delay.h.patch +staging-agnx-probe-cleanup.patch +staging-agnx-remove-memlens-from-probe.patch +staging-agnx-fix-fail-paths-in-probe.patch +staging-agnx-fix-bssid-compiler-warnings.patch +staging-agnx-replace-print_mac-with-pm.patch +staging-agnx-fix-build-warnings.patch +staging-meilhaus-switch-to-misc-device.patch +staging-meilhaus-annotate-cpi-functions.patch +staging-meilhaus-move-tables-to-.c.patch +staging-meilhaus-remove-long-deprecated-sa_-interrupt-macros.patch +staging-meilhaus-fix-build-warnings.patch +staging-sxg-replace-__function__-usages.patch +staging-sxg-add-missing-__devexit_p.patch +staging-rt3070-replace-__function__-usages.patch +staging-rt2860-don-t-call-sprintf-with-overlapping-input-and-output.patch +staging-rt2870-don-t-call-sprintf-with-overlapping-input-and-output.patch +staging-rtl8187se-use-to_delayed_work.patch +staging-rtl8187se-convert-to-net_device_ops.patch +staging-rtl8187se-wmm_param.ac_aci_acm_aifsn-tested-twice.patch +staging-rt3070-remove-dupilcated-include.patch +staging-remove-unused-include-linux-version.h-s.patch +staging-stlc45xx-replace-print_mac-with-pm.patch +staging-fix-operator-precedence-errors.patch +staging-remove-driver_data-direct-access-of-struct-device.patch +staging-otus-80211core-ccmd.c-fix-coding-style.patch +staging-otus-beyond-array_size-of-wd-ap.wds.encrymode.patch +staging-winbond-boolean-negation-and-bitwise-operation-in-wrong-order.patch +staging-w35und-remove-unused-code-from-wbsoft_configure_filter.patch +staging-w35und-replace-switch-error-handling-with-gotos-in-wb35_hw_init.patch +staging-w35und-move-hal_init_hardware-and-hal_halt-int-wbusb.c.patch +staging-w35und-simplify-error-handling-in-wb35_hw_init.patch +staging-w35und-simplify-hal_init_hardware-error-handling.patch +staging-w35und-more-simplify-hal_init_hardware-error-handling.patch +staging-w35und-simplify-hal_init_hardware-and-hal_halt.patch +staging-w35und-clean-up-comments-in-wbusb.c.patch +staging-w35und-inline-hal_set_phy_type-to-wb35_hw_init.patch +staging-w35und-reformat-wbusb.c.patch +staging-w35und-remove-module_author.patch +staging-w35und-make-led-lookup-tables-static.patch +staging-w35und-reformat-wbhal.c.patch +staging-w35und-merge-wbhal.c-to-wbusb.c.patch +staging-w35und-inline-hal_set_rf_power-to-mto.c.patch +staging-w35und-merge-rest-of-wbhal.c-to-phy_calibration.c.patch +staging-winbond-mac80211-unify-config_interface-and-bss_info_changed.patch +staging-wlan-ng-move-firmware-loading-into-driver.patch +staging-wlan-ng-change-kern_debug-or-pr_debug-to-match-orig-driver.patch +staging-wlan-ng-p80211wext.c-problem-with-iw_encode_alg_wep.patch +staging-wlan-ng-lindent-cleanups.patch +staging-wlan-ng-update-readme-file.-remove-lindent-task.patch +staging-pohmelfs-move-open-brace-to-same-line-on-structs.patch +staging-pohmelfs-remove-c99-comments.patch +staging-pohmelfs-remove-braces-around-single-statements.patch +staging-pohmelfs-storage-class-should-be-before-const-qualifier.patch +0001-Staging-rt2870-remove-unused-files.patch +0002-Staging-rt2870-remove-kernel-version-compatibility.patch +0003-Staging-rt3070-remove-kernel-version-compatibility.patch +0004-Staging-rt2860-remove-IWE_STREAM_ADD_-macros.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:59: space before tab in indent. + current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:104: space before tab in indent. + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:113: space before tab in indent. + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); +warning: 3 lines add whitespace errors. +0005-Staging-rt2870-remove-IWE_STREAM_ADD_-macros.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:59: space before tab in indent. + current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:104: space before tab in indent. + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:113: space before tab in indent. + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, custom); +warning: 3 lines add whitespace errors. +0006-Staging-rt2860-remove-dead-WIN_NDIS-code.patch +0007-Staging-rt2860-remove-dead-UNDER_CE-code.patch +0008-Staging-rt2870-remove-dead-UNDER_CE-code.patch +0009-Staging-rt3070-remove-dead-UNDER_CE-code.patch +0010-Staging-rt2860-remove-dead-WSC_AP_SUPPORT-code.patch +0011-Staging-rt2870-remove-dead-WSC_AP_SUPPORT-code.patch +0012-Staging-rt3070-remove-dead-WSC_INCLUDED-code.patch +0013-Staging-rt2860-remove-dead-WDS_SUPPORT-code.patch +0014-Staging-rt2870-remove-dead-WDS_SUPPORT-code.patch +0015-Staging-rt3070-remove-dead-WDS_SUPPORT-code.patch +0016-Staging-rt3070-remove-dead-MLME_EX-code.patch +0017-Staging-rt2860-remove-dead-APCLI_SUPPORT-code.patch +0018-Staging-rt2870-remove-dead-APCLI_SUPPORT-code.patch +0019-Staging-rt2860-remove-dead-CONFIG_APSTA_MIXED_SUPP.patch +0020-Staging-rt2870-remove-dead-CONFIG_APSTA_MIXED_SUPP.patch +0021-Staging-rt3070-remove-dead-CONFIG_APSTA_MIXED_SUPP.patch +0022-Staging-rt2860-remove-dead-UCOS-code.patch +0023-Staging-rt2870-remove-dead-UCOS-code.patch +0024-Staging-rt3070-remove-dead-UCOS-code.patch +0025-Staging-rt2860-remove-dead-NINTENDO_AP-code.patch +0026-Staging-rt2870-remove-dead-NINTENDO_AP-code.patch +0027-Staging-rt3070-remove-dead-NINTENDO_AP-code.patch +0028-Staging-rt2860-remove-dead-BIN_IN_FILE-code.patch +0029-Staging-rt2870-remove-dead-BIN_IN_FILE-code.patch +0030-Staging-rt3070-remove-dead-BIN_IN_FILE-code.patch +0031-Staging-rt2860-remove-dead-RALINK_ATE-code.patch +0032-Staging-rt2870-remove-dead-RALINK_ATE-code.patch +0033-Staging-rt3070-remove-dead-RALINK_ATE-code.patch +0034-Staging-rt2860-remove-dead-BLOCK_NET_IF-code.patch +0035-Staging-rt2870-remove-dead-BLOCK_NET_IF-code.patch +0036-Staging-rt3070-remove-dead-BLOCK_NET_IF-code.patch +0037-Staging-rt2860-remove-dead-DFS_SUPPORT-code.patch +0038-Staging-rt2870-remove-dead-DFS_SUPPORT-code.patch +0039-Staging-rt3070-remove-dead-DFS_SUPPORT-code.patch +0040-Staging-rt2860-remove-dead-CARRIER_DETECTION_SUPPO.patch +0041-Staging-rt2870-remove-dead-CARRIER_DETECTION_SUPPO.patch +0042-Staging-rt3070-remove-dead-CARRIER_DETECTION_SUPPO.patch +0043-Staging-rt2860-remove-dead-MULTIPLE_CARD_SUPPORT-c.patch +0044-Staging-rt2870-remove-dead-MULTIPLE_CARD_SUPPORT-c.patch +0045-Staging-rt3070-remove-dead-MULTIPLE_CARD_SUPPORT-c.patch +0046-Staging-rt2860-remove-dead-QOS_DLS_SUPPORT-code.patch +0047-Staging-rt2870-remove-dead-QOS_DLS_SUPPORT-code.patch +0048-Staging-rt3070-remove-dead-QOS_DLS_SUPPORT-code.patch +0049-Staging-rt2860-remove-dead-EXT_BUILD_CHANNEL_LIST.patch +0050-Staging-rt2870-remove-dead-EXT_BUILD_CHANNEL_LIST.patch +0051-Staging-rt3070-remove-dead-EXT_BUILD_CHANNEL_LIST.patch +0052-Staging-rt2860-remove-dead-SNMP_SUPPORT-code.patch +0053-Staging-rt2870-remove-dead-SNMP_SUPPORT-code.patch +0054-Staging-rt3070-remove-dead-SNMP_SUPPORT-code.patch +0055-Staging-rt2860-remove-dead-SINGLE_SKU-code.patch +0056-Staging-rt2870-remove-dead-SINGLE_SKU-code.patch +0057-Staging-rt3070-remove-dead-SINGLE_SKU-code.patch +0058-Staging-rt2860-remove-dead-LEAP_SUPPORT-code.patch +0059-Staging-rt2870-remove-dead-LEAP_SUPPORT-code.patch +0060-Staging-rt3070-remove-dead-LEAP_SUPPORT-code.patch +0061-Staging-rt2860-remove-dead-DOT11N_DRAFT3-code.patch +0062-Staging-rt2870-remove-dead-DOT11N_DRAFT3-code.patch +0063-Staging-rt3070-remove-dead-DOT11N_DRAFT3-code.patch +0064-Staging-rt2860-remove-dead-INF_AMAZON_SE-code.patch +0065-Staging-rt2870-remove-dead-INF_AMAZON_SE-code.patch +0066-Staging-rt3070-remove-dead-INF_AMAZON_SE-code.patch +0067-Staging-rt2860-remove-dead-RT_BIG_ENDIAN-code.patch +0068-Staging-rt2870-remove-dead-RT_BIG_ENDIAN-code.patch +0069-Staging-rt3070-remove-dead-RT_BIG_ENDIAN-code.patch +0070-Staging-rt2860-remove-CONFIG_STA_SUPPORT-ifdefs.patch +0071-Staging-rt2870-remove-CONFIG_STA_SUPPORT-ifdefs.patch +0072-Staging-rt3070-remove-CONFIG_STA_SUPPORT-ifdefs.patch +0073-Staging-rt2860-remove-NATIVE_WPA_SUPPLICANT_SUPPOR.patch +0074-Staging-rt2870-remove-NATIVE_WPA_SUPPLICANT_SUPPOR.patch +0075-Staging-rt3070-remove-NATIVE_WPA_SUPPLICANT_SUPPOR.patch +0076-Staging-rt2860-remove-WPA_SUPPLICANT_SUPPORT-ifdef.patch +0077-Staging-rt2870-remove-WPA_SUPPLICANT_SUPPORT-ifdef.patch +0078-Staging-rt3070-remove-WPA_SUPPLICANT_SUPPORT-ifdef.patch +0079-Staging-rt2860-remove-DOT11_N_SUPPORT-ifdefs.patch +0080-Staging-rt2870-remove-DOT11_N_SUPPORT-ifdefs.patch +0081-Staging-rt3070-remove-DOT11_N_SUPPORT-ifdefs.patch +0082-Staging-rt2860-remove-dead-CONFIG_AP_SUPPORT-code.patch +0083-Staging-rt2870-remove-dead-CONFIG_AP_SUPPORT-code.patch +0084-Staging-rt3070-remove-dead-CONFIG_AP_SUPPORT-code.patch +0085-Staging-rt2860-use-empty-ASSERT-macro.patch +0086-Staging-rt2870-use-empty-ASSERT-macro.patch +0087-Staging-rt3070-use-empty-ASSERT-macro.patch +0088-Staging-rt2860-remove-dead-code.patch +0089-Staging-rt2870-remove-dead-code.patch +0090-Staging-rt3070-remove-dead-code.patch +0091-Staging-rt2870-prepare-for-rt-28-30-70-.-ch-merg.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:432: space before tab in indent. + RTUSBEnqueueInternalCmd(pAd, CMDTHREAD_UPDATE_PROTECT, NULL, 0); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:952: space before tab in indent. + IN PUSHORT lpInBuffer, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:953: space before tab in indent. + IN ULONG nInBufferSize, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:954: space before tab in indent. + OUT PUSHORT lpOutBuffer, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:955: space before tab in indent. + IN ULONG nOutBufferSize +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +0092-Staging-rt-28-30-70-merge-rt-28-30-70-.-ch.patch +0093-Staging-rt2870-prepare-for-rt-28-30-70-common-.-c.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:313: space before tab in indent. + AsicSendCommandToMcu(pAd, 0x31, 0xff, 0x00, 0x02); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:759: space before tab in indent. + pAd->EepromAccess = TRUE; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:811: space before tab in indent. + pAd->EepromAccess = TRUE; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1031: space before tab in indent. + IN PUSHORT lpInBuffer, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1032: space before tab in indent. + IN ULONG nInBufferSize, +warning: squelched 15 whitespace errors +warning: 20 lines add whitespace errors. +0094-Staging-rt-28-30-70-merge-rt-28-30-70-common-.-ch.patch +0095-Staging-rt2870-prepare-for-rt-28-30-70-sta-.-ch.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:32: space before tab in indent. + pAd->StaCfg.RSNIE_Len, pAd->StaCfg.RSN_IE, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:33: space before tab in indent. + END_OF_ARGS); +warning: 2 lines add whitespace errors. +0096-Staging-rt-28-30-70-merge-rt-28-30-70-sta-.-ch.patch +0097-Staging-rt2860-prepare-for-rt28-67-0-.-ch-merge.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1474: space before tab in indent. + RT_HT_CAPABILITY SupportedHtPhy; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1881: space before tab in indent. + IN PUSHORT lpInBuffer, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1882: space before tab in indent. + IN ULONG nInBufferSize, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1883: space before tab in indent. + OUT PUSHORT lpOutBuffer, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1884: space before tab in indent. + IN ULONG nOutBufferSize +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +0098-Staging-rt28-67-0-merge-rt28-67-0-.-ch.patch +0099-Staging-rt2860-prepare-for-rt28-67-0-common-.-ch.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:545: space before tab in indent. + ) +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:796: space before tab in indent. + pAd->EepromAccess = TRUE; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:848: space before tab in indent. + pAd->EepromAccess = TRUE; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1068: space before tab in indent. + IN PUSHORT lpInBuffer, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1069: space before tab in indent. + IN ULONG nInBufferSize, +warning: squelched 15 whitespace errors +warning: 20 lines add whitespace errors. +0100-Staging-rt28-67-0-merge-rt28-67-0-common-.-ch.patch +0101-Staging-rt2860-prepare-for-rt28-67-0-sta-.-ch-me.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:32: space before tab in indent. + pAd->StaCfg.RSNIE_Len, pAd->StaCfg.RSN_IE, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:33: space before tab in indent. + END_OF_ARGS); +warning: 2 lines add whitespace errors. +0102-Staging-rt28-67-0-merge-rt28-67-0-sta-.-ch.patch +staging-rt2860-fix-for-driver-rt2860-to-be-able-to-connect-to-wpa2-networks.patch +staging-rtlxxxx-off-by-one-in-asicsendcommandtomcu-and-ndis_status-nicloadfirmware.patch +staging-rt2870-fix-build-warnings.patch +staging-add-pristine-upstream-vt6655-driver-sources.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:4976: space before tab in indent. + bResult &= BBbWriteEmbeded(dwIoBase,byVT3253B0_AGC4_RFMD2959[ii][0],byVT3253B0_AGC4_RFMD2959[ii][1]); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:4991: space before tab in indent. + bResult &= BBbWriteEmbeded(dwIoBase,byVT3253B0_AIROHA2230[ii][0],byVT3253B0_AIROHA2230[ii][1]); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:4992: space before tab in indent. + } +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:4994: space before tab in indent. + bResult &= BBbWriteEmbeded(dwIoBase,byVT3253B0_AGC[ii][0],byVT3253B0_AGC[ii][1]); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:4995: space before tab in indent. + } +warning: squelched 196 whitespace errors +warning: 201 lines add whitespace errors. +staging-vt6655-add-includes-to-drivers-staging-vt6655.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:730: space before tab in indent. + u8 bssid[6]; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:733: space before tab in indent. + u8 *wpa_ie; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:734: space before tab in indent. + u16 wpa_ie_len; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:735: space before tab in indent. + int pairwise_suite; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:736: space before tab in indent. + int group_suite; +warning: squelched 3 whitespace errors +warning: 8 lines add whitespace errors. +staging-vt6655-drop-obsolete-fsuid-fsgid-accesses.patch +staging-vt6655-build-vt6655.ko-not-viawget.ko.patch +staging-vt6655-replace-net_device-priv-accesses-with-netdev_priv-calls.patch +staging-vt6655-remove-linux_version_code-preprocessor-conditionals.patch +staging-vt6655-use-net_device_ops-for-management-functions.patch +staging-vt6655-integrate-drivers-staging-vt6655-into-build-system.patch +staging-vt6655-uses-pci-functions-should-depend-on-pci.patch +staging-android-lowmemorykiller-only-iterate-over-process-list-when-needed.patch +staging-android-lowmemorykiller-don-t-count-free-space-unless-it-meets-the-specified-limit-by-itself.patch +staging-android-lowmemorykiller-cleanup-android-low-memory-killer.patch +staging-lowmemorykiller-fix-possible-android-low-memory-killer-null-pointer.patch +staging-android-timed_gpio-separate-timed_output-class-into-a-separate-driver.patch +staging-android-lowmemorykiller-fix-up-remaining-checkpatch-warnings.patch +staging-android-logger-fix-up-remaining-checkpatch-warnings.patch +staging-android-ram_console-fix-up-remaining-checkpatch-warnings.patch +staging-android-binder-fix-up-some-checkpatch-warnings.patch +staging-android-fix-kconfig-issues.patch +staging-epl-do-not-use-clone_sighand-with-allow_signal.patch +staging-add-cpc-usb-driver-to-the-staging-tree.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1513: space before tab in indent. + "CPC-USB/ARM7" : "CPC-USB/M16C"); +warning: 1 line adds whitespace errors. +staging-cpc-usb-fix-some-build-problems-in-the-driver.patch +staging-cpc-usb-add-driver-to-the-build.patch +staging-cpc-usb-fix-up-checkpatch-errors-in-cpc-usb_drv.c.patch +staging-cpc-usb-fix-checkpatch-warnings-in-sja2m16c.h.patch +staging-cpc-usb-add-todo-file.patch +staging-cpc-usb-adjust-null-test.patch +staging-cpc-usb-depends-on-proc_fs.patch +staging-cpc-usb-fix-printk-format-warnings.patch +staging-cpc-usb-fix-build-warnings.patch +staging-add-rtl8192su-wireless-usb-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1362: space before tab in indent. + switch (crypto_tfm_alg_blocksize(tfm)) { +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1363: space before tab in indent. + case 8: +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1364: space before tab in indent. + ops->cit_xor_block = xor_64; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1365: space before tab in indent. + break; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1367: space before tab in indent. + case 16: +warning: squelched 168 whitespace errors +warning: 173 lines add whitespace errors. +staging-rtl8192su-fix-build-warnings.patch +staging-rtl8192su-correct-use-of-and.patch +staging-wis-sony-tuner.c-fix-error.patch +staging-b3dfg-clean-up-module_parm_desc-newline.patch +staging-oslec-bug-fix.patch +staging-p9auth-prevent-some-oopses-and-memory-leaks.patch +staging-rspiusb-make-driver-compile.patch +staging-rspiusb-clean-rspiusb-code.patch +staging-rspiusb.c-break-the-huge-piusb_ioctl-function-into-several-ones.patch +staging-rspiusb-duplicate-code-in-pixis_io.patch +staging-rspiusb-fix-a-bunch-of-warnings.patch +staging-rspiusb-copy_to-from_user-related-fixes.patch +staging-heci-fix-userspace-pointer-mess.patch +staging-heci-fix-wrong-order-of-device_lock-and-file_lock.patch +staging-heci-fix-spinlock-order-mess-of-device_lock-and-read_io_lock.patch +staging-heci-fix-softirq-safe-to-unsafe-spinlock-issue.patch +staging-heci-fix-typos-and-add-wait-after-disconnect.patch +staging-heci-fix-setting-h_is-bit-in-h_csr-register.patch +staging-heci-do-not-print-error-when-heci_bh_handler-is-already-on-workqueue.patch +staging-heci-fix-the-problem-that-file_ext-state-should-be-protected-by-device_lock.patch +staging-altpciechdma-add-missing-__devexit_p.patch +staging-altpciechdma-fix-build-warnings.patch +staging-slicoss-add-missing-__devexit_p.patch +staging-slicoss-fix-build-warnings.patch +staging-asus_oled-fix-build-warnings.patch +staging-add-serqt_usb2-a-rewrite-of-serqt_usb-for-the-usb-serial-layer.patch +staging-serqt_usb2-add-the-driver-to-the-build.patch +staging-remove-obsolete-serqt_usb-driver.patch +staging-add-pata_rdc-driver.patch +staging-pata_rdc-add-driver-to-the-build-system.patch +staging-pata_rdc-convert-code-to-work-in-2.6.29.patch +staging-pata_rdc-coding-style-fixes.patch +staging-pata_rdc-remove-function-prototypes.patch +staging-pata_rdc-use-pci_device.patch +staging-pata_rdc-fix-build-warnings.patch +staging-pata_rdc-remove-broken-flag.patch +staging-pata_rdc-remove-dbgprintf-macro.patch +staging-pata_rdc-remove-driver-macros.patch +staging-pata_rdc-remove-pointless-comments.patch +staging-add-udlfb-driver.patch +staging-udlfb-add-udlfb-driver-to-build.patch +staging-udlfb-clean-up-checkpatch-warnings-in-udlfb.h.patch +staging-udlfb-clean-up-checkpatch-warnings-in-udlfb.c.patch +staging-udlfb-fix-some-sparse-warnings.patch +staging-udlfb-update-to-version-0.2.3.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + 707c2c1...1bc8c75 master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..cd271d4c521d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090622 |