diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-16 21:23:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-16 21:23:01 +1100 |
| commit | 522ba1b19a94873478eadbe66b7b657b22069ad2 (patch) | |
| tree | 4da2635af75f69cc186900c7786f7a46b364bf4f | |
| parent | b3107386ee9770cf52e82d5057b0a781bd53b45b (diff) | |
Add linux-next specific files for 20081016next-20081016
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 122 | ||||
| -rw-r--r-- | Next/Trees | 124 | ||||
| -rw-r--r-- | Next/merge.log | 11125 | ||||
| -rw-r--r-- | Next/quilt-import.log | 343 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 11715 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..da002d3c8350 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,122 @@ +Name SHA1 +---- ---- +origin 04ab591808565f968d4406f6435090ad671ebdab +powerpc-merge 61e9916eba35dfb76d38013a5aae9a59cc50877a +scsi-rc-fixes c9eeb248f3b44939532a9716bc06413383aa5d63 +net-current deb28d9bc4bb6922c1f7e459744d7b2d0db3a1d2 +sparc-current 615c9136b385d5225d3ece20aa30b28a90c438d6 +sound-current af31ed217a0fe433e06c83b978bcb805ada6295a +arm-current 278429cff8809958d25415ba0ed32b59866ab1a8 +pci-current 278429cff8809958d25415ba0ed32b59866ab1a8 +wireless-current 8713a7ccd88d93d9f8a72436088d6627c82490db +kbuild-current 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc +driver-core.current 94d35affffc09074f86db177cd16c0abc90b9c50 +usb.current d0c4dbdc1dbed9abbd4a2aac915e659348011b8f +cpufreq-current 8d5922572038bae9f7b16fcb974eee806727b44c +input-current 1577e4b70a04cce39f296cc714da5ad5d272105a +md-current 7a1fc53c5adb910751a9b212af90302eb4ffb527 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 4249d00bde7a2ba45d27cdb61315356737a5a069 +avr32 22a304363ea6bf3100504606393e20a252173fd2 +blackfin 71de1f8a6365ea65346881e526132563d93696d1 +cris 8f808417fe211648c0816e28947cdc74eb1e1032 +ia64 a447c0932445f92ce6f4c1bd020f62c5097a7842 +m68k 336990da05c07aefe9ac105392506d2723350e3f +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 235a92b14ee121ada0454f24d8899dc14273b4aa +powerpc 6dc6472581f693b5fc95aebedf67b4960fb85cf0 +4xx 22d660ffd0db8d136b122751287d186e869ca474 +galak c0da99d5f7b0349cb11f970b3283c0d57beb5ec9 +pxa 45e9c0de2e86485f8b6633fd64ab19cfbff167f6 +s390 8d46b56cafbc2bd2f7a12cda37a79f12dc111444 +sh 14866543ad22014a0b12e10657a917eb6b487248 +sparc 4480f15b3306f43bbb0310d461142b4e897ca45b +x86 113455f80fae63de7044f93a6624b498d5c6b8a0 +xtensa dbd3dca3d7d5b1cd36a3df2ee9ed2c46d99b7f64 +driver-core e449d4fe051818602429d4d90827918f9bd5cd40 +usb bec2f5dbfbf46cf6fc3cc7b8cff5eb02834afaa9 +tip-core 36ed4f9d67e5021b5432bda97594ba98b924b9e3 +cpus4096 4145ddda112a16b870e6bc5461625afd28d9df1f +ftrace 98d9c66ab07471006fd7910cb16453581c41a3e7 +genirq 14a6b3e8964be7b82c6cb4246fe4e0d9f6ddc9d5 +safe-poison-pointers ad666554bd18330eec5fcbcb89c80ef5bb2f4797 +sched 202fb5378a17e8d100079a2c13d092f1d88ef766 +stackprotector c2d98093cf3fd7a9ef34b1ae9aa12a4a5b061872 +timers eeb2d0fcb69ea2dccaf1c1fdfc510cb1973c9b7f +pci 913d3708831ec551ca8560ea2cc793f738df88d6 +device-mapper 7955573db936a8089efd04a110d2567bedb99f26 +hid ebc0fa3049a864272ee75ae3005d15da703d1cb4 +i2c 9ca5623124ee677ef2f9b267f84a830bc71d1435 +jdelvare-hwmon e3b370b311a4d9662e1e41d6c9ad33eb5ddbbbae +kernel-doc a881214af7025692df7329c477edb044a3920bb4 +v4l-dvb 828687a7b6699fbc6bc62d03f381e3cd468134ab +jfs ec1aef33668448718fcba79e4e981592bfd7e0a3 +kbuild 56b2f0706d82535fd8d85503f2dcc0be40c8e55d +ide 322fa599179fd64d2b516c0a58777179d73f5bbb +libata a551b98d5f6fce5897d497abd8bfb262efb33d2a +nfs 011935a0a710c20bb7ae63523b78856848db1926 +xfs d3503eed0388a626544326ca9a8c5d74735d0786 +infiniband af713b499f830a630f554b7df3fa0e81be848963 +acpi 3072a17c2581af273e3170a154fc63ae825d6395 +nfsd 04ab591808565f968d4406f6435090ad671ebdab +ieee1394 e1a26a95895440949bdc7ac125f9c84b30ebdf7e +ubi 762a9f291bfdf9e4d5c2b80d730d79055c8d8c99 +kvm 9b974d0876aecc73d6a3275ccd9b5443f57b47dd +dlm 27eccf46491e1f77f9af9bbe0778122ce6882890 +scsi 4c393e6e457fb41169dd110c1b96a138394c2d7b +tests 94a97a3018e55a27d1c29e011b3c38fee01a967f +ocfs2 fd350473bd20282b725f336721751c80b724efd5 +ext4 f319fb8bf6899e08bdb8d1e09a4e7a129dfa2312 +async_tx 77cd62e8082b9743b59ee1946a4c3ee2e3cd2bce +udf 5c89468c12899b84886cb47eec93f0c88e0f896a +net 4480f15b3306f43bbb0310d461142b4e897ca45b +mtd 6028aa01f759a1dae11e5d0e495b3dc9d2b0a47b +wireless ad788b5e079484aa1d48aa90a3ebd7d954d2e7db +crypto 4c61f406471d6de3a6963c90ab4953f8f1daf9a6 +vfs 33e3239775fdd1ab95a5dc40dda9c8332a8acf01 +sound 3e1d069f9fe2cac08ea11e851d079dbad1efad4e +cpufreq 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9 +v9fs 71432ed547eb7276ab6b410dbdacc4cfeffcc2af +rr 1279fc224b18240abe1f9e4df510d1700052abe3 +cifs 7591103c08abade60aeddb432ed0686ddd0de1c6 +mmc 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e +gfs2 c59f927e7facd5a911c6bc68e56e3bda8de5d65e +input b8d055a878ee0f997ded40649701089d2486f850 +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 46006b35f9e32479181c4ede98980a30ef536a49 +trivial 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 +ubifs be2f6bd62d0d4246a9227dacbe2469e1f0eccf26 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 8ad912a613ef2dd32d36a7adf73c3c3641e2921a +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 0105f18683fde1df6ef69e7812582a52701e8a54 +pcmcia a45b3fb19ba1e4dfc3fc53563a072612092930a9 +battery 8aef7e8f8de2d900da892085edbf14ea35fe6881 +leds bfd34c4804433451929ca59db8b48456da9a899f +backlight e488bf8c4089681d5b905a9ef5c3409e697d7285 +kgdb 39465d79f822869f8969ab12aa97a9b20178dde3 +slab da80c74496079d89f24a1a02b5fffc507bb2f681 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 97ce0a7f9caf9d715cee815a016ee21575f71c95 +kmemcheck fb46cf6fb9dbf4cf58e4fd6939b77de1c39d40d2 +generic-ipi 85ba94ba0592296053f7f2846812173424afe1cb +mfd e01cfaf4059da3a5e073167e67260b78aca91227 +hdlc 2be365f597591ca097ff36ce031cc9f79d9ec1e0 +drm 5fed53a040bb697c952f765884f2afb3d89122b7 +voltage 02bdc62abff3fe77bc57372196efb58216a9b248 +security-testing 0da939b0058742ad2d8580b7db6b966d0fc72252 +lblnet 7591103c08abade60aeddb432ed0686ddd0de1c6 +ttydev dce1236e68e96a4649263d51b7a35aba47580480 +agp 91397585e3fb47b3900e17d70c6edc356e36bb46 +creds be3100318d4453654723c0777aef288db8133f99 +oprofile c8145f94f83b98ed42241f6a8b91763e7a6aebaa +fastboot 4bca8a4b21ae2a9cac26b9027d5b5db682e624e2 +sparseirq 5ab4ffd7e36dd13d1282b5870dbdef88ada32003 +iommu 4480f15b3306f43bbb0310d461142b4e897ca45b +uwb 92c4d9bd1648b3eaca6b8b8f8932eec390ba7327 +watchdog 821c9a396f7b833cd8b86cc6683a947a113c16d7 +proc 04ab591808565f968d4406f6435090ad671ebdab +scsi-post-merge 454f40af9f0d4cda1c89e1fc0028d5235b150bc7 +bdev a390554d92a96e91c0fc568902d87afd13d4e49a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..339bc2088a64 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,124 @@ +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 +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +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 +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +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-2.6.26 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/~dedekind/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 +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-linus +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 +creds git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds-subsys +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev-next.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..26ed8b4ecbfd --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,11125 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 45e9c0d warn: Turn the netdev timeout WARN_ON() into a WARN() +Merging origin/master +$ git merge origin/master +Updating 45e9c0d..04ab591 +Fast forward + Documentation/00-INDEX | 4 - + Documentation/ABI/testing/sysfs-class-regulator | 55 +- + Documentation/DMA-API.txt | 2 +- + Documentation/DMA-mapping.txt | 2 +- + Documentation/DocBook/kernel-api.tmpl | 5 + + Documentation/DocBook/mac80211.tmpl | 12 +- + Documentation/HOWTO | 3 +- + Documentation/RCU/checklist.txt | 2 +- + Documentation/RCU/rcuref.txt | 16 +- + Documentation/RCU/whatisRCU.txt | 2 - + Documentation/SELinux.txt | 27 + + Documentation/SubmitChecklist | 2 + + Documentation/blackfin/kgdb.txt | 155 - + Documentation/block/deadline-iosched.txt | 14 +- + Documentation/cdrom/ide-cd | 3 +- + Documentation/cpu-freq/index.txt | 10 +- + Documentation/feature-removal-schedule.txt | 30 +- + Documentation/filesystems/ext4.txt | 19 +- + Documentation/filesystems/fiemap.txt | 228 + + Documentation/filesystems/ocfs2.txt | 6 + + Documentation/filesystems/proc.txt | 74 +- + Documentation/hwmon/adt7473 | 18 +- + Documentation/hwmon/sysfs-interface | 12 + + Documentation/i2c/busses/i2c-viapro | 8 +- + Documentation/i2c/dev-interface | 110 +- + Documentation/i2c/smbus-protocol | 4 +- + Documentation/i2c/writing-clients | 4 +- + Documentation/ioctl/cdrom.txt | 4 +- + Documentation/kernel-doc-nano-HOWTO.txt | 4 +- + Documentation/kernel-parameters.txt | 53 +- + Documentation/laptops/disk-shock-protection.txt | 149 + + Documentation/networking/LICENSE.qlge | 46 + + Documentation/networking/can.txt | 44 +- + Documentation/networking/multiqueue.txt | 54 +- + Documentation/networking/phonet.txt | 175 + + Documentation/networking/regulatory.txt | 194 + + Documentation/networking/tproxy.txt | 85 + + Documentation/pcmcia/driver-changes.txt | 6 + + Documentation/power/regulator/machine.txt | 140 +- + Documentation/power/regulator/regulator.txt | 8 +- + Documentation/powerpc/00-INDEX | 4 - + .../powerpc/dts-bindings/fsl/83xx-512x-pci.txt | 40 + + .../powerpc/dts-bindings/fsl/8xxx_gpio.txt | 40 + + Documentation/powerpc/dts-bindings/fsl/dma.txt | 13 +- + Documentation/powerpc/dts-bindings/fsl/ssi.txt | 23 + + Documentation/powerpc/ppc_htab.txt | 118 - + Documentation/powerpc/smp.txt | 34 - + Documentation/rfkill.txt | 32 +- + Documentation/s390/CommonIO | 11 +- + Documentation/scheduler/sched-design-CFS.txt | 395 +- + Documentation/scsi/scsi_fc_transport.txt | 36 + + Documentation/sound/alsa/ALSA-Configuration.txt | 62 +- + .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 65 +- + Documentation/sound/alsa/soc/dapm.txt | 12 +- + Documentation/sparc/sbus_drivers.txt | 309 - + Documentation/sysctl/kernel.txt | 7 +- + Documentation/timers/00-INDEX | 10 + + Documentation/{ => timers}/hpet.txt | 43 +- + Documentation/usb/anchors.txt | 12 + + Documentation/video4linux/CARDLIST.bttv | 1 + + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.cx88 | 8 + + Documentation/video4linux/CARDLIST.em28xx | 6 +- + Documentation/video4linux/CARDLIST.saa7134 | 8 +- + Documentation/video4linux/CARDLIST.tuner | 1 + + Documentation/video4linux/gspca.txt | 29 +- + Documentation/video4linux/m5602.txt | 12 + + Documentation/video4linux/soc-camera.txt | 120 + + Documentation/x86/00-INDEX | 4 + + Documentation/x86/{i386 => }/boot.txt | 2 +- + Documentation/{ => x86}/mtrr.txt | 4 +- + Documentation/x86/pat.txt | 54 +- + .../x86/{i386 => }/usb-legacy-support.txt | 0 + Documentation/x86/x86_64/boot-options.txt | 4 - + Documentation/x86/{i386 => }/zero-page.txt | 0 + MAINTAINERS | 1084 ++-- + Makefile | 2 +- + arch/Kconfig | 14 + + arch/alpha/Kconfig | 4 +- + arch/alpha/include/asm/statfs.h | 4 + + arch/alpha/kernel/smp.c | 3 + + arch/arm/Kconfig | 78 +- + arch/arm/Makefile | 2 +- + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/boot/compressed/head.S | 3 +- + arch/arm/common/Kconfig | 3 +- + arch/arm/common/dmabounce.c | 287 +- + arch/arm/common/gic.c | 2 +- + arch/arm/common/it8152.c | 14 +- + arch/arm/common/locomo.c | 28 +- + arch/arm/common/sa1111.c | 2 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/common/sharpsl_param.c | 2 + + arch/arm/common/time-acorn.c | 2 +- + arch/arm/common/uengine.c | 2 +- + arch/arm/common/via82c505.c | 2 +- + arch/arm/common/vic.c | 2 +- + .../{xm_x270_defconfig => afeb9260_defconfig} | 1098 +-- + arch/arm/configs/at91sam9rlek_defconfig | 1 + + .../{xm_x270_defconfig => cm_x300_defconfig} | 735 +-- + arch/arm/configs/jornada720_defconfig | 1057 ++- + arch/arm/configs/orion5x_defconfig | 3 + + arch/arm/configs/palmz72_defconfig | 951 +++ + .../configs/{xm_x270_defconfig => viper_defconfig} | 1059 ++-- + .../{xm_x270_defconfig => xm_x2xx_defconfig} | 237 +- + arch/arm/include/asm/bug.h | 2 +- + arch/arm/include/asm/cacheflush.h | 90 - + arch/arm/include/asm/cachetype.h | 52 + + arch/arm/include/asm/cputype.h | 64 + + arch/arm/include/asm/dma-mapping.h | 378 +- + arch/arm/include/asm/elf.h | 72 +- + arch/arm/include/asm/futex.h | 124 +- + arch/arm/include/asm/io.h | 5 +- + arch/arm/include/asm/irq.h | 4 + + arch/arm/include/asm/kprobes.h | 1 - + arch/arm/include/asm/mach/map.h | 17 +- + arch/arm/include/asm/mach/udc_pxa2xx.h | 3 +- + arch/arm/include/asm/mc146818rtc.h | 2 +- + arch/arm/include/asm/memory.h | 40 +- + arch/arm/include/asm/mmu_context.h | 1 + + arch/arm/include/asm/page.h | 5 +- + arch/arm/include/asm/pgtable.h | 88 +- + arch/arm/include/asm/ptrace.h | 7 +- + arch/arm/include/asm/setup.h | 11 + + arch/arm/include/asm/sparsemem.h | 20 +- + arch/arm/include/asm/statfs.h | 34 +- + arch/arm/include/asm/system.h | 58 - + arch/arm/include/asm/thread_info.h | 2 +- + arch/arm/include/asm/uaccess.h | 10 +- + arch/arm/include/asm/vga.h | 2 +- + arch/arm/kernel/Makefile | 2 +- + arch/arm/kernel/armksyms.c | 4 +- + arch/arm/kernel/bios32.c | 2 +- + arch/arm/kernel/crunch.c | 2 +- + arch/arm/kernel/debug.S | 5 + + arch/arm/kernel/dma-isa.c | 3 +- + arch/arm/kernel/dma.c | 17 - + arch/arm/kernel/ecard.c | 6 +- + arch/arm/kernel/elf.c | 79 + + arch/arm/kernel/entry-armv.S | 16 + + arch/arm/kernel/entry-common.S | 25 +- + arch/arm/kernel/fiq.c | 1 - + arch/arm/kernel/head-common.S | 19 +- + arch/arm/kernel/head-nommu.S | 4 +- + arch/arm/kernel/head.S | 12 +- + arch/arm/kernel/init_task.c | 2 +- + arch/arm/kernel/io.c | 3 +- + arch/arm/kernel/irq.c | 11 +- + arch/arm/kernel/kgdb.c | 2 - + arch/arm/kernel/kprobes-decode.c | 4 +- + arch/arm/kernel/kprobes.c | 5 +- + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/module.c | 2 +- + arch/arm/kernel/process.c | 33 +- + arch/arm/kernel/ptrace.c | 10 +- + arch/arm/kernel/setup.c | 279 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm/kernel/smp.c | 1 + + arch/arm/kernel/sys_arm.c | 3 +- + arch/arm/kernel/sys_oabi-compat.c | 2 +- + arch/arm/kernel/time.c | 2 +- + arch/arm/kernel/traps.c | 18 +- + arch/arm/kernel/xscale-cp0.c | 2 +- + arch/arm/lib/ashldi3.S | 2 + + arch/arm/lib/ashrdi3.S | 2 + + arch/arm/lib/backtrace.S | 4 + + arch/arm/lib/changebit.S | 2 + + arch/arm/lib/clear_user.S | 3 +- + arch/arm/lib/clearbit.S | 2 + + arch/arm/lib/copy_from_user.S | 2 + + arch/arm/lib/copy_page.S | 1 + + arch/arm/lib/copy_to_user.S | 2 + + arch/arm/lib/csumipv6.S | 1 + + arch/arm/lib/csumpartial.S | 1 + + arch/arm/lib/csumpartialcopy.S | 7 +- + arch/arm/lib/csumpartialcopygeneric.S | 1 + + arch/arm/lib/csumpartialcopyuser.S | 7 +- + arch/arm/lib/delay.S | 3 + + arch/arm/lib/div64.S | 1 + + arch/arm/lib/findbit.S | 8 + + arch/arm/lib/getuser.S | 14 +- + arch/arm/lib/io-readsb.S | 1 + + arch/arm/lib/io-readsl.S | 1 + + arch/arm/lib/io-readsw-armv4.S | 1 + + arch/arm/lib/io-writesb.S | 1 + + arch/arm/lib/io-writesl.S | 1 + + arch/arm/lib/io-writesw-armv4.S | 1 + + arch/arm/lib/lib1funcs.S | 11 + + arch/arm/lib/lshrdi3.S | 2 + + arch/arm/lib/memchr.S | 1 + + arch/arm/lib/memcpy.S | 1 + + arch/arm/lib/memmove.S | 1 + + arch/arm/lib/memset.S | 1 + + arch/arm/lib/memzero.S | 1 + + arch/arm/lib/muldi3.S | 2 + + arch/arm/lib/putuser.S | 18 +- + arch/arm/lib/setbit.S | 2 + + arch/arm/lib/sha1.S | 3 + + arch/arm/lib/strchr.S | 1 + + arch/arm/lib/strncpy_from_user.S | 1 + + arch/arm/lib/strnlen_user.S | 1 + + arch/arm/lib/strrchr.S | 1 + + arch/arm/lib/testchangebit.S | 2 + + arch/arm/lib/testclearbit.S | 2 + + arch/arm/lib/testsetbit.S | 2 + + arch/arm/lib/uaccess.S | 2 + + arch/arm/lib/ucmpdi2.S | 4 + + arch/arm/mach-at91/Kconfig | 22 + + arch/arm/mach-at91/Makefile | 2 + + arch/arm/mach-at91/at91cap9.c | 6 +- + arch/arm/mach-at91/at91cap9_devices.c | 54 + + arch/arm/mach-at91/at91sam9263.c | 6 +- + arch/arm/mach-at91/at91sam9263_devices.c | 53 + + arch/arm/mach-at91/at91sam9rl.c | 6 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 98 + + arch/arm/mach-at91/at91x40_time.c | 2 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 210 + + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-carmeva.c | 28 +- + arch/arm/mach-at91/board-csb337.c | 12 +- + arch/arm/mach-at91/board-csb637.c | 4 +- + arch/arm/mach-at91/board-dk.c | 4 +- + arch/arm/mach-at91/board-ecbat91.c | 2 +- + arch/arm/mach-at91/board-ek.c | 4 +- + arch/arm/mach-at91/board-picotux200.c | 2 +- + arch/arm/mach-at91/board-qil-a9260.c | 14 +- + arch/arm/mach-at91/board-sam9-l9260.c | 4 +- + arch/arm/mach-at91/board-sam9260ek.c | 80 +- + arch/arm/mach-at91/board-sam9261ek.c | 18 +- + arch/arm/mach-at91/board-sam9263ek.c | 64 +- + arch/arm/mach-at91/board-sam9g20ek.c | 8 +- + arch/arm/mach-at91/board-sam9rlek.c | 8 +- + arch/arm/mach-at91/board-usb-a9260.c | 14 +- + arch/arm/mach-at91/board-usb-a9263.c | 14 +- + arch/arm/mach-at91/board-yl-9200.c | 50 +- + arch/arm/mach-at91/clock.c | 3 +- + arch/arm/mach-at91/gpio.c | 5 +- + arch/arm/mach-at91/include/mach/at91_pit.h | 3 + + arch/arm/mach-at91/include/mach/at91_rstc.h | 3 + + arch/arm/mach-at91/include/mach/at91_rtt.h | 3 + + arch/arm/mach-at91/include/mach/at91_shdwc.h | 3 + + arch/arm/mach-at91/include/mach/at91_wdt.h | 3 + + arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h | 2 + + .../mach-at91/include/mach/at91sam9260_matrix.h | 2 + + .../mach-at91/include/mach/at91sam9261_matrix.h | 2 + + arch/arm/mach-at91/include/mach/at91sam9_sdramc.h | 3 + + arch/arm/mach-at91/include/mach/at91sam9_smc.h | 3 + + arch/arm/mach-at91/include/mach/board.h | 14 + + arch/arm/mach-at91/include/mach/irqs.h | 2 +- + arch/arm/mach-at91/include/mach/uncompress.h | 2 +- + arch/arm/mach-at91/leds.c | 45 +- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-at91/pm_slowclock.S | 283 + + arch/arm/mach-clps711x/autcpu12.c | 2 +- + arch/arm/mach-clps711x/cdb89712.c | 2 +- + arch/arm/mach-clps711x/include/mach/system.h | 2 +- + arch/arm/mach-clps711x/irq.c | 2 +- + arch/arm/mach-clps711x/p720t-leds.c | 2 +- + arch/arm/mach-clps711x/p720t.c | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-clps7500/core.c | 2 +- + arch/arm/mach-clps7500/include/mach/irq.h | 2 +- + arch/arm/mach-clps7500/include/mach/memory.h | 8 + + arch/arm/mach-clps7500/include/mach/system.h | 2 +- + arch/arm/mach-davinci/Makefile | 2 +- + arch/arm/mach-davinci/board-evm.c | 341 +- + arch/arm/mach-davinci/clock.c | 2 +- + arch/arm/mach-davinci/devices.c | 48 + + arch/arm/mach-davinci/gpio.c | 138 +- + arch/arm/mach-davinci/id.c | 3 +- + arch/arm/mach-davinci/include/mach/common.h | 3 + + arch/arm/mach-davinci/include/mach/gpio.h | 73 +- + arch/arm/mach-davinci/include/mach/i2c.h | 7 +- + arch/arm/mach-davinci/include/mach/io.h | 43 +- + arch/arm/mach-davinci/include/mach/system.h | 2 +- + arch/arm/mach-davinci/io.c | 2 +- + arch/arm/mach-davinci/irq.c | 2 +- + arch/arm/mach-davinci/psc.c | 5 +- + arch/arm/mach-davinci/serial.c | 2 +- + arch/arm/mach-davinci/time.c | 2 +- + arch/arm/mach-davinci/usb.c | 116 + + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ebsa110/io.c | 2 +- + arch/arm/mach-ep93xx/Kconfig | 14 + + arch/arm/mach-ep93xx/adssphere.c | 28 +- + arch/arm/mach-ep93xx/clock.c | 2 +- + arch/arm/mach-ep93xx/core.c | 46 +- + arch/arm/mach-ep93xx/edb9302.c | 8 +- + arch/arm/mach-ep93xx/edb9302a.c | 28 +- + arch/arm/mach-ep93xx/edb9307.c | 28 +- + arch/arm/mach-ep93xx/edb9312.c | 8 +- + arch/arm/mach-ep93xx/edb9315.c | 8 +- + arch/arm/mach-ep93xx/edb9315a.c | 28 +- + arch/arm/mach-ep93xx/gesbc9312.c | 29 +- + arch/arm/mach-ep93xx/gpio.c | 6 +- + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 34 + + arch/arm/mach-ep93xx/include/mach/platform.h | 12 +- + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 2 +- + arch/arm/mach-ep93xx/include/mach/uncompress.h | 21 +- + arch/arm/mach-ep93xx/micro9.c | 34 +- + arch/arm/mach-ep93xx/ts72xx.c | 28 +- + arch/arm/mach-footbridge/cats-hw.c | 2 +- + arch/arm/mach-footbridge/common.c | 2 +- + arch/arm/mach-footbridge/dc21285.c | 2 +- + arch/arm/mach-footbridge/dma.c | 2 +- + arch/arm/mach-footbridge/include/mach/memory.h | 10 - + arch/arm/mach-footbridge/include/mach/system.h | 2 +- + arch/arm/mach-footbridge/isa-irq.c | 5 +- + arch/arm/mach-footbridge/isa-timer.c | 2 +- + arch/arm/mach-footbridge/netwinder-hw.c | 2 +- + arch/arm/mach-footbridge/time.c | 2 +- + arch/arm/mach-h720x/common.c | 6 +- + arch/arm/mach-h720x/cpu-h7202.c | 4 +- + arch/arm/mach-imx/clock.c | 2 +- + arch/arm/mach-imx/include/mach/irqs.h | 5 + + arch/arm/mach-imx/irq.c | 38 +- + arch/arm/mach-imx/leds-mx1ads.c | 2 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-integrator/core.c | 2 +- + arch/arm/mach-integrator/cpu.c | 2 +- + arch/arm/mach-integrator/impd1.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-integrator/integrator_cp.c | 5 +- + arch/arm/mach-integrator/leds.c | 2 +- + arch/arm/mach-integrator/pci_v3.c | 2 +- + arch/arm/mach-iop13xx/include/mach/memory.h | 61 +- + arch/arm/mach-iop13xx/include/mach/pci.h | 2 +- + arch/arm/mach-iop13xx/io.c | 2 +- + arch/arm/mach-iop13xx/msi.c | 3 +- + arch/arm/mach-iop13xx/setup.c | 2 +- + arch/arm/mach-iop13xx/tpmi.c | 2 +- + arch/arm/mach-iop32x/glantank.c | 2 +- + arch/arm/mach-iop32x/iq31244.c | 6 +- + arch/arm/mach-iop32x/iq80321.c | 2 +- + arch/arm/mach-iop32x/n2100.c | 2 +- + arch/arm/mach-iop33x/iq80331.c | 2 +- + arch/arm/mach-iop33x/iq80332.c | 2 +- + arch/arm/mach-iop33x/uart.c | 2 +- + arch/arm/mach-ixp2000/core.c | 33 +- + arch/arm/mach-ixp2000/enp2611.c | 8 +- + arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h | 8 +- + arch/arm/mach-ixp2000/ixdp2400.c | 2 +- + arch/arm/mach-ixp2000/ixdp2800.c | 2 +- + arch/arm/mach-ixp2000/ixdp2x00.c | 6 +- + arch/arm/mach-ixp2000/ixdp2x01.c | 6 +- + arch/arm/mach-ixp2000/pci.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 4 +- + arch/arm/mach-ixp23xx/ixdp2351.c | 8 +- + arch/arm/mach-ixp23xx/pci.c | 2 +- + arch/arm/mach-ixp4xx/common-pci.c | 9 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-ixp4xx/fsg-setup.c | 2 +- + arch/arm/mach-ixp4xx/include/mach/cpu.h | 9 +- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 +- + arch/arm/mach-ixp4xx/nas100d-setup.c | 2 +- + arch/arm/mach-ixp4xx/nslu2-setup.c | 2 +- + arch/arm/mach-kirkwood/addr-map.c | 8 + + arch/arm/mach-kirkwood/common.c | 84 +- + arch/arm/mach-kirkwood/common.h | 7 +- + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 3 +- + arch/arm/mach-kirkwood/include/mach/irqs.h | 1 + + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 14 + + arch/arm/mach-kirkwood/include/mach/timex.h | 1 - + arch/arm/mach-kirkwood/pcie.c | 6 + + arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- + arch/arm/mach-kirkwood/rd88f6281-setup.c | 3 +- + arch/arm/mach-ks8695/cpu.c | 2 +- + arch/arm/mach-ks8695/gpio.c | 22 +- + arch/arm/mach-ks8695/include/mach/memory.h | 4 +- + arch/arm/mach-ks8695/include/mach/regs-gpio.h | 4 +- + arch/arm/mach-ks8695/include/mach/regs-lan.h | 4 +- + arch/arm/mach-ks8695/include/mach/regs-wan.h | 4 +- + arch/arm/mach-ks8695/include/mach/system.h | 2 +- + arch/arm/mach-ks8695/include/mach/uncompress.h | 2 +- + arch/arm/mach-ks8695/irq.c | 2 +- + arch/arm/mach-ks8695/pci.c | 4 +- + arch/arm/mach-ks8695/time.c | 2 +- + arch/arm/mach-lh7a40x/Kconfig | 13 +- + arch/arm/mach-lh7a40x/arch-kev7a400.c | 2 +- + arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 4 +- + arch/arm/mach-lh7a40x/common.h | 1 - + arch/arm/mach-lh7a40x/include/mach/memory.h | 6 + + arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 4 +- + arch/arm/mach-lh7a40x/ssp-cpld.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-loki/addr-map.c | 2 +- + arch/arm/mach-loki/irq.c | 2 +- + arch/arm/mach-loki/lb88rc8480-setup.c | 2 +- + arch/arm/mach-msm/board-halibut.c | 5 +- + arch/arm/mach-msm/common.c | 2 +- + arch/arm/mach-msm/dma.c | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-msm/irq.c | 5 +- + arch/arm/mach-msm/timer.c | 3 +- + arch/arm/mach-mv78xx0/addr-map.c | 2 +- + arch/arm/mach-mv78xx0/common.c | 13 +- + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 8 +- + arch/arm/mach-mv78xx0/include/mach/entry-macro.S | 18 +- + arch/arm/mach-mv78xx0/include/mach/irqs.h | 7 +- + arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 2 + + arch/arm/mach-mv78xx0/irq.c | 1 + + arch/arm/mach-mx2/devices.h | 15 + + arch/arm/mach-mx2/mx27ads.c | 12 +- + arch/arm/mach-mx2/pcm038.c | 8 +- + arch/arm/mach-mx2/serial.c | 51 +- + arch/arm/mach-mx3/devices.c | 43 +- + arch/arm/mach-mx3/devices.h | 6 + + arch/arm/mach-mx3/iomux.c | 6 +- + arch/arm/mach-mx3/mm.c | 2 +- + arch/arm/mach-mx3/mx31ads.c | 120 +- + arch/arm/mach-mx3/mx31lite.c | 6 +- + arch/arm/mach-mx3/pcm037.c | 6 +- + arch/arm/mach-netx/generic.c | 7 +- + arch/arm/mach-netx/include/mach/system.h | 2 +- + arch/arm/mach-netx/pfifo.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-netx/xc.c | 2 +- + arch/arm/mach-ns9xxx/board-a9m9750dev.c | 5 +- + arch/arm/mach-ns9xxx/gpio.c | 2 +- + arch/arm/mach-ns9xxx/include/mach/uncompress.h | 2 +- + arch/arm/mach-ns9xxx/irq.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 4 + + arch/arm/mach-omap1/board-voiceblue.c | 1 + + arch/arm/mach-omap1/clock.c | 2 +- + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/fpga.c | 6 +- + arch/arm/mach-omap1/id.c | 3 +- + arch/arm/mach-omap1/io.c | 2 +- + arch/arm/mach-omap1/irq.c | 3 +- + arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- + arch/arm/mach-omap1/mailbox.c | 2 +- + arch/arm/mach-omap1/mux.c | 5 +- + arch/arm/mach-omap1/pm.c | 2 +- + arch/arm/mach-omap1/serial.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/board-2430sdp.c | 3 +- + arch/arm/mach-omap2/board-h4.c | 14 +- + arch/arm/mach-omap2/clock.c | 5 +- + arch/arm/mach-omap2/clock24xx.c | 3 +- + arch/arm/mach-omap2/clock34xx.c | 2 +- + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/gpmc.c | 2 +- + arch/arm/mach-omap2/id.c | 3 +- + arch/arm/mach-omap2/io.c | 2 +- + arch/arm/mach-omap2/irq.c | 2 +- + arch/arm/mach-omap2/mailbox.c | 2 +- + arch/arm/mach-omap2/memory.c | 3 +- + arch/arm/mach-omap2/mux.c | 5 +- + arch/arm/mach-omap2/pm.c | 2 +- + arch/arm/mach-omap2/serial.c | 3 +- + arch/arm/mach-orion5x/Kconfig | 26 + + arch/arm/mach-orion5x/Makefile | 4 + + arch/arm/mach-orion5x/addr-map.c | 2 +- + arch/arm/mach-orion5x/common.c | 74 +- + arch/arm/mach-orion5x/common.h | 2 + + arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- + arch/arm/mach-orion5x/dns323-setup.c | 2 +- + arch/arm/mach-orion5x/edmini_v2-setup.c | 262 + + arch/arm/mach-orion5x/gpio.c | 2 +- + arch/arm/mach-orion5x/include/mach/orion5x.h | 8 +- + arch/arm/mach-orion5x/include/mach/timex.h | 2 - + arch/arm/mach-orion5x/irq.c | 4 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +- + arch/arm/mach-orion5x/lsmini-setup.c | 279 + + arch/arm/mach-orion5x/mpp.c | 2 +- + arch/arm/mach-orion5x/mss2-setup.c | 2 +- + arch/arm/mach-orion5x/mv2120-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 117 + + arch/arm/mach-orion5x/terastation_pro2-setup.c | 369 + + arch/arm/mach-orion5x/ts78xx-setup.c | 3 +- + arch/arm/mach-orion5x/tsx09-common.c | 5 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +- + arch/arm/mach-pnx4008/clock.c | 2 +- + arch/arm/mach-pnx4008/core.c | 2 +- + arch/arm/mach-pnx4008/dma.c | 2 +- + arch/arm/mach-pnx4008/gpio.c | 2 +- + arch/arm/mach-pnx4008/include/mach/system.h | 2 +- + arch/arm/mach-pnx4008/include/mach/timex.h | 2 +- + arch/arm/mach-pnx4008/irq.c | 2 +- + arch/arm/mach-pnx4008/pm.c | 2 +- + arch/arm/mach-pnx4008/serial.c | 3 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/Kconfig | 94 +- + arch/arm/mach-pxa/Makefile | 37 +- + arch/arm/mach-pxa/akita-ioexp.c | 222 - + arch/arm/mach-pxa/am200epd.c | 374 + + arch/arm/mach-pxa/cm-x255.c | 258 + + arch/arm/mach-pxa/cm-x270-pci.h | 13 - + arch/arm/mach-pxa/cm-x270.c | 472 +-- + arch/arm/mach-pxa/{cm-x270-pci.c => cm-x2xx-pci.c} | 56 +- + arch/arm/mach-pxa/cm-x2xx-pci.h | 13 + + arch/arm/mach-pxa/cm-x2xx.c | 531 ++ + arch/arm/mach-pxa/cm-x300.c | 465 ++ + arch/arm/mach-pxa/colibri.c | 11 +- + arch/arm/mach-pxa/corgi.c | 478 +- + arch/arm/mach-pxa/corgi_lcd.c | 290 - + arch/arm/mach-pxa/corgi_pm.c | 1 - + arch/arm/mach-pxa/corgi_ssp.c | 276 - + arch/arm/mach-pxa/{cpu-pxa.c => cpufreq-pxa2xx.c} | 2 +- + arch/arm/mach-pxa/cpufreq-pxa3xx.c | 258 + + arch/arm/mach-pxa/devices.h | 1 + + arch/arm/mach-pxa/e330.c | 43 + + arch/arm/mach-pxa/e350.c | 43 + + arch/arm/mach-pxa/e400.c | 94 + + arch/arm/mach-pxa/e400_lcd.c | 56 - + arch/arm/mach-pxa/e740.c | 169 + + arch/arm/mach-pxa/e740_lcd.c | 123 - + arch/arm/mach-pxa/{e750_lcd.c => e750.c} | 67 +- + arch/arm/mach-pxa/{e800_lcd.c => e800.c} | 79 +- + arch/arm/mach-pxa/em-x270.c | 5 +- + arch/arm/mach-pxa/eseries.c | 157 +- + arch/arm/mach-pxa/eseries.h | 4 + + arch/arm/mach-pxa/eseries_udc.c | 57 - + arch/arm/mach-pxa/generic.c | 9 +- + arch/arm/mach-pxa/generic.h | 1 + + arch/arm/mach-pxa/gpio.c | 4 +- + arch/arm/mach-pxa/gumstix.c | 100 +- + arch/arm/mach-pxa/idp.c | 78 +- + arch/arm/mach-pxa/include/mach/akita.h | 32 - + arch/arm/mach-pxa/include/mach/camera.h | 2 - + arch/arm/mach-pxa/include/mach/corgi.h | 11 +- + arch/arm/mach-pxa/include/mach/entry-macro.S | 4 +- + arch/arm/mach-pxa/include/mach/hardware.h | 81 +- + arch/arm/mach-pxa/include/mach/i2c.h | 9 +- + arch/arm/mach-pxa/include/mach/irqs.h | 19 +- + arch/arm/mach-pxa/include/mach/littleton.h | 2 + + arch/arm/mach-pxa/include/mach/memory.h | 4 +- + arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 4 +- + arch/arm/mach-pxa/include/mach/mfp-pxa320.h | 8 +- + arch/arm/mach-pxa/include/mach/mfp.h | 5 +- + arch/arm/mach-pxa/include/mach/mioa701.h | 67 + + arch/arm/mach-pxa/include/mach/ohci.h | 16 + + arch/arm/mach-pxa/include/mach/palmz72.h | 80 + + arch/arm/mach-pxa/include/mach/pm.h | 2 + + arch/arm/mach-pxa/include/mach/poodle.h | 9 + + arch/arm/mach-pxa/include/mach/pxa-regs.h | 320 +- + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 22 + + arch/arm/mach-pxa/include/mach/reset.h | 9 +- + arch/arm/mach-pxa/include/mach/spitz.h | 42 +- + arch/arm/mach-pxa/include/mach/ssp.h | 24 + + arch/arm/mach-pxa/include/mach/trizeps4.h | 84 +- + arch/arm/mach-pxa/include/mach/viper.h | 96 + + arch/arm/mach-pxa/irq.c | 2 +- + arch/arm/mach-pxa/leds-trizeps4.c | 134 - + arch/arm/mach-pxa/leds.c | 2 - + arch/arm/mach-pxa/littleton.c | 205 +- + arch/arm/mach-pxa/lpd270.c | 99 +- + arch/arm/mach-pxa/lubbock.c | 26 +- + arch/arm/mach-pxa/magician.c | 16 +- + arch/arm/mach-pxa/mainstone.c | 15 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 225 +- + arch/arm/mach-pxa/mioa701.c | 905 ++ + arch/arm/mach-pxa/mioa701_bootresume.S | 36 + + arch/arm/mach-pxa/mp900.c | 100 + + arch/arm/mach-pxa/palmtx.c | 20 + + arch/arm/mach-pxa/palmz72.c | 554 ++ + arch/arm/mach-pxa/pcm027.c | 32 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 33 +- + arch/arm/mach-pxa/pm.c | 18 + + arch/arm/mach-pxa/poodle.c | 353 +- + arch/arm/mach-pxa/pxa25x.c | 66 +- + arch/arm/mach-pxa/pxa27x.c | 66 +- + arch/arm/mach-pxa/pxa3xx.c | 45 + + arch/arm/mach-pxa/reset.c | 11 +- + arch/arm/mach-pxa/sharpsl_pm.c | 16 +- + arch/arm/mach-pxa/spitz.c | 537 +- + arch/arm/mach-pxa/spitz_pm.c | 28 +- + arch/arm/mach-pxa/ssp.c | 2 +- + arch/arm/mach-pxa/time.c | 4 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 551 +- + arch/arm/mach-pxa/viper.c | 951 +++ + arch/arm/mach-pxa/zylonite.c | 17 + + arch/arm/mach-pxa/zylonite_pxa300.c | 12 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 10 + + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-realview/include/mach/system.h | 2 +- + arch/arm/mach-realview/localtimer.c | 2 +- + arch/arm/mach-realview/platsmp.c | 2 +- + arch/arm/mach-realview/realview_eb.c | 2 +- + arch/arm/mach-realview/realview_pb1176.c | 2 +- + arch/arm/mach-realview/realview_pb11mp.c | 2 +- + arch/arm/mach-rpc/dma.c | 2 +- + arch/arm/mach-rpc/include/mach/memory.h | 8 + + arch/arm/mach-rpc/include/mach/system.h | 2 +- + arch/arm/mach-rpc/include/mach/uncompress.h | 2 +- + arch/arm/mach-rpc/irq.c | 2 +- + arch/arm/mach-rpc/riscpc.c | 2 +- + arch/arm/mach-s3c2400/gpio.c | 2 +- + arch/arm/mach-s3c2410/bast-irq.c | 5 +- + arch/arm/mach-s3c2410/clock.c | 2 +- + arch/arm/mach-s3c2410/gpio.c | 2 +- + arch/arm/mach-s3c2410/include/mach/system-reset.h | 2 +- + arch/arm/mach-s3c2410/include/mach/system.h | 2 +- + arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- + arch/arm/mach-s3c2410/mach-bast.c | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 2 +- + arch/arm/mach-s3c2410/mach-n30.c | 2 +- + arch/arm/mach-s3c2410/mach-otom.c | 2 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 3 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- + arch/arm/mach-s3c2410/pm.c | 2 +- + arch/arm/mach-s3c2410/s3c2410.c | 2 +- + arch/arm/mach-s3c2410/usb-simtec.c | 2 +- + arch/arm/mach-s3c2412/clock.c | 2 +- + arch/arm/mach-s3c2412/dma.c | 2 +- + arch/arm/mach-s3c2412/irq.c | 6 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 2 +- + arch/arm/mach-s3c2412/mach-vstms.c | 3 +- + arch/arm/mach-s3c2412/pm.c | 2 +- + arch/arm/mach-s3c2412/s3c2412.c | 2 +- + arch/arm/mach-s3c2440/clock.c | 2 +- + arch/arm/mach-s3c2440/dsc.c | 2 +- + arch/arm/mach-s3c2440/irq.c | 9 +- + arch/arm/mach-s3c2440/mach-anubis.c | 3 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- + arch/arm/mach-s3c2440/mach-osiris.c | 2 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 3 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- + arch/arm/mach-s3c2440/s3c2440.c | 2 +- + arch/arm/mach-s3c2442/clock.c | 2 +- + arch/arm/mach-s3c2443/clock.c | 2 +- + arch/arm/mach-s3c2443/dma.c | 2 +- + arch/arm/mach-s3c2443/irq.c | 7 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +- + arch/arm/mach-s3c2443/s3c2443.c | 2 +- + arch/arm/mach-sa1100/badge4.c | 44 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 4 +- + arch/arm/mach-sa1100/cpu-sa1110.c | 3 +- + arch/arm/mach-sa1100/generic.c | 16 +- + arch/arm/mach-sa1100/include/mach/SA-1100.h | 16 - + arch/arm/mach-sa1100/include/mach/hardware.h | 18 + + arch/arm/mach-sa1100/include/mach/jornada720.h | 11 +- + arch/arm/mach-sa1100/include/mach/memory.h | 16 +- + arch/arm/mach-sa1100/irq.c | 4 +- + arch/arm/mach-sa1100/jornada720_ssp.c | 10 +- + arch/arm/mach-sa1100/neponset.c | 11 +- + arch/arm/mach-sa1100/pleb.c | 13 +- + arch/arm/mach-sa1100/simpad.c | 2 +- + arch/arm/mach-sa1100/ssp.c | 2 +- + arch/arm/mach-shark/core.c | 2 +- + arch/arm/mach-shark/include/mach/system.h | 2 +- + arch/arm/mach-shark/irq.c | 2 +- + arch/arm/mach-shark/leds.c | 2 +- + arch/arm/mach-versatile/core.c | 7 +- + arch/arm/mach-versatile/include/mach/system.h | 2 +- + arch/arm/mach-versatile/pci.c | 2 +- + arch/arm/mach-versatile/versatile_ab.c | 2 +- + arch/arm/mach-versatile/versatile_pb.c | 2 +- + arch/arm/mm/Kconfig | 8 + + arch/arm/mm/Makefile | 2 +- + arch/arm/mm/abort-ev7.S | 1 + + arch/arm/mm/abort-nommu.S | 1 + + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/cache-feroceon-l2.c | 42 +- + arch/arm/mm/cache-l2x0.c | 2 +- + arch/arm/mm/cache-v7.S | 10 + + arch/arm/mm/cache-xsc3l2.c | 3 +- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 1 + + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/{consistent.c => dma-mapping.c} | 104 +- + arch/arm/mm/extable.c | 2 +- + arch/arm/mm/fault-armv.c | 13 +- + arch/arm/mm/fault.c | 7 +- + arch/arm/mm/flush.c | 1 + + arch/arm/mm/init.c | 193 +- + arch/arm/mm/iomap.c | 3 +- + arch/arm/mm/ioremap.c | 15 +- + arch/arm/mm/mm.h | 3 +- + arch/arm/mm/mmap.c | 6 +- + arch/arm/mm/mmu.c | 106 +- + arch/arm/mm/nommu.c | 18 +- + arch/arm/mm/proc-arm1020.S | 26 +- + arch/arm/mm/proc-arm1020e.S | 26 +- + arch/arm/mm/proc-arm1022.S | 26 +- + arch/arm/mm/proc-arm1026.S | 26 +- + arch/arm/mm/proc-arm6_7.S | 27 +- + arch/arm/mm/proc-arm720.S | 25 +- + arch/arm/mm/proc-arm740.S | 2 +- + arch/arm/mm/proc-arm7tdmi.S | 2 +- + arch/arm/mm/proc-arm920.S | 28 +- + arch/arm/mm/proc-arm922.S | 26 +- + arch/arm/mm/proc-arm925.S | 26 +- + arch/arm/mm/proc-arm926.S | 26 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + arch/arm/mm/proc-arm9tdmi.S | 2 +- + arch/arm/mm/proc-feroceon.S | 33 +- + arch/arm/mm/proc-macros.S | 170 + + arch/arm/mm/proc-sa110.S | 21 +- + arch/arm/mm/proc-sa1100.S | 21 +- + arch/arm/mm/proc-v6.S | 42 +- + arch/arm/mm/proc-v7.S | 39 +- + arch/arm/mm/proc-xsc3.S | 56 +- + arch/arm/mm/proc-xscale.S | 76 +- + arch/arm/mm/tlb-v7.S | 2 + + arch/arm/nwfpe/fpa11_cpdt.c | 2 +- + arch/arm/oprofile/Makefile | 1 + + arch/arm/oprofile/backtrace.c | 2 +- + arch/arm/oprofile/common.c | 4 + + arch/arm/oprofile/op_arm_model.h | 1 + + arch/arm/oprofile/op_model_mpcore.c | 2 +- + arch/arm/oprofile/op_model_v7.c | 411 + + arch/arm/oprofile/op_model_v7.h | 103 + + arch/arm/oprofile/op_model_xscale.c | 2 +- + arch/arm/plat-iop/i2c.c | 2 +- + arch/arm/plat-iop/io.c | 2 +- + arch/arm/plat-iop/pci.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/Kconfig | 11 + + arch/arm/plat-mxc/Makefile | 4 +- + .../bcm47xx.h => arch/arm/plat-mxc/devices.c | 27 +- + arch/arm/plat-mxc/dma-mx1-mx2.c | 840 ++ + arch/arm/plat-mxc/include/mach/board-mx31ads.h | 3 + + arch/arm/plat-mxc/include/mach/clock.h | 2 +- + arch/arm/plat-mxc/include/mach/common.h | 3 + + arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | 89 + + arch/arm/plat-mxc/include/mach/entry-macro.S | 12 +- + arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h | 24 + + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 20 + + arch/arm/plat-mxc/include/mach/irqs.h | 1 + + arch/arm/plat-mxc/include/mach/mx27.h | 1 + + arch/arm/plat-mxc/include/mach/mx31.h | 1 + + arch/arm/plat-mxc/include/mach/mxc.h | 6 + + arch/arm/plat-mxc/irq.c | 36 +- + arch/arm/plat-omap/clock.c | 3 +- + arch/arm/plat-omap/common.c | 2 +- + arch/arm/plat-omap/cpu-omap.c | 2 +- + arch/arm/plat-omap/debug-devices.c | 2 +- + arch/arm/plat-omap/debug-leds.c | 2 +- + arch/arm/plat-omap/devices.c | 36 +- + arch/arm/plat-omap/dmtimer.c | 2 +- + arch/arm/plat-omap/fb.c | 2 +- + arch/arm/plat-omap/gpio.c | 8 +- + arch/arm/plat-omap/include/mach/gpio.h | 2 +- + arch/arm/plat-omap/include/mach/irqs.h | 2 + + arch/arm/plat-omap/include/mach/mtd-xip.h | 2 +- + arch/arm/plat-omap/mailbox.c | 2 +- + arch/arm/plat-omap/mux.c | 2 +- + arch/arm/plat-omap/ocpi.c | 2 +- + arch/arm/plat-omap/sram.c | 2 +- + arch/arm/plat-omap/usb.c | 2 +- + arch/arm/plat-s3c24xx/clock.c | 2 +- + arch/arm/plat-s3c24xx/common-smdk.c | 2 +- + arch/arm/plat-s3c24xx/cpu.c | 4 +- + arch/arm/plat-s3c24xx/devs.c | 2 +- + arch/arm/plat-s3c24xx/dma.c | 2 +- + arch/arm/plat-s3c24xx/gpio.c | 2 +- + arch/arm/plat-s3c24xx/irq.c | 26 +- + arch/arm/plat-s3c24xx/pm-simtec.c | 2 +- + arch/arm/plat-s3c24xx/pm.c | 2 +- + arch/arm/plat-s3c24xx/s3c244x-clock.c | 2 +- + arch/arm/plat-s3c24xx/s3c244x-irq.c | 9 +- + arch/arm/plat-s3c24xx/s3c244x.c | 2 +- + arch/arm/plat-s3c24xx/time.c | 2 +- + arch/arm/tools/mach-types | 44 +- + arch/arm/vfp/entry.S | 8 +- + arch/arm/vfp/vfphw.S | 25 +- + arch/avr32/boards/atngw100/setup.c | 19 +- + arch/avr32/boards/atstk1000/atstk1002.c | 25 +- + arch/avr32/boards/atstk1000/atstk1003.c | 15 +- + arch/avr32/boards/atstk1000/atstk1004.c | 18 +- + arch/avr32/boot/images/.gitignore | 4 + + arch/avr32/include/asm/a.out.h | 20 - + arch/avr32/include/asm/atmel-mci.h | 32 +- + arch/avr32/include/asm/byteorder.h | 22 +- + arch/avr32/include/asm/io.h | 8 + + arch/avr32/kernel/.gitignore | 1 + + arch/avr32/kernel/avr32_ksyms.c | 1 + + arch/avr32/kernel/process.c | 3 +- + arch/avr32/kernel/setup.c | 19 + + arch/avr32/kernel/syscall-stubs.S | 9 + + arch/avr32/kernel/syscall_table.S | 2 +- + arch/avr32/kernel/traps.c | 8 +- + arch/avr32/lib/findbit.S | 30 + + arch/avr32/mach-at32ap/at32ap700x.c | 460 +- + arch/avr32/mach-at32ap/clock.c | 52 +- + arch/avr32/mach-at32ap/clock.h | 8 +- + arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 128 + + arch/avr32/mach-at32ap/include/mach/board.h | 2 +- + arch/avr32/mach-at32ap/include/mach/io.h | 3 +- + arch/avr32/mach-at32ap/include/mach/portmux.h | 5 +- + arch/avr32/mach-at32ap/pdc.c | 3 +- + arch/avr32/mach-at32ap/pio.c | 63 +- + arch/avr32/oprofile/Makefile | 2 +- + arch/avr32/oprofile/backtrace.c | 81 + + arch/avr32/oprofile/op_model_avr32.c | 4 + + arch/blackfin/Kconfig | 75 +- + arch/blackfin/Kconfig.debug | 55 + + arch/blackfin/Makefile | 1 + + arch/blackfin/configs/BF526-EZBRD_defconfig | 1427 ++++ + arch/blackfin/configs/H8606_defconfig | 36 +- + arch/blackfin/include/asm/a.out.h | 19 - + arch/blackfin/include/asm/bfin-global.h | 5 +- + arch/blackfin/include/asm/bfrom.h | 85 + + arch/blackfin/include/asm/cacheflush.h | 2 - + arch/blackfin/include/asm/cplb.h | 8 +- + arch/blackfin/include/asm/cplbinit.h | 16 +- + arch/blackfin/include/asm/cpumask.h | 6 - + arch/blackfin/include/asm/dma-mapping.h | 11 + + arch/blackfin/include/asm/kgdb.h | 21 +- + arch/blackfin/include/asm/mmu_context.h | 79 +- + arch/blackfin/include/asm/processor.h | 6 + + arch/blackfin/include/asm/ptrace.h | 2 + + arch/blackfin/include/asm/traps.h | 5 +- + arch/blackfin/kernel/asm-offsets.c | 1 + + arch/blackfin/kernel/bfin_dma_5xx.c | 13 +- + arch/blackfin/kernel/bfin_gpio.c | 9 +- + arch/blackfin/kernel/cplb-mpu/cplbinit.c | 12 +- + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 14 +- + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 6 +- + arch/blackfin/kernel/early_printk.c | 12 + + arch/blackfin/kernel/kgdb.c | 711 ++- + arch/blackfin/kernel/ptrace.c | 215 +- + arch/blackfin/kernel/reboot.c | 18 +- + arch/blackfin/kernel/setup.c | 97 +- + arch/blackfin/kernel/traps.c | 367 +- + arch/blackfin/mach-bf527/boards/Kconfig | 5 + + arch/blackfin/mach-bf527/boards/Makefile | 1 + + arch/blackfin/mach-bf527/boards/cm_bf527.c | 17 +- + arch/blackfin/mach-bf527/boards/ezbrd.c | 734 ++ + arch/blackfin/mach-bf527/boards/ezkit.c | 53 +- + arch/blackfin/mach-bf527/head.S | 3 + + arch/blackfin/mach-bf527/include/mach/anomaly.h | 160 +- + arch/blackfin/mach-bf527/include/mach/bf527.h | 21 +- + .../mach-bf527/include/mach/bfin_serial_5xx.h | 6 +- + .../mach-bf527/include/mach/defBF52x_base.h | 27 + + arch/blackfin/mach-bf527/include/mach/portmux.h | 4 + + arch/blackfin/mach-bf533/boards/H8606.c | 34 +- + arch/blackfin/mach-bf533/head.S | 3 + + arch/blackfin/mach-bf533/include/mach/anomaly.h | 49 +- + arch/blackfin/mach-bf533/include/mach/bf533.h | 12 +- + .../mach-bf533/include/mach/bfin_serial_5xx.h | 6 +- + arch/blackfin/mach-bf537/boards/stamp.c | 85 +- + arch/blackfin/mach-bf537/head.S | 3 + + arch/blackfin/mach-bf537/include/mach/anomaly.h | 2 + + arch/blackfin/mach-bf537/include/mach/bf537.h | 12 +- + .../mach-bf537/include/mach/bfin_serial_5xx.h | 6 +- + arch/blackfin/mach-bf548/boards/cm_bf548.c | 22 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 58 +- + arch/blackfin/mach-bf548/head.S | 52 +- + arch/blackfin/mach-bf548/include/mach/anomaly.h | 93 +- + arch/blackfin/mach-bf548/include/mach/bf548.h | 25 +- + .../mach-bf548/include/mach/bfin_serial_5xx.h | 6 +- + arch/blackfin/mach-bf548/include/mach/mem_map.h | 14 +- + arch/blackfin/mach-bf561/head.S | 3 + + arch/blackfin/mach-bf561/include/mach/anomaly.h | 2 + + arch/blackfin/mach-bf561/include/mach/bf561.h | 8 +- + .../mach-bf561/include/mach/bfin_serial_5xx.h | 6 +- + arch/blackfin/mach-bf561/include/mach/mem_map.h | 18 +- + arch/blackfin/mach-common/entry.S | 219 +- + arch/blackfin/mach-common/head.S | 52 +- + arch/blackfin/mach-common/interrupt.S | 11 +- + arch/blackfin/mach-common/ints-priority.c | 25 +- + arch/blackfin/mm/Makefile | 2 +- + arch/blackfin/mm/isram-driver.c | 201 + + arch/blackfin/mm/{blackfin_sram.c => sram-alloc.c} | 31 +- + arch/cris/arch-v10/boot/tools/build.c | 1 - + arch/cris/arch-v32/kernel/smp.c | 1 + + arch/h8300/Kconfig | 3 - + arch/h8300/include/asm/a.out.h | 20 - + arch/h8300/kernel/process.c | 1 - + arch/ia64/include/asm/a.out.h | 32 - + arch/ia64/include/asm/dma-mapping.h | 4 +- + arch/ia64/include/asm/sections.h | 3 + + arch/ia64/include/asm/siginfo.h | 5 - + arch/ia64/include/asm/statfs.h | 52 +- + arch/ia64/kernel/efi.c | 5 +- + arch/ia64/kernel/head.S | 9 +- + arch/ia64/kernel/setup.c | 2 + + arch/ia64/kernel/smpboot.c | 1 + + arch/ia64/kernel/vmlinux.lds.S | 8 +- + arch/ia64/kvm/kvm-ia64.c | 7 +- + arch/ia64/mm/contig.c | 2 +- + arch/ia64/mm/discontig.c | 2 +- + arch/ia64/mm/init.c | 1 - + arch/m32r/Kconfig | 13 +- + arch/m32r/kernel/entry.S | 2 +- + arch/m32r/kernel/head.S | 1 - + arch/m32r/kernel/irq.c | 6 - + arch/m32r/kernel/m32r_ksyms.c | 2 + + arch/m32r/kernel/process.c | 30 +- + arch/m32r/kernel/smp.c | 4 +- + arch/m32r/kernel/smpboot.c | 2 + + arch/m32r/kernel/time.c | 5 +- + arch/m32r/kernel/traps.c | 8 +- + arch/m32r/lib/delay.c | 2 + + arch/m68k/Kconfig | 64 +- + arch/m68k/amiga/config.c | 9 + + arch/m68k/atari/Makefile | 3 - + arch/m68k/atari/ataints.c | 6 +- + arch/m68k/atari/atakeyb.c | 12 - + arch/m68k/atari/config.c | 37 +- + arch/m68k/atari/hades-pci.c | 440 - + arch/m68k/atari/time.c | 38 +- + arch/m68k/bvme6000/config.c | 15 +- + arch/m68k/bvme6000/rtc.c | 30 +- + arch/m68k/kernel/Makefile | 1 - + arch/m68k/kernel/bios32.c | 514 -- + arch/m68k/kernel/dma.c | 4 +- + arch/m68k/kernel/ints.c | 3 +- + arch/m68k/kernel/process.c | 2 +- + arch/m68k/kernel/traps.c | 9 +- + arch/m68k/kernel/vmlinux-std.lds | 9 +- + arch/m68k/mm/kmap.c | 4 +- + arch/m68k/mvme16x/rtc.c | 26 +- + arch/m68k/q40/config.c | 12 +- + arch/m68k/sun3x/time.c | 28 +- + arch/m68knommu/Kconfig | 3 - + arch/m68knommu/include/asm/a.out.h | 1 - + arch/m68knommu/kernel/process.c | 1 - + arch/m68knommu/kernel/traps.c | 1 - + arch/mips/Kconfig | 70 +- + arch/mips/Makefile | 122 +- + arch/mips/{au1000 => alchemy}/Kconfig | 0 + arch/mips/{au1000 => alchemy}/common/Makefile | 0 + .../{au1000 => alchemy}/common/au1xxx_irqmap.c | 0 + arch/mips/{au1000 => alchemy}/common/clocks.c | 0 + arch/mips/{au1000 => alchemy}/common/cputable.c | 0 + arch/mips/{au1000 => alchemy}/common/dbdma.c | 0 + arch/mips/{au1000 => alchemy}/common/dma.c | 0 + arch/mips/{au1000 => alchemy}/common/gpio.c | 6 +- + arch/mips/{au1000 => alchemy}/common/irq.c | 0 + arch/mips/{au1000 => alchemy}/common/pci.c | 0 + arch/mips/{au1000 => alchemy}/common/platform.c | 0 + arch/mips/{au1000 => alchemy}/common/power.c | 0 + arch/mips/{au1000 => alchemy}/common/prom.c | 0 + arch/mips/{au1000 => alchemy}/common/puts.c | 0 + arch/mips/{au1000 => alchemy}/common/reset.c | 0 + arch/mips/{au1000 => alchemy}/common/setup.c | 0 + arch/mips/{au1000 => alchemy}/common/sleeper.S | 10 +- + arch/mips/{au1000 => alchemy}/common/time.c | 0 + arch/mips/{au1000 => alchemy}/db1x00/Makefile | 0 + arch/mips/{au1000 => alchemy}/db1x00/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/db1x00/init.c | 0 + arch/mips/{au1000 => alchemy}/db1x00/irqmap.c | 0 + arch/mips/{au1000 => alchemy}/mtx-1/Makefile | 0 + arch/mips/{au1000 => alchemy}/mtx-1/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/mtx-1/init.c | 0 + arch/mips/{au1000 => alchemy}/mtx-1/irqmap.c | 0 + arch/mips/{au1000 => alchemy}/mtx-1/platform.c | 0 + arch/mips/{au1000 => alchemy}/pb1000/Makefile | 0 + arch/mips/{au1000 => alchemy}/pb1000/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/pb1000/init.c | 0 + arch/mips/{au1000 => alchemy}/pb1000/irqmap.c | 0 + arch/mips/{au1000 => alchemy}/pb1100/Makefile | 0 + arch/mips/{au1000 => alchemy}/pb1100/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/pb1100/init.c | 0 + arch/mips/{au1000 => alchemy}/pb1100/irqmap.c | 0 + arch/mips/{au1000 => alchemy}/pb1200/Makefile | 0 + arch/mips/{au1000 => alchemy}/pb1200/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/pb1200/init.c | 0 + arch/mips/{au1000 => alchemy}/pb1200/irqmap.c | 0 + arch/mips/{au1000 => alchemy}/pb1200/platform.c | 0 + arch/mips/{au1000 => alchemy}/pb1500/Makefile | 0 + arch/mips/{au1000 => alchemy}/pb1500/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/pb1500/init.c | 0 + arch/mips/{au1000 => alchemy}/pb1500/irqmap.c | 0 + arch/mips/{au1000 => alchemy}/pb1550/Makefile | 0 + arch/mips/{au1000 => alchemy}/pb1550/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/pb1550/init.c | 0 + arch/mips/{au1000 => alchemy}/pb1550/irqmap.c | 0 + arch/mips/{au1000 => alchemy}/xxs1500/Makefile | 0 + .../mips/{au1000 => alchemy}/xxs1500/board_setup.c | 0 + arch/mips/{au1000 => alchemy}/xxs1500/init.c | 0 + arch/mips/{au1000 => alchemy}/xxs1500/irqmap.c | 0 + arch/mips/bcm47xx/gpio.c | 85 +- + arch/mips/bcm47xx/setup.c | 5 +- + arch/mips/bcm47xx/wgt634u.c | 40 + + arch/mips/emma2rh/common/irq.c | 1 - + arch/mips/emma2rh/common/prom.c | 1 - + arch/mips/emma2rh/markeins/platform.c | 1 - + {include/asm-mips => arch/mips/include/asm}/Kbuild | 0 + {include/asm-mips => arch/mips/include/asm}/abi.h | 0 + .../asm-mips => arch/mips/include/asm}/addrspace.h | 0 + {include/asm-mips => arch/mips/include/asm}/asm.h | 0 + .../mips/include/asm}/asmmacro-32.h | 0 + .../mips/include/asm}/asmmacro-64.h | 0 + .../asm-mips => arch/mips/include/asm}/asmmacro.h | 0 + .../asm-mips => arch/mips/include/asm}/atomic.h | 0 + .../asm-mips => arch/mips/include/asm}/auxvec.h | 0 + .../asm-mips => arch/mips/include/asm}/barrier.h | 0 + .../asm-mips => arch/mips/include/asm}/bcache.h | 0 + .../asm-mips => arch/mips/include/asm}/bitops.h | 0 + .../asm-mips => arch/mips/include/asm}/bootinfo.h | 0 + .../asm-mips => arch/mips/include/asm}/branch.h | 0 + .../asm-mips => arch/mips/include/asm}/break.h | 0 + {include/asm-mips => arch/mips/include/asm}/bug.h | 0 + {include/asm-mips => arch/mips/include/asm}/bugs.h | 0 + .../asm-mips => arch/mips/include/asm}/byteorder.h | 0 + .../asm-mips => arch/mips/include/asm}/cache.h | 0 + .../asm-mips => arch/mips/include/asm}/cachectl.h | 0 + .../mips/include/asm}/cacheflush.h | 0 + .../asm-mips => arch/mips/include/asm}/cacheops.h | 0 + arch/mips/include/asm/cevt-r4k.h | 46 + + .../asm-mips => arch/mips/include/asm}/checksum.h | 0 + {include/asm-mips => arch/mips/include/asm}/cmp.h | 0 + .../asm-mips => arch/mips/include/asm}/cmpxchg.h | 0 + .../mips/include/asm}/compat-signal.h | 0 + .../asm-mips => arch/mips/include/asm}/compat.h | 0 + .../asm-mips => arch/mips/include/asm}/compiler.h | 0 + .../mips/include/asm}/cpu-features.h | 0 + .../asm-mips => arch/mips/include/asm}/cpu-info.h | 6 + + {include/asm-mips => arch/mips/include/asm}/cpu.h | 0 + .../asm-mips => arch/mips/include/asm}/cputime.h | 0 + .../asm-mips => arch/mips/include/asm}/current.h | 0 + .../asm-mips => arch/mips/include/asm}/debug.h | 0 + .../asm-mips => arch/mips/include/asm}/dec/ecc.h | 0 + .../mips/include/asm}/dec/interrupts.h | 0 + .../mips/include/asm}/dec/ioasic.h | 0 + .../mips/include/asm}/dec/ioasic_addrs.h | 0 + .../mips/include/asm}/dec/ioasic_ints.h | 0 + .../asm-mips => arch/mips/include/asm}/dec/kn01.h | 0 + .../asm-mips => arch/mips/include/asm}/dec/kn02.h | 0 + .../mips/include/asm}/dec/kn02ba.h | 0 + .../mips/include/asm}/dec/kn02ca.h | 0 + .../mips/include/asm}/dec/kn02xa.h | 0 + .../asm-mips => arch/mips/include/asm}/dec/kn03.h | 0 + .../asm-mips => arch/mips/include/asm}/dec/kn05.h | 0 + .../asm-mips => arch/mips/include/asm}/dec/kn230.h | 0 + .../mips/include/asm}/dec/machtype.h | 0 + .../asm-mips => arch/mips/include/asm}/dec/prom.h | 0 + .../mips/include/asm}/dec/system.h | 0 + .../asm-mips => arch/mips/include/asm}/delay.h | 0 + .../asm-mips => arch/mips/include/asm}/device.h | 0 + .../asm-mips => arch/mips/include/asm}/div64.h | 0 + .../mips/include/asm}/dma-mapping.h | 0 + {include/asm-mips => arch/mips/include/asm}/dma.h | 0 + .../asm-mips => arch/mips/include/asm}/ds1286.h | 0 + .../asm-mips => arch/mips/include/asm}/ds1287.h | 0 + {include/asm-mips => arch/mips/include/asm}/dsp.h | 0 + {include/asm-mips => arch/mips/include/asm}/edac.h | 0 + {include/asm-mips => arch/mips/include/asm}/elf.h | 0 + .../mips/include/asm}/emergency-restart.h | 0 + .../mips/include/asm}/emma2rh/emma2rh.h | 0 + .../mips/include/asm}/emma2rh/markeins.h | 0 + .../asm-mips => arch/mips/include/asm}/errno.h | 0 + {include/asm-mips => arch/mips/include/asm}/fb.h | 0 + .../asm-mips => arch/mips/include/asm}/fcntl.h | 0 + .../asm-mips => arch/mips/include/asm}/fixmap.h | 0 + .../asm-mips => arch/mips/include/asm}/floppy.h | 0 + .../asm-mips => arch/mips/include/asm}/fpregdef.h | 0 + {include/asm-mips => arch/mips/include/asm}/fpu.h | 0 + .../mips/include/asm}/fpu_emulator.h | 0 + .../asm-mips => arch/mips/include/asm}/futex.h | 0 + .../mips/include/asm}/fw/arc/hinv.h | 0 + .../mips/include/asm}/fw/arc/types.h | 0 + .../mips/include/asm}/fw/cfe/cfe_api.h | 0 + .../mips/include/asm}/fw/cfe/cfe_error.h | 0 + .../asm-mips => arch/mips/include/asm}/gcmpregs.h | 0 + {include/asm-mips => arch/mips/include/asm}/gic.h | 0 + {include/asm-mips => arch/mips/include/asm}/gpio.h | 0 + .../asm-mips => arch/mips/include/asm}/gt64120.h | 0 + .../asm-mips => arch/mips/include/asm}/hardirq.h | 0 + .../asm-mips => arch/mips/include/asm}/hazards.h | 0 + .../asm-mips => arch/mips/include/asm}/highmem.h | 0 + .../asm-mips => arch/mips/include/asm}/hw_irq.h | 0 + .../asm-mips => arch/mips/include/asm}/i8253.h | 0 + .../asm-mips => arch/mips/include/asm}/i8259.h | 0 + {include/asm-mips => arch/mips/include/asm}/ide.h | 0 + {include/asm-mips => arch/mips/include/asm}/inst.h | 0 + {include/asm-mips => arch/mips/include/asm}/io.h | 0 + .../asm-mips => arch/mips/include/asm}/ioctl.h | 0 + .../asm-mips => arch/mips/include/asm}/ioctls.h | 0 + .../mips/include/asm}/ip32/crime.h | 0 + .../mips/include/asm}/ip32/ip32_ints.h | 0 + .../asm-mips => arch/mips/include/asm}/ip32/mace.h | 0 + .../asm-mips => arch/mips/include/asm}/ipcbuf.h | 0 + {include/asm-mips => arch/mips/include/asm}/irq.h | 0 + .../asm-mips => arch/mips/include/asm}/irq_cpu.h | 0 + .../mips/include/asm}/irq_gt641xx.h | 0 + .../asm-mips => arch/mips/include/asm}/irq_regs.h | 0 + .../asm-mips => arch/mips/include/asm}/irqflags.h | 26 +- + .../asm-mips => arch/mips/include/asm}/isadep.h | 0 + {include/asm-mips => arch/mips/include/asm}/jazz.h | 0 + .../asm-mips => arch/mips/include/asm}/jazzdma.h | 0 + .../asm-mips => arch/mips/include/asm}/kdebug.h | 0 + .../asm-mips => arch/mips/include/asm}/kexec.h | 0 + {include/asm-mips => arch/mips/include/asm}/kgdb.h | 0 + .../mips/include/asm}/kmap_types.h | 0 + {include/asm-mips => arch/mips/include/asm}/kspd.h | 0 + .../mips/include/asm}/lasat/ds1603.h | 0 + .../mips/include/asm}/lasat/eeprom.h | 0 + .../mips/include/asm}/lasat/head.h | 0 + .../mips/include/asm}/lasat/lasat.h | 0 + .../mips/include/asm}/lasat/lasatint.h | 0 + .../mips/include/asm}/lasat/picvue.h | 0 + .../mips/include/asm}/lasat/serial.h | 0 + .../asm-mips => arch/mips/include/asm}/linkage.h | 0 + .../asm-mips => arch/mips/include/asm}/local.h | 0 + .../asm-mips => arch/mips/include/asm}/m48t35.h | 0 + .../asm-mips => arch/mips/include/asm}/m48t37.h | 0 + .../mips/include/asm}/mach-au1x00/au1000.h | 0 + .../mips/include/asm}/mach-au1x00/au1000_dma.h | 0 + .../mips/include/asm}/mach-au1x00/au1000_gpio.h | 0 + .../mips/include/asm}/mach-au1x00/au1100_mmc.h | 0 + .../mips/include/asm}/mach-au1x00/au1550_spi.h | 0 + .../mips/include/asm}/mach-au1x00/au1xxx.h | 0 + .../mips/include/asm}/mach-au1x00/au1xxx_dbdma.h | 0 + .../mips/include/asm}/mach-au1x00/au1xxx_ide.h | 0 + .../mips/include/asm}/mach-au1x00/au1xxx_psc.h | 0 + .../mips/include/asm}/mach-au1x00/gpio.h | 0 + .../mips/include/asm}/mach-au1x00/ioremap.h | 0 + .../mips/include/asm}/mach-au1x00/prom.h | 0 + .../mips/include/asm}/mach-au1x00/war.h | 0 + .../mips/include/asm}/mach-bcm47xx/bcm47xx.h | 0 + .../mips/include/asm}/mach-bcm47xx/gpio.h | 41 +- + .../mips/include/asm/mach-bcm47xx}/war.h | 6 +- + .../mips/include/asm}/mach-cobalt/cobalt.h | 0 + .../asm}/mach-cobalt/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-cobalt/irq.h | 0 + .../mips/include/asm}/mach-cobalt/mach-gt64120.h | 0 + .../mips/include/asm}/mach-cobalt/war.h | 0 + .../mips/include/asm}/mach-db1x00/db1200.h | 0 + .../mips/include/asm}/mach-db1x00/db1x00.h | 0 + .../mips/include/asm}/mach-dec/mc146818rtc.h | 0 + .../mips/include/asm}/mach-dec/war.h | 0 + .../mips/include/asm}/mach-emma2rh/irq.h | 0 + .../mips/include/asm}/mach-emma2rh/war.h | 0 + .../asm}/mach-excite/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-excite/excite.h | 0 + .../mips/include/asm}/mach-excite/excite_fpga.h | 0 + .../include/asm}/mach-excite/excite_nandflash.h | 0 + .../mips/include/asm}/mach-excite/rm9k_eth.h | 0 + .../mips/include/asm}/mach-excite/rm9k_wdt.h | 0 + .../mips/include/asm}/mach-excite/rm9k_xicap.h | 0 + .../mips/include/asm}/mach-excite/war.h | 0 + .../asm}/mach-generic/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-generic/dma-coherence.h | 0 + .../mips/include/asm}/mach-generic/floppy.h | 0 + .../mips/include/asm}/mach-generic/gpio.h | 0 + .../mips/include/asm}/mach-generic/ide.h | 29 - + .../mips/include/asm}/mach-generic/ioremap.h | 0 + .../mips/include/asm}/mach-generic/irq.h | 0 + .../include/asm}/mach-generic/kernel-entry-init.h | 0 + .../mips/include/asm}/mach-generic/kmalloc.h | 0 + .../mips/include/asm}/mach-generic/mangle-port.h | 0 + .../mips/include/asm}/mach-generic/mc146818rtc.h | 0 + .../mips/include/asm}/mach-generic/spaces.h | 0 + .../mips/include/asm}/mach-generic/topology.h | 0 + .../include/asm}/mach-ip22/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-ip22/spaces.h | 0 + .../mips/include/asm}/mach-ip22/war.h | 0 + .../include/asm}/mach-ip27/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-ip27/dma-coherence.h | 0 + .../mips/include/asm}/mach-ip27/irq.h | 0 + .../include/asm}/mach-ip27/kernel-entry-init.h | 0 + .../mips/include/asm}/mach-ip27/kmalloc.h | 0 + .../mips/include/asm}/mach-ip27/mangle-port.h | 0 + .../mips/include/asm}/mach-ip27/mmzone.h | 0 + .../mips/include/asm}/mach-ip27/spaces.h | 0 + .../mips/include/asm}/mach-ip27/topology.h | 0 + .../mips/include/asm}/mach-ip27/war.h | 0 + .../include/asm}/mach-ip28/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-ip28/spaces.h | 0 + .../mips/include/asm}/mach-ip28/war.h | 0 + .../include/asm}/mach-ip32/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-ip32/dma-coherence.h | 0 + .../mips/include/asm}/mach-ip32/kmalloc.h | 0 + .../mips/include/asm}/mach-ip32/mangle-port.h | 0 + .../mips/include/asm}/mach-ip32/mc146818rtc.h | 0 + .../mips/include/asm}/mach-ip32/war.h | 0 + .../mips/include/asm}/mach-jazz/dma-coherence.h | 0 + .../mips/include/asm}/mach-jazz/floppy.h | 0 + .../mips/include/asm}/mach-jazz/mc146818rtc.h | 0 + .../mips/include/asm}/mach-jazz/war.h | 0 + .../mips/include/asm}/mach-lasat/irq.h | 0 + .../mips/include/asm}/mach-lasat/mach-gt64120.h | 0 + .../mips/include/asm}/mach-lasat/war.h | 0 + .../mips/include/asm}/mach-lemote/dma-coherence.h | 0 + .../mips/include/asm}/mach-lemote/mc146818rtc.h | 0 + .../mips/include/asm}/mach-lemote/war.h | 0 + .../asm}/mach-malta/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-malta/irq.h | 0 + .../include/asm}/mach-malta/kernel-entry-init.h | 0 + .../mips/include/asm}/mach-malta/mach-gt64120.h | 0 + .../mips/include/asm}/mach-malta/mc146818rtc.h | 0 + .../mips/include/asm}/mach-malta/war.h | 0 + .../asm}/mach-mipssim/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-mipssim/war.h | 0 + .../mips/include/asm}/mach-pb1x00/mc146818rtc.h | 0 + .../mips/include/asm}/mach-pb1x00/pb1000.h | 0 + .../mips/include/asm}/mach-pb1x00/pb1100.h | 0 + .../mips/include/asm}/mach-pb1x00/pb1200.h | 0 + .../mips/include/asm}/mach-pb1x00/pb1500.h | 0 + .../mips/include/asm}/mach-pb1x00/pb1550.h | 0 + .../mips/include/asm}/mach-pnx8550/cm.h | 0 + .../mips/include/asm}/mach-pnx8550/glb.h | 0 + .../mips/include/asm}/mach-pnx8550/int.h | 0 + .../include/asm}/mach-pnx8550/kernel-entry-init.h | 0 + .../mips/include/asm}/mach-pnx8550/nand.h | 0 + .../mips/include/asm}/mach-pnx8550/pci.h | 0 + .../mips/include/asm}/mach-pnx8550/uart.h | 0 + .../mips/include/asm}/mach-pnx8550/usb.h | 0 + .../mips/include/asm}/mach-pnx8550/war.h | 0 + .../asm}/mach-rc32434/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-rc32434/ddr.h | 0 + .../mips/include/asm}/mach-rc32434/dma.h | 0 + .../mips/include/asm}/mach-rc32434/dma_v.h | 0 + .../mips/include/asm}/mach-rc32434/eth.h | 0 + .../mips/include/asm}/mach-rc32434/gpio.h | 74 +- + .../mips/include/asm}/mach-rc32434/integ.h | 0 + arch/mips/include/asm/mach-rc32434/irq.h | 33 + + .../mips/include/asm}/mach-rc32434/pci.h | 0 + .../mips/include/asm}/mach-rc32434/prom.h | 4 - + .../mips/include/asm}/mach-rc32434/rb.h | 5 +- + arch/mips/include/asm/mach-rc32434/rc32434.h | 19 + + .../mips/include/asm}/mach-rc32434/timer.h | 0 + .../mips/include/asm}/mach-rc32434/war.h | 0 + .../include/asm}/mach-rm/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-rm/mc146818rtc.h | 0 + .../mips/include/asm}/mach-rm/war.h | 0 + .../asm}/mach-sibyte/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-sibyte/war.h | 0 + .../mips/include/asm}/mach-tx39xx/ioremap.h | 0 + .../mips/include/asm}/mach-tx39xx/mangle-port.h | 0 + .../mips/include/asm}/mach-tx39xx/war.h | 0 + .../asm}/mach-tx49xx/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-tx49xx/ioremap.h | 0 + .../mips/include/asm}/mach-tx49xx/kmalloc.h | 0 + .../mips/include/asm}/mach-tx49xx/war.h | 0 + .../mips/include/asm}/mach-vr41xx/irq.h | 0 + .../mips/include/asm}/mach-vr41xx/war.h | 0 + .../mips/include/asm}/mach-wrppmc/mach-gt64120.h | 0 + .../mips/include/asm}/mach-wrppmc/war.h | 0 + .../asm}/mach-yosemite/cpu-feature-overrides.h | 0 + .../mips/include/asm}/mach-yosemite/war.h | 0 + .../mips/include/asm}/mc146818-time.h | 0 + .../mips/include/asm}/mc146818rtc.h | 0 + .../mips/include/asm}/mips-boards/bonito64.h | 0 + .../mips/include/asm}/mips-boards/generic.h | 0 + .../mips/include/asm}/mips-boards/launch.h | 0 + .../mips/include/asm}/mips-boards/malta.h | 0 + .../mips/include/asm}/mips-boards/maltaint.h | 0 + .../mips/include/asm}/mips-boards/msc01_pci.h | 0 + .../mips/include/asm}/mips-boards/piix4.h | 0 + .../mips/include/asm}/mips-boards/prom.h | 0 + .../mips/include/asm}/mips-boards/sim.h | 0 + .../mips/include/asm}/mips-boards/simint.h | 0 + .../asm-mips => arch/mips/include/asm}/mips_mt.h | 0 + .../mips/include/asm}/mipsmtregs.h | 0 + .../asm-mips => arch/mips/include/asm}/mipsprom.h | 0 + .../asm-mips => arch/mips/include/asm}/mipsregs.h | 6 +- + {include/asm-mips => arch/mips/include/asm}/mman.h | 0 + {include/asm-mips => arch/mips/include/asm}/mmu.h | 0 + .../mips/include/asm}/mmu_context.h | 8 +- + .../asm-mips => arch/mips/include/asm}/mmzone.h | 0 + .../asm-mips => arch/mips/include/asm}/module.h | 0 + .../asm-mips => arch/mips/include/asm}/msc01_ic.h | 0 + .../asm-mips => arch/mips/include/asm}/msgbuf.h | 0 + .../asm-mips => arch/mips/include/asm}/mutex.h | 0 + .../asm-mips => arch/mips/include/asm}/nile4.h | 0 + .../asm-mips => arch/mips/include/asm}/paccess.h | 0 + {include/asm-mips => arch/mips/include/asm}/page.h | 0 + .../asm-mips => arch/mips/include/asm}/param.h | 0 + .../asm-mips => arch/mips/include/asm}/parport.h | 0 + {include/asm-mips => arch/mips/include/asm}/pci.h | 0 + .../mips/include/asm}/pci/bridge.h | 0 + .../asm-mips => arch/mips/include/asm}/percpu.h | 0 + .../asm-mips => arch/mips/include/asm}/pgalloc.h | 0 + .../mips/include/asm}/pgtable-32.h | 2 +- + .../mips/include/asm}/pgtable-64.h | 0 + .../mips/include/asm}/pgtable-bits.h | 0 + .../asm-mips => arch/mips/include/asm}/pgtable.h | 0 + arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h | 46 + + .../include/asm}/pmc-sierra/msp71xx/msp_cic_int.h | 0 + .../mips/include/asm}/pmc-sierra/msp71xx/msp_int.h | 0 + .../mips/include/asm}/pmc-sierra/msp71xx/msp_pci.h | 0 + .../include/asm}/pmc-sierra/msp71xx/msp_prom.h | 0 + .../include/asm}/pmc-sierra/msp71xx/msp_regops.h | 0 + .../include/asm}/pmc-sierra/msp71xx/msp_regs.h | 0 + .../include/asm}/pmc-sierra/msp71xx/msp_slp_int.h | 0 + .../mips/include/asm}/pmc-sierra/msp71xx/war.h | 0 + {include/asm-mips => arch/mips/include/asm}/pmon.h | 0 + {include/asm-mips => arch/mips/include/asm}/poll.h | 0 + .../mips/include/asm}/posix_types.h | 0 + .../asm-mips => arch/mips/include/asm}/prefetch.h | 0 + .../asm-mips => arch/mips/include/asm}/processor.h | 20 + + arch/mips/include/asm/ptrace.h | 154 + + .../asm-mips => arch/mips/include/asm}/r4k-timer.h | 0 + .../asm-mips => arch/mips/include/asm}/r4kcache.h | 0 + .../asm-mips => arch/mips/include/asm}/reboot.h | 0 + {include/asm-mips => arch/mips/include/asm}/reg.h | 0 + .../asm-mips => arch/mips/include/asm}/regdef.h | 0 + .../asm-mips => arch/mips/include/asm}/resource.h | 0 + .../asm-mips => arch/mips/include/asm}/rm9k-ocd.h | 0 + {include/asm-mips => arch/mips/include/asm}/rtlx.h | 0 + .../mips/include/asm}/scatterlist.h | 0 + .../asm-mips => arch/mips/include/asm}/seccomp.h | 0 + .../asm-mips => arch/mips/include/asm}/sections.h | 0 + .../asm-mips => arch/mips/include/asm}/segment.h | 0 + .../asm-mips => arch/mips/include/asm}/sembuf.h | 0 + .../asm-mips => arch/mips/include/asm}/serial.h | 0 + .../asm-mips => arch/mips/include/asm}/setup.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/gio.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/hpc3.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/ioc.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/ip22.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/mc.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/pi1.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/seeq.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/sgi.h | 0 + .../asm-mips => arch/mips/include/asm}/sgi/wd.h | 0 + .../asm-mips => arch/mips/include/asm}/sgialib.h | 0 + .../asm-mips => arch/mips/include/asm}/sgiarcs.h | 0 + .../asm-mips => arch/mips/include/asm}/sgidefs.h | 0 + .../asm-mips => arch/mips/include/asm}/shmbuf.h | 0 + .../asm-mips => arch/mips/include/asm}/shmparam.h | 0 + .../mips/include/asm}/sibyte/bcm1480_int.h | 0 + .../mips/include/asm}/sibyte/bcm1480_l2c.h | 0 + .../mips/include/asm}/sibyte/bcm1480_mc.h | 0 + .../mips/include/asm}/sibyte/bcm1480_regs.h | 0 + .../mips/include/asm}/sibyte/bcm1480_scd.h | 0 + .../mips/include/asm}/sibyte/bigsur.h | 0 + .../mips/include/asm}/sibyte/board.h | 0 + .../mips/include/asm}/sibyte/carmel.h | 0 + .../mips/include/asm}/sibyte/sb1250.h | 0 + .../mips/include/asm}/sibyte/sb1250_defs.h | 0 + .../mips/include/asm}/sibyte/sb1250_dma.h | 0 + .../mips/include/asm}/sibyte/sb1250_genbus.h | 0 + .../mips/include/asm}/sibyte/sb1250_int.h | 0 + .../mips/include/asm}/sibyte/sb1250_l2c.h | 0 + .../mips/include/asm}/sibyte/sb1250_ldt.h | 0 + .../mips/include/asm}/sibyte/sb1250_mac.h | 0 + .../mips/include/asm}/sibyte/sb1250_mc.h | 0 + .../mips/include/asm}/sibyte/sb1250_regs.h | 0 + .../mips/include/asm}/sibyte/sb1250_scd.h | 0 + .../mips/include/asm}/sibyte/sb1250_smbus.h | 0 + .../mips/include/asm}/sibyte/sb1250_syncser.h | 0 + .../mips/include/asm}/sibyte/sb1250_uart.h | 0 + .../mips/include/asm}/sibyte/sentosa.h | 0 + .../mips/include/asm}/sibyte/swarm.h | 0 + .../mips/include/asm}/sigcontext.h | 0 + .../asm-mips => arch/mips/include/asm}/siginfo.h | 0 + .../asm-mips => arch/mips/include/asm}/signal.h | 0 + {include/asm-mips => arch/mips/include/asm}/sim.h | 0 + .../asm-mips => arch/mips/include/asm}/smp-ops.h | 0 + {include/asm-mips => arch/mips/include/asm}/smp.h | 0 + {include/asm-mips => arch/mips/include/asm}/smtc.h | 8 +- + .../asm-mips => arch/mips/include/asm}/smtc_ipi.h | 0 + .../asm-mips => arch/mips/include/asm}/smtc_proc.h | 0 + {include/asm-mips => arch/mips/include/asm}/smvp.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/addrs.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/agent.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/arch.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/fru.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/gda.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/hub.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/intr.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/io.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/ioc3.h | 0 + .../mips/include/asm}/sn/klconfig.h | 36 +- + .../asm-mips => arch/mips/include/asm}/sn/kldir.h | 0 + .../mips/include/asm}/sn/klkernvars.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/launch.h | 0 + .../mips/include/asm}/sn/mapped_kernel.h | 8 +- + .../asm-mips => arch/mips/include/asm}/sn/nmi.h | 0 + .../mips/include/asm}/sn/sn0/addrs.h | 0 + .../mips/include/asm}/sn/sn0/arch.h | 0 + .../mips/include/asm}/sn/sn0/hub.h | 0 + .../mips/include/asm}/sn/sn0/hubio.h | 36 +- + .../mips/include/asm}/sn/sn0/hubmd.h | 0 + .../mips/include/asm}/sn/sn0/hubni.h | 0 + .../mips/include/asm}/sn/sn0/hubpi.h | 0 + .../mips/include/asm}/sn/sn0/ip27.h | 0 + .../mips/include/asm}/sn/sn_private.h | 0 + .../asm-mips => arch/mips/include/asm}/sn/types.h | 0 + {include/asm-mips => arch/mips/include/asm}/sni.h | 0 + .../asm-mips => arch/mips/include/asm}/socket.h | 0 + .../asm-mips => arch/mips/include/asm}/sockios.h | 0 + .../asm-mips => arch/mips/include/asm}/sparsemem.h | 0 + .../asm-mips => arch/mips/include/asm}/spinlock.h | 255 +- + .../mips/include/asm}/spinlock_types.h | 7 +- + .../mips/include/asm}/stackframe.h | 72 +- + .../mips/include/asm}/stacktrace.h | 0 + {include/asm-mips => arch/mips/include/asm}/stat.h | 0 + .../asm-mips => arch/mips/include/asm}/statfs.h | 0 + .../asm-mips => arch/mips/include/asm}/string.h | 0 + .../asm-mips => arch/mips/include/asm}/suspend.h | 0 + .../asm-mips => arch/mips/include/asm}/sysmips.h | 0 + .../asm-mips => arch/mips/include/asm}/system.h | 2 + + .../asm-mips => arch/mips/include/asm}/termbits.h | 0 + .../asm-mips => arch/mips/include/asm}/termios.h | 0 + .../mips/include/asm}/thread_info.h | 2 + + {include/asm-mips => arch/mips/include/asm}/time.h | 0 + .../asm-mips => arch/mips/include/asm}/timex.h | 0 + .../asm-mips => arch/mips/include/asm}/titan_dep.h | 0 + {include/asm-mips => arch/mips/include/asm}/tlb.h | 0 + .../asm-mips => arch/mips/include/asm}/tlbdebug.h | 0 + .../asm-mips => arch/mips/include/asm}/tlbflush.h | 0 + .../asm-mips => arch/mips/include/asm}/topology.h | 0 + .../asm-mips => arch/mips/include/asm}/traps.h | 0 + arch/mips/include/asm/txx9/boards.h | 13 + + .../mips/include/asm}/txx9/generic.h | 29 +- + .../mips/include/asm}/txx9/jmr3927.h | 0 + .../asm-mips => arch/mips/include/asm}/txx9/pci.h | 0 + .../mips/include/asm}/txx9/rbtx4927.h | 3 + + .../mips/include/asm}/txx9/rbtx4938.h | 0 + arch/mips/include/asm/txx9/rbtx4939.h | 133 + + .../mips/include/asm}/txx9/smsc_fdc37m81x.h | 1 + + .../asm-mips => arch/mips/include/asm}/txx9/spi.h | 19 +- + .../mips/include/asm}/txx9/tx3927.h | 2 + + .../mips/include/asm}/txx9/tx4927.h | 14 + + .../mips/include/asm}/txx9/tx4927pcic.h | 0 + .../mips/include/asm}/txx9/tx4938.h | 2 + + arch/mips/include/asm/txx9/tx4939.h | 545 ++ + .../asm-mips => arch/mips/include/asm}/txx9irq.h | 0 + .../asm-mips => arch/mips/include/asm}/txx9pio.h | 0 + .../asm-mips => arch/mips/include/asm}/txx9tmr.h | 0 + .../asm-mips => arch/mips/include/asm}/types.h | 0 + .../asm-mips => arch/mips/include/asm}/uaccess.h | 272 +- + .../asm-mips => arch/mips/include/asm}/ucontext.h | 0 + .../asm-mips => arch/mips/include/asm}/unaligned.h | 0 + .../asm-mips => arch/mips/include/asm}/unistd.h | 0 + {include/asm-mips => arch/mips/include/asm}/user.h | 0 + {include/asm-mips => arch/mips/include/asm}/vga.h | 0 + {include/asm-mips => arch/mips/include/asm}/vpe.h | 0 + .../mips/include/asm}/vr41xx/capcella.h | 0 + .../mips/include/asm}/vr41xx/giu.h | 0 + .../mips/include/asm}/vr41xx/irq.h | 0 + .../mips/include/asm}/vr41xx/mpc30x.h | 0 + .../mips/include/asm}/vr41xx/pci.h | 0 + .../mips/include/asm}/vr41xx/siu.h | 0 + .../mips/include/asm}/vr41xx/tb0219.h | 0 + .../mips/include/asm}/vr41xx/tb0226.h | 0 + .../mips/include/asm}/vr41xx/tb0287.h | 0 + .../mips/include/asm}/vr41xx/vr41xx.h | 0 + {include/asm-mips => arch/mips/include/asm}/war.h | 0 + arch/mips/include/asm/watch.h | 32 + + .../asm-mips => arch/mips/include/asm}/wbflush.h | 0 + {include/asm-mips => arch/mips/include/asm}/xor.h | 0 + .../mips/include/asm}/xtalk/xtalk.h | 0 + .../mips/include/asm}/xtalk/xwidget.h | 0 + arch/mips/kernel/Makefile | 3 +- + arch/mips/kernel/cevt-r4k.c | 173 +- + arch/mips/kernel/cevt-smtc.c | 321 + + arch/mips/kernel/cpu-probe.c | 28 +- + arch/mips/kernel/entry.S | 10 +- + arch/mips/kernel/genex.S | 45 +- + arch/mips/kernel/head.S | 1 + + arch/mips/kernel/kgdb.c | 3 +- + arch/mips/kernel/mips-mt-fpaff.c | 2 +- + arch/mips/kernel/proc.c | 15 +- + arch/mips/kernel/process.c | 20 +- + arch/mips/kernel/ptrace.c | 102 +- + arch/mips/kernel/ptrace32.c | 59 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/signal32.c | 12 + + arch/mips/kernel/smp.c | 2 + + arch/mips/kernel/smtc.c | 260 +- + arch/mips/kernel/syscall.c | 1 - + arch/mips/kernel/traps.c | 52 +- + arch/mips/kernel/vmlinux.lds.S | 3 +- + arch/mips/kernel/watch.c | 188 + + arch/mips/lib/csum_partial.S | 72 +- + arch/mips/mti-malta/Makefile | 2 +- + arch/mips/mti-malta/malta-smtc.c | 9 +- + arch/mips/pci/Makefile | 2 + + arch/mips/pci/fixup-emma2rh.c | 1 - + arch/mips/pci/ops-pnx8550.c | 2 - + .../{au1000/mtx-1/init.c => pci/pci-bcm47xx.c} | 62 +- + arch/mips/pci/pci-emma2rh.c | 1 - + arch/mips/pci/pci-ip27.c | 40 +- + arch/mips/pci/pci-tx4938.c | 2 +- + arch/mips/pci/pci-tx4939.c | 109 + + arch/mips/pci/pci.c | 80 +- + arch/mips/pmc-sierra/msp71xx/Makefile | 1 + + arch/mips/pmc-sierra/msp71xx/gpio.c | 218 + + arch/mips/pmc-sierra/msp71xx/gpio_extended.c | 148 + + arch/mips/rb532/devices.c | 22 +- + arch/mips/rb532/gpio.c | 238 +- + arch/mips/rb532/irq.c | 2 +- + arch/mips/rb532/prom.c | 12 - + arch/mips/rb532/serial.c | 6 +- + arch/mips/rb532/setup.c | 4 +- + arch/mips/rb532/time.c | 1 - + arch/mips/sgi-ip22/ip22-platform.c | 15 + + arch/mips/sgi-ip22/ip22-setup.c | 1 - + arch/mips/sgi-ip22/ip22-time.c | 64 - + arch/mips/sgi-ip27/ip27-timer.c | 99 +- + arch/mips/sgi-ip32/ip32-platform.c | 16 + + arch/mips/sgi-ip32/ip32-setup.c | 5 - + arch/mips/sibyte/swarm/Makefile | 3 +- + arch/mips/sibyte/swarm/platform.c | 85 + + arch/mips/txx9/Kconfig | 24 +- + arch/mips/txx9/generic/Makefile | 2 + + arch/mips/txx9/generic/irq_tx4927.c | 11 + + arch/mips/txx9/generic/irq_tx4938.c | 11 + + arch/mips/txx9/generic/irq_tx4939.c | 215 + + arch/mips/txx9/generic/setup.c | 431 +- + arch/mips/txx9/generic/setup_tx3927.c | 37 +- + arch/mips/txx9/generic/setup_tx4927.c | 97 + + arch/mips/txx9/generic/setup_tx4938.c | 122 + + arch/mips/txx9/generic/setup_tx4939.c | 506 ++ + arch/mips/txx9/{rbtx4938 => generic}/spi_eeprom.c | 28 +- + arch/mips/txx9/jmr3927/prom.c | 1 - + arch/mips/txx9/jmr3927/setup.c | 25 +- + arch/mips/txx9/rbtx4927/irq.c | 11 +- + arch/mips/txx9/rbtx4927/prom.c | 1 - + arch/mips/txx9/rbtx4927/setup.c | 25 +- + arch/mips/txx9/rbtx4938/Makefile | 2 +- + arch/mips/txx9/rbtx4938/irq.c | 8 +- + arch/mips/txx9/rbtx4938/prom.c | 3 - + arch/mips/txx9/rbtx4938/setup.c | 63 +- + arch/mips/txx9/rbtx4939/Makefile | 3 + + arch/mips/txx9/rbtx4939/irq.c | 96 + + arch/mips/txx9/rbtx4939/prom.c | 17 + + arch/mips/txx9/rbtx4939/setup.c | 307 + + arch/mn10300/Kconfig | 3 - + arch/mn10300/kernel/irq.c | 71 +- + arch/mn10300/kernel/time.c | 52 +- + arch/mn10300/unit-asb2303/unit-init.c | 2 +- + arch/mn10300/unit-asb2305/unit-init.c | 2 +- + arch/parisc/Kconfig | 3 - + arch/powerpc/Kconfig | 16 + + arch/powerpc/Kconfig.debug | 5 + + arch/powerpc/Makefile | 7 +- + arch/powerpc/boot/Makefile | 5 +- + arch/powerpc/boot/addnote.c | 144 +- + arch/powerpc/boot/dtc-src/Makefile.dtc | 18 +- + arch/powerpc/boot/dtc-src/checks.c | 305 +- + arch/powerpc/boot/dtc-src/data.c | 62 +- + arch/powerpc/boot/dtc-src/dtc-lexer.l | 120 +- + arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped | 445 +- + arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped | 387 +- + arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped | 12 +- + arch/powerpc/boot/dtc-src/dtc-parser.y | 67 +- + arch/powerpc/boot/dtc-src/dtc.c | 41 +- + arch/powerpc/boot/dtc-src/dtc.h | 43 +- + arch/powerpc/boot/dtc-src/flattree.c | 232 +- + arch/powerpc/boot/dtc-src/fstree.c | 8 +- + arch/powerpc/boot/dtc-src/libfdt_env.h | 23 + + arch/powerpc/boot/dtc-src/livetree.c | 9 +- + arch/powerpc/boot/dtc-src/srcpos.c | 121 +- + arch/powerpc/boot/dtc-src/srcpos.h | 30 +- + arch/powerpc/boot/dtc-src/treesource.c | 15 +- + arch/powerpc/boot/dtc-src/version_gen.h | 2 +- + arch/powerpc/boot/dts/arches.dts | 293 + + arch/powerpc/boot/dts/asp834x-redboot.dts | 4 + + arch/powerpc/boot/dts/gef_sbc610.dts | 293 + + arch/powerpc/boot/dts/glacier.dts | 2 +- + arch/powerpc/boot/dts/holly.dts | 106 +- + arch/powerpc/boot/dts/mgcoge.dts | 174 + + arch/powerpc/boot/dts/mgsuvd.dts | 163 + + arch/powerpc/boot/dts/mpc5121ads.dts | 3 +- + arch/powerpc/boot/dts/mpc8313erdb.dts | 7 +- + arch/powerpc/boot/dts/mpc8315erdb.dts | 7 +- + arch/powerpc/boot/dts/mpc832x_mds.dts | 7 +- + arch/powerpc/boot/dts/mpc832x_rdb.dts | 7 +- + arch/powerpc/boot/dts/mpc8349emitx.dts | 10 +- + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 7 +- + arch/powerpc/boot/dts/mpc834x_mds.dts | 10 +- + arch/powerpc/boot/dts/mpc836x_mds.dts | 30 +- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 19 +- + arch/powerpc/boot/dts/mpc8377_mds.dts | 14 +- + arch/powerpc/boot/dts/mpc8377_rdb.dts | 7 +- + arch/powerpc/boot/dts/mpc8378_mds.dts | 14 +- + arch/powerpc/boot/dts/mpc8378_rdb.dts | 7 +- + arch/powerpc/boot/dts/mpc8379_mds.dts | 14 +- + arch/powerpc/boot/dts/mpc8379_rdb.dts | 7 +- + arch/powerpc/boot/dts/mpc8536ds.dts | 2 + + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 20 +- + arch/powerpc/boot/dts/sbc8349.dts | 7 +- + arch/powerpc/boot/dts/sequoia.dts | 9 + + arch/powerpc/boot/dts/yosemite.dts | 2 +- + arch/powerpc/boot/elf_util.c | 6 +- + arch/powerpc/boot/libfdt/Makefile.libfdt | 8 +- + arch/powerpc/boot/libfdt/fdt.c | 61 +- + arch/powerpc/boot/libfdt/fdt_ro.c | 329 +- + arch/powerpc/boot/libfdt/fdt_rw.c | 200 +- + arch/powerpc/boot/libfdt/fdt_strerror.c | 34 +- + arch/powerpc/boot/libfdt/fdt_sw.c | 55 +- + arch/powerpc/boot/libfdt/fdt_wip.c | 9 +- + arch/powerpc/boot/libfdt/libfdt.h | 383 +- + arch/powerpc/boot/libfdt/libfdt_internal.h | 24 +- + arch/powerpc/boot/libfdt_env.h | 1 + + arch/powerpc/boot/wrapper | 4 +- + arch/powerpc/configs/44x/arches_defconfig | 767 ++ + arch/powerpc/configs/83xx/asp8347_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 83 +- + arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 4 +- + arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 4 +- + arch/powerpc/configs/83xx/sbc834x_defconfig | 4 +- + .../gef_sbc610_defconfig} | 568 +- + .../configs/{ => 86xx}/mpc8610_hpcd_defconfig | 4 +- + .../configs/{ => 86xx}/mpc8641_hpcn_defconfig | 4 +- + arch/powerpc/configs/{ => 86xx}/sbc8641d_defconfig | 4 +- + arch/powerpc/configs/ep8248e_defconfig | 4 +- + arch/powerpc/configs/mgcoge_defconfig | 900 ++ + arch/powerpc/configs/mgsuvd_defconfig | 872 ++ + arch/powerpc/configs/mpc8272_ads_defconfig | 4 +- + arch/powerpc/configs/mpc83xx_defconfig | 4 +- + .../{mpc8641_hpcn_defconfig => mpc86xx_defconfig} | 44 +- + arch/powerpc/configs/pq2fads_defconfig | 4 +- + arch/powerpc/include/asm/a.out.h | 20 - + arch/powerpc/include/asm/cputable.h | 10 +- + arch/powerpc/include/asm/dcr-regs.h | 11 + + arch/powerpc/include/asm/device.h | 3 - + arch/powerpc/include/asm/dma-mapping.h | 187 +- + arch/powerpc/include/asm/elf.h | 7 + + arch/powerpc/include/asm/exception.h | 42 +- + arch/powerpc/include/asm/fsl_lbc.h | 48 +- + arch/powerpc/include/asm/highmem.h | 2 +- + arch/powerpc/include/asm/io.h | 2 +- + arch/powerpc/include/asm/irq.h | 18 +- + arch/powerpc/include/asm/machdep.h | 5 +- + arch/powerpc/include/asm/mman.h | 2 +- + arch/powerpc/include/asm/mmu-hash64.h | 2 +- + arch/powerpc/include/asm/mpic.h | 4 +- + arch/powerpc/include/asm/msi_bitmap.h | 35 + + arch/powerpc/include/asm/of_device.h | 3 - + arch/powerpc/include/asm/of_platform.h | 3 - + arch/powerpc/include/asm/paca.h | 2 + + arch/powerpc/include/asm/page.h | 14 +- + arch/powerpc/include/asm/page_32.h | 8 +- + arch/powerpc/include/asm/pci.h | 14 +- + arch/powerpc/include/asm/pgtable-ppc32.h | 72 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 12 +- + arch/powerpc/include/asm/ppc_asm.h | 2 +- + arch/powerpc/include/asm/reg_booke.h | 7 + + arch/powerpc/include/asm/sections.h | 18 +- + .../{math-emu => include/asm}/sfp-machine.h | 114 +- + arch/powerpc/include/asm/siginfo.h | 5 - + arch/powerpc/include/asm/smp.h | 42 +- + arch/powerpc/include/asm/statfs.h | 54 - + arch/powerpc/include/asm/systbl.h | 2 +- + arch/powerpc/include/asm/tlbflush.h | 13 +- + arch/powerpc/include/asm/types.h | 2 +- + arch/powerpc/kernel/.gitignore | 1 + + arch/powerpc/kernel/Makefile | 9 +- + arch/powerpc/kernel/asm-offsets.c | 3 + + arch/powerpc/kernel/btext.c | 34 +- + arch/powerpc/kernel/cpu_setup_ppc970.S | 4 +- + arch/powerpc/kernel/cputable.c | 24 + + arch/powerpc/kernel/dma-iommu.c | 103 + + arch/powerpc/kernel/dma.c | 131 + + arch/powerpc/kernel/dma_64.c | 200 - + arch/powerpc/kernel/entry_64.S | 69 +- + arch/powerpc/kernel/head_32.S | 10 +- + arch/powerpc/kernel/head_64.S | 473 +- + arch/powerpc/kernel/head_fsl_booke.S | 26 +- + arch/powerpc/kernel/idle.c | 6 +- + arch/powerpc/kernel/irq.c | 169 +- + arch/powerpc/kernel/kgdb.c | 5 +- + arch/powerpc/kernel/lparcfg.c | 8 +- + arch/powerpc/kernel/misc.S | 10 +- + arch/powerpc/kernel/misc_32.S | 62 +- + arch/powerpc/kernel/misc_64.S | 8 +- + arch/powerpc/kernel/module_64.c | 19 - + arch/powerpc/kernel/of_device.c | 2 +- + arch/powerpc/kernel/paca.c | 3 + + arch/powerpc/kernel/pci-common.c | 216 +- + arch/powerpc/kernel/pci_32.c | 18 +- + arch/powerpc/kernel/pci_64.c | 49 - + arch/powerpc/kernel/ppc_ksyms.c | 3 + + arch/powerpc/kernel/prom.c | 43 +- + arch/powerpc/kernel/prom_init.c | 29 +- + arch/powerpc/kernel/reloc_64.S | 87 + + arch/powerpc/kernel/setup-common.c | 17 +- + arch/powerpc/kernel/setup_32.c | 13 +- + arch/powerpc/kernel/setup_64.c | 9 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/powerpc/kernel/softemu8xx.c | 1 - + arch/powerpc/kernel/swsusp_asm64.S | 2 +- + arch/powerpc/kernel/sys_ppc32.c | 8 - + arch/powerpc/kernel/sysfs.c | 119 +- + arch/powerpc/kernel/traps.c | 1 - + arch/powerpc/kernel/vio.c | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 18 + + arch/powerpc/lib/copypage_64.S | 198 +- + arch/powerpc/lib/dma-noncoherent.c | 2 +- + arch/powerpc/math-emu/Makefile | 7 +- + arch/powerpc/math-emu/double.h | 129 - + arch/powerpc/math-emu/fadd.c | 17 +- + arch/powerpc/math-emu/fadds.c | 20 +- + arch/powerpc/math-emu/fcmpo.c | 10 +- + arch/powerpc/math-emu/fcmpu.c | 10 +- + arch/powerpc/math-emu/fctiw.c | 8 +- + arch/powerpc/math-emu/fctiwz.c | 8 +- + arch/powerpc/math-emu/fdiv.c | 14 +- + arch/powerpc/math-emu/fdivs.c | 16 +- + arch/powerpc/math-emu/fmadd.c | 16 +- + arch/powerpc/math-emu/fmadds.c | 18 +- + arch/powerpc/math-emu/fmsub.c | 16 +- + arch/powerpc/math-emu/fmsubs.c | 18 +- + arch/powerpc/math-emu/fmul.c | 14 +- + arch/powerpc/math-emu/fmuls.c | 16 +- + arch/powerpc/math-emu/fnmadd.c | 16 +- + arch/powerpc/math-emu/fnmadds.c | 18 +- + arch/powerpc/math-emu/fnmsub.c | 16 +- + arch/powerpc/math-emu/fnmsubs.c | 18 +- + arch/powerpc/math-emu/frsp.c | 14 +- + arch/powerpc/math-emu/fsel.c | 8 +- + arch/powerpc/math-emu/fsqrt.c | 12 +- + arch/powerpc/math-emu/fsqrts.c | 14 +- + arch/powerpc/math-emu/fsub.c | 14 +- + arch/powerpc/math-emu/fsubs.c | 16 +- + arch/powerpc/math-emu/lfd.c | 4 +- + arch/powerpc/math-emu/lfs.c | 19 +- + arch/powerpc/math-emu/math.c | 8 +- + arch/powerpc/math-emu/mcrfs.c | 3 +- + arch/powerpc/math-emu/mffs.c | 3 +- + arch/powerpc/math-emu/mtfsb0.c | 3 +- + arch/powerpc/math-emu/mtfsb1.c | 3 +- + arch/powerpc/math-emu/mtfsf.c | 20 +- + arch/powerpc/math-emu/mtfsfi.c | 3 +- + arch/powerpc/math-emu/op-1.h | 245 - + arch/powerpc/math-emu/op-2.h | 434 - + arch/powerpc/math-emu/op-4.h | 317 - + arch/powerpc/math-emu/op-common.h | 688 -- + arch/powerpc/math-emu/single.h | 66 - + arch/powerpc/math-emu/soft-fp.h | 104 - + arch/powerpc/math-emu/stfs.c | 19 +- + arch/powerpc/math-emu/types.c | 51 - + arch/powerpc/math-emu/udivmodti4.c | 2 +- + arch/powerpc/mm/fsl_booke_mmu.c | 5 +- + arch/powerpc/mm/gup.c | 7 +- + arch/powerpc/mm/hash_low_32.S | 122 +- + arch/powerpc/mm/hash_utils_64.c | 8 +- + arch/powerpc/mm/hugetlbpage.c | 59 +- + arch/powerpc/mm/init_64.c | 4 +- + arch/powerpc/mm/mem.c | 5 +- + arch/powerpc/mm/numa.c | 185 +- + arch/powerpc/mm/pgtable_32.c | 4 +- + arch/powerpc/mm/tlb_32.c | 1 + + arch/powerpc/oprofile/cell/vma_map.c | 2 +- + arch/powerpc/oprofile/op_model_power4.c | 4 +- + arch/powerpc/platforms/44x/Kconfig | 42 +- + arch/powerpc/platforms/44x/Makefile | 8 +- + arch/powerpc/platforms/44x/bamboo.c | 62 - + arch/powerpc/platforms/44x/canyonlands.c | 63 - + arch/powerpc/platforms/44x/katmai.c | 62 - + arch/powerpc/platforms/44x/ppc44x_simple.c | 88 + + arch/powerpc/platforms/44x/rainier.c | 62 - + arch/powerpc/platforms/44x/sequoia.c | 63 - + arch/powerpc/platforms/44x/taishan.c | 72 - + arch/powerpc/platforms/512x/Kconfig | 2 + + arch/powerpc/platforms/512x/mpc5121_ads.c | 10 + + arch/powerpc/platforms/52xx/mpc52xx_common.c | 5 +- + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 13 +- + arch/powerpc/platforms/82xx/Kconfig | 8 + + arch/powerpc/platforms/82xx/Makefile | 1 + + arch/powerpc/platforms/82xx/ep8248e.c | 2 +- + arch/powerpc/platforms/82xx/mgcoge.c | 129 + + arch/powerpc/platforms/83xx/Kconfig | 5 - + arch/powerpc/platforms/83xx/mpc837x_mds.c | 8 +- + arch/powerpc/platforms/85xx/Kconfig | 1 - + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 1 - + arch/powerpc/platforms/85xx/sbc8560.c | 3 +- + arch/powerpc/platforms/86xx/Kconfig | 9 +- + arch/powerpc/platforms/86xx/Makefile | 1 + + arch/powerpc/platforms/86xx/gef_pic.c | 258 + + arch/powerpc/platforms/86xx/gef_pic.h | 11 + + arch/powerpc/platforms/86xx/gef_sbc610.c | 221 + + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 1 - + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 8 - + arch/powerpc/platforms/86xx/sbc8641d.c | 8 - + arch/powerpc/platforms/8xx/Kconfig | 6 + + arch/powerpc/platforms/8xx/Makefile | 1 + + arch/powerpc/platforms/8xx/mgsuvd.c | 92 + + arch/powerpc/platforms/Kconfig | 21 +- + arch/powerpc/platforms/Kconfig.cputype | 17 +- + arch/powerpc/platforms/cell/iommu.c | 6 +- + arch/powerpc/platforms/cell/spufs/inode.c | 13 +- + arch/powerpc/platforms/chrp/pci.c | 4 +- + arch/powerpc/platforms/chrp/setup.c | 1 - + arch/powerpc/platforms/chrp/time.c | 24 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 - + arch/powerpc/platforms/fsl_uli1575.c | 12 +- + arch/powerpc/platforms/iseries/exception.S | 23 +- + arch/powerpc/platforms/iseries/mf.c | 26 +- + arch/powerpc/platforms/maple/setup.c | 1 - + arch/powerpc/platforms/maple/time.c | 24 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 6 +- + arch/powerpc/platforms/powermac/feature.c | 2 +- + arch/powerpc/platforms/powermac/setup.c | 1 - + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/powermac/time.c | 3 + + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/cmm.c | 4 +- + arch/powerpc/platforms/pseries/eeh_driver.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- + arch/powerpc/platforms/pseries/reconfig.c | 6 +- + arch/powerpc/platforms/pseries/rtasd.c | 26 +- + arch/powerpc/platforms/pseries/setup.c | 1 - + arch/powerpc/platforms/pseries/smp.c | 32 +- + arch/powerpc/platforms/pseries/xics.c | 550 +- + arch/powerpc/platforms/pseries/xics.h | 12 +- + arch/powerpc/sysdev/Kconfig | 6 + + arch/powerpc/sysdev/Makefile | 5 +- + arch/powerpc/sysdev/cpm1.c | 74 +- + arch/powerpc/sysdev/fsl_lbc.c | 53 +- + arch/powerpc/sysdev/fsl_msi.c | 109 +- + arch/powerpc/sysdev/fsl_msi.h | 8 +- + arch/powerpc/sysdev/fsl_pci.c | 58 +- + arch/powerpc/sysdev/fsl_soc.c | 85 +- + arch/powerpc/sysdev/fsl_soc.h | 8 - + arch/powerpc/sysdev/mpc8xxx_gpio.c | 171 + + arch/powerpc/sysdev/mpic.h | 2 - + arch/powerpc/sysdev/mpic_msi.c | 123 +- + arch/powerpc/sysdev/mpic_pasemi_msi.c | 24 +- + arch/powerpc/sysdev/mpic_u3msi.c | 22 +- + arch/powerpc/sysdev/msi_bitmap.c | 247 + + arch/powerpc/sysdev/mv64x60_dev.c | 6 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 32 +- + arch/powerpc/sysdev/qe_lib/Kconfig | 9 - + arch/s390/Kconfig | 1 + + arch/s390/hypfs/inode.c | 2 +- + arch/s390/include/asm/dasd.h | 13 + + arch/s390/include/asm/delay.h | 1 + + arch/s390/include/asm/pgtable.h | 45 +- + arch/s390/include/asm/ptrace.h | 1 + + arch/s390/include/asm/qdio.h | 8 +- + arch/s390/include/asm/statfs.h | 11 +- + arch/s390/include/asm/syscall.h | 80 + + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/kernel/compat_linux.c | 8 - + arch/s390/kernel/compat_linux.h | 1 - + arch/s390/kernel/compat_wrapper.S | 2 - + arch/s390/kernel/entry.S | 50 +- + arch/s390/kernel/entry64.S | 42 +- + arch/s390/kernel/ptrace.c | 61 +- + arch/s390/kernel/signal.c | 13 + + arch/s390/kernel/smp.c | 2 + + arch/s390/kernel/syscalls.S | 2 +- + arch/s390/kernel/time.c | 4 +- + arch/s390/lib/delay.c | 101 +- + arch/s390/mm/extmem.c | 251 +- + arch/sh/kernel/smp.c | 2 + + arch/sparc/Kconfig | 26 +- + arch/sparc/include/asm/Kbuild | 4 - + arch/sparc/include/asm/asmmacro.h | 5 - + arch/sparc/include/asm/bpp.h | 73 - + arch/sparc/include/asm/bugs.h | 7 - + arch/sparc/include/asm/cpudata_64.h | 1 - + arch/sparc/include/asm/dma-mapping_32.h | 59 +- + arch/sparc/include/asm/dma.h | 141 +- + arch/sparc/include/asm/dma_32.h | 288 - + arch/sparc/include/asm/dma_64.h | 205 - + arch/sparc/include/asm/ebus.h | 8 - + arch/sparc/include/asm/ebus_32.h | 99 - + arch/sparc/include/asm/ebus_64.h | 95 - + arch/sparc/include/asm/ebus_dma.h | 35 + + arch/sparc/include/asm/elf_32.h | 7 +- + arch/sparc/include/asm/fhc.h | 43 +- + arch/sparc/include/asm/floppy_32.h | 16 +- + arch/sparc/include/asm/floppy_64.h | 130 +- + arch/sparc/include/asm/gpio.h | 36 + + arch/sparc/include/asm/io-unit.h | 4 - + arch/sparc/include/asm/io_32.h | 19 +- + arch/sparc/include/asm/io_64.h | 22 +- + arch/sparc/include/asm/iommu_64.h | 3 + + arch/sparc/include/asm/irq_64.h | 1 - + arch/sparc/include/asm/mc146818rtc_64.h | 10 +- + arch/sparc/include/asm/memctrl.h | 9 + + arch/sparc/include/asm/mostek.h | 8 - + arch/sparc/include/asm/mostek_32.h | 171 - + arch/sparc/include/asm/mostek_64.h | 143 - + arch/sparc/include/asm/obio.h | 11 - + arch/sparc/include/asm/of_device.h | 2 + + arch/sparc/include/asm/of_platform.h | 3 - + arch/sparc/include/asm/oplib_32.h | 1 - + arch/sparc/include/asm/page_32.h | 5 +- + arch/sparc/include/asm/page_64.h | 2 + + arch/sparc/include/asm/parport.h | 4 +- + arch/sparc/include/asm/pci_32.h | 2 + + arch/sparc/include/asm/pgtable_32.h | 4 - + arch/sparc/include/asm/pgtable_64.h | 2 + + arch/sparc/include/asm/prom.h | 12 + + arch/sparc/include/asm/ptrace_64.h | 3 + + arch/sparc/include/asm/reboot.h | 6 - + arch/sparc/include/asm/rtc.h | 26 - + arch/sparc/include/asm/sbus.h | 8 - + arch/sparc/include/asm/sbus_32.h | 153 - + arch/sparc/include/asm/sbus_64.h | 190 - + arch/sparc/include/asm/serial.h | 6 + + arch/sparc/include/asm/spinlock_32.h | 2 - + arch/sparc/include/asm/spinlock_64.h | 2 - + arch/sparc/include/asm/sstate.h | 13 - + arch/sparc/include/asm/starfire.h | 1 - + arch/sparc/include/asm/statfs.h | 8 +- + arch/sparc/include/asm/statfs_32.h | 6 - + arch/sparc/include/asm/statfs_64.h | 54 - + arch/sparc/include/asm/sun4paddr.h | 56 - + arch/sparc/include/asm/sun4prom.h | 83 - + arch/sparc/include/asm/system_32.h | 9 +- + arch/sparc/include/asm/system_64.h | 6 +- + arch/sparc/include/asm/thread_info_32.h | 4 - + arch/sparc/include/asm/timer_32.h | 87 - + arch/sparc/include/asm/vac-ops.h | 7 - + arch/sparc/include/asm/vfc_ioctls.h | 58 - + arch/sparc/include/asm/visasm.h | 1 + + arch/sparc/kernel/Makefile | 4 +- + arch/sparc/kernel/apc.c | 72 +- + arch/sparc/kernel/auxio.c | 6 +- + arch/sparc/kernel/devices.c | 2 +- + arch/sparc/kernel/dma.c | 227 + + arch/sparc/kernel/dma.h | 14 + + arch/sparc/kernel/ebus.c | 393 - + arch/sparc/kernel/entry.S | 94 +- + arch/sparc/kernel/head.S | 28 +- + arch/sparc/kernel/idprom.c | 7 - + arch/sparc/kernel/ioport.c | 227 +- + arch/sparc/kernel/irq.h | 6 - + arch/sparc/kernel/of_device.c | 74 +- + arch/sparc/kernel/pcic.c | 15 +- + arch/sparc/kernel/pmc.c | 59 +- + arch/sparc/kernel/process.c | 2 +- + arch/sparc/kernel/prom.c | 7 +- + arch/sparc/kernel/setup.c | 32 +- + arch/sparc/kernel/sparc_ksyms.c | 25 - + arch/sparc/kernel/sun4c_irq.c | 156 +- + arch/sparc/kernel/sun4d_irq.c | 286 +- + arch/sparc/kernel/sun4d_smp.c | 14 +- + arch/sparc/kernel/sun4m_irq.c | 495 +- + arch/sparc/kernel/sun4m_smp.c | 7 +- + arch/sparc/kernel/sun4setup.c | 75 - + arch/sparc/kernel/sys_sparc.c | 8 +- + arch/sparc/kernel/tick14.c | 47 - + arch/sparc/kernel/time.c | 382 +- + arch/sparc/kernel/traps.c | 17 - + arch/sparc/mm/Makefile | 9 +- + arch/sparc/mm/btfixup.c | 6 +- + arch/sparc/mm/fault.c | 2 +- + arch/sparc/mm/init.c | 14 +- + arch/sparc/mm/io-unit.c | 136 +- + arch/sparc/mm/iommu.c | 113 +- + arch/sparc/mm/nosrmmu.c | 59 - + arch/sparc/mm/srmmu.c | 1 - + arch/sparc/mm/sun4c.c | 204 +- + arch/sparc/prom/Makefile | 2 - + arch/sparc/prom/bootstr.c | 4 - + arch/sparc/prom/console.c | 3 - + arch/sparc/prom/init.c | 12 - + arch/sparc/prom/memory.c | 14 - + arch/sparc/prom/ranges.c | 1 - + arch/sparc/prom/sun4prom.c | 161 - + arch/sparc64/Kconfig | 23 + + arch/sparc64/Makefile | 2 +- + arch/sparc64/kernel/Makefile | 9 +- + arch/sparc64/kernel/auxio.c | 2 +- + arch/sparc64/kernel/central.c | 617 +- + arch/sparc64/kernel/chmc.c | 817 ++- + arch/sparc64/kernel/cpu.c | 208 +- + arch/sparc64/kernel/ds.c | 4 +- + arch/sparc64/kernel/ebus.c | 299 +- + arch/sparc64/kernel/entry.h | 7 +- + arch/sparc64/kernel/head.S | 1 + + arch/sparc64/kernel/hvapi.c | 3 - + arch/sparc64/kernel/hvcalls.S | 354 +- + arch/sparc64/kernel/irq.c | 6 +- + arch/sparc64/kernel/of_device.c | 71 +- + arch/sparc64/kernel/pci.c | 174 +- + arch/sparc64/kernel/pci_common.c | 8 +- + arch/sparc64/kernel/pci_fire.c | 254 +- + arch/sparc64/kernel/pci_impl.h | 27 +- + arch/sparc64/kernel/pci_msi.c | 18 +- + arch/sparc64/kernel/pci_psycho.c | 748 +-- + arch/sparc64/kernel/pci_sabre.c | 507 +- + arch/sparc64/kernel/pci_schizo.c | 368 +- + arch/sparc64/kernel/pci_sun4v.c | 197 +- + arch/sparc64/kernel/pci_sun4v_asm.S | 99 +- + arch/sparc64/kernel/power.c | 55 +- + arch/sparc64/kernel/process.c | 35 - + arch/sparc64/kernel/prom.c | 91 +- + arch/sparc64/kernel/psycho_common.c | 470 ++ + arch/sparc64/kernel/psycho_common.h | 48 + + arch/sparc64/kernel/ptrace.c | 38 +- + arch/sparc64/kernel/reboot.c | 53 + + arch/sparc64/kernel/sbus.c | 166 +- + arch/sparc64/kernel/smp.c | 4 + + arch/sparc64/kernel/sparc64_ksyms.c | 23 +- + arch/sparc64/kernel/sstate.c | 67 +- + arch/sparc64/kernel/starfire.c | 5 - + arch/sparc64/kernel/sys_sparc32.c | 8 - + arch/sparc64/kernel/syscalls.S | 20 +- + arch/sparc64/kernel/systbls.S | 2 +- + arch/sparc64/kernel/time.c | 1187 +--- + arch/sparc64/kernel/traps.c | 72 +- + arch/sparc64/kernel/vio.c | 8 +- + arch/sparc64/kernel/visemul.c | 12 +- + arch/sparc64/mm/fault.c | 37 - + arch/sparc64/mm/init.c | 84 +- + arch/sparc64/mm/init.h | 49 + + arch/sparc64/mm/tlb.c | 2 +- + arch/um/Kconfig.char | 4 + + arch/um/Kconfig.i386 | 8 +- + arch/um/Kconfig.x86_64 | 3 - + arch/um/drivers/line.c | 2 + + arch/um/kernel/smp.c | 1 + + arch/um/sys-x86_64/syscall_table.c | 4 +- + arch/x86/Kconfig | 180 +- + arch/x86/Kconfig.cpu | 149 +- + arch/x86/Kconfig.debug | 13 + + arch/x86/Makefile_32.cpu | 6 +- + arch/x86/boot/Makefile | 5 +- + arch/x86/boot/compressed/Makefile | 8 +- + arch/x86/boot/compressed/head_32.S | 5 +- + arch/x86/boot/compressed/misc.c | 12 +- + arch/x86/boot/compressed/relocs.c | 2 +- + arch/x86/boot/cpu.c | 17 +- + arch/x86/boot/edd.c | 7 +- + arch/x86/boot/header.S | 1 - + arch/x86/boot/mkcpustr.c | 40 +- + arch/x86/boot/video-vesa.c | 2 +- + arch/x86/configs/i386_defconfig | 21 +- + arch/x86/configs/x86_64_defconfig | 31 +- + arch/x86/crypto/Makefile | 2 + + arch/x86/crypto/crc32c-intel.c | 197 + + arch/x86/ia32/ia32_aout.c | 11 +- + arch/x86/ia32/ia32_signal.c | 138 +- + arch/x86/ia32/ia32entry.S | 26 +- + arch/x86/ia32/sys_ia32.c | 9 - + arch/x86/kernel/Makefile | 17 +- + arch/x86/kernel/acpi/boot.c | 41 +- + arch/x86/kernel/alternative.c | 10 +- + arch/x86/kernel/amd_iommu.c | 350 +- + arch/x86/kernel/amd_iommu_init.c | 194 +- + arch/x86/kernel/aperture_64.c | 6 +- + arch/x86/kernel/apic_32.c | 441 +- + arch/x86/kernel/apic_64.c | 630 ++- + arch/x86/kernel/apm_32.c | 4 +- + arch/x86/kernel/asm-offsets_64.c | 2 +- + arch/x86/kernel/bios_uv.c | 10 +- + arch/x86/kernel/cpu/Makefile | 34 +- + arch/x86/kernel/cpu/addon_cpuid_features.c | 88 + + arch/x86/kernel/cpu/amd.c | 548 +- + arch/x86/kernel/cpu/amd_64.c | 224 - + arch/x86/kernel/cpu/centaur.c | 4 +- + arch/x86/kernel/cpu/centaur_64.c | 6 +- + arch/x86/kernel/cpu/cmpxchg.c | 72 + + arch/x86/kernel/cpu/common.c | 1025 ++- + arch/x86/kernel/cpu/common_64.c | 712 -- + arch/x86/kernel/cpu/cpu.h | 19 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 13 +- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 42 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 2 +- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 41 +- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 2 +- + arch/x86/kernel/cpu/cyrix.c | 23 +- + arch/x86/kernel/cpu/feature_names.c | 84 - + arch/x86/kernel/cpu/intel.c | 365 +- + arch/x86/kernel/cpu/intel_64.c | 95 - + arch/x86/kernel/cpu/intel_cacheinfo.c | 169 +- + arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +- + arch/x86/kernel/cpu/mkcapflags.pl | 32 + + arch/x86/kernel/cpu/mtrr/generic.c | 7 +- + arch/x86/kernel/cpu/mtrr/if.c | 4 +- + arch/x86/kernel/cpu/mtrr/main.c | 276 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 86 +- + arch/x86/kernel/cpu/powerflags.c | 20 + + arch/x86/kernel/cpu/transmeta.c | 32 +- + arch/x86/kernel/cpu/umc.c | 3 +- + arch/x86/kernel/cpuid.c | 1 - + arch/x86/kernel/crash_dump_64.c | 13 +- + arch/x86/kernel/doublefault_32.c | 2 +- + arch/x86/kernel/ds.c | 954 ++- + arch/x86/kernel/dumpstack_32.c | 447 + + arch/x86/kernel/dumpstack_64.c | 573 ++ + arch/x86/kernel/e820.c | 28 +- + arch/x86/kernel/early-quirks.c | 66 + + arch/x86/kernel/early_printk.c | 748 ++- + arch/x86/kernel/efi.c | 6 +- + arch/x86/kernel/entry_32.S | 22 +- + arch/x86/kernel/entry_64.S | 19 +- + .../es7000plat.c => kernel/es7000_32.c} | 115 +- + arch/x86/kernel/genapic_64.c | 88 +- + arch/x86/kernel/genapic_flat_64.c | 62 +- + arch/x86/kernel/genx2apic_cluster.c | 159 + + arch/x86/kernel/genx2apic_phys.c | 154 + + arch/x86/kernel/genx2apic_uv_x.c | 93 +- + arch/x86/kernel/head.c | 1 + + arch/x86/kernel/head64.c | 5 +- + arch/x86/kernel/head_32.S | 34 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/hpet.c | 6 +- + arch/x86/kernel/i387.c | 168 +- + arch/x86/kernel/i8259.c | 24 + + arch/x86/kernel/io_apic_32.c | 47 +- + arch/x86/kernel/io_apic_64.c | 639 ++- + arch/x86/kernel/ioport.c | 1 + + arch/x86/kernel/ipi.c | 3 +- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/irq_64.c | 2 +- + arch/x86/kernel/irqinit_32.c | 49 + + arch/x86/kernel/irqinit_64.c | 43 +- + arch/x86/kernel/k8.c | 5 +- + arch/x86/kernel/kdebugfs.c | 1 + + arch/x86/kernel/kgdb.c | 50 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/ldt.c | 10 +- + arch/x86/kernel/microcode.c | 853 -- + arch/x86/kernel/microcode_amd.c | 435 + + arch/x86/kernel/microcode_core.c | 508 ++ + arch/x86/kernel/microcode_intel.c | 480 ++ + arch/x86/kernel/mpparse.c | 2 + + arch/x86/kernel/nmi.c | 11 +- + arch/x86/kernel/numaq_32.c | 7 + + arch/x86/kernel/olpc.c | 6 +- + arch/x86/kernel/paravirt-spinlocks.c | 37 + + arch/x86/kernel/paravirt.c | 30 +- + arch/x86/kernel/paravirt_patch_32.c | 2 +- + arch/x86/kernel/pci-calgary_64.c | 18 +- + arch/x86/kernel/pci-dma.c | 179 +- + arch/x86/kernel/pci-gart_64.c | 162 +- + arch/x86/kernel/pci-nommu.c | 10 +- + arch/x86/kernel/pcspeaker.c | 13 +- + arch/x86/kernel/process.c | 21 +- + arch/x86/kernel/process_32.c | 105 +- + arch/x86/kernel/process_64.c | 197 +- + arch/x86/kernel/ptrace.c | 522 +- + arch/x86/kernel/quirks.c | 41 +- + arch/x86/kernel/reboot.c | 6 +- + arch/x86/kernel/rtc.c | 22 +- + arch/x86/kernel/setup.c | 229 +- + arch/x86/kernel/setup_percpu.c | 9 +- + arch/x86/kernel/sigframe.h | 19 +- + arch/x86/kernel/signal_32.c | 273 +- + arch/x86/kernel/signal_64.c | 362 +- + arch/x86/kernel/smp.c | 6 +- + arch/x86/kernel/smpboot.c | 210 +- + arch/x86/kernel/summit_32.c | 2 +- + arch/x86/kernel/sys_i386_32.c | 2 + + arch/x86/kernel/sys_x86_64.c | 44 +- + arch/x86/kernel/syscall_64.c | 4 +- + arch/x86/kernel/time_32.c | 8 +- + arch/x86/kernel/time_64.c | 23 +- + arch/x86/kernel/tlb_32.c | 8 + + arch/x86/kernel/tls.c | 1 + + arch/x86/kernel/{traps_32.c => traps.c} | 896 +-- + arch/x86/kernel/traps_64.c | 1212 --- + arch/x86/kernel/tsc.c | 290 +- + arch/x86/kernel/visws_quirks.c | 16 +- + arch/x86/kernel/vm86_32.c | 1 + + arch/x86/kernel/vmi_32.c | 16 +- + arch/x86/kernel/vmlinux_32.lds.S | 9 +- + arch/x86/kernel/vmlinux_64.lds.S | 9 +- + arch/x86/kernel/vsmp_64.c | 2 +- + arch/x86/kernel/xsave.c | 345 + + arch/x86/kvm/vmx.h | 15 - + arch/x86/lguest/boot.c | 38 +- + arch/x86/lib/Makefile | 3 - + arch/x86/lib/msr-on-cpu.c | 78 +- + arch/x86/lib/string_32.c | 42 +- + arch/x86/lib/strstr_32.c | 6 +- + arch/x86/lib/usercopy_32.c | 7 + + arch/x86/mach-default/setup.c | 19 +- + arch/x86/mach-es7000/Makefile | 5 - + arch/x86/mach-es7000/es7000.h | 114 - + arch/x86/mach-generic/Makefile | 1 - + arch/x86/mach-generic/bigsmp.c | 9 +- + arch/x86/mach-generic/es7000.c | 33 +- + arch/x86/mach-generic/numaq.c | 12 +- + arch/x86/mach-generic/summit.c | 11 +- + arch/x86/mach-voyager/voyager_smp.c | 2 + + arch/x86/mm/Makefile | 6 +- + arch/x86/mm/dump_pagetables.c | 4 +- + arch/x86/mm/fault.c | 22 +- + arch/x86/mm/gup.c | 10 +- + arch/x86/mm/init_32.c | 94 +- + arch/x86/mm/init_64.c | 184 +- + arch/x86/mm/ioremap.c | 191 +- + arch/x86/mm/{discontig_32.c => numa_32.c} | 2 +- + arch/x86/mm/numa_64.c | 10 +- + arch/x86/mm/pageattr-test.c | 9 +- + arch/x86/mm/pageattr.c | 463 +- + arch/x86/mm/pat.c | 132 +- + arch/x86/mm/pgtable.c | 6 +- + arch/x86/mm/pgtable_32.c | 3 +- + arch/x86/mm/srat_64.c | 2 +- + arch/x86/oprofile/Makefile | 2 +- + arch/x86/oprofile/nmi_int.c | 31 +- + arch/x86/oprofile/op_model_amd.c | 543 ++ + arch/x86/oprofile/op_model_athlon.c | 190 - + arch/x86/oprofile/op_model_p4.c | 175 +- + arch/x86/oprofile/op_x86_model.h | 4 +- + arch/x86/pci/acpi.c | 5 - + arch/x86/pci/amd_bus.c | 2 +- + arch/x86/pci/fixup.c | 28 + + arch/x86/pci/i386.c | 3 + + arch/x86/pci/irq.c | 67 +- + arch/x86/pci/mmconfig-shared.c | 12 +- + arch/x86/power/cpu_32.c | 7 + + arch/x86/power/cpu_64.c | 7 + + arch/x86/power/hibernate_asm_32.S | 14 +- + arch/x86/xen/Kconfig | 12 +- + arch/x86/xen/Makefile | 12 +- + arch/x86/xen/debugfs.c | 123 + + arch/x86/xen/debugfs.h | 10 + + arch/x86/xen/enlighten.c | 317 +- + arch/x86/xen/irq.c | 143 + + arch/x86/xen/mmu.c | 314 +- + arch/x86/xen/mmu.h | 3 - + arch/x86/xen/multicalls.c | 115 +- + arch/x86/xen/setup.c | 2 +- + arch/x86/xen/smp.c | 245 +- + arch/x86/xen/spinlock.c | 428 + + arch/x86/xen/time.c | 12 +- + arch/x86/xen/xen-asm_32.S | 2 +- + arch/x86/xen/xen-asm_64.S | 22 +- + arch/x86/xen/xen-ops.h | 8 + + arch/xtensa/kernel/setup.c | 5 - + block/Makefile | 4 +- + block/as-iosched.c | 14 +- + block/blk-barrier.c | 72 +- + block/blk-core.c | 605 +- + block/blk-exec.c | 6 +- + block/blk-integrity.c | 33 +- + block/blk-map.c | 68 +- + block/blk-merge.c | 129 +- + block/blk-settings.c | 43 +- + block/blk-softirq.c | 175 + + block/blk-sysfs.c | 35 +- + block/blk-tag.c | 22 +- + block/blk-timeout.c | 238 + + block/blk.h | 48 + + block/blktrace.c | 32 +- + block/bsg.c | 6 +- + block/cfq-iosched.c | 57 +- + block/cmd-filter.c | 9 +- + block/compat_ioctl.c | 1 + + block/deadline-iosched.c | 40 +- + block/elevator.c | 40 +- + block/genhd.c | 965 ++- + block/ioctl.c | 124 +- + block/scsi_ioctl.c | 8 +- + crypto/Kconfig | 127 +- + crypto/Makefile | 12 +- + crypto/algapi.c | 147 +- + crypto/{cryptomgr.c => algboss.c} | 92 +- + crypto/ansi_cprng.c | 417 + + crypto/api.c | 81 +- + crypto/blkcipher.c | 29 - + crypto/chainiv.c | 44 +- + crypto/eseqiv.c | 35 +- + crypto/fips.c | 27 + + crypto/internal.h | 18 +- + crypto/krng.c | 66 + + crypto/proc.c | 57 +- + crypto/rng.c | 126 + + crypto/seqiv.c | 27 +- + crypto/tcrypt.c | 1347 +--- + crypto/tcrypt.h | 8709 +------------------- + crypto/testmgr.c | 1868 +++++ + crypto/testmgr.h | 8738 ++++++++++++++++++++ + drivers/accessibility/braille/braille_console.c | 13 +- + drivers/acpi/Kconfig | 5 +- + drivers/acpi/glue.c | 118 +- + drivers/acpi/sleep/proc.c | 10 + + drivers/acpi/toshiba_acpi.c | 261 +- + drivers/ata/Kconfig | 3 +- + drivers/ata/ahci.c | 25 +- + drivers/ata/ata_piix.c | 184 +- + drivers/ata/libata-core.c | 252 +- + drivers/ata/libata-eh.c | 375 +- + drivers/ata/libata-scsi.c | 114 +- + drivers/ata/libata.h | 5 +- + drivers/ata/pata_bf54x.c | 34 +- + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/pata_pcmcia.c | 168 +- + drivers/ata/pata_sil680.c | 2 +- + drivers/ata/sata_fsl.c | 26 +- + drivers/ata/sata_inic162x.c | 8 +- + drivers/ata/sata_mv.c | 28 +- + drivers/ata/sata_nv.c | 62 +- + drivers/ata/sata_promise.c | 16 +- + drivers/ata/sata_qstor.c | 12 +- + drivers/ata/sata_sil.c | 16 +- + drivers/ata/sata_sil24.c | 12 +- + drivers/ata/sata_sis.c | 28 +- + drivers/ata/sata_svw.c | 10 +- + drivers/ata/sata_uli.c | 24 +- + drivers/ata/sata_via.c | 24 +- + drivers/ata/sata_vsc.c | 10 +- + drivers/atm/eni.c | 2 +- + drivers/atm/fore200e.c | 410 +- + drivers/atm/fore200e.h | 7 +- + drivers/atm/horizon.c | 8 +- + drivers/atm/idt77252.c | 32 +- + drivers/atm/idt77252.h | 4 +- + drivers/atm/zatm.c | 6 +- + drivers/base/base.h | 2 +- + drivers/base/class.c | 136 +- + drivers/base/core.c | 6 +- + drivers/block/aoe/aoe.h | 9 +- + drivers/block/aoe/aoeblk.c | 14 +- + drivers/block/aoe/aoechr.c | 8 +- + drivers/block/aoe/aoecmd.c | 104 +- + drivers/block/aoe/aoedev.c | 14 +- + drivers/block/aoe/aoemain.c | 1 + + drivers/block/aoe/aoenet.c | 9 +- + drivers/block/ataflop.c | 4 - + drivers/block/cciss.c | 8 +- + drivers/block/cciss_scsi.c | 151 +- + drivers/block/cciss_scsi.h | 4 + + drivers/block/cpqarray.c | 2 +- + drivers/block/floppy.c | 33 +- + drivers/block/hd.c | 9 +- + drivers/block/nbd.c | 4 +- + drivers/block/pktcdvd.c | 4 +- + drivers/block/ps3disk.c | 11 +- + drivers/block/sunvdc.c | 4 +- + drivers/block/viodasd.c | 3 - + drivers/block/virtio_blk.c | 14 +- + drivers/block/xen-blkfront.c | 78 +- + drivers/bluetooth/bluecard_cs.c | 8 +- + drivers/bluetooth/bpa10x.c | 2 - + drivers/bluetooth/bt3c_cs.c | 125 +- + drivers/bluetooth/btuart_cs.c | 126 +- + drivers/bluetooth/btusb.c | 36 +- + drivers/bluetooth/dtl1_cs.c | 67 +- + drivers/bluetooth/hci_bcsp.c | 18 +- + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/bluetooth/hci_usb.h | 10 +- + drivers/cdrom/cdrom.c | 2 +- + drivers/cdrom/gdrom.c | 4 +- + drivers/char/Kconfig | 4 +- + drivers/char/Makefile | 2 +- + drivers/char/agp/agp.h | 5 + + drivers/char/agp/alpha-agp.c | 2 + + drivers/char/agp/amd-k7-agp.c | 2 + + drivers/char/agp/amd64-agp.c | 2 + + drivers/char/agp/ati-agp.c | 2 + + drivers/char/agp/efficeon-agp.c | 2 + + drivers/char/agp/generic.c | 97 +- + drivers/char/agp/hp-agp.c | 2 + + drivers/char/agp/i460-agp.c | 2 + + drivers/char/agp/intel-agp.c | 28 + + drivers/char/agp/nvidia-agp.c | 2 + + drivers/char/agp/parisc-agp.c | 2 + + drivers/char/agp/sis-agp.c | 2 + + drivers/char/agp/sworks-agp.c | 2 + + drivers/char/agp/uninorth-agp.c | 4 + + drivers/char/agp/via-agp.c | 4 + + drivers/char/amiserial.c | 6 - + drivers/char/applicom.c | 6 +- + drivers/char/cyclades.c | 21 +- + drivers/char/epca.c | 5 +- + drivers/char/generic_serial.c | 21 - + drivers/char/hpet.c | 159 +- + drivers/char/hvc_console.c | 14 +- + drivers/char/hvc_xen.c | 6 +- + drivers/char/hw_random/n2-drv.c | 2 +- + drivers/char/ip2/Makefile | 2 +- + drivers/char/ip2/i2ellis.c | 32 - + drivers/char/ip2/i2ellis.h | 2 - + drivers/char/ip2/ip2base.c | 108 - + drivers/char/ip2/ip2main.c | 554 +- + drivers/char/ipmi/ipmi_si_intf.c | 2 +- + drivers/char/isicom.c | 61 +- + drivers/char/istallion.c | 113 +- + drivers/char/moxa.c | 61 +- + drivers/char/mxser.c | 193 +- + drivers/char/n_hdlc.c | 2 +- + drivers/char/n_r3964.c | 8 +- + drivers/char/n_tty.c | 125 +- + drivers/char/nozomi.c | 5 +- + drivers/char/pcmcia/cm4000_cs.c | 73 +- + drivers/char/pcmcia/cm4040_cs.c | 80 +- + drivers/char/pcmcia/ipwireless/main.c | 54 +- + drivers/char/pcmcia/ipwireless/tty.c | 19 +- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/char/pty.c | 335 +- + drivers/char/random.c | 6 +- + drivers/char/rtc.c | 30 +- + drivers/char/stallion.c | 139 +- + drivers/char/sx.c | 4 +- + drivers/char/tpm/Kconfig | 1 + + drivers/char/tpm/tpm.c | 96 +- + drivers/char/tpm/tpm.h | 3 +- + drivers/char/tpm/tpm_tis.c | 14 +- + drivers/char/tty_audit.c | 2 +- + drivers/char/tty_buffer.c | 511 ++ + drivers/char/tty_io.c | 1399 +--- + drivers/char/tty_ioctl.c | 212 +- + drivers/char/tty_port.c | 96 + + drivers/char/vt.c | 89 +- + drivers/char/vt_ioctl.c | 2 + + drivers/clocksource/acpi_pm.c | 21 +- + drivers/cpufreq/cpufreq.c | 30 +- + drivers/cpufreq/cpufreq_conservative.c | 5 +- + drivers/cpufreq/cpufreq_ondemand.c | 147 +- + drivers/cpufreq/cpufreq_performance.c | 4 +- + drivers/cpufreq/cpufreq_powersave.c | 4 +- + drivers/cpufreq/cpufreq_userspace.c | 4 +- + drivers/dma/dw_dmac.c | 2 +- + drivers/hid/Kconfig | 221 + + drivers/hid/Makefile | 35 +- + drivers/hid/hid-a4tech.c | 162 + + drivers/hid/hid-apple.c | 484 ++ + drivers/hid/hid-belkin.c | 105 + + drivers/hid/hid-bright.c | 71 + + drivers/hid/hid-cherry.c | 87 + + drivers/hid/hid-chicony.c | 80 + + drivers/hid/hid-core.c | 1181 +++- + drivers/hid/hid-cypress.c | 158 + + drivers/hid/hid-dell.c | 75 + + drivers/hid/hid-dummy.c | 72 + + drivers/hid/hid-ezkey.c | 95 + + drivers/hid/hid-gyration.c | 96 + + drivers/hid/hid-ids.h | 404 + + drivers/hid/hid-input-quirks.c | 484 -- + drivers/hid/hid-input.c | 915 +-- + drivers/hid/hid-lg.c | 342 + + drivers/hid/hid-lg.h | 18 + + drivers/hid/{usbhid => }/hid-lg2ff.c | 14 +- + drivers/hid/{usbhid => }/hid-lgff.c | 34 +- + drivers/hid/hid-microsoft.c | 219 + + drivers/hid/hid-monterey.c | 82 + + drivers/hid/hid-petalynx.c | 122 + + drivers/hid/{usbhid/hid-plff.c => hid-pl.c} | 83 +- + drivers/hid/hid-samsung.c | 100 + + drivers/hid/hid-sony.c | 110 + + drivers/hid/hid-sunplus.c | 82 + + drivers/hid/{usbhid => }/hid-tmff.c | 138 +- + drivers/hid/{usbhid => }/hid-zpff.c | 71 +- + drivers/hid/hidraw.c | 8 +- + drivers/hid/usbhid/Kconfig | 75 - + drivers/hid/usbhid/Makefile | 18 - + drivers/hid/usbhid/hid-core.c | 463 +- + drivers/hid/usbhid/hid-ff.c | 95 - + drivers/hid/usbhid/hid-pidff.c | 5 +- + drivers/hid/usbhid/hid-quirks.c | 934 +--- + drivers/hid/usbhid/hiddev.c | 20 +- + drivers/hid/usbhid/usbhid.h | 4 +- + drivers/hid/usbhid/usbkbd.c | 12 +- + drivers/hid/usbhid/usbmouse.c | 8 +- + drivers/hwmon/Kconfig | 16 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/abituguru3.c | 3 +- + drivers/hwmon/ad7414.c | 2 +- + drivers/hwmon/ams/ams.h | 2 +- + drivers/hwmon/atxp1.c | 18 +- + drivers/hwmon/dme1737.c | 320 +- + drivers/hwmon/it87.c | 74 +- + drivers/hwmon/max1111.c | 244 + + drivers/hwmon/ultra45_env.c | 320 + + drivers/i2c/busses/Kconfig | 20 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-highlander.c | 498 ++ + drivers/i2c/busses/i2c-mpc.c | 1 - + drivers/i2c/busses/i2c-parport-light.c | 39 +- + drivers/i2c/busses/i2c-pca-isa.c | 22 +- + drivers/i2c/busses/i2c-powermac.c | 4 +- + drivers/i2c/busses/i2c-pxa.c | 94 +- + drivers/i2c/busses/i2c-viapro.c | 17 +- + drivers/i2c/chips/Kconfig | 11 + + drivers/i2c/chips/Makefile | 1 + + drivers/i2c/chips/isp1301_omap.c | 141 +- + drivers/i2c/chips/mcu_mpc8349emitx.c | 209 + + drivers/i2c/chips/tps65010.c | 12 +- + drivers/i2c/i2c-core.c | 35 +- + drivers/i2c/i2c-dev.c | 4 +- + drivers/ide/Kconfig | 79 +- + drivers/ide/Makefile | 24 +- + drivers/ide/arm/icside.c | 28 +- + drivers/ide/arm/palm_bk3710.c | 8 +- + drivers/ide/h8300/ide-h8300.c | 2 +- + drivers/ide/ide-acpi.c | 18 +- + drivers/ide/ide-atapi.c | 405 +- + drivers/ide/ide-cd.c | 337 +- + drivers/ide/ide-cd.h | 1 - + drivers/ide/ide-disk.c | 572 +- + drivers/ide/ide-disk.h | 32 + + drivers/ide/ide-disk_ioctl.c | 29 + + drivers/ide/ide-disk_proc.c | 129 + + drivers/ide/ide-dma-sff.c | 356 + + drivers/ide/ide-dma.c | 519 +- + drivers/ide/ide-floppy.c | 954 +-- + drivers/ide/ide-floppy.h | 62 + + drivers/ide/ide-floppy_ioctl.c | 293 + + drivers/ide/ide-floppy_proc.c | 33 + + drivers/ide/ide-generic.c | 102 +- + drivers/ide/ide-io.c | 340 +- + drivers/ide/ide-ioctls.c | 299 + + drivers/ide/ide-iops.c | 318 +- + drivers/ide/ide-lib.c | 75 +- + drivers/ide/ide-park.c | 121 + + drivers/ide/ide-probe.c | 459 +- + drivers/ide/ide-proc.c | 310 +- + drivers/ide/ide-tape.c | 611 +- + drivers/ide/ide-taskfile.c | 250 +- + drivers/ide/ide-timings.c | 22 +- + drivers/ide/ide.c | 351 +- + drivers/ide/legacy/ali14xx.c | 3 +- + drivers/ide/legacy/buddha.c | 1 - + drivers/ide/legacy/dtc2278.c | 1 - + drivers/ide/legacy/falconide.c | 1 - + drivers/ide/legacy/gayle.c | 1 - + drivers/ide/legacy/ht6560b.c | 10 +- + drivers/ide/legacy/ide-4drives.c | 2 +- + drivers/ide/legacy/ide-cs.c | 159 +- + drivers/ide/legacy/macide.c | 1 - + drivers/ide/legacy/q40ide.c | 2 - + drivers/ide/legacy/qd65xx.c | 25 +- + drivers/ide/legacy/umc8672.c | 1 - + drivers/ide/mips/Makefile | 1 - + drivers/ide/mips/au1xxx-ide.c | 34 +- + drivers/ide/mips/swarm.c | 196 - + drivers/ide/pci/aec62xx.c | 13 +- + drivers/ide/pci/alim15x3.c | 24 +- + drivers/ide/pci/amd74xx.c | 16 +- + drivers/ide/pci/atiixp.c | 9 +- + drivers/ide/pci/cmd640.c | 51 +- + drivers/ide/pci/cmd64x.c | 15 +- + drivers/ide/pci/cs5520.c | 7 +- + drivers/ide/pci/cs5530.c | 25 +- + drivers/ide/pci/cs5535.c | 22 +- + drivers/ide/pci/cy82c693.c | 126 +- + drivers/ide/pci/delkin_cb.c | 7 +- + drivers/ide/pci/generic.c | 9 +- + drivers/ide/pci/hpt34x.c | 11 +- + drivers/ide/pci/hpt366.c | 92 +- + drivers/ide/pci/it8213.c | 9 +- + drivers/ide/pci/it821x.c | 104 +- + drivers/ide/pci/jmicron.c | 9 +- + drivers/ide/pci/ns87415.c | 30 +- + drivers/ide/pci/opti621.c | 15 +- + drivers/ide/pci/pdc202xx_new.c | 21 +- + drivers/ide/pci/pdc202xx_old.c | 25 +- + drivers/ide/pci/piix.c | 51 +- + drivers/ide/pci/rz1000.c | 7 +- + drivers/ide/pci/sc1200.c | 27 +- + drivers/ide/pci/scc_pata.c | 34 +- + drivers/ide/pci/serverworks.c | 17 +- + drivers/ide/pci/sgiioc4.c | 60 +- + drivers/ide/pci/siimage.c | 34 +- + drivers/ide/pci/sis5513.c | 11 +- + drivers/ide/pci/sl82c105.c | 15 +- + drivers/ide/pci/slc90e66.c | 9 +- + drivers/ide/pci/tc86c001.c | 8 +- + drivers/ide/pci/triflex.c | 18 +- + drivers/ide/pci/trm290.c | 11 +- + drivers/ide/pci/via82cxxx.c | 16 +- + drivers/ide/ppc/pmac.c | 77 +- + drivers/ide/setup-pci.c | 33 + + drivers/infiniband/core/cm.c | 2 + + drivers/infiniband/core/mad.c | 5 +- + drivers/infiniband/hw/amso1100/c2_provider.c | 1 - + drivers/infiniband/hw/cxgb3/iwch_provider.c | 9 +- + drivers/infiniband/hw/ehca/ehca_classes.h | 14 +- + drivers/infiniband/hw/ehca/ehca_cq.c | 3 + + drivers/infiniband/hw/ehca/ehca_iverbs.h | 2 + + drivers/infiniband/hw/ehca/ehca_qp.c | 225 +- + drivers/infiniband/hw/ehca/ehca_reqs.c | 211 +- + drivers/infiniband/hw/ipath/ipath_rc.c | 3 +- + drivers/infiniband/hw/ipath/ipath_ruc.c | 3 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 7 + + drivers/infiniband/hw/mlx4/qp.c | 9 + + drivers/infiniband/hw/mthca/mthca_catas.c | 15 +- + drivers/infiniband/hw/mthca/mthca_eq.c | 51 +- + drivers/infiniband/hw/mthca/mthca_main.c | 59 +- + drivers/infiniband/hw/nes/nes.c | 95 +- + drivers/infiniband/hw/nes/nes.h | 2 +- + drivers/infiniband/hw/nes/nes_cm.c | 52 +- + drivers/infiniband/hw/nes/nes_hw.c | 205 +- + drivers/infiniband/hw/nes/nes_hw.h | 6 + + drivers/infiniband/hw/nes/nes_nic.c | 122 +- + drivers/infiniband/hw/nes/nes_verbs.c | 3 - + drivers/infiniband/ulp/ipoib/ipoib.h | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 88 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 30 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 77 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 62 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/input/keyboard/corgikbd.c | 6 +- + drivers/input/keyboard/spitzkbd.c | 6 +- + drivers/input/keyboard/tosakbd.c | 6 +- + drivers/input/misc/hp_sdc_rtc.c | 10 +- + drivers/input/misc/sparcspkr.c | 4 +- + drivers/input/mouse/bcm5974.c | 13 +- + drivers/input/serio/hp_sdc.c | 2 +- + drivers/input/serio/i8042-io.h | 2 +- + drivers/input/serio/i8042-sparcio.h | 2 +- + drivers/input/touchscreen/Kconfig | 1 + + drivers/input/touchscreen/ads7846.c | 68 +- + drivers/input/touchscreen/jornada720_ts.c | 4 +- + drivers/input/touchscreen/ucb1400_ts.c | 382 +- + drivers/input/xen-kbdfront.c | 4 +- + drivers/isdn/capi/capi.c | 2 +- + drivers/isdn/capi/kcapi.c | 4 + + drivers/isdn/gigaset/ser-gigaset.c | 27 +- + drivers/isdn/hardware/avm/avm_cs.c | 85 +- + drivers/isdn/hardware/mISDN/hfc_pci.h | 4 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 23 +- + drivers/isdn/hisax/avma1_cs.c | 81 +- + drivers/isdn/hisax/elsa_cs.c | 79 +- + drivers/isdn/hisax/sedlbauer_cs.c | 197 +- + drivers/isdn/hisax/teles_cs.c | 79 +- + drivers/isdn/i4l/isdn_ppp.c | 352 +- + drivers/isdn/mISDN/dsp_cmx.c | 4 +- + drivers/isdn/mISDN/timerdev.c | 24 +- + drivers/leds/Kconfig | 22 +- + drivers/leds/Makefile | 3 +- + drivers/leds/leds-corgi.c | 124 - + drivers/leds/leds-fsg.c | 28 +- + drivers/leds/leds-pca955x.c | 70 +- + drivers/leds/leds-spitz.c | 131 - + drivers/leds/leds-sunfire.c | 273 + + drivers/md/Kconfig | 14 + + drivers/md/dm-crypt.c | 109 +- + drivers/md/dm-exception-store.c | 29 +- + drivers/md/dm-ioctl.c | 10 +- + drivers/md/dm-mpath.c | 66 +- + drivers/md/dm-mpath.h | 2 - + drivers/md/dm-raid1.c | 4 +- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-table.c | 97 +- + drivers/md/dm.c | 52 +- + drivers/md/dm.h | 10 +- + drivers/md/linear.c | 10 +- + drivers/md/md.c | 23 +- + drivers/md/multipath.c | 8 +- + drivers/md/raid0.c | 10 +- + drivers/md/raid1.c | 13 +- + drivers/md/raid10.c | 14 +- + drivers/md/raid5.c | 75 +- + drivers/media/common/ir-keymaps.c | 280 +- + drivers/media/common/saa7146_core.c | 2 +- + drivers/media/common/saa7146_fops.c | 2 +- + drivers/media/common/tuners/mt2060.c | 38 +- + drivers/media/common/tuners/mxl5007t.c | 1 - + drivers/media/common/tuners/tda18271-fe.c | 1 - + drivers/media/common/tuners/tda827x.c | 12 +- + drivers/media/common/tuners/tda827x.h | 1 - + drivers/media/common/tuners/tda8290.c | 4 +- + drivers/media/common/tuners/tda8290.h | 1 - + drivers/media/common/tuners/tda9887.c | 1 - + drivers/media/common/tuners/tuner-simple.c | 3 +- + drivers/media/common/tuners/tuner-types.c | 22 + + drivers/media/common/tuners/tuner-xc2028.c | 74 +- + drivers/media/common/tuners/tuner-xc2028.h | 11 +- + drivers/media/common/tuners/xc5000.c | 109 +- + drivers/media/common/tuners/xc5000.h | 8 +- + drivers/media/common/tuners/xc5000_priv.h | 37 - + drivers/media/dvb/Kconfig | 5 +- + drivers/media/dvb/Makefile | 2 +- + drivers/media/dvb/b2c2/flexcop-dma.c | 2 +- + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 1 + + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 2 +- + drivers/media/dvb/cinergyT2/Kconfig | 85 - + drivers/media/dvb/cinergyT2/Makefile | 3 - + drivers/media/dvb/cinergyT2/cinergyT2.c | 1105 --- + drivers/media/dvb/dm1105/Kconfig | 18 + + drivers/media/dvb/dm1105/Makefile | 3 + + drivers/media/dvb/dm1105/dm1105.c | 911 ++ + drivers/media/dvb/dvb-core/dmxdev.c | 16 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 16 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 666 ++- + drivers/media/dvb/dvb-core/dvb_frontend.h | 32 + + drivers/media/dvb/dvb-usb/Kconfig | 42 +- + drivers/media/dvb/dvb-usb/Makefile | 10 + + drivers/media/dvb/dvb-usb/af9005-remote.c | 2 +- + drivers/media/dvb/dvb-usb/af9005-script.h | 2 +- + drivers/media/dvb/dvb-usb/af9005.c | 23 +- + drivers/media/dvb/dvb-usb/af9015.c | 1474 ++++ + drivers/media/dvb/dvb-usb/af9015.h | 524 ++ + drivers/media/dvb/dvb-usb/anysee.c | 30 +- + drivers/media/dvb/dvb-usb/cinergyT2-core.c | 268 + + drivers/media/dvb/dvb-usb/cinergyT2-fe.c | 351 + + drivers/media/dvb/dvb-usb/cinergyT2.h | 95 + + drivers/media/dvb/dvb-usb/cxusb.c | 504 ++- + drivers/media/dvb/dvb-usb/dib0700.h | 4 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 115 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 195 +- + drivers/media/dvb/dvb-usb/dtv5100.c | 240 + + drivers/media/dvb/dvb-usb/dtv5100.h | 51 + + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 29 +- + drivers/media/dvb/dvb-usb/dw2102.c | 572 ++- + drivers/media/dvb/dvb-usb/dw2102.h | 1 - + drivers/media/dvb/frontends/Kconfig | 47 + + drivers/media/dvb/frontends/Makefile | 7 + + drivers/media/dvb/frontends/af9013.c | 1685 ++++ + drivers/media/dvb/frontends/af9013.h | 107 + + drivers/media/dvb/frontends/af9013_priv.h | 869 ++ + drivers/media/dvb/frontends/au8522.c | 133 + + drivers/media/dvb/frontends/au8522.h | 17 + + drivers/media/dvb/frontends/cx24110.h | 15 +- + drivers/media/dvb/frontends/cx24116.c | 1423 ++++ + drivers/media/dvb/frontends/cx24116.h | 53 + + drivers/media/dvb/frontends/dib0070.h | 8 +- + drivers/media/dvb/frontends/dib7000m.c | 6 +- + drivers/media/dvb/frontends/dib7000p.c | 3 +- + drivers/media/dvb/frontends/dib7000p.h | 41 +- + drivers/media/dvb/frontends/drx397xD.c | 288 +- + drivers/media/dvb/frontends/drx397xD.h | 6 +- + drivers/media/dvb/frontends/dvb_dummy_fe.c | 11 +- + drivers/media/dvb/frontends/eds1547.h | 133 + + drivers/media/dvb/frontends/lgs8gl5.c | 454 + + drivers/media/dvb/frontends/lgs8gl5.h | 45 + + drivers/media/dvb/frontends/nxt200x.c | 4 +- + drivers/media/dvb/frontends/or51211.c | 2 +- + drivers/media/dvb/frontends/s5h1420.c | 11 +- + drivers/media/dvb/frontends/s5h1420.h | 8 +- + drivers/media/dvb/frontends/si21xx.c | 974 +++ + drivers/media/dvb/frontends/si21xx.h | 37 + + drivers/media/dvb/frontends/sp887x.c | 3 +- + drivers/media/dvb/frontends/stb6000.c | 255 + + drivers/media/dvb/frontends/stb6000.h | 51 + + drivers/media/dvb/frontends/stv0288.c | 618 ++ + drivers/media/dvb/frontends/stv0288.h | 67 + + drivers/media/dvb/frontends/stv0299.c | 2 + + drivers/media/dvb/frontends/stv0299.h | 13 +- + drivers/media/dvb/frontends/tdhd1.h | 73 + + drivers/media/dvb/siano/sms-cards.c | 4 +- + drivers/media/dvb/ttpci/Kconfig | 1 + + drivers/media/dvb/ttpci/av7110.c | 127 +- + drivers/media/dvb/ttpci/av7110.h | 1 + + drivers/media/dvb/ttpci/av7110_av.c | 3 + + drivers/media/dvb/ttpci/budget-av.c | 8 +- + drivers/media/dvb/ttpci/budget-ci.c | 7 +- + drivers/media/dvb/ttpci/budget-core.c | 6 +- + drivers/media/dvb/ttpci/budget-patch.c | 9 +- + drivers/media/dvb/ttpci/budget.c | 25 +- + drivers/media/dvb/ttpci/budget.h | 2 +- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 16 +- + drivers/media/radio/Kconfig | 12 + + drivers/media/radio/Makefile | 1 + + drivers/media/radio/dsbr100.c | 28 +- + drivers/media/radio/radio-aimslab.c | 34 +- + drivers/media/radio/radio-aztech.c | 40 +- + drivers/media/radio/radio-cadet.c | 1 + + drivers/media/radio/radio-gemtek-pci.c | 42 +- + drivers/media/radio/radio-gemtek.c | 37 +- + drivers/media/radio/radio-maestro.c | 34 +- + drivers/media/radio/radio-maxiradio.c | 40 +- + drivers/media/radio/radio-mr800.c | 628 ++ + drivers/media/radio/radio-rtrack2.c | 34 +- + drivers/media/radio/radio-sf16fmi.c | 34 +- + drivers/media/radio/radio-sf16fmr2.c | 34 +- + drivers/media/radio/radio-si470x.c | 24 +- + drivers/media/radio/radio-terratec.c | 34 +- + drivers/media/radio/radio-trust.c | 17 +- + drivers/media/radio/radio-typhoon.c | 35 +- + drivers/media/radio/radio-zoltrix.c | 51 +- + drivers/media/video/Kconfig | 235 +- + drivers/media/video/Makefile | 9 +- + drivers/media/video/arv.c | 29 +- + drivers/media/video/au0828/au0828-cards.c | 2 +- + drivers/media/video/au0828/au0828-dvb.c | 47 +- + drivers/media/video/au0828/au0828.h | 3 +- + drivers/media/video/bt856.c | 8 +- + drivers/media/video/bt8xx/bttv-cards.c | 27 +- + drivers/media/video/bt8xx/bttv-driver.c | 68 +- + drivers/media/video/bt8xx/bttv-input.c | 62 +- + drivers/media/video/bt8xx/bttv.h | 2 +- + drivers/media/video/btcx-risc.c | 2 +- + drivers/media/video/bw-qcam.c | 26 +- + drivers/media/video/bw-qcam.h | 1 + + drivers/media/video/c-qcam.c | 23 +- + drivers/media/video/cafe_ccic.c | 20 +- + drivers/media/video/cpia.c | 15 +- + drivers/media/video/cpia2/cpia2_core.c | 10 +- + drivers/media/video/cpia2/cpia2_usb.c | 7 +- + drivers/media/video/cpia2/cpia2_v4l.c | 16 +- + drivers/media/video/cx18/Makefile | 2 +- + drivers/media/video/cx18/cx18-audio.c | 5 +- + drivers/media/video/cx18/cx18-av-core.c | 23 +- + drivers/media/video/cx18/cx18-av-core.h | 2 + + drivers/media/video/cx18/cx18-av-firmware.c | 25 +- + drivers/media/video/cx18/cx18-cards.c | 101 +- + drivers/media/video/cx18/cx18-driver.c | 51 +- + drivers/media/video/cx18/cx18-driver.h | 71 +- + drivers/media/video/cx18/cx18-dvb.c | 5 +- + drivers/media/video/cx18/cx18-fileops.c | 47 +- + drivers/media/video/cx18/cx18-firmware.c | 140 +- + drivers/media/video/cx18/cx18-gpio.c | 17 +- + drivers/media/video/cx18/cx18-gpio.h | 2 +- + drivers/media/video/cx18/cx18-i2c.c | 49 +- + drivers/media/video/cx18/cx18-io.c | 254 + + drivers/media/video/cx18/cx18-io.h | 378 + + drivers/media/video/cx18/cx18-ioctl.c | 34 +- + drivers/media/video/cx18/cx18-irq.c | 47 +- + drivers/media/video/cx18/cx18-mailbox.c | 45 +- + drivers/media/video/cx18/cx18-queue.c | 18 +- + drivers/media/video/cx18/cx18-scb.c | 131 +- + drivers/media/video/cx18/cx18-streams.c | 70 +- + drivers/media/video/cx18/cx18-version.h | 2 +- + drivers/media/video/cx18/cx23418.h | 2 +- + drivers/media/video/cx2341x.c | 5 +- + drivers/media/video/cx23885/Kconfig | 1 + + drivers/media/video/cx23885/cx23885-417.c | 13 +- + drivers/media/video/cx23885/cx23885-cards.c | 86 +- + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx23885/cx23885-dvb.c | 105 +- + drivers/media/video/cx23885/cx23885-vbi.c | 12 +- + drivers/media/video/cx23885/cx23885-video.c | 39 +- + drivers/media/video/cx23885/cx23885.h | 4 +- + drivers/media/video/cx25840/cx25840-vbi.c | 5 +- + drivers/media/video/cx88/Kconfig | 4 + + drivers/media/video/cx88/cx88-blackbird.c | 9 +- + drivers/media/video/cx88/cx88-cards.c | 306 +- + drivers/media/video/cx88/cx88-dvb.c | 198 +- + drivers/media/video/cx88/cx88-i2c.c | 16 + + drivers/media/video/cx88/cx88-input.c | 33 +- + drivers/media/video/cx88/cx88-video.c | 15 +- + drivers/media/video/cx88/cx88.h | 11 +- + drivers/media/video/dabusb.c | 3 +- + drivers/media/video/dpc7146.c | 408 - + drivers/media/video/em28xx/em28xx-audio.c | 12 +- + drivers/media/video/em28xx/em28xx-cards.c | 59 +- + drivers/media/video/em28xx/em28xx-dvb.c | 16 +- + drivers/media/video/em28xx/em28xx-i2c.c | 35 +- + drivers/media/video/em28xx/em28xx-video.c | 60 +- + drivers/media/video/em28xx/em28xx.h | 6 +- + drivers/media/video/et61x251/et61x251_core.c | 14 +- + drivers/media/video/gspca/Kconfig | 215 +- + drivers/media/video/gspca/Makefile | 75 +- + drivers/media/video/gspca/conex.c | 3 +- + drivers/media/video/gspca/etoms.c | 3 +- + drivers/media/video/gspca/finepix.c | 466 ++ + drivers/media/video/gspca/gspca.c | 248 +- + drivers/media/video/gspca/gspca.h | 21 +- + drivers/media/video/gspca/m5602/Kconfig | 11 + + drivers/media/video/gspca/m5602/Makefile | 11 + + drivers/media/video/gspca/m5602/m5602_bridge.h | 170 + + drivers/media/video/gspca/m5602/m5602_core.c | 313 + + drivers/media/video/gspca/m5602/m5602_mt9m111.c | 345 + + drivers/media/video/gspca/m5602/m5602_mt9m111.h | 1020 +++ + drivers/media/video/gspca/m5602/m5602_ov9650.c | 546 ++ + drivers/media/video/gspca/m5602/m5602_ov9650.h | 503 ++ + drivers/media/video/gspca/m5602/m5602_po1030.c | 336 + + drivers/media/video/gspca/m5602/m5602_po1030.h | 478 ++ + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 463 ++ + drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 370 + + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 423 + + drivers/media/video/gspca/m5602/m5602_s5k83a.h | 484 ++ + drivers/media/video/gspca/m5602/m5602_sensor.h | 76 + + drivers/media/video/gspca/mars.c | 20 +- + drivers/media/video/gspca/ov519.c | 5 +- + drivers/media/video/gspca/pac207.c | 4 +- + drivers/media/video/gspca/pac7311.c | 4 +- + drivers/media/video/gspca/sonixb.c | 9 +- + drivers/media/video/gspca/sonixj.c | 108 +- + drivers/media/video/gspca/spca500.c | 3 +- + drivers/media/video/gspca/spca501.c | 3 +- + drivers/media/video/gspca/spca505.c | 3 +- + drivers/media/video/gspca/spca506.c | 3 +- + drivers/media/video/gspca/spca508.c | 3 +- + drivers/media/video/gspca/spca561.c | 12 +- + drivers/media/video/gspca/stk014.c | 5 +- + drivers/media/video/gspca/sunplus.c | 3 +- + drivers/media/video/gspca/t613.c | 591 +- + drivers/media/video/gspca/tv8532.c | 3 +- + drivers/media/video/gspca/vc032x.c | 6 +- + drivers/media/video/gspca/zc3xx.c | 7 +- + drivers/media/video/ir-kbd-i2c.c | 64 +- + drivers/media/video/ivtv/ivtv-cards.h | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 12 +- + drivers/media/video/ivtv/ivtv-driver.h | 9 +- + drivers/media/video/ivtv/ivtv-fileops.c | 8 +- + drivers/media/video/ivtv/ivtv-fileops.h | 5 - + drivers/media/video/ivtv/ivtv-gpio.c | 2 +- + drivers/media/video/ivtv/ivtv-gpio.h | 2 +- + drivers/media/video/ivtv/ivtv-i2c.c | 2 - + drivers/media/video/ivtv/ivtv-ioctl.c | 60 +- + drivers/media/video/ivtv/ivtv-irq.c | 9 +- + drivers/media/video/ivtv/ivtv-streams.c | 42 +- + drivers/media/video/ivtv/ivtv-vbi.c | 2 +- + drivers/media/video/ivtv/ivtv-yuv.c | 1 + + drivers/media/video/ivtv/ivtvfb.c | 78 +- + drivers/media/video/meye.c | 13 +- + drivers/media/video/meye.h | 1 + + drivers/media/video/mt9m001.c | 55 +- + drivers/media/video/mt9m111.c | 973 +++ + drivers/media/video/mt9v022.c | 52 +- + drivers/media/video/mxb.c | 469 +- + drivers/media/video/ov511.c | 111 +- + drivers/media/video/ov511.h | 3 +- + drivers/media/video/ovcamchip/ovcamchip_core.c | 6 - + drivers/media/video/ovcamchip/ovcamchip_priv.h | 6 + + drivers/media/video/pms.c | 23 +- + drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 8 +- + drivers/media/video/pvrusb2/pvrusb2-ctrl.h | 2 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 2 + + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 9 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 340 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 13 + + .../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 7 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 46 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 1 + + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 42 +- + drivers/media/video/pvrusb2/pvrusb2-main.c | 8 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 23 + + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 94 +- + drivers/media/video/pwc/pwc-ctrl.c | 1 - + drivers/media/video/pwc/pwc-if.c | 12 +- + drivers/media/video/pwc/pwc-v4l.c | 2 +- + drivers/media/video/pxa_camera.c | 60 +- + drivers/media/video/s2255drv.c | 575 +- + drivers/media/video/saa5246a.c | 568 +- + drivers/media/video/saa5246a.h | 359 - + drivers/media/video/saa5249.c | 704 +- + drivers/media/video/saa7115.c | 42 +- + drivers/media/video/saa7134/saa6752hs.c | 440 +- + drivers/media/video/saa7134/saa7134-alsa.c | 13 +- + drivers/media/video/saa7134/saa7134-cards.c | 261 +- + drivers/media/video/saa7134/saa7134-core.c | 62 +- + drivers/media/video/saa7134/saa7134-dvb.c | 52 +- + drivers/media/video/saa7134/saa7134-empress.c | 65 +- + drivers/media/video/saa7134/saa7134-i2c.c | 11 + + drivers/media/video/saa7134/saa7134-input.c | 210 +- + drivers/media/video/saa7134/saa7134-ts.c | 56 +- + drivers/media/video/saa7134/saa7134-video.c | 63 +- + drivers/media/video/saa7134/saa7134.h | 19 +- + drivers/media/video/se401.c | 44 +- + drivers/media/video/sh_mobile_ceu_camera.c | 5 - + drivers/media/video/sn9c102/sn9c102_core.c | 34 +- + drivers/media/video/sn9c102/sn9c102_devtable.h | 20 - + drivers/media/video/sn9c102/sn9c102_hv7131d.c | 1 + + drivers/media/video/sn9c102/sn9c102_hv7131r.c | 1 + + drivers/media/video/sn9c102/sn9c102_mi0343.c | 1 + + drivers/media/video/sn9c102/sn9c102_mi0360.c | 1 + + drivers/media/video/sn9c102/sn9c102_mt9v111.c | 1 + + drivers/media/video/sn9c102/sn9c102_ov7630.c | 1 + + drivers/media/video/sn9c102/sn9c102_ov7660.c | 1 + + drivers/media/video/sn9c102/sn9c102_pas106b.c | 1 + + drivers/media/video/sn9c102/sn9c102_pas202bcb.c | 1 + + drivers/media/video/sn9c102/sn9c102_tas5110c1b.c | 1 + + drivers/media/video/sn9c102/sn9c102_tas5110d.c | 1 + + drivers/media/video/sn9c102/sn9c102_tas5130d1b.c | 1 + + drivers/media/video/stk-webcam.c | 90 +- + drivers/media/video/stk-webcam.h | 2 - + drivers/media/video/stradis.c | 7 +- + drivers/media/video/stv680.c | 8 +- + drivers/media/video/tda9840.c | 260 +- + drivers/media/video/tda9840.h | 21 - + drivers/media/video/tea6415c.c | 131 +- + drivers/media/video/tea6420.c | 147 +- + drivers/media/video/tuner-3036.c | 214 - + drivers/media/video/tuner-core.c | 13 +- + drivers/media/video/tvaudio.c | 2 +- + drivers/media/video/usbvideo/ibmcam.c | 78 +- + drivers/media/video/usbvideo/konicawc.c | 17 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 3 +- + drivers/media/video/usbvideo/ultracam.c | 29 +- + drivers/media/video/usbvideo/usbvideo.c | 166 +- + drivers/media/video/usbvideo/vicam.c | 17 +- + drivers/media/video/usbvision/usbvision-core.c | 3 +- + drivers/media/video/usbvision/usbvision-i2c.c | 3 +- + drivers/media/video/usbvision/usbvision-video.c | 127 +- + drivers/media/video/uvc/uvc_ctrl.c | 187 +- + drivers/media/video/uvc/uvc_driver.c | 51 +- + drivers/media/video/uvc/uvc_status.c | 11 +- + drivers/media/video/uvc/uvc_v4l2.c | 17 +- + drivers/media/video/uvc/uvc_video.c | 12 +- + drivers/media/video/uvc/uvcvideo.h | 4 +- + drivers/media/video/v4l2-common.c | 183 +- + drivers/media/video/v4l2-dev.c | 300 +- + drivers/media/video/v4l2-ioctl.c | 12 - + drivers/media/video/vino.c | 25 +- + drivers/media/video/vivi.c | 7 +- + drivers/media/video/vpx3220.c | 2 - + drivers/media/video/w9966.c | 29 +- + drivers/media/video/w9968cf.c | 2 +- + drivers/media/video/wm8739.c | 4 +- + drivers/media/video/zc0301/zc0301_core.c | 14 +- + drivers/media/video/zoran/Kconfig | 73 + + drivers/media/video/zoran/Makefile | 6 + + drivers/media/video/{ => zoran}/videocodec.c | 0 + drivers/media/video/{ => zoran}/videocodec.h | 0 + drivers/media/video/{ => zoran}/zoran.h | 0 + drivers/media/video/{ => zoran}/zoran_card.c | 2 +- + drivers/media/video/{ => zoran}/zoran_card.h | 0 + drivers/media/video/{ => zoran}/zoran_device.c | 6 +- + drivers/media/video/{ => zoran}/zoran_device.h | 8 + + drivers/media/video/{ => zoran}/zoran_driver.c | 28 +- + drivers/media/video/{ => zoran}/zoran_procfs.c | 0 + drivers/media/video/{ => zoran}/zoran_procfs.h | 0 + drivers/media/video/{ => zoran}/zr36016.c | 0 + drivers/media/video/{ => zoran}/zr36016.h | 0 + drivers/media/video/{ => zoran}/zr36050.c | 0 + drivers/media/video/{ => zoran}/zr36050.h | 0 + drivers/media/video/{ => zoran}/zr36057.h | 0 + drivers/media/video/{ => zoran}/zr36060.c | 0 + drivers/media/video/{ => zoran}/zr36060.h | 0 + drivers/media/video/zr364xx.c | 87 +- + drivers/memstick/core/mspro_block.c | 4 +- + drivers/mfd/Kconfig | 51 +- + drivers/mfd/Makefile | 6 + + drivers/mfd/asic3.c | 2 +- + drivers/mfd/ucb1400_core.c | 106 + + drivers/mfd/wm8350-core.c | 1273 +++ + drivers/mfd/wm8350-gpio.c | 222 + + drivers/mfd/wm8350-i2c.c | 120 + + drivers/mfd/wm8350-regmap.c | 1347 +++ + drivers/mfd/wm8400-core.c | 455 + + drivers/misc/eeepc-laptop.c | 16 +- + drivers/mmc/Kconfig | 9 +- + drivers/mmc/card/Kconfig | 3 +- + drivers/mmc/card/block.c | 67 +- + drivers/mmc/card/mmc_test.c | 4 +- + drivers/mmc/card/queue.c | 23 +- + drivers/mmc/core/mmc_ops.c | 8 +- + drivers/mmc/core/sdio.c | 52 +- + drivers/mmc/core/sdio_irq.c | 16 +- + drivers/mmc/host/Kconfig | 30 +- + drivers/mmc/host/atmel-mci-regs.h | 6 +- + drivers/mmc/host/atmel-mci.c | 1364 +++- + drivers/mmc/host/mmc_spi.c | 32 +- + drivers/mmc/host/pxamci.c | 4 +- + drivers/mmc/host/sdhci-pci.c | 5 +- + drivers/mmc/host/sdhci.c | 46 +- + drivers/mmc/host/sdhci.h | 2 + + drivers/mmc/host/tmio_mmc.h | 4 +- + drivers/mtd/ftl.c | 24 + + drivers/mtd/maps/pcmciamtd.c | 34 +- + drivers/mtd/maps/sun_uflash.c | 75 +- + drivers/mtd/mtd_blkdevs.c | 16 + + drivers/mtd/nand/atmel_nand_ecc.h | 3 + + drivers/mtd/nand/cafe_nand.c | 6 +- + drivers/mtd/nand/cmx270_nand.c | 2 +- + drivers/net/3c501.c | 12 +- + drivers/net/3c505.c | 4 +- + drivers/net/3c515.c | 2 +- + drivers/net/8139cp.c | 14 +- + drivers/net/8139too.c | 14 +- + drivers/net/Kconfig | 70 +- + drivers/net/Makefile | 6 +- + drivers/net/appletalk/cops.c | 2 +- + drivers/net/arcnet/arcnet.c | 18 +- + drivers/net/arcnet/com20020.c | 16 +- + drivers/net/atl1e/atl1e_hw.c | 6 +- + drivers/net/atl1e/atl1e_main.c | 2 - + drivers/net/atlx/Makefile | 2 + + drivers/net/atlx/atl1.c | 32 +- + drivers/net/atlx/atl2.c | 3119 +++++++ + drivers/net/atlx/atl2.h | 529 ++ + drivers/net/atlx/atlx.c | 1 - + drivers/net/au1000_eth.c | 67 +- + drivers/net/au1000_eth.h | 2 +- + drivers/net/ax88796.c | 14 +- + drivers/net/bfin_mac.c | 59 +- + drivers/net/bfin_mac.h | 2 +- + drivers/net/bnx2.c | 229 +- + drivers/net/bnx2.h | 15 +- + drivers/net/bnx2_fw.h | 8654 ++++++++++---------- + drivers/net/bnx2x_main.c | 95 +- + drivers/net/bonding/bond_alb.c | 28 +- + drivers/net/bonding/bond_main.c | 12 +- + drivers/net/bonding/bonding.h | 10 +- + drivers/net/cassini.c | 56 +- + drivers/net/cassini.h | 1522 +---- + drivers/net/cpmac.c | 51 +- + drivers/net/cs89x0.c | 14 +- + drivers/net/cxgb3/adapter.h | 9 +- + drivers/net/cxgb3/ael1002.c | 1074 +++- + drivers/net/cxgb3/common.h | 87 +- + drivers/net/cxgb3/cxgb3_ctl_defs.h | 2 +- + drivers/net/cxgb3/cxgb3_defs.h | 2 +- + drivers/net/cxgb3/cxgb3_ioctl.h | 4 +- + drivers/net/cxgb3/cxgb3_main.c | 390 +- + drivers/net/cxgb3/cxgb3_offload.c | 10 +- + drivers/net/cxgb3/cxgb3_offload.h | 2 +- + drivers/net/cxgb3/firmware_exports.h | 2 +- + drivers/net/cxgb3/l2t.c | 41 +- + drivers/net/cxgb3/l2t.h | 5 +- + drivers/net/cxgb3/mc5.c | 2 +- + drivers/net/cxgb3/regs.h | 4 + + drivers/net/cxgb3/sge.c | 112 +- + drivers/net/cxgb3/t3_cpl.h | 2 +- + drivers/net/cxgb3/t3_hw.c | 243 +- + drivers/net/cxgb3/t3cdev.h | 2 +- + drivers/net/cxgb3/version.h | 4 +- + drivers/net/cxgb3/vsc8211.c | 208 +- + drivers/net/cxgb3/xgmac.c | 2 +- + drivers/net/e100.c | 6 +- + drivers/net/e1000/e1000.h | 17 - + drivers/net/e1000/e1000_hw.c | 23 + + drivers/net/e1000/e1000_main.c | 476 +- + drivers/net/e1000e/82571.c | 153 +- + drivers/net/e1000e/defines.h | 15 + + drivers/net/e1000e/e1000.h | 36 +- + drivers/net/e1000e/es2lan.c | 2 +- + drivers/net/e1000e/ethtool.c | 69 +- + drivers/net/e1000e/hw.h | 15 +- + drivers/net/e1000e/ich8lan.c | 253 +- + drivers/net/e1000e/lib.c | 8 +- + drivers/net/e1000e/netdev.c | 571 ++- + drivers/net/e1000e/param.c | 57 + + drivers/net/e1000e/phy.c | 194 +- + drivers/net/eexpress.c | 2 +- + drivers/net/ehea/ehea.h | 4 +- + drivers/net/ehea/ehea_phyp.c | 2 +- + drivers/net/ehea/ehea_qmr.c | 3 +- + drivers/net/enc28j60.c | 56 +- + drivers/net/enic/Makefile | 5 + + drivers/net/enic/cq_desc.h | 79 + + drivers/net/enic/cq_enet_desc.h | 169 + + drivers/net/enic/enic.h | 114 + + drivers/net/enic/enic_main.c | 1935 +++++ + drivers/net/enic/enic_res.c | 370 + + drivers/net/enic/enic_res.h | 151 + + drivers/net/enic/rq_enet_desc.h | 60 + + drivers/net/enic/vnic_cq.c | 89 + + drivers/net/enic/vnic_cq.h | 113 + + drivers/net/enic/vnic_dev.c | 674 ++ + drivers/net/enic/vnic_dev.h | 120 + + drivers/net/enic/vnic_devcmd.h | 282 + + drivers/net/enic/vnic_enet.h | 47 + + drivers/net/enic/vnic_intr.c | 62 + + drivers/net/enic/vnic_intr.h | 92 + + drivers/net/enic/vnic_nic.h | 65 + + drivers/net/enic/vnic_resource.h | 63 + + drivers/net/enic/vnic_rq.c | 199 + + drivers/net/enic/vnic_rq.h | 204 + + drivers/net/enic/vnic_rss.h | 32 + + drivers/net/enic/vnic_stats.h | 70 + + drivers/net/enic/vnic_wq.c | 184 + + drivers/net/enic/vnic_wq.h | 154 + + drivers/net/enic/wq_enet_desc.h | 98 + + drivers/net/fealnx.c | 6 +- + drivers/net/fec_mpc52xx_phy.c | 8 +- + drivers/net/forcedeth.c | 18 +- + drivers/net/fs_enet/fs_enet-main.c | 22 +- + drivers/net/fs_enet/fs_enet.h | 2 - + drivers/net/fs_enet/mac-fcc.c | 12 - + drivers/net/fs_enet/mac-fec.c | 30 - + drivers/net/fs_enet/mac-scc.c | 26 - + drivers/net/fs_enet/mii-bitbang.c | 9 +- + drivers/net/fs_enet/mii-fec.c | 8 +- + drivers/net/gianfar.c | 3 + + drivers/net/gianfar_mii.c | 27 +- + drivers/net/ibm_newemac/Kconfig | 14 +- + drivers/net/ibm_newemac/core.c | 60 +- + drivers/net/ibm_newemac/core.h | 11 + + drivers/net/ibm_newemac/mal.c | 60 +- + drivers/net/ibm_newemac/mal.h | 38 +- + drivers/net/ibm_newemac/phy.c | 86 +- + drivers/net/ibm_newemac/phy.h | 2 + + drivers/net/ibmlana.c | 2 +- + drivers/net/igb/igb_main.c | 12 +- + drivers/net/irda/pxaficp_ir.c | 8 +- + drivers/net/irda/vlsi_ir.c | 2 +- + drivers/net/ixgb/ixgb.h | 2 +- + drivers/net/ixgb/ixgb_main.c | 8 +- + drivers/net/ixgbe/ixgbe.h | 103 +- + drivers/net/ixgbe/ixgbe_82598.c | 628 ++- + drivers/net/ixgbe/ixgbe_common.c | 1060 ++- + drivers/net/ixgbe/ixgbe_common.h | 58 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 302 +- + drivers/net/ixgbe/ixgbe_main.c | 1938 +++-- + drivers/net/ixgbe/ixgbe_phy.c | 244 +- + drivers/net/ixgbe/ixgbe_phy.h | 63 +- + drivers/net/ixgbe/ixgbe_type.h | 563 +- + drivers/net/jme.c | 3038 +++++++ + drivers/net/jme.h | 1229 +++ + drivers/net/lib8390.c | 4 +- + drivers/net/macb.c | 49 +- + drivers/net/macb.h | 2 +- + drivers/net/macmace.c | 2 +- + drivers/net/meth.c | 2 +- + drivers/net/mipsnet.c | 2 +- + drivers/net/mlx4/alloc.c | 1 + + drivers/net/mlx4/mr.c | 10 +- + drivers/net/mv643xx_eth.c | 1471 ++-- + drivers/net/myri10ge/myri10ge.c | 185 +- + drivers/net/myri_sbus.c | 198 +- + drivers/net/myri_sbus.h | 2 +- + drivers/net/natsemi.c | 8 +- + drivers/net/ne.c | 281 +- + drivers/net/netx-eth.c | 2 +- + drivers/net/netxen/netxen_nic.h | 2 +- + drivers/net/netxen/netxen_nic_main.c | 20 +- + drivers/net/niu.c | 2 +- + drivers/net/pci-skeleton.c | 4 +- + drivers/net/pcmcia/3c574_cs.c | 7 +- + drivers/net/pcmcia/3c589_cs.c | 9 +- + drivers/net/pcmcia/axnet_cs.c | 80 +- + drivers/net/pcmcia/com20020_cs.c | 8 +- + drivers/net/pcmcia/fmvj18x_cs.c | 21 +- + drivers/net/pcmcia/ibmtr_cs.c | 2 +- + drivers/net/pcmcia/nmclan_cs.c | 4 +- + drivers/net/pcmcia/pcnet_cs.c | 86 +- + drivers/net/pcmcia/smc91c92_cs.c | 151 +- + drivers/net/pcmcia/xirc2ps_cs.c | 85 +- + drivers/net/phy/fixed.c | 33 +- + drivers/net/phy/mdio-bitbang.c | 4 +- + drivers/net/phy/mdio-ofgpio.c | 11 +- + drivers/net/phy/mdio_bus.c | 232 +- + drivers/net/phy/phy.c | 60 +- + drivers/net/phy/phy_device.c | 50 +- + drivers/net/ppp_generic.c | 13 +- + drivers/net/pppol2tp.c | 2 +- + drivers/net/qlge/Makefile | 7 + + drivers/net/qlge/qlge.h | 1593 ++++ + drivers/net/qlge/qlge_dbg.c | 858 ++ + drivers/net/qlge/qlge_ethtool.c | 414 + + drivers/net/qlge/qlge_main.c | 3956 +++++++++ + drivers/net/qlge/qlge_mpi.c | 150 + + drivers/net/r6040.c | 6 +- + drivers/net/r8169.c | 966 ++- + drivers/net/s2io.c | 62 +- + drivers/net/s2io.h | 1 + + drivers/net/sb1250-mac.c | 48 +- + drivers/net/sfc/bitfield.h | 178 +- + drivers/net/sfc/boards.c | 12 +- + drivers/net/sfc/boards.h | 2 - + drivers/net/sfc/efx.c | 489 +- + drivers/net/sfc/efx.h | 14 +- + drivers/net/sfc/enum.h | 9 +- + drivers/net/sfc/ethtool.c | 184 +- + drivers/net/sfc/falcon.c | 1019 ++- + drivers/net/sfc/falcon.h | 17 +- + drivers/net/sfc/falcon_hwdefs.h | 80 +- + drivers/net/sfc/falcon_io.h | 1 - + drivers/net/sfc/falcon_xmac.c | 346 +- + drivers/net/sfc/mac.h | 4 - + drivers/net/sfc/mdio_10g.c | 16 +- + drivers/net/sfc/mdio_10g.h | 13 +- + drivers/net/sfc/net_driver.h | 144 +- + drivers/net/sfc/phy.h | 10 +- + drivers/net/sfc/rx.c | 78 +- + drivers/net/sfc/rx.h | 4 +- + drivers/net/sfc/selftest.c | 391 +- + drivers/net/sfc/selftest.h | 13 +- + drivers/net/sfc/sfe4001.c | 248 +- + drivers/net/sfc/spi.h | 89 +- + drivers/net/sfc/tenxpress.c | 149 +- + drivers/net/sfc/tx.c | 385 +- + drivers/net/sfc/tx.h | 2 +- + drivers/net/sfc/workarounds.h | 4 - + drivers/net/sfc/xfp_phy.c | 12 +- + drivers/net/sh_eth.c | 4 +- + drivers/net/skfp/pmf.c | 29 +- + drivers/net/skge.c | 26 +- + drivers/net/sky2.c | 181 +- + drivers/net/smc911x.c | 77 +- + drivers/net/smc911x.h | 14 +- + drivers/net/smc91x.c | 52 +- + drivers/net/smc91x.h | 15 +- + drivers/net/sunbmac.c | 206 +- + drivers/net/sunbmac.h | 4 +- + drivers/net/sundance.c | 95 +- + drivers/net/sunhme.c | 322 +- + drivers/net/sunhme.h | 7 +- + drivers/net/sunlance.c | 180 +- + drivers/net/sunqe.c | 162 +- + drivers/net/sunqe.h | 4 +- + drivers/net/sunvnet.c | 4 +- + drivers/net/tc35815.c | 45 +- + drivers/net/tehuti.h | 8 +- + drivers/net/tg3.c | 157 +- + drivers/net/tg3.h | 3 +- + drivers/net/tlan.c | 3 +- + drivers/net/tokenring/smctr.c | 2 +- + drivers/net/tsi108_eth.c | 6 +- + drivers/net/tulip/de2104x.c | 2 +- + drivers/net/tulip/de4x5.c | 38 +- + drivers/net/tulip/dmfe.c | 4 +- + drivers/net/ucc_geth.c | 116 +- + drivers/net/ucc_geth_mii.c | 9 +- + drivers/net/usb/Kconfig | 8 + + drivers/net/usb/Makefile | 4 +- + drivers/net/usb/hso.c | 335 +- + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/pegasus.c | 20 +- + drivers/net/usb/smsc95xx.c | 1225 +++ + drivers/net/usb/smsc95xx.h | 253 + + drivers/net/usb/usbnet.c | 3 +- + drivers/net/via-rhine.c | 8 +- + drivers/net/via-velocity.c | 6 +- + drivers/net/via-velocity.h | 2 +- + drivers/net/wan/Kconfig | 2 +- + drivers/net/wan/cycx_drv.c | 6 +- + drivers/net/wan/cycx_x25.c | 12 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wan/hdlc_x25.c | 8 +- + drivers/net/wan/pc300_tty.c | 2 +- + drivers/net/wan/sbni.c | 2 +- + drivers/net/wan/z85230.c | 3 +- + drivers/net/wan/z85230.h | 2 +- + drivers/net/wireless/Kconfig | 17 +- + drivers/net/wireless/Makefile | 4 +- + drivers/net/wireless/adm8211.c | 23 +- + drivers/net/wireless/airo.c | 18 +- + drivers/net/wireless/airo_cs.c | 224 +- + drivers/net/wireless/airport.c | 3 +- + drivers/net/wireless/ath5k/Makefile | 12 +- + drivers/net/wireless/ath5k/ath5k.h | 619 +- + drivers/net/wireless/ath5k/attach.c | 359 + + drivers/net/wireless/ath5k/base.c | 574 +- + drivers/net/wireless/ath5k/base.h | 10 +- + drivers/net/wireless/ath5k/caps.c | 193 + + drivers/net/wireless/ath5k/debug.c | 4 +- + drivers/net/wireless/ath5k/desc.c | 692 ++ + drivers/net/wireless/ath5k/desc.h | 332 + + drivers/net/wireless/ath5k/dma.c | 605 ++ + drivers/net/wireless/ath5k/eeprom.c | 466 ++ + drivers/net/wireless/ath5k/eeprom.h | 215 + + drivers/net/wireless/ath5k/gpio.c | 176 + + drivers/net/wireless/ath5k/hw.c | 4529 ---------- + drivers/net/wireless/ath5k/hw.h | 616 -- + drivers/net/wireless/ath5k/initvals.c | 22 +- + drivers/net/wireless/ath5k/pcu.c | 1014 +++ + drivers/net/wireless/ath5k/phy.c | 12 +- + drivers/net/wireless/ath5k/qcu.c | 488 ++ + drivers/net/wireless/ath5k/reg.h | 679 +- + drivers/net/wireless/ath5k/reset.c | 931 +++ + drivers/net/wireless/ath9k/Kconfig | 3 + + drivers/net/wireless/ath9k/ath9k.h | 64 +- + drivers/net/wireless/ath9k/beacon.c | 383 +- + drivers/net/wireless/ath9k/core.c | 423 +- + drivers/net/wireless/ath9k/core.h | 295 +- + drivers/net/wireless/ath9k/hw.c | 312 +- + drivers/net/wireless/ath9k/hw.h | 120 +- + drivers/net/wireless/ath9k/main.c | 1275 ++- + drivers/net/wireless/ath9k/phy.h | 12 +- + drivers/net/wireless/ath9k/rc.c | 280 +- + drivers/net/wireless/ath9k/rc.h | 222 +- + drivers/net/wireless/ath9k/recv.c | 98 +- + drivers/net/wireless/ath9k/reg.h | 6 - + drivers/net/wireless/ath9k/xmit.c | 418 +- + drivers/net/wireless/atmel.c | 2 +- + drivers/net/wireless/atmel_cs.c | 121 +- + drivers/net/wireless/b43/Kconfig | 12 + + drivers/net/wireless/b43/Makefile | 7 +- + drivers/net/wireless/b43/b43.h | 146 +- + drivers/net/wireless/b43/debugfs.c | 79 +- + drivers/net/wireless/b43/lo.c | 120 +- + drivers/net/wireless/b43/lo.h | 4 +- + drivers/net/wireless/b43/main.c | 404 +- + drivers/net/wireless/b43/pcmcia.c | 16 +- + drivers/net/wireless/b43/phy.h | 340 - + drivers/net/wireless/b43/phy_a.c | 643 ++ + drivers/net/wireless/b43/phy_a.h | 130 + + drivers/net/wireless/b43/phy_common.c | 381 + + drivers/net/wireless/b43/phy_common.h | 413 + + drivers/net/wireless/b43/{phy.c => phy_g.c} | 4420 +++++------ + drivers/net/wireless/b43/phy_g.h | 209 + + drivers/net/wireless/b43/phy_lp.c | 155 + + drivers/net/wireless/b43/phy_lp.h | 540 ++ + drivers/net/wireless/b43/{nphy.c => phy_n.c} | 154 +- + drivers/net/wireless/b43/{nphy.h => phy_n.h} | 54 +- + drivers/net/wireless/b43/rfkill.c | 10 +- + drivers/net/wireless/b43/sysfs.c | 23 +- + drivers/net/wireless/b43/tables.c | 43 +- + drivers/net/wireless/b43/tables_nphy.c | 4 +- + drivers/net/wireless/b43/wa.c | 2 +- + drivers/net/wireless/b43/xmit.c | 14 +- + drivers/net/wireless/b43legacy/main.c | 38 +- + drivers/net/wireless/b43legacy/phy.c | 36 +- + drivers/net/wireless/b43legacy/xmit.c | 12 +- + drivers/net/wireless/hermes.c | 124 +- + drivers/net/wireless/hermes.h | 45 + + drivers/net/wireless/hermes_dld.c | 730 ++ + drivers/net/wireless/hermes_dld.h | 48 + + drivers/net/wireless/hermes_rid.h | 17 + + drivers/net/wireless/hostap/hostap_cs.c | 237 +- + drivers/net/wireless/ipw2100.c | 2 +- + drivers/net/wireless/ipw2200.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-io.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 200 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 9 - + drivers/net/wireless/iwlwifi/iwl-3945.c | 205 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 7 + + drivers/net/wireless/iwlwifi/iwl-5000.c | 71 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 331 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 29 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 275 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 75 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 136 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 25 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 107 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 102 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 163 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 41 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 31 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 65 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 250 +- + drivers/net/wireless/libertas/assoc.c | 750 +- + drivers/net/wireless/libertas/assoc.h | 18 +- + drivers/net/wireless/libertas/cmd.c | 430 +- + drivers/net/wireless/libertas/cmd.h | 22 + + drivers/net/wireless/libertas/cmdresp.c | 80 - + drivers/net/wireless/libertas/decl.h | 1 - + drivers/net/wireless/libertas/defs.h | 41 +- + drivers/net/wireless/libertas/dev.h | 11 +- + drivers/net/wireless/libertas/host.h | 51 +- + drivers/net/wireless/libertas/hostcmd.h | 84 +- + drivers/net/wireless/libertas/if_cs.c | 4 +- + drivers/net/wireless/libertas/if_usb.c | 182 +- + drivers/net/wireless/libertas/if_usb.h | 5 + + drivers/net/wireless/libertas/main.c | 41 +- + drivers/net/wireless/libertas/scan.c | 5 + + drivers/net/wireless/libertas/wext.c | 363 +- + drivers/net/wireless/libertas_tf/Makefile | 6 + + drivers/net/wireless/libertas_tf/cmd.c | 669 ++ + drivers/net/wireless/libertas_tf/if_usb.c | 766 ++ + drivers/net/wireless/libertas_tf/if_usb.h | 98 + + drivers/net/wireless/libertas_tf/libertas_tf.h | 514 ++ + drivers/net/wireless/libertas_tf/main.c | 662 ++ + drivers/net/wireless/mac80211_hwsim.c | 211 +- + drivers/net/wireless/netwave_cs.c | 7 +- + drivers/net/wireless/orinoco.c | 1951 ++++- + drivers/net/wireless/orinoco.h | 61 +- + drivers/net/wireless/orinoco_cs.c | 170 +- + drivers/net/wireless/orinoco_nortel.c | 3 +- + drivers/net/wireless/orinoco_pci.c | 3 +- + drivers/net/wireless/orinoco_plx.c | 3 +- + drivers/net/wireless/orinoco_tmd.c | 3 +- + drivers/net/wireless/p54/p54.h | 55 +- + drivers/net/wireless/p54/p54common.c | 695 ++- + drivers/net/wireless/p54/p54common.h | 124 +- + drivers/net/wireless/p54/p54pci.c | 427 +- + drivers/net/wireless/p54/p54pci.h | 20 +- + drivers/net/wireless/p54/p54usb.c | 200 +- + drivers/net/wireless/p54/p54usb.h | 11 +- + drivers/net/wireless/prism54/isl_ioctl.c | 8 +- + drivers/net/wireless/ray_cs.c | 6 +- + drivers/net/wireless/rndis_wlan.c | 3 +- + drivers/net/wireless/rt2x00/Kconfig | 128 +- + drivers/net/wireless/rt2x00/Makefile | 1 + + drivers/net/wireless/rt2x00/rt2400pci.c | 58 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 22 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 59 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 17 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 68 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 17 +- + drivers/net/wireless/rt2x00/rt2x00.h | 90 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 16 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 215 + + drivers/net/wireless/rt2x00/rt2x00debug.c | 97 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 129 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 49 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 245 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 136 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 82 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 19 +- + drivers/net/wireless/rt2x00/rt2x00rfkill.c | 63 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 21 +- + drivers/net/wireless/rt2x00/rt61pci.c | 447 +- + drivers/net/wireless/rt2x00/rt61pci.h | 38 +- + drivers/net/wireless/rt2x00/rt73usb.c | 457 +- + drivers/net/wireless/rt2x00/rt73usb.h | 38 +- + drivers/net/wireless/rtl8180.h | 31 - + drivers/net/wireless/rtl8180_dev.c | 49 +- + drivers/net/wireless/rtl8187.h | 6 - + drivers/net/wireless/rtl8187_dev.c | 20 +- + drivers/net/wireless/rtl818x.h | 35 + + drivers/net/wireless/spectrum_cs.c | 590 +-- + drivers/net/wireless/wavelan.c | 2 +- + drivers/net/wireless/wavelan.p.h | 2 +- + drivers/net/wireless/wavelan_cs.c | 18 +- + drivers/net/wireless/wl3501_cs.c | 14 +- + drivers/net/wireless/zd1211rw/Makefile | 2 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 1 - + drivers/net/wireless/zd1211rw/zd_ieee80211.c | 100 - + drivers/net/wireless/zd1211rw/zd_ieee80211.h | 95 - + drivers/net/wireless/zd1211rw/zd_mac.c | 67 +- + drivers/net/wireless/zd1211rw/zd_mac.h | 65 +- + drivers/net/wireless/zd1211rw/zd_rf.c | 2 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 1 + + drivers/net/xen-netfront.c | 6 +- + drivers/of/base.c | 136 +- + drivers/of/gpio.c | 79 +- + drivers/oprofile/buffer_sync.c | 209 +- + drivers/oprofile/cpu_buffer.c | 74 +- + drivers/oprofile/cpu_buffer.h | 2 + + drivers/parport/parport_cs.c | 70 +- + drivers/parport/parport_sunbpp.c | 49 +- + drivers/pci/Makefile | 2 + + drivers/pci/dma_remapping.h | 157 + + drivers/pci/dmar.c | 397 +- + drivers/pci/hotplug/rpaphp_slot.c | 4 - + drivers/pci/intel-iommu.c | 187 +- + drivers/pci/intel-iommu.h | 233 +- + drivers/pci/intr_remapping.c | 471 ++ + drivers/pci/intr_remapping.h | 8 + + drivers/pci/pci-sysfs.c | 19 + + drivers/pci/pcie/aspm.c | 2 +- + drivers/pci/search.c | 6 +- + drivers/pcmcia/Kconfig | 3 +- + drivers/pcmcia/Makefile | 20 +- + drivers/pcmcia/au1000_generic.c | 2 +- + drivers/pcmcia/au1000_generic.h | 2 +- + drivers/pcmcia/au1000_pb1x00.c | 1 - + drivers/pcmcia/au1000_xxs1500.c | 1 - + drivers/pcmcia/cardbus.c | 2 +- + drivers/pcmcia/cistpl.c | 297 +- + drivers/pcmcia/cs.c | 78 +- + drivers/pcmcia/cs_internal.h | 226 +- + drivers/pcmcia/ds.c | 262 +- + drivers/pcmcia/ds_internal.h | 23 - + drivers/pcmcia/hd64465_ss.c | 1 - + drivers/pcmcia/i82365.c | 2 +- + drivers/pcmcia/m32r_cfc.c | 4 +- + drivers/pcmcia/m32r_pcc.c | 4 +- + drivers/pcmcia/m8xx_pcmcia.c | 4 +- + drivers/pcmcia/o2micro.h | 10 +- + drivers/pcmcia/pcmcia_ioctl.c | 120 +- + drivers/pcmcia/pcmcia_resource.c | 381 +- + drivers/pcmcia/pxa2xx_base.c | 45 +- + drivers/pcmcia/pxa2xx_cm_x255.c | 154 + + drivers/pcmcia/pxa2xx_cm_x270.c | 14 +- + drivers/pcmcia/pxa2xx_cm_x2xx.c | 49 + + drivers/pcmcia/pxa2xx_palmld.c | 151 + + drivers/pcmcia/pxa2xx_trizeps4.c | 256 + + drivers/pcmcia/pxa2xx_viper.c | 179 + + drivers/pcmcia/rsrc_nonstatic.c | 67 +- + drivers/pcmcia/soc_common.c | 2 +- + drivers/pcmcia/soc_common.h | 3 +- + drivers/pcmcia/socket_sysfs.c | 13 +- + drivers/pcmcia/tcic.c | 2 +- + drivers/pcmcia/ti113x.h | 78 +- + drivers/pcmcia/yenta_socket.c | 86 +- + drivers/pnp/Makefile | 5 +- + drivers/pnp/isapnp/core.c | 2 +- + drivers/pnp/pnpacpi/core.c | 2 +- + drivers/pnp/pnpbios/core.c | 6 +- + drivers/power/Kconfig | 8 +- + drivers/power/Makefile | 2 +- + drivers/power/palmtx_battery.c | 198 - + drivers/power/wm97xx_battery.c | 272 + + drivers/regulator/Kconfig | 24 + + drivers/regulator/Makefile | 3 + + drivers/regulator/bq24022.c | 21 +- + drivers/regulator/core.c | 508 +- + drivers/regulator/da903x.c | 513 ++ + drivers/regulator/wm8350-regulator.c | 1431 ++++ + drivers/regulator/wm8400-regulator.c | 368 + + drivers/rtc/Kconfig | 46 +- + drivers/rtc/Makefile | 5 + + drivers/rtc/rtc-bq4802.c | 230 + + drivers/rtc/rtc-cmos.c | 127 +- + drivers/rtc/rtc-dev.c | 15 +- + drivers/rtc/rtc-ds1286.c | 409 + + drivers/rtc/rtc-m48t35.c | 234 + + drivers/rtc/rtc-m48t59.c | 68 +- + drivers/rtc/rtc-starfire.c | 120 + + drivers/rtc/rtc-sun4v.c | 153 + + drivers/s390/block/dasd.c | 32 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/block/dasd_devmap.c | 28 +- + drivers/s390/block/dasd_eckd.c | 132 +- + drivers/s390/block/dasd_eer.c | 6 +- + drivers/s390/block/dasd_fba.c | 4 +- + drivers/s390/block/dasd_int.h | 4 +- + drivers/s390/block/dasd_proc.c | 5 +- + drivers/s390/block/dcssblk.c | 520 +- + drivers/s390/block/xpram.c | 37 +- + drivers/s390/char/con3215.c | 53 +- + drivers/s390/char/con3270.c | 27 +- + drivers/s390/char/fs3270.c | 17 +- + drivers/s390/char/raw3270.c | 4 +- + drivers/s390/char/sclp_con.c | 24 +- + drivers/s390/char/sclp_vt220.c | 26 +- + drivers/s390/char/tape_3590.c | 132 +- + drivers/s390/char/tape_block.c | 2 +- + drivers/s390/char/tape_core.c | 21 +- + drivers/s390/char/tape_proc.c | 2 +- + drivers/s390/char/tape_std.c | 13 +- + drivers/s390/char/vmlogrdr.c | 5 +- + drivers/s390/char/vmur.c | 6 +- + drivers/s390/cio/blacklist.c | 11 +- + drivers/s390/cio/ccwgroup.c | 7 +- + drivers/s390/cio/chp.c | 3 +- + drivers/s390/cio/chsc_sch.c | 2 +- + drivers/s390/cio/cio.c | 57 +- + drivers/s390/cio/cio.h | 4 + + drivers/s390/cio/css.c | 4 +- + drivers/s390/cio/device.c | 118 +- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/device_fsm.c | 6 +- + drivers/s390/cio/device_ops.c | 2 +- + drivers/s390/cio/io_sch.h | 22 +- + drivers/s390/cio/ioasm.h | 49 +- + drivers/s390/cio/qdio.h | 11 + + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/s390/cio/qdio_main.c | 32 +- + drivers/s390/cio/qdio_setup.c | 55 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/s390/kvm/kvm_virtio.c | 15 +- + drivers/s390/net/claw.c | 36 +- + drivers/s390/net/claw.h | 2 +- + drivers/s390/net/ctcm_main.c | 22 +- + drivers/s390/net/ctcm_main.h | 2 +- + drivers/s390/net/lcs.c | 34 +- + drivers/s390/net/netiucv.c | 2 +- + drivers/s390/net/qeth_core.h | 10 +- + drivers/s390/net/qeth_core_main.c | 14 +- + drivers/s390/net/qeth_l2_main.c | 14 +- + drivers/s390/net/qeth_l3_main.c | 8 +- + drivers/s390/s390_rdev.c | 2 +- + drivers/s390/scsi/zfcp_aux.c | 149 +- + drivers/s390/scsi/zfcp_ccw.c | 45 +- + drivers/s390/scsi/zfcp_dbf.c | 75 +- + drivers/s390/scsi/zfcp_dbf.h | 1 + + drivers/s390/scsi/zfcp_def.h | 183 +- + drivers/s390/scsi/zfcp_erp.c | 231 +- + drivers/s390/scsi/zfcp_ext.h | 27 +- + drivers/s390/scsi/zfcp_fc.c | 227 +- + drivers/s390/scsi/zfcp_fsf.c | 584 +- + drivers/s390/scsi/zfcp_fsf.h | 75 - + drivers/s390/scsi/zfcp_qdio.c | 67 +- + drivers/s390/scsi/zfcp_scsi.c | 28 +- + drivers/s390/scsi/zfcp_sysfs.c | 62 +- + drivers/sbus/Makefile | 4 - + drivers/sbus/char/Kconfig | 29 +- + drivers/sbus/char/Makefile | 6 - + drivers/sbus/char/bbc_envctrl.c | 121 +- + drivers/sbus/char/bbc_i2c.c | 267 +- + drivers/sbus/char/bbc_i2c.h | 75 +- + drivers/sbus/char/bpp.c | 1055 --- + drivers/sbus/char/cpwatchdog.c | 858 -- + drivers/sbus/char/display7seg.c | 251 +- + drivers/sbus/char/envctrl.c | 147 +- + drivers/sbus/char/flash.c | 130 +- + drivers/sbus/char/rtc.c | 275 - + drivers/sbus/char/uctrl.c | 216 +- + drivers/sbus/char/vfc.h | 171 - + drivers/sbus/char/vfc_dev.c | 736 -- + drivers/sbus/char/vfc_i2c.c | 335 - + drivers/sbus/char/vfc_i2c.h | 44 - + drivers/sbus/dvma.c | 136 - + drivers/sbus/sbus.c | 316 - + drivers/scsi/Kconfig | 17 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/atari_dma_emul.c | 468 -- + drivers/scsi/atari_scsi.c | 27 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 5 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 2 - + drivers/scsi/device_handler/scsi_dh_rdac.c | 4 +- + drivers/scsi/esp_scsi.h | 3 +- + drivers/scsi/gdth.c | 60 +- + drivers/scsi/gdth.h | 2 +- + drivers/scsi/gdth_proc.c | 66 - + drivers/scsi/gdth_proc.h | 3 - + drivers/scsi/hosts.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/ide-scsi.c | 220 +- + drivers/scsi/ipr.c | 3 +- + drivers/scsi/ips.c | 2 +- + drivers/scsi/libiscsi.c | 19 +- + drivers/scsi/libsas/sas_ata.c | 10 +- + drivers/scsi/libsas/sas_internal.h | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 30 +- + drivers/scsi/megaraid/megaraid_sas.c | 6 +- + drivers/scsi/ncr53c8xx.c | 4 +- + drivers/scsi/pcmcia/aha152x_stub.c | 58 +- + drivers/scsi/pcmcia/fdomain_stub.c | 37 +- + drivers/scsi/pcmcia/nsp_cs.c | 194 +- + drivers/scsi/pcmcia/qlogic_stub.c | 47 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 46 +- + drivers/scsi/qla1280.c | 4 +- + drivers/scsi/qla2xxx/qla_attr.c | 9 +- + drivers/scsi/qla2xxx/qla_def.h | 13 +- + drivers/scsi/qla2xxx/qla_fw.h | 71 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 14 +- + drivers/scsi/qla2xxx/qla_inline.h | 2 +- + drivers/scsi/qla2xxx/qla_iocb.c | 30 +- + drivers/scsi/qla2xxx/qla_isr.c | 18 +- + drivers/scsi/qla2xxx/qla_mbx.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 11 +- + drivers/scsi/qla2xxx/qla_sup.c | 338 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/qlogicpti.c | 147 +- + drivers/scsi/qlogicpti.h | 2 +- + drivers/scsi/scsi.c | 105 +- + drivers/scsi/scsi_error.c | 90 +- + drivers/scsi/scsi_lib.c | 59 +- + drivers/scsi/scsi_netlink.c | 523 ++- + drivers/scsi/scsi_priv.h | 7 +- + drivers/scsi/scsi_proc.c | 8 +- + drivers/scsi/scsi_scan.c | 20 +- + drivers/scsi/scsi_sysfs.c | 8 +- + drivers/scsi/scsi_tgt_lib.c | 8 +- + drivers/scsi/scsi_transport_fc.c | 60 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/scsi/sd.c | 122 +- + drivers/scsi/sg.c | 667 +-- + drivers/scsi/sr.c | 7 +- + drivers/scsi/sun_esp.c | 267 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/tmscsim.c | 4 +- + drivers/serial/8250.c | 49 +- + drivers/serial/8250_pci.c | 4 +- + drivers/serial/Kconfig | 53 +- + drivers/serial/Makefile | 16 +- + drivers/serial/atmel_serial.c | 32 +- + drivers/serial/bfin_5xx.c | 123 +- + drivers/serial/cpm_uart/cpm_uart_core.c | 3 + + drivers/serial/cpm_uart/cpm_uart_cpm1.c | 6 +- + drivers/serial/cpm_uart/cpm_uart_cpm2.c | 6 +- + drivers/serial/crisv10.c | 5 +- + drivers/serial/mcfserial.c | 1965 ----- + drivers/serial/mcfserial.h | 74 - + drivers/serial/mpc52xx_uart.c | 181 +- + drivers/serial/pxa.c | 5 + + drivers/serial/serial_core.c | 12 +- + drivers/serial/serial_cs.c | 302 +- + drivers/serial/serial_ks8695.c | 61 +- + drivers/serial/sunhv.c | 2 +- + drivers/serial/sunsab.c | 2 +- + drivers/serial/sunsu.c | 2 +- + drivers/serial/sunzilog.c | 2 +- + drivers/serial/ucc_uart.c | 4 +- + drivers/spi/mpc52xx_psc_spi.c | 6 +- + drivers/spi/orion_spi.c | 2 +- + drivers/spi/pxa2xx_spi.c | 4 +- + drivers/ssb/main.c | 1 + + drivers/ssb/pci.c | 84 +- + drivers/ssb/pcmcia.c | 22 +- + drivers/telephony/ixj_pcmcia.c | 72 +- + drivers/usb/atm/usbatm.c | 5 +- + drivers/usb/core/hcd.c | 3 +- + drivers/usb/core/hub.c | 39 +- + drivers/usb/core/inode.c | 2 +- + drivers/usb/gadget/fsl_usb2_udc.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/host/ehci-hcd.c | 26 +- + drivers/usb/host/ehci-ixp4xx.c | 2 +- + drivers/usb/host/ehci-sched.c | 32 +- + drivers/usb/host/ehci.h | 138 +- + drivers/usb/host/ohci-pxa27x.c | 259 +- + drivers/usb/host/sl811_cs.c | 133 +- + drivers/usb/musb/Kconfig | 1 + + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/omap2430.c | 4 +- + drivers/usb/musb/omap2430.h | 4 +- + drivers/usb/serial/aircable.c | 15 +- + drivers/usb/serial/belkin_sa.c | 3 +- + drivers/usb/serial/console.c | 8 +- + drivers/usb/serial/cp2101.c | 3 + + drivers/usb/serial/cyberjack.c | 3 +- + drivers/usb/serial/cypress_m8.c | 5 +- + drivers/usb/serial/digi_acceleport.c | 19 +- + drivers/usb/serial/empeg.c | 8 +- + drivers/usb/serial/ftdi_sio.c | 28 +- + drivers/usb/serial/ftdi_sio.h | 5 + + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/generic.c | 3 +- + drivers/usb/serial/io_edgeport.c | 43 +- + drivers/usb/serial/io_ti.c | 26 +- + drivers/usb/serial/ipaq.c | 3 +- + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 3 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 77 +- + drivers/usb/serial/keyspan_pda.c | 16 +- + drivers/usb/serial/kl5kusb105.c | 3 +- + drivers/usb/serial/kobil_sct.c | 3 +- + drivers/usb/serial/mct_u232.c | 6 +- + drivers/usb/serial/mos7720.c | 36 +- + drivers/usb/serial/mos7840.c | 7 +- + drivers/usb/serial/navman.c | 3 +- + drivers/usb/serial/omninet.c | 10 +- + drivers/usb/serial/option.c | 20 +- + drivers/usb/serial/oti6858.c | 7 +- + drivers/usb/serial/pl2303.c | 15 +- + drivers/usb/serial/safe_serial.c | 11 +- + drivers/usb/serial/sierra.c | 28 +- + drivers/usb/serial/spcp8x5.c | 3 +- + drivers/usb/serial/ti_usb_3410_5052.c | 46 +- + drivers/usb/serial/usb-serial.c | 28 +- + drivers/usb/serial/visor.c | 18 +- + drivers/usb/serial/whiteheat.c | 8 +- + drivers/usb/storage/Kconfig | 12 - + drivers/usb/storage/Makefile | 3 +- + drivers/usb/storage/unusual_devs.h | 30 +- + drivers/usb/storage/usb.c | 2 - + drivers/video/Kconfig | 33 +- + drivers/video/Makefile | 1 - + drivers/video/am200epd.c | 295 - + drivers/video/atmel_lcdfb.c | 4 + + drivers/video/backlight/Kconfig | 15 + + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/corgi_lcd.c | 641 ++ + drivers/video/backlight/lcd.c | 18 +- + drivers/video/backlight/mbp_nvidia_bl.c | 4 +- + drivers/video/backlight/tdo24m.c | 396 + + drivers/video/bw2.c | 2 +- + drivers/video/cg14.c | 2 +- + drivers/video/cg3.c | 2 +- + drivers/video/cg6.c | 38 +- + drivers/video/console/Kconfig | 16 - + drivers/video/console/fbcon.c | 45 +- + drivers/video/console/fbcon.h | 2 +- + drivers/video/console/mdacon.c | 2 +- + drivers/video/console/sticon.c | 4 +- + drivers/video/console/vgacon.c | 4 +- + drivers/video/fbmem.c | 1 + + drivers/video/ffb.c | 2 +- + drivers/video/leo.c | 96 +- + drivers/video/metronomefb.c | 288 +- + drivers/video/p9100.c | 2 +- + drivers/video/tcx.c | 2 +- + drivers/video/xen-fbfront.c | 4 +- + drivers/watchdog/Kconfig | 43 + + drivers/watchdog/Makefile | 7 + + drivers/watchdog/at91sam9_wdt.c | 328 + + drivers/watchdog/cpwd.c | 695 ++ + drivers/watchdog/geodewdt.c | 6 +- + drivers/watchdog/ibmasr.c | 1 - + drivers/watchdog/it87_wdt.c | 725 ++ + drivers/watchdog/ixp4xx_wdt.c | 4 +- + drivers/watchdog/omap_wdt.c | 337 +- + drivers/watchdog/omap_wdt.h | 28 +- + drivers/watchdog/orion5x_wdt.c | 245 + + drivers/watchdog/pnx4008_wdt.c | 4 +- + drivers/watchdog/rc32434_wdt.c | 6 +- + drivers/watchdog/rdc321x_wdt.c | 6 +- + .../{sbus/char/riowatchdog.c => watchdog/riowd.c} | 236 +- + drivers/watchdog/w83697ug_wdt.c | 392 + + drivers/watchdog/wdt285.c | 15 +- + drivers/xen/Makefile | 1 + + drivers/xen/balloon.c | 175 +- + drivers/xen/cpu_hotplug.c | 90 + + drivers/xen/events.c | 40 +- + drivers/xen/grant-table.c | 2 +- + drivers/xen/xenbus/xenbus_probe.c | 8 +- + firmware/Makefile | 1 + + firmware/WHENCE | 10 + + firmware/sun/cassini.bin.ihex | 143 + + fs/9p/v9fs.c | 2 +- + fs/9p/vfs_inode.c | 3 +- + fs/Kconfig | 144 +- + fs/Kconfig.binfmt | 6 +- + fs/Makefile | 5 +- + fs/adfs/super.c | 2 +- + fs/affs/super.c | 2 +- + fs/afs/super.c | 2 +- + fs/autofs/inode.c | 2 +- + fs/autofs4/inode.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/bio-integrity.c | 29 +- + fs/bio.c | 297 +- + fs/block_dev.c | 182 +- + fs/cifs/cifs_spnego.c | 35 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifsproto.h | 4 +- + fs/cifs/cifssmb.c | 84 +- + fs/cifs/dns_resolve.c | 74 +- + fs/cifs/file.c | 130 +- + fs/cifs/inode.c | 644 +- + fs/cifs/misc.c | 8 +- + fs/cifs/readdir.c | 128 +- + fs/cifs/sess.c | 4 +- + fs/cifs/transport.c | 3 +- + fs/dcache.c | 10 +- + fs/debugfs/inode.c | 3 +- + fs/devpts/inode.c | 68 +- + fs/dlm/config.c | 77 +- + fs/dlm/dlm_internal.h | 7 +- + fs/dlm/lockspace.c | 158 +- + fs/dlm/lockspace.h | 1 + + fs/dlm/user.c | 124 +- + fs/dlm/user.h | 4 +- + fs/dquot.c | 6 +- + fs/ecryptfs/main.c | 2 +- + fs/efs/super.c | 2 - + fs/exec.c | 2 +- + fs/ext2/ext2.h | 2 + + fs/ext2/file.c | 1 + + fs/ext2/inode.c | 8 + + fs/ext2/super.c | 2 +- + fs/ext3/file.c | 1 + + fs/ext3/inode.c | 8 + + fs/ext3/super.c | 2 +- + fs/ext4/Makefile | 10 +- + fs/ext4/acl.h | 12 +- + fs/ext4/balloc.c | 1457 +--- + fs/ext4/bitmap.c | 6 +- + fs/ext4/dir.c | 64 +- + fs/ext4/ext4.h | 133 +- + fs/ext4/ext4_extents.h | 15 + + fs/ext4/ext4_i.h | 39 +- + fs/ext4/ext4_sb.h | 25 +- + fs/ext4/extents.c | 281 +- + fs/ext4/file.c | 10 +- + fs/ext4/fsync.c | 7 +- + fs/ext4/hash.c | 8 +- + fs/ext4/ialloc.c | 71 +- + fs/ext4/inode.c | 620 +- + fs/ext4/ioctl.c | 96 +- + fs/ext4/mballoc.c | 220 +- + fs/ext4/mballoc.h | 1 - + fs/ext4/migrate.c | 10 +- + fs/ext4/namei.c | 402 +- + fs/ext4/resize.c | 33 +- + fs/ext4/super.c | 317 +- + fs/ext4/symlink.c | 8 +- + fs/ext4/xattr.c | 14 +- + fs/ext4/xattr.h | 12 +- + fs/fat/fatent.c | 14 + + fs/fat/inode.c | 6 +- + fs/fuse/inode.c | 2 +- + fs/gfs2/glock.c | 15 +- + fs/gfs2/glock.h | 1 - + fs/gfs2/incore.h | 38 +- + fs/gfs2/inode.c | 159 +- + fs/gfs2/inode.h | 2 - + fs/gfs2/locking/dlm/mount.c | 3 +- + fs/gfs2/log.c | 21 +- + fs/gfs2/mount.c | 9 +- + fs/gfs2/ops_address.c | 18 +- + fs/gfs2/ops_file.c | 16 +- + fs/gfs2/ops_fstype.c | 578 +- + fs/gfs2/ops_inode.c | 127 +- + fs/gfs2/ops_super.c | 108 +- + fs/gfs2/super.c | 340 - + fs/gfs2/super.h | 6 - + fs/gfs2/sys.c | 11 - + fs/hfs/super.c | 2 +- + fs/hfsplus/options.c | 2 +- + fs/hpfs/super.c | 2 +- + fs/hugetlbfs/inode.c | 2 +- + fs/inotify_user.c | 27 +- + fs/ioctl.c | 277 + + fs/isofs/inode.c | 2 +- + fs/jbd2/checkpoint.c | 71 +- + fs/jbd2/commit.c | 32 +- + fs/jbd2/journal.c | 103 +- + fs/jbd2/recovery.c | 7 +- + fs/jfs/super.c | 2 +- + fs/lockd/Makefile | 2 +- + fs/lockd/clntlock.c | 13 +- + fs/lockd/grace.c | 59 + + fs/lockd/host.c | 350 +- + fs/lockd/mon.c | 2 +- + fs/lockd/svc.c | 88 +- + fs/lockd/svc4proc.c | 31 +- + fs/lockd/svclock.c | 18 +- + fs/lockd/svcproc.c | 31 +- + fs/lockd/svcsubs.c | 2 +- + fs/lockd/xdr.c | 2 - + fs/lockd/xdr4.c | 2 - + fs/nfs/callback.c | 3 +- + fs/nfs/nfsroot.c | 2 +- + fs/nfs/super.c | 6 +- + fs/nfsd/lockd.c | 1 - + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4callback.c | 7 +- + fs/nfsd/nfs4proc.c | 8 +- + fs/nfsd/nfs4state.c | 34 +- + fs/nfsd/nfs4xdr.c | 171 +- + fs/nfsd/nfsctl.c | 5 +- + fs/nfsd/nfsfh.c | 30 +- + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 20 +- + fs/nfsd/vfs.c | 63 +- + fs/ocfs2/Makefile | 3 +- + fs/ocfs2/alloc.c | 922 ++- + fs/ocfs2/alloc.h | 95 +- + fs/ocfs2/aops.c | 60 +- + fs/ocfs2/buffer_head_io.c | 134 +- + fs/ocfs2/buffer_head_io.h | 23 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 109 +- + fs/ocfs2/dlmglue.c | 9 +- + fs/ocfs2/extent_map.c | 386 +- + fs/ocfs2/extent_map.h | 7 + + fs/ocfs2/file.c | 334 +- + fs/ocfs2/file.h | 32 +- + fs/ocfs2/inode.c | 87 +- + fs/ocfs2/inode.h | 6 +- + fs/ocfs2/ioctl.c | 3 +- + fs/ocfs2/journal.c | 89 +- + fs/ocfs2/journal.h | 52 +- + fs/ocfs2/localalloc.c | 384 +- + fs/ocfs2/localalloc.h | 4 + + fs/ocfs2/locks.c | 15 + + fs/ocfs2/locks.h | 1 + + fs/ocfs2/namei.c | 101 +- + fs/ocfs2/ocfs2.h | 56 +- + fs/ocfs2/ocfs2_fs.h | 220 +- + fs/ocfs2/ocfs2_jbd_compat.h | 82 + + fs/ocfs2/resize.c | 11 +- + fs/ocfs2/slot_map.c | 7 +- + fs/ocfs2/stack_user.c | 33 + + fs/ocfs2/stackglue.c | 20 + + fs/ocfs2/stackglue.h | 19 + + fs/ocfs2/suballoc.c | 248 +- + fs/ocfs2/suballoc.h | 26 +- + fs/ocfs2/super.c | 64 +- + fs/ocfs2/symlink.c | 18 +- + fs/ocfs2/uptodate.c | 38 +- + fs/ocfs2/uptodate.h | 3 + + fs/ocfs2/xattr.c | 4832 +++++++++++ + fs/ocfs2/xattr.h | 68 + + fs/omfs/inode.c | 2 +- + fs/open.c | 3 +- + fs/partitions/check.c | 268 +- + fs/partitions/check.h | 4 +- + fs/proc/Kconfig | 10 + + fs/proc/array.c | 7 - + fs/proc/base.c | 21 +- + fs/proc/inode.c | 2 +- + fs/proc/internal.h | 2 - + fs/proc/proc_misc.c | 5 +- + fs/proc/proc_sysctl.c | 6 +- + fs/proc/task_mmu.c | 16 +- + fs/proc/task_nommu.c | 5 - + fs/proc/vmcore.c | 6 - + fs/ramfs/file-nommu.c | 2 +- + fs/splice.c | 3 + + fs/ubifs/debug.c | 2 +- + fs/ubifs/dir.c | 2 +- + fs/ubifs/find.c | 1 - + fs/ubifs/gc.c | 14 +- + fs/ubifs/super.c | 5 +- + fs/ubifs/tnc.c | 2 +- + fs/udf/super.c | 2 +- + fs/ufs/super.c | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 4 + + fs/xfs/linux-2.6/xfs_buf.c | 3 +- + fs/xfs/linux-2.6/xfs_buf.h | 8 + + fs/xfs/linux-2.6/xfs_super.c | 22 +- + fs/xfs/xfs_buf_item.c | 44 +- + fs/xfs/xfs_dfrag.c | 9 +- + fs/xfs/xfs_inode.c | 94 +- + fs/xfs/xfs_log.c | 67 +- + fs/xfs/xfs_log_priv.h | 1 - + fs/xfs/xfs_vnodeops.c | 26 + + include/asm-cris/a.out.h | 26 - + include/asm-generic/siginfo.h | 2 + + include/asm-generic/statfs.h | 65 +- + include/asm-generic/vmlinux.lds.h | 1 + + include/asm-m32r/a.out.h | 20 - + include/asm-m68k/atarihw.h | 1 - + include/asm-m68k/dma-mapping.h | 16 + + include/asm-m68k/dma.h | 4 - + include/asm-m68k/entry.h | 2 +- + include/asm-m68k/io.h | 66 +- + include/asm-m68k/pci.h | 47 +- + include/asm-m68k/virtconvert.h | 6 - + include/asm-mips/a.out.h | 35 - + include/asm-mips/mach-bcm47xx/war.h | 25 - + include/asm-mips/mach-ip22/ds1286.h | 18 - + include/asm-mips/mach-ip28/ds1286.h | 4 - + include/asm-mips/mach-rc32434/irq.h | 8 - + include/asm-mips/mach-rc32434/rc32434.h | 61 - + include/asm-mips/ptrace.h | 99 - + include/asm-parisc/a.out.h | 20 - + include/asm-parisc/siginfo.h | 5 - + include/asm-parisc/statfs.h | 55 +- + include/asm-um/dma-mapping.h | 7 + + include/asm-x86/a.out-core.h | 6 +- + include/asm-x86/a.out.h | 6 +- + include/asm-x86/acpi.h | 8 +- + include/asm-x86/agp.h | 6 +- + include/asm-x86/alternative.h | 6 +- + include/asm-x86/amd_iommu.h | 9 +- + include/asm-x86/amd_iommu_types.h | 70 +- + include/asm-x86/apic.h | 80 +- + include/asm-x86/apicdef.h | 9 +- + include/asm-x86/arch_hooks.h | 8 +- + include/asm-x86/asm.h | 13 +- + include/asm-x86/atomic_32.h | 6 +- + include/asm-x86/atomic_64.h | 6 +- + include/asm-x86/auxvec.h | 6 +- + .../{mach-bigsmp/mach_apic.h => bigsmp/apic.h} | 4 +- + .../mach_apicdef.h => bigsmp/apicdef.h} | 6 +- + .../{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} | 0 + include/asm-x86/bios_ebda.h | 23 +- + include/asm-x86/bitops.h | 16 +- + include/asm-x86/boot.h | 8 +- + include/asm-x86/bootparam.h | 6 +- + include/asm-x86/bug.h | 6 +- + include/asm-x86/bugs.h | 11 +- + include/asm-x86/byteorder.h | 6 +- + include/asm-x86/cache.h | 6 +- + include/asm-x86/cacheflush.h | 13 +- + include/asm-x86/calgary.h | 6 +- + include/asm-x86/checksum_32.h | 6 +- + include/asm-x86/checksum_64.h | 6 +- + include/asm-x86/cmpxchg_32.h | 6 +- + include/asm-x86/cmpxchg_64.h | 6 +- + include/asm-x86/compat.h | 6 +- + include/asm-x86/cpu.h | 6 +- + include/asm-x86/cpufeature.h | 125 +- + include/asm-x86/current.h | 6 +- + include/asm-x86/debugreg.h | 6 +- + include/asm-x86/delay.h | 6 +- + include/asm-x86/desc.h | 35 +- + include/asm-x86/desc_defs.h | 6 +- + include/asm-x86/device.h | 6 +- + include/asm-x86/div64.h | 6 +- + include/asm-x86/dma-mapping.h | 89 +- + include/asm-x86/dma.h | 6 +- + include/asm-x86/dmi.h | 6 +- + include/asm-x86/ds.h | 266 +- + include/asm-x86/dwarf2.h | 6 +- + include/asm-x86/e820.h | 9 +- + include/asm-x86/edac.h | 6 +- + include/asm-x86/efi.h | 6 +- + include/asm-x86/elf.h | 11 +- + include/asm-x86/emergency-restart.h | 6 +- + .../{mach-es7000/mach_apic.h => es7000/apic.h} | 32 +- + include/asm-x86/es7000/apicdef.h | 13 + + .../{mach-es7000/mach_ipi.h => es7000/ipi.h} | 6 +- + .../mach_mpparse.h => es7000/mpparse.h} | 5 +- + .../mach_wakecpu.h => es7000/wakecpu.h} | 6 +- + include/asm-x86/fb.h | 6 +- + include/asm-x86/fixmap.h | 6 +- + include/asm-x86/fixmap_32.h | 10 +- + include/asm-x86/fixmap_64.h | 18 +- + include/asm-x86/floppy.h | 6 +- + include/asm-x86/ftrace.h | 6 +- + include/asm-x86/futex.h | 12 +- + include/asm-x86/gart.h | 14 +- + include/asm-x86/genapic_32.h | 6 +- + include/asm-x86/genapic_64.h | 14 +- + include/asm-x86/geode.h | 6 +- + include/asm-x86/gpio.h | 2 +- + include/asm-x86/hardirq_32.h | 6 +- + include/asm-x86/hardirq_64.h | 6 +- + include/asm-x86/highmem.h | 6 +- + include/asm-x86/hpet.h | 6 +- + include/asm-x86/hugetlb.h | 6 +- + include/asm-x86/hw_irq.h | 29 +- + include/asm-x86/hypertransport.h | 6 +- + include/asm-x86/i387.h | 91 +- + include/asm-x86/i8253.h | 6 +- + include/asm-x86/i8259.h | 9 +- + include/asm-x86/ia32.h | 6 +- + include/asm-x86/ia32_unistd.h | 6 +- + include/asm-x86/idle.h | 8 +- + include/asm-x86/intel_arch_perfmon.h | 6 +- + include/asm-x86/io.h | 23 +- + include/asm-x86/io_32.h | 6 +- + include/asm-x86/io_64.h | 10 +- + include/asm-x86/io_apic.h | 26 +- + include/asm-x86/ioctls.h | 12 +- + include/asm-x86/iommu.h | 7 +- + include/asm-x86/ipcbuf.h | 6 +- + include/asm-x86/ipi.h | 22 +- + include/asm-x86/irq.h | 6 +- + include/asm-x86/irq_regs_32.h | 6 +- + include/asm-x86/irq_remapping.h | 8 + + include/asm-x86/irq_vectors.h | 6 +- + include/asm-x86/irqflags.h | 21 - + include/asm-x86/ist.h | 6 +- + include/asm-x86/k8.h | 6 +- + include/asm-x86/kdebug.h | 9 +- + include/asm-x86/kexec.h | 6 +- + include/asm-x86/kgdb.h | 30 +- + include/asm-x86/kmap_types.h | 6 +- + include/asm-x86/kprobes.h | 15 +- + include/asm-x86/kvm.h | 6 +- + include/asm-x86/kvm_host.h | 8 +- + include/asm-x86/kvm_para.h | 6 +- + include/asm-x86/kvm_x86_emulate.h | 6 +- + include/asm-x86/ldt.h | 6 +- + include/asm-x86/lguest.h | 6 +- + include/asm-x86/lguest_hcall.h | 6 +- + include/asm-x86/linkage.h | 6 +- + include/asm-x86/local.h | 6 +- + include/asm-x86/mach-bigsmp/mach_apicdef.h | 13 - + include/asm-x86/mach-default/apm.h | 6 +- + include/asm-x86/mach-default/mach_apic.h | 10 +- + include/asm-x86/mach-default/mach_apicdef.h | 12 +- + include/asm-x86/mach-default/mach_ipi.h | 6 +- + include/asm-x86/mach-default/mach_mpparse.h | 6 +- + include/asm-x86/mach-default/mach_mpspec.h | 6 +- + include/asm-x86/mach-default/mach_timer.h | 6 +- + include/asm-x86/mach-default/mach_traps.h | 12 +- + include/asm-x86/mach-default/mach_wakecpu.h | 6 +- + include/asm-x86/mach-es7000/mach_apicdef.h | 13 - + include/asm-x86/mach-generic/gpio.h | 6 +- + include/asm-x86/mach-generic/irq_vectors_limits.h | 6 +- + include/asm-x86/mach-generic/mach_apic.h | 6 +- + include/asm-x86/mach-generic/mach_apicdef.h | 6 +- + include/asm-x86/mach-generic/mach_ipi.h | 6 +- + include/asm-x86/mach-generic/mach_mpparse.h | 6 +- + include/asm-x86/mach-generic/mach_mpspec.h | 6 +- + include/asm-x86/mach-rdc321x/gpio.h | 9 +- + include/asm-x86/math_emu.h | 6 +- + include/asm-x86/mc146818rtc.h | 6 +- + include/asm-x86/mca.h | 6 +- + include/asm-x86/mca_dma.h | 6 +- + include/asm-x86/mce.h | 6 +- + include/asm-x86/microcode.h | 47 + + include/asm-x86/mman.h | 6 +- + include/asm-x86/mmconfig.h | 6 +- + include/asm-x86/mmu.h | 11 +- + include/asm-x86/mmu_context.h | 6 +- + include/asm-x86/mmu_context_32.h | 6 +- + include/asm-x86/mmu_context_64.h | 6 +- + include/asm-x86/mmx.h | 6 +- + include/asm-x86/mmzone_32.h | 6 +- + include/asm-x86/mmzone_64.h | 9 +- + include/asm-x86/module.h | 8 +- + include/asm-x86/mpspec.h | 9 +- + include/asm-x86/mpspec_def.h | 6 +- + include/asm-x86/msgbuf.h | 6 +- + include/asm-x86/msidef.h | 10 +- + include/asm-x86/msr-index.h | 22 +- + include/asm-x86/msr.h | 29 +- + include/asm-x86/mtrr.h | 6 +- + include/asm-x86/mutex_32.h | 6 +- + include/asm-x86/mutex_64.h | 6 +- + include/asm-x86/nmi.h | 11 +- + include/asm-x86/nops.h | 6 +- + include/asm-x86/numa_32.h | 6 +- + include/asm-x86/numa_64.h | 6 +- + include/asm-x86/numaq.h | 6 +- + .../{mach-numaq/mach_apic.h => numaq/apic.h} | 6 +- + .../{mach-numaq/mach_apicdef.h => numaq/apicdef.h} | 4 +- + .../asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} | 6 +- + .../{mach-numaq/mach_mpparse.h => numaq/mpparse.h} | 6 +- + .../{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} | 6 +- + include/asm-x86/olpc.h | 6 +- + include/asm-x86/page.h | 15 +- + include/asm-x86/page_32.h | 23 +- + include/asm-x86/page_64.h | 7 +- + include/asm-x86/param.h | 6 +- + include/asm-x86/paravirt.h | 87 +- + include/asm-x86/parport.h | 6 +- + include/asm-x86/pat.h | 6 +- + include/asm-x86/pci-direct.h | 6 +- + include/asm-x86/pci.h | 6 +- + include/asm-x86/pci_32.h | 6 +- + include/asm-x86/pci_64.h | 6 +- + include/asm-x86/pda.h | 6 +- + include/asm-x86/percpu.h | 6 +- + include/asm-x86/pgalloc.h | 6 +- + include/asm-x86/pgtable-2level-defs.h | 6 +- + include/asm-x86/pgtable-2level.h | 8 +- + include/asm-x86/pgtable-3level-defs.h | 6 +- + include/asm-x86/pgtable-3level.h | 13 +- + include/asm-x86/pgtable.h | 44 +- + include/asm-x86/pgtable_32.h | 12 +- + include/asm-x86/pgtable_64.h | 8 +- + include/asm-x86/posix_types_32.h | 6 +- + include/asm-x86/posix_types_64.h | 6 +- + include/asm-x86/prctl.h | 6 +- + include/asm-x86/processor-cyrix.h | 8 + + include/asm-x86/processor-flags.h | 7 +- + include/asm-x86/processor.h | 84 +- + include/asm-x86/proto.h | 6 +- + include/asm-x86/ptrace-abi.h | 20 +- + include/asm-x86/ptrace.h | 58 +- + include/asm-x86/pvclock-abi.h | 6 +- + include/asm-x86/pvclock.h | 6 +- + include/asm-x86/reboot.h | 6 +- + include/asm-x86/reboot_fixups.h | 6 +- + include/asm-x86/required-features.h | 6 +- + include/asm-x86/resume-trace.h | 8 +- + include/asm-x86/rio.h | 6 +- + include/asm-x86/rwlock.h | 6 +- + include/asm-x86/rwsem.h | 6 +- + include/asm-x86/scatterlist.h | 6 +- + include/asm-x86/seccomp_32.h | 6 +- + include/asm-x86/seccomp_64.h | 6 +- + include/asm-x86/segment.h | 12 +- + include/asm-x86/sembuf.h | 6 +- + include/asm-x86/serial.h | 6 +- + include/asm-x86/setup.h | 8 +- + include/asm-x86/shmbuf.h | 6 +- + include/asm-x86/shmparam.h | 6 +- + include/asm-x86/sigcontext.h | 93 +- + include/asm-x86/sigcontext32.h | 12 +- + include/asm-x86/siginfo.h | 6 +- + include/asm-x86/signal.h | 9 +- + include/asm-x86/smp.h | 67 +- + include/asm-x86/socket.h | 6 +- + include/asm-x86/sockios.h | 6 +- + include/asm-x86/sparsemem.h | 6 +- + include/asm-x86/spinlock.h | 79 +- + include/asm-x86/spinlock_types.h | 6 +- + include/asm-x86/srat.h | 6 +- + include/asm-x86/stacktrace.h | 6 +- + include/asm-x86/stat.h | 6 +- + include/asm-x86/statfs.h | 67 +- + include/asm-x86/string_32.h | 6 +- + include/asm-x86/string_64.h | 6 +- + .../{mach-summit/mach_apic.h => summit/apic.h} | 24 +- + include/asm-x86/summit/apicdef.h | 13 + + .../{mach-summit/mach_ipi.h => summit/ipi.h} | 6 +- + .../{mach-summit => summit}/irq_vectors_limits.h | 0 + .../mach_mpparse.h => summit/mpparse.h} | 13 +- + include/asm-x86/suspend_32.h | 6 +- + include/asm-x86/suspend_64.h | 6 +- + include/asm-x86/swiotlb.h | 6 +- + include/asm-x86/sync_bitops.h | 6 +- + include/asm-x86/syscall.h | 211 + + include/asm-x86/syscalls.h | 93 + + include/asm-x86/system.h | 11 +- + include/asm-x86/system_64.h | 6 +- + include/asm-x86/tce.h | 6 +- + include/asm-x86/termbits.h | 6 +- + include/asm-x86/termios.h | 6 +- + include/asm-x86/therm_throt.h | 6 +- + include/asm-x86/thread_info.h | 11 +- + include/asm-x86/time.h | 8 +- + include/asm-x86/timer.h | 11 +- + include/asm-x86/timex.h | 6 +- + include/asm-x86/tlb.h | 6 +- + include/asm-x86/tlbflush.h | 16 +- + include/asm-x86/topology.h | 6 +- + include/asm-x86/trampoline.h | 6 +- + include/asm-x86/traps.h | 87 +- + include/asm-x86/tsc.h | 6 +- + include/asm-x86/types.h | 6 +- + include/asm-x86/uaccess.h | 6 +- + include/asm-x86/uaccess_32.h | 6 +- + include/asm-x86/uaccess_64.h | 7 +- + include/asm-x86/ucontext.h | 12 +- + include/asm-x86/unaligned.h | 6 +- + include/asm-x86/unistd_32.h | 6 +- + include/asm-x86/unistd_64.h | 6 +- + include/asm-x86/unwind.h | 6 +- + include/asm-x86/user32.h | 6 +- + include/asm-x86/user_32.h | 6 +- + include/asm-x86/user_64.h | 6 +- + include/asm-x86/uv/bios.h | 6 +- + include/asm-x86/uv/uv_bau.h | 6 +- + include/asm-x86/uv/uv_hub.h | 6 +- + include/asm-x86/uv/uv_mmrs.h | 6 +- + include/asm-x86/vdso.h | 6 +- + include/asm-x86/vga.h | 6 +- + include/asm-x86/vgtod.h | 6 +- + include/asm-x86/visws/cobalt.h | 6 +- + include/asm-x86/visws/lithium.h | 6 +- + include/asm-x86/visws/piix4.h | 6 +- + include/asm-x86/vm86.h | 6 +- + include/asm-x86/vmi_time.h | 6 +- + include/asm-x86/vsyscall.h | 6 +- + include/asm-x86/xcr.h | 49 + + include/asm-x86/xen/events.h | 6 +- + include/asm-x86/xen/grant_table.h | 6 +- + include/asm-x86/xen/hypercall.h | 6 +- + include/asm-x86/xen/hypervisor.h | 20 +- + include/asm-x86/xen/interface.h | 6 +- + include/asm-x86/xen/interface_32.h | 6 +- + include/asm-x86/xen/interface_64.h | 6 +- + include/asm-x86/xen/page.h | 6 +- + include/asm-x86/xsave.h | 118 + + include/asm-xtensa/a.out.h | 29 - + include/crypto/internal/rng.h | 26 + + include/crypto/internal/skcipher.h | 6 - + include/crypto/rng.h | 75 + + include/linux/Kbuild | 3 + + include/linux/ata.h | 127 +- + include/linux/bio.h | 108 +- + include/linux/blkdev.h | 151 +- + include/linux/blktrace_api.h | 62 +- + .../include/asm => include/linux}/cnt32_to_63.h | 46 +- + include/linux/compiler.h | 4 +- + include/linux/completion.h | 41 + + include/linux/console_struct.h | 1 - + include/linux/cpu.h | 1 + + include/linux/cpufreq.h | 7 +- + include/linux/crypto.h | 35 + + include/linux/device-mapper.h | 18 +- + include/linux/device.h | 14 +- + include/linux/devpts_fs.h | 31 +- + include/linux/dlm.h | 5 +- + include/linux/dlm_device.h | 2 +- + include/linux/dma-mapping.h | 12 + + include/linux/dmar.h | 127 +- + include/linux/dmi.h | 41 +- + include/linux/ds1286.h | 2 - + include/linux/dvb/frontend.h | 110 +- + include/linux/dvb/version.h | 4 +- + include/linux/elevator.h | 9 +- + include/linux/elf.h | 1 + + include/linux/ext3_fs.h | 2 + + include/linux/fd.h | 8 +- + include/linux/fiemap.h | 64 + + include/linux/fs.h | 95 +- + include/linux/genhd.h | 363 +- + include/linux/gfs2_ondisk.h | 6 +- + include/linux/hid.h | 373 +- + include/linux/hiddev.h | 46 +- + include/linux/hpet.h | 14 +- + include/linux/hrtimer.h | 18 +- + include/linux/i2c-id.h | 1 - + include/linux/ide.h | 901 ++- + include/linux/ieee80211.h | 36 +- + include/linux/if.h | 1 + + include/linux/if_ether.h | 8 +- + include/linux/if_fddi.h | 2 +- + include/linux/if_hippi.h | 2 +- + include/linux/if_link.h | 1 + + include/linux/if_phonet.h | 19 + + include/linux/if_tunnel.h | 19 + + include/linux/igmp.h | 2 +- + include/linux/in.h | 1 + + include/linux/inetdevice.h | 1 + + include/linux/iommu-helper.h | 16 + + include/linux/ioport.h | 3 + + include/linux/ip_vs.h | 160 + + include/linux/irq.h | 1 + + include/linux/isdn_ppp.h | 2 +- + include/linux/ivtv.h | 1 + + include/linux/jbd2.h | 8 +- + include/linux/kernel.h | 2 +- + include/linux/key.h | 1 + + include/linux/klist.h | 3 +- + include/linux/lcd.h | 3 + + include/linux/libata.h | 66 +- + include/linux/lockd/bind.h | 11 +- + include/linux/lockd/lockd.h | 137 +- + include/linux/lockd/xdr.h | 2 - + include/linux/magic.h | 4 + + include/linux/major.h | 2 + + include/linux/mfd/wm8350/audio.h | 598 ++ + include/linux/mfd/wm8350/comparator.h | 167 + + include/linux/mfd/wm8350/core.h | 631 ++ + include/linux/mfd/wm8350/gpio.h | 342 + + include/linux/mfd/wm8350/pmic.h | 741 ++ + include/linux/mfd/wm8350/rtc.h | 266 + + include/linux/mfd/wm8350/supply.h | 111 + + include/linux/mfd/wm8350/wdt.h | 28 + + include/linux/mfd/wm8400-audio.h | 1186 +++ + include/linux/mfd/wm8400-private.h | 936 +++ + .../zoran_procfs.h => include/linux/mfd/wm8400.h | 36 +- + include/linux/mlx4/device.h | 4 + + include/linux/mm.h | 13 +- + include/linux/mm_types.h | 10 +- + include/linux/mmc/host.h | 2 +- + include/linux/mmdebug.h | 18 + + include/linux/mod_devicetable.h | 57 + + include/linux/mtd/blktrans.h | 2 + + include/linux/mv643xx_eth.h | 13 +- + include/linux/netdevice.h | 33 +- + include/linux/netfilter.h | 97 +- + include/linux/netfilter/Kbuild | 1 + + include/linux/netfilter/nf_conntrack_proto_gre.h | 2 +- + include/linux/netfilter/x_tables.h | 161 +- + include/linux/netfilter/xt_TPROXY.h | 14 + + include/linux/netfilter/xt_recent.h | 26 + + include/linux/netfilter_bridge/ebtables.h | 76 +- + include/linux/netfilter_ipv4/ipt_recent.h | 28 +- + include/linux/nfsd/nfsd.h | 3 +- + include/linux/nl80211.h | 133 +- + include/linux/notifier.h | 10 +- + include/linux/of.h | 3 + + include/linux/oprofile.h | 2 + + include/linux/parser.h | 2 +- + include/linux/pci.h | 8 +- + include/linux/pci_ids.h | 27 +- + include/linux/percpu.h | 7 + + include/linux/percpu_counter.h | 12 +- + include/linux/pfkeyv2.h | 13 +- + include/linux/phonet.h | 170 + + include/linux/phy.h | 52 +- + include/linux/pkt_sched.h | 7 + + include/linux/proc_fs.h | 1 - + include/linux/proportions.h | 2 +- + include/linux/ramfs.h | 1 + + include/linux/rcuclassic.h | 37 +- + include/linux/rculist.h | 14 - + include/linux/rcupdate.h | 20 + + include/linux/rcupreempt.h | 11 +- + include/linux/regulator/driver.h | 10 +- + include/linux/regulator/machine.h | 30 +- + include/linux/rfkill.h | 7 +- + include/linux/rtc/m48t59.h | 47 +- + include/linux/rtnetlink.h | 4 + + include/linux/sched.h | 15 +- + include/linux/security.h | 54 +- + include/linux/serial.h | 16 + + include/linux/serial_core.h | 2 +- + include/linux/skbuff.h | 175 +- + include/linux/smb.h | 2 + + include/linux/smc91x.h | 11 + + include/linux/socket.h | 5 +- + include/linux/spi/ads7846.h | 3 + + include/linux/spi/corgi_lcd.h | 20 + + include/linux/ssb/ssb_regs.h | 19 +- + include/linux/stacktrace.h | 2 + + include/linux/string_helpers.h | 16 + + include/linux/sunrpc/clnt.h | 5 +- + include/linux/sunrpc/svc.h | 19 +- + include/linux/sunrpc/svc_rdma.h | 27 +- + include/linux/sunrpc/svcsock.h | 5 +- + include/linux/tc_act/Kbuild | 1 + + include/linux/tc_act/tc_skbedit.h | 44 + + include/linux/tcp.h | 12 +- + include/linux/termios.h | 15 + + include/linux/tick.h | 2 +- + include/linux/tty.h | 45 +- + include/linux/tty_driver.h | 56 +- + include/linux/ucb1400.h | 161 + + include/linux/usb/ehci_def.h | 160 + + include/linux/videodev2.h | 30 +- + include/linux/vt_kern.h | 2 +- + include/linux/wm97xx_batt.h | 26 + + include/linux/xfrm.h | 10 + + include/math-emu/op-2.h | 2 +- + include/math-emu/op-common.h | 12 +- + include/math-emu/soft-fp.h | 19 + + include/media/ir-common.h | 11 +- + include/media/saa7115.h | 19 +- + include/media/saa7146.h | 2 +- + include/media/sh_mobile_ceu.h | 2 - + include/media/soc_camera.h | 3 + + include/media/tuner.h | 3 +- + include/media/v4l2-chip-ident.h | 5 + + include/media/v4l2-common.h | 15 +- + include/media/v4l2-dev.h | 75 +- + include/media/v4l2-ioctl.h | 5 - + include/net/9p/9p.h | 1 + + include/net/9p/transport.h | 9 +- + include/net/cfg80211.h | 89 +- + include/net/cipso_ipv4.h | 55 +- + include/net/dsa.h | 37 + + include/net/flow.h | 2 + + include/net/ieee80211.h | 4 - + include/net/inet6_hashtables.h | 15 + + include/net/inet_connection_sock.h | 2 + + include/net/inet_hashtables.h | 18 + + include/net/inet_sock.h | 20 +- + include/net/inet_timewait_sock.h | 3 +- + include/net/ip.h | 13 + + include/net/ip_vs.h | 311 +- + include/net/ipip.h | 2 +- + include/net/ipv6.h | 47 +- + include/net/mac80211.h | 239 +- + include/net/net_namespace.h | 6 + + include/net/netfilter/ipv4/nf_defrag_ipv4.h | 6 + + include/net/netfilter/nf_conntrack.h | 34 +- + include/net/netfilter/nf_conntrack_acct.h | 10 +- + include/net/netfilter/nf_conntrack_core.h | 11 +- + include/net/netfilter/nf_conntrack_ecache.h | 29 +- + include/net/netfilter/nf_conntrack_expect.h | 22 +- + include/net/netfilter/nf_conntrack_l4proto.h | 21 +- + include/net/netfilter/nf_log.h | 8 +- + include/net/netfilter/nf_queue.h | 6 +- + include/net/netfilter/nf_tproxy_core.h | 32 + + include/net/netlabel.h | 51 +- + include/net/netlink.h | 82 - + include/net/netns/conntrack.h | 30 + + include/net/netns/ipv4.h | 3 + + include/net/netns/mib.h | 9 + + include/net/phonet/gprs.h | 38 + + include/net/phonet/pep.h | 160 + + include/net/phonet/phonet.h | 112 + + include/net/phonet/pn_dev.h | 50 + + include/net/pkt_sched.h | 5 +- + include/net/route.h | 11 +- + include/net/sch_generic.h | 1 + + include/net/sctp/constants.h | 4 +- + include/net/sctp/sctp.h | 10 +- + include/net/sctp/sm.h | 3 + + include/net/sctp/structs.h | 34 +- + include/net/sctp/tsnmap.h | 53 +- + include/net/sock.h | 19 + + include/net/tc_act/tc_skbedit.h | 34 + + include/net/tcp.h | 52 +- + include/net/udp.h | 21 +- + include/net/wireless.h | 65 +- + include/net/xfrm.h | 104 +- + include/pcmcia/ciscode.h | 2 +- + include/pcmcia/cistpl.h | 38 - + include/pcmcia/cs.h | 165 +- + include/pcmcia/cs_types.h | 8 - + include/pcmcia/device_id.h | 18 +- + include/pcmcia/ds.h | 411 +- + include/pcmcia/ss.h | 202 +- + include/scsi/scsi_cmnd.h | 3 - + include/scsi/scsi_device.h | 21 +- + include/scsi/scsi_host.h | 9 +- + include/scsi/scsi_netlink.h | 62 +- + include/scsi/scsi_transport.h | 3 +- + include/scsi/scsi_transport_fc.h | 23 +- + include/sound/ad1848.h | 218 - + include/sound/asound.h | 52 +- + include/sound/asoundef.h | 89 +- + include/sound/core.h | 35 +- + include/sound/cs4231.h | 175 - + include/sound/jack.h | 75 + + include/sound/memalloc.h | 18 +- + include/sound/minors.h | 2 + + include/sound/pcm.h | 39 +- + include/sound/pxa2xx-lib.h | 45 + + include/sound/sb.h | 5 + + include/sound/snd_wavefront.h | 1 - + include/sound/soc-dapm.h | 1 + + include/sound/soc-of-simple.h | 25 + + include/sound/soc.h | 74 +- + include/sound/tea575x-tuner.h | 1 + + include/sound/version.h | 2 +- + include/sound/vx_core.h | 9 - + include/sound/wss.h | 235 + + include/video/atmel_lcdc.h | 1 + + include/video/metronomefb.h | 31 +- + include/xen/balloon.h | 61 - + include/xen/events.h | 2 + + init/Kconfig | 10 - + init/do_mounts.c | 4 + + init/do_mounts_md.c | 40 +- + init/main.c | 9 +- + kernel/acct.c | 2 +- + kernel/auditsc.c | 9 +- + kernel/cgroup.c | 5 +- + kernel/cpu.c | 24 +- + kernel/cpuset.c | 2 +- + kernel/dma-coherent.c | 2 + + kernel/exit.c | 12 +- + kernel/fork.c | 5 +- + kernel/hrtimer.c | 95 +- + kernel/irq/manage.c | 9 +- + kernel/kexec.c | 8 +- + kernel/kgdb.c | 13 +- + kernel/posix-timers.c | 2 +- + kernel/printk.c | 16 - + kernel/rcuclassic.c | 337 +- + kernel/rcupreempt.c | 8 - + kernel/rcupreempt_trace.c | 7 +- + kernel/resource.c | 68 + + kernel/sched.c | 389 +- + kernel/sched_debug.c | 2 - + kernel/sched_fair.c | 234 +- + kernel/sched_features.h | 1 + + kernel/sched_idletask.c | 6 +- + kernel/sched_rt.c | 58 +- + kernel/sys.c | 4 +- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 25 +- + kernel/time/clockevents.c | 12 +- + kernel/time/tick-broadcast.c | 23 +- + kernel/time/tick-common.c | 14 +- + kernel/time/tick-internal.h | 9 + + kernel/time/tick-sched.c | 24 +- + kernel/trace/trace_sysprof.c | 2 +- + kernel/user.c | 4 +- + lib/Kconfig.debug | 57 +- + lib/Makefile | 3 +- + lib/cmdline.c | 2 +- + lib/iommu-helper.c | 5 +- + lib/klist.c | 96 +- + lib/parser.c | 2 +- + lib/percpu_counter.c | 8 +- + lib/string_helpers.c | 64 + + lib/swiotlb.c | 49 +- + mm/bounce.c | 2 +- + mm/highmem.c | 5 +- + mm/memcontrol.c | 18 + + mm/page_alloc.c | 13 +- + mm/page_isolation.c | 12 +- + mm/shmem.c | 4 +- + mm/slob.c | 8 +- + mm/tiny-shmem.c | 26 +- + mm/vmalloc.c | 7 + + net/802/psnap.c | 2 +- + net/8021q/vlan.c | 1 + + net/8021q/vlan_dev.c | 3 +- + net/9p/client.c | 12 +- + net/9p/conv.c | 6 +- + net/9p/mod.c | 92 +- + net/9p/trans_fd.c | 106 +- + net/9p/trans_virtio.c | 2 + + net/Kconfig | 10 +- + net/Makefile | 2 + + net/appletalk/ddp.c | 4 +- + net/atm/br2684.c | 8 +- + net/atm/lec.c | 1 - + net/ax25/af_ax25.c | 3 + + net/ax25/ax25_std_timer.c | 8 +- + net/bluetooth/hidp/core.c | 214 +- + net/bluetooth/hidp/hidp.h | 2 + + net/bridge/br.c | 22 +- + net/bridge/br_device.c | 3 +- + net/bridge/br_if.c | 15 +- + net/bridge/br_ioctl.c | 20 +- + net/bridge/br_netfilter.c | 4 +- + net/bridge/br_netlink.c | 15 +- + net/bridge/br_notify.c | 3 - + net/bridge/br_private.h | 6 +- + net/bridge/br_stp_bpdu.c | 3 - + net/bridge/netfilter/Kconfig | 30 +- + net/bridge/netfilter/ebt_802_3.c | 47 +- + net/bridge/netfilter/ebt_among.c | 85 +- + net/bridge/netfilter/ebt_arp.c | 73 +- + net/bridge/netfilter/ebt_arpreply.c | 49 +- + net/bridge/netfilter/ebt_dnat.c | 57 +- + net/bridge/netfilter/ebt_ip.c | 72 +- + net/bridge/netfilter/ebt_ip6.c | 76 +- + net/bridge/netfilter/ebt_limit.c | 45 +- + net/bridge/netfilter/ebt_log.c | 57 +- + net/bridge/netfilter/ebt_mark.c | 41 +- + net/bridge/netfilter/ebt_mark_m.c | 45 +- + net/bridge/netfilter/ebt_nflog.c | 44 +- + net/bridge/netfilter/ebt_pkttype.c | 41 +- + net/bridge/netfilter/ebt_redirect.c | 63 +- + net/bridge/netfilter/ebt_snat.c | 52 +- + net/bridge/netfilter/ebt_stp.c | 78 +- + net/bridge/netfilter/ebt_ulog.c | 58 +- + net/bridge/netfilter/ebt_vlan.c | 61 +- + net/bridge/netfilter/ebtables.c | 313 +- + net/core/Makefile | 1 + + net/core/datagram.c | 2 +- + net/core/dev.c | 145 +- + net/core/dev_mcast.c | 2 +- + net/core/dst.c | 1 + + net/core/neighbour.c | 21 +- + net/core/net-sysfs.c | 36 + + net/core/net_namespace.c | 1 + + net/core/pktgen.c | 8 +- + net/core/rtnetlink.c | 15 +- + net/core/skb_dma_map.c | 66 + + net/core/skbuff.c | 65 +- + net/core/sock.c | 13 +- + net/core/stream.c | 2 +- + net/dccp/ccids/ccid2.c | 2 +- + net/dccp/ccids/ccid3.c | 2 +- + net/dccp/ccids/lib/loss_interval.c | 6 +- + net/dccp/ccids/lib/tfrc.c | 2 +- + net/dccp/input.c | 4 +- + net/dccp/ipv4.c | 5 +- + net/dccp/ipv6.c | 12 +- + net/dccp/options.c | 13 +- + net/dccp/proto.c | 4 +- + net/dsa/Kconfig | 60 + + net/dsa/Makefile | 13 + + net/dsa/dsa.c | 392 + + net/dsa/dsa_priv.h | 116 + + net/dsa/mv88e6060.c | 287 + + net/dsa/mv88e6123_61_65.c | 421 + + net/dsa/mv88e6131.c | 380 + + net/dsa/mv88e6xxx.c | 522 ++ + net/dsa/mv88e6xxx.h | 93 + + net/dsa/slave.c | 298 + + net/dsa/tag_dsa.c | 194 + + net/dsa/tag_edsa.c | 213 + + net/dsa/tag_trailer.c | 130 + + net/ethernet/eth.c | 14 +- + net/ieee80211/ieee80211_module.c | 8 +- + net/ipv4/Kconfig | 2 - + net/ipv4/Makefile | 1 - + net/ipv4/af_inet.c | 2 +- + net/ipv4/cipso_ipv4.c | 656 ++- + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 9 +- + net/ipv4/inet_connection_sock.c | 19 +- + net/ipv4/inet_diag.c | 6 +- + net/ipv4/inet_timewait_sock.c | 1 + + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/ip_gre.c | 487 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_options.c | 2 +- + net/ipv4/ip_output.c | 4 +- + net/ipv4/ip_sockglue.c | 15 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/ipvs/ip_vs_ctl.c | 2373 ------ + net/ipv4/ipvs/ip_vs_proto_ah.c | 178 - + net/ipv4/ipvs/ip_vs_proto_esp.c | 176 - + net/ipv4/ipvs/ip_vs_xmit.c | 559 -- + net/ipv4/netfilter.c | 10 +- + net/ipv4/netfilter/Kconfig | 128 +- + net/ipv4/netfilter/Makefile | 4 +- + net/ipv4/netfilter/arp_tables.c | 116 +- + net/ipv4/netfilter/arpt_mangle.c | 15 +- + net/ipv4/netfilter/arptable_filter.c | 8 +- + net/ipv4/netfilter/ip_tables.c | 177 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 29 +- + net/ipv4/netfilter/ipt_ECN.c | 17 +- + net/ipv4/netfilter/ipt_LOG.c | 21 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 30 +- + net/ipv4/netfilter/ipt_NETMAP.c | 26 +- + net/ipv4/netfilter/ipt_REDIRECT.c | 21 +- + net/ipv4/netfilter/ipt_REJECT.c | 19 +- + net/ipv4/netfilter/ipt_TTL.c | 15 +- + net/ipv4/netfilter/ipt_ULOG.c | 23 +- + net/ipv4/netfilter/ipt_addrtype.c | 35 +- + net/ipv4/netfilter/ipt_ah.c | 24 +- + net/ipv4/netfilter/ipt_ecn.c | 20 +- + net/ipv4/netfilter/ipt_ttl.c | 9 +- + net/ipv4/netfilter/iptable_filter.c | 6 +- + net/ipv4/netfilter/iptable_mangle.c | 10 +- + net/ipv4/netfilter/iptable_raw.c | 4 +- + net/ipv4/netfilter/iptable_security.c | 6 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 68 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 73 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 22 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 96 + + net/ipv4/netfilter/nf_nat_core.c | 72 +- + net/ipv4/netfilter/nf_nat_helper.c | 3 +- + net/ipv4/netfilter/nf_nat_pptp.c | 3 +- + net/ipv4/netfilter/nf_nat_rule.c | 92 +- + net/ipv4/route.c | 34 +- + net/ipv4/syncookies.c | 3 + + net/ipv4/sysctl_net_ipv4.c | 23 +- + net/ipv4/tcp.c | 18 +- + net/ipv4/tcp_hybla.c | 6 +- + net/ipv4/tcp_input.c | 332 +- + net/ipv4/tcp_ipv4.c | 53 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 222 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv4/udp.c | 187 +- + net/ipv6/af_inet6.c | 71 +- + net/ipv6/exthdrs.c | 42 +- + net/ipv6/icmp.c | 8 +- + net/ipv6/ip6_input.c | 27 +- + net/ipv6/ip6_output.c | 80 +- + net/ipv6/ip6_tunnel.c | 4 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/mcast.c | 22 +- + net/ipv6/ndisc.c | 12 +- + net/ipv6/netfilter.c | 5 +- + net/ipv6/netfilter/Kconfig | 77 +- + net/ipv6/netfilter/ip6_tables.c | 173 +- + net/ipv6/netfilter/ip6t_HL.c | 15 +- + net/ipv6/netfilter/ip6t_LOG.c | 22 +- + net/ipv6/netfilter/ip6t_REJECT.c | 39 +- + net/ipv6/netfilter/ip6t_ah.c | 21 +- + net/ipv6/netfilter/ip6t_eui64.c | 11 +- + net/ipv6/netfilter/ip6t_frag.c | 21 +- + net/ipv6/netfilter/ip6t_hbh.c | 33 +- + net/ipv6/netfilter/ip6t_hl.c | 9 +- + net/ipv6/netfilter/ip6t_ipv6header.c | 16 +- + net/ipv6/netfilter/ip6t_mh.c | 25 +- + net/ipv6/netfilter/ip6t_rt.c | 21 +- + net/ipv6/netfilter/ip6table_filter.c | 6 +- + net/ipv6/netfilter/ip6table_mangle.c | 31 +- + net/ipv6/netfilter/ip6table_raw.c | 20 +- + net/ipv6/netfilter/ip6table_security.c | 6 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 24 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 19 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 32 +- + net/ipv6/proc.c | 121 +- + net/ipv6/raw.c | 4 +- + net/ipv6/reassembly.c | 65 +- + net/ipv6/route.c | 57 +- + net/ipv6/tcp_ipv6.c | 166 +- + net/ipv6/udp.c | 18 +- + net/ipv6/udplite.c | 2 - + net/iucv/iucv.c | 3 +- + net/key/af_key.c | 155 +- + net/mac80211/Kconfig | 26 +- + net/mac80211/Makefile | 7 + + net/mac80211/cfg.c | 201 +- + net/mac80211/debugfs.c | 4 - + net/mac80211/debugfs_key.c | 3 +- + net/mac80211/debugfs_netdev.c | 72 +- + net/mac80211/debugfs_sta.c | 11 +- + net/mac80211/event.c | 5 +- + net/mac80211/ht.c | 992 +++ + net/mac80211/ieee80211_i.h | 393 +- + net/mac80211/iface.c | 620 ++- + net/mac80211/key.c | 22 +- + net/mac80211/main.c | 1003 +-- + net/mac80211/mesh.c | 368 +- + net/mac80211/mesh.h | 80 +- + net/mac80211/mesh_hwmp.c | 230 +- + net/mac80211/mesh_pathtbl.c | 211 +- + net/mac80211/mesh_plink.c | 98 +- + net/mac80211/mlme.c | 3920 +++------- + net/mac80211/rate.c | 71 +- + net/mac80211/rate.h | 116 +- + net/mac80211/rc80211_minstrel.c | 583 ++ + net/mac80211/rc80211_minstrel.h | 85 + + net/mac80211/rc80211_minstrel_debugfs.c | 164 + + net/mac80211/rc80211_pid.h | 4 +- + net/mac80211/rc80211_pid_algo.c | 191 +- + net/mac80211/rx.c | 372 +- + net/mac80211/scan.c | 937 +++ + net/mac80211/spectmgmt.c | 86 + + net/mac80211/sta_info.c | 100 +- + net/mac80211/sta_info.h | 42 +- + net/mac80211/tkip.c | 2 +- + net/mac80211/tx.c | 334 +- + net/mac80211/util.c | 365 +- + net/mac80211/wep.c | 17 +- + net/mac80211/wext.c | 165 +- + net/mac80211/wme.c | 14 +- + net/mac80211/wme.h | 3 - + net/mac80211/wpa.c | 10 +- + net/netfilter/Kconfig | 236 +- + net/netfilter/Makefile | 9 + + net/netfilter/core.c | 18 +- + net/{ipv4 => netfilter}/ipvs/Kconfig | 21 +- + net/{ipv4 => netfilter}/ipvs/Makefile | 3 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_app.c | 0 + net/{ipv4 => netfilter}/ipvs/ip_vs_conn.c | 251 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_core.c | 817 ++- + net/netfilter/ipvs/ip_vs_ctl.c | 3443 ++++++++ + net/{ipv4 => netfilter}/ipvs/ip_vs_dh.c | 5 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_est.c | 58 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_ftp.c | 61 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_lblc.c | 220 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_lblcr.c | 249 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_lc.c | 32 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_nq.c | 39 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_proto.c | 65 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 235 + + net/{ipv4 => netfilter}/ipvs/ip_vs_proto_tcp.c | 254 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_proto_udp.c | 227 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_rr.c | 20 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_sched.c | 0 + net/{ipv4 => netfilter}/ipvs/ip_vs_sed.c | 39 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_sh.c | 5 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_sync.c | 46 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_wlc.c | 39 +- + net/{ipv4 => netfilter}/ipvs/ip_vs_wrr.c | 15 +- + net/netfilter/ipvs/ip_vs_xmit.c | 1004 +++ + net/netfilter/nf_conntrack_acct.c | 100 +- + net/netfilter/nf_conntrack_core.c | 344 +- + net/netfilter/nf_conntrack_ecache.c | 26 +- + net/netfilter/nf_conntrack_expect.c | 104 +- + net/netfilter/nf_conntrack_ftp.c | 9 +- + net/netfilter/nf_conntrack_h323_main.c | 6 +- + net/netfilter/nf_conntrack_helper.c | 40 +- + net/netfilter/nf_conntrack_netlink.c | 31 +- + net/netfilter/nf_conntrack_pptp.c | 36 +- + net/netfilter/nf_conntrack_proto.c | 10 +- + net/netfilter/nf_conntrack_proto_dccp.c | 20 +- + net/netfilter/nf_conntrack_proto_generic.c | 2 +- + net/netfilter/nf_conntrack_proto_gre.c | 101 +- + net/netfilter/nf_conntrack_proto_sctp.c | 6 +- + net/netfilter/nf_conntrack_proto_tcp.c | 35 +- + net/netfilter/nf_conntrack_proto_udp.c | 16 +- + net/netfilter/nf_conntrack_proto_udplite.c | 20 +- + net/netfilter/nf_conntrack_sip.c | 3 +- + net/netfilter/nf_conntrack_standalone.c | 146 +- + net/netfilter/nf_internals.h | 4 +- + net/netfilter/nf_log.c | 18 +- + net/netfilter/nf_queue.c | 22 +- + net/netfilter/nf_sockopt.c | 18 +- + net/netfilter/nf_tproxy_core.c | 95 + + net/netfilter/nfnetlink_log.c | 4 +- + net/netfilter/x_tables.c | 145 +- + net/netfilter/xt_CLASSIFY.c | 44 +- + net/netfilter/xt_CONNMARK.c | 78 +- + net/netfilter/xt_CONNSECMARK.c | 63 +- + net/netfilter/xt_DSCP.c | 59 +- + net/netfilter/xt_MARK.c | 76 +- + net/netfilter/xt_NFLOG.c | 46 +- + net/netfilter/xt_NFQUEUE.c | 10 +- + net/netfilter/xt_NOTRACK.c | 30 +- + net/netfilter/xt_RATEEST.c | 56 +- + net/netfilter/xt_SECMARK.c | 52 +- + net/netfilter/xt_TCPMSS.c | 38 +- + net/netfilter/xt_TCPOPTSTRIP.c | 16 +- + net/netfilter/xt_TPROXY.c | 102 + + net/netfilter/xt_TRACE.c | 30 +- + net/netfilter/xt_comment.c | 31 +- + net/netfilter/xt_connbytes.c | 56 +- + net/netfilter/xt_connlimit.c | 80 +- + net/netfilter/xt_connmark.c | 68 +- + net/netfilter/xt_conntrack.c | 62 +- + net/netfilter/xt_dccp.c | 27 +- + net/netfilter/xt_dscp.c | 51 +- + net/netfilter/xt_esp.c | 25 +- + net/netfilter/xt_hashlimit.c | 104 +- + net/netfilter/xt_helper.c | 54 +- + net/netfilter/xt_iprange.c | 27 +- + net/netfilter/xt_length.c | 18 +- + net/netfilter/xt_limit.c | 54 +- + net/netfilter/xt_mac.c | 41 +- + net/netfilter/xt_mark.c | 46 +- + net/netfilter/xt_multiport.c | 71 +- + net/netfilter/xt_owner.c | 51 +- + net/netfilter/xt_physdev.c | 49 +- + net/netfilter/xt_pkttype.c | 37 +- + net/netfilter/xt_policy.c | 34 +- + net/netfilter/xt_quota.c | 43 +- + net/netfilter/xt_rateest.c | 58 +- + net/netfilter/xt_realm.c | 9 +- + .../ipt_recent.c => netfilter/xt_recent.c} | 348 +- + net/netfilter/xt_sctp.c | 27 +- + net/netfilter/xt_socket.c | 185 + + net/netfilter/xt_state.c | 24 +- + net/netfilter/xt_statistic.c | 45 +- + net/netfilter/xt_string.c | 53 +- + net/netfilter/xt_tcpmss.c | 17 +- + net/netfilter/xt_tcpudp.c | 64 +- + net/netfilter/xt_time.c | 47 +- + net/netfilter/xt_u32.c | 33 +- + net/netlabel/Makefile | 3 +- + net/netlabel/netlabel_addrlist.c | 388 + + net/netlabel/netlabel_addrlist.h | 189 + + net/netlabel/netlabel_cipso_v4.c | 136 +- + net/netlabel/netlabel_cipso_v4.h | 10 +- + net/netlabel/netlabel_domainhash.c | 393 +- + net/netlabel/netlabel_domainhash.h | 40 +- + net/netlabel/netlabel_kapi.c | 272 +- + net/netlabel/netlabel_mgmt.c | 410 +- + net/netlabel/netlabel_mgmt.h | 59 +- + net/netlabel/netlabel_unlabeled.c | 456 +- + net/netlink/af_netlink.c | 2 +- + net/netrom/af_netrom.c | 2 +- + net/phonet/Kconfig | 16 + + net/phonet/Makefile | 11 + + net/phonet/af_phonet.c | 477 ++ + net/phonet/datagram.c | 197 + + net/phonet/pep-gprs.c | 347 + + net/phonet/pep.c | 1076 +++ + net/phonet/pn_dev.c | 208 + + net/phonet/pn_netlink.c | 165 + + net/phonet/socket.c | 411 + + net/phonet/sysctl.c | 113 + + net/rfkill/rfkill-input.c | 1 + + net/rfkill/rfkill-input.h | 1 + + net/rfkill/rfkill.c | 259 +- + net/sched/Kconfig | 20 + + net/sched/Makefile | 2 + + net/sched/act_ipt.c | 46 +- + net/sched/act_skbedit.c | 203 + + net/sched/cls_flow.c | 28 +- + net/sched/em_cmp.c | 9 +- + net/sched/sch_dsmark.c | 8 +- + net/sched/sch_generic.c | 31 +- + net/sched/sch_multiq.c | 477 ++ + net/sched/sch_netem.c | 18 +- + net/sched/sch_prio.c | 6 +- + net/sched/sch_sfq.c | 4 +- + net/sctp/associola.c | 18 +- + net/sctp/bind_addr.c | 16 +- + net/sctp/ipv6.c | 7 +- + net/sctp/output.c | 5 +- + net/sctp/outqueue.c | 65 +- + net/sctp/sm_make_chunk.c | 67 +- + net/sctp/sm_sideeffect.c | 81 +- + net/sctp/sm_statefuns.c | 92 +- + net/sctp/sm_statetable.c | 2 +- + net/sctp/socket.c | 10 +- + net/sctp/tsnmap.c | 346 +- + net/sctp/ulpevent.c | 10 +- + net/sctp/ulpqueue.c | 5 +- + net/socket.c | 2 + + net/sunrpc/clnt.c | 2 +- + net/sunrpc/rpcb_clnt.c | 81 +- + net/sunrpc/svc.c | 251 +- + net/sunrpc/svc_xprt.c | 39 +- + net/sunrpc/svcsock.c | 17 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 187 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 255 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 364 +- + net/sunrpc/xprtsock.c | 4 +- + net/unix/af_unix.c | 2 +- + net/wireless/Kconfig | 32 + + net/wireless/core.c | 44 +- + net/wireless/core.h | 2 +- + net/wireless/nl80211.c | 280 +- + net/wireless/reg.c | 910 ++- + net/wireless/reg.h | 13 + + net/xfrm/xfrm_output.c | 12 +- + net/xfrm/xfrm_policy.c | 118 +- + net/xfrm/xfrm_state.c | 84 +- + net/xfrm/xfrm_user.c | 61 +- + scripts/Kbuild.include | 4 +- + scripts/Makefile | 3 +- + scripts/bootgraph.pl | 147 + + scripts/checkstack.pl | 5 +- + scripts/kconfig/conf.c | 123 +- + scripts/kconfig/confdata.c | 8 +- + scripts/kernel-doc | 4 + + scripts/mod/file2alias.c | 75 + + scripts/mod/modpost.c | 6 +- + scripts/selinux/Makefile | 2 + + scripts/selinux/README | 2 + + scripts/selinux/install_policy.sh | 69 + + scripts/selinux/mdp/.gitignore | 2 + + scripts/selinux/mdp/Makefile | 5 + + scripts/selinux/mdp/dbus_contexts | 6 + + scripts/selinux/mdp/mdp.c | 242 + + security/Kconfig | 8 + + security/Makefile | 3 +- + security/commoncap.c | 2 +- + security/inode.c | 36 +- + security/security.c | 8 +- + security/selinux/Kconfig | 3 - + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 296 +- + security/selinux/include/avc.h | 4 + + security/selinux/include/netlabel.h | 44 +- + security/selinux/include/objsec.h | 9 +- + security/selinux/include/security.h | 15 +- + security/selinux/netlabel.c | 280 +- + security/selinux/ss/avtab.c | 8 +- + security/selinux/ss/conditional.c | 18 +- + security/selinux/ss/conditional.h | 2 +- + security/selinux/ss/ebitmap.c | 4 +- + security/selinux/ss/hashtab.c | 6 +- + security/selinux/ss/mls.c | 14 +- + security/selinux/ss/policydb.c | 225 +- + security/selinux/ss/policydb.h | 5 + + security/selinux/ss/services.c | 204 +- + security/selinux/ss/sidtab.c | 12 +- + security/smack/smack.h | 1 + + security/smack/smack_access.c | 10 +- + security/smack/smack_lsm.c | 5 +- + security/smack/smackfs.c | 96 +- + sound/Kconfig | 5 + + sound/aoa/codecs/snd-aoa-codec-tas.c | 6 +- + sound/aoa/soundbus/soundbus.h | 2 +- + sound/arm/Kconfig | 9 + + sound/arm/Makefile | 4 + + sound/arm/aaci.c | 6 +- + sound/arm/pxa2xx-ac97-lib.c | 384 + + sound/arm/pxa2xx-ac97.c | 251 +- + sound/arm/pxa2xx-pcm-lib.c | 278 + + sound/arm/pxa2xx-pcm.c | 252 +- + sound/arm/pxa2xx-pcm.h | 13 +- + sound/arm/sa11xx-uda1341.c | 7 +- + sound/core/Kconfig | 10 + + sound/core/Makefile | 1 + + sound/core/control.c | 54 +- + sound/core/control_compat.c | 3 +- + sound/core/device.c | 26 +- + sound/core/hwdep.c | 16 +- + sound/core/info.c | 23 +- + sound/core/info_oss.c | 6 +- + sound/core/init.c | 3 +- + sound/core/jack.c | 163 + + sound/core/memalloc.c | 100 +- + sound/core/oss/copy.c | 30 +- + sound/core/oss/io.c | 24 +- + sound/core/oss/linear.c | 29 +- + sound/core/oss/mixer_oss.c | 18 +- + sound/core/oss/mulaw.c | 27 +- + sound/core/oss/pcm_oss.c | 52 +- + sound/core/oss/pcm_plugin.c | 38 +- + sound/core/oss/rate.c | 42 +- + sound/core/oss/route.c | 12 +- + sound/core/pcm.c | 88 +- + sound/core/pcm_compat.c | 3 +- + sound/core/pcm_lib.c | 102 +- + sound/core/pcm_memory.c | 40 +- + sound/core/pcm_native.c | 153 +- + sound/core/pcm_timer.c | 6 +- + sound/core/rawmidi.c | 29 +- + sound/core/rtctimer.c | 6 +- + sound/core/seq/oss/seq_oss.c | 12 +- + sound/core/seq/oss/seq_oss_synth.c | 6 +- + sound/core/seq/seq_clientmgr.c | 30 +- + sound/core/seq/seq_compat.c | 3 +- + sound/core/seq/seq_device.c | 6 +- + sound/core/seq/seq_fifo.c | 15 +- + sound/core/seq/seq_memory.c | 12 +- + sound/core/seq/seq_midi.c | 15 +- + sound/core/seq/seq_ports.c | 13 +- + sound/core/seq/seq_prioq.c | 4 +- + sound/core/seq/seq_queue.c | 6 +- + sound/core/seq/seq_timer.c | 24 +- + sound/core/sgbuf.c | 62 +- + sound/core/sound.c | 14 +- + sound/core/sound_oss.c | 12 +- + sound/core/timer.c | 33 +- + sound/core/timer_compat.c | 9 +- + sound/drivers/dummy.c | 41 +- + sound/drivers/mtpav.c | 8 +- + sound/drivers/opl3/opl3_lib.c | 6 +- + sound/drivers/opl3/opl3_midi.c | 6 +- + sound/drivers/opl3/opl3_oss.c | 15 +- + sound/drivers/opl3/opl3_synth.c | 3 +- + sound/drivers/opl4/opl4_synth.c | 2 +- + sound/drivers/vx/vx_cmd.c | 3 +- + sound/drivers/vx/vx_core.c | 21 +- + sound/drivers/vx/vx_hwdep.c | 6 +- + sound/drivers/vx/vx_mixer.c | 3 +- + sound/drivers/vx/vx_pcm.c | 9 +- + sound/drivers/vx/vx_uer.c | 6 +- + sound/i2c/cs8427.c | 15 +- + sound/i2c/i2c.c | 6 +- + sound/i2c/l3/uda1341.c | 3 +- + sound/i2c/other/ak4114.c | 3 +- + sound/i2c/other/ak4117.c | 3 +- + sound/i2c/other/ak4xxx-adda.c | 4 +- + sound/i2c/other/tea575x-tuner.c | 23 +- + sound/isa/Kconfig | 44 +- + sound/isa/Makefile | 2 +- + sound/isa/ad1816a/ad1816a.c | 4 +- + sound/isa/ad1816a/ad1816a_lib.c | 6 +- + sound/isa/ad1848/Makefile | 2 - + sound/isa/ad1848/ad1848.c | 17 +- + sound/isa/ad1848/ad1848_lib.c | 1267 --- + sound/isa/azt2320.c | 29 +- + sound/isa/cmi8330.c | 106 +- + sound/isa/cs423x/Makefile | 2 - + sound/isa/cs423x/cs4231.c | 18 +- + sound/isa/cs423x/cs4231_lib.c | 1945 ----- + sound/isa/cs423x/cs4236.c | 51 +- + sound/isa/cs423x/cs4236_lib.c | 349 +- + sound/isa/es1688/es1688_lib.c | 3 +- + sound/isa/gus/gus_main.c | 6 +- + sound/isa/gus/gus_mixer.c | 6 +- + sound/isa/gus/gus_pcm.c | 12 +- + sound/isa/gus/gusmax.c | 50 +- + sound/isa/gus/interwave.c | 67 +- + sound/isa/opl3sa2.c | 99 +- + sound/isa/opti9xx/miro.c | 28 +- + sound/isa/opti9xx/opti92x-ad1848.c | 70 +- + sound/isa/sb/emu8000.c | 3 +- + sound/isa/sb/emu8000_patch.c | 3 +- + sound/isa/sb/sb16_csp.c | 9 +- + sound/isa/sb/sb16_main.c | 3 +- + sound/isa/sb/sb8_main.c | 8 +- + sound/isa/sb/sb_common.c | 3 +- + sound/isa/sb/sb_mixer.c | 9 +- + sound/isa/sc6000.c | 18 +- + sound/isa/sgalaxy.c | 43 +- + sound/isa/sscape.c | 63 +- + sound/isa/wavefront/wavefront.c | 62 +- + sound/isa/wavefront/wavefront_fx.c | 8 +- + sound/isa/wavefront/wavefront_midi.c | 24 +- + sound/isa/wavefront/wavefront_synth.c | 7 +- + sound/isa/wss/Makefile | 10 + + sound/isa/wss/wss_lib.c | 2322 ++++++ + sound/mips/au1x00.c | 6 +- + sound/oss/Kconfig | 35 - + sound/oss/Makefile | 1 - + sound/oss/ac97_codec.c | 2 +- + sound/oss/aedsp16.c | 8 - + sound/oss/dmasound/Kconfig | 1 + + sound/oss/hal2.c | 1558 ---- + sound/oss/hal2.h | 248 - + sound/oss/mpu401.c | 2 +- + sound/parisc/harmony.c | 3 +- + sound/pci/Kconfig | 33 +- + sound/pci/ac97/ac97_codec.c | 41 +- + sound/pci/ac97/ac97_patch.c | 210 +- + sound/pci/ad1889.c | 6 +- + sound/pci/ak4531_codec.c | 10 +- + sound/pci/als4000.c | 391 +- + sound/pci/atiixp.c | 13 +- + sound/pci/atiixp_modem.c | 10 +- + sound/pci/au88x0/au88x0.h | 7 +- + sound/pci/au88x0/au88x0_core.c | 40 +- + sound/pci/au88x0/au88x0_pcm.c | 14 +- + sound/pci/azt3328.c | 6 +- + sound/pci/bt87x.c | 5 +- + sound/pci/ca0106/ca0106_main.c | 2 +- + sound/pci/ca0106/ca_midi.c | 20 +- + sound/pci/cmipci.c | 9 +- + sound/pci/cs4281.c | 13 +- + sound/pci/cs46xx/cs46xx_lib.c | 91 +- + sound/pci/cs46xx/dsp_spos.c | 51 +- + sound/pci/cs46xx/dsp_spos_scb_lib.c | 115 +- + sound/pci/echoaudio/darla20_dsp.c | 3 +- + sound/pci/echoaudio/darla24_dsp.c | 8 +- + sound/pci/echoaudio/echo3g_dsp.c | 9 +- + sound/pci/echoaudio/echoaudio.c | 22 +- + sound/pci/echoaudio/echoaudio_3g.c | 11 +- + sound/pci/echoaudio/echoaudio_dsp.c | 21 +- + sound/pci/echoaudio/echoaudio_gml.c | 6 +- + sound/pci/echoaudio/gina20_dsp.c | 6 +- + sound/pci/echoaudio/gina24_dsp.c | 11 +- + sound/pci/echoaudio/indigo_dsp.c | 8 +- + sound/pci/echoaudio/indigodj_dsp.c | 8 +- + sound/pci/echoaudio/indigoio_dsp.c | 8 +- + sound/pci/echoaudio/layla20_dsp.c | 9 +- + sound/pci/echoaudio/layla24_dsp.c | 11 +- + sound/pci/echoaudio/mia_dsp.c | 13 +- + sound/pci/echoaudio/midi.c | 6 +- + sound/pci/echoaudio/mona_dsp.c | 6 +- + sound/pci/emu10k1/emu10k1_callback.c | 6 +- + sound/pci/emu10k1/emu10k1_patch.c | 23 +- + sound/pci/emu10k1/emu10k1x.c | 18 +- + sound/pci/emu10k1/emufx.c | 6 +- + sound/pci/emu10k1/emumpu401.c | 18 +- + sound/pci/emu10k1/memory.c | 31 +- + sound/pci/emu10k1/voice.c | 9 +- + sound/pci/es1938.c | 3 +- + sound/pci/es1968.c | 6 +- + sound/pci/hda/Makefile | 2 + + sound/pci/hda/hda_beep.c | 134 + + sound/pci/hda/hda_beep.h | 44 + + sound/pci/hda/hda_codec.c | 113 +- + sound/pci/hda/hda_codec.h | 93 +- + sound/pci/hda/hda_generic.c | 3 +- + sound/pci/hda/hda_intel.c | 146 +- + sound/pci/hda/hda_local.h | 24 +- + sound/pci/hda/hda_patch.h | 2 + + sound/pci/hda/hda_proc.c | 25 +- + sound/pci/hda/patch_analog.c | 96 +- + sound/pci/hda/patch_atihdmi.c | 45 +- + sound/pci/hda/patch_nvhdmi.c | 164 + + sound/pci/hda/patch_realtek.c | 1816 ++++- + sound/pci/hda/patch_sigmatel.c | 1008 ++- + sound/pci/hda/patch_via.c | 1407 +++- + sound/pci/ice1712/ak4xxx.c | 3 +- + sound/pci/ice1712/aureon.c | 699 +- + sound/pci/ice1712/delta.c | 2 +- + sound/pci/ice1712/delta.h | 1 + + sound/pci/ice1712/ews.c | 9 +- + sound/pci/ice1712/ice1712.c | 240 +- + sound/pci/ice1712/ice1712.h | 52 +- + sound/pci/ice1712/ice1724.c | 188 +- + sound/pci/ice1712/juli.c | 47 +- + sound/pci/ice1712/phase.c | 277 +- + sound/pci/ice1712/phase.h | 8 +- + sound/pci/ice1712/pontis.c | 5 +- + sound/pci/ice1712/revo.c | 25 +- + sound/pci/ice1712/wtm.c | 104 +- + sound/pci/ice1712/wtm.h | 4 +- + sound/pci/intel8x0.c | 50 +- + sound/pci/intel8x0m.c | 3 +- + sound/pci/korg1212/korg1212.c | 9 +- + sound/pci/maestro3.c | 10 +- + sound/pci/mixart/mixart.c | 4 +- + sound/pci/mixart/mixart_core.c | 18 +- + sound/pci/mixart/mixart_hwdep.c | 19 +- + sound/pci/mixart/mixart_mixer.c | 8 +- + sound/pci/nm256/nm256.c | 15 +- + sound/pci/oxygen/hifier.c | 15 +- + sound/pci/oxygen/oxygen.c | 92 +- + sound/pci/oxygen/oxygen.h | 103 +- + sound/pci/oxygen/oxygen_io.c | 22 + + sound/pci/oxygen/oxygen_lib.c | 101 +- + sound/pci/oxygen/oxygen_mixer.c | 48 +- + sound/pci/oxygen/oxygen_pcm.c | 47 +- + sound/pci/oxygen/virtuoso.c | 594 +- + sound/pci/pcxhr/pcxhr.c | 6 +- + sound/pci/pcxhr/pcxhr_core.c | 27 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 15 +- + sound/pci/riptide/riptide.c | 31 +- + sound/pci/rme9652/hdsp.c | 25 +- + sound/pci/rme9652/hdspm.c | 52 +- + sound/pci/rme9652/rme9652.c | 23 +- + sound/pci/sonicvibes.c | 10 +- + sound/pci/trident/trident_main.c | 22 +- + sound/pci/trident/trident_memory.c | 37 +- + sound/pci/via82xx.c | 60 +- + sound/pci/via82xx_modem.c | 8 +- + sound/pci/vx222/vx222_ops.c | 12 +- + sound/pci/ymfpci/ymfpci_main.c | 21 +- + sound/pcmcia/vx/vxp_ops.c | 3 +- + sound/ppc/awacs.c | 73 +- + sound/ppc/beep.c | 6 +- + sound/ppc/tumbler.c | 17 +- + sound/sh/aica.c | 9 +- + sound/soc/Kconfig | 2 + + sound/soc/Makefile | 2 +- + sound/soc/at32/at32-pcm.c | 5 +- + sound/soc/at32/playpaq_wm8510.c | 7 +- + sound/soc/at91/Kconfig | 17 - + sound/soc/at91/Makefile | 5 - + sound/soc/at91/at91-ssc.c | 4 +- + sound/soc/at91/eti_b1_wm8731.c | 348 - + sound/soc/blackfin/Kconfig | 101 + + sound/soc/blackfin/Makefile | 21 + + sound/soc/blackfin/bf5xx-ac97-pcm.c | 457 + + sound/soc/blackfin/bf5xx-ac97-pcm.h | 29 + + sound/soc/blackfin/bf5xx-ac97.c | 406 + + sound/soc/blackfin/bf5xx-ac97.h | 36 + + sound/soc/blackfin/bf5xx-ad1980.c | 113 + + sound/soc/blackfin/bf5xx-ad73311.c | 240 + + sound/soc/blackfin/bf5xx-i2s-pcm.c | 288 + + sound/soc/blackfin/bf5xx-i2s-pcm.h | 29 + + sound/soc/blackfin/bf5xx-i2s.c | 311 + + sound/soc/blackfin/bf5xx-i2s.h | 14 + + sound/soc/blackfin/bf5xx-sport.c | 1032 +++ + sound/soc/blackfin/bf5xx-sport.h | 194 + + sound/soc/blackfin/bf5xx-ssm2602.c | 186 + + sound/soc/codecs/Kconfig | 100 +- + sound/soc/codecs/Makefile | 26 +- + sound/soc/codecs/ac97.c | 3 +- + sound/soc/codecs/ad1980.c | 308 + + sound/soc/codecs/ad1980.h | 23 + + sound/soc/codecs/ad73311.c | 107 + + sound/soc/codecs/ad73311.h | 90 + + sound/soc/codecs/ak4535.c | 117 +- + sound/soc/codecs/ak4535.h | 1 + + sound/soc/codecs/cs4270.c | 103 +- + sound/soc/codecs/ssm2602.c | 775 ++ + sound/soc/codecs/ssm2602.h | 130 + + sound/soc/codecs/tlv320aic23.c | 714 ++ + sound/soc/codecs/tlv320aic23.h | 122 + + sound/soc/codecs/tlv320aic26.c | 520 ++ + sound/soc/codecs/tlv320aic26.h | 96 + + sound/soc/codecs/tlv320aic3x.c | 113 +- + sound/soc/codecs/tlv320aic3x.h | 3 +- + sound/soc/codecs/uda1380.c | 116 +- + sound/soc/codecs/uda1380.h | 1 + + sound/soc/codecs/wm8510.c | 221 +- + sound/soc/codecs/wm8510.h | 2 + + sound/soc/codecs/wm8580.c | 1053 +++ + sound/soc/codecs/wm8580.h | 42 + + sound/soc/codecs/wm8731.c | 179 +- + sound/soc/codecs/wm8731.h | 2 + + sound/soc/codecs/wm8750.c | 178 +- + sound/soc/codecs/wm8750.h | 2 + + sound/soc/codecs/wm8753.c | 181 +- + sound/soc/codecs/wm8753.h | 5 +- + sound/soc/codecs/wm8900.c | 1541 ++++ + sound/soc/codecs/wm8900.h | 64 + + sound/soc/codecs/wm8903.c | 1813 ++++ + sound/soc/codecs/wm8903.h | 1463 ++++ + sound/soc/codecs/wm8971.c | 941 +++ + sound/soc/codecs/wm8971.h | 64 + + sound/soc/codecs/wm8990.c | 110 +- + sound/soc/codecs/wm8990.h | 1 + + sound/soc/codecs/wm9712.c | 3 +- + sound/soc/codecs/wm9713.c | 37 +- + sound/soc/davinci/davinci-evm.c | 3 +- + sound/soc/davinci/davinci-i2s.c | 4 +- + sound/soc/davinci/davinci-i2s.h | 2 +- + sound/soc/davinci/davinci-pcm.c | 2 +- + sound/soc/davinci/davinci-pcm.h | 2 +- + sound/soc/fsl/Kconfig | 10 + + sound/soc/fsl/Makefile | 5 + + sound/soc/fsl/mpc5200_psc_i2s.c | 884 ++ + sound/soc/fsl/mpc8610_hpcd.c | 26 +- + sound/soc/fsl/soc-of-simple.c | 171 + + sound/soc/omap/Kconfig | 8 + + sound/soc/omap/Makefile | 2 + + sound/soc/omap/n810.c | 7 +- + sound/soc/omap/omap-mcbsp.c | 181 +- + sound/soc/omap/omap-mcbsp.h | 16 +- + sound/soc/omap/omap-pcm.c | 4 +- + sound/soc/omap/osk5912.c | 232 + + sound/soc/pxa/Kconfig | 3 + + sound/soc/pxa/corgi.c | 41 +- + sound/soc/pxa/em-x270.c | 2 +- + sound/soc/pxa/poodle.c | 7 +- + sound/soc/pxa/pxa2xx-ac97.c | 282 +- + sound/soc/pxa/pxa2xx-i2s.c | 67 +- + sound/soc/pxa/pxa2xx-pcm.c | 265 +- + sound/soc/pxa/pxa2xx-pcm.h | 15 - + sound/soc/pxa/spitz.c | 63 +- + sound/soc/pxa/tosa.c | 6 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 96 +- + sound/soc/soc-core.c | 143 +- + sound/soc/soc-dapm.c | 152 +- + sound/sound_core.c | 79 +- + sound/sparc/amd7930.c | 104 +- + sound/sparc/cs4231.c | 202 +- + sound/sparc/dbri.c | 106 +- + sound/synth/emux/emux.c | 8 +- + sound/synth/emux/emux_nrpn.c | 8 +- + sound/synth/emux/emux_oss.c | 42 +- + sound/synth/emux/emux_seq.c | 15 +- + sound/synth/emux/emux_synth.c | 47 +- + sound/synth/util_mem.c | 10 +- + sound/usb/Kconfig | 12 + + sound/usb/Makefile | 1 + + sound/usb/usbaudio.c | 46 +- + sound/usb/usbaudio.h | 6 +- + sound/usb/usbmidi.c | 48 + + sound/usb/usbmixer.c | 19 +- + sound/usb/usbquirks.h | 80 +- + sound/usb/usx2y/Makefile | 2 + + sound/usb/usx2y/us122l.c | 692 ++ + sound/usb/usx2y/us122l.h | 27 + + sound/usb/usx2y/usb_stream.c | 761 ++ + sound/usb/usx2y/usb_stream.h | 112 + + 5470 files changed, 301230 insertions(+), 152800 deletions(-) + create mode 100644 Documentation/SELinux.txt + delete mode 100644 Documentation/blackfin/kgdb.txt + create mode 100644 Documentation/filesystems/fiemap.txt + create mode 100644 Documentation/laptops/disk-shock-protection.txt + create mode 100644 Documentation/networking/LICENSE.qlge + create mode 100644 Documentation/networking/phonet.txt + create mode 100644 Documentation/networking/regulatory.txt + create mode 100644 Documentation/networking/tproxy.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/83xx-512x-pci.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/8xxx_gpio.txt + delete mode 100644 Documentation/powerpc/ppc_htab.txt + delete mode 100644 Documentation/powerpc/smp.txt + delete mode 100644 Documentation/sparc/sbus_drivers.txt + create mode 100644 Documentation/timers/00-INDEX + rename Documentation/{ => timers}/hpet.txt (81%) + create mode 100644 Documentation/video4linux/m5602.txt + create mode 100644 Documentation/video4linux/soc-camera.txt + create mode 100644 Documentation/x86/00-INDEX + rename Documentation/x86/{i386 => }/boot.txt (99%) + rename Documentation/{ => x86}/mtrr.txt (99%) + rename Documentation/x86/{i386 => }/usb-legacy-support.txt (100%) + rename Documentation/x86/{i386 => }/zero-page.txt (100%) + copy arch/arm/configs/{xm_x270_defconfig => afeb9260_defconfig} (51%) + copy arch/arm/configs/{xm_x270_defconfig => cm_x300_defconfig} (68%) + create mode 100644 arch/arm/configs/palmz72_defconfig + copy arch/arm/configs/{xm_x270_defconfig => viper_defconfig} (65%) + rename arch/arm/configs/{xm_x270_defconfig => xm_x2xx_defconfig} (91%) + create mode 100644 arch/arm/include/asm/cachetype.h + create mode 100644 arch/arm/include/asm/cputype.h + create mode 100644 arch/arm/kernel/elf.c + create mode 100644 arch/arm/mach-at91/board-afeb-9260v1.c + create mode 100644 arch/arm/mach-at91/pm_slowclock.S + create mode 100644 arch/arm/mach-davinci/devices.c + create mode 100644 arch/arm/mach-davinci/usb.c + create mode 100644 arch/arm/mach-mx2/devices.h + create mode 100644 arch/arm/mach-mx3/devices.h + create mode 100644 arch/arm/mach-orion5x/edmini_v2-setup.c + create mode 100644 arch/arm/mach-orion5x/lsmini-setup.c + create mode 100644 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c + create mode 100644 arch/arm/mach-orion5x/terastation_pro2-setup.c + delete mode 100644 arch/arm/mach-pxa/akita-ioexp.c + create mode 100644 arch/arm/mach-pxa/am200epd.c + create mode 100644 arch/arm/mach-pxa/cm-x255.c + delete mode 100644 arch/arm/mach-pxa/cm-x270-pci.h + rename arch/arm/mach-pxa/{cm-x270-pci.c => cm-x2xx-pci.c} (77%) + create mode 100644 arch/arm/mach-pxa/cm-x2xx-pci.h + create mode 100644 arch/arm/mach-pxa/cm-x2xx.c + create mode 100644 arch/arm/mach-pxa/cm-x300.c + delete mode 100644 arch/arm/mach-pxa/corgi_lcd.c + delete mode 100644 arch/arm/mach-pxa/corgi_ssp.c + rename arch/arm/mach-pxa/{cpu-pxa.c => cpufreq-pxa2xx.c} (99%) + create mode 100644 arch/arm/mach-pxa/cpufreq-pxa3xx.c + create mode 100644 arch/arm/mach-pxa/e330.c + create mode 100644 arch/arm/mach-pxa/e350.c + create mode 100644 arch/arm/mach-pxa/e400.c + delete mode 100644 arch/arm/mach-pxa/e400_lcd.c + create mode 100644 arch/arm/mach-pxa/e740.c + delete mode 100644 arch/arm/mach-pxa/e740_lcd.c + rename arch/arm/mach-pxa/{e750_lcd.c => e750.c} (61%) + rename arch/arm/mach-pxa/{e800_lcd.c => e800.c} (65%) + create mode 100644 arch/arm/mach-pxa/eseries.h + delete mode 100644 arch/arm/mach-pxa/eseries_udc.c + delete mode 100644 arch/arm/mach-pxa/include/mach/akita.h + create mode 100644 arch/arm/mach-pxa/include/mach/mioa701.h + create mode 100644 arch/arm/mach-pxa/include/mach/palmz72.h + create mode 100644 arch/arm/mach-pxa/include/mach/viper.h + delete mode 100644 arch/arm/mach-pxa/leds-trizeps4.c + create mode 100644 arch/arm/mach-pxa/mioa701.c + create mode 100644 arch/arm/mach-pxa/mioa701_bootresume.S + create mode 100644 arch/arm/mach-pxa/mp900.c + create mode 100644 arch/arm/mach-pxa/palmz72.c + create mode 100644 arch/arm/mach-pxa/viper.c + rename arch/arm/mm/{consistent.c => dma-mapping.c} (79%) + create mode 100644 arch/arm/oprofile/op_model_v7.c + create mode 100644 arch/arm/oprofile/op_model_v7.h + copy include/asm-mips/mach-bcm47xx/bcm47xx.h => arch/arm/plat-mxc/devices.c (56%) + create mode 100644 arch/arm/plat-mxc/dma-mx1-mx2.c + create mode 100644 arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h + create mode 100644 arch/avr32/boot/images/.gitignore + delete mode 100644 arch/avr32/include/asm/a.out.h + create mode 100644 arch/avr32/kernel/.gitignore + create mode 100644 arch/avr32/oprofile/backtrace.c + create mode 100644 arch/blackfin/configs/BF526-EZBRD_defconfig + delete mode 100644 arch/blackfin/include/asm/a.out.h + create mode 100644 arch/blackfin/include/asm/bfrom.h + delete mode 100644 arch/blackfin/include/asm/cpumask.h + create mode 100644 arch/blackfin/mach-bf527/boards/ezbrd.c + create mode 100644 arch/blackfin/mm/isram-driver.c + rename arch/blackfin/mm/{blackfin_sram.c => sram-alloc.c} (96%) + delete mode 100644 arch/h8300/include/asm/a.out.h + delete mode 100644 arch/ia64/include/asm/a.out.h + delete mode 100644 arch/m68k/atari/hades-pci.c + delete mode 100644 arch/m68k/kernel/bios32.c + delete mode 100644 arch/m68knommu/include/asm/a.out.h + rename arch/mips/{au1000 => alchemy}/Kconfig (100%) + rename arch/mips/{au1000 => alchemy}/common/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/common/au1xxx_irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/common/clocks.c (100%) + rename arch/mips/{au1000 => alchemy}/common/cputable.c (100%) + rename arch/mips/{au1000 => alchemy}/common/dbdma.c (100%) + rename arch/mips/{au1000 => alchemy}/common/dma.c (100%) + rename arch/mips/{au1000 => alchemy}/common/gpio.c (94%) + rename arch/mips/{au1000 => alchemy}/common/irq.c (100%) + rename arch/mips/{au1000 => alchemy}/common/pci.c (100%) + rename arch/mips/{au1000 => alchemy}/common/platform.c (100%) + rename arch/mips/{au1000 => alchemy}/common/power.c (100%) + rename arch/mips/{au1000 => alchemy}/common/prom.c (100%) + rename arch/mips/{au1000 => alchemy}/common/puts.c (100%) + rename arch/mips/{au1000 => alchemy}/common/reset.c (100%) + rename arch/mips/{au1000 => alchemy}/common/setup.c (100%) + rename arch/mips/{au1000 => alchemy}/common/sleeper.S (96%) + rename arch/mips/{au1000 => alchemy}/common/time.c (100%) + rename arch/mips/{au1000 => alchemy}/db1x00/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/db1x00/board_setup.c (100%) + rename arch/mips/{au1000 => alchemy}/db1x00/init.c (100%) + rename arch/mips/{au1000 => alchemy}/db1x00/irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/mtx-1/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/mtx-1/board_setup.c (100%) + copy arch/mips/{au1000 => alchemy}/mtx-1/init.c (100%) + rename arch/mips/{au1000 => alchemy}/mtx-1/irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/mtx-1/platform.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1000/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/pb1000/board_setup.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1000/init.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1000/irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1100/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/pb1100/board_setup.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1100/init.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1100/irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1200/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/pb1200/board_setup.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1200/init.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1200/irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1200/platform.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1500/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/pb1500/board_setup.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1500/init.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1500/irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1550/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/pb1550/board_setup.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1550/init.c (100%) + rename arch/mips/{au1000 => alchemy}/pb1550/irqmap.c (100%) + rename arch/mips/{au1000 => alchemy}/xxs1500/Makefile (100%) + rename arch/mips/{au1000 => alchemy}/xxs1500/board_setup.c (100%) + rename arch/mips/{au1000 => alchemy}/xxs1500/init.c (100%) + rename arch/mips/{au1000 => alchemy}/xxs1500/irqmap.c (100%) + rename {include/asm-mips => arch/mips/include/asm}/Kbuild (100%) + rename {include/asm-mips => arch/mips/include/asm}/abi.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/addrspace.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/asm.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/asmmacro-32.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/asmmacro-64.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/asmmacro.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/atomic.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/auxvec.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/barrier.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/bcache.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/bitops.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/bootinfo.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/branch.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/break.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/bug.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/bugs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/byteorder.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cache.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cachectl.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cacheflush.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cacheops.h (100%) + create mode 100644 arch/mips/include/asm/cevt-r4k.h + rename {include/asm-mips => arch/mips/include/asm}/checksum.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cmp.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cmpxchg.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/compat-signal.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/compat.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/compiler.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cpu-features.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cpu-info.h (92%) + rename {include/asm-mips => arch/mips/include/asm}/cpu.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/cputime.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/current.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/debug.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/ecc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/interrupts.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/ioasic.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/ioasic_addrs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/ioasic_ints.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn01.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn02.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn02ba.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn02ca.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn02xa.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn03.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn05.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/kn230.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/machtype.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/prom.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dec/system.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/delay.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/device.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/div64.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dma-mapping.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dma.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ds1286.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ds1287.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/dsp.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/edac.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/elf.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/emergency-restart.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/emma2rh/emma2rh.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/emma2rh/markeins.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/errno.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fb.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fcntl.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fixmap.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/floppy.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fpregdef.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fpu.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fpu_emulator.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/futex.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fw/arc/hinv.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fw/arc/types.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fw/cfe/cfe_api.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/fw/cfe/cfe_error.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/gcmpregs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/gic.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/gpio.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/gt64120.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/hardirq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/hazards.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/highmem.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/hw_irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/i8253.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/i8259.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ide.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/inst.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/io.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ioctl.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ioctls.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ip32/crime.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ip32/ip32_ints.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ip32/mace.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/ipcbuf.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/irq_cpu.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/irq_gt641xx.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/irq_regs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/irqflags.h (93%) + rename {include/asm-mips => arch/mips/include/asm}/isadep.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/jazz.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/jazzdma.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/kdebug.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/kexec.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/kgdb.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/kmap_types.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/kspd.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/lasat/ds1603.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/lasat/eeprom.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/lasat/head.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/lasat/lasat.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/lasat/lasatint.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/lasat/picvue.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/lasat/serial.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/linkage.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/local.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/m48t35.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/m48t37.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1000.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1000_dma.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1000_gpio.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1100_mmc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1550_spi.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx_dbdma.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx_ide.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx_psc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/gpio.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/ioremap.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/prom.h (100%) + copy {include/asm-mips => arch/mips/include/asm}/mach-au1x00/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-bcm47xx/bcm47xx.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-bcm47xx/gpio.h (50%) + rename {include/asm-mips/mach-au1x00 => arch/mips/include/asm/mach-bcm47xx}/war.h (85%) + rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/cobalt.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/mach-gt64120.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-db1x00/db1200.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-db1x00/db1x00.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-dec/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-dec/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-emma2rh/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-emma2rh/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/excite.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/excite_fpga.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/excite_nandflash.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/rm9k_eth.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/rm9k_wdt.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/rm9k_xicap.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-excite/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/dma-coherence.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/floppy.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/gpio.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/ide.h (85%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/ioremap.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/kernel-entry-init.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/kmalloc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/mangle-port.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/spaces.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-generic/topology.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip22/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip22/spaces.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip22/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/dma-coherence.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/kernel-entry-init.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/kmalloc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/mangle-port.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/mmzone.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/spaces.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/topology.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip28/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip28/spaces.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip28/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/dma-coherence.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/kmalloc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/mangle-port.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/dma-coherence.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/floppy.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-lasat/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-lasat/mach-gt64120.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-lasat/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-lemote/dma-coherence.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-lemote/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-lemote/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-malta/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-malta/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-malta/kernel-entry-init.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-malta/mach-gt64120.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-malta/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-malta/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-mipssim/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-mipssim/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1000.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1100.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1200.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1500.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1550.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/cm.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/glb.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/int.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/kernel-entry-init.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/nand.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/pci.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/uart.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/usb.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/ddr.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/dma.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/dma_v.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/eth.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/gpio.h (61%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/integ.h (100%) + create mode 100644 arch/mips/include/asm/mach-rc32434/irq.h + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/pci.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/prom.h (95%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/rb.h (93%) + create mode 100644 arch/mips/include/asm/mach-rc32434/rc32434.h + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/timer.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rm/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rm/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-rm/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-sibyte/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-sibyte/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-tx39xx/ioremap.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-tx39xx/mangle-port.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-tx39xx/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/ioremap.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/kmalloc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-vr41xx/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-vr41xx/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-wrppmc/mach-gt64120.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-wrppmc/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-yosemite/cpu-feature-overrides.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mach-yosemite/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mc146818-time.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mc146818rtc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/bonito64.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/generic.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/launch.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/malta.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/maltaint.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/msc01_pci.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/piix4.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/prom.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/sim.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips-boards/simint.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mips_mt.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mipsmtregs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mipsprom.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mipsregs.h (99%) + rename {include/asm-mips => arch/mips/include/asm}/mman.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mmu.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mmu_context.h (97%) + rename {include/asm-mips => arch/mips/include/asm}/mmzone.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/module.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/msc01_ic.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/msgbuf.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/mutex.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/nile4.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/paccess.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/page.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/param.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/parport.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pci.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pci/bridge.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/percpu.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pgalloc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pgtable-32.h (99%) + rename {include/asm-mips => arch/mips/include/asm}/pgtable-64.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pgtable-bits.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pgtable.h (100%) + create mode 100644 arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_cic_int.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_int.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_pci.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_prom.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_regops.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_regs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_slp_int.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/war.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/pmon.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/poll.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/posix_types.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/prefetch.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/processor.h (92%) + create mode 100644 arch/mips/include/asm/ptrace.h + rename {include/asm-mips => arch/mips/include/asm}/r4k-timer.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/r4kcache.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/reboot.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/reg.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/regdef.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/resource.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/rm9k-ocd.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/rtlx.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/scatterlist.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/seccomp.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sections.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/segment.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sembuf.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/serial.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/setup.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/gio.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/hpc3.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/ioc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/ip22.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/mc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/pi1.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/seeq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/sgi.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgi/wd.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgialib.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgiarcs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sgidefs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/shmbuf.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/shmparam.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_int.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_l2c.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_mc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_regs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_scd.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/bigsur.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/board.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/carmel.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_defs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_dma.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_genbus.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_int.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_l2c.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_ldt.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_mac.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_mc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_regs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_scd.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_smbus.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_syncser.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_uart.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/sentosa.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sibyte/swarm.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sigcontext.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/siginfo.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/signal.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sim.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/smp-ops.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/smp.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/smtc.h (90%) + rename {include/asm-mips => arch/mips/include/asm}/smtc_ipi.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/smtc_proc.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/smvp.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/addrs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/agent.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/arch.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/fru.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/gda.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/hub.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/intr.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/io.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/ioc3.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/klconfig.h (96%) + rename {include/asm-mips => arch/mips/include/asm}/sn/kldir.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/klkernvars.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/launch.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/mapped_kernel.h (90%) + rename {include/asm-mips => arch/mips/include/asm}/sn/nmi.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/addrs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/arch.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hub.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubio.h (96%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubmd.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubni.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubpi.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/ip27.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/sn_private.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sn/types.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sni.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/socket.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sockios.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sparsemem.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/spinlock.h (54%) + rename {include/asm-mips => arch/mips/include/asm}/spinlock_types.h (75%) + rename {include/asm-mips => arch/mips/include/asm}/stackframe.h (84%) + rename {include/asm-mips => arch/mips/include/asm}/stacktrace.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/stat.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/statfs.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/string.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/suspend.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/sysmips.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/system.h (99%) + rename {include/asm-mips => arch/mips/include/asm}/termbits.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/termios.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/thread_info.h (97%) + rename {include/asm-mips => arch/mips/include/asm}/time.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/timex.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/titan_dep.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/tlb.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/tlbdebug.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/tlbflush.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/topology.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/traps.h (100%) + create mode 100644 arch/mips/include/asm/txx9/boards.h + rename {include/asm-mips => arch/mips/include/asm}/txx9/generic.h (73%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/jmr3927.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/pci.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/rbtx4927.h (94%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/rbtx4938.h (100%) + create mode 100644 arch/mips/include/asm/txx9/rbtx4939.h + rename {include/asm-mips => arch/mips/include/asm}/txx9/smsc_fdc37m81x.h (98%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/spi.h (53%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/tx3927.h (99%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/tx4927.h (95%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/tx4927pcic.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/txx9/tx4938.h (99%) + create mode 100644 arch/mips/include/asm/txx9/tx4939.h + rename {include/asm-mips => arch/mips/include/asm}/txx9irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/txx9pio.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/txx9tmr.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/types.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/uaccess.h (74%) + rename {include/asm-mips => arch/mips/include/asm}/ucontext.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/unaligned.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/unistd.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/user.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vga.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vpe.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/capcella.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/giu.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/irq.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/mpc30x.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/pci.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/siu.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/tb0219.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/tb0226.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/tb0287.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/vr41xx/vr41xx.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/war.h (100%) + create mode 100644 arch/mips/include/asm/watch.h + rename {include/asm-mips => arch/mips/include/asm}/wbflush.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/xor.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/xtalk/xtalk.h (100%) + rename {include/asm-mips => arch/mips/include/asm}/xtalk/xwidget.h (100%) + create mode 100644 arch/mips/kernel/cevt-smtc.c + create mode 100644 arch/mips/kernel/watch.c + rename arch/mips/{au1000/mtx-1/init.c => pci/pci-bcm47xx.c} (62%) + create mode 100644 arch/mips/pci/pci-tx4939.c + create mode 100644 arch/mips/pmc-sierra/msp71xx/gpio.c + create mode 100644 arch/mips/pmc-sierra/msp71xx/gpio_extended.c + create mode 100644 arch/mips/sibyte/swarm/platform.c + create mode 100644 arch/mips/txx9/generic/irq_tx4939.c + create mode 100644 arch/mips/txx9/generic/setup_tx4939.c + rename arch/mips/txx9/{rbtx4938 => generic}/spi_eeprom.c (79%) + create mode 100644 arch/mips/txx9/rbtx4939/Makefile + create mode 100644 arch/mips/txx9/rbtx4939/irq.c + create mode 100644 arch/mips/txx9/rbtx4939/prom.c + create mode 100644 arch/mips/txx9/rbtx4939/setup.c + create mode 100644 arch/powerpc/boot/dtc-src/libfdt_env.h + create mode 100644 arch/powerpc/boot/dts/arches.dts + create mode 100644 arch/powerpc/boot/dts/gef_sbc610.dts + create mode 100644 arch/powerpc/boot/dts/mgcoge.dts + create mode 100644 arch/powerpc/boot/dts/mgsuvd.dts + create mode 100644 arch/powerpc/configs/44x/arches_defconfig + copy arch/powerpc/configs/{sbc8641d_defconfig => 86xx/gef_sbc610_defconfig} (76%) + rename arch/powerpc/configs/{ => 86xx}/mpc8610_hpcd_defconfig (99%) + copy arch/powerpc/configs/{ => 86xx}/mpc8641_hpcn_defconfig (99%) + rename arch/powerpc/configs/{ => 86xx}/sbc8641d_defconfig (99%) + create mode 100644 arch/powerpc/configs/mgcoge_defconfig + create mode 100644 arch/powerpc/configs/mgsuvd_defconfig + rename arch/powerpc/configs/{mpc8641_hpcn_defconfig => mpc86xx_defconfig} (97%) + delete mode 100644 arch/powerpc/include/asm/a.out.h + create mode 100644 arch/powerpc/include/asm/msi_bitmap.h + rename arch/powerpc/{math-emu => include/asm}/sfp-machine.h (83%) + create mode 100644 arch/powerpc/kernel/.gitignore + create mode 100644 arch/powerpc/kernel/dma-iommu.c + create mode 100644 arch/powerpc/kernel/dma.c + delete mode 100644 arch/powerpc/kernel/dma_64.c + create mode 100644 arch/powerpc/kernel/reloc_64.S + delete mode 100644 arch/powerpc/math-emu/double.h + delete mode 100644 arch/powerpc/math-emu/op-1.h + delete mode 100644 arch/powerpc/math-emu/op-2.h + delete mode 100644 arch/powerpc/math-emu/op-4.h + delete mode 100644 arch/powerpc/math-emu/op-common.h + delete mode 100644 arch/powerpc/math-emu/single.h + delete mode 100644 arch/powerpc/math-emu/soft-fp.h + delete mode 100644 arch/powerpc/math-emu/types.c + delete mode 100644 arch/powerpc/platforms/44x/bamboo.c + delete mode 100644 arch/powerpc/platforms/44x/canyonlands.c + delete mode 100644 arch/powerpc/platforms/44x/katmai.c + create mode 100644 arch/powerpc/platforms/44x/ppc44x_simple.c + delete mode 100644 arch/powerpc/platforms/44x/rainier.c + delete mode 100644 arch/powerpc/platforms/44x/sequoia.c + delete mode 100644 arch/powerpc/platforms/44x/taishan.c + create mode 100644 arch/powerpc/platforms/82xx/mgcoge.c + create mode 100644 arch/powerpc/platforms/86xx/gef_pic.c + create mode 100644 arch/powerpc/platforms/86xx/gef_pic.h + create mode 100644 arch/powerpc/platforms/86xx/gef_sbc610.c + create mode 100644 arch/powerpc/platforms/8xx/mgsuvd.c + create mode 100644 arch/powerpc/sysdev/mpc8xxx_gpio.c + create mode 100644 arch/powerpc/sysdev/msi_bitmap.c + create mode 100644 arch/s390/include/asm/syscall.h + delete mode 100644 arch/sparc/include/asm/bpp.h + delete mode 100644 arch/sparc/include/asm/dma_32.h + delete mode 100644 arch/sparc/include/asm/dma_64.h + delete mode 100644 arch/sparc/include/asm/ebus.h + delete mode 100644 arch/sparc/include/asm/ebus_32.h + delete mode 100644 arch/sparc/include/asm/ebus_64.h + create mode 100644 arch/sparc/include/asm/ebus_dma.h + create mode 100644 arch/sparc/include/asm/gpio.h + create mode 100644 arch/sparc/include/asm/memctrl.h + delete mode 100644 arch/sparc/include/asm/mostek.h + delete mode 100644 arch/sparc/include/asm/mostek_32.h + delete mode 100644 arch/sparc/include/asm/mostek_64.h + delete mode 100644 arch/sparc/include/asm/reboot.h + delete mode 100644 arch/sparc/include/asm/rtc.h + delete mode 100644 arch/sparc/include/asm/sbus.h + delete mode 100644 arch/sparc/include/asm/sbus_32.h + delete mode 100644 arch/sparc/include/asm/sbus_64.h + create mode 100644 arch/sparc/include/asm/serial.h + delete mode 100644 arch/sparc/include/asm/sstate.h + delete mode 100644 arch/sparc/include/asm/statfs_32.h + delete mode 100644 arch/sparc/include/asm/statfs_64.h + delete mode 100644 arch/sparc/include/asm/sun4paddr.h + delete mode 100644 arch/sparc/include/asm/sun4prom.h + delete mode 100644 arch/sparc/include/asm/vfc_ioctls.h + create mode 100644 arch/sparc/kernel/dma.c + create mode 100644 arch/sparc/kernel/dma.h + delete mode 100644 arch/sparc/kernel/ebus.c + delete mode 100644 arch/sparc/kernel/sun4setup.c + delete mode 100644 arch/sparc/mm/nosrmmu.c + delete mode 100644 arch/sparc/prom/sun4prom.c + create mode 100644 arch/sparc64/kernel/psycho_common.c + create mode 100644 arch/sparc64/kernel/psycho_common.h + create mode 100644 arch/sparc64/kernel/reboot.c + create mode 100644 arch/sparc64/mm/init.h + create mode 100644 arch/x86/crypto/crc32c-intel.c + delete mode 100644 arch/x86/kernel/cpu/amd_64.c + create mode 100644 arch/x86/kernel/cpu/cmpxchg.c + delete mode 100644 arch/x86/kernel/cpu/common_64.c + delete mode 100644 arch/x86/kernel/cpu/feature_names.c + delete mode 100644 arch/x86/kernel/cpu/intel_64.c + create mode 100644 arch/x86/kernel/cpu/mkcapflags.pl + create mode 100644 arch/x86/kernel/cpu/powerflags.c + create mode 100644 arch/x86/kernel/dumpstack_32.c + create mode 100644 arch/x86/kernel/dumpstack_64.c + rename arch/x86/{mach-es7000/es7000plat.c => kernel/es7000_32.c} (70%) + create mode 100644 arch/x86/kernel/genx2apic_cluster.c + create mode 100644 arch/x86/kernel/genx2apic_phys.c + delete mode 100644 arch/x86/kernel/microcode.c + create mode 100644 arch/x86/kernel/microcode_amd.c + create mode 100644 arch/x86/kernel/microcode_core.c + create mode 100644 arch/x86/kernel/microcode_intel.c + create mode 100644 arch/x86/kernel/paravirt-spinlocks.c + rename arch/x86/kernel/{traps_32.c => traps.c} (57%) + delete mode 100644 arch/x86/kernel/traps_64.c + create mode 100644 arch/x86/kernel/xsave.c + delete mode 100644 arch/x86/mach-es7000/Makefile + delete mode 100644 arch/x86/mach-es7000/es7000.h + rename arch/x86/mm/{discontig_32.c => numa_32.c} (99%) + create mode 100644 arch/x86/oprofile/op_model_amd.c + delete mode 100644 arch/x86/oprofile/op_model_athlon.c + create mode 100644 arch/x86/xen/debugfs.c + create mode 100644 arch/x86/xen/debugfs.h + create mode 100644 arch/x86/xen/irq.c + create mode 100644 arch/x86/xen/spinlock.c + create mode 100644 block/blk-softirq.c + create mode 100644 block/blk-timeout.c + rename crypto/{cryptomgr.c => algboss.c} (69%) + create mode 100644 crypto/ansi_cprng.c + create mode 100644 crypto/fips.c + create mode 100644 crypto/krng.c + create mode 100644 crypto/rng.c + create mode 100644 crypto/testmgr.c + create mode 100644 crypto/testmgr.h + delete mode 100644 drivers/char/ip2/ip2base.c + create mode 100644 drivers/char/tty_buffer.c + create mode 100644 drivers/char/tty_port.c + create mode 100644 drivers/hid/hid-a4tech.c + create mode 100644 drivers/hid/hid-apple.c + create mode 100644 drivers/hid/hid-belkin.c + create mode 100644 drivers/hid/hid-bright.c + create mode 100644 drivers/hid/hid-cherry.c + create mode 100644 drivers/hid/hid-chicony.c + create mode 100644 drivers/hid/hid-cypress.c + create mode 100644 drivers/hid/hid-dell.c + create mode 100644 drivers/hid/hid-dummy.c + create mode 100644 drivers/hid/hid-ezkey.c + create mode 100644 drivers/hid/hid-gyration.c + create mode 100644 drivers/hid/hid-ids.h + delete mode 100644 drivers/hid/hid-input-quirks.c + create mode 100644 drivers/hid/hid-lg.c + create mode 100644 drivers/hid/hid-lg.h + rename drivers/hid/{usbhid => }/hid-lg2ff.c (90%) + rename drivers/hid/{usbhid => }/hid-lgff.c (81%) + create mode 100644 drivers/hid/hid-microsoft.c + create mode 100644 drivers/hid/hid-monterey.c + create mode 100644 drivers/hid/hid-petalynx.c + rename drivers/hid/{usbhid/hid-plff.c => hid-pl.c} (68%) + create mode 100644 drivers/hid/hid-samsung.c + create mode 100644 drivers/hid/hid-sony.c + create mode 100644 drivers/hid/hid-sunplus.c + rename drivers/hid/{usbhid => }/hid-tmff.c (60%) + rename drivers/hid/{usbhid => }/hid-zpff.c (67%) + delete mode 100644 drivers/hid/usbhid/hid-ff.c + create mode 100644 drivers/hwmon/max1111.c + create mode 100644 drivers/hwmon/ultra45_env.c + create mode 100644 drivers/i2c/busses/i2c-highlander.c + create mode 100644 drivers/i2c/chips/mcu_mpc8349emitx.c + create mode 100644 drivers/ide/ide-disk.h + create mode 100644 drivers/ide/ide-disk_ioctl.c + create mode 100644 drivers/ide/ide-disk_proc.c + create mode 100644 drivers/ide/ide-dma-sff.c + create mode 100644 drivers/ide/ide-floppy.h + create mode 100644 drivers/ide/ide-floppy_ioctl.c + create mode 100644 drivers/ide/ide-floppy_proc.c + create mode 100644 drivers/ide/ide-ioctls.c + create mode 100644 drivers/ide/ide-park.c + delete mode 100644 drivers/ide/mips/swarm.c + delete mode 100644 drivers/leds/leds-corgi.c + delete mode 100644 drivers/leds/leds-spitz.c + create mode 100644 drivers/leds/leds-sunfire.c + delete mode 100644 drivers/media/common/tuners/xc5000_priv.h + delete mode 100644 drivers/media/dvb/cinergyT2/Kconfig + delete mode 100644 drivers/media/dvb/cinergyT2/Makefile + delete mode 100644 drivers/media/dvb/cinergyT2/cinergyT2.c + create mode 100644 drivers/media/dvb/dm1105/Kconfig + create mode 100644 drivers/media/dvb/dm1105/Makefile + create mode 100644 drivers/media/dvb/dm1105/dm1105.c + create mode 100644 drivers/media/dvb/dvb-usb/af9015.c + create mode 100644 drivers/media/dvb/dvb-usb/af9015.h + create mode 100644 drivers/media/dvb/dvb-usb/cinergyT2-core.c + create mode 100644 drivers/media/dvb/dvb-usb/cinergyT2-fe.c + create mode 100644 drivers/media/dvb/dvb-usb/cinergyT2.h + create mode 100644 drivers/media/dvb/dvb-usb/dtv5100.c + create mode 100644 drivers/media/dvb/dvb-usb/dtv5100.h + create mode 100644 drivers/media/dvb/frontends/af9013.c + create mode 100644 drivers/media/dvb/frontends/af9013.h + create mode 100644 drivers/media/dvb/frontends/af9013_priv.h + create mode 100644 drivers/media/dvb/frontends/cx24116.c + create mode 100644 drivers/media/dvb/frontends/cx24116.h + create mode 100644 drivers/media/dvb/frontends/eds1547.h + create mode 100644 drivers/media/dvb/frontends/lgs8gl5.c + create mode 100644 drivers/media/dvb/frontends/lgs8gl5.h + create mode 100644 drivers/media/dvb/frontends/si21xx.c + create mode 100644 drivers/media/dvb/frontends/si21xx.h + create mode 100644 drivers/media/dvb/frontends/stb6000.c + create mode 100644 drivers/media/dvb/frontends/stb6000.h + create mode 100644 drivers/media/dvb/frontends/stv0288.c + create mode 100644 drivers/media/dvb/frontends/stv0288.h + create mode 100644 drivers/media/dvb/frontends/tdhd1.h + create mode 100644 drivers/media/radio/radio-mr800.c + create mode 100644 drivers/media/video/cx18/cx18-io.c + create mode 100644 drivers/media/video/cx18/cx18-io.h + delete mode 100644 drivers/media/video/dpc7146.c + create mode 100644 drivers/media/video/gspca/finepix.c + create mode 100644 drivers/media/video/gspca/m5602/Kconfig + create mode 100644 drivers/media/video/gspca/m5602/Makefile + create mode 100644 drivers/media/video/gspca/m5602/m5602_bridge.h + create mode 100644 drivers/media/video/gspca/m5602/m5602_core.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_mt9m111.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_mt9m111.h + create mode 100644 drivers/media/video/gspca/m5602/m5602_ov9650.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_ov9650.h + create mode 100644 drivers/media/video/gspca/m5602/m5602_po1030.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_po1030.h + create mode 100644 drivers/media/video/gspca/m5602/m5602_s5k4aa.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_s5k4aa.h + create mode 100644 drivers/media/video/gspca/m5602/m5602_s5k83a.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_s5k83a.h + create mode 100644 drivers/media/video/gspca/m5602/m5602_sensor.h + create mode 100644 drivers/media/video/mt9m111.c + delete mode 100644 drivers/media/video/saa5246a.h + delete mode 100644 drivers/media/video/tuner-3036.c + create mode 100644 drivers/media/video/zoran/Kconfig + create mode 100644 drivers/media/video/zoran/Makefile + rename drivers/media/video/{ => zoran}/videocodec.c (100%) + rename drivers/media/video/{ => zoran}/videocodec.h (100%) + rename drivers/media/video/{ => zoran}/zoran.h (100%) + rename drivers/media/video/{ => zoran}/zoran_card.c (99%) + rename drivers/media/video/{ => zoran}/zoran_card.h (100%) + rename drivers/media/video/{ => zoran}/zoran_device.c (99%) + rename drivers/media/video/{ => zoran}/zoran_device.h (94%) + rename drivers/media/video/{ => zoran}/zoran_driver.c (99%) + rename drivers/media/video/{ => zoran}/zoran_procfs.c (100%) + copy drivers/media/video/{ => zoran}/zoran_procfs.h (100%) + rename drivers/media/video/{ => zoran}/zr36016.c (100%) + rename drivers/media/video/{ => zoran}/zr36016.h (100%) + rename drivers/media/video/{ => zoran}/zr36050.c (100%) + rename drivers/media/video/{ => zoran}/zr36050.h (100%) + rename drivers/media/video/{ => zoran}/zr36057.h (100%) + rename drivers/media/video/{ => zoran}/zr36060.c (100%) + rename drivers/media/video/{ => zoran}/zr36060.h (100%) + create mode 100644 drivers/mfd/ucb1400_core.c + create mode 100644 drivers/mfd/wm8350-core.c + create mode 100644 drivers/mfd/wm8350-gpio.c + create mode 100644 drivers/mfd/wm8350-i2c.c + create mode 100644 drivers/mfd/wm8350-regmap.c + create mode 100644 drivers/mfd/wm8400-core.c + create mode 100644 drivers/net/atlx/atl2.c + create mode 100644 drivers/net/atlx/atl2.h + create mode 100644 drivers/net/enic/Makefile + create mode 100644 drivers/net/enic/cq_desc.h + create mode 100644 drivers/net/enic/cq_enet_desc.h + create mode 100644 drivers/net/enic/enic.h + create mode 100644 drivers/net/enic/enic_main.c + create mode 100644 drivers/net/enic/enic_res.c + create mode 100644 drivers/net/enic/enic_res.h + create mode 100644 drivers/net/enic/rq_enet_desc.h + create mode 100644 drivers/net/enic/vnic_cq.c + create mode 100644 drivers/net/enic/vnic_cq.h + create mode 100644 drivers/net/enic/vnic_dev.c + create mode 100644 drivers/net/enic/vnic_dev.h + create mode 100644 drivers/net/enic/vnic_devcmd.h + create mode 100644 drivers/net/enic/vnic_enet.h + create mode 100644 drivers/net/enic/vnic_intr.c + create mode 100644 drivers/net/enic/vnic_intr.h + create mode 100644 drivers/net/enic/vnic_nic.h + create mode 100644 drivers/net/enic/vnic_resource.h + create mode 100644 drivers/net/enic/vnic_rq.c + create mode 100644 drivers/net/enic/vnic_rq.h + create mode 100644 drivers/net/enic/vnic_rss.h + create mode 100644 drivers/net/enic/vnic_stats.h + create mode 100644 drivers/net/enic/vnic_wq.c + create mode 100644 drivers/net/enic/vnic_wq.h + create mode 100644 drivers/net/enic/wq_enet_desc.h + create mode 100644 drivers/net/jme.c + create mode 100644 drivers/net/jme.h + create mode 100644 drivers/net/qlge/Makefile + create mode 100644 drivers/net/qlge/qlge.h + create mode 100644 drivers/net/qlge/qlge_dbg.c + create mode 100644 drivers/net/qlge/qlge_ethtool.c + create mode 100644 drivers/net/qlge/qlge_main.c + create mode 100644 drivers/net/qlge/qlge_mpi.c + create mode 100644 drivers/net/usb/smsc95xx.c + create mode 100644 drivers/net/usb/smsc95xx.h + create mode 100644 drivers/net/wireless/ath5k/attach.c + create mode 100644 drivers/net/wireless/ath5k/caps.c + create mode 100644 drivers/net/wireless/ath5k/desc.c + create mode 100644 drivers/net/wireless/ath5k/desc.h + create mode 100644 drivers/net/wireless/ath5k/dma.c + create mode 100644 drivers/net/wireless/ath5k/eeprom.c + create mode 100644 drivers/net/wireless/ath5k/eeprom.h + create mode 100644 drivers/net/wireless/ath5k/gpio.c + delete mode 100644 drivers/net/wireless/ath5k/hw.c + delete mode 100644 drivers/net/wireless/ath5k/hw.h + create mode 100644 drivers/net/wireless/ath5k/pcu.c + create mode 100644 drivers/net/wireless/ath5k/qcu.c + create mode 100644 drivers/net/wireless/ath5k/reset.c + delete mode 100644 drivers/net/wireless/b43/phy.h + create mode 100644 drivers/net/wireless/b43/phy_a.c + create mode 100644 drivers/net/wireless/b43/phy_a.h + create mode 100644 drivers/net/wireless/b43/phy_common.c + create mode 100644 drivers/net/wireless/b43/phy_common.h + rename drivers/net/wireless/b43/{phy.c => phy_g.c} (61%) + create mode 100644 drivers/net/wireless/b43/phy_g.h + create mode 100644 drivers/net/wireless/b43/phy_lp.c + create mode 100644 drivers/net/wireless/b43/phy_lp.h + rename drivers/net/wireless/b43/{nphy.c => phy_n.c} (80%) + rename drivers/net/wireless/b43/{nphy.h => phy_n.h} (98%) + create mode 100644 drivers/net/wireless/hermes_dld.c + create mode 100644 drivers/net/wireless/hermes_dld.h + create mode 100644 drivers/net/wireless/libertas_tf/Makefile + create mode 100644 drivers/net/wireless/libertas_tf/cmd.c + create mode 100644 drivers/net/wireless/libertas_tf/if_usb.c + create mode 100644 drivers/net/wireless/libertas_tf/if_usb.h + create mode 100644 drivers/net/wireless/libertas_tf/libertas_tf.h + create mode 100644 drivers/net/wireless/libertas_tf/main.c + create mode 100644 drivers/net/wireless/rt2x00/rt2x00crypto.c + delete mode 100644 drivers/net/wireless/zd1211rw/zd_ieee80211.c + delete mode 100644 drivers/net/wireless/zd1211rw/zd_ieee80211.h + create mode 100644 drivers/pci/dma_remapping.h + create mode 100644 drivers/pci/intr_remapping.c + create mode 100644 drivers/pci/intr_remapping.h + delete mode 100644 drivers/pcmcia/ds_internal.h + create mode 100644 drivers/pcmcia/pxa2xx_cm_x255.c + create mode 100644 drivers/pcmcia/pxa2xx_cm_x2xx.c + create mode 100644 drivers/pcmcia/pxa2xx_palmld.c + create mode 100644 drivers/pcmcia/pxa2xx_trizeps4.c + create mode 100644 drivers/pcmcia/pxa2xx_viper.c + delete mode 100644 drivers/power/palmtx_battery.c + create mode 100644 drivers/power/wm97xx_battery.c + create mode 100644 drivers/regulator/da903x.c + create mode 100644 drivers/regulator/wm8350-regulator.c + create mode 100644 drivers/regulator/wm8400-regulator.c + create mode 100644 drivers/rtc/rtc-bq4802.c + create mode 100644 drivers/rtc/rtc-ds1286.c + create mode 100644 drivers/rtc/rtc-m48t35.c + create mode 100644 drivers/rtc/rtc-starfire.c + create mode 100644 drivers/rtc/rtc-sun4v.c + delete mode 100644 drivers/sbus/char/bpp.c + delete mode 100644 drivers/sbus/char/cpwatchdog.c + delete mode 100644 drivers/sbus/char/rtc.c + delete mode 100644 drivers/sbus/char/vfc.h + delete mode 100644 drivers/sbus/char/vfc_dev.c + delete mode 100644 drivers/sbus/char/vfc_i2c.c + delete mode 100644 drivers/sbus/char/vfc_i2c.h + delete mode 100644 drivers/sbus/dvma.c + delete mode 100644 drivers/sbus/sbus.c + delete mode 100644 drivers/scsi/atari_dma_emul.c + delete mode 100644 drivers/serial/mcfserial.c + delete mode 100644 drivers/serial/mcfserial.h + delete mode 100644 drivers/video/am200epd.c + create mode 100644 drivers/video/backlight/corgi_lcd.c + create mode 100644 drivers/video/backlight/tdo24m.c + create mode 100644 drivers/watchdog/at91sam9_wdt.c + create mode 100644 drivers/watchdog/cpwd.c + create mode 100644 drivers/watchdog/it87_wdt.c + create mode 100644 drivers/watchdog/orion5x_wdt.c + rename drivers/{sbus/char/riowatchdog.c => watchdog/riowd.c} (51%) + create mode 100644 drivers/watchdog/w83697ug_wdt.c + create mode 100644 drivers/xen/cpu_hotplug.c + create mode 100644 firmware/sun/cassini.bin.ihex + create mode 100644 fs/lockd/grace.c + create mode 100644 fs/ocfs2/ocfs2_jbd_compat.h + create mode 100644 fs/ocfs2/xattr.c + create mode 100644 fs/ocfs2/xattr.h + delete mode 100644 include/asm-cris/a.out.h + delete mode 100644 include/asm-m32r/a.out.h + delete mode 100644 include/asm-mips/a.out.h + delete mode 100644 include/asm-mips/mach-bcm47xx/war.h + delete mode 100644 include/asm-mips/mach-ip22/ds1286.h + delete mode 100644 include/asm-mips/mach-ip28/ds1286.h + delete mode 100644 include/asm-mips/mach-rc32434/irq.h + delete mode 100644 include/asm-mips/mach-rc32434/rc32434.h + delete mode 100644 include/asm-mips/ptrace.h + delete mode 100644 include/asm-parisc/a.out.h + rename include/asm-x86/{mach-bigsmp/mach_apic.h => bigsmp/apic.h} (98%) + rename include/asm-x86/{mach-summit/mach_apicdef.h => bigsmp/apicdef.h} (74%) + rename include/asm-x86/{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} (100%) + rename include/asm-x86/{mach-es7000/mach_apic.h => es7000/apic.h} (92%) + create mode 100644 include/asm-x86/es7000/apicdef.h + rename include/asm-x86/{mach-es7000/mach_ipi.h => es7000/ipi.h} (83%) + rename include/asm-x86/{mach-es7000/mach_mpparse.h => es7000/mpparse.h} (83%) + rename include/asm-x86/{mach-es7000/mach_wakecpu.h => es7000/wakecpu.h} (95%) + create mode 100644 include/asm-x86/irq_remapping.h + delete mode 100644 include/asm-x86/mach-bigsmp/mach_apicdef.h + delete mode 100644 include/asm-x86/mach-es7000/mach_apicdef.h + create mode 100644 include/asm-x86/microcode.h + rename include/asm-x86/{mach-numaq/mach_apic.h => numaq/apic.h} (97%) + rename include/asm-x86/{mach-numaq/mach_apicdef.h => numaq/apicdef.h} (75%) + rename include/asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} (83%) + rename include/asm-x86/{mach-numaq/mach_mpparse.h => numaq/mpparse.h} (50%) + rename include/asm-x86/{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} (91%) + rename include/asm-x86/{mach-summit/mach_apic.h => summit/apic.h} (94%) + create mode 100644 include/asm-x86/summit/apicdef.h + rename include/asm-x86/{mach-summit/mach_ipi.h => summit/ipi.h} (83%) + rename include/asm-x86/{mach-summit => summit}/irq_vectors_limits.h (100%) + rename include/asm-x86/{mach-summit/mach_mpparse.h => summit/mpparse.h} (96%) + create mode 100644 include/asm-x86/syscall.h + create mode 100644 include/asm-x86/syscalls.h + create mode 100644 include/asm-x86/xcr.h + create mode 100644 include/asm-x86/xsave.h + delete mode 100644 include/asm-xtensa/a.out.h + create mode 100644 include/crypto/internal/rng.h + create mode 100644 include/crypto/rng.h + rename {arch/arm/include/asm => include/linux}/cnt32_to_63.h (87%) + create mode 100644 include/linux/fiemap.h + create mode 100644 include/linux/if_phonet.h + create mode 100644 include/linux/mfd/wm8350/audio.h + create mode 100644 include/linux/mfd/wm8350/comparator.h + create mode 100644 include/linux/mfd/wm8350/core.h + create mode 100644 include/linux/mfd/wm8350/gpio.h + create mode 100644 include/linux/mfd/wm8350/pmic.h + create mode 100644 include/linux/mfd/wm8350/rtc.h + create mode 100644 include/linux/mfd/wm8350/supply.h + create mode 100644 include/linux/mfd/wm8350/wdt.h + create mode 100644 include/linux/mfd/wm8400-audio.h + create mode 100644 include/linux/mfd/wm8400-private.h + rename drivers/media/video/zoran_procfs.h => include/linux/mfd/wm8400.h (53%) + create mode 100644 include/linux/mmdebug.h + create mode 100644 include/linux/netfilter/xt_TPROXY.h + create mode 100644 include/linux/netfilter/xt_recent.h + create mode 100644 include/linux/phonet.h + create mode 100644 include/linux/spi/corgi_lcd.h + create mode 100644 include/linux/string_helpers.h + create mode 100644 include/linux/tc_act/tc_skbedit.h + create mode 100644 include/linux/ucb1400.h + create mode 100644 include/linux/usb/ehci_def.h + create mode 100644 include/linux/wm97xx_batt.h + create mode 100644 include/net/dsa.h + create mode 100644 include/net/netfilter/ipv4/nf_defrag_ipv4.h + create mode 100644 include/net/netfilter/nf_tproxy_core.h + create mode 100644 include/net/netns/conntrack.h + create mode 100644 include/net/phonet/gprs.h + create mode 100644 include/net/phonet/pep.h + create mode 100644 include/net/phonet/phonet.h + create mode 100644 include/net/phonet/pn_dev.h + create mode 100644 include/net/tc_act/tc_skbedit.h + delete mode 100644 include/sound/ad1848.h + delete mode 100644 include/sound/cs4231.h + create mode 100644 include/sound/jack.h + create mode 100644 include/sound/pxa2xx-lib.h + create mode 100644 include/sound/soc-of-simple.h + create mode 100644 include/sound/wss.h + delete mode 100644 include/xen/balloon.h + create mode 100644 lib/string_helpers.c + create mode 100644 net/core/skb_dma_map.c + create mode 100644 net/dsa/Kconfig + create mode 100644 net/dsa/Makefile + create mode 100644 net/dsa/dsa.c + create mode 100644 net/dsa/dsa_priv.h + create mode 100644 net/dsa/mv88e6060.c + create mode 100644 net/dsa/mv88e6123_61_65.c + create mode 100644 net/dsa/mv88e6131.c + create mode 100644 net/dsa/mv88e6xxx.c + create mode 100644 net/dsa/mv88e6xxx.h + create mode 100644 net/dsa/slave.c + create mode 100644 net/dsa/tag_dsa.c + create mode 100644 net/dsa/tag_edsa.c + create mode 100644 net/dsa/tag_trailer.c + delete mode 100644 net/ipv4/ipvs/ip_vs_ctl.c + delete mode 100644 net/ipv4/ipvs/ip_vs_proto_ah.c + delete mode 100644 net/ipv4/ipvs/ip_vs_proto_esp.c + delete mode 100644 net/ipv4/ipvs/ip_vs_xmit.c + create mode 100644 net/ipv4/netfilter/nf_defrag_ipv4.c + create mode 100644 net/mac80211/ht.c + create mode 100644 net/mac80211/rc80211_minstrel.c + create mode 100644 net/mac80211/rc80211_minstrel.h + create mode 100644 net/mac80211/rc80211_minstrel_debugfs.c + create mode 100644 net/mac80211/scan.c + create mode 100644 net/mac80211/spectmgmt.c + rename net/{ipv4 => netfilter}/ipvs/Kconfig (95%) + rename net/{ipv4 => netfilter}/ipvs/Makefile (88%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_app.c (100%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_conn.c (77%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_core.c (58%) + create mode 100644 net/netfilter/ipvs/ip_vs_ctl.c + rename net/{ipv4 => netfilter}/ipvs/ip_vs_dh.c (98%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_est.c (78%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_ftp.c (87%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_lblc.c (80%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_lblcr.c (82%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_lc.c (82%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_nq.c (84%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_proto.c (79%) + create mode 100644 net/netfilter/ipvs/ip_vs_proto_ah_esp.c + rename net/{ipv4 => netfilter}/ipvs/ip_vs_proto_tcp.c (70%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_proto_udp.c (60%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_rr.c (88%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_sched.c (100%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_sed.c (85%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_sh.c (98%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_sync.c (95%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_wlc.c (84%) + rename net/{ipv4 => netfilter}/ipvs/ip_vs_wrr.c (94%) + create mode 100644 net/netfilter/ipvs/ip_vs_xmit.c + create mode 100644 net/netfilter/nf_tproxy_core.c + create mode 100644 net/netfilter/xt_TPROXY.c + rename net/{ipv4/netfilter/ipt_recent.c => netfilter/xt_recent.c} (51%) + create mode 100644 net/netfilter/xt_socket.c + create mode 100644 net/netlabel/netlabel_addrlist.c + create mode 100644 net/netlabel/netlabel_addrlist.h + create mode 100644 net/phonet/Kconfig + create mode 100644 net/phonet/Makefile + create mode 100644 net/phonet/af_phonet.c + create mode 100644 net/phonet/datagram.c + create mode 100644 net/phonet/pep-gprs.c + create mode 100644 net/phonet/pep.c + create mode 100644 net/phonet/pn_dev.c + create mode 100644 net/phonet/pn_netlink.c + create mode 100644 net/phonet/socket.c + create mode 100644 net/phonet/sysctl.c + create mode 100644 net/sched/act_skbedit.c + create mode 100644 net/sched/sch_multiq.c + create mode 100644 net/wireless/reg.h + create mode 100644 scripts/bootgraph.pl + create mode 100644 scripts/selinux/Makefile + create mode 100644 scripts/selinux/README + create mode 100644 scripts/selinux/install_policy.sh + create mode 100644 scripts/selinux/mdp/.gitignore + create mode 100644 scripts/selinux/mdp/Makefile + create mode 100644 scripts/selinux/mdp/dbus_contexts + create mode 100644 scripts/selinux/mdp/mdp.c + create mode 100644 sound/arm/pxa2xx-ac97-lib.c + create mode 100644 sound/arm/pxa2xx-pcm-lib.c + create mode 100644 sound/core/jack.c + delete mode 100644 sound/isa/ad1848/ad1848_lib.c + delete mode 100644 sound/isa/cs423x/cs4231_lib.c + create mode 100644 sound/isa/wss/Makefile + create mode 100644 sound/isa/wss/wss_lib.c + delete mode 100644 sound/oss/hal2.c + delete mode 100644 sound/oss/hal2.h + create mode 100644 sound/pci/hda/hda_beep.c + create mode 100644 sound/pci/hda/hda_beep.h + create mode 100644 sound/pci/hda/patch_nvhdmi.c + delete mode 100644 sound/soc/at91/eti_b1_wm8731.c + create mode 100644 sound/soc/blackfin/Kconfig + create mode 100644 sound/soc/blackfin/Makefile + create mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.c + create mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h + create mode 100644 sound/soc/blackfin/bf5xx-ac97.c + create mode 100644 sound/soc/blackfin/bf5xx-ac97.h + create mode 100644 sound/soc/blackfin/bf5xx-ad1980.c + create mode 100644 sound/soc/blackfin/bf5xx-ad73311.c + create mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.c + create mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h + create mode 100644 sound/soc/blackfin/bf5xx-i2s.c + create mode 100644 sound/soc/blackfin/bf5xx-i2s.h + create mode 100644 sound/soc/blackfin/bf5xx-sport.c + create mode 100644 sound/soc/blackfin/bf5xx-sport.h + create mode 100644 sound/soc/blackfin/bf5xx-ssm2602.c + create mode 100644 sound/soc/codecs/ad1980.c + create mode 100644 sound/soc/codecs/ad1980.h + create mode 100644 sound/soc/codecs/ad73311.c + create mode 100644 sound/soc/codecs/ad73311.h + create mode 100644 sound/soc/codecs/ssm2602.c + create mode 100644 sound/soc/codecs/ssm2602.h + create mode 100644 sound/soc/codecs/tlv320aic23.c + create mode 100644 sound/soc/codecs/tlv320aic23.h + create mode 100644 sound/soc/codecs/tlv320aic26.c + create mode 100644 sound/soc/codecs/tlv320aic26.h + create mode 100644 sound/soc/codecs/wm8580.c + create mode 100644 sound/soc/codecs/wm8580.h + create mode 100644 sound/soc/codecs/wm8900.c + create mode 100644 sound/soc/codecs/wm8900.h + create mode 100644 sound/soc/codecs/wm8903.c + create mode 100644 sound/soc/codecs/wm8903.h + create mode 100644 sound/soc/codecs/wm8971.c + create mode 100644 sound/soc/codecs/wm8971.h + create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.c + create mode 100644 sound/soc/fsl/soc-of-simple.c + create mode 100644 sound/soc/omap/osk5912.c + create mode 100644 sound/usb/usx2y/us122l.c + create mode 100644 sound/usb/usx2y/us122l.h + create mode 100644 sound/usb/usx2y/usb_stream.c + create mode 100644 sound/usb/usx2y/usb_stream.h +$ git cherry-pick c917a47312d1dcfadbb8d558fab121d4d6467d10 +Finished one cherry-pick. +Created commit ef2f741: mfd: Don't use NO_IRQ in WM8350 + 1 files changed, 1 insertions(+), 1 deletions(-) +$ git revert 5f119f29063c9a9bf1ab40112c02710c2db84f29 +Auto-merged drivers/rtc/Kconfig +Auto-merged drivers/rtc/Makefile +Removed drivers/rtc/rtc-ds1286.c +Finished one revert. +Created commit 5f21bf1: Revert "MIPS: DS1286: New RTC driver" + 3 files changed, 0 insertions(+), 415 deletions(-) + delete mode 100644 drivers/rtc/rtc-ds1286.c +$ git revert d1dbd82e2ff02181a7102088a9fe83e17ddbcb47 +Auto-merged drivers/rtc/Kconfig +Auto-merged drivers/rtc/Makefile +Removed drivers/rtc/rtc-m48t35.c +Finished one revert. +Created commit dbe292a: Revert "RTC: M48T35: new RTC driver" + 3 files changed, 0 insertions(+), 244 deletions(-) + delete mode 100644 drivers/rtc/rtc-m48t35.c +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merged drivers/net/wireless/orinoco_cs.c +Auto-merged drivers/net/wireless/spectrum_cs.c +Merge made by recursive. + Documentation/networking/phonet.txt | 4 +- + drivers/net/wireless/ath9k/main.c | 8 ++- + drivers/net/wireless/iwlwifi/iwl-5000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- + drivers/net/wireless/libertas/cmd.c | 2 + + drivers/net/wireless/orinoco_cs.c | 5 +- + drivers/net/wireless/p54/p54common.c | 1 - + drivers/net/wireless/p54/p54usb.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 9 +- + drivers/net/wireless/rtl8187_dev.c | 3 + + drivers/net/wireless/spectrum_cs.c | 5 +- + include/linux/netfilter/nfnetlink.h | 3 + + include/net/mac80211.h | 3 +- + include/net/netfilter/nf_nat_core.h | 8 ++ + net/802/fc.c | 2 +- + net/bridge/netfilter/Kconfig | 1 + + net/core/net_namespace.c | 2 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 3 +- + net/ipv4/netfilter/nf_nat_core.c | 97 ++++++++++++++++++ + net/ipv6/netfilter.c | 6 +- + net/mac80211/debugfs_netdev.c | 6 +- + net/mac80211/debugfs_sta.c | 11 ++ + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/mlme.c | 3 - + net/mac80211/scan.c | 3 +- + net/mac80211/sta_info.c | 7 +- + net/mac80211/sta_info.h | 1 + + net/mac80211/util.c | 8 +- + net/mac80211/wext.c | 2 +- + net/netfilter/nf_conntrack_core.c | 7 ++ + net/netfilter/nf_conntrack_netlink.c | 151 ++++++++++++----------------- + net/netfilter/nfnetlink.c | 12 ++- + net/wireless/core.c | 5 +- + 33 files changed, 262 insertions(+), 133 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/arm/pxa2xx-ac97-lib.c | 12 +++--- + sound/pci/hda/patch_realtek.c | 88 +++++++++++++++++++++++++++++++--------- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/tlv320aic23.c | 10 ++-- + sound/usb/usx2y/us122l.c | 13 +++--- + 6 files changed, 88 insertions(+), 39 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +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 +Merge made by recursive. + kernel/module.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + Documentation/ABI/stable/sysfs-driver-usb-usbtmc | 62 ++ + .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 43 + + Documentation/devices.txt | 3 + + Documentation/ioctl-number.txt | 2 + + Documentation/usb/misc_usbsevseg.txt | 46 + + drivers/usb/class/Kconfig | 10 + + drivers/usb/class/Makefile | 1 + + drivers/usb/class/usbtmc.c | 1087 ++++++++++++++++++++ + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/usbsevseg.c | 394 +++++++ + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio.h | 5 + + drivers/usb/serial/option.c | 28 +- + include/linux/usb/Kbuild | 2 +- + include/linux/usb/tmc.h | 43 + + 16 files changed, 1714 insertions(+), 23 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-usb-usbtmc + create mode 100644 Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg + create mode 100644 Documentation/usb/misc_usbsevseg.txt + create mode 100644 drivers/usb/class/usbtmc.c + create mode 100644 drivers/usb/misc/usbsevseg.c + create mode 100644 include/linux/usb/tmc.h +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-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merged drivers/serial/8250.c +Merge made by recursive. + arch/arm/Makefile | 3 +- + arch/arm/configs/omap3_beagle_defconfig | 1321 ++++++++++++++ + arch/arm/configs/omap_ldp_defconfig | 1044 +++++++++++ + arch/arm/configs/overo_defconfig | 1885 ++++++++++++++++++++ + arch/arm/mach-omap1/clock.c | 10 +- + arch/arm/mach-omap1/clock.h | 6 +- + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/mcbsp.c | 45 +- + arch/arm/mach-omap1/serial.c | 12 +- + arch/arm/mach-omap2/Kconfig | 22 +- + arch/arm/mach-omap2/Makefile | 12 +- + arch/arm/mach-omap2/board-ldp.c | 86 + + arch/arm/mach-omap2/board-omap3beagle.c | 244 +++ + arch/arm/mach-omap2/board-overo.c | 242 +++ + arch/arm/mach-omap2/clock.c | 64 +- + arch/arm/mach-omap2/clock.h | 2 + + arch/arm/mach-omap2/clock24xx.h | 238 ++- + arch/arm/mach-omap2/clock34xx.c | 31 +- + arch/arm/mach-omap2/clock34xx.h | 248 ++- + arch/arm/mach-omap2/clockdomain.c | 623 +++++++ + arch/arm/mach-omap2/clockdomains.h | 305 ++++ + arch/arm/mach-omap2/cm-regbits-24xx.h | 24 +- + arch/arm/mach-omap2/cm-regbits-34xx.h | 42 +- + arch/arm/mach-omap2/cm.h | 2 +- + arch/arm/mach-omap2/devices.c | 225 ++- + arch/arm/mach-omap2/gpmc.c | 88 +- + arch/arm/mach-omap2/id.c | 39 +- + arch/arm/mach-omap2/io.c | 152 ++- + arch/arm/mach-omap2/irq.c | 81 +- + arch/arm/mach-omap2/mcbsp.c | 151 ++- + arch/arm/mach-omap2/memory.c | 14 + + arch/arm/mach-omap2/memory.h | 7 + + arch/arm/mach-omap2/mux.c | 245 +++- + arch/arm/mach-omap2/powerdomain.c | 1113 ++++++++++++ + arch/arm/mach-omap2/powerdomains.h | 187 ++ + arch/arm/mach-omap2/powerdomains24xx.h | 200 +++ + arch/arm/mach-omap2/powerdomains34xx.h | 327 ++++ + arch/arm/mach-omap2/prcm-common.h | 3 +- + arch/arm/mach-omap2/prm-regbits-24xx.h | 12 +- + arch/arm/mach-omap2/prm-regbits-34xx.h | 11 +- + arch/arm/mach-omap2/prm.h | 5 +- + arch/arm/mach-omap2/serial.c | 116 +- + arch/arm/mach-omap2/{sleep.S => sleep24xx.S} | 32 +- + arch/arm/mach-omap2/sram34xx.S | 179 ++ + arch/arm/mach-s3c2410/bast-irq.c | 2 +- + arch/arm/mach-s3c2410/clock.c | 8 +- + arch/arm/mach-s3c2410/dma.c | 6 +- + arch/arm/mach-s3c2410/include/mach/debug-macro.S | 4 +- + arch/arm/mach-s3c2410/include/mach/map.h | 2 +- + arch/arm/mach-s3c2410/include/mach/uncompress.h | 2 +- + arch/arm/mach-s3c2410/irq.c | 4 +- + arch/arm/mach-s3c2410/mach-amlm5900.c | 6 +- + arch/arm/mach-s3c2410/mach-bast.c | 8 +- + arch/arm/mach-s3c2410/mach-h1940.c | 10 +- + arch/arm/mach-s3c2410/mach-n30.c | 10 +- + arch/arm/mach-s3c2410/mach-otom.c | 10 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 10 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 8 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 6 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 8 +- + arch/arm/mach-s3c2410/pm.c | 4 +- + arch/arm/mach-s3c2410/s3c2410.c | 10 +- + arch/arm/mach-s3c2410/sleep.S | 2 +- + arch/arm/mach-s3c2410/usb-simtec.c | 2 +- + arch/arm/mach-s3c2412/clock.c | 8 +- + arch/arm/mach-s3c2412/dma.c | 6 +- + arch/arm/mach-s3c2412/irq.c | 6 +- + arch/arm/mach-s3c2412/mach-jive.c | 10 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 14 +- + arch/arm/mach-s3c2412/mach-vstms.c | 12 +- + arch/arm/mach-s3c2412/pm.c | 6 +- + arch/arm/mach-s3c2412/s3c2412.c | 12 +- + arch/arm/mach-s3c2440/clock.c | 4 +- + arch/arm/mach-s3c2440/dma.c | 6 +- + arch/arm/mach-s3c2440/dsc.c | 4 +- + arch/arm/mach-s3c2440/irq.c | 6 +- + arch/arm/mach-s3c2440/mach-anubis.c | 8 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 8 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 12 +- + arch/arm/mach-s3c2440/mach-osiris.c | 8 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 10 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 14 +- + arch/arm/mach-s3c2440/s3c2440.c | 6 +- + arch/arm/mach-s3c2442/clock.c | 4 +- + arch/arm/mach-s3c2442/s3c2442.c | 4 +- + arch/arm/mach-s3c2443/clock.c | 6 +- + arch/arm/mach-s3c2443/dma.c | 6 +- + arch/arm/mach-s3c2443/irq.c | 6 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 14 +- + arch/arm/mach-s3c2443/s3c2443.c | 6 +- + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-omap/Kconfig | 33 +- + arch/arm/plat-omap/Makefile | 2 +- + arch/arm/plat-omap/common.c | 40 +- + arch/arm/plat-omap/devices.c | 22 +- + arch/arm/plat-omap/dma.c | 8 +- + arch/arm/plat-omap/dmtimer.c | 2 +- + arch/arm/plat-omap/gpio.c | 70 +- + arch/arm/plat-omap/include/mach/board-2430sdp.h | 6 +- + arch/arm/plat-omap/include/mach/board-apollon.h | 6 + + arch/arm/plat-omap/include/mach/board-h4.h | 5 +- + arch/arm/plat-omap/include/mach/board-ldp.h | 36 + + .../arm/plat-omap/include/mach/board-omap3beagle.h | 33 + + arch/arm/plat-omap/include/mach/board-overo.h | 26 + + arch/arm/plat-omap/include/mach/board.h | 2 + + arch/arm/plat-omap/include/mach/clock.h | 3 + + arch/arm/plat-omap/include/mach/clockdomain.h | 106 ++ + arch/arm/plat-omap/include/mach/common.h | 3 + + arch/arm/plat-omap/include/mach/control.h | 23 +- + arch/arm/plat-omap/include/mach/cpu.h | 5 + + arch/arm/plat-omap/include/mach/debug-macro.S | 12 + + arch/arm/plat-omap/include/mach/entry-macro.S | 12 +- + arch/arm/plat-omap/include/mach/fpga.h | 12 +- + arch/arm/plat-omap/include/mach/gpio.h | 4 +- + arch/arm/plat-omap/include/mach/gpmc.h | 12 + + arch/arm/plat-omap/include/mach/hardware.h | 12 +- + arch/arm/plat-omap/include/mach/io.h | 59 +- + arch/arm/plat-omap/include/mach/irqs.h | 59 + + arch/arm/plat-omap/include/mach/mcbsp.h | 44 +- + arch/arm/plat-omap/include/mach/memory.h | 2 +- + arch/arm/plat-omap/include/mach/mux.h | 180 ++- + arch/arm/plat-omap/include/mach/omap1510.h | 2 + + arch/arm/plat-omap/include/mach/omap16xx.h | 7 +- + arch/arm/plat-omap/include/mach/omap24xx.h | 2 +- + arch/arm/plat-omap/include/mach/omapfb.h | 3 + + arch/arm/plat-omap/include/mach/pm.h | 7 +- + arch/arm/plat-omap/include/mach/powerdomain.h | 166 ++ + arch/arm/plat-omap/include/mach/sdrc.h | 8 +- + arch/arm/plat-omap/include/mach/serial.h | 18 +- + arch/arm/plat-omap/include/mach/sram.h | 10 + + arch/arm/plat-omap/include/mach/system.h | 2 +- + arch/arm/plat-omap/io.c | 107 ++ + arch/arm/plat-omap/mcbsp.c | 431 +++-- + arch/arm/plat-omap/sram.c | 53 +- + arch/arm/plat-s3c/Makefile | 3 + + .../arm/plat-s3c/include/plat}/debug-macro.S | 2 +- + .../arm/plat-s3c/include/plat}/map.h | 0 + .../arm/plat-s3c/include/plat}/regs-adc.h | 0 + .../arm/plat-s3c/include/plat}/regs-serial.h | 0 + .../arm/plat-s3c/include/plat}/regs-timer.h | 0 + .../arm/plat-s3c/include/plat}/uncompress.h | 2 +- + arch/arm/plat-s3c24xx/clock.c | 4 +- + arch/arm/plat-s3c24xx/common-smdk.c | 6 +- + arch/arm/plat-s3c24xx/cpu.c | 20 +- + arch/arm/plat-s3c24xx/devs.c | 6 +- + arch/arm/plat-s3c24xx/dma.c | 2 +- + .../arm/plat-s3c24xx/include/plat}/clock.h | 0 + .../arm/plat-s3c24xx/include/plat}/common-smdk.h | 0 + .../arm/plat-s3c24xx/include/plat}/cpu.h | 0 + .../arm/plat-s3c24xx/include/plat}/devs.h | 0 + .../arm/plat-s3c24xx/include/plat}/dma.h | 0 + .../arm/plat-s3c24xx/include/plat}/irq.h | 0 + .../arm/plat-s3c24xx/include/plat}/pm.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2400.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2410.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2412.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2440.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2442.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2443.h | 0 + arch/arm/plat-s3c24xx/irq.c | 6 +- + arch/arm/plat-s3c24xx/pm-simtec.c | 2 +- + arch/arm/plat-s3c24xx/pm.c | 4 +- + arch/arm/plat-s3c24xx/pwm-clock.c | 6 +- + arch/arm/plat-s3c24xx/pwm.c | 4 +- + arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- + arch/arm/plat-s3c24xx/s3c244x-irq.c | 6 +- + arch/arm/plat-s3c24xx/s3c244x.c | 14 +- + arch/arm/plat-s3c24xx/sleep.S | 2 +- + arch/arm/plat-s3c24xx/time.c | 6 +- + drivers/char/hw_random/omap-rng.c | 33 +- + drivers/i2c/busses/i2c-omap.c | 12 +- + drivers/input/keyboard/omap-keypad.c | 2 +- + drivers/mmc/host/omap.c | 11 +- + drivers/serial/8250.c | 23 +- + drivers/serial/s3c2400.c | 2 +- + drivers/serial/s3c2410.c | 2 +- + drivers/serial/s3c2412.c | 2 +- + drivers/serial/s3c2440.c | 2 +- + drivers/serial/samsung.c | 2 +- + drivers/spi/omap2_mcspi.c | 18 +- + drivers/spi/omap_uwire.c | 23 +- + drivers/usb/host/ohci-omap.c | 14 +- + drivers/video/omap/dispc.c | 21 +- + drivers/video/omap/dispc.h | 2 + + drivers/video/omap/lcd_h4.c | 4 +- + drivers/video/omap/lcdc.c | 2 + + drivers/video/omap/lcdc.h | 2 + + drivers/video/omap/omapfb_main.c | 15 +- + drivers/video/omap/rfbi.c | 9 +- + drivers/video/omap/sossi.c | 8 +- + 190 files changed, 10867 insertions(+), 1126 deletions(-) + create mode 100644 arch/arm/configs/omap3_beagle_defconfig + create mode 100644 arch/arm/configs/omap_ldp_defconfig + create mode 100644 arch/arm/configs/overo_defconfig + create mode 100644 arch/arm/mach-omap2/board-ldp.c + create mode 100644 arch/arm/mach-omap2/board-omap3beagle.c + create mode 100644 arch/arm/mach-omap2/board-overo.c + create mode 100644 arch/arm/mach-omap2/clockdomain.c + create mode 100644 arch/arm/mach-omap2/clockdomains.h + create mode 100644 arch/arm/mach-omap2/powerdomain.c + create mode 100644 arch/arm/mach-omap2/powerdomains.h + create mode 100644 arch/arm/mach-omap2/powerdomains24xx.h + create mode 100644 arch/arm/mach-omap2/powerdomains34xx.h + rename arch/arm/mach-omap2/{sleep.S => sleep24xx.S} (85%) + create mode 100644 arch/arm/mach-omap2/sram34xx.S + create mode 100644 arch/arm/plat-omap/include/mach/board-ldp.h + create mode 100644 arch/arm/plat-omap/include/mach/board-omap3beagle.h + create mode 100644 arch/arm/plat-omap/include/mach/board-overo.h + create mode 100644 arch/arm/plat-omap/include/mach/clockdomain.h + create mode 100644 arch/arm/plat-omap/include/mach/powerdomain.h + create mode 100644 arch/arm/plat-omap/io.c + create mode 100644 arch/arm/plat-s3c/Makefile + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/debug-macro.S (97%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/map.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-adc.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-serial.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-timer.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/uncompress.h (98%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/clock.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/common-smdk.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/cpu.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/devs.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/dma.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/irq.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/pm.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2400.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2410.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2412.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2440.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2442.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2443.h (100%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/Kconfig | 12 +- + arch/avr32/Makefile | 2 + + arch/avr32/boards/atngw100/Kconfig | 35 + + arch/avr32/boards/atngw100/Makefile | 3 +- + arch/avr32/boards/atngw100/evklcd10x.c | 155 +++ + arch/avr32/boards/atngw100/setup.c | 5 + + arch/avr32/boards/favr-32/Kconfig | 22 + + arch/avr32/boards/favr-32/Makefile | 1 + + arch/avr32/boards/favr-32/flash.c | 98 ++ + arch/avr32/boards/favr-32/setup.c | 352 +++++++ + arch/avr32/boards/mimc200/Makefile | 1 + + arch/avr32/boards/mimc200/flash.c | 143 +++ + arch/avr32/boards/mimc200/fram.c | 80 ++ + arch/avr32/boards/mimc200/setup.c | 237 +++++ + arch/avr32/configs/atngw100_evklcd100_defconfig | 1264 +++++++++++++++++++++++ + arch/avr32/configs/atngw100_evklcd101_defconfig | 1264 +++++++++++++++++++++++ + arch/avr32/configs/favr-32_defconfig | 1235 ++++++++++++++++++++++ + arch/avr32/configs/mimc200_defconfig | 1109 ++++++++++++++++++++ + arch/avr32/mach-at32ap/at32ap700x.c | 6 +- + 19 files changed, 6020 insertions(+), 4 deletions(-) + create mode 100644 arch/avr32/boards/atngw100/Kconfig + create mode 100644 arch/avr32/boards/atngw100/evklcd10x.c + create mode 100644 arch/avr32/boards/favr-32/Kconfig + create mode 100644 arch/avr32/boards/favr-32/Makefile + create mode 100644 arch/avr32/boards/favr-32/flash.c + create mode 100644 arch/avr32/boards/favr-32/setup.c + create mode 100644 arch/avr32/boards/mimc200/Makefile + create mode 100644 arch/avr32/boards/mimc200/flash.c + create mode 100644 arch/avr32/boards/mimc200/fram.c + create mode 100644 arch/avr32/boards/mimc200/setup.c + create mode 100644 arch/avr32/configs/atngw100_evklcd100_defconfig + create mode 100644 arch/avr32/configs/atngw100_evklcd101_defconfig + create mode 100644 arch/avr32/configs/favr-32_defconfig + create mode 100644 arch/avr32/configs/mimc200_defconfig +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/Makefile | 2 ++ + arch/cris/arch-v10/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v10/boot/rescue/Makefile | 2 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 2 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/{ => configs}/artpec_3_defconfig | 0 + .../defconfig => configs/etrax-100lx_defconfig} | 0 + .../etrax-100lx_v2_defconfig} | 0 + arch/cris/{ => configs}/etraxfs_defconfig | 0 + 13 files changed, 6 insertions(+), 4 deletions(-) + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/{ => configs}/artpec_3_defconfig (100%) + rename arch/cris/{arch-v10/defconfig => configs/etrax-100lx_defconfig} (100%) + rename arch/cris/{defconfig => configs/etrax-100lx_v2_defconfig} (100%) + rename arch/cris/{ => configs}/etraxfs_defconfig (100%) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + drivers/char/amiserial.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +CONFLICT (rename/delete): Renamed include/asm-parisc/a.out.h->arch/parisc/include/asm/a.out.h in parisc/master and deleted in HEAD +Auto-merged arch/parisc/Kconfig +Auto-merged drivers/char/agp/parisc-agp.c +Auto-merged drivers/rtc/Kconfig +Auto-merged drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/parisc/include/asm/a.out.h +rm 'arch/parisc/include/asm/a.out.h' +$ git commit -v -a +Created commit fc4d7f9: Merge commit 'parisc/master' +$ git diff -M --stat --summary HEAD^.. + arch/parisc/Kconfig | 2 + + .../asm-parisc => arch/parisc/include/asm}/Kbuild | 0 + .../asm-parisc => arch/parisc/include/asm}/agp.h | 0 + .../parisc/include/asm}/asmregs.h | 0 + .../parisc/include/asm}/assembly.h | 0 + .../parisc/include/asm}/atomic.h | 0 + .../parisc/include/asm}/auxvec.h | 0 + .../parisc/include/asm}/bitops.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bug.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bugs.h | 0 + .../parisc/include/asm}/byteorder.h | 0 + .../asm-parisc => arch/parisc/include/asm}/cache.h | 0 + .../parisc/include/asm}/cacheflush.h | 0 + .../parisc/include/asm}/checksum.h | 0 + .../parisc/include/asm}/compat.h | 0 + .../parisc/include/asm}/compat_rt_sigframe.h | 0 + .../parisc/include/asm}/compat_signal.h | 0 + .../parisc/include/asm}/compat_ucontext.h | 0 + .../parisc/include/asm}/cputime.h | 0 + .../parisc/include/asm}/current.h | 0 + .../asm-parisc => arch/parisc/include/asm}/delay.h | 0 + .../parisc/include/asm}/device.h | 0 + .../asm-parisc => arch/parisc/include/asm}/div64.h | 0 + .../parisc/include/asm}/dma-mapping.h | 0 + .../asm-parisc => arch/parisc/include/asm}/dma.h | 0 + .../parisc/include/asm}/eisa_bus.h | 0 + .../parisc/include/asm}/eisa_eeprom.h | 0 + .../asm-parisc => arch/parisc/include/asm}/elf.h | 0 + .../parisc/include/asm}/emergency-restart.h | 0 + .../asm-parisc => arch/parisc/include/asm}/errno.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fb.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fcntl.h | 0 + .../parisc/include/asm}/fixmap.h | 0 + .../parisc/include/asm}/floppy.h | 0 + .../asm-parisc => arch/parisc/include/asm}/futex.h | 0 + .../parisc/include/asm}/grfioctl.h | 0 + .../parisc/include/asm}/hardirq.h | 0 + .../parisc/include/asm}/hardware.h | 0 + .../parisc/include/asm}/hw_irq.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ide.h | 0 + .../asm-parisc => arch/parisc/include/asm}/io.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ioctl.h | 0 + .../parisc/include/asm}/ioctls.h | 0 + .../parisc/include/asm}/ipcbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/irq.h | 0 + .../parisc/include/asm}/irq_regs.h | 0 + .../parisc/include/asm}/kdebug.h | 0 + .../parisc/include/asm}/kmap_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/led.h | 0 + .../parisc/include/asm}/linkage.h | 0 + .../asm-parisc => arch/parisc/include/asm}/local.h | 0 + .../parisc/include/asm}/machdep.h | 0 + .../parisc/include/asm}/mc146818rtc.h | 0 + .../parisc/include/asm}/mckinley.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mman.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mmu.h | 0 + .../parisc/include/asm}/mmu_context.h | 0 + .../parisc/include/asm}/mmzone.h | 0 + .../parisc/include/asm}/module.h | 0 + .../parisc/include/asm}/msgbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mutex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/page.h | 0 + .../asm-parisc => arch/parisc/include/asm}/param.h | 0 + .../parisc/include/asm}/parisc-device.h | 0 + .../parisc/include/asm}/parport.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pci.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pdc.h | 5 + + .../parisc/include/asm}/pdc_chassis.h | 0 + .../parisc/include/asm}/pdcpat.h | 0 + .../parisc/include/asm}/percpu.h | 0 + .../asm-parisc => arch/parisc/include/asm}/perf.h | 0 + .../parisc/include/asm}/pgalloc.h | 0 + .../parisc/include/asm}/pgtable.h | 0 + .../asm-parisc => arch/parisc/include/asm}/poll.h | 0 + .../parisc/include/asm}/posix_types.h | 0 + .../parisc/include/asm}/prefetch.h | 0 + .../parisc/include/asm}/processor.h | 0 + .../asm-parisc => arch/parisc/include/asm}/psw.h | 0 + .../parisc/include/asm}/ptrace.h | 0 + .../asm-parisc => arch/parisc/include/asm}/real.h | 0 + .../parisc/include/asm}/resource.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ropes.h | 2 +- + .../parisc/include/asm}/rt_sigframe.h | 0 + .../asm-parisc => arch/parisc/include/asm}/rtc.h | 0 + .../parisc/include/asm}/runway.h | 0 + .../parisc/include/asm}/scatterlist.h | 0 + .../parisc/include/asm}/sections.h | 0 + .../parisc/include/asm}/segment.h | 0 + .../parisc/include/asm}/sembuf.h | 0 + .../parisc/include/asm}/serial.h | 0 + .../asm-parisc => arch/parisc/include/asm}/setup.h | 0 + .../parisc/include/asm}/shmbuf.h | 0 + .../parisc/include/asm}/shmparam.h | 0 + .../parisc/include/asm}/sigcontext.h | 0 + .../parisc/include/asm}/siginfo.h | 0 + .../parisc/include/asm}/signal.h | 0 + .../asm-parisc => arch/parisc/include/asm}/smp.h | 0 + .../parisc/include/asm}/socket.h | 0 + .../parisc/include/asm}/sockios.h | 0 + .../parisc/include/asm}/spinlock.h | 0 + .../parisc/include/asm}/spinlock_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/stat.h | 0 + .../parisc/include/asm}/statfs.h | 0 + .../parisc/include/asm}/string.h | 0 + .../parisc/include/asm}/superio.h | 0 + .../parisc/include/asm}/system.h | 0 + .../parisc/include/asm}/termbits.h | 0 + .../parisc/include/asm}/termios.h | 0 + .../parisc/include/asm}/thread_info.h | 0 + .../asm-parisc => arch/parisc/include/asm}/timex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/tlb.h | 0 + .../parisc/include/asm}/tlbflush.h | 0 + .../parisc/include/asm}/topology.h | 0 + .../asm-parisc => arch/parisc/include/asm}/traps.h | 0 + .../asm-parisc => arch/parisc/include/asm}/types.h | 0 + .../parisc/include/asm}/uaccess.h | 0 + .../parisc/include/asm}/ucontext.h | 0 + .../parisc/include/asm}/unaligned.h | 0 + .../parisc/include/asm}/unistd.h | 8 ++- + .../parisc/include/asm}/unwind.h | 2 + + .../asm-parisc => arch/parisc/include/asm}/user.h | 0 + .../asm-parisc => arch/parisc/include/asm}/vga.h | 0 + .../asm-parisc => arch/parisc/include/asm}/xor.h | 0 + arch/parisc/kernel/.gitignore | 1 + + arch/parisc/kernel/asm-offsets.c | 3 + + arch/parisc/kernel/firmware.c | 69 ++++++++---- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/real2.S | 12 ++ + arch/parisc/kernel/setup.c | 29 +++++- + arch/parisc/kernel/syscall_table.S | 6 + + arch/parisc/kernel/time.c | 20 ++++- + arch/parisc/kernel/unwind.c | 4 +- + drivers/char/agp/parisc-agp.c | 4 +- + drivers/parisc/ccio-dma.c | 43 +++----- + drivers/rtc/Kconfig | 8 ++ + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-parisc.c | 111 ++++++++++++++++++++ + 137 files changed, 273 insertions(+), 59 deletions(-) + rename {include/asm-parisc => arch/parisc/include/asm}/Kbuild (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/agp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/asmregs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/assembly.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/atomic.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/auxvec.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bitops.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bugs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/byteorder.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cache.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cacheflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/checksum.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cputime.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/current.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/delay.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/div64.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma-mapping.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_bus.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_eeprom.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/elf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/emergency-restart.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/errno.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fcntl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fixmap.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/floppy.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/futex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/grfioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardirq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardware.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hw_irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ide.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/io.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctls.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ipcbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq_regs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kdebug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kmap_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/led.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/linkage.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/local.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/machdep.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mc146818rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mckinley.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mman.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu_context.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmzone.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/module.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/msgbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mutex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/page.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/param.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parisc-device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parport.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pci.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc_chassis.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdcpat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/percpu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/perf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgalloc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgtable.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/poll.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/posix_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/prefetch.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/processor.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/psw.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ptrace.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/real.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/resource.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ropes.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/runway.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/scatterlist.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sections.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/segment.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sembuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/serial.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/setup.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmparam.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sigcontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/siginfo.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/smp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/socket.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sockios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/stat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/statfs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/string.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/superio.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/system.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termbits.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/thread_info.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/timex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlbflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/topology.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/traps.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/uaccess.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unaligned.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unistd.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/unwind.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/user.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/vga.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/xor.h (100%) + create mode 100644 arch/parisc/kernel/.gitignore + create mode 100644 drivers/rtc/rtc-parisc.c +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/mmu.h | 3 ++- + arch/s390/include/asm/mmu_context.h | 19 ++++++++++++++++--- + arch/s390/include/asm/pgtable.h | 8 ++++---- + arch/s390/kernel/smp.c | 24 +++++++++--------------- + arch/s390/mm/pgtable.c | 16 ++++++++-------- + drivers/s390/char/vmcp.c | 3 --- + drivers/s390/cio/qdio_debug.c | 6 +++--- + drivers/s390/cio/qdio_main.c | 1 - + 8 files changed, 42 insertions(+), 38 deletions(-) +Merging sh/master +$ git merge sh/master +Auto-merged Documentation/kernel-parameters.txt +Removed arch/sh/kernel/dump_task.c +Auto-merged arch/sh/kernel/smp.c +Auto-merged drivers/net/sh_eth.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 12 +- + arch/sh/Kconfig | 16 +- + arch/sh/Kconfig.debug | 2 +- + arch/sh/Makefile | 2 + + arch/sh/boards/Kconfig | 7 + + arch/sh/boards/Makefile | 1 + + arch/sh/boards/board-ap325rxa.c | 35 +- + arch/sh/boards/board-edosk7760.c | 193 ++++ + arch/sh/boards/mach-migor/lcd_qvga.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boot/.gitignore | 3 + + arch/sh/boot/Makefile | 6 + + arch/sh/boot/compressed/Makefile_32 | 5 + + arch/sh/boot/compressed/misc_32.c | 2 +- + arch/sh/configs/edosk7760_defconfig | 1050 ++++++++++++++++++++ + arch/sh/configs/rts7751r2dplus_qemu_defconfig | 909 +++++++++++++++++ + arch/sh/include/asm/bitops-llsc.h | 144 +++ + arch/sh/include/asm/bitops.h | 2 + + arch/sh/include/asm/clock.h | 1 + + arch/sh/include/asm/cmpxchg-llsc.h | 71 ++ + arch/sh/include/asm/elf.h | 14 +- + arch/sh/include/asm/fpu.h | 19 + + arch/sh/include/asm/ftrace.h | 8 + + arch/sh/include/asm/hw_irq.h | 92 +-- + arch/sh/include/asm/io.h | 300 +++---- + arch/sh/include/asm/io_generic.h | 7 - + arch/sh/include/asm/irq.h | 3 + + arch/sh/include/asm/kprobes.h | 58 ++ + arch/sh/include/asm/machvec.h | 7 - + arch/sh/include/asm/migor.h | 2 +- + arch/sh/include/asm/mmzone.h | 2 + + arch/sh/include/asm/page.h | 2 + + arch/sh/include/asm/pgtable.h | 1 + + arch/sh/include/asm/processor.h | 44 +- + arch/sh/include/asm/processor_32.h | 22 +- + arch/sh/include/asm/processor_64.h | 45 +- + arch/sh/include/asm/ptrace.h | 11 +- + arch/sh/include/asm/rtc.h | 1 + + arch/sh/include/asm/setup.h | 1 - + arch/sh/include/asm/sizes.h | 61 ++ + arch/sh/include/asm/smp.h | 26 +- + arch/sh/include/asm/syscall.h | 10 + + arch/sh/include/asm/syscall_32.h | 110 ++ + arch/sh/include/asm/syscall_64.h | 6 + + arch/sh/include/asm/syscalls.h | 25 + + arch/sh/include/asm/syscalls_32.h | 56 + + arch/sh/include/asm/syscalls_64.h | 34 + + arch/sh/include/asm/system.h | 8 +- + arch/sh/include/asm/system_32.h | 44 +- + arch/sh/include/asm/thread_info.h | 32 +- + arch/sh/include/asm/uaccess_64.h | 26 +- + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/Makefile_64 | 1 - + arch/sh/kernel/cpu/clock.c | 5 +- + arch/sh/kernel/cpu/irq/Makefile | 2 - + arch/sh/kernel/cpu/irq/ipr.c | 4 +- + arch/sh/kernel/cpu/sh4/fpu.c | 25 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 5 + + arch/sh/kernel/cpu/sh4/softfloat.c | 29 + + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 67 +- + arch/sh/kernel/cpu/sh5/Makefile | 5 + + arch/sh/kernel/cpu/sh5/clock-sh5.c | 79 ++ + arch/sh/kernel/dump_task.c | 32 - + arch/sh/kernel/entry-common.S | 44 + + arch/sh/kernel/io.c | 12 +- + arch/sh/kernel/io_generic.c | 67 +- + arch/sh/kernel/kprobes.c | 584 +++++++++++ + arch/sh/kernel/machvec.c | 4 +- + arch/sh/kernel/process_32.c | 36 +- + arch/sh/kernel/process_64.c | 11 +- + arch/sh/kernel/ptrace_32.c | 298 +++++- + arch/sh/kernel/ptrace_64.c | 1 + + arch/sh/kernel/setup.c | 48 +- + arch/sh/kernel/sh_ksyms_32.c | 4 + + arch/sh/kernel/signal_32.c | 69 +- + arch/sh/kernel/signal_64.c | 26 +- + arch/sh/kernel/smp.c | 43 +- + arch/sh/kernel/stacktrace.c | 23 +- + arch/sh/kernel/sys_sh.c | 9 +- + arch/sh/kernel/sys_sh32.c | 5 +- + arch/sh/kernel/time_32.c | 11 +- + arch/sh/kernel/time_64.c | 168 +--- + arch/sh/kernel/timers/Makefile | 1 + + arch/sh/kernel/timers/timer-broadcast.c | 57 ++ + arch/sh/kernel/timers/timer-cmt.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 177 +++-- + arch/sh/kernel/traps_32.c | 95 +- + arch/sh/lib/div64-generic.c | 1 + + arch/sh/lib/io.c | 8 +- + arch/sh/mm/Kconfig | 6 +- + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/consistent.c | 2 +- + arch/sh/mm/fault_32.c | 63 +- + arch/sh/mm/init.c | 74 ++- + arch/sh/mm/pg-nommu.c | 1 + + arch/sh/mm/tlb-nommu.c | 1 + + arch/sh/tools/mach-types | 1 + + drivers/net/sh_eth.c | 5 +- + drivers/rtc/rtc-sh.c | 21 +- + drivers/serial/sh-sci.c | 90 +- + drivers/serial/sh-sci.h | 14 +- + drivers/sh/Makefile | 2 +- + {arch/sh/kernel/cpu/irq => drivers/sh}/intc.c | 35 +- + drivers/video/sh_mobile_lcdcfb.c | 8 +- + include/linux/sh_intc.h | 91 ++ + .../include/asm => include/video}/sh_mobile_lcdc.h | 0 + 106 files changed, 4959 insertions(+), 1059 deletions(-) + create mode 100644 arch/sh/boards/board-edosk7760.c + create mode 100644 arch/sh/configs/edosk7760_defconfig + create mode 100644 arch/sh/configs/rts7751r2dplus_qemu_defconfig + create mode 100644 arch/sh/include/asm/bitops-llsc.h + create mode 100644 arch/sh/include/asm/cmpxchg-llsc.h + create mode 100644 arch/sh/include/asm/ftrace.h + create mode 100644 arch/sh/include/asm/kprobes.h + create mode 100644 arch/sh/include/asm/sizes.h + create mode 100644 arch/sh/include/asm/syscall.h + create mode 100644 arch/sh/include/asm/syscall_32.h + create mode 100644 arch/sh/include/asm/syscall_64.h + create mode 100644 arch/sh/include/asm/syscalls.h + create mode 100644 arch/sh/include/asm/syscalls_32.h + create mode 100644 arch/sh/include/asm/syscalls_64.h + create mode 100644 arch/sh/kernel/cpu/sh5/clock-sh5.c + delete mode 100644 arch/sh/kernel/dump_task.c + create mode 100644 arch/sh/kernel/kprobes.c + create mode 100644 arch/sh/kernel/timers/timer-broadcast.c + rename {arch/sh/kernel/cpu/irq => drivers/sh}/intc.c (96%) + create mode 100644 include/linux/sh_intc.h + rename {arch/sh/include/asm => include/video}/sh_mobile_lcdc.h (100%) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/kernel-parameters.txt | 11 +++ + arch/x86/Kconfig | 24 +++++ + arch/x86/mm/fault.c | 45 ++++------ + arch/x86/pci/common.c | 17 ++++ + drivers/acpi/pci_irq.c | 56 ++++++++++++ + drivers/pci/quirks.c | 170 ++++++++++++++++++++++++++++++----- + include/asm-x86/io_apic.h | 10 ++ + include/asm-x86/pci.h | 2 + + include/linux/pci.h | 6 ++ + include/linux/pci_ids.h | 5 + + 10 files changed, 297 insertions(+), 49 deletions(-) +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/kernel/irq.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + include/asm-xtensa/rwsem.h | 4 ++++ + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/char/tty_io.c +Auto-merged include/linux/pci.h +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 + + Documentation/kobject.txt | 4 + + arch/mips/kernel/rtlx.c | 4 +- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/dumpstack_32.c | 2 + + arch/x86/kernel/dumpstack_64.c | 2 + + arch/x86/kernel/msr.c | 4 +- + block/bsg.c | 3 +- + drivers/acpi/scan.c | 2 +- + drivers/base/bus.c | 54 +++- + drivers/base/core.c | 30 ++- + drivers/base/dd.c | 3 + + drivers/base/platform.c | 162 +++++++---- + drivers/base/power/main.c | 21 +- + drivers/block/aoe/aoechr.c | 6 +- + drivers/block/paride/pg.c | 5 +- + drivers/block/paride/pt.c | 10 +- + drivers/block/pktcdvd.c | 5 +- + drivers/block/xen-blkfront.c | 14 +- + drivers/char/bsr.c | 5 +- + drivers/char/dsp56k.c | 4 +- + drivers/char/ip2/ip2main.c | 12 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/istallion.c | 5 +- + drivers/char/lp.c | 4 +- + drivers/char/mem.c | 6 +- + drivers/char/misc.c | 4 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 3 +- + drivers/char/ppdev.c | 5 +- + drivers/char/raw.c | 7 +- + drivers/char/snsc.c | 4 +- + drivers/char/stallion.c | 4 +- + drivers/char/tty_io.c | 2 +- + drivers/char/vc_screen.c | 12 +- + drivers/char/viotape.c | 8 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +- + drivers/dca/dca-sysfs.c | 8 +- + drivers/eisa/pci_eisa.c | 2 +- + drivers/eisa/virtual_root.c | 2 +- + drivers/firmware/iscsi_ibft.c | 18 +- + drivers/hid/hidraw.c | 5 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/i2c/i2c-dev.c | 6 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide-tape.c | 11 +- + drivers/ide/legacy/ide_platform.c | 2 +- + drivers/ieee1394/dv1394.c | 8 +- + drivers/ieee1394/raw1394.c | 8 +- + drivers/ieee1394/video1394.c | 5 +- + drivers/infiniband/core/cm.c | 6 +- + drivers/infiniband/core/user_mad.c | 12 +- + drivers/infiniband/core/uverbs_main.c | 9 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/input/xen-kbdfront.c | 8 +- + drivers/isdn/capi/capi.c | 3 +- + drivers/leds/led-class.c | 4 +- + drivers/macintosh/adb.c | 3 +- + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 22 +- + drivers/mfd/htc-pasic3.c | 8 +- + drivers/misc/phantom.c | 6 +- + drivers/mtd/mtdchar.c | 10 +- + drivers/net/3c509.c | 42 ++- + drivers/net/depca.c | 17 +- + drivers/net/hp100.c | 4 +- + drivers/net/ne3210.c | 4 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/net/ppp_generic.c | 4 +- + drivers/net/tulip/de4x5.c | 7 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wireless/atmel_cs.c | 2 +- + drivers/net/wireless/ipw2100.c | 8 +- + drivers/net/wireless/ipw2200.c | 46 ++-- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 22 +- + drivers/net/wireless/mac80211_hwsim.c | 6 +- + drivers/net/xen-netfront.c | 10 +- + drivers/pci/pci-driver.c | 46 ++-- + drivers/pci/probe.c | 50 +--- + drivers/pcmcia/ds.c | 8 +- + drivers/pnp/base.h | 2 +- + drivers/pnp/core.c | 10 +- + drivers/pnp/driver.c | 1 + + drivers/pnp/interface.c | 37 +-- + drivers/power/power_supply_core.c | 4 +- + drivers/s390/block/dasd_devmap.c | 6 +- + drivers/s390/char/con3215.c | 16 +- + drivers/s390/char/raw3270.c | 30 +- + drivers/s390/char/tape_34xx.c | 4 +- + drivers/s390/char/tape_class.c | 6 +- + drivers/s390/char/tape_core.c | 20 +- + drivers/s390/char/vmlogrdr.c | 20 +- + drivers/s390/char/vmur.c | 15 +- + drivers/s390/net/claw.c | 40 ++-- + drivers/s390/net/lcs.c | 23 +- + drivers/s390/net/netiucv.c | 47 ++-- + drivers/scsi/aha1740.c | 3 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- + drivers/scsi/libsrp.c | 2 +- + drivers/scsi/osst.c | 3 +- + drivers/scsi/sg.c | 10 +- + drivers/scsi/st.c | 11 +- + drivers/spi/spidev.c | 7 +- + drivers/thermal/thermal_sys.c | 4 +- + drivers/uio/Kconfig | 13 + + drivers/uio/Makefile | 1 + + drivers/uio/uio.c | 26 ++- + drivers/uio/uio_pdrv.c | 2 +- + drivers/uio/uio_sercos3.c | 243 +++++++++++++++ + drivers/usb/core/devio.c | 6 +- + drivers/usb/core/file.c | 6 +- + drivers/usb/core/hcd.c | 5 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/Makefile | 23 +- + drivers/usb/gadget/cdc2.c | 25 ++- + drivers/usb/gadget/ether.c | 28 ++- + drivers/usb/gadget/f_ecm.c | 108 ++++---- + drivers/usb/gadget/f_loopback.c | 34 ++- + drivers/usb/gadget/f_subset.c | 44 ++-- + drivers/usb/gadget/file_storage.c | 12 + + drivers/usb/gadget/gmidi.c | 15 + + drivers/usb/gadget/printer.c | 18 +- + drivers/usb/gadget/rndis.c | 115 ++++---- + drivers/usb/gadget/serial.c | 18 ++ + drivers/usb/gadget/u_ether.c | 4 +- + drivers/usb/gadget/zero.c | 17 + + drivers/usb/host/uhci-q.c | 24 +- + drivers/usb/misc/phidgetkit.c | 5 +- + drivers/usb/misc/phidgetmotorcontrol.c | 5 +- + drivers/usb/misc/phidgetservo.c | 5 +- + drivers/usb/mon/mon_bin.c | 6 +- + drivers/video/console/fbcon.c | 4 +- + drivers/video/display/display-sysfs.c | 9 +- + drivers/video/fbmem.c | 5 +- + drivers/video/xen-fbfront.c | 8 +- + fs/coda/psdev.c | 5 +- + fs/sysfs/bin.c | 42 ++- + fs/sysfs/dir.c | 24 +- + fs/sysfs/file.c | 46 ++- + fs/sysfs/mount.c | 15 + + fs/sysfs/sysfs.h | 6 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/linux/device.h | 26 ++- + include/linux/dynamic_printk.h | 93 ++++++ + include/linux/eisa.h | 4 +- + include/linux/init.h | 1 + + include/linux/kernel.h | 7 +- + include/linux/module.h | 1 - + include/linux/pci.h | 1 - + include/linux/platform_device.h | 3 +- + include/linux/pm.h | 76 ++--- + include/linux/sysfs.h | 36 ++- + init/main.c | 9 + + kernel/module.c | 31 ++ + lib/Kconfig.debug | 55 ++++ + lib/Makefile | 2 + + lib/dynamic_printk.c | 418 ++++++++++++++++++++++++++ + lib/kobject.c | 85 +++++- + net/netfilter/nf_conntrack_pptp.c | 2 +- + scripts/Makefile.lib | 11 +- + scripts/basic/Makefile | 2 +- + scripts/basic/hash.c | 64 ++++ + sound/core/init.c | 6 +- + sound/core/sound.c | 5 +- + sound/oss/soundcard.c | 15 +- + sound/sound_core.c | 5 +- + 169 files changed, 2200 insertions(+), 976 deletions(-) + create mode 100644 drivers/uio/uio_sercos3.c + create mode 100644 include/linux/dynamic_printk.h + create mode 100644 lib/dynamic_printk.c + create mode 100644 scripts/basic/hash.c +Merging quilt/usb +$ git merge quilt/usb +Auto-merged Documentation/kernel-parameters.txt +Removed drivers/usb/host/ehci-ppc-soc.c +Auto-merged drivers/usb/host/ohci-omap.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-usb | 16 + + Documentation/DocBook/gadget.tmpl | 3 + + Documentation/ioctl-number.txt | 1 + + Documentation/kernel-parameters.txt | 19 + + Documentation/usb/anchors.txt | 17 + + Documentation/usb/power-management.txt | 8 +- + drivers/block/ub.c | 3 - + drivers/hid/usbhid/hid-core.c | 4 +- + drivers/input/joystick/iforce/iforce-ff.c | 36 +- + drivers/input/joystick/iforce/iforce-main.c | 14 +- + drivers/input/joystick/iforce/iforce-packets.c | 8 +- + drivers/input/joystick/iforce/iforce-usb.c | 2 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/misc/ati_remote.c | 20 +- + drivers/input/misc/yealink.c | 3 +- + drivers/input/tablet/acecad.c | 3 +- + drivers/input/tablet/aiptek.c | 26 +- + drivers/input/tablet/gtco.c | 4 +- + drivers/input/tablet/kbtab.c | 3 +- + drivers/input/tablet/wacom_sys.c | 3 +- + drivers/media/radio/dsbr100.c | 13 +- + drivers/media/video/dabusb.c | 4 +- + drivers/media/video/ov511.c | 19 +- + drivers/media/video/usbvideo/konicawc.c | 8 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 14 +- + drivers/mtd/nand/alauda.c | 4 +- + drivers/net/irda/kingsun-sir.c | 3 +- + drivers/net/irda/ks959-sir.c | 3 +- + drivers/net/irda/ksdazzle-sir.c | 3 +- + drivers/net/irda/stir4200.c | 18 +- + drivers/net/usb/catc.c | 8 +- + drivers/net/usb/hso.c | 24 +- + drivers/net/usb/kaweth.c | 27 +- + drivers/net/usb/rtl8150.c | 31 +- + drivers/usb/Kconfig | 1 + + drivers/usb/atm/usbatm.c | 10 +- + drivers/usb/atm/usbatm.h | 10 +- + drivers/usb/atm/xusbatm.c | 2 +- + drivers/usb/class/cdc-acm.c | 26 +- + drivers/usb/class/cdc-wdm.c | 48 +- + drivers/usb/class/usblp.c | 25 +- + drivers/usb/core/Kconfig | 2 +- + drivers/usb/core/devio.c | 12 +- + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/endpoint.c | 3 +- + drivers/usb/core/file.c | 5 +- + drivers/usb/core/hcd.c | 4 + + drivers/usb/core/hcd.h | 6 + + drivers/usb/core/hub.c | 102 +- + drivers/usb/core/inode.c | 18 +- + drivers/usb/core/message.c | 3 +- + drivers/usb/core/sysfs.c | 24 + + drivers/usb/core/urb.c | 169 ++- + drivers/usb/gadget/Kconfig | 315 ++- + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/cdc2.c | 1 - + drivers/usb/gadget/composite.c | 68 +- + drivers/usb/gadget/dummy_hcd.c | 33 +- + drivers/usb/gadget/ether.c | 2 - + drivers/usb/gadget/f_loopback.c | 1 - + drivers/usb/gadget/f_obex.c | 493 ++++ + drivers/usb/gadget/f_sourcesink.c | 1 - + drivers/usb/gadget/file_storage.c | 23 +- + drivers/usb/gadget/fsl_qe_udc.c | 2760 +++++++++++++++++++++ + drivers/usb/gadget/fsl_qe_udc.h | 437 ++++ + drivers/usb/gadget/fsl_usb2_udc.c | 176 +- + drivers/usb/gadget/fsl_usb2_udc.h | 21 +- + drivers/usb/gadget/gadget_chips.h | 9 + + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/net2280.c | 40 +- + drivers/usb/gadget/net2280.h | 1 + + drivers/usb/gadget/omap_udc.c | 7 + + drivers/usb/gadget/printer.c | 6 +- + drivers/usb/gadget/pxa27x_udc.c | 1 - + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/usb/gadget/serial.c | 15 +- + drivers/usb/gadget/u_ether.c | 7 + + drivers/usb/gadget/u_serial.h | 1 + + drivers/usb/host/ehci-dbg.c | 56 +- + drivers/usb/host/ehci-hcd.c | 47 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-ppc-soc.c | 201 -- + drivers/usb/host/ehci.h | 23 +- + drivers/usb/host/isp116x-hcd.c | 13 +- + drivers/usb/host/isp1760-if.c | 7 +- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-hcd.c | 31 +- + drivers/usb/host/ohci-hub.c | 87 +- + drivers/usb/host/ohci-omap.c | 4 +- + drivers/usb/host/ohci-pnx4008.c | 2 +- + drivers/usb/host/ohci-tmio.c | 376 +++ + drivers/usb/host/ohci.h | 8 - + drivers/usb/host/r8a66597-hcd.c | 101 +- + drivers/usb/host/sl811-hcd.c | 15 +- + drivers/usb/host/uhci-hcd.c | 10 +- + drivers/usb/host/uhci-q.c | 17 +- + drivers/usb/image/mdc800.c | 61 +- + drivers/usb/misc/Kconfig | 23 + + drivers/usb/misc/Makefile | 2 + + drivers/usb/misc/adutux.c | 22 +- + drivers/usb/misc/appledisplay.c | 26 +- + drivers/usb/misc/cypress_cy7c63.c | 6 +- + drivers/usb/misc/cytherm.c | 9 +- + drivers/usb/misc/emi26.c | 17 +- + drivers/usb/misc/emi62.c | 4 +- + drivers/usb/misc/ftdi-elan.c | 10 +- + drivers/usb/misc/gotemp.c | 301 +++ + drivers/usb/misc/idmouse.c | 5 +- + drivers/usb/misc/legousbtower.c | 23 +- + drivers/usb/misc/rio500.c | 11 +- + drivers/usb/misc/trancevibrator.c | 3 +- + drivers/usb/misc/usblcd.c | 13 +- + drivers/usb/misc/uss720.c | 19 +- + drivers/usb/misc/vstusb.c | 782 ++++++ + drivers/usb/mon/mon_main.c | 2 +- + drivers/usb/musb/Kconfig | 4 - + drivers/usb/musb/cppi_dma.h | 4 +- + drivers/usb/musb/davinci.c | 20 +- + drivers/usb/musb/musb_core.c | 41 +- + drivers/usb/musb/musb_gadget_ep0.c | 24 +- + drivers/usb/musb/musb_host.c | 19 +- + drivers/usb/musb/musb_io.h | 4 +- + drivers/usb/musb/musbhsdma.c | 306 ++-- + drivers/usb/serial/aircable.c | 8 +- + drivers/usb/serial/belkin_sa.c | 39 +- + drivers/usb/serial/cp2101.c | 3 +- + drivers/usb/serial/cyberjack.c | 28 +- + drivers/usb/serial/cypress_m8.c | 21 +- + drivers/usb/serial/digi_acceleport.c | 68 +- + drivers/usb/serial/empeg.c | 11 +- + drivers/usb/serial/ezusb.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 81 +- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/hp4x.c | 3 +- + drivers/usb/serial/io_edgeport.c | 19 +- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 30 +- + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 3 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan_pda.c | 17 +- + drivers/usb/serial/kl5kusb105.c | 69 +- + drivers/usb/serial/kobil_sct.c | 4 +- + drivers/usb/serial/mct_u232.c | 42 +- + drivers/usb/serial/mos7720.c | 22 +- + drivers/usb/serial/mos7840.c | 29 +- + drivers/usb/serial/omninet.c | 22 +- + drivers/usb/serial/option.c | 14 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/safe_serial.c | 28 +- + drivers/usb/serial/sierra.c | 72 +- + drivers/usb/serial/spcp8x5.c | 10 +- + drivers/usb/serial/ti_usb_3410_5052.c | 4 +- + drivers/usb/serial/usb-serial.c | 26 +- + drivers/usb/serial/visor.c | 17 +- + drivers/usb/serial/whiteheat.c | 121 +- + drivers/usb/storage/onetouch.c | 9 +- + drivers/usb/storage/transport.c | 2 +- + include/linux/usb.h | 11 +- + include/linux/usb/Kbuild | 1 + + include/linux/usb/cdc.h | 9 + + include/linux/usb/composite.h | 11 +- + include/linux/usb/serial.h | 2 +- + include/linux/usb/vstusb.h | 71 + + 165 files changed, 7479 insertions(+), 1526 deletions(-) + create mode 100644 drivers/usb/gadget/f_obex.c + create mode 100644 drivers/usb/gadget/fsl_qe_udc.c + create mode 100644 drivers/usb/gadget/fsl_qe_udc.h + delete mode 100644 drivers/usb/host/ehci-ppc-soc.c + create mode 100644 drivers/usb/host/ohci-tmio.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/misc/vstusb.c + create mode 100644 include/linux/usb/vstusb.h +$ git revert 4fa35b11a2af4c941f87657d34bbfb895cc4db09 +Removed drivers/usb/host/ohci-tmio.c +Finished one revert. +Created commit 12e0536: Revert "USB: ohci: add support for tmio-ohci cell" + 3 files changed, 0 insertions(+), 398 deletions(-) + delete mode 100644 drivers/usb/host/ohci-tmio.c +$ git revert 2ed5f27e20ee40d904e34e30745f8386f3611c88 +Finished one revert. +Created commit e5065ec: Revert "USB: remove info() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +$ git revert b9313f21c7d595f8d163bee07c6d2b2c6943a93a +Finished one revert. +Created commit 7ba38cf: Revert "USB: remove warn() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged arch/powerpc/Kconfig +Auto-merged arch/powerpc/include/asm/types.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/types.h +Auto-merged arch/powerpc/platforms/Kconfig.cputype +CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig.cputype +Auto-merged arch/powerpc/sysdev/ppc4xx_pci.c +Auto-merged arch/x86/Kconfig +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/kernel.h +Auto-merged kernel/module.c +Auto-merged lib/Kconfig.debug +Resolved 'arch/powerpc/include/asm/types.h' using previous resolution. +Resolved 'arch/powerpc/platforms/Kconfig.cputype' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ec76430: Merge commit 'tip-core/auto-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/lockstat.txt | 1 + + arch/m32r/mm/discontig.c | 4 +- + arch/powerpc/Kconfig | 3 + + arch/powerpc/include/asm/types.h | 7 - + arch/powerpc/platforms/Kconfig.cputype | 1 - + arch/powerpc/sysdev/ppc4xx_pci.c | 16 +- + arch/x86/Kconfig | 4 +- + arch/x86/kernel/e820.c | 4 +- + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/lib/usercopy_64.c | 4 +- + arch/x86/mm/ioremap.c | 6 + + drivers/firmware/dmi_scan.c | 22 ++- + drivers/pci/hotplug/ibmphp_ebda.c | 2 +- + drivers/pci/setup-bus.c | 9 +- + include/asm-generic/percpu.h | 11 +- + include/asm-generic/sections.h | 10 + + include/asm-generic/vmlinux.lds.h | 16 ++ + include/asm-um/system-generic.h | 32 ++-- + include/asm-x86/page_32.h | 2 - + include/asm-x86/page_64.h | 1 - + include/asm-x86/percpu.h | 83 +++++++++- + include/asm-x86/uaccess.h | 2 + + include/asm-x86/uaccess_32.h | 8 +- + include/asm-x86/uaccess_64.h | 6 + + include/asm-x86/xen/page.h | 4 +- + include/linux/debug_locks.h | 2 +- + include/linux/futex.h | 2 + + include/linux/interrupt.h | 2 + + include/linux/ioport.h | 1 + + include/linux/kernel.h | 14 ++ + include/linux/lockdep.h | 18 ++ + include/linux/percpu.h | 17 ++- + include/linux/pfn.h | 6 +- + include/linux/types.h | 8 +- + include/linux/uaccess.h | 2 +- + kernel/extable.c | 16 ++ + kernel/futex.c | 290 +++++++++++--------------------- + kernel/lockdep.c | 4 +- + kernel/lockdep_proc.c | 7 +- + kernel/module.c | 7 +- + kernel/notifier.c | 8 + + kernel/printk.c | 22 ++- + kernel/resource.c | 51 +++++- + kernel/sched.c | 2 +- + kernel/softirq.c | 13 ++- + kernel/softlockup.c | 2 +- + kernel/time/tick-sched.c | 2 +- + kernel/timer.c | 1 + + lib/Kconfig.debug | 10 + + mm/Kconfig | 3 + + mm/filemap.c | 15 +- + mm/memory.c | 15 ++ + 52 files changed, 504 insertions(+), 302 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/smp.c +Auto-merged arch/x86/xen/smp.c +Auto-merged include/asm-x86/smp.h +CONFLICT (content): Merge conflict in include/asm-x86/smp.h +Resolved 'include/asm-x86/smp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 83ae5d0: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 17 +++++++++++------ + arch/x86/kernel/smp.c | 6 +++--- + arch/x86/xen/smp.c | 6 +++--- + include/asm-x86/smp.h | 6 +++--- + kernel/smp.c | 12 +++++------- + 5 files changed, 25 insertions(+), 22 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged arch/x86/Kconfig +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/init.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/module.h +Auto-merged init/Kconfig +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/notifier.c +Auto-merged kernel/sched.c +Auto-merged scripts/bootgraph.pl +CONFLICT (add/add): Merge conflict in scripts/bootgraph.pl +Resolved 'init/main.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Resolved 'scripts/bootgraph.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 85cba81: Merge commit 'ftrace/auto-ftrace-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/markers.txt | 10 +- + Documentation/tracepoints.txt | 101 ++ + Documentation/tracers/mmiotrace.txt | 5 +- + arch/powerpc/platforms/cell/spufs/sputrace.c | 1 + + arch/x86/Kconfig | 1 + + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 +- + arch/x86/kernel/entry_32.S | 14 - + arch/x86/kernel/entry_64.S | 26 - + arch/x86/kernel/ftrace.c | 124 +- + arch/x86/mm/mmio-mod.c | 87 +- + arch/x86/mm/pf_in.c | 121 +- + arch/x86/mm/testmmiotrace.c | 4 + + include/asm-generic/vmlinux.lds.h | 14 +- + include/asm-x86/ftrace.h | 10 + + include/linux/compiler.h | 2 + + include/linux/ftrace.h | 84 +- + include/linux/init.h | 2 +- + include/linux/kernel.h | 5 + + include/linux/kprobes.h | 5 +- + include/linux/linkage.h | 2 - + include/linux/marker.h | 7 + + include/linux/mmiotrace.h | 20 +- + include/linux/module.h | 17 + + include/linux/ring_buffer.h | 127 ++ + include/linux/tracepoint.h | 137 ++ + include/trace/sched.h | 56 + + init/Kconfig | 7 + + init/main.c | 34 +- + kernel/Makefile | 1 + + kernel/exit.c | 10 +- + kernel/fork.c | 3 + + kernel/kthread.c | 5 + + kernel/marker.c | 36 +- + kernel/module.c | 81 +- + kernel/notifier.c | 2 +- + kernel/sched.c | 17 +- + kernel/signal.c | 3 + + kernel/trace/Kconfig | 64 +- + kernel/trace/Makefile | 4 + + kernel/trace/ftrace.c | 275 +++- + kernel/trace/ring_buffer.c | 2014 ++++++++++++++++++++++++ + kernel/trace/trace.c | 1845 +++++++++++----------- + kernel/trace/trace.h | 211 ++- + kernel/trace/trace_boot.c | 126 ++ + kernel/trace/trace_functions.c | 2 +- + kernel/trace/trace_irqsoff.c | 19 +- + kernel/trace/trace_mmiotrace.c | 116 ++- + kernel/trace/trace_nop.c | 64 + + kernel/trace/trace_sched_switch.c | 137 +-- + kernel/trace/trace_sched_wakeup.c | 148 +-- + kernel/trace/trace_selftest.c | 83 +- + kernel/trace/trace_stack.c | 310 ++++ + kernel/trace/trace_sysprof.c | 2 +- + kernel/tracepoint.c | 477 ++++++ + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/markers/probe-example.c | 1 + + samples/tracepoints/Makefile | 6 + + samples/tracepoints/tp-samples-trace.h | 13 + + samples/tracepoints/tracepoint-probe-sample.c | 55 + + samples/tracepoints/tracepoint-probe-sample2.c | 42 + + samples/tracepoints/tracepoint-sample.c | 53 + + scripts/Makefile.build | 7 + + scripts/bootgraph.pl | 24 +- + scripts/recordmcount.pl | 395 +++++ + 65 files changed, 6108 insertions(+), 1585 deletions(-) + create mode 100644 Documentation/tracepoints.txt + create mode 100644 include/linux/ring_buffer.h + create mode 100644 include/linux/tracepoint.h + create mode 100644 include/trace/sched.h + create mode 100644 kernel/trace/ring_buffer.c + create mode 100644 kernel/trace/trace_boot.c + create mode 100644 kernel/trace/trace_nop.c + create mode 100644 kernel/trace/trace_stack.c + create mode 100644 kernel/tracepoint.c + create mode 100644 samples/tracepoints/Makefile + create mode 100644 samples/tracepoints/tp-samples-trace.h + create mode 100644 samples/tracepoints/tracepoint-probe-sample.c + create mode 100644 samples/tracepoints/tracepoint-probe-sample2.c + create mode 100644 samples/tracepoints/tracepoint-sample.c + create mode 100755 scripts/recordmcount.pl +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged include/linux/irq.h +Auto-merged kernel/irq/manage.c +Merge made by recursive. + include/linux/irq.h | 4 - + kernel/irq/chip.c | 17 +++--- + kernel/irq/handle.c | 2 - + kernel/irq/internals.h | 3 + + kernel/irq/manage.c | 43 ++++++++++----- + kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ + 6 files changed, 132 insertions(+), 83 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already uptodate! +Merge made by recursive. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/mm/fault.c +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/sched.c +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9087afd: Merge commit 'stackprotector/auto-stackprotector-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/pda.h | 4 ++-- + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/asm-x86/system.h | 6 +++++- + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/sched.h +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +Auto-merged kernel/time/tick-sched.c +Auto-merged kernel/timer.c +Merge made by recursive. + arch/alpha/kernel/osf_sys.c | 13 +- + arch/ia64/kvm/kvm-ia64.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- + arch/x86/kvm/i8254.c | 6 +- + arch/x86/kvm/lapic.c | 6 +- + drivers/clocksource/acpi_pm.c | 7 +- + drivers/cpuidle/cpuidle.c | 7 + + drivers/s390/crypto/ap_bus.c | 6 +- + fs/binfmt_elf.c | 19 +- + fs/compat.c | 187 ++++------- + fs/proc/array.c | 8 +- + fs/select.c | 396 +++++++++++++---------- + fs/timerfd.c | 8 +- + include/linux/clocksource.h | 14 +- + include/linux/hrtimer.h | 104 ++++++- + include/linux/init_task.h | 1 + + include/linux/kernel_stat.h | 1 + + include/linux/poll.h | 8 +- + include/linux/posix-timers.h | 4 +- + include/linux/prctl.h | 7 + + include/linux/sched.h | 90 +++++- + include/linux/thread_info.h | 8 + + include/linux/time.h | 9 + + include/linux/timex.h | 11 +- + kernel/compat.c | 53 +--- + kernel/exit.c | 19 +- + kernel/fork.c | 94 +++--- + kernel/futex.c | 11 +- + kernel/hrtimer.c | 227 +++++++++++-- + kernel/itimer.c | 33 +-- + kernel/posix-cpu-timers.c | 512 +++++++++++++++-------------- + kernel/posix-timers.c | 163 ++++------ + kernel/rtmutex.c | 3 +- + kernel/sched.c | 26 +- + kernel/sched_fair.c | 1 + + kernel/sched_rt.c | 4 +- + kernel/sched_stats.h | 86 +++++ + kernel/signal.c | 8 +- + kernel/sys.c | 85 ++--- + kernel/time.c | 18 + + kernel/time/clocksource.c | 3 + + kernel/time/jiffies.c | 1 + + kernel/time/ntp.c | 96 +++--- + kernel/time/tick-sched.c | 21 +- + kernel/time/timekeeping.c | 122 +++++--- + kernel/time/timer_list.c | 8 +- + kernel/timer.c | 11 +- + net/sched/sch_cbq.c | 7 +- + security/selinux/hooks.c | 9 +- + sound/drivers/pcsp/pcsp_lib.c | 5 +- + 50 files changed, 1506 insertions(+), 1044 deletions(-) +$ git am -3 ../patches/0001-DECLARE_PER_CPU-needs-linux-percpu.h.patch +Applying DECLARE_PER_CPU needs linux/percpu.h +$ git reset HEAD^ +include/linux/hrtimer.h: needs update +$ git add . +$ git commit -v -a --amend +Created commit 82af37c: Merge commit 'timers/auto-timers-next' +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/powerpc/include/asm/pci.h +Auto-merged arch/powerpc/kernel/pci-common.c +Auto-merged arch/x86/pci/irq.c +Auto-merged drivers/i2c/busses/i2c-viapro.c +Auto-merged drivers/pci/hotplug/ibmphp_ebda.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/pcie/aspm.c +CONFLICT (content): Merge conflict in drivers/pci/pcie/aspm.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/pci/quirks.c +Auto-merged drivers/pci/setup-bus.c +Auto-merged drivers/scsi/ipr.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/pci_ids.h +Auto-merged init/Kconfig +Recorded preimage for 'drivers/pci/pcie/aspm.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pci/pcie/aspm.c'. +Created commit 3d6984a: Merge commit 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/MSI-HOWTO.txt | 6 +- + Documentation/PCI/pci.txt | 4 + + Documentation/kernel-parameters.txt | 25 ++-- + arch/powerpc/include/asm/pci-bridge.h | 7 + + arch/powerpc/include/asm/pci.h | 11 ++ + arch/powerpc/kernel/pci-common.c | 136 +++++++++++++++++++++- + arch/x86/pci/irq.c | 19 ++- + drivers/i2c/busses/i2c-amd756.c | 5 - + drivers/i2c/busses/i2c-viapro.c | 5 - + drivers/pci/bus.c | 7 + + drivers/pci/hotplug/ibmphp_ebda.c | 92 ++++----------- + drivers/pci/hotplug/pci_hotplug_core.c | 14 +- + drivers/pci/hotplug/pciehp.h | 16 +++- + drivers/pci/hotplug/pciehp_core.c | 78 ++++++++----- + drivers/pci/hotplug/pciehp_ctrl.c | 136 ++++++++++++---------- + drivers/pci/hotplug/pciehp_hpc.c | 202 ++++++++++++++++++-------------- + drivers/pci/hotplug/pciehp_pci.c | 26 +++-- + drivers/pci/hotplug/rpaphp.h | 4 +- + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/hotplug/rpaphp_pci.c | 2 +- + drivers/pci/msi.c | 10 +- + drivers/pci/pci-driver.c | 21 +++- + drivers/pci/pci-sysfs.c | 148 ++++++++++++++---------- + drivers/pci/pci.c | 95 ++++++++++++--- + drivers/pci/pci.h | 20 +++ + drivers/pci/pcie/aspm.c | 6 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/probe.c | 63 +++++++---- + drivers/pci/quirks.c | 176 ++++++++++++++-------------- + drivers/pci/remove.c | 11 +- + drivers/pci/setup-bus.c | 4 +- + drivers/pci/setup-res.c | 9 +- + drivers/pci/slot.c | 10 ++ + drivers/scsi/ipr.c | 1 - + drivers/scsi/qla2xxx/qla_def.h | 2 +- + include/linux/pci.h | 11 +- + include/linux/pci_ids.h | 6 +- + include/linux/pci_regs.h | 14 +++ + init/Kconfig | 8 ++ + 39 files changed, 888 insertions(+), 528 deletions(-) +$ git revert 913d3708831ec551ca8560ea2cc793f738df88d6 +Auto-merged arch/powerpc/include/asm/pci.h +Auto-merged arch/powerpc/kernel/pci-common.c +Finished one revert. +Created commit ac06c0d: Revert "powerpc/PCI: Add legacy PCI access via sysfs" + 3 files changed, 1 insertions(+), 153 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-crypt.c | 9 ++++++--- + drivers/md/dm-delay.c | 3 ++- + drivers/md/dm-exception-store.c | 1 - + drivers/md/dm-io.c | 2 +- + drivers/md/dm-kcopyd.c | 14 +++++++++++++- + drivers/md/dm-linear.c | 2 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 3 ++- + drivers/md/dm-path-selector.c | 3 ++- + drivers/md/dm-raid1.c | 6 ++---- + drivers/md/dm-round-robin.c | 3 ++- + drivers/md/dm-snap.c | 10 +++------- + drivers/md/dm-snap.h | 2 +- + drivers/md/dm-stripe.c | 6 +++--- + drivers/md/dm-zero.c | 2 +- + drivers/md/dm.h | 9 --------- + include/linux/device-mapper.h | 3 +++ + 17 files changed, 43 insertions(+), 37 deletions(-) +Merging hid/mm +$ git merge hid/mm +Renamed drivers/hid/usbhid/hid-lg2ff.c->drivers/hid/hid-lg2ff.c +Auto-merged drivers/hid/hid-lg2ff.c +Renamed drivers/hid/usbhid/hid-lgff.c->drivers/hid/hid-lgff.c +Auto-merged drivers/hid/hid-lgff.c +Renamed drivers/hid/usbhid/hid-plff.c->drivers/hid/hid-pl.c +Auto-merged drivers/hid/hid-pl.c +Renamed drivers/hid/usbhid/hid-tmff.c->drivers/hid/hid-tmff.c +Auto-merged drivers/hid/hid-tmff.c +Renamed drivers/hid/usbhid/hid-zpff.c->drivers/hid/hid-zpff.c +Auto-merged drivers/hid/hid-zpff.c +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged drivers/hid/Kconfig +CONFLICT (content): Merge conflict in drivers/hid/Kconfig +Auto-merged drivers/hid/Makefile +CONFLICT (content): Merge conflict in drivers/hid/Makefile +Auto-merged drivers/hid/hid-core.c +CONFLICT (content): Merge conflict in drivers/hid/hid-core.c +Auto-merged drivers/hid/hid-dell.c +CONFLICT (add/add): Merge conflict in drivers/hid/hid-dell.c +Auto-merged drivers/hid/hid-dummy.c +CONFLICT (add/add): Merge conflict in drivers/hid/hid-dummy.c +Auto-merged drivers/hid/hid-ids.h +CONFLICT (add/add): Merge conflict in drivers/hid/hid-ids.h +Auto-merged drivers/hid/hidraw.c +Auto-merged drivers/hid/usbhid/hid-core.c +CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-core.c +Auto-merged include/linux/hid.h +CONFLICT (content): Merge conflict in include/linux/hid.h +Auto-merged include/linux/mod_devicetable.h +Auto-merged scripts/mod/file2alias.c +Recorded preimage for 'drivers/hid/Kconfig' +Recorded preimage for 'drivers/hid/Makefile' +Recorded preimage for 'drivers/hid/hid-core.c' +Recorded preimage for 'drivers/hid/hid-dell.c' +Recorded preimage for 'drivers/hid/hid-dummy.c' +Recorded preimage for 'drivers/hid/hid-ids.h' +Recorded preimage for 'drivers/hid/usbhid/hid-core.c' +Recorded preimage for 'include/linux/hid.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 05affac Merge branch 'quilt/device-mapper' +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 7 ++++--- + drivers/i2c/algos/i2c-algo-pcf.c | 4 ++-- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-elektor.c | 3 ++- + drivers/i2c/busses/i2c-i801.c | 3 +++ + include/linux/i2c-algo-pcf.h | 2 +- + 6 files changed, 13 insertions(+), 7 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged drivers/hwmon/ams/ams.h +Merge made by recursive. + Documentation/hwmon/adt7470 | 76 +++ + Documentation/hwmon/it87 | 4 +- + Documentation/hwmon/lm85 | 10 - + Documentation/hwmon/lm87 | 9 +- + Documentation/hwmon/lm90 | 45 ++- + Documentation/hwmon/pc87360 | 7 +- + Documentation/hwmon/pc87427 | 2 +- + Documentation/hwmon/w83781d | 37 ++- + Documentation/hwmon/w83791d | 43 ++- + drivers/hwmon/Kconfig | 8 +- + drivers/hwmon/adm1026.c | 17 +- + drivers/hwmon/adm1029.c | 5 +- + drivers/hwmon/ams/ams-core.c | 82 ++-- + drivers/hwmon/ams/ams-i2c.c | 60 +-- + drivers/hwmon/ams/ams-input.c | 63 ++- + drivers/hwmon/ams/ams-pmu.c | 18 +- + drivers/hwmon/ams/ams.h | 4 +- + drivers/hwmon/ibmaem.c | 7 + + drivers/hwmon/ibmpex.c | 6 + + drivers/hwmon/it87.c | 11 +- + drivers/hwmon/lm78.c | 270 ++++++----- + drivers/hwmon/lm85.c | 352 +++++++------- + drivers/hwmon/lm87.c | 33 +- + drivers/hwmon/lm90.c | 444 ++++++++++++----- + drivers/hwmon/max1619.c | 17 +- + drivers/hwmon/w83781d.c | 976 ++++++++++++++++++++----------------- + drivers/hwmon/w83791d.c | 324 ++++++++++++- + drivers/i2c/busses/i2c-powermac.c | 29 ++ + 28 files changed, 1864 insertions(+), 1095 deletions(-) + create mode 100644 Documentation/hwmon/adt7470 +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged include/linux/kernel.h +Merge made by recursive. + Documentation/00-INDEX | 2 -- + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + include/linux/kernel.h | 4 ++-- + scripts/kernel-doc | 6 +++--- + 5 files changed, 16 insertions(+), 10 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Renamed arch/arm/include/asm/cnt32_to_63.h->include/linux/cnt32_to_63.h +Auto-merged include/linux/cnt32_to_63.h +CONFLICT (rename/add): Renamed arch/mips/au1000/mtx-1/init.c->arch/mips/pci/pci-bcm47xx.c in HEAD. arch/mips/pci/pci-bcm47xx.c added in v4l-dvb/stable +Added as arch/mips/pci/pci-bcm47xx.c~v4l-dvb_stable instead +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/filesystems/proc.txt +Auto-merged Documentation/usb/anchors.txt +CONFLICT (content): Merge conflict in Documentation/usb/anchors.txt +Auto-merged Documentation/video4linux/CARDLIST.cx88 +CONFLICT (content): Merge conflict in Documentation/video4linux/CARDLIST.cx88 +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/arm/include/asm/io.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/io.h +Auto-merged arch/arm/include/asm/mach/map.h +Auto-merged arch/arm/mach-davinci/psc.c +Auto-merged arch/arm/mach-mx3/pcm037.c +Auto-merged arch/arm/mach-omap1/mcbsp.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap1/mcbsp.c +Auto-merged arch/arm/mach-omap2/mcbsp.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/mcbsp.c +Auto-merged arch/arm/mach-pxa/time.c +Auto-merged arch/arm/mach-pxa/tosa.c +Auto-merged arch/arm/mach-sa1100/generic.c +Auto-merged arch/arm/mach-versatile/core.c +CONFLICT (content): Merge conflict in arch/arm/mach-versatile/core.c +Auto-merged arch/arm/mm/mmu.c +Auto-merged arch/arm/plat-omap/devices.c +CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c +Auto-merged arch/arm/plat-omap/gpio.c +Auto-merged arch/arm/plat-omap/include/mach/mcbsp.h +CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/mach/mcbsp.h +Auto-merged arch/arm/plat-omap/mcbsp.c +CONFLICT (content): Merge conflict in arch/arm/plat-omap/mcbsp.c +Auto-merged arch/avr32/boards/atstk1000/atstk1002.c +CONFLICT (content): Merge conflict in arch/avr32/boards/atstk1000/atstk1002.c +Auto-merged arch/ia64/kernel/smpboot.c +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/m32r/Kconfig +Auto-merged arch/mips/Kconfig +Auto-merged arch/mips/kernel/Makefile +Auto-merged arch/mips/kernel/cpu-probe.c +Auto-merged arch/mips/kernel/genex.S +Auto-merged arch/mips/kernel/process.c +Auto-merged arch/mips/kernel/ptrace.c +Auto-merged arch/mips/kernel/traps.c +Auto-merged arch/mips/kernel/vmlinux.lds.S +Auto-merged arch/mips/lib/csum_partial.S +Auto-merged arch/mips/pci/Makefile +Auto-merged arch/mips/sgi-ip22/ip22-platform.c +Auto-merged arch/powerpc/boot/Makefile +Auto-merged arch/powerpc/boot/dts/mpc8610_hpcd.dts +Auto-merged arch/powerpc/include/asm/sections.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/sections.h +Auto-merged arch/s390/kernel/ptrace.c +Auto-merged arch/s390/kernel/time.c +Auto-merged arch/s390/lib/delay.c +CONFLICT (content): Merge conflict in arch/s390/lib/delay.c +Auto-merged arch/sparc/kernel/of_device.c +Auto-merged arch/sparc64/kernel/irq.c +Auto-merged arch/sparc64/kernel/of_device.c +Auto-merged arch/sparc64/kernel/pci.c +Auto-merged arch/sparc64/kernel/pci_psycho.c +CONFLICT (content): Merge conflict in arch/sparc64/kernel/pci_psycho.c +Auto-merged arch/sparc64/kernel/prom.c +Auto-merged arch/sparc64/kernel/ptrace.c +Auto-merged arch/sparc64/kernel/smp.c +Auto-merged arch/sparc64/kernel/traps.c +Auto-merged arch/x86/Kconfig.cpu +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/amd_iommu.c +Auto-merged arch/x86/kernel/apm_32.c +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kernel/cpu/mtrr/main.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mtrr/main.c +Auto-merged arch/x86/kernel/e820.c +Auto-merged arch/x86/kernel/pci-gart_64.c +Auto-merged arch/x86/kernel/process.c +Auto-merged arch/x86/kernel/process_32.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/setup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/vmi_32.c +Auto-merged arch/x86/kvm/vmx.h +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/oprofile/nmi_int.c +Auto-merged block/cmd-filter.c +Auto-merged drivers/acpi/glue.c +Auto-merged drivers/ata/Kconfig +Auto-merged drivers/ata/ahci.c +Auto-merged drivers/ata/ata_piix.c +Auto-merged drivers/ata/pata_marvell.c +CONFLICT (content): Merge conflict in drivers/ata/pata_marvell.c +Auto-merged drivers/ata/pata_sil680.c +Auto-merged drivers/ata/sata_inic162x.c +Auto-merged drivers/ata/sata_mv.c +Auto-merged drivers/ata/sata_nv.c +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/clocksource/acpi_pm.c +Auto-merged drivers/hwmon/it87.c +Auto-merged drivers/i2c/busses/i2c-powermac.c +Auto-merged drivers/i2c/i2c-dev.c +Auto-merged drivers/ide/Kconfig +Auto-merged drivers/ide/ide-cd.c +Auto-merged drivers/ide/ide-dma.c +CONFLICT (content): Merge conflict in drivers/ide/ide-dma.c +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Auto-merged drivers/ide/pci/hpt366.c +CONFLICT (content): Merge conflict in drivers/ide/pci/hpt366.c +Auto-merged drivers/infiniband/hw/mlx4/qp.c +Auto-merged drivers/infiniband/hw/nes/nes_cm.c +Auto-merged drivers/infiniband/ulp/ipoib/ipoib.h +Auto-merged drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merged drivers/infiniband/ulp/ipoib/ipoib_multicast.c +Auto-merged drivers/md/dm-mpath.c +Auto-merged drivers/md/dm.c +Auto-merged drivers/md/md.c +Auto-merged drivers/media/common/ir-keymaps.c +Auto-merged drivers/media/dvb/dvb-core/dvb_frontend.c +CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-core/dvb_frontend.c +Auto-merged drivers/media/dvb/dvb-usb/Kconfig +CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/Kconfig +Auto-merged drivers/media/dvb/dvb-usb/af9015.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-usb/af9015.c +Auto-merged drivers/media/dvb/dvb-usb/dib0700_devices.c +CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/dib0700_devices.c +Auto-merged drivers/media/dvb/dvb-usb/dvb-usb-ids.h +CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/dvb-usb-ids.h +Auto-merged drivers/media/dvb/dvb-usb/dw2102.c +CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/dw2102.c +Auto-merged drivers/media/dvb/frontends/af9013.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/frontends/af9013.c +Auto-merged drivers/media/dvb/frontends/af9013_priv.h +CONFLICT (add/add): Merge conflict in drivers/media/dvb/frontends/af9013_priv.h +Auto-merged drivers/media/dvb/frontends/cx24116.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/frontends/cx24116.c +Auto-merged drivers/media/dvb/frontends/stb6000.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/frontends/stb6000.c +Auto-merged drivers/media/dvb/frontends/stv0288.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/frontends/stv0288.c +Auto-merged drivers/media/dvb/frontends/stv0288.h +CONFLICT (add/add): Merge conflict in drivers/media/dvb/frontends/stv0288.h +Auto-merged drivers/media/radio/dsbr100.c +Auto-merged drivers/media/radio/radio-zoltrix.c +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/media/video/Makefile +Auto-merged drivers/media/video/au0828/au0828-dvb.c +Auto-merged drivers/media/video/bt8xx/bttv-driver.c +Auto-merged drivers/media/video/cafe_ccic.c +Auto-merged drivers/media/video/cx18/cx18-cards.c +Auto-merged drivers/media/video/cx18/cx18-driver.c +Auto-merged drivers/media/video/cx18/cx18-driver.h +Auto-merged drivers/media/video/cx18/cx18-ioctl.c +Auto-merged drivers/media/video/cx18/cx18-irq.c +Auto-merged drivers/media/video/cx18/cx18-streams.c +Auto-merged drivers/media/video/cx23885/cx23885-417.c +Auto-merged drivers/media/video/cx88/cx88-cards.c +CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-cards.c +Auto-merged drivers/media/video/cx88/cx88-dvb.c +CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-dvb.c +Auto-merged drivers/media/video/cx88/cx88.h +CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88.h +Auto-merged drivers/media/video/em28xx/em28xx-dvb.c +CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-dvb.c +Auto-merged drivers/media/video/em28xx/em28xx-video.c +Auto-merged drivers/media/video/gspca/Kconfig +CONFLICT (content): Merge conflict in drivers/media/video/gspca/Kconfig +Auto-merged drivers/media/video/gspca/Makefile +CONFLICT (content): Merge conflict in drivers/media/video/gspca/Makefile +Auto-merged drivers/media/video/gspca/gspca.c +CONFLICT (content): Merge conflict in drivers/media/video/gspca/gspca.c +Auto-merged drivers/media/video/gspca/m5602/m5602_bridge.h +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_bridge.h +Auto-merged drivers/media/video/gspca/m5602/m5602_core.c +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_core.c +Auto-merged drivers/media/video/gspca/m5602/m5602_mt9m111.c +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_mt9m111.c +Auto-merged drivers/media/video/gspca/m5602/m5602_mt9m111.h +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_mt9m111.h +Auto-merged drivers/media/video/gspca/m5602/m5602_ov9650.h +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_ov9650.h +Auto-merged drivers/media/video/gspca/m5602/m5602_po1030.h +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_po1030.h +Auto-merged drivers/media/video/gspca/m5602/m5602_s5k4aa.h +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_s5k4aa.h +Auto-merged drivers/media/video/gspca/m5602/m5602_s5k83a.c +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_s5k83a.c +Auto-merged drivers/media/video/gspca/m5602/m5602_s5k83a.h +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/m5602/m5602_s5k83a.h +Auto-merged drivers/media/video/gspca/sonixj.c +CONFLICT (content): Merge conflict in drivers/media/video/gspca/sonixj.c +Auto-merged drivers/media/video/gspca/t613.c +CONFLICT (content): Merge conflict in drivers/media/video/gspca/t613.c +Auto-merged drivers/media/video/ir-kbd-i2c.c +Auto-merged drivers/media/video/ivtv/ivtv-driver.c +Auto-merged drivers/media/video/ivtv/ivtv-driver.h +Auto-merged drivers/media/video/ivtv/ivtv-fileops.c +Auto-merged drivers/media/video/ivtv/ivtv-ioctl.c +CONFLICT (content): Merge conflict in drivers/media/video/ivtv/ivtv-ioctl.c +Auto-merged drivers/media/video/ov511.c +Auto-merged drivers/media/video/pvrusb2/pvrusb2-sysfs.c +Auto-merged drivers/media/video/pxa_camera.c +Auto-merged drivers/media/video/saa5249.c +CONFLICT (content): Merge conflict in drivers/media/video/saa5249.c +Auto-merged drivers/media/video/saa7115.c +Auto-merged drivers/media/video/saa7134/saa7134-cards.c +Auto-merged drivers/media/video/saa7134/saa7134-i2c.c +Auto-merged drivers/media/video/saa7134/saa7134-input.c +Auto-merged drivers/media/video/saa7134/saa7134-video.c +Auto-merged drivers/media/video/se401.c +Auto-merged drivers/media/video/stv680.c +Auto-merged drivers/media/video/usbvideo/usbvideo.c +Auto-merged drivers/media/video/usbvision/usbvision-video.c +Auto-merged drivers/media/video/uvc/uvc_driver.c +Auto-merged drivers/media/video/v4l2-dev.c +CONFLICT (content): Merge conflict in drivers/media/video/v4l2-dev.c +Auto-merged drivers/media/video/vpx3220.c +Auto-merged drivers/media/video/zr364xx.c +CONFLICT (content): Merge conflict in drivers/media/video/zr364xx.c +Auto-merged drivers/memstick/core/mspro_block.c +CONFLICT (content): Merge conflict in drivers/memstick/core/mspro_block.c +Auto-merged drivers/mfd/Kconfig +Auto-merged drivers/mmc/card/block.c +Auto-merged drivers/mmc/host/atmel-mci.c +CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c +Auto-merged drivers/net/bnx2.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/e1000e/e1000.h +Auto-merged drivers/net/e1000e/ethtool.c +Auto-merged drivers/net/e1000e/ich8lan.c +CONFLICT (content): Merge conflict in drivers/net/e1000e/ich8lan.c +Auto-merged drivers/net/e1000e/netdev.c +Auto-merged drivers/net/e1000e/param.c +Auto-merged drivers/net/forcedeth.c +Auto-merged drivers/net/niu.c +Auto-merged drivers/net/wireless/ath9k/beacon.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath9k/beacon.c +Auto-merged drivers/net/wireless/ath9k/core.c +Auto-merged drivers/net/wireless/ath9k/core.h +CONFLICT (content): Merge conflict in drivers/net/wireless/ath9k/core.h +Auto-merged drivers/net/wireless/ath9k/main.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath9k/main.c +Auto-merged drivers/net/wireless/ath9k/xmit.c +Auto-merged drivers/net/wireless/b43/rfkill.c +Auto-merged drivers/pci/hotplug/pciehp_hpc.c +Auto-merged drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/pcie/aspm.c +CONFLICT (content): Merge conflict in drivers/pci/pcie/aspm.c +Auto-merged drivers/pci/probe.c +CONFLICT (content): Merge conflict in drivers/pci/probe.c +Auto-merged drivers/pci/setup-bus.c +Auto-merged drivers/pcmcia/ds.c +CONFLICT (content): Merge conflict in drivers/pcmcia/ds.c +Auto-merged drivers/pcmcia/soc_common.c +Auto-merged drivers/s390/cio/ccwgroup.c +Auto-merged drivers/s390/cio/chp.c +Auto-merged drivers/s390/cio/cio.c +Auto-merged drivers/s390/cio/css.c +Auto-merged drivers/s390/cio/device_fsm.c +Auto-merged drivers/s390/scsi/zfcp_ccw.c +Auto-merged drivers/s390/scsi/zfcp_fc.c +CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_fc.c +Auto-merged drivers/s390/scsi/zfcp_fsf.c +CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_fsf.c +Auto-merged drivers/s390/scsi/zfcp_qdio.c +CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_qdio.c +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/scsi/device_handler/scsi_dh_emc.c +Auto-merged drivers/scsi/device_handler/scsi_dh_rdac.c +Auto-merged drivers/scsi/qla2xxx/qla_isr.c +Auto-merged drivers/scsi/qla2xxx/qla_os.c +Auto-merged drivers/scsi/qlogicpti.c +Auto-merged drivers/scsi/scsi_error.c +Auto-merged drivers/scsi/scsi_lib.c +Auto-merged drivers/scsi/scsi_scan.c +Auto-merged drivers/scsi/sd.c +Auto-merged drivers/scsi/sr.c +Auto-merged drivers/usb/core/hcd.c +Auto-merged drivers/usb/core/hub.c +Auto-merged drivers/usb/gadget/fsl_usb2_udc.c +Auto-merged drivers/usb/gadget/omap_udc.c +Auto-merged drivers/usb/host/ehci-hcd.c +Auto-merged drivers/usb/host/ohci-omap.c +Auto-merged drivers/usb/musb/Kconfig +Auto-merged drivers/usb/musb/musb_core.c +Auto-merged drivers/usb/serial/console.c +Auto-merged drivers/usb/serial/cp2101.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged drivers/usb/serial/ftdi_sio.h +Auto-merged drivers/usb/serial/option.c +CONFLICT (content): Merge conflict in drivers/usb/serial/option.c +Auto-merged drivers/usb/serial/sierra.c +Auto-merged drivers/usb/serial/ti_usb_3410_5052.c +Auto-merged drivers/usb/serial/usb-serial.c +Auto-merged drivers/video/atmel_lcdfb.c +Auto-merged drivers/video/console/fbcon.c +Auto-merged drivers/xen/balloon.c +Auto-merged fs/nfs/super.c +Auto-merged fs/ocfs2/aops.c +Auto-merged fs/partitions/check.c +Auto-merged fs/proc/proc_misc.c +Auto-merged fs/ubifs/super.c +Auto-merged fs/xfs/linux-2.6/xfs_super.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c +Auto-merged fs/xfs/xfs_log.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_log.c +Auto-merged include/asm-generic/sections.h +CONFLICT (delete/modify): include/asm-parisc/sections.h deleted in HEAD and modified in v4l-dvb/stable. Version v4l-dvb/stable of include/asm-parisc/sections.h left in tree. +Auto-merged include/asm-x86/acpi.h +Auto-merged include/asm-x86/cpufeature.h +CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h +Auto-merged include/asm-x86/idle.h +CONFLICT (content): Merge conflict in include/asm-x86/idle.h +Auto-merged include/asm-x86/kgdb.h +Auto-merged include/asm-x86/uaccess_64.h +Auto-merged include/linux/ata.h +Auto-merged include/linux/blkdev.h +Auto-merged include/linux/dvb/frontend.h +CONFLICT (content): Merge conflict in include/linux/dvb/frontend.h +Auto-merged include/linux/hrtimer.h +Auto-merged include/linux/ide.h +CONFLICT (content): Merge conflict in include/linux/ide.h +Auto-merged include/linux/ioport.h +Auto-merged include/linux/pci.h +Auto-merged include/media/ir-common.h +CONFLICT (content): Merge conflict in include/media/ir-common.h +Auto-merged include/media/v4l2-dev.h +CONFLICT (content): Merge conflict in include/media/v4l2-dev.h +Auto-merged include/net/inet_timewait_sock.h +Auto-merged include/net/netlink.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/cpuset.c +Auto-merged kernel/exit.c +Auto-merged kernel/hrtimer.c +CONFLICT (content): Merge conflict in kernel/hrtimer.c +Auto-merged kernel/posix-timers.c +Auto-merged kernel/sched.c +CONFLICT (content): Merge conflict in kernel/sched.c +Auto-merged kernel/sched_rt.c +Auto-merged kernel/time/tick-sched.c +Auto-merged kernel/trace/trace_sysprof.c +Auto-merged lib/swiotlb.c +CONFLICT (content): Merge conflict in lib/swiotlb.c +Auto-merged net/9p/client.c +Auto-merged net/9p/trans_fd.c +Auto-merged net/bridge/br_ioctl.c +Auto-merged net/core/dev.c +CONFLICT (content): Merge conflict in net/core/dev.c +Auto-merged net/core/rtnetlink.c +Auto-merged net/ipv4/inet_timewait_sock.c +Auto-merged net/ipv4/tcp_input.c +Auto-merged net/ipv4/tcp_ipv4.c +Auto-merged net/ipv4/udp.c +Auto-merged net/ipv6/ip6_output.c +Auto-merged net/ipv6/netfilter/ip6t_hbh.c +Auto-merged net/ipv6/route.c +Auto-merged net/ipv6/tcp_ipv6.c +CONFLICT (content): Merge conflict in net/ipv6/tcp_ipv6.c +Auto-merged net/key/af_key.c +CONFLICT (content): Merge conflict in net/key/af_key.c +Auto-merged net/netfilter/nf_conntrack_proto_gre.c +CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_proto_gre.c +Auto-merged net/netfilter/nf_conntrack_sip.c +Auto-merged net/sched/sch_generic.c +Auto-merged net/sctp/associola.c +Auto-merged net/sctp/output.c +Auto-merged net/sctp/sm_make_chunk.c +Auto-merged net/sctp/sm_statefuns.c +CONFLICT (content): Merge conflict in net/sctp/sm_statefuns.c +Auto-merged net/xfrm/xfrm_policy.c +CONFLICT (content): Merge conflict in net/xfrm/xfrm_policy.c +Auto-merged net/xfrm/xfrm_state.c +CONFLICT (content): Merge conflict in net/xfrm/xfrm_state.c +Auto-merged scripts/kernel-doc +Auto-merged security/selinux/ss/services.c +Auto-merged sound/core/pcm.c +Auto-merged sound/core/pcm_native.c +Auto-merged sound/core/rawmidi.c +Auto-merged sound/pci/hda/patch_sigmatel.c +Auto-merged sound/ppc/awacs.c +Auto-merged sound/soc/codecs/wm8753.c +Recorded preimage for 'drivers/pci/pcie/aspm.c' +Recorded preimage for 'drivers/pci/probe.c' +Recorded preimage for 'fs/xfs/linux-2.6/xfs_super.c' +Resolved 'arch/arm/mach-omap1/mcbsp.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/mcbsp.c' using previous resolution. +Resolved 'arch/arm/plat-omap/include/mach/mcbsp.h' using previous resolution. +Resolved 'drivers/ide/pci/hpt366.c' using previous resolution. +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Resolved 'lib/swiotlb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at f30ea9c Merge branch 'quilt/kernel-doc' +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Removed arch/arm/mach-sa1100/include/mach/ide.h +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Merge made by recursive. + arch/arm/mach-sa1100/include/mach/ide.h | 75 --- + arch/parisc/include/asm/ide.h | 4 - + drivers/ide/Kconfig | 70 ++-- + drivers/ide/Makefile | 19 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-cd.c | 61 ++- + drivers/ide/ide-cd_ioctl.c | 8 +- + drivers/ide/ide-disk.c | 382 +++------------- + drivers/ide/ide-disk.h | 21 +- + drivers/ide/ide-disk_ioctl.c | 4 +- + drivers/ide/ide-disk_proc.c | 2 +- + drivers/ide/ide-floppy.c | 339 ++------------ + drivers/ide/ide-floppy.h | 43 +-- + drivers/ide/ide-floppy_ioctl.c | 15 +- + drivers/ide/ide-floppy_proc.c | 2 +- + drivers/ide/ide-gd.c | 398 ++++++++++++++++ + drivers/ide/ide-gd.h | 44 ++ + drivers/ide/ide-iops.c | 2 +- + drivers/ide/ide-probe.c | 1 + + drivers/ide/ide-proc.c | 6 +- + drivers/ide/ide-tape.c | 16 +- + drivers/ide/mips/Makefile | 1 + + drivers/ide/mips/tx4939ide.c | 775 +++++++++++++++++++++++++++++++ + drivers/ide/pci/hpt366.c | 35 +- + drivers/ide/pci/sgiioc4.c | 9 - + drivers/leds/Kconfig | 2 +- + drivers/scsi/ide-scsi.c | 26 +- + include/asm-frv/ide.h | 10 +- + include/asm-m68k/ide.h | 9 - + include/linux/ide.h | 36 +- + 30 files changed, 1517 insertions(+), 900 deletions(-) + delete mode 100644 arch/arm/mach-sa1100/include/mach/ide.h + create mode 100644 drivers/ide/ide-gd.c + create mode 100644 drivers/ide/ide-gd.h + create mode 100644 drivers/ide/mips/tx4939ide.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merged fs/nfs/super.c +Auto-merged net/sunrpc/clnt.c +Auto-merged net/sunrpc/rpcb_clnt.c +Auto-merged net/sunrpc/xprtrdma/rpc_rdma.c +Merge made by recursive. + fs/nfs/client.c | 5 +- + fs/nfs/dir.c | 20 +- + fs/nfs/file.c | 18 +- + fs/nfs/inode.c | 183 ++++++---- + fs/nfs/internal.h | 25 ++- + fs/nfs/mount_clnt.c | 3 +- + fs/nfs/namespace.c | 7 +- + fs/nfs/nfs3acl.c | 2 + + fs/nfs/nfs3proc.c | 20 +- + fs/nfs/nfs4namespace.c | 105 +++--- + fs/nfs/proc.c | 10 +- + fs/nfs/super.c | 126 ++++--- + fs/nfs/unlink.c | 5 +- + fs/nfs/write.c | 3 +- + include/linux/nfs_fs.h | 19 +- + include/linux/nfs_fs_sb.h | 1 - + include/linux/nfs_mount.h | 4 + + include/linux/nfs_xdr.h | 11 +- + include/linux/sunrpc/xprtrdma.h | 4 +- + net/sunrpc/clnt.c | 4 +- + net/sunrpc/rpcb_clnt.c | 40 ++- + net/sunrpc/xprt.c | 12 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 29 ++- + net/sunrpc/xprtrdma/transport.c | 41 ++- + net/sunrpc/xprtrdma/verbs.c | 741 ++++++++++++++++++++++++++------------ + net/sunrpc/xprtrdma/xprt_rdma.h | 17 +- + 26 files changed, 955 insertions(+), 500 deletions(-) +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Merge made by recursive. + fs/xfs/Makefile | 4 +- + fs/xfs/linux-2.6/xfs_stats.c | 4 + + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 223 +-- + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/linux-2.6/xfs_sync.c | 609 +++++++ + fs/xfs/linux-2.6/xfs_sync.h | 63 + + fs/xfs/linux-2.6/xfs_vfs.h | 31 - + fs/xfs/quota/xfs_dquot.c | 18 +- + fs/xfs/quota/xfs_dquot.h | 4 +- + fs/xfs/quota/xfs_dquot_item.c | 37 +- + fs/xfs/quota/xfs_qm.c | 2 - + fs/xfs/quota/xfs_qm.h | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 127 +- + fs/xfs/support/debug.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_ag.h | 5 +- + fs/xfs/xfs_alloc.c | 195 ++- + fs/xfs/xfs_alloc.h | 27 +- + fs/xfs/xfs_alloc_btree.c | 2387 ++++----------------------- + fs/xfs/xfs_alloc_btree.h | 107 +- + fs/xfs/xfs_arch.h | 39 +- + fs/xfs/xfs_bit.h | 3 +- + fs/xfs/xfs_bmap.c | 296 ++-- + fs/xfs/xfs_bmap.h | 61 +- + fs/xfs/xfs_bmap_btree.c | 2614 ++++++------------------------ + fs/xfs/xfs_bmap_btree.h | 171 +-- + fs/xfs/xfs_btree.c | 3596 +++++++++++++++++++++++++++++++++++----- + fs/xfs/xfs_btree.h | 392 +++-- + fs/xfs/xfs_btree_trace.c | 249 +++ + fs/xfs/xfs_btree_trace.h | 116 ++ + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dinode.h | 5 +- + fs/xfs/xfs_fsops.c | 24 +- + fs/xfs/xfs_ialloc.c | 132 ++- + fs/xfs/xfs_ialloc.h | 21 +- + fs/xfs/xfs_ialloc_btree.c | 2193 +++---------------------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 66 +- + fs/xfs/xfs_imap.h | 2 - + fs/xfs/xfs_inode.c | 198 ++-- + fs/xfs/xfs_inode.h | 259 ++-- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_itable.c | 26 +- + fs/xfs/xfs_log_recover.c | 8 +- + fs/xfs/xfs_mount.c | 46 +- + fs/xfs/xfs_mount.h | 33 +- + fs/xfs/xfs_trans.h | 317 ++-- + fs/xfs/xfs_vfsops.c | 562 +------- + fs/xfs/xfs_vfsops.h | 1 - + fs/xfs/xfs_vnodeops.c | 42 +- + 51 files changed, 6846 insertions(+), 8718 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/mad.c | 14 +++++--------- + drivers/infiniband/core/ucma.c | 4 ++-- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 + + drivers/infiniband/hw/ehca/ehca_qp.c | 6 ++++++ + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 +++---- + 5 files changed, 17 insertions(+), 15 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged drivers/acpi/Kconfig +CONFLICT (content): Merge conflict in drivers/acpi/Kconfig +Removed drivers/acpi/bay.c +Auto-merged drivers/acpi/scan.c +CONFLICT (content): Merge conflict in drivers/acpi/scan.c +Auto-merged drivers/acpi/toshiba_acpi.c +Auto-merged drivers/pnp/Makefile +CONFLICT (content): Merge conflict in drivers/pnp/Makefile +Auto-merged drivers/pnp/base.h +Auto-merged drivers/pnp/core.c +Auto-merged drivers/pnp/driver.c +Auto-merged drivers/pnp/isapnp/core.c +Auto-merged drivers/pnp/pnpacpi/core.c +Auto-merged drivers/pnp/pnpbios/core.c +Auto-merged include/asm-x86/idle.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci_ids.h +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/acpi/Kconfig' using previous resolution. +Resolved 'drivers/acpi/scan.c' using previous resolution. +Resolved 'drivers/pnp/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 7c2c242: Merge commit 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 59 ++- + Documentation/laptops/acer-wmi.txt | 28 +- + MAINTAINERS | 15 +- + arch/ia64/sn/kernel/io_acpi_init.c | 8 +- + arch/x86/Kconfig | 2 + + arch/x86/kernel/acpi/sleep.c | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 + + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 42 +- + arch/x86/kernel/process_64.c | 7 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 11 +- + drivers/acpi/Makefile | 1 - + drivers/acpi/ac.c | 4 +- + drivers/acpi/acpi_memhotplug.c | 11 +- + drivers/acpi/asus_acpi.c | 4 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/bay.c | 411 --------------- + drivers/acpi/bus.c | 78 +++- + drivers/acpi/button.c | 6 +- + drivers/acpi/cm_sbs.c | 6 +- + drivers/acpi/container.c | 4 +- + drivers/acpi/dock.c | 388 +++++++++++---- + drivers/acpi/ec.c | 374 +++++++------- + drivers/acpi/executer/exconfig.c | 116 +++-- + drivers/acpi/fan.c | 6 +- + drivers/acpi/hardware/hwsleep.c | 44 +- + drivers/acpi/namespace/nsxfeval.c | 79 +++ + drivers/acpi/namespace/nsxfname.c | 5 + + drivers/acpi/numa.c | 2 +- + drivers/acpi/osl.c | 54 ++- + drivers/acpi/parser/psloop.c | 2 + + drivers/acpi/pci_link.c | 2 +- + drivers/acpi/pci_root.c | 4 +- + drivers/acpi/pci_slot.c | 10 +- + drivers/acpi/power.c | 74 ++- + drivers/acpi/processor_core.c | 6 +- + drivers/acpi/processor_perflib.c | 37 +- + drivers/acpi/processor_throttling.c | 19 +- + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sbshc.c | 6 +- + drivers/acpi/scan.c | 91 ++-- + drivers/acpi/sleep/main.c | 53 ++- + drivers/acpi/system.c | 4 +- + drivers/acpi/tables/tbfadt.c | 32 +- + drivers/acpi/tables/tbinstal.c | 61 ++- + drivers/acpi/thermal.c | 49 ++- + drivers/acpi/toshiba_acpi.c | 2 +- + drivers/acpi/utilities/utglobal.c | 44 ++- + drivers/acpi/utilities/utobject.c | 8 +- + drivers/acpi/utilities/utxface.c | 7 +- + drivers/acpi/utils.c | 4 +- + drivers/acpi/video.c | 59 +-- + drivers/acpi/wmi.c | 49 ++- + drivers/ata/libata-acpi.c | 135 ++---- + drivers/dma/ioat_dma.c | 3 + + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/acer-wmi.c | 225 +++++--- + drivers/misc/asus-laptop.c | 14 +- + drivers/misc/eeepc-laptop.c | 232 ++++++++- + drivers/misc/fujitsu-laptop.c | 135 +++--- + drivers/misc/intel_menlow.c | 29 +- + drivers/misc/panasonic-laptop.c | 767 ++++++++++++++++++++++++++++ + drivers/misc/thinkpad_acpi.c | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 20 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/sgi_hotplug.c | 4 +- + drivers/pnp/Kconfig | 20 +- + drivers/pnp/Makefile | 4 - + drivers/pnp/base.h | 10 + + drivers/pnp/core.c | 29 +- + drivers/pnp/driver.c | 4 - + drivers/pnp/isapnp/Makefile | 4 - + drivers/pnp/isapnp/core.c | 12 +- + drivers/pnp/manager.c | 34 +- + drivers/pnp/pnpacpi/Makefile | 4 - + drivers/pnp/pnpacpi/core.c | 16 +- + drivers/pnp/pnpacpi/rsparser.c | 43 +- + drivers/pnp/pnpbios/Makefile | 4 - + drivers/pnp/pnpbios/core.c | 4 +- + drivers/pnp/pnpbios/rsparser.c | 18 +- + drivers/pnp/quirks.c | 6 +- + drivers/pnp/resource.c | 12 +- + drivers/pnp/support.c | 14 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acdisasm.h | 4 + + include/acpi/acmacros.h | 253 +++++----- + include/acpi/acpi_bus.h | 11 +- + include/acpi/acpi_drivers.h | 11 +- + include/acpi/acpiosxf.h | 3 + + include/acpi/actbl1.h | 51 ++- + include/acpi/actypes.h | 3 +- + include/acpi/acutils.h | 4 +- + include/acpi/platform/aclinux.h | 6 + + include/asm-x86/idle.h | 1 + + include/linux/acpi.h | 8 - + include/linux/kernel.h | 24 + + include/linux/pci_ids.h | 1 + + include/linux/pnp.h | 10 - + 99 files changed, 2988 insertions(+), 1623 deletions(-) + delete mode 100644 drivers/acpi/bay.c + create mode 100644 drivers/misc/panasonic-laptop.c +$ git am -3 ../patches/0001-drivers-has-no-idle-subdirectory.patch +Applying drivers has no idle subdirectory +$ git reset HEAD^ +arch/x86/Kconfig: needs update +drivers/Makefile: needs update +$ git add . +$ git commit -v -a --amend +Created commit bafe44c: Merge commit 'acpi/test' +$ git am -3 ../patches/0001-acpi-acpi_os_hotplug_execute-needs-to-be-exported.patch +Applying acpi: acpi_os_hotplug_execute needs to be exported +$ git reset HEAD^ +drivers/acpi/osl.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 640c40b: Merge commit 'acpi/test' +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/ieee1394/dv1394.c +Auto-merged drivers/ieee1394/raw1394.c +Auto-merged drivers/ieee1394/video1394.c +Merge made by recursive. + drivers/firewire/fw-card.c | 56 ++------ + drivers/firewire/fw-cdev.c | 42 +++--- + drivers/firewire/fw-device.c | 40 ++---- + drivers/firewire/fw-device.h | 4 + + drivers/firewire/fw-ohci.c | 73 +++++----- + drivers/firewire/fw-sbp2.c | 119 ++++++---------- + drivers/firewire/fw-transaction.c | 48 ++++++- + drivers/firewire/fw-transaction.h | 9 +- + drivers/ieee1394/csr1212.c | 2 +- + drivers/ieee1394/dv1394.c | 2 +- + drivers/ieee1394/eth1394.c | 2 +- + drivers/ieee1394/nodemgr.c | 279 ++++++++++++++---------------------- + drivers/ieee1394/nodemgr.h | 2 +- + drivers/ieee1394/raw1394-private.h | 1 + + drivers/ieee1394/raw1394.c | 230 ++++++++++++++++------------- + drivers/ieee1394/sbp2.c | 218 ++++++++++++---------------- + drivers/ieee1394/sbp2.h | 33 ++--- + drivers/ieee1394/video1394.c | 8 +- + include/linux/firewire-cdev.h | 9 +- + 19 files changed, 529 insertions(+), 648 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/cdev.c | 6 +----- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/vtbl.c | 4 ++-- + 3 files changed, 4 insertions(+), 8 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged MAINTAINERS +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/powerpc/kernel/asm-offsets.c +Auto-merged arch/x86/kvm/i8254.c +CONFLICT (content): Merge conflict in arch/x86/kvm/i8254.c +Auto-merged arch/x86/kvm/lapic.c +Resolved 'arch/x86/kvm/i8254.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 07ece95: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 9 +- + arch/ia64/include/asm/kvm_host.h | 6 +- + arch/ia64/kvm/Kconfig | 2 + + arch/ia64/kvm/Makefile | 6 +- + arch/ia64/kvm/irq.h | 31 + + arch/ia64/kvm/kvm-ia64.c | 66 ++- + arch/ia64/kvm/kvm_minstate.h | 23 +- + arch/ia64/kvm/optvfault.S | 181 ++++- + arch/ia64/kvm/process.c | 4 +- + arch/ia64/kvm/vcpu.h | 26 +- + arch/ia64/kvm/vmm_ivt.S | 39 +- + arch/ia64/kvm/vtlb.c | 23 +- + arch/powerpc/include/asm/kvm_host.h | 14 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 53 +- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/booke_guest.c | 17 + + arch/powerpc/kvm/booke_interrupts.S | 79 ++- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/powerpc.c | 99 +++- + arch/s390/Kconfig | 7 +- + arch/s390/kvm/priv.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +- + arch/x86/kernel/kvmclock.c | 30 + + arch/x86/kernel/pvclock.c | 12 + + arch/x86/kvm/Makefile | 5 +- + arch/x86/kvm/i8254.c | 96 ++- + arch/x86/kvm/i8254.h | 7 +- + arch/x86/kvm/i8259.c | 53 ++- + arch/x86/kvm/irq.c | 3 +- + arch/x86/kvm/irq.h | 7 +- + arch/x86/kvm/kvm_cache_regs.h | 32 + + arch/x86/kvm/lapic.c | 78 ++- + arch/x86/kvm/mmu.c | 794 ++++++++++++++++---- + arch/x86/kvm/paging_tmpl.h | 249 ++++-- + arch/x86/kvm/svm.c | 162 ++--- + arch/x86/kvm/vmx.c | 989 +++++++++++++++++------- + arch/x86/kvm/vmx.h | 10 +- + arch/x86/kvm/x86.c | 669 +++++++++++------ + arch/x86/kvm/x86.h | 22 + + arch/x86/kvm/x86_emulate.c | 178 +++-- + arch/x86/xen/time.c | 11 +- + drivers/pci/dmar.c | 4 +- + drivers/pci/intel-iommu.c | 116 +++- + drivers/pci/intr_remapping.c | 2 +- + drivers/pci/intr_remapping.h | 2 +- + drivers/pci/iova.c | 2 +- + include/asm-x86/kvm.h | 22 - + include/asm-x86/kvm_host.h | 93 ++- + include/asm-x86/kvm_x86_emulate.h | 10 +- + include/asm-x86/msr-index.h | 3 + + include/asm-x86/mtrr.h | 25 + + include/asm-x86/pvclock.h | 1 + + {drivers/pci => include/linux}/dma_remapping.h | 0 + {drivers/pci => include/linux}/intel-iommu.h | 24 +- + {drivers/pci => include/linux}/iova.h | 0 + include/linux/kvm.h | 83 ++- + include/linux/kvm_host.h | 82 ++ + virt/kvm/ioapic.c | 23 +- + virt/kvm/ioapic.h | 10 +- + virt/kvm/irq_comm.c | 60 ++ + virt/kvm/kvm_main.c | 382 ++++++++-- + virt/kvm/kvm_trace.c | 30 +- + virt/kvm/vtd.c | 191 +++++ + 68 files changed, 3970 insertions(+), 1366 deletions(-) + create mode 100644 arch/ia64/kvm/irq.h + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h + rename {drivers/pci => include/linux}/dma_remapping.h (100%) + rename {drivers/pci => include/linux}/intel-iommu.h (92%) + rename {drivers/pci => include/linux}/iova.h (100%) + create mode 100644 virt/kvm/irq_comm.c + create mode 100644 virt/kvm/vtd.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/md/dm-mpath.c +Merge made by recursive. + block/blk-core.c | 11 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 3 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/multipath.c | 4 +- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/scsi/constants.c | 3 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 3 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 3 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 6 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 3 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 - + drivers/scsi/iscsi_tcp.c | 44 +- + drivers/scsi/libiscsi.c | 183 +++- + drivers/scsi/lpfc/lpfc.h | 96 ++- + drivers/scsi/lpfc/lpfc_attr.c | 1375 +++++++++++++++++++++- + drivers/scsi/lpfc/lpfc_crtn.h | 51 +- + drivers/scsi/lpfc/lpfc_ct.c | 20 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 400 ++++++-- + drivers/scsi/lpfc/lpfc_disc.h | 23 + + drivers/scsi/lpfc/lpfc_els.c | 1712 +++++++++++++++++++++++++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 241 ++++- + drivers/scsi/lpfc/lpfc_hw.h | 183 +++- + drivers/scsi/lpfc/lpfc_init.c | 924 +++++++++++---- + drivers/scsi/lpfc/lpfc_mbox.c | 624 ++++++++-- + drivers/scsi/lpfc/lpfc_mem.c | 116 ++- + drivers/scsi/lpfc/lpfc_nl.h | 163 +++ + drivers/scsi/lpfc/lpfc_nportdisc.c | 24 +- + drivers/scsi/lpfc/lpfc_scsi.c | 514 ++++++++- + drivers/scsi/lpfc/lpfc_scsi.h | 5 + + drivers/scsi/lpfc/lpfc_sli.c | 1715 ++++++++++++++++++++++++--- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 168 +++- + drivers/scsi/lpfc/lpfc_vport.h | 4 + + drivers/scsi/qla2xxx/qla_attr.c | 1 - + drivers/scsi/qla2xxx/qla_isr.c | 14 +- + drivers/scsi/qla2xxx/qla_os.c | 26 +- + drivers/scsi/qla4xxx/ql4_isr.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi.c | 10 +- + drivers/scsi/scsi_error.c | 72 +- + drivers/scsi/scsi_lib.c | 106 ++- + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/scsi_transport_fc.c | 47 +- + drivers/scsi/scsi_transport_iscsi.c | 19 +- + drivers/scsi/scsi_transport_spi.c | 4 +- + drivers/scsi/sd.c | 17 +- + drivers/scsi/sd.h | 21 +- + drivers/scsi/sd_dif.c | 42 +- + include/linux/bio.h | 26 +- + include/linux/blkdev.h | 15 +- + include/scsi/iscsi_if.h | 2 + + include/scsi/libiscsi.h | 15 +- + include/scsi/scsi.h | 6 + + include/scsi/scsi_device.h | 10 + + include/scsi/scsi_transport_fc.h | 8 +- + include/scsi/scsi_transport_iscsi.h | 5 +- + 60 files changed, 8003 insertions(+), 1111 deletions(-) + create mode 100644 drivers/scsi/lpfc/lpfc_nl.h +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/mmap.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merged drivers/dma/ioat_dma.c +Merge made by recursive. + crypto/async_tx/async_tx.c | 34 +++--- + drivers/dma/Kconfig | 10 +- + drivers/dma/dmatest.c | 7 +- + drivers/dma/fsldma.c | 270 ++++++++++++++----------------------------- + drivers/dma/fsldma.h | 1 + + drivers/dma/ioat_dma.c | 2 - + 6 files changed, 116 insertions(+), 208 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Removed drivers/mtd/maps/ebony.c +Removed drivers/mtd/maps/ocotea.c +Removed drivers/mtd/maps/omap-toto-flash.c +Removed drivers/mtd/maps/walnut.c +Auto-merged drivers/mtd/mtdchar.c +Removed drivers/mtd/nand/toto.c +Auto-merged fs/Kconfig +Auto-merged include/linux/pci.h +Merge made by recursive. + Documentation/mtd/nand_ecc.txt | 714 +++++++++++++++++ + arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 44 +- + arch/arm/plat-mxc/include/mach/mxc_nand.h | 27 + + arch/arm/plat-omap/include/mach/onenand.h | 6 +- + drivers/mtd/Kconfig | 5 + + drivers/mtd/chips/Kconfig | 4 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 71 ++- + drivers/mtd/chips/cfi_probe.c | 58 +-- + drivers/mtd/chips/cfi_util.c | 66 ++- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/devices/Kconfig | 21 + + drivers/mtd/devices/m25p80.c | 140 +++-- + drivers/mtd/devices/mtd_dataflash.c | 214 +++++- + drivers/mtd/inftlcore.c | 5 +- + drivers/mtd/maps/Kconfig | 33 +- + drivers/mtd/maps/Makefile | 4 - + drivers/mtd/maps/ebony.c | 163 ---- + drivers/mtd/maps/ocotea.c | 154 ---- + drivers/mtd/maps/omap-toto-flash.c | 133 ---- + drivers/mtd/maps/pci.c | 18 +- + drivers/mtd/maps/physmap_of.c | 3 +- + drivers/mtd/maps/walnut.c | 122 --- + drivers/mtd/mtdchar.c | 4 +- + drivers/mtd/mtdconcat.c | 4 +- + drivers/mtd/mtdpart.c | 4 +- + drivers/mtd/nand/Kconfig | 36 +- + drivers/mtd/nand/Makefile | 3 +- + drivers/mtd/nand/atmel_nand.c | 58 +-- + drivers/mtd/nand/fsl_elbc_nand.c | 3 +- + drivers/mtd/nand/fsl_upm.c | 68 +- + drivers/mtd/nand/mxc_nand.c | 1077 ++++++++++++++++++++++++++ + drivers/mtd/nand/nand_base.c | 16 +- + drivers/mtd/nand/nand_ecc.c | 554 ++++++++++--- + drivers/mtd/nand/nandsim.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 147 ++-- + drivers/mtd/nand/sh_flctl.c | 301 +++++++ + drivers/mtd/nand/toto.c | 206 ----- + drivers/mtd/ofpart.c | 1 - + drivers/mtd/onenand/Kconfig | 8 + + drivers/mtd/onenand/Makefile | 1 + + drivers/mtd/onenand/omap2.c | 802 +++++++++++++++++++ + drivers/mtd/onenand/onenand_base.c | 2 +- + drivers/mtd/ssfdc.c | 3 +- + drivers/pci/rom.c | 6 +- + fs/Kconfig | 190 +----- + fs/jffs2/Kconfig | 188 +++++ + fs/jffs2/dir.c | 2 +- + fs/jffs2/erase.c | 4 +- + fs/jffs2/fs.c | 6 +- + include/linux/mtd/cfi.h | 9 +- + include/linux/mtd/flashchip.h | 4 + + include/linux/mtd/mtd.h | 4 +- + include/linux/mtd/nand.h | 1 + + include/linux/mtd/onenand_regs.h | 2 + + include/linux/mtd/partitions.h | 1 - + include/linux/mtd/sh_flctl.h | 125 +++ + include/linux/pci.h | 2 + + 57 files changed, 4380 insertions(+), 1470 deletions(-) + create mode 100644 Documentation/mtd/nand_ecc.txt + create mode 100644 arch/arm/plat-mxc/include/mach/mxc_nand.h + delete mode 100644 drivers/mtd/maps/ebony.c + delete mode 100644 drivers/mtd/maps/ocotea.c + delete mode 100644 drivers/mtd/maps/omap-toto-flash.c + delete mode 100644 drivers/mtd/maps/walnut.c + create mode 100644 drivers/mtd/nand/mxc_nand.c + create mode 100644 drivers/mtd/nand/sh_flctl.c + delete mode 100644 drivers/mtd/nand/toto.c + create mode 100644 drivers/mtd/onenand/omap2.c + create mode 100644 fs/jffs2/Kconfig + create mode 100644 include/linux/mtd/sh_flctl.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/camellia.c | 84 +++++++++------------- + crypto/testmgr.c | 7 ++- + drivers/crypto/hifn_795x.c | 5 ++ + drivers/crypto/talitos.c | 169 ++++++++++++++++++++++++++++---------------- + drivers/crypto/talitos.h | 11 +++- + 5 files changed, 165 insertions(+), 111 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merged arch/alpha/kernel/osf_sys.c +Auto-merged arch/parisc/hpux/fs.c +Auto-merged drivers/md/dm-table.c +Auto-merged fs/block_dev.c +Auto-merged fs/compat.c +Auto-merged fs/dcache.c +Auto-merged fs/dquot.c +Auto-merged fs/ecryptfs/main.c +Auto-merged fs/ext2/ext2.h +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/namei.c +CONFLICT (content): Merge conflict in fs/ext4/namei.c +Auto-merged fs/ext4/super.c +Auto-merged fs/fat/inode.c +Auto-merged fs/fuse/inode.c +Auto-merged fs/gfs2/ops_inode.c +Auto-merged fs/jffs2/dir.c +Auto-merged fs/nfs/dir.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged fs/nfsd/nfsctl.c +Auto-merged fs/nfsd/vfs.c +Auto-merged include/linux/fs.h +Auto-merged init/main.c +Auto-merged net/unix/af_unix.c +Resolved 'fs/ext4/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 8e23af7: Merge commit 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/osf_sys.c | 7 +- + arch/parisc/hpux/fs.c | 5 +- + arch/powerpc/platforms/cell/spufs/syscalls.c | 4 +- + drivers/md/dm-table.c | 21 +--- + fs/block_dev.c | 14 ++-- + fs/char_dev.c | 21 +++-- + fs/compat.c | 22 ++--- + fs/configfs/symlink.c | 16 ++-- + fs/dcache.c | 85 +++++++++--------- + fs/dquot.c | 10 +- + fs/ecryptfs/main.c | 23 ++--- + fs/efs/namei.c | 29 +----- + fs/exportfs/expfs.c | 16 ++-- + fs/ext2/dir.c | 14 ++-- + fs/ext2/ext2.h | 4 +- + fs/ext2/namei.c | 30 ++----- + fs/ext3/namei.c | 84 +++++++---------- + fs/ext3/super.c | 22 ++-- + fs/ext4/namei.c | 14 +--- + fs/ext4/super.c | 22 ++-- + fs/fat/inode.c | 52 ++++------- + fs/fuse/inode.c | 23 ++--- + fs/gfs2/ops_export.c | 33 ++----- + fs/gfs2/ops_inode.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 29 ++++-- + fs/hpfs/namei.c | 2 +- + fs/isofs/export.c | 33 +------ + fs/jffs2/dir.c | 4 +- + fs/jffs2/super.c | 48 ++++++++++ + fs/jfs/namei.c | 15 +--- + fs/libfs.c | 26 +----- + fs/namei.c | 75 +++++++-------- + fs/namespace.c | 126 ++++++++++++------------- + fs/nfs/dir.c | 6 +- + fs/nfs/getroot.c | 6 +- + fs/nfsd/export.c | 125 ++++++++++++------------- + fs/nfsd/nfs4recover.c | 50 +++++----- + fs/nfsd/nfs4state.c | 8 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/vfs.c | 126 ++++++++++++++++++++++--- + fs/ntfs/namei.c | 22 +---- + fs/ocfs2/export.c | 30 +----- + fs/read_write.c | 58 ++++++++---- + fs/readdir.c | 22 ++--- + fs/reiserfs/inode.c | 13 +-- + fs/reiserfs/namei.c | 11 +-- + fs/reiserfs/super.c | 18 ++-- + fs/super.c | 15 +-- + fs/udf/namei.c | 17 +--- + fs/xfs/linux-2.6/xfs_export.c | 32 +------ + fs/xfs/linux-2.6/xfs_file.c | 128 -------------------------- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- + include/linux/dcache.h | 2 +- + include/linux/fs.h | 1 - + include/linux/namei.h | 7 +- + init/main.c | 1 - + kernel/audit_tree.c | 48 +++++----- + net/unix/af_unix.c | 18 ++-- + 60 files changed, 724 insertions(+), 986 deletions(-) +$ git am -3 ../patches/0001-vfs-fix-up-merge-of-ext4.patch +Applying vfs: fix up merge of ext4 +$ git reset HEAD^ +fs/ext4/super.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit bf74588: Merge commit 'vfs/for-next' +Merging sound/for-next +$ git merge sound/for-next +Already uptodate! +Merge made by recursive. +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Removed net/9p/conv.c +Removed net/9p/fcprint.c +Merge made by recursive. + fs/9p/v9fs.c | 4 +- + fs/9p/v9fs_vfs.h | 6 +- + fs/9p/vfs_addr.c | 5 +- + fs/9p/vfs_dir.c | 60 ++- + fs/9p/vfs_file.c | 93 +++- + fs/9p/vfs_inode.c | 39 +- + fs/9p/vfs_super.c | 6 +- + include/net/9p/9p.h | 116 +--- + include/net/9p/client.h | 124 ++++- + include/net/9p/transport.h | 55 +-- + net/9p/Makefile | 3 +- + net/9p/client.c | 1467 +++++++++++++++++++++++++------------------- + net/9p/conv.c | 1054 ------------------------------- + net/9p/fcprint.c | 366 ----------- + net/9p/mod.c | 1 + + net/9p/protocol.c | 558 +++++++++++++++++ + net/9p/protocol.h | 34 + + net/9p/trans_fd.c | 1429 ++++++++++++++----------------------------- + net/9p/trans_virtio.c | 246 ++------- + net/9p/util.c | 4 + + 20 files changed, 2217 insertions(+), 3453 deletions(-) + delete mode 100644 net/9p/conv.c + delete mode 100644 net/9p/fcprint.c + create mode 100644 net/9p/protocol.c + create mode 100644 net/9p/protocol.h +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/md/md.c +Auto-merged drivers/media/video/cpia.c +Auto-merged drivers/media/video/usbvision/usbvision-core.c +Auto-merged drivers/media/video/usbvision/usbvision-video.c +Auto-merged drivers/media/video/v4l2-common.c +Auto-merged drivers/media/video/vino.c +Auto-merged drivers/media/video/w9968cf.c +Auto-merged drivers/mtd/mtdpart.c +Auto-merged drivers/net/ppp_generic.c +Auto-merged drivers/video/fbmem.c +Auto-merged fs/char_dev.c +Auto-merged include/linux/module.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/panic.c +Auto-merged net/bridge/netfilter/ebtables.c +Auto-merged net/core/dev.c +Auto-merged net/core/rtnetlink.c +Auto-merged net/ipv4/inet_diag.c +Auto-merged net/netfilter/nfnetlink.c +Auto-merged net/netlink/af_netlink.c +Resolved 'kernel/module.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b5b9b9e: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + drivers/md/md.c | 7 - + drivers/media/video/cpia.c | 4 - + drivers/media/video/usbvision/usbvision-core.c | 4 - + drivers/media/video/usbvision/usbvision-video.c | 4 - + drivers/media/video/v4l1-compat.c | 4 - + drivers/media/video/v4l2-common.c | 4 - + drivers/media/video/vino.c | 5 +- + drivers/media/video/w9968cf.c | 4 +- + drivers/mtd/mtdpart.c | 2 - + drivers/net/irda/sir_dongle.c | 2 - + drivers/net/ppp_generic.c | 10 +- + drivers/net/pppox.c | 9 +- + drivers/video/fbmem.c | 17 +-- + fs/char_dev.c | 3 - + fs/exec.c | 9 +- + fs/nls/nls_base.c | 21 +-- + include/linux/module.h | 6 +- + include/linux/moduleparam.h | 25 ++- + init/Kconfig | 6 - + init/main.c | 8 +- + kernel/kmod.c | 2 +- + kernel/module.c | 240 +++++++++----------- + kernel/panic.c | 17 +-- + kernel/params.c | 274 ++++++++++++----------- + net/bluetooth/af_bluetooth.c | 8 +- + net/bridge/netfilter/ebtables.c | 15 +- + net/can/af_can.c | 4 +- + net/core/dev.c | 2 - + net/core/rtnetlink.c | 4 +- + net/dccp/ccid.c | 2 +- + net/decnet/dn_dev.c | 2 - + net/ipv4/devinet.c | 2 - + net/ipv4/inet_diag.c | 2 - + net/ipv4/tcp_cong.c | 4 +- + net/netfilter/nfnetlink.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/sched/act_api.c | 2 +- + net/sched/cls_api.c | 2 +- + net/sched/ematch.c | 2 +- + net/sched/sch_api.c | 2 +- + net/socket.c | 2 +- + net/sunrpc/auth.c | 2 - + 42 files changed, 314 insertions(+), 434 deletions(-) +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/ops_dentry.h +Auto-merged fs/gfs2/ops_export.c +Removed fs/gfs2/ops_fstype.h +Auto-merged fs/gfs2/ops_inode.c +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/inode.c | 1 - + fs/gfs2/inode.h | 11 +++++++++++ + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_address.c | 16 +++++++--------- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 ----------------- + fs/gfs2/ops_export.c | 3 +-- + fs/gfs2/ops_file.c | 1 - + fs/gfs2/ops_fstype.c | 3 --- + fs/gfs2/ops_fstype.h | 19 ------------------- + fs/gfs2/ops_inode.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/ops_inode.h | 25 ------------------------- + fs/gfs2/ops_super.c | 8 ++++---- + fs/gfs2/ops_super.h | 17 ----------------- + fs/gfs2/super.h | 8 ++++++++ + fs/ioctl.c | 44 ++++++++++++++++++++++++++++++++++---------- + include/linux/fs.h | 3 +++ + 17 files changed, 117 insertions(+), 112 deletions(-) + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Auto-merged Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged drivers/input/keyboard/bf54x-keys.c +Auto-merged drivers/input/keyboard/gpio_keys.c +Auto-merged drivers/input/misc/yealink.c +Auto-merged drivers/input/mouse/Kconfig +Auto-merged drivers/input/mouse/Makefile +Auto-merged drivers/input/serio/i8042-x86ia64io.h +Auto-merged drivers/input/tablet/aiptek.c +Auto-merged drivers/input/touchscreen/ads7846.c +Auto-merged drivers/input/touchscreen/mainstone-wm97xx.c +Auto-merged drivers/input/touchscreen/wm9705.c +Auto-merged drivers/input/touchscreen/wm9712.c +Auto-merged drivers/input/touchscreen/wm9713.c +Auto-merged drivers/input/touchscreen/wm97xx-core.c +Auto-merged include/linux/Kbuild +Auto-merged include/linux/mod_devicetable.h +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1995abb: Merge commit 'input/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 1 + + MAINTAINERS | 2 +- + drivers/char/keyboard.c | 2 +- + drivers/input/gameport/gameport.c | 88 ++- + drivers/input/joystick/a3d.c | 3 +- + drivers/input/joystick/adi.c | 3 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/joystick/cobra.c | 3 +- + drivers/input/joystick/gf2k.c | 3 +- + drivers/input/joystick/grip.c | 3 +- + drivers/input/joystick/grip_mp.c | 3 +- + drivers/input/joystick/guillemot.c | 3 +- + drivers/input/joystick/interact.c | 3 +- + drivers/input/joystick/joydump.c | 3 +- + drivers/input/joystick/sidewinder.c | 3 +- + drivers/input/joystick/tmdc.c | 3 +- + drivers/input/keyboard/atkbd.c | 30 +- + drivers/input/keyboard/bf54x-keys.c | 13 +- + drivers/input/keyboard/gpio_keys.c | 42 +- + drivers/input/misc/Kconfig | 13 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ati_remote2.c | 263 +++++- + drivers/input/misc/cm109.c | 882 ++++++++++++++++++++ + drivers/input/misc/wistron_btns.c | 19 + + drivers/input/misc/yealink.c | 2 +- + drivers/input/mouse/Kconfig | 10 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/alps.c | 1 + + drivers/input/mouse/appletouch.c | 299 +++++-- + drivers/input/mouse/hgpk.c | 477 +++++++++++ + drivers/input/mouse/hgpk.h | 49 ++ + drivers/input/mouse/logips2pp.c | 4 +- + drivers/input/mouse/psmouse-base.c | 81 ++- + drivers/input/mouse/psmouse.h | 14 +- + drivers/input/mouse/trackpoint.c | 8 +- + drivers/input/serio/i8042-x86ia64io.h | 7 + + drivers/input/serio/serio_raw.c | 6 + + drivers/input/tablet/aiptek.c | 53 +- + drivers/input/touchscreen/ads7846.c | 94 ++- + drivers/input/touchscreen/atmel_tsadcc.c | 37 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 5 +- + drivers/input/touchscreen/wm9705.c | 5 +- + drivers/input/touchscreen/wm9712.c | 5 +- + drivers/input/touchscreen/wm9713.c | 5 +- + drivers/input/touchscreen/wm97xx-core.c | 5 +- + include/linux/Kbuild | 1 + + include/linux/gameport.h | 7 +- + include/linux/input.h | 15 +- + .../input/misc => include/linux}/map_to_7segment.h | 4 +- + include/linux/mod_devicetable.h | 2 +- + 50 files changed, 2252 insertions(+), 338 deletions(-) + create mode 100644 drivers/input/misc/cm109.c + create mode 100644 drivers/input/mouse/hgpk.c + create mode 100644 drivers/input/mouse/hgpk.h + rename {drivers/input/misc => include/linux}/map_to_7segment.h (98%) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged arch/arm/mach-lh7a40x/clocks.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged include/net/bluetooth/hci_core.h +Auto-merged net/9p/trans_virtio.c +CONFLICT (content): Merge conflict in net/9p/trans_virtio.c +Auto-merged net/bluetooth/hci_core.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'net/9p/trans_virtio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1f8d5d5: Merge commit 'semaphore-removal/semaphore-removal' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged drivers/uio/uio.c +Merge made by recursive. + drivers/uio/uio.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/ntfs/aops.c +Auto-merged fs/proc/nommu.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d9dd92b: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merged fs/ubifs/super.c +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 9 + + fs/ubifs/budget.c | 26 ++-- + fs/ubifs/debug.c | 79 +++++++-- + fs/ubifs/debug.h | 6 + + fs/ubifs/file.c | 260 ++++++++++++++++++++++++++ + fs/ubifs/find.c | 4 +- + fs/ubifs/gc.c | 90 ++++++++-- + fs/ubifs/io.c | 12 +- + fs/ubifs/key.h | 22 ++- + fs/ubifs/lprops.c | 34 +---- + fs/ubifs/lpt.c | 3 +- + fs/ubifs/lpt_commit.c | 187 ++++++++++++++++++- + fs/ubifs/misc.h | 27 +++ + fs/ubifs/scan.c | 2 +- + fs/ubifs/super.c | 109 +++++++++-- + fs/ubifs/tnc.c | 345 ++++++++++++++++++++++++++++++++--- + fs/ubifs/tnc_misc.c | 4 +- + fs/ubifs/ubifs-media.h | 1 - + fs/ubifs/ubifs.h | 85 +++++++-- + fs/ubifs/xattr.c | 2 +- + 20 files changed, 1149 insertions(+), 158 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merged block/blk-core.c +Auto-merged include/linux/bio.h +Auto-merged include/linux/interrupt.h +CONFLICT (content): Merge conflict in include/linux/interrupt.h +Auto-merged kernel/softirq.c +CONFLICT (content): Merge conflict in kernel/softirq.c +Auto-merged lib/Kconfig.debug +Resolved 'include/linux/interrupt.h' using previous resolution. +Resolved 'kernel/softirq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 78d0977: Merge commit 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + block/blk-core.c | 19 ++++++- + block/blk-merge.c | 20 ++++++- + block/elevator.c | 16 ++---- + block/genhd.c | 1 - + fs/partitions/check.c | 27 +++++++++- + include/linux/bio.h | 7 +++ + include/linux/interrupt.h | 24 ++++++++- + include/linux/smp.h | 4 +- + kernel/softirq.c | 131 ++++++++++++++++++++++++++++++++++++++++++++- + lib/Kconfig.debug | 5 ++ + 10 files changed, 232 insertions(+), 22 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/av7110.c +Removed drivers/media/dvb/ttpci/fdump.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Auto-merged drivers/scsi/qlogicpti.c +CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Auto-merged sound/isa/Kconfig +Auto-merged sound/isa/wavefront/wavefront_fx.c +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/scsi/qlogicpti.c' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 04c6606: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 121 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20560 insertions(+), 22498 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Auto-merged drivers/power/Kconfig +Auto-merged drivers/power/Makefile +CONFLICT (content): Merge conflict in drivers/power/Makefile +Auto-merged drivers/power/power_supply_core.c +Resolved 'drivers/power/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit bc5d5fa: Merge commit 'battery/master' +$ git diff -M --stat --summary HEAD^.. + drivers/power/Kconfig | 8 +- + drivers/power/Makefile | 3 +- + drivers/power/bq27x00_battery.c | 381 +++++++++++++++++++++++++++++++++++++ + drivers/power/pda_power.c | 11 +- + drivers/power/power_supply_core.c | 25 +++ + include/linux/power_supply.h | 6 + + 6 files changed, 428 insertions(+), 6 deletions(-) + create mode 100644 drivers/power/bq27x00_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merged drivers/leds/Kconfig +Merge made by recursive. + drivers/leds/Kconfig | 16 ++++ + drivers/leds/Makefile | 2 + + drivers/leds/leds-da903x.c | 175 ++++++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-backlight.c | 110 ++++++++++++++++++++++++ + include/linux/leds.h | 4 +- + 5 files changed, 305 insertions(+), 2 deletions(-) + create mode 100644 drivers/leds/leds-da903x.c + create mode 100644 drivers/leds/ledtrig-backlight.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merged drivers/leds/led-class.c +Merge made by recursive. + arch/arm/mach-pxa/include/mach/tosa.h | 3 + + arch/arm/mach-pxa/tosa.c | 21 +++- + drivers/leds/led-class.c | 5 +- + drivers/leds/leds-wrap.c | 5 +- + drivers/leds/ledtrig-timer.c | 8 +- + drivers/video/backlight/Kconfig | 25 +++ + drivers/video/backlight/Makefile | 4 + + drivers/video/backlight/da903x.c | 201 +++++++++++++++++++++++ + drivers/video/backlight/tosa_bl.c | 198 +++++++++++++++++++++++ + drivers/video/backlight/tosa_lcd.c | 280 +++++++++++++++++++++++++++++++++ + 10 files changed, 737 insertions(+), 13 deletions(-) + create mode 100644 drivers/video/backlight/da903x.c + create mode 100644 drivers/video/backlight/tosa_bl.c + create mode 100644 drivers/video/backlight/tosa_lcd.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + drivers/serial/serial_txx9.c | 113 ++++++++++++++++++++++++++++++++++-------- + 1 files changed, 92 insertions(+), 21 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged fs/dcache.c +Auto-merged fs/ext2/super.c +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Auto-merged fs/proc/inode.c +Auto-merged fs/reiserfs/super.c +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Auto-merged include/linux/fs.h +Auto-merged include/linux/mm.h +Auto-merged init/main.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/slob.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysctl/vm.txt | 12 + + Documentation/vm/kmemtrace.txt | 126 +++++++ + Documentation/vm/slabinfo.c | 95 +++++- + MAINTAINERS | 6 + + fs/buffer.c | 102 ++++++ + fs/dcache.c | 148 +++++++-- + fs/drop_caches.c | 2 +- + fs/ext2/super.c | 9 + + fs/ext3/super.c | 8 + + fs/ext4/super.c | 8 + + fs/inode.c | 123 +++++++ + fs/proc/inode.c | 8 + + fs/reiserfs/super.c | 8 + + fs/xfs/linux-2.6/xfs_super.c | 2 + + include/linux/fs.h | 6 + + include/linux/kmemtrace.h | 86 +++++ + include/linux/mm.h | 3 +- + include/linux/mmzone.h | 1 + + include/linux/page-flags.h | 2 + + include/linux/slab.h | 61 +++- + include/linux/slab_def.h | 68 +++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 69 ++++- + include/linux/swap.h | 3 + + init/main.c | 2 + + kernel/relay.c | 7 +- + kernel/sysctl.c | 20 + + lib/Kconfig.debug | 20 + + mm/Makefile | 2 +- + mm/kmemtrace.c | 333 +++++++++++++++++ + mm/slab.c | 79 ++++- + mm/slob.c | 37 ++- + mm/slub.c | 515 ++++++++++++++++++++++----- + mm/vmscan.c | 64 +++- + mm/vmstat.c | 4 +- + 37 files changed, 1943 insertions(+), 186 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/linux/kmemtrace.h + create mode 100644 mm/kmemtrace.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merged drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Auto-merged drivers/md/multipath.c +Recorded preimage for 'drivers/md/md.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/md/md.c'. +Created commit 091cd25: Merge commit 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/md/faulty.c | 2 + + drivers/md/linear.c | 133 +++++++++++++++++-------------------------- + drivers/md/md.c | 74 +++++++++++------------- + drivers/md/multipath.c | 9 --- + drivers/md/raid0.c | 5 -- + drivers/md/raid1.c | 1 + + drivers/md/raid10.c | 6 +- + drivers/md/raid5.c | 42 +++++++------- + drivers/md/raid6.h | 9 --- + include/linux/raid/linear.h | 10 ++- + include/linux/raid/md.h | 32 ++--------- + 11 files changed, 126 insertions(+), 197 deletions(-) +$ git am -3 ../patches/0001-Fix-do_mounts_md-use-of-msleep.patch +Applying Fix do_mounts_md use of msleep +$ git reset HEAD^ +init/do_mounts_md.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 20eb7bc: Merge commit 'md/for-next' +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'mm/Makefile' using previous resolution. +Resolved 'mm/slab.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 596e48a: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 135 +++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 87 +++++ + arch/x86/Makefile | 5 + + arch/x86/kernel/cpu/common.c | 11 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 756 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/dma-mapping.h | 2 + + include/asm-x86/kmemcheck.h | 42 ++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 8 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 +++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 +- + mm/Makefile | 1 + + mm/kmemcheck.c | 111 ++++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 2012 insertions(+), 109 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged arch/arm/mach-pxa/include/mach/tosa.h +Auto-merged arch/arm/mach-pxa/tosa.c +Merge made by recursive. + arch/arm/mach-pxa/include/mach/tosa.h | 2 - + arch/arm/mach-pxa/tosa.c | 37 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/mfd/Kconfig | 16 + + drivers/mfd/Makefile | 2 + + drivers/mfd/da903x.c | 563 ++++++++++++++++ + drivers/mfd/htc-egpio.c | 2 +- + drivers/mfd/mfd-core.c | 15 +- + drivers/mfd/sm501.c | 6 +- + drivers/mfd/t7l66xb.c | 40 +- + drivers/mfd/tc6387xb.c | 47 +- + drivers/mfd/tc6393xb.c | 296 +++++++-- + drivers/mfd/twl4030-core.c | 1193 +++++++++++++++++++++++++++++++++ + include/linux/i2c/twl4030.h | 339 ++++++++++ + include/linux/mfd/da903x.h | 201 ++++++ + include/linux/mfd/t7l66xb.h | 2 - + include/linux/mfd/tc6387xb.h | 3 - + include/linux/mfd/tc6393xb.h | 17 +- + 18 files changed, 2686 insertions(+), 97 deletions(-) + create mode 100644 drivers/mfd/da903x.c + create mode 100644 drivers/mfd/twl4030-core.c + create mode 100644 include/linux/i2c/twl4030.h + create mode 100644 include/linux/mfd/da903x.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Removed Documentation/DocBook/wanbook.tmpl +Removed drivers/net/wan/syncppp.c +Removed include/net/syncppp.h +Merge made by recursive. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 -- + Documentation/networking/generic-hdlc.txt | 8 +- + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- + drivers/net/wan/hd64572.c | 641 +++++++++++++ + drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300too.c | 73 +- + drivers/net/wan/pci200syn.c | 77 +- + drivers/net/wan/syncppp.c | 1479 ----------------------------- + include/net/syncppp.h | 102 -- + 14 files changed, 1357 insertions(+), 2046 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c + delete mode 100644 drivers/net/wan/syncppp.c + delete mode 100644 include/net/syncppp.h +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merged mm/shmem.c +Merge made by recursive. + arch/x86/mm/highmem_32.c | 1 + + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/drm_agpsupport.c | 51 +- + drivers/gpu/drm/drm_cache.c | 69 + + drivers/gpu/drm/drm_drv.c | 6 + + drivers/gpu/drm/drm_fops.c | 8 +- + drivers/gpu/drm/drm_gem.c | 421 ++++++ + drivers/gpu/drm/drm_irq.c | 464 +++++- + drivers/gpu/drm/drm_memory.c | 2 + + drivers/gpu/drm/drm_mm.c | 5 +- + drivers/gpu/drm/drm_proc.c | 135 ++- + drivers/gpu/drm/drm_stub.c | 11 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/i915_dma.c | 330 +++-- + drivers/gpu/drm/i915/i915_drv.c | 476 +------ + drivers/gpu/drm/i915/i915_drv.h | 1175 +++++----------- + drivers/gpu/drm/i915/i915_gem.c | 2517 ++++++++++++++++++++++++++++++++ + drivers/gpu/drm/i915/i915_gem_debug.c | 201 +++ + drivers/gpu/drm/i915/i915_gem_proc.c | 292 ++++ + drivers/gpu/drm/i915/i915_gem_tiling.c | 256 ++++ + drivers/gpu/drm/i915/i915_irq.c | 512 +++++-- + drivers/gpu/drm/i915/i915_opregion.c | 371 +++++ + drivers/gpu/drm/i915/i915_reg.h | 1417 ++++++++++++++++++ + drivers/gpu/drm/i915/i915_suspend.c | 509 +++++++ + drivers/gpu/drm/mga/mga_drv.c | 29 +- + drivers/gpu/drm/mga/mga_drv.h | 6 +- + drivers/gpu/drm/mga/mga_irq.c | 74 +- + drivers/gpu/drm/mga/mga_state.c | 2 +- + drivers/gpu/drm/r128/r128_drv.c | 29 +- + drivers/gpu/drm/r128/r128_drv.h | 11 +- + drivers/gpu/drm/r128/r128_irq.c | 55 +- + drivers/gpu/drm/r128/r128_state.c | 2 +- + drivers/gpu/drm/radeon/radeon_cp.c | 7 +- + drivers/gpu/drm/radeon/radeon_drv.c | 32 +- + drivers/gpu/drm/radeon/radeon_drv.h | 27 +- + drivers/gpu/drm/radeon/radeon_irq.c | 268 +++-- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/gpu/drm/sis/sis_mm.c | 10 +- + drivers/gpu/drm/via/via_drv.c | 26 +- + drivers/gpu/drm/via/via_drv.h | 16 +- + drivers/gpu/drm/via/via_irq.c | 105 +- + drivers/gpu/drm/via/via_mm.c | 3 +- + include/drm/drm.h | 63 +- + include/drm/drmP.h | 248 +++- + include/drm/i915_drm.h | 333 +++++ + mm/shmem.c | 1 + + 48 files changed, 8668 insertions(+), 1925 deletions(-) + create mode 100644 drivers/gpu/drm/drm_cache.c + create mode 100644 drivers/gpu/drm/drm_gem.c + create mode 100644 drivers/gpu/drm/i915/i915_gem.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_debug.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_proc.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_tiling.c + create mode 100644 drivers/gpu/drm/i915/i915_opregion.c + create mode 100644 drivers/gpu/drm/i915/i915_reg.h + create mode 100644 drivers/gpu/drm/i915/i915_suspend.c +Merging voltage/for-linus +$ git merge voltage/for-linus +Merge made by recursive. + drivers/Kconfig | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/char/vt.c +Auto-merged drivers/serial/8250.c +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + drivers/char/pty.c | 54 +++++++++- + drivers/char/tty_io.c | 31 ++---- + drivers/char/vt.c | 14 +-- + drivers/parport/parport_pc.c | 20 ++++- + drivers/serial/8250_pci.c | 211 +++++++++++++++++++++++++++++++++++++ + drivers/serial/bfin_5xx.c | 239 ++++++++++++++++++++++-------------------- + include/linux/pci_ids.h | 8 ++ + include/linux/tty.h | 3 +- + include/linux/tty_driver.h | 6 +- + 9 files changed, 437 insertions(+), 149 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging creds/next-creds-subsys +$ git merge creds/next-creds-subsys +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/powerpc/platforms/cell/spufs/inode.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/gpu/drm/drm_fops.c +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/core/inode.c +Auto-merged fs/9p/vfs_inode.c +Auto-merged fs/9p/vfs_super.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/compat.c +Auto-merged fs/dquot.c +Auto-merged fs/ecryptfs/main.c +Auto-merged fs/exec.c +Auto-merged fs/exportfs/expfs.c +Auto-merged fs/fat/inode.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/hpfs/namei.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/namei.c +Auto-merged fs/namespace.c +CONFLICT (content): Merge conflict in fs/namespace.c +Auto-merged fs/nfsd/nfs4recover.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c +Auto-merged fs/nfsd/nfsfh.c +Auto-merged fs/nfsd/vfs.c +Auto-merged fs/ocfs2/namei.c +Auto-merged fs/proc/array.c +Auto-merged fs/reiserfs/namei.c +Auto-merged fs/ubifs/budget.c +Auto-merged fs/udf/namei.c +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/xfs_inode.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/init_task.h +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/kmod.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +CONFLICT (content): Merge conflict in kernel/signal.c +Auto-merged kernel/sys.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/timer.c +Auto-merged kernel/trace/trace.c +Auto-merged lib/Makefile +Auto-merged mm/migrate.c +Auto-merged mm/shmem.c +Auto-merged net/9p/client.c +CONFLICT (content): Merge conflict in net/9p/client.c +Auto-merged net/core/dev.c +Auto-merged net/socket.c +Auto-merged net/sunrpc/auth.c +Auto-merged net/unix/af_unix.c +Auto-merged security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Resolved 'fs/namespace.c' using previous resolution. +Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'kernel/signal.c' using previous resolution. +Resolved 'net/9p/client.c' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b5c47dd: Merge commit 'creds/next-creds-subsys' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 582 +++++++++++++ + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/ia32/sys_ia32.c | 7 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 43 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/net/tun.c | 8 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 2 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 42 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 183 +++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/ext4/balloc.c | 5 +- + fs/ext4/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +-- + fs/nfsctl.c | 3 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 6 +- + fs/xfs/linux-2.6/xfs_globals.h | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- + fs/xfs/xfs_acl.c | 6 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 10 +- + include/keys/keyring-type.h | 31 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 2 - + include/linux/cred.h | 340 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 64 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 326 ++++---- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 57 +- + kernel/capability.c | 268 +------ + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 21 + + kernel/cred.c | 577 +++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 45 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 579 ++++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + kernel/workqueue.c | 8 +- + lib/Makefile | 2 +- + lib/is_single_threaded.c | 45 + + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 56 +- + security/commoncap.c | 699 ++++++++++------ + security/keys/internal.h | 47 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 468 +++++------ + security/keys/request_key.c | 133 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 96 +-- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1151 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 173 +++-- + security/smack/smackfs.c | 6 +- + 212 files changed, 5059 insertions(+), 3098 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c + create mode 100644 lib/is_single_threaded.c +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already uptodate! +Merge made by recursive. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Auto-merged drivers/acpi/battery.c +Auto-merged drivers/acpi/button.c +Auto-merged drivers/acpi/thermal.c +Auto-merged drivers/md/Kconfig +CONFLICT (content): Merge conflict in drivers/md/Kconfig +Auto-merged drivers/pci/pci.c +Auto-merged drivers/usb/host/ehci-hcd.c +Auto-merged drivers/usb/host/ohci-hcd.c +Auto-merged drivers/usb/host/uhci-hcd.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/init.h +CONFLICT (content): Merge conflict in include/linux/init.h +Auto-merged init/Kconfig +Auto-merged init/do_mounts.c +Auto-merged init/do_mounts_md.c +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged scripts/bootgraph.pl +CONFLICT (add/add): Merge conflict in scripts/bootgraph.pl +Resolved 'drivers/md/Kconfig' using previous resolution. +Resolved 'include/linux/init.h' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'scripts/bootgraph.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9e89cc8: Merge commit 'fastboot/auto-fastboot-next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/battery.c | 2 +- + drivers/acpi/button.c | 2 +- + drivers/acpi/thermal.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.c | 2 +- + include/asm-generic/vmlinux.lds.h | 6 ++- + include/linux/init.h | 8 ++++ + init/Kconfig | 11 +++++ + init/do_mounts.c | 2 + + init/do_mounts_md.c | 1 + + init/initramfs.c | 73 ++++++++++++++++++++++++++++------- + init/main.c | 77 +++++++++++++++++++++++++++++++++++- + 14 files changed, 166 insertions(+), 26 deletions(-) +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Renamed arch/x86/kernel/traps_32.c->arch/x86/kernel/traps.c +Auto-merged arch/x86/kernel/traps.c +CONFLICT (content): merge conflict in arch/x86/kernel/traps.c +Auto-merged arch/m68k/kernel/ints.c +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.cpu +Auto-merged arch/x86/Makefile_32.cpu +Auto-merged arch/x86/configs/i386_defconfig +Auto-merged arch/x86/configs/x86_64_defconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/acpi/boot.c +CONFLICT (delete/modify): arch/x86/kernel/apic_64.c deleted in sparseirq/auto-sparseirq-next and modified in HEAD. Version HEAD of arch/x86/kernel/apic_64.c left in tree. +Auto-merged arch/x86/kernel/cpu/common.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kernel/dumpstack_32.c +CONFLICT (add/add): Merge conflict in arch/x86/kernel/dumpstack_32.c +Auto-merged arch/x86/kernel/dumpstack_64.c +CONFLICT (add/add): Merge conflict in arch/x86/kernel/dumpstack_64.c +Auto-merged arch/x86/kernel/early-quirks.c +Auto-merged arch/x86/kernel/efi.c +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/genx2apic_uv_x.c +Removed arch/x86/kernel/io_apic_32.c +Auto-merged arch/x86/kernel/irqinit_64.c +Auto-merged arch/x86/kernel/process_32.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/smpboot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c +Auto-merged arch/x86/kernel/vmlinux_64.lds.S +Auto-merged arch/x86/mach-generic/es7000.c +Auto-merged arch/x86/mach-voyager/voyager_smp.c +Auto-merged arch/x86/mm/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged arch/x86/mm/ioremap.c +CONFLICT (content): Merge conflict in arch/x86/mm/ioremap.c +Auto-merged arch/x86/oprofile/nmi_int.c +CONFLICT (content): Merge conflict in arch/x86/oprofile/nmi_int.c +Auto-merged arch/x86/xen/enlighten.c +Auto-merged drivers/acpi/osl.c +Auto-merged drivers/char/hpet.c +Auto-merged drivers/char/random.c +Auto-merged drivers/mfd/htc-egpio.c +Auto-merged drivers/net/wan/sbni.c +Auto-merged drivers/pci/dmar.c +Auto-merged drivers/pci/intr_remapping.c +Auto-merged drivers/pcmcia/hd64465_ss.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged drivers/serial/8250.c +CONFLICT (content): Merge conflict in drivers/serial/8250.c +Auto-merged drivers/serial/cpm_uart/cpm_uart_core.c +Auto-merged drivers/serial/serial_core.c +Auto-merged drivers/serial/sh-sci.c +Auto-merged drivers/serial/ucc_uart.c +Auto-merged fs/proc/proc_misc.c +Auto-merged include/acpi/acpiosxf.h +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/asm-x86/dma-mapping.h +Auto-merged include/asm-x86/fixmap_32.h +Auto-merged include/asm-x86/fixmap_64.h +CONFLICT (content): Merge conflict in include/asm-x86/fixmap_64.h +Auto-merged include/asm-x86/idle.h +Auto-merged include/asm-x86/io_apic.h +Removed include/asm-x86/mach-generic/irq_vectors_limits.h +Auto-merged include/asm-x86/nmi.h +Auto-merged include/asm-x86/page.h +Auto-merged include/asm-x86/page_32.h +Auto-merged include/asm-x86/pgtable.h +CONFLICT (content): Merge conflict in include/asm-x86/pgtable.h +Auto-merged include/asm-x86/smp.h +Removed include/asm-x86/summit/irq_vectors_limits.h +Auto-merged include/asm-x86/system.h +Auto-merged include/linux/acpi.h +Auto-merged include/linux/init.h +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/kernel_stat.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Auto-merged init/main.c +Auto-merged kernel/irq/chip.c +CONFLICT (content): Merge conflict in kernel/irq/chip.c +Auto-merged kernel/irq/internals.h +Auto-merged kernel/irq/manage.c +Auto-merged lib/swiotlb.c +Resolved 'arch/x86/kernel/process_32.c' using previous resolution. +Resolved 'kernel/irq/chip.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 9e89cc8 Merge commit 'fastboot/auto-fastboot-next' +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged Documentation/ABI/testing/sysfs-bus-usb +CONFLICT (content): Merge conflict in Documentation/ABI/testing/sysfs-bus-usb +Auto-merged MAINTAINERS +Auto-merged arch/arm/Kconfig +Auto-merged arch/h8300/Kconfig +Auto-merged drivers/Kconfig +Recorded preimage for 'Documentation/ABI/testing/sysfs-bus-usb' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/ABI/testing/sysfs-bus-usb'. +Created commit 4fb9f4f: Merge commit 'uwb/for-upstream' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 11 + + Documentation/ABI/testing/sysfs-bus-umc | 28 + + Documentation/ABI/testing/sysfs-bus-usb | 43 + + Documentation/ABI/testing/sysfs-class-usb_host | 25 + + Documentation/ABI/testing/sysfs-class-uwb_rc | 144 ++ + Documentation/ABI/testing/sysfs-wusb_cbaf | 100 ++ + Documentation/usb/WUSB-Design-overview.txt | 448 ++++++ + Documentation/usb/wusb-cbaf | 139 ++ + MAINTAINERS | 17 + + arch/arm/Kconfig | 2 + + arch/cris/Kconfig | 2 + + arch/h8300/Kconfig | 2 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/host/Kconfig | 28 + + drivers/usb/host/Makefile | 3 + + drivers/usb/host/hwa-hc.c | 925 +++++++++++ + drivers/usb/host/whci/Kbuild | 11 + + drivers/usb/host/whci/asl.c | 367 +++++ + drivers/usb/host/whci/hcd.c | 339 ++++ + drivers/usb/host/whci/hw.c | 87 ++ + drivers/usb/host/whci/init.c | 188 +++ + drivers/usb/host/whci/int.c | 95 ++ + drivers/usb/host/whci/pzl.c | 398 +++++ + drivers/usb/host/whci/qset.c | 567 +++++++ + drivers/usb/host/whci/whcd.h | 197 +++ + drivers/usb/host/whci/whci-hc.h | 416 +++++ + drivers/usb/host/whci/wusb.c | 241 +++ + drivers/usb/wusbcore/Kconfig | 41 + + drivers/usb/wusbcore/Makefile | 26 + + drivers/usb/wusbcore/cbaf.c | 673 ++++++++ + drivers/usb/wusbcore/crypto.c | 538 +++++++ + drivers/usb/wusbcore/dev-sysfs.c | 143 ++ + drivers/usb/wusbcore/devconnect.c | 1314 ++++++++++++++++ + drivers/usb/wusbcore/mmc.c | 329 ++++ + drivers/usb/wusbcore/pal.c | 42 + + drivers/usb/wusbcore/reservation.c | 115 ++ + drivers/usb/wusbcore/rh.c | 477 ++++++ + drivers/usb/wusbcore/security.c | 642 ++++++++ + drivers/usb/wusbcore/wa-hc.c | 95 ++ + drivers/usb/wusbcore/wa-hc.h | 417 +++++ + drivers/usb/wusbcore/wa-nep.c | 310 ++++ + drivers/usb/wusbcore/wa-rpipe.c | 562 +++++++ + drivers/usb/wusbcore/wa-xfer.c | 1709 +++++++++++++++++++++ + drivers/usb/wusbcore/wusbhc.c | 418 +++++ + drivers/usb/wusbcore/wusbhc.h | 495 ++++++ + drivers/uwb/Kconfig | 90 ++ + drivers/uwb/Makefile | 29 + + drivers/uwb/address.c | 374 +++++ + drivers/uwb/beacon.c | 645 ++++++++ + drivers/uwb/driver.c | 144 ++ + drivers/uwb/drp-avail.c | 288 ++++ + drivers/uwb/drp-ie.c | 232 +++ + drivers/uwb/drp.c | 461 ++++++ + drivers/uwb/est.c | 485 ++++++ + drivers/uwb/hwa-rc.c | 926 +++++++++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 217 +++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 260 ++++ + drivers/uwb/i1480/dfu/mac.c | 529 +++++++ + drivers/uwb/i1480/dfu/phy.c | 203 +++ + drivers/uwb/i1480/dfu/usb.c | 500 ++++++ + drivers/uwb/i1480/i1480-est.c | 99 ++ + drivers/uwb/i1480/i1480-wlp.h | 200 +++ + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 284 ++++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 +++++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 368 +++++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 486 ++++++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 408 +++++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 632 ++++++++ + drivers/uwb/ie.c | 541 +++++++ + drivers/uwb/lc-dev.c | 492 ++++++ + drivers/uwb/lc-rc.c | 495 ++++++ + drivers/uwb/neh.c | 616 ++++++++ + drivers/uwb/pal.c | 91 ++ + drivers/uwb/reset.c | 362 +++++ + drivers/uwb/rsv.c | 680 +++++++++ + drivers/uwb/scan.c | 133 ++ + drivers/uwb/umc-bus.c | 218 +++ + drivers/uwb/umc-dev.c | 104 ++ + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 367 +++++ + drivers/uwb/uwb-internal.h | 305 ++++ + drivers/uwb/uwbd.c | 427 ++++++ + drivers/uwb/whc-rc.c | 528 +++++++ + drivers/uwb/whci.c | 269 ++++ + drivers/uwb/wlp/Makefile | 10 + + drivers/uwb/wlp/driver.c | 43 + + drivers/uwb/wlp/eda.c | 449 ++++++ + drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++++++ + drivers/uwb/wlp/sysfs.c | 709 +++++++++ + drivers/uwb/wlp/txrx.c | 374 +++++ + drivers/uwb/wlp/wlp-internal.h | 228 +++ + drivers/uwb/wlp/wlp-lc.c | 585 +++++++ + drivers/uwb/wlp/wss-lc.c | 1055 +++++++++++++ + include/linux/bitmap.h | 1 + + include/linux/usb/wusb-wa.h | 271 ++++ + include/linux/usb/wusb.h | 376 +++++ + include/linux/uwb.h | 765 ++++++++++ + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 + + include/linux/uwb/spec.h | 727 +++++++++ + include/linux/uwb/umc.h | 194 +++ + include/linux/uwb/whci.h | 117 ++ + include/linux/wlp.h | 735 +++++++++ + lib/bitmap.c | 22 + + 110 files changed, 35882 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-umc + create mode 100644 Documentation/ABI/testing/sysfs-class-usb_host + create mode 100644 Documentation/ABI/testing/sysfs-class-uwb_rc + create mode 100644 Documentation/ABI/testing/sysfs-wusb_cbaf + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/host/whci/Kbuild + create mode 100644 drivers/usb/host/whci/asl.c + create mode 100644 drivers/usb/host/whci/hcd.c + create mode 100644 drivers/usb/host/whci/hw.c + create mode 100644 drivers/usb/host/whci/init.c + create mode 100644 drivers/usb/host/whci/int.c + create mode 100644 drivers/usb/host/whci/pzl.c + create mode 100644 drivers/usb/host/whci/qset.c + create mode 100644 drivers/usb/host/whci/whcd.h + create mode 100644 drivers/usb/host/whci/whci-hc.h + create mode 100644 drivers/usb/host/whci/wusb.c + create mode 100644 drivers/usb/wusbcore/Kconfig + create mode 100644 drivers/usb/wusbcore/Makefile + create mode 100644 drivers/usb/wusbcore/cbaf.c + create mode 100644 drivers/usb/wusbcore/crypto.c + create mode 100644 drivers/usb/wusbcore/dev-sysfs.c + create mode 100644 drivers/usb/wusbcore/devconnect.c + create mode 100644 drivers/usb/wusbcore/mmc.c + create mode 100644 drivers/usb/wusbcore/pal.c + create mode 100644 drivers/usb/wusbcore/reservation.c + create mode 100644 drivers/usb/wusbcore/rh.c + create mode 100644 drivers/usb/wusbcore/security.c + create mode 100644 drivers/usb/wusbcore/wa-hc.c + create mode 100644 drivers/usb/wusbcore/wa-hc.h + create mode 100644 drivers/usb/wusbcore/wa-nep.c + create mode 100644 drivers/usb/wusbcore/wa-rpipe.c + create mode 100644 drivers/usb/wusbcore/wa-xfer.c + create mode 100644 drivers/usb/wusbcore/wusbhc.c + create mode 100644 drivers/usb/wusbcore/wusbhc.h + create mode 100644 drivers/uwb/Kconfig + create mode 100644 drivers/uwb/Makefile + create mode 100644 drivers/uwb/address.c + create mode 100644 drivers/uwb/beacon.c + create mode 100644 drivers/uwb/driver.c + create mode 100644 drivers/uwb/drp-avail.c + create mode 100644 drivers/uwb/drp-ie.c + create mode 100644 drivers/uwb/drp.c + create mode 100644 drivers/uwb/est.c + create mode 100644 drivers/uwb/hwa-rc.c + create mode 100644 drivers/uwb/i1480/Makefile + create mode 100644 drivers/uwb/i1480/dfu/Makefile + create mode 100644 drivers/uwb/i1480/dfu/dfu.c + create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h + create mode 100644 drivers/uwb/i1480/dfu/mac.c + create mode 100644 drivers/uwb/i1480/dfu/phy.c + create mode 100644 drivers/uwb/i1480/dfu/usb.c + create mode 100644 drivers/uwb/i1480/i1480-est.c + create mode 100644 drivers/uwb/i1480/i1480-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile + create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c + create mode 100644 drivers/uwb/ie.c + create mode 100644 drivers/uwb/lc-dev.c + create mode 100644 drivers/uwb/lc-rc.c + create mode 100644 drivers/uwb/neh.c + create mode 100644 drivers/uwb/pal.c + create mode 100644 drivers/uwb/reset.c + create mode 100644 drivers/uwb/rsv.c + create mode 100644 drivers/uwb/scan.c + create mode 100644 drivers/uwb/umc-bus.c + create mode 100644 drivers/uwb/umc-dev.c + create mode 100644 drivers/uwb/umc-drv.c + create mode 100644 drivers/uwb/uwb-debug.c + create mode 100644 drivers/uwb/uwb-internal.h + create mode 100644 drivers/uwb/uwbd.c + create mode 100644 drivers/uwb/whc-rc.c + create mode 100644 drivers/uwb/whci.c + create mode 100644 drivers/uwb/wlp/Makefile + create mode 100644 drivers/uwb/wlp/driver.c + create mode 100644 drivers/uwb/wlp/eda.c + create mode 100644 drivers/uwb/wlp/messages.c + create mode 100644 drivers/uwb/wlp/sysfs.c + create mode 100644 drivers/uwb/wlp/txrx.c + create mode 100644 drivers/uwb/wlp/wlp-internal.h + create mode 100644 drivers/uwb/wlp/wlp-lc.c + create mode 100644 drivers/uwb/wlp/wss-lc.c + create mode 100644 include/linux/usb/wusb-wa.h + create mode 100644 include/linux/usb/wusb.h + create mode 100644 include/linux/uwb.h + create mode 100644 include/linux/uwb/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/ib700wdt.c | 49 ++++++++++++++++-------------------------- + 1 files changed, 19 insertions(+), 30 deletions(-) +Merging proc/proc +$ git merge proc/proc +Already up-to-date. +$ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch +Applying sparc: qlogicpti fallout from sbus removal +Applying tip-core/powerpc: phys_addr_t has moved to linux/types.h +Applying v9fs: don't export static functions +Applying tpm: don't export static functions +Applying mfd/wm8350: don't export static functions diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..53949c6f54d3 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,343 @@ +Importing driver-core.current based on 2.6.27-git5 +$ git checkout quilt/driver-core.current +Switched to branch "quilt/driver-core.current" +$ git reset --hard 278429cff8809958d25415ba0ed32b59866ab1a8 +HEAD is now at 278429c Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +modules-fix-module-notes-kobject-leak.patch +Importing usb.current based on quilt/driver-core.current +$ git checkout quilt/usb.current +Switched to branch "quilt/usb.current" +$ git reset --hard 94d35affffc09074f86db177cd16c0abc90b9c50 +HEAD is now at 94d35af modules: fix module "notes" kobject leak +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-option-add-ericsson-f3507g-and-dell-5530.patch +usb-option.c-remove-duplicate-device-ids-now-supported-in-hso.c.patch +usb-add-oceanic-product-id-to-ftdi_sio.patch +usb-added-driver-for-a-delcom-usb-7-segment-led-display.patch +usb-add-usb-test-and-measurement-class-driver.patch +Importing m68k based on 278429cff8809958d25415ba0ed32b59866ab1a8 +$ git checkout quilt/m68k +Switched to branch "quilt/m68k" +$ git reset --hard 278429cff8809958d25415ba0ed32b59866ab1a8 +HEAD is now at 278429c Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +amiga-amiserial-no-serial-console-if-modular.diff +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard d0c4dbdc1dbed9abbd4a2aac915e659348011b8f +HEAD is now at d0c4dbd USB: add USB test and measurement class driver +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +sysfs-crash-debugging.patch +device-create-block-convert-device_create_drvdata-to-device_create.patch +device-create-char-convert-device_create_drvdata-to-device_create.patch +device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch +.dotest/patch:35: space before tab in indent. + MKDEV(IEEE1394_MAJOR, +warning: 1 line adds whitespace errors. +device-create-infiniband-convert-device_create_drvdata-to-device_create.patch +device-create-misc-convert-device_create_drvdata-to-device_create.patch +device-create-net-convert-device_create_drvdata-to-device_create.patch +device-create-s390-convert-device_create_drvdata-to-device_create.patch +device-create-scsi-convert-device_create_drvdata-to-device_create.patch +device-create-sound-convert-device_create_drvdata-to-device_create.patch +device-create-usb-convert-device_create_drvdata-to-device_create.patch +device-create-video-convert-device_create_drvdata-to-device_create.patch +device-create-ide-convert-device_create_drvdata-to-device_create.patch +device-create-remove-device_create_drvdata.patch +usb-gadget-link-fixes-for-serial-gadget.patch +usb-gadget-link-fixes-for-gadget-zero.patch +usb-gadget-link-fixes-for-midi-gadget.patch +usb-gadget-link-fixes-for-printer-gadget.patch +usb-gadget-link-fixes-for-storage-gadget.patch +usb-gadget-link-fixes-for-cdc-composite-gadget.patch +usb-gadget-link-fixes-for-network-gadget.patch +driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch +.dotest/patch:728: space before tab in indent. + $echo "set enabled=1 <module_name>" > dynamic_printk/modules +.dotest/patch:732: space before tab in indent. + $echo "set enabled=0 <module_name>" > dynamic_printk/modules +warning: 2 lines add whitespace errors. +driver-core-make-struct-platform_pm_ops-static.patch +sysfs-support-sysfs_notify-from-atomic-context-with-new-sysfs_notify_dirent.patch +drivers-firmware-iscsi_ibft.c-make-3-functions-static.patch +driver-core-clarify-device-cleanup.patch +driver-core-fix-cleanup-in-device_create_vargs.patch +device-model-do-a-quickcheck-for-driver-binding-before-doing-an-expensive-check.patch +sysfs-fix-deadlock.patch +debug-introduce-a-dev_warn-function.patch +debug-use-dev_warn-rather-than-warn_on-in-device_pm_add.patch +usb-turn-dev_warn-warn_on-combos-into-dev_warn.patch +driver-core-make-bus_find_device_by_name-more-robust.patch +pnp-create-device-attributes-via-default-device-attributes.patch +sysfs-use-ilookup5-instead-of-ilookup5_nowait.patch +platform-add-new-device-registration-helper.patch +sysfs-make-dir-and-name-args-to-sysfs_notify-const.patch +kobject-fix-kobject_rename-and-config_sysfs.patch +kobject-cleanup-kobject_rename-and-config_sysfs.patch +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +driver-core-add-bus_sort_breadthfirst-function.patch +.dotest/patch:21: space before tab in indent. + int (*compare)(const struct device *a, +.dotest/patch:42: space before tab in indent. + const struct device *b)) +.dotest/patch:141: space before tab in indent. + const struct device *b)); +warning: 3 lines add whitespace errors. +uio-add-alignment-warnings-for-uio-mem.patch +uio-change-driver-name-of-uio_pdrv.patch +uio-add-automata-sercos3-pci-card-support.patch +uio-fix-mapping-of-logical-and-virtual-memory.patch +driver-core-use-dev_get_drvdata-accessors.patch +acpi-fixup-typo-in-acpi_device_remove.patch +pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch +warn-when-statically-allocated-kobjects-are-used.patch +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard e449d4fe051818602429d4d90827918f9bd5cd40 +HEAD is now at e449d4f warn when statically-allocated kobjects are used +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +drivers-usb-class-usblp.c-adjust-error-handling-code.patch +usb-kill-urbs-permanently.patch +usb-extend-poisoning-to-anchors.patch +ub-remove-sg_stat.patch +usb-let-some-usb-host-controllers-get-irq-flags-from-resource.patch +usb-gadget-kconfig-cleanup.patch +usb-gadget-dummy_hcd-implement-set_wedge.patch +usb-gadget-net2280-implement-set_wedge.patch +usb-gadget-function-activation-deactivation.patch +usb-gadget-cdc-obex-glue.patch +usb-gadget-defer-obex-enumeration.patch +usb-remove-unused-include-version.h.patch +usb-drivers-usb-misc-use-an-is_err-test-rather-than-a-null-test.patch +usb-add-freescale-qe-cpm-usb-peripheral-controller-driver.patch +usb-storage-report-underflow-with-no-sense-data.patch +ohci-allow-broken-controllers-to-auto-stop.patch +usb-documentation-usb-anchors.txt-2.patch +usb-core-fix-usb_otg_blacklist_hub-typo.patch +usb-ftdi_sio-fix-product-parameter-description.patch +usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch +usb-serial-sierra-debug-message-fix.patch +usb-fix-doc-for-usb_autopm_enable.patch +usb-fix-spelling-in-usb-serial.h.patch +usb-g_printer-fix-handling-zero-length-packet.patch +usb-gadget-workaround-storage-command-size-issues.patch +usb-ehci-dbg-increase-debug-buffer-size-for-periodic-file.patch +usb-ehci-dbg-fix-reading-less-content-of-periodic-file.patch +usb-change-hub-initialization-sleeps-to-delayed_work.patch +.dotest/patch:178: space before tab in indent. + hub_power_on(hub, true); +warning: 1 line adds whitespace errors. +usbmon-fix-tiny-race-exposed-by-the-fastboot-patches.patch +usb-remove-code-associated-with-config_ppc_merge.patch +musb-add-sanity-check-for-maximum-number-of-endpoints.patch +usb-gadget-usb_gadget_vbus_draw-kconfig-option.patch +usb-fix-s3c2410_udc-usb-speed-handling.patch +musb-io-only-define-read-write-stubs-if-they-re-not-defined-yet.patch +omap-musb-fixes-the-tt-programming.patch +omap-musb-corrects-urb-unlink-function-path.patch +usb-musb-do-not-mess-up-count-number-and-csr0-register-value.patch +usb-musb_hdrc-build-fixes.patch +usb-musb-general-cleanup-to-musbhsdma.c.patch +usb-musb-remove-dead-code-from-procfs.patch +usb-ohci-omap-handle-other-omap15xx-chips.patch +usb-omap_udc-sync-with-omap-tree.patch +usb-gadget-cdc-ethernet-notification-bugfix.patch +usb-vstusb.c-new-driver-for-spectrometers-used-by-vernier-software-technology-inc.patch +usb-ti_usb_3410_5052-removed-duplicated-include.patch +usb-uhci-improve-scheduling-of-interrupt-urbs.patch +usb-improve-ehci_watchdog-s-side-effect-in-cpu-power-management.patch +usb-isp1760-use-an-is_err-test-rather-than-a-null-test.patch +usb-ftdi-elan-always-pass-usb_bulk_msg-a-timeout-in-milliseconds.patch +usb-anchor-api-changes-needed-for-btusb.patch +usb-ehci-ohci-uhci-remove-version-numbers.patch +usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch +usb-option-anydata-new-modem-same-id.patch +usb-snoop-processes-opening-usbfs-device-files.patch +usb-ehci-fix-remote-wakeup-support-for-arc-tdi-core.patch +usb-export-if-an-interface-driver-supports-autosuspend.patch +usb-ohci-add-support-for-tmio-ohci-cell.patch +usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch +usb-option-add-pantech-cards.patch +usb-ohci-fix-endless-polling-behavior.patch +usb-fix-up-problems-in-the-vtusb-driver.patch +fsl_usb2_udc-make-dr_ep_setup-function-static.patch +fsl_usb2_udc-remove-check-for-udc-null-in-dr_controller_setup.patch +fsl_usb2_udc-fix-some-sparse-warnings-and-remove-redundant-code.patch +fsl_usb2_udc-clean-up-whitespace-in-errors-and-warnings.patch +fsl_usb2_udc-clean-up-whitespace-in-proc-debugging-output.patch +fsl_usb2_udc-initialize-spinlock-earlier.patch +fsl_usb2_udc-rename-the-arguments-of-the-fsl_writel-macro.patch +fsl_usb2_udc-uninline-udc_reset_ep_queue.patch +fsl_usb2_udc-make-fsl_queue_td-return-type-void.patch +fsl_usb2_udc-add-a-wmb-before-priming-endpoint.patch +fsl_usb2_udc-fix-oops-on-probe-failure.patch +usb-fsl_qe_udc-fix-response-to-get-status-request.patch +usb-fsl_qe_udc-clear-data-toggle-on-clear-halt-request.patch +hso-fix-hso_serial_close-refcounting.patch +hso-put-linefeeds-on-printk-s-in-hso.c.patch +usb-remove-warn-macro-from-usb-input-drivers.patch +usb-remove-warn-macro-from-usb-media-drivers.patch +usb-remove-warn-macro-from-usb-net-drivers.patch +usb-remove-warn-macro-from-usb-drivers.patch +usb-remove-warn-macro-from-hid-core.patch +usb-remove-warn-macro-from-usb.h.patch +usb-remove-info-macro-from-usb-serial-drivers.patch +usb-remove-info-macro-from-usb-misc-drivers.patch +usb-remove-info-macro-from-remaining-usb-drivers.patch +.dotest/patch:33: space before tab in indent. + USB_ENDPOINT_DIR_MASK + info->epnum +warning: 1 line adds whitespace errors. +usb-remove-info-macro-from-usb-network-drivers.patch +usb-remove-info-macro-from-usb-input-drivers.patch +usb-remove-info-macro-from-usb-mtd-drivers.patch +usb-remove-info-macro-from-usb.h.patch +usb-remove-use-of-err-in-drivers-usb-serial.patch +usb-remove-err-macro-from-usb-class-drivers.patch +usb-remove-err-macro-from-usb-core-code.patch +usb-remove-err-macro-from-usb-misc-drivers.patch +usb-remove-err-macro-from-more-usb-drivers.patch +usb-gotemp.patch +Importing device-mapper based on v2.6.27-3976-g7591103 +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 7591103c08abade60aeddb432ed0686ddd0de1c6 +HEAD is now at 7591103 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-kcopyd-avoid-queue-shuffle.patch +dm-snapshot-fix-primary_pe-race.patch +dm-publish-array_too_big.patch +dm-remove-dm-header-from-targets.patch +dm-crypt-tidy-sector.patch +Importing i2c based on 2.6.27-git5 +$ git checkout quilt/i2c +Switched to branch "quilt/i2c" +$ git reset --hard 278429cff8809958d25415ba0ed32b59866ab1a8 +HEAD is now at 278429c Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-i801-smbus-patch-for-intel-ibex-peak-deviceids.patch +i2c-algo-pcf-01-pass-adapter-data-into-waitforpin-method.patch +i2c-algo-pcf-03-fix-typo-in-debugging-log-message.patch +Importing jdelvare-hwmon based on 2.6.27-git5 +$ git checkout quilt/jdelvare-hwmon +Switched to branch "quilt/jdelvare-hwmon" +$ git reset --hard 278429cff8809958d25415ba0ed32b59866ab1a8 +HEAD is now at 278429c Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-lm90-01-function-for-16-bit-read.patch +hwmon-lm90-02-max6657-extra-local-res.patch +hwmon-lm90-03-max6657-has-no-low-limit-bytes.patch +hwmon-lm90-04-update-links.patch +hwmon-lm90-05-convert-some-macros-to-static-functions.patch +hwmon-lm90-06-support-adt7461-in-extended-mode.patch +hwmon-lm90-07-rename-temperature-conversion-functions.patch +hwmon-lm90-08-support-max6646-max6647-and-max6649.patch +hwmon-lm90-09-dont-spam-the-log.patch +hwmon-lm87-01-fix-masking-of-config-register-in-lm87_init_client.patch +hwmon-lm87-02-restore-original-configuration-register-on-removal.patch +hwmon-lm87-03-add-support-for-configuration-through-platform_data.patch +hwmon-ams-01-convert-to-new-style-i2c.patch +hwmon-ams-02-fix-permissions-on-joystick-module-parameter.patch +hwmon-ams-03-fix-locking-issues.patch +hwmon-ams-04-simplify-irq-handling-routine.patch +hwmon-lm85-01-rework-the-device-detection.patch +hwmon-lm85-02-standard-pwm-freq-interface.patch +hwmon-lm85-03-pwm-freq-closest-match.patch +hwmon-lm85-04-second-pwm-freq-table.patch +hwmon-lm85-05-convert-to-new-style-i2c.patch +hwmon-lm85-06-optimize-RANGE_TO_REG.patch +hwmon-lm85-07-improve-label-names.patch +hwmon-lm78-01-fix-pnp-io-conflict.patch +hwmon-lm78-02-alias-detect.patch +hwmon-lm78-03-fix-winbond-misdetection.patch +hwmon-lm78-04-dont-abuse-i2c_client.patch +hwmon-lm78-05-convert-to-new-style-i2c.patch +hwmon-it87-fix-thermal-sensor-types.patch +hwmon-max1619-convert-macros-to-inline-functions.patch +hwmon-w83791d-01-fan-4-5-pins-can-also-be-used-for-gpio.patch +hwmon-w83791d-02-add-manual-PWM-support.patch +hwmon-w83791d-03-add-pwm_enable-support.patch +.dotest/patch:17: space before tab in indent. + fan 1-3. Fan/PWM 4-5 only support manual mode. +warning: 1 line adds whitespace errors. +hwmon-w83791d-04-add-support-for-thermal-cruise-mode.patch +hwmon-update-datasheet-links.patch +hwmon-w83781d-01-refactor-beep-enable.patch +hwmon-w83781d-02-alias-detect.patch +hwmon-w83781d-03-more-info-on-as99127f-pwm.patch +hwmon-w83781d-04-make-isa-interface-depend-on-config_isa.patch +hwmon-w83781d-05-dont-abuse-i2c_client.patch +hwmon-w83781d-06-use-new-style-driver-binding.patch +hwmon-ibmpex-automatically-load-on-ibm-systems.patch +hwmon-ibmaem-automatically-load-on-ibm-systems.patch +hwmon-adt7470-add-documentation.patch +hwmon-adm1029-use-mask-for-fan_div-value.patch +hwmon-adm1026-01-fix-debug-messages.patch +hwmon-adm1026-02-prevent-log-spamming.patch +Unchanged quilt series kernel-doc +Importing ide based on 278429cff8809958d25415ba0ed32b59866ab1a8 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 278429cff8809958d25415ba0ed32b59866ab1a8 +HEAD is now at 278429c Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-add-tx4939ide-driver-v3.patch +ide-disk-fix-ide_dflag_lba48-handling-on-resume.patch +ide-disk-lock-media-before-checking-for-media-change.patch +ide-floppy-use-alloc_disk_node.patch +ide-disk-use-to_ide_drv-and-ide_drv_g.patch +ide-disk-move-ide_dflag_doorlocking-flag-handling-to-idedisk_set_doorlock.patch +ide-disk-floppy-set-ide_dflag_attach-in-_setup.patch +ide-floppy-drop-floppy-argument-from-idefloppy_setup.patch +ide-floppy-use-drive-capacity64-for-caching-current-capacity.patch +ide-ide_aflag_media_changed-to-ide_dflag_media_changed.patch +ide-ide_aflag_wp-to-ide_dflag_wp.patch +ide-ide_aflag_format_in_progress-to-ide_dflag_format_in_progress.patch +ide-remove-ide_aflag_no_doorlocking.patch +ide-disk-factor-out-generic-disk-handling-code-to-ide-gd-c.patch +ide-disk-use-ide_dflag_media_changed.patch +ide-floppy-factor-out-generic-disk-handling-code-to-ide-gd-floppy-c.patch +ide-prepare-for-merging-ide-gd-floppy-c-with-ide-gd-c.patch +ide-allow-device-drivers-to-specify-per-device-type-proc-settings.patch +ide-add-generic-ata-atapi-disk-driver.patch +ide-cd-debug-log-enhancements.patch +ide-cd-small-drive-type-print-fix.patch +ide-cd-remove-stale-comment.patch +ide-fix-support-for-ide-pci-controllers-using-mmio-on-frv.patch +ide-remove-dead-asm-arm-arch-sa1100-ide-h.patch +ide-remove-m68k_ide_swapw-define-from-asm-m68k-ide-h.patch +ide-remove-unused-macros-from-asm-parisc-ide-h.patch +hpt366-fix-compile-warning.patch +ide-mask-interrupt-in-ide_config_drive_speed.patch +hpt366-cleanup-maskproc-method.patch +sgiioc4-remove-maskproc-method.patch +Unchanged quilt series rr +Importing ttydev based on 7591103c08abade60aeddb432ed0686ddd0de1c6 +$ git checkout quilt/ttydev +Switched to branch "quilt/ttydev" +$ git reset --hard 7591103c08abade60aeddb432ed0686ddd0de1c6 +HEAD is now at 7591103 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +serial-mend-irqs +8250-oxsemi +.dotest/patch:154: trailing whitespace. + +.dotest/patch:179: space before tab in indent. + pci_oxsemi_tornado_init(dev, board); +.dotest/patch:180: trailing whitespace. + +.dotest/patch:191: space before tab in indent. + { PCI_VENDOR_ID_OXSEMI, 0xc101, /* OXPCIe952 1 Legacy UART */ +.dotest/patch:194: space before tab in indent. + { PCI_VENDOR_ID_OXSEMI, 0xc105, /* OXPCIe952 1 Legacy UART */ +warning: squelched 2 whitespace errors +warning: 7 lines add whitespace errors. +tty-lock-setid +blackfin-kgdb +blackfin-sir-stopfix +blackfin-clean-early +blackfin-rxtx-lock +blackfin-clear-bi +pty-simplify-resize diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..28e845a5eca6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20081016 |