diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-02 20:07:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-02 20:07:41 +1100 |
| commit | 039b0d7fa4a3d3ec65b006c5c6c3d306b2f3962b (patch) | |
| tree | 4c2a375f4d2aa05a6b117bd8c91bcb58e26e4535 | |
| parent | 03d3fa669f45dde35e1e4e1ec6f1a7fac52d7818 (diff) | |
Add linux-next specific files for 20090102next-20090102
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 133 | ||||
| -rw-r--r-- | Next/Trees | 135 | ||||
| -rw-r--r-- | Next/merge.log | 5705 | ||||
| -rw-r--r-- | Next/quilt-import.log | 117 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6091 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..95b10ca062ba --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,133 @@ +Name SHA1 +---- ---- +origin b58602a4bac012b5f4fc12fe6b46ab237b610d5d +arm-current b58602a4bac012b5f4fc12fe6b46ab237b610d5d +m68k-current aa6eeeef78263e9891185c6cfaaf64808460a54a +powerpc-merge 55dac3a5553b13891f0ae4bbd11920619b5436d4 +sparc-current 878a5535957b563c447d32866a9e606c55fef091 +scsi-rc-fixes 508859405e33797342d42cda3e731464c2bcd7a8 +net-current eb4dea5853046727bfbb579f0c9a8cae7369f7c6 +sound-current 6a94cb73064c952255336cc57731904174b2c58f +pci-current 3e3d0e9246d0eccc1da800348fc1b9199ae3d768 +wireless-current 3298a7388c00227e736d1037328788073c80c7b4 +kbuild-current bf1b36445dc868cbbde194aa1dd87e38fe24cf16 +driver-core.current 929096fe9ff1f4b3645cf3919527ab47e8d5e17c +usb.current 7bf2a098d46648a359e80217da56bd71c7fd17a2 +cpufreq-current bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e +input-current 1dd3294677d5484e4813c6c454ba7f192a3ef61d +md-current a2ed9615e3222645007fc19991aedf30eed3ecfd +audit-current c05a63c58c2884c4db00308ba5eb0dbac2fb5ac9 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm bdbb861f75c2bd94480316d3318dff280f4f5ce4 +avr32 2fa41ac5e825a7ed6764fdbcba65b98d8b3bee11 +blackfin 62273eeb6ac516ab0abf49417378726ad8875b03 +cris 0db42c6b23ce26b05b235dbe2e0aa096db194e33 +ia64 8b1fae4e4200388b64dd88065639413cb3f1051c +m68k 66c04f16a0aaf2e0ec34161563ed6d5e91ba457f +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 378fe7c4cc619b561409206605c723c05358edac +powerpc ca9153a3a2a7556d091dfe080e42b0e67881fff6 +4xx ca9153a3a2a7556d091dfe080e42b0e67881fff6 +galak 068e8c9d02ee37c44a4d65279b3ae8188fb09e18 +pxa 9a8585e138d7d6285d50ab3cf3cce4fdb9d4dbd1 +s390 2a6aaa9f129945607c9dd42f609c72431bf12b5c +sh 59de580af1c2fd671b0cb27c41ff958859ae5288 +sparc e3c6d4ee545e427b55882d97d3b663c6411645fe +x86 226cf6bc3b83a3c3d2434c9b9061021a302b0c9f +xtensa 5fee325e7d2bcbebf1cb38b4ff3a7aa3744c43e3 +driver-core 77bc13253b537968208927fed966d34fee912e18 +usb c716dbaf83d7e81fe569e821895ad05c6d8310d3 +tip-core 70d79df1c1b7068c02655955357b33b0fb57f525 +cpus4096 97e59939109fa5a10ce90e8d34a4166d6e5ad137 +ftrace e2b544796ba6c407567bfcb4ed2920ca9b4a88cd +genirq 1faa44855f8f1e9b2cd46e9227ad23c3301556c1 +safe-poison-pointers 286c12f72ad295bbc27cfe67b0922bfc09732af7 +sched 7f2e9653ba258a561b9380e875ba6131642fb0ec +stackprotector a9de18eb761f7c1c860964b2e5addc1a35c7e861 +timers 74541be1cd6480943f84ae9116bfad1c90f1d3c0 +pci 66aef641dcf129fc8d8e6e797d0ad71881bc4e0a +device-mapper ef6550830ad0e770a0c592fe3e22e78d0b684707 +hid a55b730d48ec9ef3787d1378c07e36dad7c4550f +i2c fe9ae364c851becfeef4a0475d7db0f496d1df9a +jdelvare-hwmon c2a437b912fa9324ca25ad6ea32b5a26f1df1ef3 +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb 6a94cb73064c952255336cc57731904174b2c58f +jfs d69e83d99cf87e3328c47bb54684360e32aef17d +kbuild 1f71c478dadbe1425eeaa704e50c7030ab011c5b +ide eaac9708a462b5d3b9ba28af3b16b7e3bdd45e8a +libata 0adb81b1e2e3019219b946d86070df32f08a3562 +nfs 6a94cb73064c952255336cc57731904174b2c58f +xfs 0a8c5395f90f06d128247844b2515c8bf3f2826b +infiniband 6a94cb73064c952255336cc57731904174b2c58f +acpi c7b84be7611b447a1a70ff4313f21a2b40bb9705 +nfsd a2f8463da9ec0018013c2e2b12a2b05bb45b821f +ieee1394 7bd1ac603c1ee82cbbe1395a35dbd9090368a018 +ubi f2863c54f30cccb50661697a6e4bdcd0ad0b0a6c +kvm 42ea0db3a2e0a0519a999abf89e2300f5221842a +dlm 722d74219ea21223c74e5e894b0afcc5e4ca75a7 +scsi fb5edd020fa0fbe991f4a473611ad530d2237425 +ocfs2 811d30152c6bdb0cab723b13a78c42cba1566e2d +ext4 1d5e145e366262c9ee63601ef0b11553e7be0c5e +async_tx e03ed4f50257bd9f8990ed3cc6512ff222ec78d9 +udf 0f675c1b6ef06b8f08c2a78ad99efd4e50c2603d +net 3c92ec8ae91ecf59d88c798301833d7cf83f2179 +mtd 160bbab3000dafccbe43688e48208cecf4deb879 +wireless 9cf7f247bd0cd21e475c71a4e018bb612ef02aab +crypto 0ee4a96902dd7858e65f378c86f428a0355bd841 +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound 52fd270b28c283cd45a8de28ee84d352233a8a96 +cpufreq 187d9f4ed4fc089f1f25a875fb485e27626972f9 +v9fs f1d9e4586e79e1fc7b26d1c567599a904013f199 +rr_cpumask 8c384cdee3e04d6194a2c2b192b624754f990835 +rr 84571b00ce0813fe96e8fe030bde8561b3076543 +cifs 3c92ec8ae91ecf59d88c798301833d7cf83f2179 +mmc 418f19ea17a99421b22a64e101e14b6a16bed66d +gfs2 a95b5b8af40786f6d13e5570e25a6ce8608eb793 +input e941da3110422c4e57c3d05759fb9475b28f45f6 +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 877d79ef6ad6a67bb8582b7013e0d6f56a77e5ba +ubifs 8e5033adc78ff4fbeab7052134e7af1f6ff04187 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block d3f761104b097738932afcc310fbbbbfb007ef92 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 26b06189dcf12e67f3552327ae2ba5e3053730fe +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds d528785f4a5583ddd7a921e4b2501e71243c61b8 +backlight bf1fd5da75006877efdd11d5f90beef74ea7053e +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab 3c506efd7e0f615bd9603ce8c06bc4a896952599 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 774c910d35402b9fced9a9f16a094fd5fb9c8100 +kmemcheck 72accebb513bcb4ab345719135baf5d242464dac +generic-ipi 6a94cb73064c952255336cc57731904174b2c58f +mfd dc5c04f0a25b54a639d8e6b96f53b29987dee29b +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm aa5966296675a5092505f68d72563d5939a92353 +voltage b6fe1c783638104350147877f5823d8faa68f6a2 +security-testing 81ea714bf148fce35e931edcbdfd3aedda20d1dc +lblnet 6d3dc07cbb1e88deed2e8710e215f232a56b1dce +ttydev 493bb5a2fe0e14de8e6907fab92ac2608e5369ad +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +oprofile 6a94cb73064c952255336cc57731904174b2c58f +fastboot 6a94cb73064c952255336cc57731904174b2c58f +sparseirq ac8931efd29418a669d66831a818e2ff736e4e82 +iommu 2fcc1536fdbd8cca41914cae39a9b4919999657c +uwb 3af373021fa32f8f787bfbdcc1a9277a287bde4e +watchdog e006c92dcb613eeb651c2999c2df5ffae2c308a4 +proc 788ff43b53179f3af8677d59c87104aff1f75bde +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b4e7781aee2f03a6f9577a4268c96d6072be59d +cpu_alloc c905c8806c7df091085a66bab590c3ee499b86cc +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd 0e39696e8e1f9859a50f111645a825e9bbe8f5f2 +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 5d9ec854bfb6f1e122b1d96b344164a71eac5be8 +jc_docs 2884f00b94be73a6a7875bada739bf9bb2f9a1b6 +nommu d10f9907ba3626261f45dbb498867f441f06c486 +trivial 402d76a27e1e5fc3d11d6ca93c1e11947daad4d3 +audit b3985e2bf6ce51ae943208af4bd336287fb34ed6 +staging a75ba4c0c38b3a9a150130801ad2744fb6226666 +scsi-post-merge 6b101f1ded7062a53dc4a0d6e024547391dab892 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..90a95b3fc2f6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,135 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr_cpumask git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask.git#master +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 +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cpu_alloc git git://git.kernel.org/pub/scm/linux/kernel/git/christoph/work.git#cpu_alloc +cputime git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..25f205362b0d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5705 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 3c92ec8 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc +Merging origin/master +$ git merge origin/master +Updating 3c92ec8..b58602a +Fast forward + Documentation/RCU/00-INDEX | 2 + + Documentation/RCU/trace.txt | 413 +++ + Documentation/arm/pxa/mfp.txt | 286 ++ + Documentation/block/biodoc.txt | 6 +- + Documentation/dvb/technisat.txt | 69 + + Documentation/fb/pxafb.txt | 92 +- + Documentation/filesystems/Locking | 2 - + Documentation/filesystems/files.txt | 6 +- + Documentation/filesystems/vfs.txt | 5 +- + Documentation/filesystems/xfs.txt | 4 - + Documentation/lguest/lguest.c | 66 +- + Documentation/lockstat.txt | 51 +- + Documentation/scsi/cxgb3i.txt | 85 + + Documentation/video4linux/API.html | 43 +- + Documentation/video4linux/CARDLIST.bttv | 7 +- + Documentation/video4linux/CARDLIST.cx23885 | 1 + + Documentation/video4linux/CARDLIST.cx88 | 5 +- + Documentation/video4linux/CARDLIST.em28xx | 9 +- + Documentation/video4linux/CARDLIST.saa7134 | 3 +- + Documentation/video4linux/README.cx88 | 8 +- + Documentation/video4linux/gspca.txt | 19 +- + Documentation/video4linux/v4l2-framework.txt | 520 +++ + MAINTAINERS | 7 + + Makefile | 9 +- + arch/Kconfig | 2 + + arch/alpha/include/asm/io.h | 3 - + arch/alpha/kernel/init_task.c | 1 - + arch/arm/Kconfig | 71 +- + arch/arm/Makefile | 7 +- + arch/arm/boot/compressed/Makefile | 4 - + arch/arm/boot/compressed/head-clps7500.S | 86 - + arch/arm/boot/compressed/head.S | 20 +- + arch/arm/boot/compressed/misc.c | 2 + + arch/arm/common/Kconfig | 3 + + arch/arm/common/Makefile | 1 + + arch/arm/common/clkdev.c | 128 + + arch/arm/common/locomo.c | 1 + + arch/arm/common/vic.c | 8 +- + arch/arm/configs/eseries_pxa_defconfig | 326 +-- + arch/arm/configs/h5000_defconfig | 996 ++++++ + arch/arm/configs/kirkwood_defconfig | 329 ++- + arch/arm/configs/ks8695_defconfig | 707 +++-- + arch/arm/configs/mx31moboard_defconfig | 790 +++++ + arch/arm/configs/mx31pdk_defconfig | 773 +++++ + arch/arm/configs/neocore926_defconfig | 1302 +++++++ + arch/arm/configs/netx_defconfig | 6 +- + arch/arm/configs/omap3_pandora_defconfig | 1409 ++++++++ + arch/arm/configs/omap_ldp_defconfig | 148 +- + arch/arm/configs/picotux200_defconfig | 6 +- + arch/arm/configs/realview-smp_defconfig | 718 +++-- + arch/arm/configs/realview_defconfig | 763 +++-- + arch/arm/configs/s3c6400_defconfig | 845 +++++ + arch/arm/configs/w90p910_defconfig | 626 ++++ + arch/arm/include/asm/cacheflush.h | 37 +- + arch/arm/include/asm/clkdev.h | 30 + + arch/arm/include/asm/dma-mapping.h | 4 +- + arch/arm/include/asm/dma.h | 24 +- + arch/arm/include/asm/hardware/iomd.h | 41 - + arch/arm/include/asm/hardware/vic.h | 10 +- + arch/arm/include/asm/hwcap.h | 1 + + arch/arm/include/asm/io.h | 8 + + arch/arm/include/asm/irq.h | 4 - + arch/arm/include/asm/memory.h | 7 +- + arch/arm/include/asm/mmu_context.h | 1 + + arch/arm/include/asm/mtd-xip.h | 1 - + arch/arm/include/asm/page.h | 32 +- + arch/arm/include/asm/processor.h | 2 +- + arch/arm/include/asm/setup.h | 6 +- + arch/arm/include/asm/smp.h | 6 +- + arch/arm/include/asm/string.h | 9 - + arch/arm/include/asm/system.h | 2 - + arch/arm/include/asm/uaccess.h | 5 +- + arch/arm/kernel/armksyms.c | 1 + + arch/arm/kernel/ftrace.c | 2 +- + arch/arm/kernel/head-common.S | 2 +- + arch/arm/kernel/init_task.c | 1 - + arch/arm/kernel/module.c | 4 +- + arch/arm/kernel/setup.c | 57 +- + arch/arm/kernel/smp.c | 4 +- + arch/arm/kernel/thumbee.c | 2 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/arm/lib/Makefile | 1 - + arch/arm/lib/memset.S | 2 +- + arch/arm/mach-aaec2000/Makefile | 2 +- + arch/arm/mach-aaec2000/clock.c | 99 - + arch/arm/mach-aaec2000/clock.h | 23 - + arch/arm/mach-aaec2000/core.c | 29 +- + arch/arm/mach-aaec2000/include/mach/dma.h | 9 - + arch/arm/mach-aaec2000/include/mach/io.h | 6 +- + arch/arm/mach-aaec2000/include/mach/memory.h | 3 - + arch/arm/mach-at91/Kconfig | 15 +- + arch/arm/mach-at91/Makefile | 13 +- + arch/arm/mach-at91/at91cap9.c | 8 + + arch/arm/mach-at91/at91cap9_devices.c | 36 +- + arch/arm/mach-at91/at91rm9200_time.c | 9 + + arch/arm/mach-at91/at91sam9260_devices.c | 38 +- + arch/arm/mach-at91/at91sam9261_devices.c | 17 +- + arch/arm/mach-at91/at91sam9263_devices.c | 17 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 11 - + arch/arm/mach-at91/board-cam60.c | 30 +- + arch/arm/mach-at91/board-cap9adk.c | 77 +- + arch/arm/mach-at91/board-neocore926.c | 397 +++ + arch/arm/mach-at91/board-qil-a9260.c | 35 +- + arch/arm/mach-at91/board-sam9-l9260.c | 35 +- + arch/arm/mach-at91/board-sam9260ek.c | 37 +- + arch/arm/mach-at91/board-sam9261ek.c | 80 +- + arch/arm/mach-at91/board-sam9263ek.c | 36 +- + arch/arm/mach-at91/board-sam9g20ek.c | 36 +- + arch/arm/mach-at91/board-sam9rlek.c | 32 +- + arch/arm/mach-at91/board-usb-a9260.c | 35 +- + arch/arm/mach-at91/board-usb-a9263.c | 36 +- + arch/arm/mach-at91/include/mach/at91_pmc.h | 7 + + arch/arm/mach-at91/include/mach/at91cap9.h | 4 +- + arch/arm/mach-at91/include/mach/cpu.h | 15 + + arch/arm/mach-at91/include/mach/dma.h | 19 - + arch/arm/mach-at91/include/mach/io.h | 4 +- + arch/arm/mach-at91/include/mach/memory.h | 11 - + arch/arm/mach-at91/sam9_smc.c | 47 + + arch/arm/mach-at91/sam9_smc.h | 33 + + arch/arm/mach-clps711x/include/mach/dma.h | 19 - + arch/arm/mach-clps711x/include/mach/io.h | 6 +- + arch/arm/mach-clps711x/include/mach/memory.h | 20 +- + arch/arm/mach-clps7500/Makefile | 11 - + arch/arm/mach-clps7500/Makefile.boot | 2 - + arch/arm/mach-clps7500/core.c | 395 --- + arch/arm/mach-clps7500/include/mach/acornfb.h | 33 - + arch/arm/mach-clps7500/include/mach/debug-macro.S | 21 - + arch/arm/mach-clps7500/include/mach/dma.h | 21 - + arch/arm/mach-clps7500/include/mach/entry-macro.S | 16 - + arch/arm/mach-clps7500/include/mach/hardware.h | 67 - + arch/arm/mach-clps7500/include/mach/io.h | 255 -- + arch/arm/mach-clps7500/include/mach/irq.h | 32 - + arch/arm/mach-clps7500/include/mach/irqs.h | 66 - + arch/arm/mach-clps7500/include/mach/memory.h | 43 - + arch/arm/mach-clps7500/include/mach/system.h | 23 - + arch/arm/mach-clps7500/include/mach/timex.h | 13 - + arch/arm/mach-clps7500/include/mach/uncompress.h | 35 - + arch/arm/mach-clps7500/include/mach/vmalloc.h | 4 - + arch/arm/mach-davinci/include/mach/dma.h | 16 - + arch/arm/mach-davinci/include/mach/io.h | 3 +- + arch/arm/mach-davinci/include/mach/memory.h | 7 +- + arch/arm/mach-davinci/include/mach/vmalloc.h | 1 - + arch/arm/mach-ebsa110/include/mach/dma.h | 11 - + arch/arm/mach-ebsa110/include/mach/memory.h | 7 - + arch/arm/mach-ep93xx/Kconfig | 6 + + arch/arm/mach-ep93xx/Makefile | 1 + + arch/arm/mach-ep93xx/adssphere.c | 7 +- + arch/arm/mach-ep93xx/clock.c | 68 +- + arch/arm/mach-ep93xx/core.c | 40 + + arch/arm/mach-ep93xx/edb9302.c | 7 +- + arch/arm/mach-ep93xx/edb9302a.c | 9 +- + arch/arm/mach-ep93xx/edb9307.c | 9 +- + arch/arm/mach-ep93xx/edb9307a.c | 68 + + arch/arm/mach-ep93xx/edb9312.c | 9 +- + arch/arm/mach-ep93xx/edb9315.c | 9 +- + arch/arm/mach-ep93xx/edb9315a.c | 9 +- + arch/arm/mach-ep93xx/gesbc9312.c | 7 +- + arch/arm/mach-ep93xx/include/mach/clkdev.h | 7 + + arch/arm/mach-ep93xx/include/mach/dma.h | 3 - + arch/arm/mach-ep93xx/include/mach/gpio.h | 2 + + arch/arm/mach-ep93xx/include/mach/io.h | 4 +- + arch/arm/mach-ep93xx/include/mach/memory.h | 4 - + arch/arm/mach-ep93xx/include/mach/platform.h | 1 + + arch/arm/mach-ep93xx/micro9.c | 89 +- + arch/arm/mach-ep93xx/ts72xx.c | 21 +- + arch/arm/mach-footbridge/cats-hw.c | 1 + + arch/arm/mach-footbridge/common.c | 1 + + arch/arm/mach-footbridge/dc21285-timer.c | 1 + + arch/arm/mach-footbridge/dc21285.c | 1 + + arch/arm/mach-footbridge/dma.c | 1 + + arch/arm/mach-footbridge/ebsa285.c | 1 + + arch/arm/mach-footbridge/include/mach/hardware.h | 14 +- + arch/arm/mach-footbridge/include/mach/io.h | 3 +- + .../include/mach/{dma.h => isa-dma.h} | 2 +- + arch/arm/mach-footbridge/include/mach/memory.h | 9 + + arch/arm/mach-footbridge/isa-irq.c | 1 + + arch/arm/mach-footbridge/netwinder-hw.c | 54 +- + arch/arm/mach-footbridge/netwinder-leds.c | 7 +- + arch/arm/mach-footbridge/personal.c | 1 + + arch/arm/mach-h720x/include/mach/io.h | 4 +- + .../mach-h720x/include/mach/{dma.h => isa-dma.h} | 9 +- + arch/arm/mach-h720x/include/mach/memory.h | 20 +- + arch/arm/mach-imx/dma.c | 7 +- + arch/arm/mach-imx/include/mach/imx-dma.h | 12 +- + arch/arm/mach-imx/include/mach/imxfb.h | 50 +- + arch/arm/mach-imx/include/mach/io.h | 4 +- + arch/arm/mach-imx/include/mach/memory.h | 10 - + arch/arm/mach-integrator/clock.c | 80 +- + arch/arm/mach-integrator/clock.h | 25 - + arch/arm/mach-integrator/core.c | 35 + + arch/arm/mach-integrator/impd1.c | 26 +- + arch/arm/mach-integrator/include/mach/clkdev.h | 25 + + arch/arm/mach-integrator/include/mach/dma.h | 19 - + arch/arm/mach-integrator/include/mach/memory.h | 13 +- + arch/arm/mach-integrator/integrator_cp.c | 18 +- + arch/arm/mach-iop13xx/include/mach/dma.h | 3 - + arch/arm/mach-iop13xx/include/mach/memory.h | 16 +- + arch/arm/mach-iop13xx/include/mach/timex.h | 2 - + arch/arm/mach-iop32x/include/mach/dma.h | 9 - + arch/arm/mach-iop32x/include/mach/io.h | 2 +- + arch/arm/mach-iop32x/include/mach/memory.h | 13 - + arch/arm/mach-iop32x/include/mach/system.h | 3 +- + arch/arm/mach-iop32x/include/mach/timex.h | 3 - + arch/arm/mach-iop33x/include/mach/dma.h | 9 - + arch/arm/mach-iop33x/include/mach/io.h | 2 +- + arch/arm/mach-iop33x/include/mach/memory.h | 13 - + arch/arm/mach-iop33x/include/mach/system.h | 1 + + arch/arm/mach-iop33x/include/mach/timex.h | 3 - + arch/arm/mach-ixp2000/include/mach/dma.h | 9 - + arch/arm/mach-ixp2000/include/mach/memory.h | 7 - + arch/arm/mach-ixp23xx/include/mach/dma.h | 3 - + arch/arm/mach-ixp23xx/include/mach/io.h | 2 - + arch/arm/mach-ixp23xx/include/mach/memory.h | 13 - + arch/arm/mach-ixp4xx/include/mach/dma.h | 21 - + arch/arm/mach-ixp4xx/include/mach/io.h | 4 +- + arch/arm/mach-ixp4xx/include/mach/memory.h | 13 +- + arch/arm/mach-kirkwood/common.c | 59 + + arch/arm/mach-kirkwood/common.h | 1 + + arch/arm/mach-kirkwood/include/mach/dma.h | 1 - + arch/arm/mach-kirkwood/include/mach/gpio.h | 38 + + arch/arm/mach-kirkwood/include/mach/irqs.h | 5 +- + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 - + arch/arm/mach-kirkwood/include/mach/memory.h | 4 - + arch/arm/mach-kirkwood/irq.c | 35 + + arch/arm/mach-kirkwood/rd88f6281-setup.c | 16 +- + arch/arm/mach-ks8695/Kconfig | 6 + + arch/arm/mach-ks8695/Makefile | 1 + + arch/arm/mach-ks8695/board-dsm320.c | 131 + + arch/arm/mach-ks8695/board-micrel.c | 3 + + arch/arm/mach-ks8695/devices.c | 38 +- + arch/arm/mach-ks8695/gpio.c | 44 +- + arch/arm/mach-ks8695/include/mach/dma.h | 17 - + arch/arm/mach-ks8695/include/mach/gpio.h | 49 +- + arch/arm/mach-ks8695/include/mach/io.h | 4 +- + arch/arm/mach-ks8695/include/mach/memory.h | 5 - + arch/arm/mach-l7200/include/mach/dma.h | 23 - + arch/arm/mach-l7200/include/mach/io.h | 10 +- + arch/arm/mach-l7200/include/mach/memory.h | 3 - + arch/arm/mach-lh7a40x/clocks.c | 92 +- + arch/arm/mach-lh7a40x/include/mach/io.h | 6 +- + arch/arm/mach-lh7a40x/include/mach/memory.h | 10 - + arch/arm/mach-loki/include/mach/dma.h | 1 - + arch/arm/mach-loki/include/mach/memory.h | 4 - + arch/arm/mach-msm/include/mach/io.h | 6 +- + arch/arm/mach-msm/include/mach/memory.h | 4 - + arch/arm/mach-mv78xx0/common.c | 1 + + arch/arm/mach-mv78xx0/include/mach/dma.h | 1 - + arch/arm/mach-mv78xx0/include/mach/gpio.h | 40 + + arch/arm/mach-mv78xx0/include/mach/irqs.h | 4 +- + arch/arm/mach-mv78xx0/include/mach/memory.h | 4 - + arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 3 - + arch/arm/mach-mv78xx0/irq.c | 29 + + arch/arm/mach-mx1/Kconfig | 14 + + arch/arm/mach-mx1/Makefile | 10 + + arch/arm/mach-mx1/Makefile.boot | 4 + + arch/arm/mach-mx1/clock.c | 656 ++++ + arch/arm/mach-mx1/crm_regs.h | 55 + + arch/arm/mach-mx1/devices.c | 260 ++ + arch/arm/mach-mx1/devices.h | 7 + + .../include/mach/dma.h => mach-mx1/generic.c} | 29 +- + arch/arm/mach-mx1/mx1ads.c | 148 + + arch/arm/mach-mx2/devices.c | 46 +- + arch/arm/mach-mx2/devices.h | 3 +- + arch/arm/mach-mx2/mx27ads.c | 61 +- + arch/arm/mach-mx2/pcm038.c | 82 +- + arch/arm/mach-mx3/Kconfig | 14 + + arch/arm/mach-mx3/Makefile | 2 + + arch/arm/mach-mx3/clock.c | 1 + + arch/arm/mach-mx3/devices.c | 40 +- + arch/arm/mach-mx3/devices.h | 2 + + arch/arm/mach-mx3/iomux.c | 9 +- + arch/arm/mach-mx3/mx31moboard.c | 141 + + arch/arm/mach-mx3/mx31pdk.c | 115 + + arch/arm/mach-mx3/pcm037.c | 70 + + arch/arm/mach-netx/fb.c | 7 +- + arch/arm/mach-netx/include/mach/dma.h | 21 - + arch/arm/mach-netx/include/mach/io.h | 2 +- + arch/arm/mach-netx/include/mach/memory.h | 10 - + arch/arm/mach-netx/include/mach/netx-regs.h | 22 + + arch/arm/mach-netx/time.c | 98 +- + arch/arm/mach-netx/xc.c | 6 +- + arch/arm/mach-ns9xxx/include/mach/dma.h | 14 - + arch/arm/mach-ns9xxx/include/mach/hardware.h | 2 - + arch/arm/mach-ns9xxx/include/mach/io.h | 2 +- + arch/arm/mach-ns9xxx/include/mach/memory.h | 3 - + arch/arm/mach-omap1/Kconfig | 3 + + arch/arm/mach-omap1/board-fsample.c | 7 +- + arch/arm/mach-omap1/board-h2-mmc.c | 89 +- + arch/arm/mach-omap1/board-h2.c | 49 +- + arch/arm/mach-omap1/board-h3-mmc.c | 100 +- + arch/arm/mach-omap1/board-h3.c | 19 +- + arch/arm/mach-omap1/board-innovator.c | 52 +- + arch/arm/mach-omap1/board-nokia770.c | 86 +- + arch/arm/mach-omap1/board-osk.c | 43 +- + arch/arm/mach-omap1/board-palmte.c | 15 +- + arch/arm/mach-omap1/board-palmtt.c | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 34 +- + arch/arm/mach-omap1/board-perseus2.c | 7 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 80 +- + arch/arm/mach-omap1/board-sx1.c | 21 +- + arch/arm/mach-omap1/board-voiceblue.c | 59 +- + arch/arm/mach-omap1/clock.h | 3 +- + arch/arm/mach-omap1/devices.c | 90 + + arch/arm/mach-omap1/fpga.c | 6 +- + arch/arm/mach-omap1/id.c | 53 +- + arch/arm/mach-omap1/leds-h2p2-debug.c | 10 +- + arch/arm/mach-omap1/leds-osk.c | 4 +- + arch/arm/mach-omap1/leds.c | 8 +- + arch/arm/mach-omap1/pm.c | 6 +- + arch/arm/mach-omap1/serial.c | 10 +- + arch/arm/mach-omap2/Kconfig | 4 + + arch/arm/mach-omap2/Makefile | 14 +- + arch/arm/mach-omap2/board-2430sdp.c | 52 +- + arch/arm/mach-omap2/board-apollon.c | 26 +- + arch/arm/mach-omap2/board-generic.c | 11 - + arch/arm/mach-omap2/board-h4.c | 25 +- + arch/arm/mach-omap2/board-ldp.c | 97 +- + arch/arm/mach-omap2/board-omap3beagle.c | 90 + + arch/arm/mach-omap2/board-omap3pandora.c | 212 ++ + arch/arm/mach-omap2/board-overo.c | 43 + + arch/arm/mach-omap2/clock24xx.h | 9 +- + arch/arm/mach-omap2/clock34xx.c | 2 +- + arch/arm/mach-omap2/clock34xx.h | 46 +- + arch/arm/mach-omap2/devices.c | 169 + + arch/arm/mach-omap2/id.c | 305 +- + arch/arm/mach-omap2/irq.c | 39 + + arch/arm/mach-omap2/mmc-twl4030.c | 408 +++ + arch/arm/mach-omap2/mmc-twl4030.h | 29 + + arch/arm/mach-omap2/mux.c | 44 +- + arch/arm/mach-omap2/usb-tusb6010.c | 6 +- + arch/arm/mach-orion5x/Makefile | 2 +- + arch/arm/mach-orion5x/common.c | 1 + + arch/arm/mach-orion5x/common.h | 7 - + arch/arm/mach-orion5x/dns323-setup.c | 174 +- + arch/arm/mach-orion5x/gpio.c | 231 -- + arch/arm/mach-orion5x/include/mach/dma.h | 1 - + arch/arm/mach-orion5x/include/mach/gpio.h | 29 +- + arch/arm/mach-orion5x/include/mach/io.h | 7 +- + arch/arm/mach-orion5x/include/mach/irqs.h | 4 +- + arch/arm/mach-orion5x/include/mach/memory.h | 4 - + arch/arm/mach-orion5x/include/mach/orion5x.h | 9 - + arch/arm/mach-orion5x/irq.c | 183 +- + arch/arm/mach-orion5x/mpp.c | 6 +- + arch/arm/mach-pnx4008/dma.c | 3 +- + arch/arm/mach-pnx4008/include/mach/dma.h | 2 - + arch/arm/mach-pnx4008/include/mach/io.h | 4 +- + arch/arm/mach-pnx4008/include/mach/memory.h | 5 +- + arch/arm/mach-pxa/Kconfig | 44 +- + arch/arm/mach-pxa/Makefile | 5 +- + arch/arm/mach-pxa/am200epd.c | 19 +- + arch/arm/mach-pxa/clock.c | 67 +- + arch/arm/mach-pxa/clock.h | 59 +- + arch/arm/mach-pxa/cm-x2xx.c | 29 +- + arch/arm/mach-pxa/cm-x300.c | 5 +- + arch/arm/mach-pxa/corgi.c | 32 + + arch/arm/mach-pxa/cpufreq-pxa2xx.c | 57 +- + arch/arm/mach-pxa/devices.c | 95 +- + arch/arm/mach-pxa/devices.h | 1 + + arch/arm/mach-pxa/dma.c | 2 +- + arch/arm/mach-pxa/e330.c | 36 +- + arch/arm/mach-pxa/e350.c | 36 +- + arch/arm/mach-pxa/e400.c | 67 +- + arch/arm/mach-pxa/e740.c | 46 +- + arch/arm/mach-pxa/e750.c | 36 +- + arch/arm/mach-pxa/e800.c | 30 + + arch/arm/mach-pxa/eseries.c | 124 + + arch/arm/mach-pxa/eseries.h | 12 + + arch/arm/mach-pxa/ezx.c | 701 ++++- + arch/arm/mach-pxa/generic.c | 16 + + arch/arm/mach-pxa/gpio.c | 59 +- + arch/arm/mach-pxa/gumstix.c | 22 +- + arch/arm/mach-pxa/h5000.c | 200 ++ + arch/arm/mach-pxa/imote2.c | 575 ++++ + arch/arm/mach-pxa/include/mach/clkdev.h | 7 + + arch/arm/mach-pxa/include/mach/dma.h | 4 - + arch/arm/mach-pxa/include/mach/eseries-gpio.h | 4 +- + arch/arm/mach-pxa/include/mach/gumstix.h | 4 + + arch/arm/mach-pxa/include/mach/h5000.h | 113 + + arch/arm/mach-pxa/include/mach/hardware.h | 52 +- + arch/arm/mach-pxa/include/mach/io.h | 6 +- + arch/arm/mach-pxa/include/mach/littleton.h | 11 +- + arch/arm/mach-pxa/include/mach/memory.h | 11 +- + arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 31 + + arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 6 + + arch/arm/mach-pxa/include/mach/mfp-pxa930.h | 1 + + arch/arm/mach-pxa/include/mach/mioa701.h | 9 +- + arch/arm/mach-pxa/include/mach/mtd-xip.h | 1 + + arch/arm/mach-pxa/include/mach/pxa-regs.h | 507 +--- + arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h | 5 + + arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 12 + + arch/arm/mach-pxa/include/mach/pxafb.h | 6 + + arch/arm/mach-pxa/include/mach/regs-ac97.h | 99 + + arch/arm/mach-pxa/include/mach/regs-lcd.h | 67 +- + arch/arm/mach-pxa/include/mach/regs-uart.h | 143 + + arch/arm/mach-pxa/include/mach/timex.h | 8 + + arch/arm/mach-pxa/include/mach/uncompress.h | 4 +- + arch/arm/mach-pxa/littleton.c | 75 +- + arch/arm/mach-pxa/magician.c | 11 +- + arch/arm/mach-pxa/mainstone.c | 4 + + arch/arm/mach-pxa/mfp-pxa2xx.c | 62 +- + arch/arm/mach-pxa/mioa701.c | 203 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 10 +- + arch/arm/mach-pxa/poodle.c | 32 + + arch/arm/mach-pxa/pwm.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 89 +- + arch/arm/mach-pxa/pxa27x.c | 115 +- + arch/arm/mach-pxa/pxa300.c | 18 +- + arch/arm/mach-pxa/pxa320.c | 8 +- + arch/arm/mach-pxa/pxa3xx.c | 111 +- + arch/arm/mach-pxa/saar.c | 421 +++ + arch/arm/mach-pxa/smemc.c | 2 + + arch/arm/mach-pxa/spitz.c | 36 + + arch/arm/mach-pxa/ssp.c | 2 +- + arch/arm/mach-pxa/tavorevb.c | 412 +++ + arch/arm/mach-pxa/time.c | 11 +- + arch/arm/mach-pxa/tosa.c | 74 + + arch/arm/mach-pxa/zylonite.c | 2 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- + arch/arm/mach-realview/Kconfig | 30 + + arch/arm/mach-realview/Makefile | 1 + + arch/arm/mach-realview/Makefile.boot | 7 +- + arch/arm/mach-realview/clock.c | 80 +- + arch/arm/mach-realview/clock.h | 6 - + arch/arm/mach-realview/core.c | 141 +- + arch/arm/mach-realview/core.h | 5 +- + arch/arm/mach-realview/hotplug.c | 5 +- + arch/arm/mach-realview/include/mach/board-eb.h | 18 +- + arch/arm/mach-realview/include/mach/board-pb11mp.h | 3 +- + arch/arm/mach-realview/include/mach/board-pba8.h | 152 + + arch/arm/mach-realview/include/mach/clkdev.h | 7 + + arch/arm/mach-realview/include/mach/debug-macro.S | 29 +- + arch/arm/mach-realview/include/mach/hardware.h | 9 +- + arch/arm/mach-realview/include/mach/io.h | 9 +- + arch/arm/mach-realview/include/mach/irqs.h | 1 + + arch/arm/mach-realview/include/mach/memory.h | 14 +- + arch/arm/mach-realview/include/mach/uncompress.h | 3 + + arch/arm/mach-realview/include/mach/vmalloc.h | 2 +- + arch/arm/mach-realview/localtimer.c | 44 +- + arch/arm/mach-realview/platsmp.c | 37 +- + arch/arm/mach-realview/realview_eb.c | 33 +- + arch/arm/mach-realview/realview_pb1176.c | 13 +- + arch/arm/mach-realview/realview_pb11mp.c | 16 +- + arch/arm/mach-realview/realview_pba8.c | 300 ++ + arch/arm/mach-rpc/include/mach/io.h | 47 +- + arch/arm/mach-rpc/include/mach/irqs.h | 1 + + .../arm/mach-rpc/include/mach/{dma.h => isa-dma.h} | 8 +- + arch/arm/mach-rpc/include/mach/memory.h | 7 - + arch/arm/mach-s3c2400/include/mach/memory.h | 3 - + arch/arm/mach-s3c2410/Kconfig | 8 +- + arch/arm/mach-s3c2410/Makefile | 1 - + arch/arm/mach-s3c2410/dma.c | 5 +- + arch/arm/mach-s3c2410/include/mach/dma.h | 23 +- + arch/arm/mach-s3c2410/include/mach/gpio-core.h | 34 + + arch/arm/mach-s3c2410/include/mach/gpio.h | 6 + + arch/arm/mach-s3c2410/include/mach/irqs.h | 8 + + arch/arm/mach-s3c2410/include/mach/map.h | 83 +- + arch/arm/mach-s3c2410/include/mach/memory.h | 3 - + arch/arm/mach-s3c2410/include/mach/regs-clock.h | 33 - + arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 7 - + arch/arm/mach-s3c2410/include/mach/spi.h | 7 + + arch/arm/mach-s3c2410/include/mach/system-reset.h | 2 +- + arch/arm/mach-s3c2410/include/mach/tick.h | 15 + + arch/arm/mach-s3c2410/include/mach/uncompress.h | 1 + + arch/arm/mach-s3c2410/mach-amlm5900.c | 4 +- + arch/arm/mach-s3c2410/mach-bast.c | 11 +- + arch/arm/mach-s3c2410/mach-h1940.c | 14 +- + arch/arm/mach-s3c2410/mach-n30.c | 11 +- + arch/arm/mach-s3c2410/mach-otom.c | 4 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 8 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 4 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 4 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 4 +- + arch/arm/mach-s3c2410/s3c2410.c | 27 +- + arch/arm/mach-s3c2412/Kconfig | 1 + + arch/arm/mach-s3c2412/clock.c | 7 +- + arch/arm/mach-s3c2412/dma.c | 5 +- + arch/arm/mach-s3c2412/mach-jive.c | 22 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 6 +- + arch/arm/mach-s3c2412/mach-vstms.c | 6 +- + arch/arm/mach-s3c2412/s3c2412.c | 27 +- + arch/arm/mach-s3c2440/Kconfig | 5 + + arch/arm/mach-s3c2440/dma.c | 5 +- + arch/arm/mach-s3c2440/mach-anubis.c | 11 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 51 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 4 +- + arch/arm/mach-s3c2440/mach-osiris.c | 7 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 4 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 4 +- + arch/arm/mach-s3c2442/Kconfig | 1 + + arch/arm/mach-s3c2443/Kconfig | 1 + + arch/arm/mach-s3c2443/clock.c | 53 +- + arch/arm/mach-s3c2443/dma.c | 5 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 6 +- + arch/arm/mach-s3c2443/s3c2443.c | 3 +- + arch/arm/mach-s3c24a0/include/mach/debug-macro.S | 28 + + arch/arm/mach-s3c24a0/include/mach/irqs.h | 115 + + arch/arm/mach-s3c24a0/include/mach/map.h | 85 + + arch/arm/mach-s3c24a0/include/mach/memory.h | 19 + + arch/arm/mach-s3c24a0/include/mach/regs-clock.h | 88 + + arch/arm/mach-s3c24a0/include/mach/regs-irq.h | 25 + + arch/arm/mach-s3c24a0/include/mach/system.h | 25 + + arch/arm/mach-s3c24a0/include/mach/tick.h | 15 + + arch/arm/mach-s3c24a0/include/mach/timex.h | 18 + + .../include/mach/vmalloc.h | 11 +- + arch/arm/mach-s3c6400/Kconfig | 8 + + arch/arm/mach-s3c6400/Makefile | 15 + + arch/arm/mach-s3c6400/Makefile.boot | 2 + + arch/arm/mach-s3c6400/include/mach/debug-macro.S | 39 + + arch/arm/mach-s3c6400/include/mach/dma.h | 16 + + arch/arm/mach-s3c6400/include/mach/entry-macro.S | 44 + + arch/arm/mach-s3c6400/include/mach/gpio-core.h | 21 + + arch/arm/mach-s3c6400/include/mach/gpio.h | 96 + + arch/arm/mach-s3c6400/include/mach/hardware.h | 16 + + arch/arm/mach-s3c6400/include/mach/irqs.h | 20 + + arch/arm/mach-s3c6400/include/mach/map.h | 68 + + arch/arm/mach-s3c6400/include/mach/memory.h | 18 + + arch/arm/mach-s3c6400/include/mach/pwm-clock.h | 56 + + arch/arm/mach-s3c6400/include/mach/regs-fb.h | 259 ++ + arch/arm/mach-s3c6400/include/mach/regs-irq.h | 20 + + arch/arm/mach-s3c6400/include/mach/system.h | 24 + + arch/arm/mach-s3c6400/include/mach/tick.h | 29 + + arch/arm/mach-s3c6400/include/mach/uncompress.h | 28 + + arch/arm/mach-s3c6410/Kconfig | 62 + + arch/arm/mach-s3c6410/Makefile | 23 + + arch/arm/mach-s3c6410/cpu.c | 101 + + arch/arm/mach-s3c6410/mach-smdk6410.c | 185 + + arch/arm/mach-s3c6410/setup-sdhci.c | 102 + + arch/arm/mach-sa1100/clock.c | 100 +- + arch/arm/mach-sa1100/collie.c | 29 +- + arch/arm/mach-sa1100/collie_pm.c | 22 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 20 +- + arch/arm/mach-sa1100/cpu-sa1110.c | 18 +- + arch/arm/mach-sa1100/dma.c | 10 +- + arch/arm/mach-sa1100/include/mach/h3600.h | 12 +- + arch/arm/mach-sa1100/include/mach/hardware.h | 4 + + arch/arm/mach-sa1100/include/mach/io.h | 8 +- + arch/arm/mach-sa1100/include/mach/memory.h | 13 +- + arch/arm/mach-sa1100/include/mach/mtd-xip.h | 2 + + arch/arm/mach-sa1100/pleb.c | 10 +- + arch/arm/mach-sa1100/shannon.c | 2 +- + arch/arm/mach-sa1100/sleep.S | 52 +- + arch/arm/mach-sa1100/time.c | 4 +- + arch/arm/mach-shark/core.c | 2 + + arch/arm/mach-shark/include/mach/hardware.h | 2 - + arch/arm/mach-shark/include/mach/io.h | 44 +- + .../mach-shark/include/mach/{dma.h => isa-dma.h} | 3 +- + arch/arm/mach-shark/include/mach/memory.h | 4 +- + arch/arm/mach-versatile/Kconfig | 2 + + arch/arm/mach-versatile/clock.c | 80 +- + arch/arm/mach-versatile/clock.h | 7 +- + arch/arm/mach-versatile/core.c | 56 +- + arch/arm/mach-versatile/include/mach/clkdev.h | 7 + + arch/arm/mach-versatile/include/mach/dma.h | 20 - + arch/arm/mach-versatile/include/mach/io.h | 8 +- + arch/arm/mach-versatile/include/mach/irqs.h | 86 - + arch/arm/mach-versatile/include/mach/memory.h | 10 - + arch/arm/mach-versatile/include/mach/platform.h | 58 - + arch/arm/mach-w90x900/Kconfig | 19 + + arch/arm/mach-w90x900/Makefile | 15 + + arch/arm/mach-w90x900/Makefile.boot | 3 + + arch/arm/mach-w90x900/cpu.h | 77 + + arch/arm/mach-w90x900/include/mach/entry-macro.S | 34 + + arch/arm/mach-w90x900/include/mach/hardware.h | 24 + + arch/arm/mach-w90x900/include/mach/io.h | 30 + + arch/arm/mach-w90x900/include/mach/irqs.h | 45 + + arch/arm/mach-w90x900/include/mach/map.h | 76 + + arch/arm/mach-w90x900/include/mach/memory.h | 23 + + arch/arm/mach-w90x900/include/mach/regs-irq.h | 51 + + arch/arm/mach-w90x900/include/mach/regs-serial.h | 59 + + arch/arm/mach-w90x900/include/mach/regs-timer.h | 42 + + arch/arm/mach-w90x900/include/mach/system.h | 28 + + arch/arm/mach-w90x900/include/mach/timex.h | 25 + + arch/arm/mach-w90x900/include/mach/uncompress.h | 40 + + arch/arm/mach-w90x900/include/mach/vmalloc.h | 23 + + arch/arm/mach-w90x900/irq.c | 76 + + arch/arm/mach-w90x900/mach-w90p910evb.c | 72 + + arch/arm/mach-w90x900/time.c | 80 + + arch/arm/mach-w90x900/w90p910.c | 134 + + arch/arm/mm/Kconfig | 67 +- + arch/arm/mm/alignment.c | 1 + + arch/arm/mm/cache-v3.S | 1 - + arch/arm/mm/cache-v4.S | 1 - + arch/arm/mm/cache-v4wt.S | 1 - + arch/arm/mm/cache-v7.S | 2 + + arch/arm/mm/copypage-feroceon.S | 95 - + arch/arm/mm/copypage-feroceon.c | 111 + + arch/arm/mm/copypage-v3.S | 67 - + arch/arm/mm/copypage-v3.c | 81 + + arch/arm/mm/copypage-v4mc.c | 53 +- + arch/arm/mm/copypage-v4wb.S | 79 - + arch/arm/mm/copypage-v4wb.c | 94 + + arch/arm/mm/copypage-v4wt.S | 73 - + arch/arm/mm/copypage-v4wt.c | 88 + + arch/arm/mm/copypage-v6.c | 84 +- + arch/arm/mm/copypage-xsc3.S | 97 - + arch/arm/mm/copypage-xsc3.c | 113 + + arch/arm/mm/copypage-xscale.c | 47 +- + arch/arm/mm/fault.c | 6 +- + arch/arm/mm/init.c | 60 +- + arch/arm/mm/mm.h | 4 +- + arch/arm/mm/mmu.c | 128 +- + arch/arm/mm/nommu.c | 23 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm/mm/proc-syms.c | 4 +- + arch/arm/mm/proc-v6.S | 2 + + arch/arm/mm/proc-v7.S | 19 +- + arch/arm/mm/proc-xsc3.S | 25 + + arch/arm/plat-mxc/Kconfig | 9 + + arch/arm/plat-mxc/Makefile | 1 + + arch/arm/plat-mxc/dma-mx1-mx2.c | 14 +- + arch/arm/plat-mxc/gpio.c | 6 +- + arch/arm/plat-mxc/include/mach/board-mx27ads.h | 7 +- + arch/arm/plat-mxc/include/mach/board-mx31ads.h | 2 +- + arch/arm/plat-mxc/include/mach/board-mx31pdk.h | 19 + + arch/arm/plat-mxc/include/mach/debug-macro.S | 3 + + arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | 10 +- + arch/arm/plat-mxc/include/mach/dma.h | 14 - + arch/arm/plat-mxc/include/mach/entry-macro.S | 2 + + arch/arm/plat-mxc/include/mach/gpio.h | 4 +- + arch/arm/plat-mxc/include/mach/hardware.h | 4 + + arch/arm/plat-mxc/include/mach/io.h | 8 +- + arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h | 72 +- + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 19 +- + arch/arm/plat-mxc/include/mach/irqs.h | 32 +- + arch/arm/plat-mxc/include/mach/memory.h | 21 +- + arch/arm/plat-mxc/include/mach/mtd-xip.h | 34 + + arch/arm/plat-mxc/include/mach/mx1.h | 186 + + arch/arm/plat-mxc/include/mach/mx27.h | 15 +- + arch/arm/plat-mxc/include/mach/mx31.h | 25 - + arch/arm/plat-mxc/include/mach/mxc_timer.h | 4 +- + arch/arm/plat-mxc/include/mach/timex.h | 8 +- + arch/arm/plat-mxc/iomux-mx1-mx2.c | 37 +- + arch/arm/plat-mxc/irq.c | 33 +- + arch/arm/plat-omap/Kconfig | 2 + + arch/arm/plat-omap/debug-devices.c | 8 +- + arch/arm/plat-omap/debug-leds.c | 10 +- + arch/arm/plat-omap/devices.c | 225 +- + arch/arm/plat-omap/dma.c | 17 +- + arch/arm/plat-omap/dmtimer.c | 11 +- + arch/arm/plat-omap/gpio.c | 127 +- + arch/arm/plat-omap/i2c.c | 55 +- + arch/arm/plat-omap/include/mach/board-apollon.h | 4 +- + arch/arm/plat-omap/include/mach/board-h2.h | 6 +- + arch/arm/plat-omap/include/mach/board-ldp.h | 5 +- + arch/arm/plat-omap/include/mach/board.h | 22 - + arch/arm/plat-omap/include/mach/control.h | 17 + + arch/arm/plat-omap/include/mach/cpu.h | 82 +- + arch/arm/plat-omap/include/mach/gpio.h | 31 +- + arch/arm/plat-omap/include/mach/io.h | 6 +- + arch/arm/plat-omap/include/mach/memory.h | 17 +- + arch/arm/plat-omap/include/mach/mmc.h | 74 +- + arch/arm/plat-omap/include/mach/mux.h | 41 + + arch/arm/plat-omap/sram.c | 3 +- + arch/arm/plat-orion/Makefile | 2 + + arch/arm/plat-orion/gpio.c | 415 +++ + arch/arm/plat-orion/include/plat/ehci-orion.h | 8 + + arch/arm/plat-orion/include/plat/gpio.h | 39 + + arch/arm/plat-s3c/Kconfig | 95 +- + arch/arm/plat-s3c/Makefile | 28 +- + arch/arm/plat-s3c/clock.c | 368 ++ + arch/arm/plat-s3c/dev-fb.c | 72 + + arch/arm/plat-s3c/dev-hsmmc.c | 68 + + arch/arm/plat-s3c/dev-hsmmc1.c | 68 + + arch/arm/plat-s3c/dev-i2c0.c | 71 + + arch/arm/plat-s3c/dev-i2c1.c | 68 + + arch/arm/plat-s3c/gpio-config.c | 163 + + arch/arm/plat-s3c/gpio.c | 147 + + arch/arm/plat-s3c/include/mach/io.h | 18 + + .../include/mach/timex.h | 0 + .../include/mach/vmalloc.h | 2 +- + arch/arm/plat-s3c/include/plat/adc.h | 29 + + .../include/plat/clock.h | 38 +- + arch/arm/plat-s3c/include/plat/cpu-freq.h | 94 + + .../{plat-s3c24xx => plat-s3c}/include/plat/cpu.h | 21 +- + arch/arm/plat-s3c/include/plat/debug-macro.S | 2 +- + .../{plat-s3c24xx => plat-s3c}/include/plat/devs.h | 9 +- + arch/arm/plat-s3c/include/plat/fb.h | 73 + + arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h | 176 + + arch/arm/plat-s3c/include/plat/gpio-cfg.h | 110 + + arch/arm/plat-s3c/include/plat/gpio-core.h | 77 + + arch/arm/plat-s3c/include/plat/iic-core.h | 35 + + arch/arm/plat-s3c/include/plat/iic.h | 57 + + .../plat-s3c/include/plat/{map.h => map-base.h} | 0 + .../arm/plat-s3c/include/plat}/nand.h | 0 + .../arm/plat-s3c/include/plat}/regs-ac97.h | 0 + arch/arm/plat-s3c/include/plat/regs-fb.h | 366 ++ + .../arm/plat-s3c/include/plat}/regs-iic.h | 0 + arch/arm/plat-s3c/include/plat/regs-irqtype.h | 21 + + .../arm/plat-s3c/include/plat}/regs-nand.h | 0 + .../arm/plat-s3c/include/plat}/regs-rtc.h | 0 + arch/arm/plat-s3c/include/plat/regs-sdhci.h | 87 + + arch/arm/plat-s3c/include/plat/regs-serial.h | 16 +- + arch/arm/plat-s3c/include/plat/regs-timer.h | 11 +- + .../arm/plat-s3c/include/plat}/regs-watchdog.h | 0 + arch/arm/plat-s3c/include/plat/sdhci.h | 108 + + arch/arm/plat-s3c/include/plat/uncompress.h | 32 +- + arch/arm/plat-s3c/init.c | 160 + + arch/arm/{plat-s3c24xx => plat-s3c}/pwm-clock.c | 126 +- + arch/arm/{plat-s3c24xx => plat-s3c}/time.c | 89 +- + arch/arm/plat-s3c24xx/Kconfig | 61 +- + arch/arm/plat-s3c24xx/Makefile | 16 +- + arch/arm/plat-s3c24xx/adc.c | 372 ++ + arch/arm/plat-s3c24xx/clock-dclk.c | 194 ++ + arch/arm/plat-s3c24xx/clock.c | 493 +--- + arch/arm/plat-s3c24xx/common-smdk.c | 2 +- + arch/arm/plat-s3c24xx/cpu.c | 142 +- + arch/arm/plat-s3c24xx/devs.c | 103 +- + arch/arm/plat-s3c24xx/dma.c | 18 +- + arch/arm/plat-s3c24xx/gpiolib.c | 130 +- + arch/arm/plat-s3c24xx/include/mach/pwm-clock.h | 55 + + arch/arm/plat-s3c24xx/include/plat/map.h | 99 + + .../arm/plat-s3c24xx/include/plat}/mci.h | 0 + arch/arm/plat-s3c24xx/include/plat/pll.h | 37 + + .../arm/plat-s3c24xx/include/plat}/regs-spi.h | 0 + .../arm/plat-s3c24xx/include/plat}/regs-udc.h | 0 + arch/arm/plat-s3c24xx/include/plat/s3c2400.h | 2 +- + arch/arm/plat-s3c24xx/include/plat/s3c2410.h | 2 +- + arch/arm/plat-s3c24xx/include/plat/s3c2412.h | 2 +- + arch/arm/plat-s3c24xx/include/plat/s3c2443.h | 2 +- + .../arm/plat-s3c24xx/include/plat}/udc.h | 0 + arch/arm/plat-s3c24xx/irq.c | 1 + + arch/arm/plat-s3c24xx/pm.c | 5 +- + .../clock.c => plat-s3c24xx/s3c2410-clock.c} | 1 + + arch/arm/plat-s3c24xx/s3c244x-clock.c | 5 +- + arch/arm/plat-s3c24xx/s3c244x.c | 29 +- + arch/arm/plat-s3c24xx/s3c244x.h | 2 +- + arch/arm/plat-s3c24xx/setup-i2c.c | 25 + + arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 37 + + arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 37 + + arch/arm/plat-s3c64xx/Kconfig | 62 + + arch/arm/plat-s3c64xx/Makefile | 31 + + arch/arm/plat-s3c64xx/clock.c | 281 ++ + arch/arm/plat-s3c64xx/cpu.c | 114 + + arch/arm/plat-s3c64xx/dev-uart.c | 176 + + arch/arm/plat-s3c64xx/gpiolib.c | 420 +++ + arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h | 48 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h | 60 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h | 53 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h | 49 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h | 44 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h | 71 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h | 42 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h | 74 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h | 40 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h | 36 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h | 54 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h | 70 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h | 69 + + arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h | 46 + + arch/arm/plat-s3c64xx/include/plat/irqs.h | 201 ++ + arch/arm/plat-s3c64xx/include/plat/pll.h | 74 + + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 224 ++ + arch/arm/plat-s3c64xx/include/plat/regs-gpio.h | 35 + + arch/arm/plat-s3c64xx/include/plat/regs-sys.h | 24 + + arch/arm/plat-s3c64xx/include/plat/s3c6400.h | 35 + + arch/arm/plat-s3c64xx/include/plat/s3c6410.h | 29 + + arch/arm/plat-s3c64xx/irq-eint.c | 202 ++ + arch/arm/plat-s3c64xx/irq.c | 257 ++ + arch/arm/plat-s3c64xx/s3c6400-clock.c | 655 ++++ + arch/arm/plat-s3c64xx/s3c6400-init.c | 29 + + arch/arm/plat-s3c64xx/setup-fb-24bpp.c | 37 + + arch/arm/plat-s3c64xx/setup-i2c0.c | 31 + + arch/arm/plat-s3c64xx/setup-i2c1.c | 31 + + arch/arm/tools/mach-types | 101 +- + arch/arm/vfp/vfp.h | 2 +- + arch/arm/vfp/vfphw.S | 29 +- + arch/arm/vfp/vfpmodule.c | 65 + + arch/avr32/kernel/init_task.c | 1 - + arch/blackfin/kernel/init_task.c | 1 - + arch/cris/kernel/process.c | 1 - + arch/frv/kernel/init_task.c | 1 - + arch/h8300/kernel/init_task.c | 1 - + arch/ia64/kernel/init_task.c | 1 - + arch/m32r/kernel/init_task.c | 1 - + arch/m68k/kernel/process.c | 1 - + arch/m68knommu/kernel/init_task.c | 1 - + arch/mips/kernel/init_task.c | 1 - + arch/mn10300/kernel/init_task.c | 1 - + arch/parisc/kernel/init_task.c | 1 - + arch/powerpc/kernel/init_task.c | 1 - + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + arch/powerpc/platforms/pseries/rtasd.c | 4 + + arch/s390/include/asm/kvm_virtio.h | 4 + + arch/s390/kernel/init_task.c | 1 - + arch/s390/mm/pgtable.c | 4 +- + arch/sh/kernel/init_task.c | 1 - + arch/sparc/Kconfig | 525 +++- + arch/sparc/Kconfig.debug | 26 + + arch/sparc/Makefile | 97 +- + arch/sparc/boot/.gitignore | 8 + + arch/sparc/boot/Makefile | 38 +- + arch/sparc/boot/{piggyback.c => piggyback_32.c} | 0 + .../boot/piggyback.c => sparc/boot/piggyback_64.c} | 0 + .../sparc/{defconfig => configs/sparc32_defconfig} | 0 + .../defconfig => sparc/configs/sparc64_defconfig} | 0 + arch/sparc/include/asm/Kbuild | 2 - + arch/sparc/include/asm/asm.h | 40 + + arch/sparc/include/asm/atomic_64.h | 7 - + arch/sparc/include/asm/bitops_64.h | 5 - + arch/sparc/include/asm/hypervisor.h | 24 + + arch/sparc/include/asm/irq_32.h | 1 + + arch/sparc/include/asm/irq_64.h | 3 + + arch/sparc/include/asm/irqflags_64.h | 6 +- + arch/sparc/include/asm/module.h | 32 +- + arch/sparc/include/asm/module_32.h | 7 - + arch/sparc/include/asm/module_64.h | 7 - + arch/sparc/include/asm/openprom_32.h | 6 +- + arch/sparc/include/asm/oplib_32.h | 8 +- + arch/sparc/include/asm/pil.h | 9 +- + arch/sparc/include/asm/scatterlist.h | 33 +- + arch/sparc/include/asm/scatterlist_32.h | 26 - + arch/sparc/include/asm/scatterlist_64.h | 27 - + arch/sparc/include/asm/sections.h | 16 +- + arch/sparc/include/asm/sections_32.h | 6 - + arch/sparc/include/asm/sections_64.h | 9 - + arch/sparc/include/asm/spinlock_64.h | 31 +- + arch/sparc/include/asm/spitfire.h | 4 +- + arch/sparc/include/asm/system_32.h | 5 + + arch/sparc/include/asm/system_64.h | 46 +- + arch/sparc/include/asm/tsb.h | 6 - + arch/sparc/include/asm/ttable.h | 15 +- + arch/sparc/include/asm/unistd.h | 446 +++- + arch/sparc/include/asm/unistd_32.h | 385 --- + arch/sparc/include/asm/unistd_64.h | 380 --- + arch/sparc/kernel/.gitignore | 1 + + arch/sparc/kernel/Makefile | 117 +- + arch/sparc/kernel/asm-offsets.c | 19 +- + arch/{sparc64 => sparc}/kernel/audit.c | 0 + arch/sparc/kernel/{auxio.c => auxio_32.c} | 0 + .../kernel/auxio.c => sparc/kernel/auxio_64.c} | 70 +- + arch/{sparc64 => sparc}/kernel/central.c | 0 + arch/{sparc64 => sparc}/kernel/cherrs.S | 10 +- + arch/{sparc64 => sparc}/kernel/chmc.c | 0 + arch/{sparc64 => sparc}/kernel/compat_audit.c | 3 +- + arch/sparc/kernel/cpu.c | 413 ++- + arch/sparc/kernel/devices.c | 2 - + arch/{sparc64 => sparc}/kernel/ds.c | 0 + arch/{sparc64 => sparc}/kernel/dtlb_miss.S | 0 + arch/{sparc64 => sparc}/kernel/dtlb_prot.S | 0 + arch/{sparc64 => sparc}/kernel/ebus.c | 0 + arch/{sparc64 => sparc}/kernel/entry.h | 40 +- + arch/sparc/kernel/{etrap.S => etrap_32.S} | 0 + .../kernel/etrap.S => sparc/kernel/etrap_64.S} | 6 +- + arch/{sparc64 => sparc}/kernel/fpu_traps.S | 0 + arch/{sparc64 => sparc}/kernel/ftrace.c | 0 + arch/{sparc64 => sparc}/kernel/getsetcc.S | 0 + arch/sparc/kernel/{head.S => head_32.S} | 2 +- + .../kernel/head.S => sparc/kernel/head_64.S} | 8 +- + arch/{sparc64 => sparc}/kernel/helpers.S | 0 + arch/{sparc64 => sparc}/kernel/hvapi.c | 0 + arch/{sparc64 => sparc}/kernel/hvcalls.S | 32 + + arch/{sparc64 => sparc}/kernel/hvtramp.S | 5 +- + arch/sparc/kernel/idprom.c | 67 +- + arch/sparc/kernel/init_task.c | 4 +- + arch/{sparc64 => sparc}/kernel/iommu.c | 0 + arch/{sparc64 => sparc}/kernel/iommu_common.h | 0 + arch/sparc/kernel/ioport.c | 4 +- + arch/sparc/kernel/{irq.c => irq_32.c} | 7 +- + .../kernel/irq.c => sparc/kernel/irq_64.c} | 63 + + arch/{sparc64 => sparc}/kernel/itlb_miss.S | 0 + arch/{sparc64 => sparc}/kernel/ivec.S | 0 + arch/sparc/kernel/kernel.h | 31 + + arch/sparc/kernel/{kgdb.c => kgdb_32.c} | 0 + .../kernel/kgdb.c => sparc/kernel/kgdb_64.c} | 0 + arch/{sparc64 => sparc}/kernel/kprobes.c | 0 + arch/{sparc64 => sparc}/kernel/kstack.h | 0 + arch/{sparc64 => sparc}/kernel/ktlb.S | 0 + arch/{sparc64 => sparc}/kernel/ldc.c | 0 + arch/{sparc64 => sparc}/kernel/mdesc.c | 1 + + arch/{sparc64 => sparc}/kernel/misctrap.S | 0 + arch/sparc/kernel/module.c | 140 +- + arch/sparc/kernel/muldiv.c | 5 +- + arch/sparc/kernel/{of_device.c => of_device_32.c} | 0 + .../of_device.c => sparc/kernel/of_device_64.c} | 18 +- + arch/{sparc64 => sparc}/kernel/pci.c | 0 + arch/{sparc64 => sparc}/kernel/pci_common.c | 0 + arch/{sparc64 => sparc}/kernel/pci_fire.c | 0 + arch/{sparc64 => sparc}/kernel/pci_impl.h | 0 + arch/{sparc64 => sparc}/kernel/pci_msi.c | 0 + arch/{sparc64 => sparc}/kernel/pci_psycho.c | 0 + arch/{sparc64 => sparc}/kernel/pci_sabre.c | 0 + arch/{sparc64 => sparc}/kernel/pci_schizo.c | 0 + arch/{sparc64 => sparc}/kernel/pci_sun4v.c | 0 + arch/{sparc64 => sparc}/kernel/pci_sun4v.h | 0 + arch/{sparc64 => sparc}/kernel/pci_sun4v_asm.S | 0 + arch/sparc/kernel/pcic.c | 2 +- + arch/sparc/kernel/pmc.c | 18 +- + arch/{sparc64 => sparc}/kernel/power.c | 0 + arch/sparc/kernel/{process.c => process_32.c} | 2 - + .../kernel/process.c => sparc/kernel/process_64.c} | 0 + arch/sparc/kernel/prom.c | 566 --- + arch/sparc/kernel/prom.h | 29 + + arch/sparc/kernel/prom_32.c | 295 ++ + arch/sparc/kernel/prom_64.c | 571 ++++ + arch/sparc/kernel/prom_common.c | 326 ++ + arch/sparc/kernel/prom_irqtrans.c | 842 +++++ + arch/{sparc64 => sparc}/kernel/psycho_common.c | 0 + arch/{sparc64 => sparc}/kernel/psycho_common.h | 0 + arch/sparc/kernel/{ptrace.c => ptrace_32.c} | 0 + .../kernel/ptrace.c => sparc/kernel/ptrace_64.c} | 0 + arch/{sparc64 => sparc}/kernel/reboot.c | 0 + arch/sparc/kernel/{rtrap.S => rtrap_32.S} | 0 + .../kernel/rtrap.S => sparc/kernel/rtrap_64.S} | 20 +- + arch/{sparc64 => sparc}/kernel/sbus.c | 0 + arch/sparc/kernel/{setup.c => setup_32.c} | 9 +- + .../kernel/setup.c => sparc/kernel/setup_64.c} | 1 + + arch/{sparc64 => sparc}/kernel/signal32.c | 0 + arch/sparc/kernel/{signal.c => signal_32.c} | 0 + .../kernel/signal.c => sparc/kernel/signal_64.c} | 0 + arch/sparc/kernel/{smp.c => smp_32.c} | 0 + .../kernel/smp.c => sparc/kernel/smp_64.c} | 17 +- + .../kernel/{sparc_ksyms.c => sparc_ksyms_32.c} | 4 - + .../kernel/sparc_ksyms_64.c} | 11 +- + arch/{sparc64 => sparc}/kernel/spiterrs.S | 2 +- + arch/{sparc64 => sparc}/kernel/sstate.c | 0 + arch/{sparc64 => sparc}/kernel/stacktrace.c | 32 +- + arch/{sparc64 => sparc}/kernel/starfire.c | 0 + arch/sparc/kernel/sun4c_irq.c | 2 + + arch/sparc/kernel/sun4d_irq.c | 3 +- + arch/sparc/kernel/sun4m_irq.c | 2 + + arch/{sparc64 => sparc}/kernel/sun4v_ivec.S | 8 +- + arch/{sparc64 => sparc}/kernel/sun4v_tlb_miss.S | 0 + arch/{sparc64 => sparc}/kernel/sys32.S | 0 + arch/{sparc64 => sparc}/kernel/sys_sparc32.c | 0 + arch/sparc/kernel/{sys_sparc.c => sys_sparc_32.c} | 0 + .../sys_sparc.c => sparc/kernel/sys_sparc_64.c} | 0 + arch/{sparc64 => sparc}/kernel/syscalls.S | 0 + arch/{sparc64 => sparc}/kernel/sysfs.c | 1 + + arch/{sparc64 => sparc}/kernel/systbls.h | 0 + arch/sparc/kernel/{systbls.S => systbls_32.S} | 0 + .../kernel/systbls.S => sparc/kernel/systbls_64.S} | 0 + arch/sparc/kernel/{time.c => time_32.c} | 0 + .../kernel/time.c => sparc/kernel/time_64.c} | 0 + .../sparc/kernel/{trampoline.S => trampoline_32.S} | 0 + .../trampoline.S => sparc/kernel/trampoline_64.S} | 4 - + arch/sparc/kernel/{traps.c => traps_32.c} | 34 +- + .../kernel/traps.c => sparc/kernel/traps_64.c} | 5 +- + arch/{sparc64 => sparc}/kernel/tsb.S | 6 +- + arch/{sparc64 => sparc}/kernel/ttable.S | 2 +- + arch/sparc/kernel/{una_asm.S => una_asm_32.S} | 0 + .../kernel/una_asm.S => sparc/kernel/una_asm_64.S} | 0 + arch/sparc/kernel/{unaligned.c => unaligned_32.c} | 0 + .../unaligned.c => sparc/kernel/unaligned_64.c} | 0 + arch/{sparc64 => sparc}/kernel/us2e_cpufreq.c | 0 + arch/{sparc64 => sparc}/kernel/us3_cpufreq.c | 0 + arch/{sparc64 => sparc}/kernel/utrap.S | 0 + arch/{sparc64 => sparc}/kernel/vio.c | 0 + arch/{sparc64 => sparc}/kernel/viohs.c | 0 + arch/{sparc64 => sparc}/kernel/visemul.c | 0 + arch/sparc/kernel/vmlinux.lds.S | 109 +- + arch/{sparc64 => sparc}/kernel/winfixup.S | 0 + arch/{sparc64 => sparc}/lib/GENbzero.S | 0 + arch/{sparc64 => sparc}/lib/GENcopy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/GENcopy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/GENmemcpy.S | 0 + arch/{sparc64 => sparc}/lib/GENpage.S | 0 + arch/{sparc64 => sparc}/lib/GENpatch.S | 0 + arch/sparc/lib/Makefile | 47 +- + arch/{sparc64 => sparc}/lib/NG2copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/NG2copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/NG2memcpy.S | 0 + arch/{sparc64 => sparc}/lib/NG2page.S | 0 + arch/{sparc64 => sparc}/lib/NG2patch.S | 0 + arch/{sparc64 => sparc}/lib/NGbzero.S | 0 + arch/{sparc64 => sparc}/lib/NGcopy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/NGcopy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/NGmemcpy.S | 0 + arch/{sparc64 => sparc}/lib/NGpage.S | 0 + arch/{sparc64 => sparc}/lib/NGpatch.S | 0 + arch/{sparc64 => sparc}/lib/PeeCeeI.c | 0 + arch/{sparc64 => sparc}/lib/U1copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/U1copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/U1memcpy.S | 0 + arch/{sparc64 => sparc}/lib/U3copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/U3copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/U3memcpy.S | 0 + arch/{sparc64 => sparc}/lib/U3patch.S | 0 + arch/{sparc64 => sparc}/lib/VISsave.S | 0 + arch/sparc/lib/{atomic.S => atomic_32.S} | 0 + .../lib/atomic.S => sparc/lib/atomic_64.S} | 26 - + arch/{sparc64 => sparc}/lib/bitops.S | 24 - + arch/{sparc64 => sparc}/lib/bzero.S | 0 + arch/sparc/lib/{checksum.S => checksum_32.S} | 0 + .../lib/checksum.S => sparc/lib/checksum_64.S} | 0 + arch/{sparc64 => sparc}/lib/clear_page.S | 0 + arch/{sparc64 => sparc}/lib/copy_in_user.S | 0 + arch/{sparc64 => sparc}/lib/copy_page.S | 0 + arch/{sparc64 => sparc}/lib/csum_copy.S | 0 + arch/{sparc64 => sparc}/lib/csum_copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/csum_copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/ipcsum.S | 0 + arch/{sparc64 => sparc}/lib/mcount.S | 0 + arch/sparc/lib/memcmp.S | 329 +-- + arch/{sparc64 => sparc}/lib/memmove.S | 0 + arch/sparc/lib/{memscan.S => memscan_32.S} | 0 + .../lib/memscan.S => sparc/lib/memscan_64.S} | 0 + arch/sparc/lib/{rwsem.S => rwsem_32.S} | 0 + arch/{sparc64/lib/rwsem.S => sparc/lib/rwsem_64.S} | 7 - + arch/sparc/lib/strlen.S | 79 +- + arch/sparc/lib/{strlen_user.S => strlen_user_32.S} | 0 + .../strlen_user.S => sparc/lib/strlen_user_64.S} | 0 + arch/sparc/lib/{strncmp.S => strncmp_32.S} | 0 + .../lib/strncmp.S => sparc/lib/strncmp_64.S} | 0 + ...{strncpy_from_user.S => strncpy_from_user_32.S} | 0 + .../lib/strncpy_from_user_64.S} | 0 + arch/{sparc64 => sparc}/lib/user_fixup.c | 0 + arch/{sparc64 => sparc}/lib/xor.S | 0 + arch/sparc/math-emu/Makefile | 6 +- + arch/sparc/math-emu/ashldi3.S | 36 - + arch/sparc/math-emu/{math.c => math_32.c} | 2 +- + .../math-emu/math.c => sparc/math-emu/math_64.c} | 2 +- + arch/sparc/math-emu/{sfp-util.h => sfp-util_32.h} | 0 + .../sfp-util.h => sparc/math-emu/sfp-util_64.h} | 0 + arch/sparc/mm/Makefile | 24 +- + arch/sparc/mm/{fault.c => fault_32.c} | 0 + arch/{sparc64/mm/fault.c => sparc/mm/fault_64.c} | 0 + arch/sparc/mm/{generic.c => generic_32.c} | 0 + .../mm/generic.c => sparc/mm/generic_64.c} | 0 + arch/{sparc64 => sparc}/mm/hugetlbpage.c | 0 + arch/sparc/mm/{init.c => init_32.c} | 14 +- + arch/{sparc64/mm/init.c => sparc/mm/init_64.c} | 6 +- + arch/{sparc64/mm/init.h => sparc/mm/init_64.h} | 0 + arch/sparc/mm/io-unit.c | 8 +- + arch/sparc/mm/iommu.c | 16 +- + arch/sparc/mm/srmmu.c | 25 +- + arch/sparc/mm/sun4c.c | 12 +- + arch/{sparc64 => sparc}/mm/tlb.c | 0 + arch/{sparc64 => sparc}/mm/tsb.c | 25 +- + arch/{sparc64 => sparc}/mm/ultra.S | 6 +- + arch/sparc/oprofile/init.c | 229 ++- + arch/sparc/prom/Makefile | 19 +- + arch/sparc/prom/{bootstr.c => bootstr_32.c} | 0 + .../prom/bootstr.c => sparc/prom/bootstr_64.c} | 0 + arch/{sparc64 => sparc}/prom/cif.S | 0 + arch/sparc/prom/{console.c => console_32.c} | 0 + .../prom/console.c => sparc/prom/console_64.c} | 0 + arch/sparc/prom/{devops.c => devops_32.c} | 0 + .../prom/devops.c => sparc/prom/devops_64.c} | 0 + arch/sparc/prom/{init.c => init_32.c} | 0 + arch/{sparc64/prom/init.c => sparc/prom/init_64.c} | 0 + arch/sparc/prom/{misc.c => misc_32.c} | 2 - + arch/{sparc64/prom/misc.c => sparc/prom/misc_64.c} | 0 + arch/{sparc64 => sparc}/prom/p1275.c | 0 + arch/sparc/prom/printf.c | 5 +- + arch/sparc/prom/{tree.c => tree_32.c} | 6 +- + arch/{sparc64/prom/tree.c => sparc/prom/tree_64.c} | 0 + arch/sparc64/Kconfig | 433 --- + arch/sparc64/Kconfig.debug | 44 - + arch/sparc64/Makefile | 48 - + arch/sparc64/boot/.gitignore | 4 - + arch/sparc64/boot/Makefile | 33 - + arch/sparc64/kernel/Makefile | 36 - + arch/sparc64/kernel/asm-offsets.c | 1 - + arch/sparc64/kernel/cpu.c | 166 - + arch/sparc64/kernel/idprom.c | 46 - + arch/sparc64/kernel/init_task.c | 35 - + arch/sparc64/kernel/module.c | 213 -- + arch/sparc64/kernel/prom.c | 1684 --------- + arch/sparc64/kernel/vmlinux.lds.S | 147 - + arch/sparc64/lib/Makefile | 23 - + arch/sparc64/lib/iomap.c | 48 - + arch/sparc64/lib/memcmp.S | 28 - + arch/sparc64/lib/strlen.S | 80 - + arch/sparc64/math-emu/Makefile | 7 - + arch/sparc64/mm/Makefile | 9 - + arch/sparc64/oprofile/Makefile | 9 - + arch/sparc64/oprofile/init.c | 23 - + arch/sparc64/prom/Makefile | 9 - + arch/sparc64/prom/printf.c | 47 - + arch/um/include/asm/system.h | 14 +- + arch/um/kernel/init_task.c | 1 - + arch/x86/Kconfig | 24 +- + arch/x86/include/asm/dma-mapping.h | 2 +- + arch/x86/include/asm/io_apic.h | 9 +- + arch/x86/include/asm/iommu.h | 2 - + arch/x86/include/asm/irq_vectors.h | 11 + + arch/x86/include/asm/pci.h | 2 + + arch/x86/include/asm/pci_64.h | 1 - + arch/x86/include/asm/uaccess.h | 2 + + arch/x86/include/asm/uaccess_32.h | 8 +- + arch/x86/include/asm/uaccess_64.h | 6 + + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/hpet.c | 7 +- + arch/x86/kernel/init_task.c | 1 - + arch/x86/kernel/io_apic.c | 755 +++-- + arch/x86/kernel/irq.c | 3 + + arch/x86/kernel/irq_32.c | 2 + + arch/x86/kernel/irq_64.c | 2 + + arch/x86/kernel/irqinit_32.c | 3 +- + arch/x86/kernel/irqinit_64.c | 3 +- + arch/x86/kernel/pci-dma.c | 13 +- + arch/x86/kernel/pci-swiotlb_64.c | 29 + + arch/x86/kernel/quirks.c | 2 + + arch/x86/kernel/setup.c | 2 +- + arch/x86/lguest/i386_head.S | 15 - + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/lib/usercopy_64.c | 4 +- + arch/x86/mm/init_32.c | 3 + + arch/x86/oprofile/op_model_amd.c | 89 +- + arch/xtensa/kernel/init_task.c | 1 - + block/Kconfig | 23 +- + block/as-iosched.c | 10 +- + block/blk-barrier.c | 120 +- + block/blk-core.c | 63 +- + block/blk-settings.c | 6 +- + block/blk-softirq.c | 2 +- + block/blk-sysfs.c | 7 +- + block/blk-tag.c | 1 - + block/blk-timeout.c | 21 +- + block/cfq-iosched.c | 26 +- + block/compat_ioctl.c | 2 - + block/deadline-iosched.c | 6 +- + block/elevator.c | 73 +- + block/genhd.c | 23 +- + block/ioctl.c | 2 - + block/noop-iosched.c | 2 +- + block/scsi_ioctl.c | 4 +- + drivers/ata/ahci.c | 8 +- + drivers/ata/ata_generic.c | 5 +- + drivers/ata/ata_piix.c | 21 +- + drivers/ata/libata-acpi.c | 19 +- + drivers/ata/libata-core.c | 204 +- + drivers/ata/libata-eh.c | 116 +- + drivers/ata/libata-pmp.c | 22 +- + drivers/ata/libata-scsi.c | 26 +- + drivers/ata/pata_bf54x.c | 1 - + drivers/ata/pata_it821x.c | 34 +- + drivers/ata/pata_ixp4xx_cf.c | 14 +- + drivers/ata/pata_legacy.c | 18 +- + drivers/ata/pata_oldpiix.c | 1 - + drivers/ata/pata_pdc2027x.c | 29 +- + drivers/ata/pata_platform.c | 14 +- + drivers/ata/pata_radisys.c | 1 - + drivers/ata/pata_rz1000.c | 16 +- + drivers/ata/pata_scc.c | 1 - + drivers/ata/pata_serverworks.c | 1 - + drivers/ata/pata_sis.c | 1 - + drivers/ata/sata_mv.c | 1 - + drivers/ata/sata_sil.c | 98 +- + drivers/block/cciss.c | 88 +- + drivers/block/cciss.h | 4 +- + drivers/block/cciss_cmd.h | 3 +- + drivers/block/loop.c | 39 +- + drivers/block/nbd.c | 10 +- + drivers/block/virtio_blk.c | 43 +- + drivers/block/xen-blkfront.c | 8 +- + drivers/cdrom/cdrom.c | 703 +++-- + drivers/char/agp/intel-agp.c | 11 +- + drivers/char/ds1620.c | 25 +- + drivers/char/hpet.c | 2 +- + drivers/char/hvc_console.c | 1 + + drivers/char/nwflash.c | 8 +- + drivers/char/random.c | 22 +- + drivers/char/virtio_console.c | 30 +- + drivers/clocksource/acpi_pm.c | 10 +- + drivers/firmware/dmi_scan.c | 16 + + drivers/gpu/drm/Kconfig | 17 + + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/drm_auth.c | 29 +- + drivers/gpu/drm/drm_bufs.c | 27 +- + drivers/gpu/drm/drm_context.c | 10 +- + drivers/gpu/drm/drm_crtc.c | 2446 +++++++++++++ + drivers/gpu/drm/drm_crtc_helper.c | 826 +++++ + drivers/gpu/drm/drm_drv.c | 95 +- + drivers/gpu/drm/drm_edid.c | 732 ++++ + drivers/gpu/drm/drm_fops.c | 223 +- + drivers/gpu/drm/drm_gem.c | 111 + + drivers/gpu/drm/drm_hashtab.c | 2 + + drivers/gpu/drm/drm_ioctl.c | 61 +- + drivers/gpu/drm/drm_irq.c | 73 +- + drivers/gpu/drm/drm_lock.c | 42 +- + drivers/gpu/drm/drm_mm.c | 1 + + drivers/gpu/drm/drm_modes.c | 576 ++++ + drivers/gpu/drm/drm_proc.c | 71 +- + drivers/gpu/drm/drm_stub.c | 142 +- + drivers/gpu/drm/drm_sysfs.c | 329 ++- + drivers/gpu/drm/drm_vm.c | 7 +- + drivers/gpu/drm/i915/Makefile | 17 +- + drivers/gpu/drm/i915/dvo.h | 157 + + drivers/gpu/drm/i915/dvo_ch7017.c | 454 +++ + drivers/gpu/drm/i915/dvo_ch7xxx.c | 368 ++ + drivers/gpu/drm/i915/dvo_ivch.c | 442 +++ + drivers/gpu/drm/i915/dvo_sil164.c | 302 ++ + drivers/gpu/drm/i915/dvo_tfp410.c | 335 ++ + drivers/gpu/drm/i915/i915_dma.c | 338 ++- + drivers/gpu/drm/i915/i915_drv.c | 42 +- + drivers/gpu/drm/i915/i915_drv.h | 93 +- + drivers/gpu/drm/i915/i915_gem.c | 628 ++++- + drivers/gpu/drm/i915/i915_gem_proc.c | 34 + + drivers/gpu/drm/i915/i915_gem_tiling.c | 1 + + drivers/gpu/drm/i915/i915_irq.c | 51 +- + drivers/gpu/drm/i915/i915_mem.c | 3 +- + drivers/gpu/drm/i915/i915_opregion.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 20 +- + drivers/gpu/drm/i915/intel_bios.c | 193 ++ + drivers/gpu/drm/i915/intel_bios.h | 405 +++ + drivers/gpu/drm/i915/intel_crt.c | 284 ++ + drivers/gpu/drm/i915/intel_display.c | 1618 +++++++++ + drivers/gpu/drm/i915/intel_drv.h | 146 + + drivers/gpu/drm/i915/intel_dvo.c | 495 +++ + drivers/gpu/drm/i915/intel_fb.c | 925 +++++ + drivers/gpu/drm/i915/intel_i2c.c | 184 + + drivers/gpu/drm/i915/intel_lvds.c | 525 +++ + drivers/gpu/drm/i915/intel_modes.c | 83 + + drivers/gpu/drm/i915/intel_sdvo.c | 1128 ++++++ + drivers/gpu/drm/i915/intel_sdvo_regs.h | 327 ++ + drivers/gpu/drm/i915/intel_tv.c | 1725 ++++++++++ + drivers/gpu/drm/radeon/r300_cmdbuf.c | 11 +- + drivers/gpu/drm/radeon/radeon_cp.c | 73 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 + + drivers/gpu/drm/radeon/radeon_drv.h | 14 +- + drivers/gpu/drm/radeon/radeon_state.c | 166 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 4 +- + drivers/ide/Kconfig | 10 +- + drivers/ide/Makefile | 3 +- + drivers/ide/cmd64x.c | 4 +- + drivers/ide/cy82c693.c | 1 - + drivers/ide/gayle.c | 6 +- + drivers/ide/hpt366.c | 8 +- + drivers/ide/ide-acpi.c | 4 +- + drivers/ide/ide-cd.c | 142 +- + drivers/ide/ide-cd.h | 2 - + drivers/ide/ide-dma-sff.c | 54 +- + drivers/ide/ide-io.c | 292 +-- + drivers/ide/ide-ioctls.c | 5 +- + drivers/ide/ide-iops.c | 48 +- + drivers/ide/ide-legacy.c | 58 + + drivers/ide/ide-lib.c | 105 +- + drivers/ide/ide-park.c | 16 +- + drivers/ide/ide-pm.c | 235 ++ + drivers/ide/ide-probe.c | 166 +- + drivers/ide/ide-proc.c | 29 +- + drivers/ide/ide.c | 89 +- + drivers/ide/ide_arm.c | 11 +- + drivers/ide/pdc202xx_old.c | 9 +- + drivers/ide/rz1000.c | 36 +- + drivers/ide/trm290.c | 4 +- + drivers/ide/tx4938ide.c | 4 +- + drivers/ide/tx4939ide.c | 10 +- + drivers/ide/umc8672.c | 11 +- + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/addr.c | 47 +- + drivers/infiniband/hw/mlx4/cq.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 48 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 5 +- + drivers/input/keyboard/omap-keypad.c | 8 +- + drivers/input/keyboard/pxa27x_keypad.c | 2 +- + drivers/input/serio/Kconfig | 2 +- + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 2 +- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_device.c | 8 +- + drivers/lguest/lguest_user.c | 13 +- + drivers/lguest/page_tables.c | 72 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm.c | 2 +- + drivers/media/common/ir-keymaps.c | 93 + + drivers/media/common/saa7146_fops.c | 2 +- + drivers/media/common/saa7146_video.c | 10 +- + drivers/media/common/tuners/mxl5005s.c | 6 +- + drivers/media/common/tuners/tda827x.c | 15 +- + drivers/media/common/tuners/tda8290.c | 63 +- + drivers/media/common/tuners/tda9887.c | 5 +- + drivers/media/common/tuners/tuner-xc2028.c | 35 + + drivers/media/common/tuners/xc5000.c | 7 - + drivers/media/dvb/Kconfig | 13 + + drivers/media/dvb/b2c2/Kconfig | 1 + + drivers/media/dvb/dm1105/dm1105.c | 3 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 77 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 134 +- + drivers/media/dvb/dvb-core/dvbdev.c | 71 +- + drivers/media/dvb/dvb-core/dvbdev.h | 1 + + drivers/media/dvb/dvb-usb/af9015.c | 33 +- + drivers/media/dvb/dvb-usb/af9015.h | 140 + + drivers/media/dvb/dvb-usb/anysee.c | 2 +- + drivers/media/dvb/dvb-usb/cinergyT2-core.c | 3 +- + drivers/media/dvb/dvb-usb/cinergyT2.h | 10 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/dw2102.c | 15 +- + drivers/media/dvb/dvb-usb/gp8psk-fe.c | 140 +- + drivers/media/dvb/dvb-usb/gp8psk.c | 16 + + drivers/media/dvb/dvb-usb/gp8psk.h | 1 + + drivers/media/dvb/dvb-usb/usb-urb.c | 3 +- + drivers/media/dvb/frontends/Kconfig | 53 + + drivers/media/dvb/frontends/Makefile | 10 + + drivers/media/dvb/frontends/af9013.c | 14 +- + drivers/media/dvb/frontends/cx24113.c | 616 ++++ + drivers/media/dvb/frontends/cx24113.h | 11 +- + drivers/media/dvb/frontends/cx24116.c | 43 +- + drivers/media/dvb/frontends/dib7000p.h | 9 +- + drivers/media/dvb/frontends/drx397xD.c | 12 +- + drivers/media/dvb/frontends/drx397xD_fw.h | 4 +- + drivers/media/dvb/frontends/dvb-pll.c | 2 +- + drivers/media/dvb/frontends/lgdt3304.c | 378 ++ + drivers/media/dvb/frontends/lgdt3304.h | 45 + + drivers/media/dvb/frontends/s5h1411.c | 3 + + drivers/media/dvb/frontends/s921_core.c | 216 ++ + drivers/media/dvb/frontends/s921_core.h | 114 + + drivers/media/dvb/frontends/s921_module.c | 190 + + drivers/media/dvb/frontends/s921_module.h | 49 + + drivers/media/dvb/frontends/si21xx.c | 1 - + drivers/media/dvb/frontends/stb0899_algo.c | 1519 +++++++++ + drivers/media/dvb/frontends/stb0899_cfg.h | 287 ++ + drivers/media/dvb/frontends/stb0899_drv.c | 1684 +++++++++ + drivers/media/dvb/frontends/stb0899_drv.h | 162 + + drivers/media/dvb/frontends/stb0899_priv.h | 267 ++ + drivers/media/dvb/frontends/stb0899_reg.h | 2027 +++++++++++ + drivers/media/dvb/frontends/stb6100.c | 545 +++ + drivers/media/dvb/frontends/stb6100.h | 115 + + drivers/media/dvb/frontends/stb6100_cfg.h | 108 + + drivers/media/dvb/frontends/tda8261.c | 230 ++ + drivers/media/dvb/frontends/tda8261.h | 55 + + drivers/media/dvb/frontends/tda8261_cfg.h | 84 + + drivers/media/dvb/frontends/zl10353.c | 3 + + drivers/media/dvb/siano/sms-cards.c | 110 + + drivers/media/dvb/siano/sms-cards.h | 13 + + drivers/media/dvb/siano/smscoreapi.c | 78 + + drivers/media/dvb/siano/smscoreapi.h | 36 +- + drivers/media/dvb/siano/smsdvb.c | 56 +- + drivers/media/dvb/siano/smsusb.c | 45 + + drivers/media/dvb/ttpci/Kconfig | 4 + + drivers/media/dvb/ttpci/budget-av.c | 298 ++ + drivers/media/dvb/ttpci/budget-ci.c | 311 ++ + drivers/media/dvb/ttpci/budget.h | 1 + + drivers/media/radio/dsbr100.c | 381 ++- + drivers/media/radio/radio-aimslab.c | 2 +- + drivers/media/radio/radio-cadet.c | 2 +- + drivers/media/radio/radio-gemtek.c | 2 +- + drivers/media/radio/radio-mr800.c | 123 +- + drivers/media/radio/radio-rtrack2.c | 2 +- + drivers/media/radio/radio-sf16fmi.c | 2 +- + drivers/media/video/Kconfig | 48 +- + drivers/media/video/Makefile | 12 +- + drivers/media/video/arv.c | 5 +- + drivers/media/video/bt8xx/bt832.c | 274 -- + drivers/media/video/bt8xx/bt832.h | 305 -- + drivers/media/video/bt8xx/bttv-cards.c | 72 +- + drivers/media/video/bt8xx/bttv-gpio.c | 7 +- + drivers/media/video/bt8xx/bttv.h | 10 +- + drivers/media/video/bt8xx/bttvp.h | 2 +- + drivers/media/video/bw-qcam.c | 5 +- + drivers/media/video/c-qcam.c | 7 +- + drivers/media/video/cpia.c | 9 +- + drivers/media/video/cpia2/cpia2_core.c | 2 +- + drivers/media/video/cpia2/cpia2_usb.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 15 +- + drivers/media/video/cs5345.c | 227 +- + drivers/media/video/cs53l32a.c | 188 +- + drivers/media/video/cx18/cx18-av-audio.c | 231 +- + drivers/media/video/cx18/cx18-av-core.c | 106 +- + drivers/media/video/cx18/cx18-av-core.h | 5 +- + drivers/media/video/cx18/cx18-av-firmware.c | 28 +- + drivers/media/video/cx18/cx18-av-vbi.c | 5 +- + drivers/media/video/cx18/cx18-cards.c | 9 +- + drivers/media/video/cx18/cx18-cards.h | 6 +- + drivers/media/video/cx18/cx18-controls.c | 5 +- + drivers/media/video/cx18/cx18-driver.c | 284 ++- + drivers/media/video/cx18/cx18-driver.h | 78 +- + drivers/media/video/cx18/cx18-dvb.c | 59 +- + drivers/media/video/cx18/cx18-dvb.h | 1 - + drivers/media/video/cx18/cx18-fileops.c | 38 +- + drivers/media/video/cx18/cx18-firmware.c | 229 +- + drivers/media/video/cx18/cx18-gpio.c | 21 +- + drivers/media/video/cx18/cx18-gpio.h | 1 + + drivers/media/video/cx18/cx18-i2c.c | 31 +- + drivers/media/video/cx18/cx18-io.c | 198 +- + drivers/media/video/cx18/cx18-io.h | 326 +-- + drivers/media/video/cx18/cx18-ioctl.c | 12 +- + drivers/media/video/cx18/cx18-ioctl.h | 1 + + drivers/media/video/cx18/cx18-irq.c | 163 +- + drivers/media/video/cx18/cx18-irq.h | 4 +- + drivers/media/video/cx18/cx18-mailbox.c | 527 +++- + drivers/media/video/cx18/cx18-mailbox.h | 29 +- + drivers/media/video/cx18/cx18-queue.c | 120 +- + drivers/media/video/cx18/cx18-queue.h | 22 +- + drivers/media/video/cx18/cx18-scb.c | 2 +- + drivers/media/video/cx18/cx18-scb.h | 9 +- + drivers/media/video/cx18/cx18-streams.c | 140 +- + drivers/media/video/cx18/cx18-streams.h | 5 + + drivers/media/video/cx18/cx18-vbi.c | 5 +- + drivers/media/video/cx18/cx18-version.h | 2 +- + drivers/media/video/cx18/cx23418.h | 6 + + drivers/media/video/cx23885/cx23885-417.c | 2 +- + drivers/media/video/cx23885/cx23885-cards.c | 12 + + drivers/media/video/cx23885/cx23885-dvb.c | 1 + + drivers/media/video/cx23885/cx23885.h | 1 + + drivers/media/video/cx25840/Kconfig | 2 +- + drivers/media/video/cx25840/cx25840-audio.c | 14 +- + drivers/media/video/cx25840/cx25840-core.c | 447 ++- + drivers/media/video/cx25840/cx25840-core.h | 7 + + drivers/media/video/cx25840/cx25840-firmware.c | 2 +- + drivers/media/video/cx25840/cx25840-vbi.c | 2 +- + drivers/media/video/cx88/cx88-alsa.c | 3 +- + drivers/media/video/cx88/cx88-blackbird.c | 16 +- + drivers/media/video/cx88/cx88-cards.c | 86 +- + drivers/media/video/cx88/cx88-core.c | 3 + + drivers/media/video/cx88/cx88-dvb.c | 230 +- + drivers/media/video/cx88/cx88-mpeg.c | 4 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/em28xx/em28xx-audio.c | 21 +- + drivers/media/video/em28xx/em28xx-cards.c | 1464 +++++--- + drivers/media/video/em28xx/em28xx-core.c | 628 +++- + drivers/media/video/em28xx/em28xx-dvb.c | 14 +- + drivers/media/video/em28xx/em28xx-i2c.c | 49 +- + drivers/media/video/em28xx/em28xx-input.c | 311 ++- + drivers/media/video/em28xx/em28xx-reg.h | 153 +- + drivers/media/video/em28xx/em28xx-video.c | 851 ++---- + drivers/media/video/em28xx/em28xx.h | 148 +- + drivers/media/video/et61x251/et61x251_core.c | 2 +- + drivers/media/video/gspca/Kconfig | 23 +- + drivers/media/video/gspca/Makefile | 4 +- + drivers/media/video/gspca/conex.c | 2 +- + drivers/media/video/gspca/etoms.c | 4 +- + drivers/media/video/gspca/finepix.c | 5 +- + drivers/media/video/gspca/gspca.c | 210 +- + drivers/media/video/gspca/gspca.h | 25 +- + drivers/media/video/gspca/m5602/m5602_bridge.h | 119 +- + drivers/media/video/gspca/m5602/m5602_core.c | 100 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.c | 135 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.h | 14 +- + drivers/media/video/gspca/m5602/m5602_ov9650.c | 316 +- + drivers/media/video/gspca/m5602/m5602_ov9650.h | 195 +- + drivers/media/video/gspca/m5602/m5602_po1030.c | 166 +- + drivers/media/video/gspca/m5602/m5602_po1030.h | 10 +- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 235 +- + drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 47 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 213 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.h | 25 +- + drivers/media/video/gspca/m5602/m5602_sensor.h | 14 +- + drivers/media/video/gspca/mars.c | 4 +- + drivers/media/video/gspca/ov519.c | 172 +- + drivers/media/video/gspca/ov534.c | 601 ++++ + drivers/media/video/gspca/pac207.c | 8 +- + drivers/media/video/gspca/pac7311.c | 5 +- + drivers/media/video/gspca/sonixb.c | 25 +- + drivers/media/video/gspca/sonixj.c | 508 ++-- + drivers/media/video/gspca/spca500.c | 8 +- + drivers/media/video/gspca/spca501.c | 148 +- + drivers/media/video/gspca/spca505.c | 2 +- + drivers/media/video/gspca/spca506.c | 2 +- + drivers/media/video/gspca/spca508.c | 2 +- + drivers/media/video/gspca/spca561.c | 522 ++-- + drivers/media/video/gspca/stk014.c | 8 +- + drivers/media/video/gspca/stv06xx/Kconfig | 9 + + drivers/media/video/gspca/stv06xx/Makefile | 9 + + drivers/media/video/gspca/stv06xx/stv06xx.c | 522 +++ + drivers/media/video/gspca/stv06xx/stv06xx.h | 107 + + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 535 +++ + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 263 ++ + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 430 +++ + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 275 ++ + drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 92 + + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 251 ++ + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 315 ++ + drivers/media/video/gspca/sunplus.c | 6 +- + drivers/media/video/gspca/t613.c | 4 +- + drivers/media/video/gspca/tv8532.c | 142 +- + drivers/media/video/gspca/vc032x.c | 819 ++++- + drivers/media/video/gspca/zc3xx-reg.h | 8 - + drivers/media/video/gspca/zc3xx.c | 1012 +++--- + drivers/media/video/ir-kbd-i2c.c | 6 +- + drivers/media/video/ivtv/ivtv-cards.c | 16 +- + drivers/media/video/ivtv/ivtv-controls.c | 16 +- + drivers/media/video/ivtv/ivtv-driver.c | 214 +- + drivers/media/video/ivtv/ivtv-driver.h | 52 +- + drivers/media/video/ivtv/ivtv-fileops.c | 44 +- + drivers/media/video/ivtv/ivtv-gpio.c | 324 ++- + drivers/media/video/ivtv/ivtv-gpio.h | 3 +- + drivers/media/video/ivtv/ivtv-i2c.c | 314 +-- + drivers/media/video/ivtv/ivtv-i2c.h | 13 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 73 +- + drivers/media/video/ivtv/ivtv-routing.c | 12 +- + drivers/media/video/ivtv/ivtv-streams.c | 15 +- + drivers/media/video/ivtv/ivtv-vbi.c | 17 +- + drivers/media/video/ivtv/ivtvfb.c | 91 +- + drivers/media/video/m52790.c | 176 +- + drivers/media/video/msp3400-driver.c | 402 ++- + drivers/media/video/msp3400-driver.h | 7 + + drivers/media/video/msp3400-kthreads.c | 34 +- + drivers/media/video/mt9m001.c | 60 +- + drivers/media/video/mt9m111.c | 121 +- + drivers/media/video/mt9t031.c | 736 ++++ + drivers/media/video/mt9v022.c | 46 +- + drivers/media/video/omap24xxcam-dma.c | 601 ++++ + drivers/media/video/omap24xxcam.c | 1908 +++++++++++ + drivers/media/video/omap24xxcam.h | 593 ++++ + drivers/media/video/ov511.c | 5 +- + drivers/media/video/ov772x.c | 1012 ++++++ + drivers/media/video/pms.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 13 +- + drivers/media/video/pwc/pwc-if.c | 2 +- + drivers/media/video/pwc/pwc-v4l.c | 3 +- + drivers/media/video/pwc/pwc.h | 3 +- + drivers/media/video/pxa_camera.c | 545 +++- + drivers/media/video/pxa_camera.h | 95 + + drivers/media/video/saa5246a.c | 7 +- + drivers/media/video/saa5249.c | 7 +- + drivers/media/video/saa7115.c | 763 +++-- + drivers/media/video/saa7127.c | 421 ++- + drivers/media/video/saa7134/saa7134-cards.c | 52 +- + drivers/media/video/saa7134/saa7134-dvb.c | 24 +- + drivers/media/video/saa7134/saa7134-input.c | 14 + + drivers/media/video/saa7134/saa7134-tvaudio.c | 2 +- + drivers/media/video/saa7134/saa7134.h | 3 +- + drivers/media/video/saa717x.c | 610 ++-- + drivers/media/video/se401.c | 5 +- + drivers/media/video/sh_mobile_ceu_camera.c | 309 ++- + drivers/media/video/sn9c102/sn9c102_core.c | 2 +- + drivers/media/video/sn9c102/sn9c102_devtable.h | 8 + + drivers/media/video/soc_camera.c | 389 ++- + drivers/media/video/soc_camera_platform.c | 17 +- + drivers/media/video/stk-webcam.c | 27 +- + drivers/media/video/stv680.c | 5 +- + drivers/media/video/tda7432.c | 252 +- + drivers/media/video/tda9840.c | 188 +- + drivers/media/video/tda9875.c | 348 +-- + drivers/media/video/tea6415c.c | 49 +- + drivers/media/video/tea6420.c | 49 +- + drivers/media/video/tlv320aic23b.c | 141 +- + drivers/media/video/tuner-core.c | 397 ++- + drivers/media/video/tvaudio.c | 707 +++-- + drivers/media/video/tvp514x.c | 1569 +++++++++ + drivers/media/video/tvp514x_regs.h | 297 ++ + drivers/media/video/tvp5150.c | 827 +++--- + drivers/media/video/tw9910.c | 951 ++++++ + drivers/media/video/upd64031a.c | 193 +- + drivers/media/video/upd64083.c | 166 +- + drivers/media/video/usbvideo/ibmcam.c | 4 +- + drivers/media/video/usbvideo/konicawc.c | 4 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 9 +- + drivers/media/video/usbvideo/ultracam.c | 4 +- + drivers/media/video/usbvideo/usbvideo.c | 7 +- + drivers/media/video/usbvideo/vicam.c | 3 +- + drivers/media/video/usbvision/usbvision-video.c | 11 +- + drivers/media/video/uvc/uvc_ctrl.c | 143 +- + drivers/media/video/uvc/uvc_driver.c | 332 +- + drivers/media/video/uvc/uvc_queue.c | 23 +- + drivers/media/video/uvc/uvc_v4l2.c | 115 +- + drivers/media/video/uvc/uvc_video.c | 214 +- + drivers/media/video/uvc/uvcvideo.h | 34 +- + drivers/media/video/v4l2-common.c | 203 ++- + .../{compat_ioctl32.c => v4l2-compat-ioctl32.c} | 835 +++-- + drivers/media/video/v4l2-dev.c | 365 ++- + drivers/media/video/v4l2-device.c | 86 + + drivers/media/video/v4l2-ioctl.c | 98 +- + drivers/media/video/v4l2-subdev.c | 110 + + drivers/media/video/vino.c | 5 +- + drivers/media/video/vp27smpx.c | 126 +- + drivers/media/video/w9966.c | 5 +- + drivers/media/video/wm8739.c | 188 +- + drivers/media/video/wm8775.c | 221 +- + drivers/media/video/zc0301/zc0301_core.c | 2 +- + drivers/media/video/zoran/zoran_card.c | 6 - + drivers/media/video/zoran/zoran_driver.c | 8 +- + drivers/message/fusion/mptbase.c | 15 +- + drivers/mfd/asic3.c | 6 +- + drivers/mfd/mcp-core.c | 2 +- + drivers/mfd/mcp-sa11x0.c | 2 +- + drivers/mfd/ucb1x00-assabet.c | 2 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/mfd/ucb1x00-ts.c | 2 +- + drivers/mmc/host/imxmmc.c | 459 ++-- + drivers/mmc/host/imxmmc.h | 37 +- + drivers/mmc/host/mmci.c | 2 +- + drivers/mmc/host/omap.c | 7 +- + drivers/mmc/host/pxamci.c | 7 +- + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mtd/maps/dc21285.c | 7 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 4 +- + drivers/mtd/nand/s3c2410.c | 8 +- + drivers/mtd/onenand/omap2.c | 10 +- + drivers/net/Kconfig | 7 +- + drivers/net/arm/ep93xx_eth.c | 2 +- + drivers/net/arm/ixp4xx_eth.c | 2 +- + drivers/net/arm/ks8695net.c | 1 - + drivers/net/cs89x0.c | 6 +- + drivers/net/eexpress.h | 56 +- + drivers/net/irda/pxaficp_ir.c | 46 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/mlx4/en_main.c | 11 +- + drivers/net/mlx4/en_netdev.c | 8 +- + drivers/net/mlx4/en_params.c | 87 +- + drivers/net/mlx4/mlx4_en.h | 6 + + drivers/net/pasemi_mac.c | 2 - + drivers/net/smc911x.h | 3 + + drivers/net/smc91x.h | 3 +- + drivers/net/smsc911x.c | 4 +- + drivers/net/spider_net.c | 1 - + drivers/net/tun.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/wan/ixp4xx_hss.c | 2 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 3 +- + drivers/oprofile/buffer_sync.c | 119 +- + drivers/oprofile/cpu_buffer.c | 197 +- + drivers/oprofile/cpu_buffer.h | 69 +- + drivers/oprofile/oprofile_files.c | 15 +- + drivers/pci/intr_remapping.c | 77 +- + drivers/pci/msi.c | 55 +- + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/pxa2xx_e740.c | 176 + + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-s3c.c | 2 +- + drivers/rtc/rtc-sa1100.c | 12 +- + drivers/s390/kvm/kvm_virtio.c | 34 +- + drivers/s390/scsi/zfcp_aux.c | 110 +- + drivers/s390/scsi/zfcp_ccw.c | 6 - + drivers/s390/scsi/zfcp_cfdc.c | 17 +- + drivers/s390/scsi/zfcp_dbf.c | 12 +- + drivers/s390/scsi/zfcp_dbf.h | 1 + + drivers/s390/scsi/zfcp_def.h | 32 - + drivers/s390/scsi/zfcp_erp.c | 10 +- + drivers/s390/scsi/zfcp_fc.c | 88 +- + drivers/s390/scsi/zfcp_fsf.c | 77 +- + drivers/s390/scsi/zfcp_fsf.h | 2 + + drivers/s390/scsi/zfcp_qdio.c | 4 +- + drivers/scsi/Kconfig | 22 + + drivers/scsi/Makefile | 5 +- + drivers/scsi/NCR5380.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aacraid/commctrl.c | 14 +- + drivers/scsi/aacraid/comminit.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aacraid/dpcsup.c | 2 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aacraid/rkt.c | 2 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/sa.c | 2 +- + drivers/scsi/advansys.c | 3 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/cxgb3i/Kbuild | 4 + + drivers/scsi/cxgb3i/Kconfig | 7 + + drivers/scsi/cxgb3i/cxgb3i.h | 139 + + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 770 +++++ + drivers/scsi/cxgb3i/cxgb3i_ddp.h | 306 ++ + drivers/scsi/cxgb3i/cxgb3i_init.c | 107 + + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 951 ++++++ + drivers/scsi/cxgb3i/cxgb3i_offload.c | 1810 ++++++++++ + drivers/scsi/cxgb3i/cxgb3i_offload.h | 231 ++ + drivers/scsi/cxgb3i/cxgb3i_pdu.c | 402 +++ + drivers/scsi/cxgb3i/cxgb3i_pdu.h | 59 + + drivers/scsi/device_handler/scsi_dh_rdac.c | 18 +- + drivers/scsi/eata.c | 15 +- + drivers/scsi/eata_pio.c | 4 +- + drivers/scsi/esp_scsi.c | 6 +- + drivers/scsi/fcoe/Makefile | 8 + + drivers/scsi/fcoe/fc_transport_fcoe.c | 446 +++ + drivers/scsi/fcoe/fcoe_sw.c | 494 +++ + drivers/scsi/fcoe/libfcoe.c | 1510 ++++++++ + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/ibmmca.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 293 ++- + drivers/scsi/ibmvscsi/ibmvfc.h | 32 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +- + drivers/scsi/ide-scsi.c | 32 +- + drivers/scsi/in2000.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/initio.h | 2 +- + drivers/scsi/ipr.c | 6 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/iscsi_tcp.c | 1621 ++-------- + drivers/scsi/iscsi_tcp.h | 88 +- + drivers/scsi/libfc/Makefile | 12 + + drivers/scsi/libfc/fc_disc.c | 845 +++++ + drivers/scsi/libfc/fc_elsct.c | 71 + + drivers/scsi/libfc/fc_exch.c | 1970 +++++++++++ + drivers/scsi/libfc/fc_fcp.c | 2131 ++++++++++++ + drivers/scsi/libfc/fc_frame.c | 89 + + drivers/scsi/libfc/fc_lport.c | 1604 +++++++++ + drivers/scsi/libfc/fc_rport.c | 1291 +++++++ + drivers/scsi/libiscsi.c | 236 +- + drivers/scsi/libiscsi_tcp.c | 1163 +++++++ + drivers/scsi/lpfc/lpfc.h | 22 +- + drivers/scsi/lpfc/lpfc_attr.c | 169 +- + drivers/scsi/lpfc/lpfc_crtn.h | 15 +- + drivers/scsi/lpfc/lpfc_ct.c | 17 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 164 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- + drivers/scsi/lpfc/lpfc_els.c | 160 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 69 +- + drivers/scsi/lpfc/lpfc_hw.h | 249 ++- + drivers/scsi/lpfc/lpfc_init.c | 685 +++- + drivers/scsi/lpfc/lpfc_logmsg.h | 1 + + drivers/scsi/lpfc/lpfc_mbox.c | 54 +- + drivers/scsi/lpfc/lpfc_nl.h | 30 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 1235 +++++++- + drivers/scsi/lpfc/lpfc_scsi.h | 2 + + drivers/scsi/lpfc/lpfc_sli.c | 159 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 28 +- + drivers/scsi/mac_esp.c | 100 +- + drivers/scsi/nsp32.c | 3 +- + drivers/scsi/qla1280.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 328 ++- + drivers/scsi/qla2xxx/qla_dbg.c | 96 +- + drivers/scsi/qla2xxx/qla_dbg.h | 15 +- + drivers/scsi/qla2xxx/qla_def.h | 584 ++-- + drivers/scsi/qla2xxx/qla_dfs.c | 21 +- + drivers/scsi/qla2xxx/qla_fw.h | 14 +- + drivers/scsi/qla2xxx/qla_gbl.h | 56 +- + drivers/scsi/qla2xxx/qla_gs.c | 481 ++-- + drivers/scsi/qla2xxx/qla_init.c | 1251 ++++---- + drivers/scsi/qla2xxx/qla_inline.h | 45 +- + drivers/scsi/qla2xxx/qla_iocb.c | 358 ++- + drivers/scsi/qla2xxx/qla_isr.c | 840 +++-- + drivers/scsi/qla2xxx/qla_mbx.c | 886 +++-- + drivers/scsi/qla2xxx/qla_mid.c | 516 +++- + drivers/scsi/qla2xxx/qla_os.c | 1471 +++++---- + drivers/scsi/qla2xxx/qla_sup.c | 554 ++-- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicfas408.c | 2 +- + drivers/scsi/scsi_error.c | 6 +- + drivers/scsi/scsi_ioctl.c | 6 +- + drivers/scsi/scsi_lib.c | 149 +- + drivers/scsi/scsi_scan.c | 17 +- + drivers/scsi/scsi_transport_fc.c | 13 +- + drivers/scsi/scsi_transport_spi.c | 5 +- + drivers/scsi/sd.c | 11 +- + drivers/scsi/ses.c | 9 +- + drivers/scsi/sr.c | 4 +- + drivers/scsi/sr_ioctl.c | 2 +- + drivers/scsi/st.c | 245 +- + drivers/scsi/stex.c | 3 +- + drivers/scsi/sym53c416.c | 2 +- + drivers/scsi/tmscsim.c | 3 +- + drivers/scsi/u14-34f.c | 3 +- + drivers/scsi/wd7000.c | 4 +- + drivers/serial/Kconfig | 25 +- + drivers/serial/Makefile | 2 + + drivers/serial/amba-pl010.c | 2 +- + drivers/serial/amba-pl011.c | 2 +- + drivers/serial/imx.c | 8 +- + drivers/serial/pxa.c | 3 +- + drivers/serial/s3c24a0.c | 118 + + drivers/serial/s3c6400.c | 151 + + drivers/serial/samsung.c | 184 +- + drivers/serial/samsung.h | 9 + + drivers/serial/serial_lh7a40x.c | 3 +- + drivers/spi/pxa2xx_spi.c | 2 +- + drivers/spi/spi_s3c24xx.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 4 +- + drivers/usb/host/ehci-orion.c | 17 +- + drivers/usb/host/ohci-omap.c | 8 +- + drivers/usb/host/ohci-pxa27x.c | 2 +- + drivers/video/Kconfig | 7 +- + drivers/video/amba-clcd.c | 4 +- + drivers/video/console/vgacon.c | 17 + + drivers/video/cyber2000fb.c | 2 +- + drivers/video/imxfb.c | 468 ++-- + drivers/video/imxfb.h | 73 - + drivers/video/pxafb.c | 981 ++++-- + drivers/video/pxafb.h | 82 +- + drivers/video/sa1100fb.c | 2 +- + drivers/virtio/virtio.c | 2 +- + drivers/virtio/virtio_balloon.c | 13 +- + drivers/virtio/virtio_pci.c | 43 +- + drivers/virtio/virtio_ring.c | 3 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/sa1100_wdt.c | 12 +- + drivers/xen/events.c | 14 +- + firmware/Makefile | 16 +- + fs/Kconfig | 39 +- + fs/Makefile | 5 +- + fs/aio.c | 100 +- + fs/bad_inode.c | 6 - + fs/befs/linuxvfs.c | 5 +- + fs/bio-integrity.c | 2 +- + fs/bio.c | 320 ++- + fs/block_dev.c | 9 +- + fs/buffer.c | 19 +- + fs/cifs/Makefile | 2 +- + fs/cifs/cifsfs.c | 7 - + fs/cifs/cifsfs.h | 1 - + fs/cifs/fcntl.c | 118 - + fs/dcache.c | 25 +- + fs/dcookies.c | 28 +- + fs/ecryptfs/inode.c | 3 +- + fs/exec.c | 13 +- + fs/ext2/ialloc.c | 6 +- + fs/ext2/inode.c | 7 +- + fs/ext2/namei.c | 15 +- + fs/ext3/ialloc.c | 6 +- + fs/ext3/inode.c | 7 +- + fs/ext3/namei.c | 15 +- + fs/ext4/ialloc.c | 6 +- + fs/ext4/inode.c | 7 +- + fs/ext4/namei.c | 14 +- + fs/ext4/super.c | 8 +- + fs/fat/dir.c | 1 - + fs/fat/inode.c | 2 + + fs/fat/namei_vfat.c | 2 +- + fs/file_table.c | 10 +- + fs/freevxfs/vxfs_inode.c | 4 +- + fs/inode.c | 268 +- + fs/jfs/inode.c | 8 +- + fs/jfs/jfs_inode.c | 29 +- + fs/jfs/namei.c | 24 +- + fs/lockd/clntlock.c | 23 +- + fs/lockd/host.c | 10 +- + fs/lockd/svc.c | 6 +- + fs/namei.c | 115 +- + fs/namespace.c | 2 +- + fs/nfs/callback.c | 36 +- + fs/nfs/client.c | 95 +- + fs/nfs/delegation.c | 260 +- + fs/nfs/delegation.h | 33 +- + fs/nfs/dir.c | 24 +- + fs/nfs/inode.c | 13 +- + fs/nfs/internal.h | 14 + + fs/nfs/mount_clnt.c | 34 +- + fs/nfs/nfs4_fs.h | 32 +- + fs/nfs/nfs4proc.c | 431 ++-- + fs/nfs/nfs4renewd.c | 22 +- + fs/nfs/nfs4state.c | 415 ++- + fs/nfs/nfs4xdr.c | 1235 +++---- + fs/nfs/nfsroot.c | 27 +- + fs/nfs/read.c | 6 - + fs/nfs/super.c | 44 +- + fs/nfs_common/nfsacl.c | 4 +- + fs/nfsctl.c | 5 +- + fs/nfsd/nfs4callback.c | 9 +- + fs/nfsd/nfs4state.c | 12 + + fs/notify/Kconfig | 2 + + fs/notify/Makefile | 2 + + fs/notify/dnotify/Kconfig | 10 + + fs/notify/dnotify/Makefile | 1 + + fs/{ => notify/dnotify}/dnotify.c | 3 - + fs/notify/inotify/Kconfig | 27 + + fs/notify/inotify/Makefile | 2 + + fs/{ => notify/inotify}/inotify.c | 0 + fs/{ => notify/inotify}/inotify_user.c | 2 +- + fs/open.c | 5 + + fs/proc/stat.c | 7 +- + fs/reiserfs/inode.c | 15 +- + fs/reiserfs/namei.c | 8 + + fs/seq_file.c | 10 +- + fs/sysv/inode.c | 6 +- + fs/xfs/Makefile | 6 +- + fs/xfs/linux-2.6/sv.h | 22 +- + fs/xfs/linux-2.6/xfs_aops.c | 66 +- + fs/xfs/linux-2.6/xfs_aops.h | 3 + + fs/xfs/linux-2.6/xfs_buf.c | 87 +- + fs/xfs/linux-2.6/xfs_buf.h | 30 +- + fs/xfs/linux-2.6/xfs_cred.h | 8 - + fs/xfs/linux-2.6/xfs_export.c | 1 - + fs/xfs/linux-2.6/xfs_file.c | 189 +- + fs/xfs/linux-2.6/xfs_fs_subr.c | 23 +- + fs/xfs/linux-2.6/xfs_globals.c | 8 - + fs/xfs/linux-2.6/xfs_globals.h | 1 - + fs/xfs/linux-2.6/xfs_ioctl.c | 223 +- + fs/xfs/linux-2.6/xfs_ioctl.h | 82 + + fs/xfs/linux-2.6/xfs_ioctl32.c | 849 +++-- + fs/xfs/linux-2.6/xfs_ioctl32.h | 214 ++- + fs/xfs/linux-2.6/xfs_iops.c | 122 +- + fs/xfs/linux-2.6/xfs_iops.h | 1 - + fs/xfs/linux-2.6/xfs_linux.h | 13 +- + fs/xfs/linux-2.6/xfs_lrw.c | 50 +- + fs/xfs/linux-2.6/xfs_stats.c | 6 +- + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 884 ++---- + fs/xfs/linux-2.6/xfs_super.h | 15 - + fs/xfs/linux-2.6/xfs_sync.c | 762 +++++ + fs/xfs/linux-2.6/xfs_sync.h | 55 + + fs/xfs/linux-2.6/xfs_sysctl.c | 11 - + fs/xfs/linux-2.6/xfs_sysctl.h | 3 +- + fs/xfs/linux-2.6/xfs_vfs.h | 77 - + fs/xfs/linux-2.6/xfs_vnode.c | 145 - + fs/xfs/linux-2.6/xfs_vnode.h | 72 +- + fs/xfs/quota/xfs_dquot.c | 39 +- + fs/xfs/quota/xfs_dquot.h | 4 +- + fs/xfs/quota/xfs_dquot_item.c | 45 +- + fs/xfs/quota/xfs_qm.c | 57 +- + fs/xfs/quota/xfs_qm.h | 3 +- + fs/xfs/quota/xfs_qm_bhv.c | 5 +- + fs/xfs/quota/xfs_qm_syscalls.c | 151 +- + fs/xfs/support/debug.c | 39 +- + fs/xfs/support/debug.h | 2 - + fs/xfs/support/ktrace.c | 9 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_ag.h | 15 +- + fs/xfs/xfs_alloc.c | 264 +- + 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 | 410 ++- + fs/xfs/xfs_bmap.h | 72 +- + fs/xfs/xfs_bmap_btree.c | 2617 +++------------ + 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_buf_item.c | 45 +- + fs/xfs/xfs_clnt.h | 105 - + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dfrag.c | 8 +- + fs/xfs/xfs_dfrag.h | 2 +- + fs/xfs/xfs_dinode.h | 148 +- + fs/xfs/xfs_dir2_sf.h | 7 - + fs/xfs/xfs_dmops.c | 5 +- + fs/xfs/xfs_error.c | 15 - + fs/xfs/xfs_error.h | 12 +- + fs/xfs/xfs_extfree_item.c | 45 +- + fs/xfs/xfs_fs.h | 22 +- + fs/xfs/xfs_fsops.c | 30 +- + fs/xfs/xfs_ialloc.c | 449 ++- + fs/xfs/xfs_ialloc.h | 31 +- + fs/xfs/xfs_ialloc_btree.c | 2193 ++----------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 735 +++-- + fs/xfs/xfs_imap.h | 40 - + fs/xfs/xfs_inode.c | 587 +--- + fs/xfs/xfs_inode.h | 375 ++- + fs/xfs/xfs_inode_item.c | 45 +- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_iomap.c | 28 +- + fs/xfs/xfs_itable.c | 102 +- + fs/xfs/xfs_itable.h | 14 + + fs/xfs/xfs_log.c | 81 +- + fs/xfs/xfs_log.h | 4 + + fs/xfs/xfs_log_priv.h | 48 +- + fs/xfs/xfs_log_recover.c | 416 +-- + fs/xfs/xfs_mount.c | 81 +- + fs/xfs/xfs_mount.h | 73 +- + fs/xfs/xfs_qmops.c | 5 +- + fs/xfs/xfs_quota.h | 8 +- + fs/xfs/xfs_rename.c | 61 +- + fs/xfs/xfs_rtalloc.c | 41 +- + fs/xfs/xfs_rw.c | 2 +- + fs/xfs/xfs_sb.h | 167 +- + fs/xfs/xfs_trans.c | 22 +- + fs/xfs/xfs_trans.h | 322 +- + fs/xfs/xfs_trans_ail.c | 362 ++- + fs/xfs/xfs_trans_buf.c | 7 +- + fs/xfs/xfs_trans_inode.c | 30 +- + fs/xfs/xfs_trans_item.c | 10 + + fs/xfs/xfs_trans_priv.h | 98 +- + fs/xfs/xfs_utils.c | 12 +- + fs/xfs/xfs_vfsops.c | 757 ---- + fs/xfs/xfs_vfsops.h | 16 - + fs/xfs/xfs_vnodeops.c | 354 +-- + fs/xfs/xfs_vnodeops.h | 10 +- + include/asm-arm/plat-s3c/iic.h | 33 - + include/asm-generic/bug.h | 7 +- + include/drm/Kbuild | 2 +- + include/drm/drm.h | 24 + + include/drm/drmP.h | 108 +- + include/drm/drm_crtc.h | 733 ++++ + include/drm/drm_crtc_helper.h | 124 + + include/drm/drm_edid.h | 202 ++ + include/drm/drm_mode.h | 271 ++ + include/drm/drm_sarea.h | 6 +- + include/drm/i915_drm.h | 41 +- + include/linux/Kbuild | 1 + + include/linux/aio.h | 5 +- + include/linux/bio.h | 26 +- + include/linux/blkdev.h | 52 +- + include/linux/bottom_half.h | 1 - + include/linux/buffer_head.h | 1 + + include/linux/console.h | 4 + + include/linux/dcache.h | 21 +- + include/linux/debug_locks.h | 2 +- + include/linux/dmi.h | 3 + + include/linux/elevator.h | 8 +- + include/linux/fault-inject.h | 9 + + include/linux/fdtable.h | 2 - + include/linux/fs.h | 34 +- + include/linux/fs_struct.h | 6 - + include/linux/futex.h | 5 +- + include/linux/genhd.h | 1 + + include/linux/hardirq.h | 13 +- + include/linux/hrtimer.h | 34 +- + include/linux/ide.h | 37 +- + include/linux/init_task.h | 1 + + include/linux/interrupt.h | 11 +- + include/linux/irq.h | 45 +- + include/linux/irqnr.h | 33 +- + include/linux/jiffies.h | 10 + + include/linux/kernel.h | 11 + + include/linux/kernel_stat.h | 14 +- + include/linux/lguest_launcher.h | 6 +- + include/linux/libata.h | 71 +- + include/linux/lockd/bind.h | 1 + + include/linux/lockd/lockd.h | 4 +- + include/linux/lockdep.h | 45 +- + include/linux/mm_types.h | 5 +- + include/linux/msi.h | 3 + + include/linux/mutex.h | 2 + + include/linux/namei.h | 5 + + include/linux/nfs_fs.h | 17 +- + include/linux/nfs_fs_sb.h | 6 - + include/linux/nfs_mount.h | 3 +- + include/linux/nfs_xdr.h | 7 +- + include/linux/nfsd/state.h | 2 + + include/linux/of_platform.h | 3 +- + include/linux/oprofile.h | 3 +- + include/linux/posix-timers.h | 6 +- + include/linux/random.h | 51 + + include/linux/rcuclassic.h | 2 +- + include/linux/rcupdate.h | 10 +- + include/linux/rcutree.h | 329 ++ + include/linux/ring_buffer.h | 2 + + include/linux/security.h | 137 + + include/linux/serial_core.h | 2 + + include/linux/slab.h | 10 +- + include/linux/sunrpc/clnt.h | 2 + + include/linux/sunrpc/rpc_pipe_fs.h | 1 + + include/linux/sunrpc/svcauth_gss.h | 1 + + include/linux/sunrpc/xdr.h | 15 - + include/linux/sunrpc/xprt.h | 3 +- + include/linux/swiotlb.h | 22 + + include/linux/timex.h | 73 +- + include/linux/types.h | 11 +- + include/linux/uaccess.h | 2 +- + include/linux/videodev2.h | 14 +- + include/linux/virtio_balloon.h | 3 + + include/linux/virtio_console.h | 11 + + include/linux/virtio_pci.h | 8 + + include/linux/virtio_ring.h | 13 +- + include/media/i2c-addr.h | 2 - + include/media/ir-common.h | 2 + + include/media/ov772x.h | 21 + + include/media/saa7146_vv.h | 3 +- + include/media/soc_camera.h | 111 +- + include/media/tvp514x.h | 118 + + include/media/tw9910.h | 39 + + include/media/v4l2-chip-ident.h | 10 + + include/media/v4l2-common.h | 41 + + include/media/v4l2-dev.h | 51 +- + include/media/v4l2-device.h | 109 + + include/media/v4l2-int-device.h | 6 + + include/media/v4l2-ioctl.h | 14 +- + include/media/v4l2-subdev.h | 189 + + include/scsi/fc/fc_els.h | 816 +++++ + include/scsi/fc/fc_encaps.h | 138 + + include/scsi/fc/fc_fc2.h | 124 + + include/scsi/fc/fc_fcoe.h | 114 + + include/scsi/fc/fc_fcp.h | 199 ++ + include/scsi/fc/fc_fs.h | 340 ++ + include/scsi/fc/fc_gs.h | 93 + + include/scsi/fc/fc_ns.h | 159 + + include/scsi/fc_encode.h | 309 ++ + include/scsi/fc_frame.h | 242 ++ + include/scsi/fc_transport_fcoe.h | 54 + + include/scsi/iscsi_if.h | 7 +- + include/scsi/libfc.h | 938 +++++ + include/scsi/libfcoe.h | 176 + + include/scsi/libiscsi.h | 39 +- + include/scsi/libiscsi_tcp.h | 132 + + include/scsi/scsi_device.h | 7 +- + include/scsi/scsi_transport_iscsi.h | 12 +- + init/Kconfig | 86 +- + init/main.c | 2 + + kernel/Kconfig.preempt | 25 - + kernel/Makefile | 6 +- + kernel/exit.c | 4 +- + kernel/extable.c | 16 + + kernel/fork.c | 4 +- + kernel/futex.c | 351 +-- + kernel/hrtimer.c | 332 +-- + kernel/irq/Makefile | 1 + + kernel/irq/chip.c | 16 +- + kernel/irq/handle.c | 205 ++- + kernel/irq/internals.h | 5 + + kernel/irq/manage.c | 27 +- + kernel/irq/numa_migrate.c | 119 + + kernel/irq/proc.c | 6 +- + kernel/lockdep.c | 60 +- + kernel/lockdep_proc.c | 28 +- + kernel/mutex.c | 10 +- + kernel/notifier.c | 8 + + kernel/panic.c | 32 +- + kernel/posix-cpu-timers.c | 10 +- + kernel/posix-timers.c | 40 +- + kernel/printk.c | 2 +- + kernel/rcuclassic.c | 4 +- + kernel/rcupreempt.c | 10 + + kernel/rcupreempt_trace.c | 10 +- + kernel/rcutorture.c | 66 +- + kernel/rcutree.c | 1535 +++++++++ + kernel/rcutree_trace.c | 271 ++ + kernel/resource.c | 9 + + kernel/sched.c | 5 +- + kernel/softirq.c | 39 +- + kernel/softlockup.c | 2 +- + kernel/stacktrace.c | 11 + + kernel/sys.c | 2 +- + kernel/sysctl.c | 14 + + kernel/sysctl_check.c | 1 - + kernel/time/ntp.c | 4 +- + kernel/time/tick-sched.c | 44 +- + kernel/trace/ring_buffer.c | 36 +- + kernel/trace/trace.c | 5 +- + kernel/trace/trace_sysprof.c | 1 - + lib/Kconfig.debug | 32 + + lib/debugobjects.c | 4 +- + lib/swiotlb.c | 255 +- + mm/Makefile | 1 + + mm/bounce.c | 9 +- + mm/failslab.c | 59 + + mm/memory.c | 15 + + mm/slab.c | 89 +- + mm/slub.c | 98 +- + net/core/dev.c | 8 +- + net/core/neighbour.c | 4 +- + net/dccp/proto.c | 3 +- + net/ipv4/inet_connection_sock.c | 4 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +- + net/ipv4/proc.c | 13 +- + net/ipv4/route.c | 4 +- + net/ipv4/tcp.c | 3 +- + net/ipv4/tcp_ipv4.c | 3 + + net/ipv6/tcp_ipv6.c | 3 + + net/netfilter/ipvs/ip_vs_lblc.c | 2 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 2 +- + net/netfilter/ipvs/ip_vs_lc.c | 14 +- + net/netfilter/ipvs/ip_vs_nq.c | 4 +- + net/netfilter/ipvs/ip_vs_rr.c | 1 + + net/netfilter/ipvs/ip_vs_sed.c | 1 + + net/netfilter/ipvs/ip_vs_sh.c | 1 + + net/netfilter/ipvs/ip_vs_wlc.c | 1 + + net/netfilter/ipvs/ip_vs_wrr.c | 8 +- + net/netfilter/nf_conntrack_standalone.c | 4 +- + net/sched/Kconfig | 3 - + net/sched/cls_cgroup.c | 23 +- + net/sunrpc/auth.c | 6 +- + net/sunrpc/auth_gss/auth_gss.c | 295 ++- + net/sunrpc/auth_gss/gss_generic_token.c | 6 +- + net/sunrpc/auth_gss/gss_mech_switch.c | 18 +- + net/sunrpc/auth_gss/svcauth_gss.c | 28 +- + net/sunrpc/clnt.c | 16 + + net/sunrpc/rpc_pipe.c | 42 +- + net/sunrpc/xdr.c | 50 +- + net/unix/af_unix.c | 4 + + net/xfrm/xfrm_proc.c | 17 +- + security/Kconfig | 9 + + security/capability.c | 57 + + security/keys/keyctl.c | 6 +- + security/security.c | 66 + + sound/arm/pxa2xx-ac97-lib.c | 2 +- + sound/arm/pxa2xx-ac97.c | 1 + + sound/arm/pxa2xx-pcm.h | 2 +- + sound/core/hrtimer.c | 1 - + sound/drivers/pcsp/pcsp.c | 1 - + sound/i2c/other/tea575x-tuner.c | 22 +- + sound/oss/waveartist.c | 8 +- + sound/soc/pxa/pxa2xx-ac97.c | 1 + + sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- + 2165 files changed, 145901 insertions(+), 51711 deletions(-) + create mode 100644 Documentation/RCU/trace.txt + create mode 100644 Documentation/arm/pxa/mfp.txt + create mode 100644 Documentation/dvb/technisat.txt + create mode 100644 Documentation/scsi/cxgb3i.txt + create mode 100644 Documentation/video4linux/v4l2-framework.txt + delete mode 100644 arch/arm/boot/compressed/head-clps7500.S + create mode 100644 arch/arm/common/clkdev.c + create mode 100644 arch/arm/configs/h5000_defconfig + create mode 100644 arch/arm/configs/mx31moboard_defconfig + create mode 100644 arch/arm/configs/mx31pdk_defconfig + create mode 100644 arch/arm/configs/neocore926_defconfig + create mode 100644 arch/arm/configs/omap3_pandora_defconfig + create mode 100644 arch/arm/configs/s3c6400_defconfig + create mode 100644 arch/arm/configs/w90p910_defconfig + create mode 100644 arch/arm/include/asm/clkdev.h + delete mode 100644 arch/arm/mach-aaec2000/clock.c + delete mode 100644 arch/arm/mach-aaec2000/clock.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/dma.h + create mode 100644 arch/arm/mach-at91/board-neocore926.c + delete mode 100644 arch/arm/mach-at91/include/mach/dma.h + create mode 100644 arch/arm/mach-at91/sam9_smc.c + create mode 100644 arch/arm/mach-at91/sam9_smc.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/dma.h + delete mode 100644 arch/arm/mach-clps7500/Makefile + delete mode 100644 arch/arm/mach-clps7500/Makefile.boot + delete mode 100644 arch/arm/mach-clps7500/core.c + delete mode 100644 arch/arm/mach-clps7500/include/mach/acornfb.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/dma.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/hardware.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/io.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irq.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irqs.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/memory.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/system.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/timex.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-davinci/include/mach/dma.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/dma.h + create mode 100644 arch/arm/mach-ep93xx/edb9307a.c + create mode 100644 arch/arm/mach-ep93xx/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-ep93xx/include/mach/dma.h + rename arch/arm/mach-footbridge/include/mach/{dma.h => isa-dma.h} (91%) + rename arch/arm/mach-h720x/include/mach/{dma.h => isa-dma.h} (60%) + create mode 100644 arch/arm/mach-integrator/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-integrator/include/mach/dma.h + delete mode 100644 arch/arm/mach-iop13xx/include/mach/dma.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/dma.h + delete mode 100644 arch/arm/mach-iop33x/include/mach/dma.h + delete mode 100644 arch/arm/mach-ixp2000/include/mach/dma.h + delete mode 100644 arch/arm/mach-ixp23xx/include/mach/dma.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/dma.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/dma.h + create mode 100644 arch/arm/mach-kirkwood/include/mach/gpio.h + create mode 100644 arch/arm/mach-ks8695/board-dsm320.c + delete mode 100644 arch/arm/mach-ks8695/include/mach/dma.h + delete mode 100644 arch/arm/mach-l7200/include/mach/dma.h + delete mode 100644 arch/arm/mach-loki/include/mach/dma.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/dma.h + create mode 100644 arch/arm/mach-mv78xx0/include/mach/gpio.h + create mode 100644 arch/arm/mach-mx1/Kconfig + create mode 100644 arch/arm/mach-mx1/Makefile + create mode 100644 arch/arm/mach-mx1/Makefile.boot + create mode 100644 arch/arm/mach-mx1/clock.c + create mode 100644 arch/arm/mach-mx1/crm_regs.h + create mode 100644 arch/arm/mach-mx1/devices.c + create mode 100644 arch/arm/mach-mx1/devices.h + rename arch/arm/{mach-realview/include/mach/dma.h => mach-mx1/generic.c} (58%) + create mode 100644 arch/arm/mach-mx1/mx1ads.c + create mode 100644 arch/arm/mach-mx3/mx31moboard.c + create mode 100644 arch/arm/mach-mx3/mx31pdk.c + delete mode 100644 arch/arm/mach-netx/include/mach/dma.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/dma.h + create mode 100644 arch/arm/mach-omap2/board-omap3pandora.c + create mode 100644 arch/arm/mach-omap2/mmc-twl4030.c + create mode 100644 arch/arm/mach-omap2/mmc-twl4030.h + delete mode 100644 arch/arm/mach-orion5x/gpio.c + delete mode 100644 arch/arm/mach-orion5x/include/mach/dma.h + create mode 100644 arch/arm/mach-pxa/h5000.c + create mode 100644 arch/arm/mach-pxa/imote2.c + create mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h + create mode 100644 arch/arm/mach-pxa/include/mach/h5000.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-ac97.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-uart.h + create mode 100644 arch/arm/mach-realview/include/mach/board-pba8.h + create mode 100644 arch/arm/mach-realview/include/mach/clkdev.h + create mode 100644 arch/arm/mach-realview/realview_pba8.c + rename arch/arm/mach-rpc/include/mach/{dma.h => isa-dma.h} (71%) + create mode 100644 arch/arm/mach-s3c2410/include/mach/gpio-core.h + create mode 100644 arch/arm/mach-s3c2410/include/mach/tick.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-s3c24a0/include/mach/irqs.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/map.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/memory.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/regs-clock.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/regs-irq.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/system.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/tick.h + create mode 100644 arch/arm/mach-s3c24a0/include/mach/timex.h + copy arch/arm/{mach-s3c2410 => mach-s3c24a0}/include/mach/vmalloc.h (56%) + create mode 100644 arch/arm/mach-s3c6400/Kconfig + create mode 100644 arch/arm/mach-s3c6400/Makefile + create mode 100644 arch/arm/mach-s3c6400/Makefile.boot + create mode 100644 arch/arm/mach-s3c6400/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-s3c6400/include/mach/dma.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s3c6400/include/mach/gpio-core.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/gpio.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/hardware.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/irqs.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/map.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/memory.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/pwm-clock.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/regs-fb.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/regs-irq.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/system.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/tick.h + create mode 100644 arch/arm/mach-s3c6400/include/mach/uncompress.h + create mode 100644 arch/arm/mach-s3c6410/Kconfig + create mode 100644 arch/arm/mach-s3c6410/Makefile + create mode 100644 arch/arm/mach-s3c6410/cpu.c + create mode 100644 arch/arm/mach-s3c6410/mach-smdk6410.c + create mode 100644 arch/arm/mach-s3c6410/setup-sdhci.c + rename arch/arm/mach-shark/include/mach/{dma.h => isa-dma.h} (79%) + create mode 100644 arch/arm/mach-versatile/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-versatile/include/mach/dma.h + create mode 100644 arch/arm/mach-w90x900/Kconfig + create mode 100644 arch/arm/mach-w90x900/Makefile + create mode 100644 arch/arm/mach-w90x900/Makefile.boot + create mode 100644 arch/arm/mach-w90x900/cpu.h + create mode 100644 arch/arm/mach-w90x900/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-w90x900/include/mach/hardware.h + create mode 100644 arch/arm/mach-w90x900/include/mach/io.h + create mode 100644 arch/arm/mach-w90x900/include/mach/irqs.h + create mode 100644 arch/arm/mach-w90x900/include/mach/map.h + create mode 100644 arch/arm/mach-w90x900/include/mach/memory.h + create mode 100644 arch/arm/mach-w90x900/include/mach/regs-irq.h + create mode 100644 arch/arm/mach-w90x900/include/mach/regs-serial.h + create mode 100644 arch/arm/mach-w90x900/include/mach/regs-timer.h + create mode 100644 arch/arm/mach-w90x900/include/mach/system.h + create mode 100644 arch/arm/mach-w90x900/include/mach/timex.h + create mode 100644 arch/arm/mach-w90x900/include/mach/uncompress.h + create mode 100644 arch/arm/mach-w90x900/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-w90x900/irq.c + create mode 100644 arch/arm/mach-w90x900/mach-w90p910evb.c + create mode 100644 arch/arm/mach-w90x900/time.c + create mode 100644 arch/arm/mach-w90x900/w90p910.c + delete mode 100644 arch/arm/mm/copypage-feroceon.S + create mode 100644 arch/arm/mm/copypage-feroceon.c + delete mode 100644 arch/arm/mm/copypage-v3.S + create mode 100644 arch/arm/mm/copypage-v3.c + delete mode 100644 arch/arm/mm/copypage-v4wb.S + create mode 100644 arch/arm/mm/copypage-v4wb.c + delete mode 100644 arch/arm/mm/copypage-v4wt.S + create mode 100644 arch/arm/mm/copypage-v4wt.c + delete mode 100644 arch/arm/mm/copypage-xsc3.S + create mode 100644 arch/arm/mm/copypage-xsc3.c + create mode 100644 arch/arm/plat-mxc/include/mach/board-mx31pdk.h + delete mode 100644 arch/arm/plat-mxc/include/mach/dma.h + create mode 100644 arch/arm/plat-mxc/include/mach/mtd-xip.h + create mode 100644 arch/arm/plat-mxc/include/mach/mx1.h + create mode 100644 arch/arm/plat-orion/gpio.c + create mode 100644 arch/arm/plat-orion/include/plat/gpio.h + create mode 100644 arch/arm/plat-s3c/clock.c + create mode 100644 arch/arm/plat-s3c/dev-fb.c + create mode 100644 arch/arm/plat-s3c/dev-hsmmc.c + create mode 100644 arch/arm/plat-s3c/dev-hsmmc1.c + create mode 100644 arch/arm/plat-s3c/dev-i2c0.c + create mode 100644 arch/arm/plat-s3c/dev-i2c1.c + create mode 100644 arch/arm/plat-s3c/gpio-config.c + create mode 100644 arch/arm/plat-s3c/gpio.c + create mode 100644 arch/arm/plat-s3c/include/mach/io.h + rename arch/arm/{mach-s3c2410 => plat-s3c}/include/mach/timex.h (100%) + rename arch/arm/{mach-s3c2410 => plat-s3c}/include/mach/vmalloc.h (91%) + create mode 100644 arch/arm/plat-s3c/include/plat/adc.h + rename arch/arm/{plat-s3c24xx => plat-s3c}/include/plat/clock.h (66%) + create mode 100644 arch/arm/plat-s3c/include/plat/cpu-freq.h + rename arch/arm/{plat-s3c24xx => plat-s3c}/include/plat/cpu.h (70%) + rename arch/arm/{plat-s3c24xx => plat-s3c}/include/plat/devs.h (79%) + create mode 100644 arch/arm/plat-s3c/include/plat/fb.h + create mode 100644 arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h + create mode 100644 arch/arm/plat-s3c/include/plat/gpio-cfg.h + create mode 100644 arch/arm/plat-s3c/include/plat/gpio-core.h + create mode 100644 arch/arm/plat-s3c/include/plat/iic-core.h + create mode 100644 arch/arm/plat-s3c/include/plat/iic.h + rename arch/arm/plat-s3c/include/plat/{map.h => map-base.h} (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/nand.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-ac97.h (100%) + create mode 100644 arch/arm/plat-s3c/include/plat/regs-fb.h + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-iic.h (100%) + create mode 100644 arch/arm/plat-s3c/include/plat/regs-irqtype.h + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-nand.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-rtc.h (100%) + create mode 100644 arch/arm/plat-s3c/include/plat/regs-sdhci.h + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-watchdog.h (100%) + create mode 100644 arch/arm/plat-s3c/include/plat/sdhci.h + create mode 100644 arch/arm/plat-s3c/init.c + rename arch/arm/{plat-s3c24xx => plat-s3c}/pwm-clock.c (81%) + rename arch/arm/{plat-s3c24xx => plat-s3c}/time.c (80%) + create mode 100644 arch/arm/plat-s3c24xx/adc.c + create mode 100644 arch/arm/plat-s3c24xx/clock-dclk.c + create mode 100644 arch/arm/plat-s3c24xx/include/mach/pwm-clock.h + create mode 100644 arch/arm/plat-s3c24xx/include/plat/map.h + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/mci.h (100%) + create mode 100644 arch/arm/plat-s3c24xx/include/plat/pll.h + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/regs-spi.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/regs-udc.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/udc.h (100%) + rename arch/arm/{mach-s3c2410/clock.c => plat-s3c24xx/s3c2410-clock.c} (99%) + create mode 100644 arch/arm/plat-s3c24xx/setup-i2c.c + create mode 100644 arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c + create mode 100644 arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c + create mode 100644 arch/arm/plat-s3c64xx/Kconfig + create mode 100644 arch/arm/plat-s3c64xx/Makefile + create mode 100644 arch/arm/plat-s3c64xx/clock.c + create mode 100644 arch/arm/plat-s3c64xx/cpu.c + create mode 100644 arch/arm/plat-s3c64xx/dev-uart.c + create mode 100644 arch/arm/plat-s3c64xx/gpiolib.c + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-a.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-b.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-c.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-d.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-e.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-f.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-g.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-h.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-i.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-j.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-n.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-o.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-p.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/gpio-bank-q.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/irqs.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/pll.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-clock.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-gpio.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-sys.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/s3c6400.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/s3c6410.h + create mode 100644 arch/arm/plat-s3c64xx/irq-eint.c + create mode 100644 arch/arm/plat-s3c64xx/irq.c + create mode 100644 arch/arm/plat-s3c64xx/s3c6400-clock.c + create mode 100644 arch/arm/plat-s3c64xx/s3c6400-init.c + create mode 100644 arch/arm/plat-s3c64xx/setup-fb-24bpp.c + create mode 100644 arch/arm/plat-s3c64xx/setup-i2c0.c + create mode 100644 arch/arm/plat-s3c64xx/setup-i2c1.c + create mode 100644 arch/sparc/boot/.gitignore + rename arch/sparc/boot/{piggyback.c => piggyback_32.c} (100%) + rename arch/{sparc64/boot/piggyback.c => sparc/boot/piggyback_64.c} (100%) + rename arch/sparc/{defconfig => configs/sparc32_defconfig} (100%) + rename arch/{sparc64/defconfig => sparc/configs/sparc64_defconfig} (100%) + create mode 100644 arch/sparc/include/asm/asm.h + delete mode 100644 arch/sparc/include/asm/module_32.h + delete mode 100644 arch/sparc/include/asm/module_64.h + delete mode 100644 arch/sparc/include/asm/scatterlist_32.h + delete mode 100644 arch/sparc/include/asm/scatterlist_64.h + delete mode 100644 arch/sparc/include/asm/sections_32.h + delete mode 100644 arch/sparc/include/asm/sections_64.h + delete mode 100644 arch/sparc/include/asm/unistd_32.h + delete mode 100644 arch/sparc/include/asm/unistd_64.h + create mode 100644 arch/sparc/kernel/.gitignore + rename arch/{sparc64 => sparc}/kernel/audit.c (100%) + rename arch/sparc/kernel/{auxio.c => auxio_32.c} (100%) + rename arch/{sparc64/kernel/auxio.c => sparc/kernel/auxio_64.c} (67%) + rename arch/{sparc64 => sparc}/kernel/central.c (100%) + rename arch/{sparc64 => sparc}/kernel/cherrs.S (98%) + rename arch/{sparc64 => sparc}/kernel/chmc.c (100%) + rename arch/{sparc64 => sparc}/kernel/compat_audit.c (91%) + rename arch/{sparc64 => sparc}/kernel/ds.c (100%) + rename arch/{sparc64 => sparc}/kernel/dtlb_miss.S (100%) + rename arch/{sparc64 => sparc}/kernel/dtlb_prot.S (100%) + rename arch/{sparc64 => sparc}/kernel/ebus.c (100%) + rename arch/{sparc64 => sparc}/kernel/entry.h (79%) + rename arch/sparc/kernel/{etrap.S => etrap_32.S} (100%) + rename arch/{sparc64/kernel/etrap.S => sparc/kernel/etrap_64.S} (97%) + rename arch/{sparc64 => sparc}/kernel/fpu_traps.S (100%) + rename arch/{sparc64 => sparc}/kernel/ftrace.c (100%) + rename arch/{sparc64 => sparc}/kernel/getsetcc.S (100%) + rename arch/sparc/kernel/{head.S => head_32.S} (99%) + rename arch/{sparc64/kernel/head.S => sparc/kernel/head_64.S} (99%) + rename arch/{sparc64 => sparc}/kernel/helpers.S (100%) + rename arch/{sparc64 => sparc}/kernel/hvapi.c (100%) + rename arch/{sparc64 => sparc}/kernel/hvcalls.S (96%) + rename arch/{sparc64 => sparc}/kernel/hvtramp.S (95%) + rename arch/{sparc64 => sparc}/kernel/iommu.c (100%) + rename arch/{sparc64 => sparc}/kernel/iommu_common.h (100%) + rename arch/sparc/kernel/{irq.c => irq_32.c} (99%) + rename arch/{sparc64/kernel/irq.c => sparc/kernel/irq_64.c} (94%) + rename arch/{sparc64 => sparc}/kernel/itlb_miss.S (100%) + rename arch/{sparc64 => sparc}/kernel/ivec.S (100%) + create mode 100644 arch/sparc/kernel/kernel.h + rename arch/sparc/kernel/{kgdb.c => kgdb_32.c} (100%) + rename arch/{sparc64/kernel/kgdb.c => sparc/kernel/kgdb_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/kprobes.c (100%) + rename arch/{sparc64 => sparc}/kernel/kstack.h (100%) + rename arch/{sparc64 => sparc}/kernel/ktlb.S (100%) + rename arch/{sparc64 => sparc}/kernel/ldc.c (100%) + rename arch/{sparc64 => sparc}/kernel/mdesc.c (99%) + rename arch/{sparc64 => sparc}/kernel/misctrap.S (100%) + rename arch/sparc/kernel/{of_device.c => of_device_32.c} (100%) + rename arch/{sparc64/kernel/of_device.c => sparc/kernel/of_device_64.c} (98%) + rename arch/{sparc64 => sparc}/kernel/pci.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_common.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_fire.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_impl.h (100%) + rename arch/{sparc64 => sparc}/kernel/pci_msi.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_psycho.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sabre.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_schizo.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sun4v.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sun4v.h (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sun4v_asm.S (100%) + rename arch/{sparc64 => sparc}/kernel/power.c (100%) + rename arch/sparc/kernel/{process.c => process_32.c} (99%) + rename arch/{sparc64/kernel/process.c => sparc/kernel/process_64.c} (100%) + delete mode 100644 arch/sparc/kernel/prom.c + create mode 100644 arch/sparc/kernel/prom.h + create mode 100644 arch/sparc/kernel/prom_32.c + create mode 100644 arch/sparc/kernel/prom_64.c + create mode 100644 arch/sparc/kernel/prom_common.c + create mode 100644 arch/sparc/kernel/prom_irqtrans.c + rename arch/{sparc64 => sparc}/kernel/psycho_common.c (100%) + rename arch/{sparc64 => sparc}/kernel/psycho_common.h (100%) + rename arch/sparc/kernel/{ptrace.c => ptrace_32.c} (100%) + rename arch/{sparc64/kernel/ptrace.c => sparc/kernel/ptrace_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/reboot.c (100%) + rename arch/sparc/kernel/{rtrap.S => rtrap_32.S} (100%) + rename arch/{sparc64/kernel/rtrap.S => sparc/kernel/rtrap_64.S} (95%) + rename arch/{sparc64 => sparc}/kernel/sbus.c (100%) + rename arch/sparc/kernel/{setup.c => setup_32.c} (98%) + rename arch/{sparc64/kernel/setup.c => sparc/kernel/setup_64.c} (99%) + rename arch/{sparc64 => sparc}/kernel/signal32.c (100%) + rename arch/sparc/kernel/{signal.c => signal_32.c} (100%) + rename arch/{sparc64/kernel/signal.c => sparc/kernel/signal_64.c} (100%) + rename arch/sparc/kernel/{smp.c => smp_32.c} (100%) + rename arch/{sparc64/kernel/smp.c => sparc/kernel/smp_64.c} (99%) + rename arch/sparc/kernel/{sparc_ksyms.c => sparc_ksyms_32.c} (98%) + rename arch/{sparc64/kernel/sparc64_ksyms.c => sparc/kernel/sparc_ksyms_64.c} (97%) + rename arch/{sparc64 => sparc}/kernel/spiterrs.S (99%) + rename arch/{sparc64 => sparc}/kernel/sstate.c (100%) + rename arch/{sparc64 => sparc}/kernel/stacktrace.c (60%) + rename arch/{sparc64 => sparc}/kernel/starfire.c (100%) + rename arch/{sparc64 => sparc}/kernel/sun4v_ivec.S (98%) + rename arch/{sparc64 => sparc}/kernel/sun4v_tlb_miss.S (100%) + rename arch/{sparc64 => sparc}/kernel/sys32.S (100%) + rename arch/{sparc64 => sparc}/kernel/sys_sparc32.c (100%) + rename arch/sparc/kernel/{sys_sparc.c => sys_sparc_32.c} (100%) + rename arch/{sparc64/kernel/sys_sparc.c => sparc/kernel/sys_sparc_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/syscalls.S (100%) + rename arch/{sparc64 => sparc}/kernel/sysfs.c (99%) + rename arch/{sparc64 => sparc}/kernel/systbls.h (100%) + rename arch/sparc/kernel/{systbls.S => systbls_32.S} (100%) + rename arch/{sparc64/kernel/systbls.S => sparc/kernel/systbls_64.S} (100%) + rename arch/sparc/kernel/{time.c => time_32.c} (100%) + rename arch/{sparc64/kernel/time.c => sparc/kernel/time_64.c} (100%) + rename arch/sparc/kernel/{trampoline.S => trampoline_32.S} (100%) + rename arch/{sparc64/kernel/trampoline.S => sparc/kernel/trampoline_64.S} (98%) + rename arch/sparc/kernel/{traps.c => traps_32.c} (94%) + rename arch/{sparc64/kernel/traps.c => sparc/kernel/traps_64.c} (99%) + rename arch/{sparc64 => sparc}/kernel/tsb.S (99%) + rename arch/{sparc64 => sparc}/kernel/ttable.S (99%) + rename arch/sparc/kernel/{una_asm.S => una_asm_32.S} (100%) + rename arch/{sparc64/kernel/una_asm.S => sparc/kernel/una_asm_64.S} (100%) + rename arch/sparc/kernel/{unaligned.c => unaligned_32.c} (100%) + rename arch/{sparc64/kernel/unaligned.c => sparc/kernel/unaligned_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/us2e_cpufreq.c (100%) + rename arch/{sparc64 => sparc}/kernel/us3_cpufreq.c (100%) + rename arch/{sparc64 => sparc}/kernel/utrap.S (100%) + rename arch/{sparc64 => sparc}/kernel/vio.c (100%) + rename arch/{sparc64 => sparc}/kernel/viohs.c (100%) + rename arch/{sparc64 => sparc}/kernel/visemul.c (100%) + rename arch/{sparc64 => sparc}/kernel/winfixup.S (100%) + rename arch/{sparc64 => sparc}/lib/GENbzero.S (100%) + rename arch/{sparc64 => sparc}/lib/GENcopy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/GENcopy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/GENmemcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/GENpage.S (100%) + rename arch/{sparc64 => sparc}/lib/GENpatch.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2memcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2page.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2patch.S (100%) + rename arch/{sparc64 => sparc}/lib/NGbzero.S (100%) + rename arch/{sparc64 => sparc}/lib/NGcopy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NGcopy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NGmemcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/NGpage.S (100%) + rename arch/{sparc64 => sparc}/lib/NGpatch.S (100%) + rename arch/{sparc64 => sparc}/lib/PeeCeeI.c (100%) + rename arch/{sparc64 => sparc}/lib/U1copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U1copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U1memcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/U3copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U3copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U3memcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/U3patch.S (100%) + rename arch/{sparc64 => sparc}/lib/VISsave.S (100%) + rename arch/sparc/lib/{atomic.S => atomic_32.S} (100%) + rename arch/{sparc64/lib/atomic.S => sparc/lib/atomic_64.S} (84%) + rename arch/{sparc64 => sparc}/lib/bitops.S (84%) + rename arch/{sparc64 => sparc}/lib/bzero.S (100%) + rename arch/sparc/lib/{checksum.S => checksum_32.S} (100%) + rename arch/{sparc64/lib/checksum.S => sparc/lib/checksum_64.S} (100%) + rename arch/{sparc64 => sparc}/lib/clear_page.S (100%) + rename arch/{sparc64 => sparc}/lib/copy_in_user.S (100%) + rename arch/{sparc64 => sparc}/lib/copy_page.S (100%) + rename arch/{sparc64 => sparc}/lib/csum_copy.S (100%) + rename arch/{sparc64 => sparc}/lib/csum_copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/csum_copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/ipcsum.S (100%) + rename arch/{sparc64 => sparc}/lib/mcount.S (100%) + rename arch/{sparc64 => sparc}/lib/memmove.S (100%) + rename arch/sparc/lib/{memscan.S => memscan_32.S} (100%) + rename arch/{sparc64/lib/memscan.S => sparc/lib/memscan_64.S} (100%) + rename arch/sparc/lib/{rwsem.S => rwsem_32.S} (100%) + rename arch/{sparc64/lib/rwsem.S => sparc/lib/rwsem_64.S} (92%) + rename arch/sparc/lib/{strlen_user.S => strlen_user_32.S} (100%) + rename arch/{sparc64/lib/strlen_user.S => sparc/lib/strlen_user_64.S} (100%) + rename arch/sparc/lib/{strncmp.S => strncmp_32.S} (100%) + rename arch/{sparc64/lib/strncmp.S => sparc/lib/strncmp_64.S} (100%) + rename arch/sparc/lib/{strncpy_from_user.S => strncpy_from_user_32.S} (100%) + rename arch/{sparc64/lib/strncpy_from_user.S => sparc/lib/strncpy_from_user_64.S} (100%) + rename arch/{sparc64 => sparc}/lib/user_fixup.c (100%) + rename arch/{sparc64 => sparc}/lib/xor.S (100%) + delete mode 100644 arch/sparc/math-emu/ashldi3.S + rename arch/sparc/math-emu/{math.c => math_32.c} (99%) + rename arch/{sparc64/math-emu/math.c => sparc/math-emu/math_64.c} (99%) + rename arch/sparc/math-emu/{sfp-util.h => sfp-util_32.h} (100%) + rename arch/{sparc64/math-emu/sfp-util.h => sparc/math-emu/sfp-util_64.h} (100%) + rename arch/sparc/mm/{fault.c => fault_32.c} (100%) + rename arch/{sparc64/mm/fault.c => sparc/mm/fault_64.c} (100%) + rename arch/sparc/mm/{generic.c => generic_32.c} (100%) + rename arch/{sparc64/mm/generic.c => sparc/mm/generic_64.c} (100%) + rename arch/{sparc64 => sparc}/mm/hugetlbpage.c (100%) + rename arch/sparc/mm/{init.c => init_32.c} (97%) + rename arch/{sparc64/mm/init.c => sparc/mm/init_64.c} (99%) + rename arch/{sparc64/mm/init.h => sparc/mm/init_64.h} (100%) + rename arch/{sparc64 => sparc}/mm/tlb.c (100%) + rename arch/{sparc64 => sparc}/mm/tsb.c (97%) + rename arch/{sparc64 => sparc}/mm/ultra.S (99%) + rename arch/sparc/prom/{bootstr.c => bootstr_32.c} (100%) + rename arch/{sparc64/prom/bootstr.c => sparc/prom/bootstr_64.c} (100%) + rename arch/{sparc64 => sparc}/prom/cif.S (100%) + rename arch/sparc/prom/{console.c => console_32.c} (100%) + rename arch/{sparc64/prom/console.c => sparc/prom/console_64.c} (100%) + rename arch/sparc/prom/{devops.c => devops_32.c} (100%) + rename arch/{sparc64/prom/devops.c => sparc/prom/devops_64.c} (100%) + rename arch/sparc/prom/{init.c => init_32.c} (100%) + rename arch/{sparc64/prom/init.c => sparc/prom/init_64.c} (100%) + rename arch/sparc/prom/{misc.c => misc_32.c} (98%) + rename arch/{sparc64/prom/misc.c => sparc/prom/misc_64.c} (100%) + rename arch/{sparc64 => sparc}/prom/p1275.c (100%) + rename arch/sparc/prom/{tree.c => tree_32.c} (97%) + rename arch/{sparc64/prom/tree.c => sparc/prom/tree_64.c} (100%) + delete mode 100644 arch/sparc64/Kconfig + delete mode 100644 arch/sparc64/Kconfig.debug + delete mode 100644 arch/sparc64/Makefile + delete mode 100644 arch/sparc64/boot/.gitignore + delete mode 100644 arch/sparc64/boot/Makefile + delete mode 100644 arch/sparc64/kernel/Makefile + delete mode 100644 arch/sparc64/kernel/asm-offsets.c + delete mode 100644 arch/sparc64/kernel/cpu.c + delete mode 100644 arch/sparc64/kernel/idprom.c + delete mode 100644 arch/sparc64/kernel/init_task.c + delete mode 100644 arch/sparc64/kernel/module.c + delete mode 100644 arch/sparc64/kernel/prom.c + delete mode 100644 arch/sparc64/kernel/vmlinux.lds.S + delete mode 100644 arch/sparc64/lib/Makefile + delete mode 100644 arch/sparc64/lib/iomap.c + delete mode 100644 arch/sparc64/lib/memcmp.S + delete mode 100644 arch/sparc64/lib/strlen.S + delete mode 100644 arch/sparc64/math-emu/Makefile + delete mode 100644 arch/sparc64/mm/Makefile + delete mode 100644 arch/sparc64/oprofile/Makefile + delete mode 100644 arch/sparc64/oprofile/init.c + delete mode 100644 arch/sparc64/prom/Makefile + delete mode 100644 arch/sparc64/prom/printf.c + create mode 100644 drivers/gpu/drm/drm_crtc.c + create mode 100644 drivers/gpu/drm/drm_crtc_helper.c + create mode 100644 drivers/gpu/drm/drm_edid.c + create mode 100644 drivers/gpu/drm/drm_modes.c + create mode 100644 drivers/gpu/drm/i915/dvo.h + create mode 100644 drivers/gpu/drm/i915/dvo_ch7017.c + create mode 100644 drivers/gpu/drm/i915/dvo_ch7xxx.c + create mode 100644 drivers/gpu/drm/i915/dvo_ivch.c + create mode 100644 drivers/gpu/drm/i915/dvo_sil164.c + create mode 100644 drivers/gpu/drm/i915/dvo_tfp410.c + create mode 100644 drivers/gpu/drm/i915/intel_bios.c + create mode 100644 drivers/gpu/drm/i915/intel_bios.h + create mode 100644 drivers/gpu/drm/i915/intel_crt.c + create mode 100644 drivers/gpu/drm/i915/intel_display.c + create mode 100644 drivers/gpu/drm/i915/intel_drv.h + create mode 100644 drivers/gpu/drm/i915/intel_dvo.c + create mode 100644 drivers/gpu/drm/i915/intel_fb.c + create mode 100644 drivers/gpu/drm/i915/intel_i2c.c + create mode 100644 drivers/gpu/drm/i915/intel_lvds.c + create mode 100644 drivers/gpu/drm/i915/intel_modes.c + create mode 100644 drivers/gpu/drm/i915/intel_sdvo.c + create mode 100644 drivers/gpu/drm/i915/intel_sdvo_regs.h + create mode 100644 drivers/gpu/drm/i915/intel_tv.c + create mode 100644 drivers/ide/ide-legacy.c + create mode 100644 drivers/ide/ide-pm.c + create mode 100644 drivers/media/dvb/frontends/cx24113.c + create mode 100644 drivers/media/dvb/frontends/lgdt3304.c + create mode 100644 drivers/media/dvb/frontends/lgdt3304.h + create mode 100644 drivers/media/dvb/frontends/s921_core.c + create mode 100644 drivers/media/dvb/frontends/s921_core.h + create mode 100644 drivers/media/dvb/frontends/s921_module.c + create mode 100644 drivers/media/dvb/frontends/s921_module.h + create mode 100644 drivers/media/dvb/frontends/stb0899_algo.c + create mode 100644 drivers/media/dvb/frontends/stb0899_cfg.h + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.c + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_priv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_reg.h + create mode 100644 drivers/media/dvb/frontends/stb6100.c + create mode 100644 drivers/media/dvb/frontends/stb6100.h + create mode 100644 drivers/media/dvb/frontends/stb6100_cfg.h + create mode 100644 drivers/media/dvb/frontends/tda8261.c + create mode 100644 drivers/media/dvb/frontends/tda8261.h + create mode 100644 drivers/media/dvb/frontends/tda8261_cfg.h + delete mode 100644 drivers/media/video/bt8xx/bt832.c + delete mode 100644 drivers/media/video/bt8xx/bt832.h + create mode 100644 drivers/media/video/gspca/ov534.c + create mode 100644 drivers/media/video/gspca/stv06xx/Kconfig + create mode 100644 drivers/media/video/gspca/stv06xx/Makefile + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx.c + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx.h + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx_sensor.h + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c + create mode 100644 drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h + create mode 100644 drivers/media/video/mt9t031.c + create mode 100644 drivers/media/video/omap24xxcam-dma.c + create mode 100644 drivers/media/video/omap24xxcam.c + create mode 100644 drivers/media/video/omap24xxcam.h + create mode 100644 drivers/media/video/ov772x.c + create mode 100644 drivers/media/video/pxa_camera.h + create mode 100644 drivers/media/video/tvp514x.c + create mode 100644 drivers/media/video/tvp514x_regs.h + create mode 100644 drivers/media/video/tw9910.c + rename drivers/media/video/{compat_ioctl32.c => v4l2-compat-ioctl32.c} (53%) + create mode 100644 drivers/media/video/v4l2-device.c + create mode 100644 drivers/media/video/v4l2-subdev.c + create mode 100644 drivers/pcmcia/pxa2xx_e740.c + create mode 100644 drivers/scsi/cxgb3i/Kbuild + create mode 100644 drivers/scsi/cxgb3i/Kconfig + create mode 100644 drivers/scsi/cxgb3i/cxgb3i.h + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.c + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.h + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_init.c + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_iscsi.c + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.c + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.h + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.c + create mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.h + create mode 100644 drivers/scsi/fcoe/Makefile + create mode 100644 drivers/scsi/fcoe/fc_transport_fcoe.c + create mode 100644 drivers/scsi/fcoe/fcoe_sw.c + create mode 100644 drivers/scsi/fcoe/libfcoe.c + create mode 100644 drivers/scsi/libfc/Makefile + create mode 100644 drivers/scsi/libfc/fc_disc.c + create mode 100644 drivers/scsi/libfc/fc_elsct.c + create mode 100644 drivers/scsi/libfc/fc_exch.c + create mode 100644 drivers/scsi/libfc/fc_fcp.c + create mode 100644 drivers/scsi/libfc/fc_frame.c + create mode 100644 drivers/scsi/libfc/fc_lport.c + create mode 100644 drivers/scsi/libfc/fc_rport.c + create mode 100644 drivers/scsi/libiscsi_tcp.c + create mode 100644 drivers/serial/s3c24a0.c + create mode 100644 drivers/serial/s3c6400.c + delete mode 100644 drivers/video/imxfb.h + delete mode 100644 fs/cifs/fcntl.c + create mode 100644 fs/notify/Kconfig + create mode 100644 fs/notify/Makefile + create mode 100644 fs/notify/dnotify/Kconfig + create mode 100644 fs/notify/dnotify/Makefile + rename fs/{ => notify/dnotify}/dnotify.c (98%) + create mode 100644 fs/notify/inotify/Kconfig + create mode 100644 fs/notify/inotify/Makefile + rename fs/{ => notify/inotify}/inotify.c (100%) + rename fs/{ => notify/inotify}/inotify_user.c (100%) + create mode 100644 fs/xfs/linux-2.6/xfs_ioctl.h + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + delete mode 100644 fs/xfs/linux-2.6/xfs_vfs.h + delete mode 100644 fs/xfs/linux-2.6/xfs_vnode.c + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h + delete mode 100644 fs/xfs/xfs_clnt.h + delete mode 100644 fs/xfs/xfs_imap.h + delete mode 100644 fs/xfs/xfs_vfsops.c + delete mode 100644 fs/xfs/xfs_vfsops.h + delete mode 100644 include/asm-arm/plat-s3c/iic.h + create mode 100644 include/drm/drm_crtc.h + create mode 100644 include/drm/drm_crtc_helper.h + create mode 100644 include/drm/drm_edid.h + create mode 100644 include/drm/drm_mode.h + create mode 100644 include/linux/rcutree.h + create mode 100644 include/media/ov772x.h + create mode 100644 include/media/tvp514x.h + create mode 100644 include/media/tw9910.h + create mode 100644 include/media/v4l2-device.h + create mode 100644 include/media/v4l2-subdev.h + create mode 100644 include/scsi/fc/fc_els.h + create mode 100644 include/scsi/fc/fc_encaps.h + create mode 100644 include/scsi/fc/fc_fc2.h + create mode 100644 include/scsi/fc/fc_fcoe.h + create mode 100644 include/scsi/fc/fc_fcp.h + create mode 100644 include/scsi/fc/fc_fs.h + create mode 100644 include/scsi/fc/fc_gs.h + create mode 100644 include/scsi/fc/fc_ns.h + create mode 100644 include/scsi/fc_encode.h + create mode 100644 include/scsi/fc_frame.h + create mode 100644 include/scsi/fc_transport_fcoe.h + create mode 100644 include/scsi/libfc.h + create mode 100644 include/scsi/libfcoe.h + create mode 100644 include/scsi/libiscsi_tcp.h + create mode 100644 kernel/irq/numa_migrate.c + create mode 100644 kernel/rcutree.c + create mode 100644 kernel/rcutree_trace.c + create mode 100644 mm/failslab.c +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/storage/unusual_devs.h | 30 +++++++++++++++++++++++++++++- + 1 files changed, 29 insertions(+), 1 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merged drivers/input/keyboard/omap-keypad.c +Auto-merged drivers/input/touchscreen/ads7846.c +Merge made by recursive. + Documentation/input/walkera0701.txt | 109 +++++++ + arch/arm/mach-pxa/include/mach/pxa930_rotary.h | 20 ++ + arch/arm/mach-pxa/include/mach/pxa930_trkball.h | 10 + + drivers/input/Makefile | 2 +- + drivers/input/evbug.c | 6 +- + drivers/input/evdev.c | 199 +----------- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input-compat.c | 135 ++++++++ + drivers/input/input-compat.h | 94 ++++++ + drivers/input/input.c | 4 +- + drivers/input/joydev.c | 2 +- + drivers/input/joystick/Kconfig | 24 ++ + drivers/input/joystick/Makefile | 2 + + drivers/input/joystick/maplecontrol.c | 193 +++++++++++ + drivers/input/joystick/walkera0701.c | 292 +++++++++++++++++ + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atkbd.c | 60 ++++ + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/hil_kbd.c | 1 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/keyboard/pxa930_rotary.c | 212 ++++++++++++ + drivers/input/misc/pcspkr.c | 4 +- + drivers/input/misc/uinput.c | 172 +++++++++-- + drivers/input/mouse/Kconfig | 6 + + drivers/input/mouse/Makefile | 27 +- + drivers/input/mouse/appletouch.c | 274 ++++++++-------- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/mouse/hgpk.c | 32 ++- + drivers/input/mouse/hil_ptr.c | 2 +- + drivers/input/mouse/pxa930_trkball.c | 269 ++++++++++++++++ + drivers/input/mouse/synaptics.c | 16 +- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/hil_mlc.c | 1 + + drivers/input/serio/i8042-x86ia64io.h | 8 + + drivers/input/serio/libps2.c | 20 +- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 220 +++++++------- + drivers/input/tablet/gtco.c | 2 +- + drivers/input/tablet/wacom_wac.c | 2 +- + drivers/input/touchscreen/Kconfig | 32 ++ + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ads7846.c | 6 +- + drivers/input/touchscreen/da9034-ts.c | 389 +++++++++++++++++++++++ + drivers/input/touchscreen/tsc2007.c | 381 ++++++++++++++++++++++ + drivers/input/touchscreen/usbtouchscreen.c | 5 +- + drivers/input/touchscreen/wacom_w8001.c | 325 +++++++++++++++++++ + include/linux/gpio_keys.h | 1 + + include/linux/i2c/tsc2007.h | 17 + + include/linux/libps2.h | 2 + + include/linux/map_to_7segment.h | 2 +- + include/linux/serio.h | 1 + + 54 files changed, 3098 insertions(+), 522 deletions(-) + create mode 100644 Documentation/input/walkera0701.txt + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_rotary.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_trkball.h + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h + create mode 100644 drivers/input/joystick/maplecontrol.c + create mode 100644 drivers/input/joystick/walkera0701.c + create mode 100644 drivers/input/keyboard/pxa930_rotary.c + create mode 100644 drivers/input/mouse/pxa930_trkball.c + create mode 100644 drivers/input/touchscreen/da9034-ts.c + create mode 100644 drivers/input/touchscreen/tsc2007.c + create mode 100644 drivers/input/touchscreen/wacom_w8001.c + create mode 100644 include/linux/i2c/tsc2007.h +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Auto-merged drivers/char/tty_audit.c +CONFLICT (content): Merge conflict in drivers/char/tty_audit.c +Auto-merged include/linux/audit.h +Auto-merged include/linux/tty.h +Auto-merged kernel/auditsc.c +Auto-merged kernel/fork.c +Resolved 'drivers/char/tty_audit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b7809a4: Merge commit 'audit-current/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Merge made by recursive. + arch/arm/mach-footbridge/common.c | 7 +++++ + arch/arm/mach-pxa/e750.c | 52 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 59 insertions(+), 0 deletions(-) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/kernel/process.c | 1 + + arch/avr32/kernel/signal.c | 1 + + arch/avr32/kernel/sys_avr32.c | 1 + + arch/avr32/mm/cache.c | 1 + + include/asm-avr32/syscalls.h | 39 +++++++++++++++++++++++++++++++++++++++ + 5 files changed, 43 insertions(+), 0 deletions(-) + create mode 100644 include/asm-avr32/syscalls.h +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/Kconfig | 1 - + 1 files changed, 0 insertions(+), 1 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 +Merge made by recursive. + arch/parisc/include/asm/byteorder.h | 37 ++++++++++---------------------- + arch/parisc/include/asm/io.h | 12 ++-------- + arch/parisc/include/asm/mmu_context.h | 13 ++++++++--- + arch/parisc/include/asm/smp.h | 2 - + arch/parisc/kernel/setup.c | 5 ---- + arch/parisc/kernel/unwind.c | 2 +- + arch/parisc/lib/iomap.c | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + drivers/parisc/asp.c | 3 +- + drivers/parisc/ccio-dma.c | 4 +-- + drivers/parisc/dino.c | 4 +- + drivers/parisc/hppb.c | 2 +- + drivers/parisc/lasi.c | 5 +-- + drivers/parisc/lba_pci.c | 2 +- + drivers/parisc/sba_iommu.c | 9 ++----- + drivers/parisc/wax.c | 3 +- + drivers/rtc/rtc-parisc.c | 3 +- + 17 files changed, 41 insertions(+), 69 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Auto-merged arch/powerpc/boot/dts/mpc8641_hpcn.dts +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/board.txt | 32 ++++- + arch/powerpc/boot/dts/mpc836x_mds.dts | 43 +++++- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 19 ++- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 56 ++++--- + arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 43 +++-- + arch/powerpc/include/asm/qe.h | 37 ++++- + arch/powerpc/include/asm/qe_ic.h | 21 ++- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 9 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 81 +++++++++- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 6 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 - + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 - + arch/powerpc/platforms/83xx/mpc83xx.h | 1 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 7 + + arch/powerpc/platforms/85xx/smp.c | 1 + + arch/powerpc/platforms/Kconfig | 11 ++ + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/fsl_pci.c | 7 +- + arch/powerpc/sysdev/fsl_soc.h | 5 + + arch/powerpc/sysdev/qe_lib/Kconfig | 3 +- + arch/powerpc/sysdev/qe_lib/gpio.c | 195 ++++++++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.c | 155 +++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.h | 12 ++ + 26 files changed, 686 insertions(+), 71 deletions(-) + create mode 100644 arch/powerpc/sysdev/simple_gpio.c + create mode 100644 arch/powerpc/sysdev/simple_gpio.h +Merging pxa/for-next +$ git merge pxa/for-next +Merge made by recursive. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/ptrace.h | 7 +++++-- + arch/s390/kernel/vdso32/gettimeofday.S | 4 ---- + 2 files changed, 5 insertions(+), 6 deletions(-) +Merging sh/master +$ git merge sh/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged arch/x86/kernel/io_apic.c +Merge made by recursive. + arch/x86/ia32/ia32_signal.c | 3 +- + arch/x86/ia32/ipc32.c | 1 + + arch/x86/ia32/sys_ia32.c | 2 +- + arch/x86/include/asm/apic.h | 3 +- + arch/x86/include/asm/efi.h | 1 + + arch/x86/include/asm/mpspec.h | 2 +- + arch/x86/{pci/pci.h => include/asm/pci_x86.h} | 17 +++-- + arch/x86/include/asm/sys_ia32.h | 101 +++++++++++++++++++++++++ + arch/x86/include/asm/uv/uv_bau.h | 46 ++++++------ + arch/x86/kernel/amd_iommu.c | 2 +- + arch/x86/kernel/amd_iommu_init.c | 4 +- + arch/x86/kernel/apic.c | 8 +- + arch/x86/kernel/bios_uv.c | 2 +- + arch/x86/kernel/cpu/mtrr/main.c | 6 +- + arch/x86/kernel/genx2apic_phys.c | 4 +- + arch/x86/kernel/io_apic.c | 2 +- + arch/x86/kernel/mmconf-fam10h_64.c | 3 +- + arch/x86/kernel/pci-gart_64.c | 2 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/traps.c | 33 +++++---- + arch/x86/kernel/xsave.c | 2 +- + arch/x86/mach-default/setup.c | 15 ++-- + arch/x86/pci/acpi.c | 2 +- + arch/x86/pci/amd_bus.c | 2 +- + arch/x86/pci/common.c | 3 +- + arch/x86/pci/direct.c | 2 +- + arch/x86/pci/early.c | 2 +- + arch/x86/pci/fixup.c | 3 +- + arch/x86/pci/i386.c | 2 +- + arch/x86/pci/init.c | 2 +- + arch/x86/pci/irq.c | 3 +- + arch/x86/pci/legacy.c | 2 +- + arch/x86/pci/mmconfig-shared.c | 3 +- + arch/x86/pci/mmconfig_32.c | 2 +- + arch/x86/pci/mmconfig_64.c | 3 +- + arch/x86/pci/numaq_32.c | 2 +- + arch/x86/pci/olpc.c | 2 +- + arch/x86/pci/pcbios.c | 5 +- + arch/x86/pci/visws.c | 3 +- + drivers/pci/hotplug/cpqphp_core.c | 2 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/ibmphp_core.c | 2 +- + 42 files changed, 204 insertions(+), 106 deletions(-) + rename arch/x86/{pci/pci.h => include/asm/pci_x86.h} (88%) + create mode 100644 arch/x86/include/asm/sys_ia32.h +Merging xtensa/master +$ git merge xtensa/master +Auto-merged arch/xtensa/platforms/iss/network.c +Merge made by recursive. + arch/xtensa/Makefile | 28 +-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/Kbuild | 0 + .../xtensa/include/asm}/asmmacro.h | 2 +- + .../xtensa/include/asm}/atomic.h | 0 + .../xtensa/include/asm}/auxvec.h | 0 + .../xtensa/include/asm}/bitops.h | 0 + .../xtensa/include/asm}/bootparam.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 + .../xtensa/include/asm}/byteorder.h | 32 ++-- + .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- + .../xtensa/include/asm}/cacheasm.h | 0 + .../xtensa/include/asm}/cacheflush.h | 0 + .../xtensa/include/asm}/checksum.h | 2 +- + .../xtensa/include/asm}/coprocessor.h | 4 +- + .../xtensa/include/asm}/cpumask.h | 0 + .../xtensa/include/asm}/cputime.h | 0 + .../xtensa/include/asm}/current.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 + .../xtensa/include/asm}/device.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 + .../xtensa/include/asm}/dma-mapping.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 + .../xtensa/include/asm}/emergency-restart.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 + .../xtensa/include/asm}/hardirq.h | 0 + .../xtensa/include/asm}/highmem.h | 0 + .../xtensa/include/asm}/hw_irq.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 + .../xtensa/include/asm}/ioctls.h | 0 + .../xtensa/include/asm}/ipcbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- + .../xtensa/include/asm}/irq_regs.h | 0 + .../xtensa/include/asm}/kdebug.h | 0 + .../xtensa/include/asm}/kmap_types.h | 0 + .../xtensa/include/asm}/linkage.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 + .../xtensa/include/asm}/mmu_context.h | 0 + .../xtensa/include/asm}/module.h | 0 + .../xtensa/include/asm}/msgbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 + .../xtensa/include/asm}/pci-bridge.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 + .../xtensa/include/asm}/percpu.h | 0 + .../xtensa/include/asm}/pgalloc.h | 0 + .../xtensa/include/asm}/pgtable.h | 0 + .../xtensa/include/asm}/platform.h | 2 - + .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 + .../xtensa/include/asm}/posix_types.h | 0 + .../xtensa/include/asm}/processor.h | 2 +- + .../xtensa/include/asm}/ptrace.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 + .../xtensa/include/asm}/resource.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 + .../xtensa/include/asm}/scatterlist.h | 0 + .../xtensa/include/asm}/sections.h | 0 + .../xtensa/include/asm}/segment.h | 0 + .../xtensa/include/asm}/sembuf.h | 0 + .../xtensa/include/asm}/serial.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 + .../xtensa/include/asm}/shmbuf.h | 0 + .../xtensa/include/asm}/shmparam.h | 0 + .../xtensa/include/asm}/sigcontext.h | 0 + .../xtensa/include/asm}/siginfo.h | 0 + .../xtensa/include/asm}/signal.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 + .../xtensa/include/asm}/socket.h | 0 + .../xtensa/include/asm}/sockios.h | 0 + .../xtensa/include/asm}/spinlock.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 + .../xtensa/include/asm}/statfs.h | 0 + .../xtensa/include/asm}/string.h | 0 + .../xtensa/include/asm}/syscall.h | 0 + .../xtensa/include/asm}/system.h | 0 + .../xtensa/include/asm}/termbits.h | 0 + .../xtensa/include/asm}/termios.h | 0 + .../xtensa/include/asm}/thread_info.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 + .../xtensa/include/asm}/tlbflush.h | 0 + .../xtensa/include/asm}/topology.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 + .../xtensa/include/asm}/uaccess.h | 0 + .../xtensa/include/asm}/ucontext.h | 0 + .../xtensa/include/asm}/unaligned.h | 12 +- + .../xtensa/include/asm}/unistd.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/console.c | 4 +- + .../platforms/iss/include/platform}/hardware.h | 0 + .../platforms/iss/include/platform}/simcall.h | 0 + arch/xtensa/platforms/iss/io.c | 2 +- + arch/xtensa/platforms/iss/network.c | 4 +- + arch/xtensa/platforms/xt2000/Makefile | 5 + + .../platforms/xt2000/include/platform/hardware.h | 55 ++++++ + .../platforms/xt2000/include/platform/serial.h | 28 +++ + arch/xtensa/platforms/xt2000/setup.c | 181 ++++++++++++++++++++ + .../xtensa/variants/dc232b/include/variant}/core.h | 0 + .../variants/dc232b/include/variant}/tie-asm.h | 0 + .../xtensa/variants/dc232b/include/variant}/tie.h | 0 + .../xtensa/variants/fsf/include/variant}/core.h | 0 + .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 + .../xtensa/variants/fsf/include/variant}/tie.h | 0 + 124 files changed, 324 insertions(+), 69 deletions(-) + rename {include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (82%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (80%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) + create mode 100644 arch/xtensa/platforms/xt2000/Makefile + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xt2000/setup.c + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Merge made by recursive. + arch/x86/include/asm/percpu.h | 83 ++++++++++++++++++++++++++++++++++-- + include/asm-generic/percpu.h | 11 ++++- + include/asm-generic/sections.h | 10 ++++ + include/asm-generic/vmlinux.lds.h | 16 +++++++ + include/linux/percpu.h | 17 +++++++- + include/linux/percpu_counter.h | 14 ++++-- + kernel/futex.c | 74 ++++++++++++++++++--------------- + kernel/lockdep.c | 4 +- + kernel/module.c | 7 ++- + lib/percpu_counter.c | 18 ++------ + lib/proportions.c | 6 +- + mm/backing-dev.c | 2 +- + 12 files changed, 195 insertions(+), 67 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/genx2apic_phys.c +Auto-merged arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/traps.c +Auto-merged drivers/xen/events.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/irq.h +Merge made by recursive. + Documentation/cpu-hotplug.txt | 17 +- + arch/alpha/include/asm/smp.h | 1 - + arch/alpha/kernel/irq.c | 2 +- + arch/alpha/kernel/process.c | 2 + + arch/alpha/kernel/smp.c | 7 +- + arch/alpha/kernel/sys_dp264.c | 8 +- + arch/alpha/kernel/sys_titan.c | 4 +- + arch/arm/common/gic.c | 4 +- + arch/arm/kernel/irq.c | 2 +- + arch/arm/kernel/smp.c | 10 - + arch/arm/mach-at91/at91rm9200_time.c | 3 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-davinci/time.c | 2 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-realview/localtimer.c | 4 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/oprofile/op_model_mpcore.c | 4 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-orion/time.c | 2 +- + arch/avr32/kernel/time.c | 2 +- + arch/blackfin/kernel/time-ts.c | 2 +- + arch/cris/arch-v32/kernel/irq.c | 4 +- + arch/cris/arch-v32/kernel/smp.c | 4 - + arch/cris/include/asm/smp.h | 1 - + arch/ia64/hp/sim/hpsim_irq.c | 2 +- + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 2 - + arch/ia64/kernel/iosapic.c | 12 +- + arch/ia64/kernel/irq.c | 9 +- + arch/ia64/kernel/msi_ia64.c | 12 +- + arch/ia64/kernel/smpboot.c | 10 +- + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/sn/kernel/irq.c | 6 +- + arch/ia64/sn/kernel/msi_sn.c | 7 +- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/smpboot.c | 6 - + arch/m68knommu/platform/coldfire/pit.c | 2 +- + arch/mips/include/asm/irq.h | 3 +- + arch/mips/include/asm/mach-ip27/topology.h | 1 - + arch/mips/include/asm/smp.h | 3 - + arch/mips/jazz/irq.c | 2 +- + arch/mips/kernel/cevt-bcm1480.c | 4 +- + arch/mips/kernel/cevt-ds1287.c | 2 +- + arch/mips/kernel/cevt-gt641xx.c | 2 +- + arch/mips/kernel/cevt-r4k.c | 2 +- + arch/mips/kernel/cevt-sb1250.c | 4 +- + arch/mips/kernel/cevt-smtc.c | 2 +- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/i8253.c | 2 +- + arch/mips/kernel/irq-gic.c | 6 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp.c | 7 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mti-malta/malta-smtc.c | 6 +- + arch/mips/nxp/pnx8550/common/time.c | 1 + + arch/mips/pmc-sierra/yosemite/smp.c | 6 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sgi-ip27/ip27-timer.c | 2 +- + arch/mips/sibyte/bcm1480/irq.c | 8 +- + arch/mips/sibyte/bcm1480/smp.c | 8 +- + arch/mips/sibyte/sb1250/irq.c | 8 +- + arch/mips/sibyte/sb1250/smp.c | 8 +- + arch/mips/sni/time.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/irq.c | 6 +- + arch/parisc/kernel/smp.c | 15 - + arch/powerpc/include/asm/topology.h | 1 - + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/smp.c | 4 - + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/platforms/pseries/xics.c | 4 +- + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/sysdev/mpic.h | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/smp.c | 6 - + arch/s390/kernel/time.c | 2 +- + arch/sh/include/asm/smp.h | 2 +- + arch/sh/include/asm/topology.h | 1 - + arch/sh/kernel/smp.c | 10 +- + arch/sh/kernel/timers/timer-broadcast.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 2 +- + arch/sparc/include/asm/smp_32.h | 2 - + arch/sparc/kernel/irq_64.c | 11 +- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/pci_msi.c | 2 +- + arch/sparc/kernel/smp_32.c | 6 +- + arch/sparc/kernel/smp_64.c | 4 - + arch/sparc/kernel/sparc_ksyms_32.c | 4 - + arch/sparc/kernel/time_64.c | 2 +- + arch/um/kernel/smp.c | 7 - + arch/um/kernel/time.c | 2 +- + arch/x86/Kconfig | 13 +- + arch/x86/include/asm/bigsmp/apic.h | 32 +- + arch/x86/include/asm/bigsmp/ipi.h | 13 +- + arch/x86/include/asm/desc.h | 10 +- + arch/x86/include/asm/es7000/apic.h | 82 ++- + arch/x86/include/asm/es7000/ipi.h | 12 +- + arch/x86/include/asm/genapic_32.h | 13 +- + arch/x86/include/asm/genapic_64.h | 14 +- + arch/x86/include/asm/ipi.h | 23 +- + arch/x86/include/asm/irq.h | 3 +- + arch/x86/include/asm/mach-default/mach_apic.h | 28 +- + arch/x86/include/asm/mach-default/mach_ipi.h | 18 +- + arch/x86/include/asm/mach-generic/mach_apic.h | 1 + + arch/x86/include/asm/numaq/apic.h | 12 +- + arch/x86/include/asm/numaq/ipi.h | 13 +- + arch/x86/include/asm/smp.h | 6 +- + arch/x86/include/asm/summit/apic.h | 55 ++- + arch/x86/include/asm/summit/ipi.h | 9 +- + arch/x86/include/asm/topology.h | 2 + + arch/x86/kernel/apic.c | 34 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 45 +- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 108 ++-- + arch/x86/kernel/genapic_flat_64.c | 107 ++- + arch/x86/kernel/genx2apic_cluster.c | 81 ++- + arch/x86/kernel/genx2apic_phys.c | 74 ++- + arch/x86/kernel/genx2apic_uv_x.c | 61 ++- + arch/x86/kernel/hpet.c | 8 +- + arch/x86/kernel/i8253.c | 2 +- + arch/x86/kernel/io_apic.c | 370 +++++----- + arch/x86/kernel/ipi.c | 28 +- + arch/x86/kernel/irq.c | 3 + + arch/x86/kernel/irq_32.c | 13 +- + arch/x86/kernel/irq_64.c | 15 +- + arch/x86/kernel/irqinit_32.c | 16 +- + arch/x86/kernel/irqinit_64.c | 13 + + arch/x86/kernel/mfgpt_32.c | 2 +- + arch/x86/kernel/reboot.c | 5 +- + arch/x86/kernel/setup_percpu.c | 19 +- + arch/x86/kernel/smp.c | 8 +- + arch/x86/kernel/smpboot.c | 33 +- + arch/x86/kernel/tlb_32.c | 2 +- + arch/x86/kernel/tlb_64.c | 2 +- + arch/x86/kernel/traps.c | 12 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/mach-generic/bigsmp.c | 5 +- + arch/x86/mach-generic/es7000.c | 5 +- + arch/x86/mach-generic/numaq.c | 5 +- + arch/x86/mach-generic/summit.c | 5 +- + arch/x86/mach-voyager/voyager_smp.c | 9 +- + arch/x86/mm/numa_64.c | 4 +- + arch/x86/mm/srat_64.c | 2 +- + arch/x86/xen/mmu.c | 20 +- + arch/x86/xen/smp.c | 27 +- + arch/x86/xen/suspend.c | 3 +- + arch/x86/xen/time.c | 2 +- + arch/x86/xen/xen-ops.h | 2 +- + drivers/base/cpu.c | 2 +- + drivers/base/node.c | 4 +- + drivers/base/topology.c | 4 +- + drivers/clocksource/tcb_clksrc.c | 2 +- + drivers/lguest/interrupts_and_traps.c | 13 +- + drivers/parisc/iosapic.c | 7 +- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/probe.c | 4 +- + drivers/xen/events.c | 6 +- + include/asm-generic/topology.h | 14 +- + include/asm-m32r/smp.h | 2 - + include/linux/clockchips.h | 4 +- + include/linux/cpumask.h | 98 ++- + include/linux/interrupt.h | 4 +- + include/linux/irq.h | 3 +- + include/linux/sched.h | 92 ++- + include/linux/topology.h | 6 +- + init/Kconfig | 9 + + kernel/cpu.c | 11 +- + kernel/cpuset.c | 4 +- + kernel/irq/chip.c | 2 +- + kernel/irq/manage.c | 22 +- + kernel/irq/migration.c | 14 +- + kernel/irq/proc.c | 31 +- + kernel/profile.c | 4 +- + kernel/rcuclassic.c | 2 +- + kernel/sched.c | 970 ++++++++++++++----------- + kernel/sched_cpupri.c | 39 +- + kernel/sched_cpupri.h | 5 +- + kernel/sched_fair.c | 32 +- + kernel/sched_rt.c | 73 ++- + kernel/sched_stats.h | 3 +- + kernel/taskstats.c | 2 +- + kernel/time/clockevents.c | 2 + + kernel/time/tick-broadcast.c | 2 +- + kernel/time/tick-common.c | 12 +- + kernel/time/tick-sched.c | 10 +- + kernel/trace/trace.c | 4 +- + lib/Kconfig | 7 + + mm/slub.c | 2 +- + 198 files changed, 2019 insertions(+), 1424 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged init/main.c +Auto-merged kernel/trace/trace.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/vm/kmemtrace.txt | 126 ++++ + MAINTAINERS | 6 + + arch/x86/kvm/Kconfig | 3 +- + drivers/char/sysrq.c | 2 +- + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 +++ + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/trace/Kconfig | 23 + + kernel/trace/Makefile | 3 + + kernel/trace/kmemtrace.c | 345 +++++++++++ + kernel/trace/trace.c | 741 ++---------------------- + kernel/trace/trace.h | 61 ++- + kernel/trace/trace_boot.c | 1 + + kernel/trace/trace_branch.c | 295 ++++++---- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hw_branches.c | 1 + + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ + kernel/trace/trace_output.h | 59 ++ + kernel/trace/trace_power.c | 1 + + kernel/trace/trace_selftest.c | 1 - + kernel/trace/trace_stat.c | 251 ++++++++ + mm/Makefile | 1 + + mm/kmemtrace.c | 333 +++++++++++ + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 +++- + 33 files changed, 2705 insertions(+), 877 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/trace/kmemtrace.h + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_stat.c + create mode 100644 mm/kmemtrace.c +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged kernel/irq/chip.c +Merge made by recursive. + kernel/irq/chip.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/linux/sched.h +Merge made by recursive. + include/linux/sched.h | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/clockchips.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/time/tick-common.c +Merge made by recursive. + include/linux/clockchips.h | 1 + + kernel/hrtimer.c | 34 +++++++++++++++++++++++++++++++++- + kernel/time/tick-common.c | 26 +++++++++++++++++++------- + 3 files changed, 53 insertions(+), 8 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/alpha/kernel/sys_dp264.c +Auto-merged arch/powerpc/kernel/prom_parse.c +Auto-merged arch/x86/kernel/pci-dma.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged arch/x86/pci/acpi.c +Auto-merged arch/x86/pci/common.c +Auto-merged arch/x86/pci/i386.c +Auto-merged arch/x86/pci/init.c +Auto-merged arch/x86/pci/irq.c +Auto-merged arch/x86/pci/visws.c +Auto-merged drivers/net/e1000e/netdev.c +Auto-merged drivers/parisc/dino.c +Auto-merged drivers/parisc/iosapic.c +Auto-merged drivers/pci/hotplug/acpiphp.h +Auto-merged drivers/pci/hotplug/acpiphp_glue.c +Auto-merged drivers/pci/hotplug/cpqphp_pci.c +Auto-merged drivers/pci/msi.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/pci/quirks.c +Auto-merged include/linux/pci.h +Auto-merged kernel/resource.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 4 + + arch/alpha/kernel/pci.c | 2 +- + arch/alpha/kernel/pci_impl.h | 9 +- + arch/alpha/kernel/sys_dp264.c | 2 +- + arch/alpha/kernel/sys_eiger.c | 2 +- + arch/alpha/kernel/sys_miata.c | 2 +- + arch/alpha/kernel/sys_noritake.c | 2 +- + arch/alpha/kernel/sys_ruffian.c | 2 +- + arch/alpha/kernel/sys_sable.c | 2 +- + arch/arm/kernel/bios32.c | 6 +- + arch/arm/mach-integrator/pci.c | 11 +- + arch/mips/pci/pci-ip27.c | 6 - + arch/mips/pci/pci.c | 9 +- + arch/powerpc/kernel/prom_parse.c | 7 +- + arch/sh/drivers/pci/ops-cayman.c | 9 +- + arch/sh/drivers/pci/pci.c | 7 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/init_32.c | 2 + + arch/x86/mm/init_64.c | 2 + + arch/x86/pci/acpi.c | 9 +- + arch/x86/pci/common.c | 8 + + arch/x86/pci/i386.c | 4 +- + arch/x86/pci/init.c | 3 +- + arch/x86/pci/irq.c | 54 ++--- + arch/x86/pci/visws.c | 7 +- + drivers/acpi/pci_root.c | 20 ++ + drivers/net/e1000e/netdev.c | 2 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/iosapic.c | 3 +- + drivers/pci/Kconfig | 9 + + drivers/pci/Makefile | 2 + + drivers/pci/bus.c | 87 ++++--- + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 38 ++-- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/fakephp.c | 1 + + drivers/pci/hotplug/pciehp_ctrl.c | 26 +- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 +-- + drivers/pci/pci-acpi.c | 82 +++---- + drivers/pci/pci-driver.c | 74 ++++--- + drivers/pci/pci-stub.c | 47 ++++ + drivers/pci/pci-sysfs.c | 57 +++-- + drivers/pci/pci.c | 410 +++++++++++++++++++++++++------- + drivers/pci/pci.h | 26 ++- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aer/aerdrv_errprint.c | 2 +- + drivers/pci/pcie/aspm.c | 27 +-- + drivers/pci/pcie/portdrv_core.c | 6 +- + drivers/pci/pcie/portdrv_pci.c | 21 ++- + drivers/pci/probe.c | 40 ++-- + drivers/pci/proc.c | 18 +- + drivers/pci/quirks.c | 112 ++++++++-- + drivers/pci/setup-bus.c | 6 +- + drivers/pci/setup-res.c | 24 +- + include/linux/ioport.h | 11 +- + include/linux/pci-acpi.h | 14 +- + include/linux/pci.h | 74 ++++--- + include/linux/pci_regs.h | 12 + + kernel/resource.c | 61 +++++- + 62 files changed, 1015 insertions(+), 518 deletions(-) + create mode 100644 drivers/pci/pci-stub.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merged drivers/md/dm-crypt.c +Auto-merged drivers/md/dm.c +CONFLICT (content): Merge conflict in drivers/md/dm.c +Resolved 'drivers/md/dm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ac16d44: Merge branch 'quilt/device-mapper' +$ git diff -M --stat --summary HEAD^.. + drivers/md/dm-crypt.c | 6 +--- + drivers/md/dm-delay.c | 6 +--- + drivers/md/dm-ioctl.c | 6 +++- + drivers/md/dm-linear.c | 6 +--- + drivers/md/dm-log.c | 40 ++++++++++++++++++++++------ + drivers/md/dm-mpath.c | 6 +--- + drivers/md/dm-raid1.c | 24 +++-------------- + drivers/md/dm-snap.c | 18 ++++-------- + drivers/md/dm-stripe.c | 4 +-- + drivers/md/dm-table.c | 19 +++++++++++++ + drivers/md/dm-target.c | 15 +++++----- + drivers/md/dm-zero.c | 5 +--- + drivers/md/dm.c | 58 ++++++++++++++++++++++++++++++++-------- + drivers/md/dm.h | 1 + + include/linux/device-mapper.h | 27 ++++++++++++++++++- + 15 files changed, 151 insertions(+), 90 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Removed drivers/hid/hid-bright.c +Removed drivers/hid/hid-dell.c +Merge made by recursive. + drivers/hid/Kconfig | 63 +++++++------- + drivers/hid/Makefile | 4 +- + drivers/hid/hid-bright.c | 71 --------------- + drivers/hid/hid-core.c | 119 +++++++++++++++++++++++--- + drivers/hid/hid-dell.c | 76 ---------------- + drivers/hid/hid-dummy.c | 6 ++ + drivers/hid/hid-gaff.c | 185 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-ids.h | 18 ++-- + drivers/hid/hid-lg.c | 7 -- + drivers/hid/hid-ntrig.c | 82 +++++++++++++++++ + drivers/hid/hid-sony.c | 2 +- + drivers/hid/hidraw.c | 32 ++++++- + drivers/hid/usbhid/Kconfig | 2 +- + drivers/hid/usbhid/hid-core.c | 34 +++++--- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/hiddev.c | 135 +++++++++++++++++++++-------- + drivers/hid/usbhid/usbhid.h | 10 ++ + include/linux/hid.h | 16 ++-- + include/linux/hidraw.h | 2 + + 19 files changed, 596 insertions(+), 269 deletions(-) + delete mode 100644 drivers/hid/hid-bright.c + delete mode 100644 drivers/hid/hid-dell.c + create mode 100644 drivers/hid/hid-gaff.c + create mode 100644 drivers/hid/hid-ntrig.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/busses/i2c-pxa.c +Auto-merged drivers/i2c/busses/i2c-s3c2410.c +Auto-merged drivers/i2c/busses/i2c-sh_mobile.c +Merge made by recursive. + drivers/i2c/busses/i2c-ali1563.c | 4 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-amd756.c | 5 +- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 50 ++++++++++++++- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 4 +- + drivers/i2c/busses/i2c-sis630.c | 4 +- + drivers/i2c/i2c-core.c | 8 +- + drivers/input/misc/apanel.c | 81 ++++++++---------------- + drivers/media/video/cafe_ccic.c | 1 - + drivers/media/video/ov7670.c | 1 - + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + drivers/media/video/w9968cf.c | 1 - + include/linux/i2c.h | 4 - + 19 files changed, 98 insertions(+), 84 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged Documentation/feature-removal-schedule.txt +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/hwmon/f71882fg | 89 ++ + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/lm70 | 12 +- + Documentation/hwmon/lm85 | 2 +- + Documentation/hwmon/ltc4245 | 81 ++ + Documentation/spi/spi-lm70llp | 10 + + drivers/hwmon/Kconfig | 47 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/dme1737.c | 5 + + drivers/hwmon/f71805f.c | 5 + + drivers/hwmon/f71882fg.c | 1547 +++++++++++++++++++++++----- + drivers/hwmon/fschmd.c | 448 ++++++++- + drivers/hwmon/i5k_amb.c | 7 + + drivers/hwmon/it87.c | 37 +- + drivers/hwmon/k8temp.c | 15 + + drivers/hwmon/lm70.c | 91 ++- + drivers/hwmon/ltc4245.c | 567 ++++++++++ + drivers/hwmon/pc87360.c | 6 + + drivers/hwmon/pc87427.c | 5 + + drivers/hwmon/sis5595.c | 5 + + drivers/hwmon/smsc47b397.c | 5 + + drivers/hwmon/smsc47m1.c | 5 + + drivers/hwmon/via686a.c | 5 + + drivers/hwmon/vt1211.c | 5 + + drivers/hwmon/vt8231.c | 5 + + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 5 + + drivers/hwmon/w83781d.c | 5 +- + drivers/hwmon/w83791d.c | 5 +- + drivers/hwmon/w83792d.c | 5 +- + drivers/hwmon/w83793.c | 5 +- + drivers/spi/spi_lm70llp.c | 33 +- + 34 files changed, 2743 insertions(+), 361 deletions(-) + create mode 100644 Documentation/hwmon/f71882fg + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 drivers/hwmon/ltc4245.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Auto-merged Makefile +Merge made by recursive. + Documentation/kbuild/00-INDEX | 6 +- + Documentation/kbuild/kbuild.txt | 126 +++++++++++++++++++++++ + Documentation/kbuild/kconfig.txt | 188 +++++++++++++++++++++++++++++++++++ + Makefile | 3 +- + README | 32 ++++--- + scripts/headers_check.pl | 64 ++++++++++++- + scripts/headers_install.pl | 3 + + scripts/kconfig/expr.h | 83 ++++++++++----- + scripts/kconfig/lex.zconf.c_shipped | 7 +- + scripts/kconfig/menu.c | 2 + + scripts/kconfig/symbol.c | 27 ++++- + scripts/kconfig/zconf.l | 7 +- + scripts/tags.sh | 1 - + 13 files changed, 495 insertions(+), 54 deletions(-) + create mode 100644 Documentation/kbuild/kbuild.txt + create mode 100644 Documentation/kbuild/kconfig.txt +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged MAINTAINERS +Removed drivers/scsi/ide-scsi.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + MAINTAINERS | 5 - + drivers/ide/Kconfig | 18 +- + drivers/ide/Makefile | 2 +- + drivers/ide/aec62xx.c | 4 +- + drivers/ide/alim15x3.c | 6 +- + drivers/ide/amd74xx.c | 4 +- + drivers/ide/au1xxx-ide.c | 10 +- + drivers/ide/cmd640.c | 5 +- + drivers/ide/cmd64x.c | 20 +- + drivers/ide/cs5520.c | 2 +- + drivers/ide/cy82c693.c | 2 +- + drivers/ide/hpt366.c | 18 +- + drivers/ide/icside.c | 12 +- + drivers/ide/ide-acpi.c | 22 +- + drivers/ide/ide-atapi.c | 257 +++++---- + drivers/ide/ide-cd.c | 187 +------ + drivers/ide/ide-cd.h | 46 +- + drivers/ide/ide-disk.c | 4 +- + drivers/ide/ide-dma-sff.c | 4 +- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-floppy.c | 30 +- + drivers/ide/ide-floppy_ioctl.c | 58 +- + drivers/ide/ide-gd.c | 3 +- + drivers/ide/ide-gd.h | 10 +- + drivers/ide/ide-io.c | 617 ++++++++------------ + drivers/ide/ide-ioctls.c | 3 +- + drivers/ide/ide-iops.c | 90 ++-- + drivers/ide/ide-lib.c | 9 +- + drivers/ide/ide-park.c | 25 +- + drivers/ide/ide-pm.c | 8 +- + drivers/ide/ide-probe.c | 666 ++++++++++------------ + drivers/ide/ide-proc.c | 23 +- + drivers/ide/ide-sysfs.c | 125 ++++ + drivers/ide/ide-tape.c | 22 +- + drivers/ide/ide-taskfile.c | 14 +- + drivers/ide/ide.c | 259 +-------- + drivers/ide/it8213.c | 4 +- + drivers/ide/it821x.c | 12 +- + drivers/ide/ns87415.c | 6 +- + drivers/ide/pdc202xx_new.c | 4 +- + drivers/ide/pdc202xx_old.c | 12 +- + drivers/ide/piix.c | 6 +- + drivers/ide/pmac.c | 6 +- + drivers/ide/qd65xx.c | 7 +- + drivers/ide/qd65xx.h | 4 +- + drivers/ide/sc1200.c | 8 +- + drivers/ide/scc_pata.c | 23 +- + drivers/ide/serverworks.c | 2 +- + drivers/ide/setup-pci.c | 5 +- + drivers/ide/sgiioc4.c | 14 +- + drivers/ide/siimage.c | 10 +- + drivers/ide/sis5513.c | 2 +- + drivers/ide/sl82c105.c | 4 +- + drivers/ide/slc90e66.c | 4 +- + drivers/ide/tc86c001.c | 16 +- + drivers/ide/triflex.c | 2 +- + drivers/ide/trm290.c | 10 +- + drivers/ide/tx4938ide.c | 11 +- + drivers/ide/tx4939ide.c | 45 +- + drivers/ide/umc8672.c | 13 +- + drivers/ide/via82cxxx.c | 2 +- + drivers/scsi/Kconfig | 8 +- + drivers/scsi/Makefile | 1 - + drivers/scsi/ide-scsi.c | 840 ---------------------------- + include/linux/ide.h | 242 ++++----- + 66 files changed, 1293 insertions(+), 2631 deletions(-) + create mode 100644 drivers/ide/ide-sysfs.c + delete mode 100644 drivers/scsi/ide-scsi.c +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merged drivers/ata/libata-core.c +Auto-merged drivers/ata/libata-scsi.c +Auto-merged drivers/ata/sata_sil.c +Merge made by recursive. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/e820.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged kernel/power/disk.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/boot.c | 11 + + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 84 ----- + drivers/acpi/Makefile | 3 - + drivers/acpi/battery.c | 14 +- + drivers/acpi/dispatcher/dsmethod.c | 3 + + drivers/acpi/dispatcher/dsopcode.c | 53 +++- + drivers/acpi/ec.c | 43 ++-- + drivers/acpi/events/evevent.c | 14 +- + drivers/acpi/events/evgpe.c | 36 +- + drivers/acpi/events/evgpeblk.c | 38 ++- + drivers/acpi/events/evmisc.c | 51 ++-- + drivers/acpi/events/evregion.c | 133 ++++---- + drivers/acpi/events/evrgnini.c | 41 +-- + drivers/acpi/events/evsci.c | 10 +- + drivers/acpi/events/evxface.c | 2 +- + drivers/acpi/events/evxfevnt.c | 12 +- + drivers/acpi/executer/exfldio.c | 11 +- + drivers/acpi/hardware/hwsleep.c | 77 ++--- + drivers/acpi/namespace/nsaccess.c | 11 +- + drivers/acpi/namespace/nseval.c | 70 +--- + drivers/acpi/namespace/nspredef.c | 256 ++++++++++++--- + drivers/acpi/namespace/nsutils.c | 8 +- + drivers/acpi/parser/psparse.c | 12 + + drivers/acpi/parser/psxface.c | 33 ++ + drivers/acpi/pci_link.c | 39 +-- + drivers/acpi/sbs.c | 31 +- + drivers/acpi/sleep/main.c | 67 ++++- + drivers/acpi/sleep/proc.c | 53 ++-- + drivers/acpi/tables/tbfadt.c | 38 ++- + drivers/acpi/tables/tbutils.c | 27 ++- + drivers/acpi/utilities/uteval.c | 6 +- + drivers/acpi/utilities/utglobal.c | 3 +- + drivers/acpi/utilities/utxface.c | 11 + + drivers/acpi/video.c | 15 + + drivers/misc/Kconfig | 284 +---------------- + drivers/misc/Makefile | 13 - + drivers/platform/Kconfig | 5 + + drivers/platform/Makefile | 5 + + drivers/platform/x86/Kconfig | 375 +++++++++++++++++++++ + drivers/platform/x86/Makefile | 19 + + drivers/{misc => platform/x86}/acer-wmi.c | 0 + drivers/{misc => platform/x86}/asus-laptop.c | 0 + drivers/{acpi => platform/x86}/asus_acpi.c | 0 + drivers/{misc => platform/x86}/compal-laptop.c | 0 + drivers/{misc => platform/x86}/eeepc-laptop.c | 0 + drivers/{misc => platform/x86}/fujitsu-laptop.c | 0 + drivers/{misc => platform/x86}/hp-wmi.c | 0 + drivers/{misc => platform/x86}/intel_menlow.c | 0 + drivers/{misc => platform/x86}/msi-laptop.c | 0 + drivers/{misc => platform/x86}/panasonic-laptop.c | 0 + drivers/{misc => platform/x86}/sony-laptop.c | 0 + drivers/{misc => platform/x86}/tc1100-wmi.c | 0 + drivers/{misc => platform/x86}/thinkpad_acpi.c | 0 + drivers/{acpi => platform/x86}/toshiba_acpi.c | 0 + drivers/{acpi => platform/x86}/wmi.c | 0 + drivers/power/power_supply_sysfs.c | 2 + + include/acpi/acconfig.h | 6 +- + include/acpi/acexcep.h | 4 +- + include/acpi/acglobal.h | 1 + + include/acpi/aclocal.h | 1 + + include/acpi/acnamesp.h | 5 +- + include/acpi/acpixf.h | 6 +- + include/acpi/actables.h | 2 + + include/acpi/actypes.h | 8 +- + include/linux/acpi.h | 1 + + include/linux/power_supply.h | 2 + + include/linux/suspend.h | 13 + + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 370 +++++++++++---------- + kernel/power/swsusp.c | 122 +++++++ + 77 files changed, 1597 insertions(+), 1010 deletions(-) + create mode 100644 drivers/platform/Kconfig + create mode 100644 drivers/platform/Makefile + create mode 100644 drivers/platform/x86/Kconfig + create mode 100644 drivers/platform/x86/Makefile + rename drivers/{misc => platform/x86}/acer-wmi.c (100%) + rename drivers/{misc => platform/x86}/asus-laptop.c (100%) + rename drivers/{acpi => platform/x86}/asus_acpi.c (100%) + rename drivers/{misc => platform/x86}/compal-laptop.c (100%) + rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%) + rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%) + rename drivers/{misc => platform/x86}/hp-wmi.c (100%) + rename drivers/{misc => platform/x86}/intel_menlow.c (100%) + rename drivers/{misc => platform/x86}/msi-laptop.c (100%) + rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%) + rename drivers/{misc => platform/x86}/sony-laptop.c (100%) + rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%) + rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%) + rename drivers/{acpi => platform/x86}/toshiba_acpi.c (100%) + rename drivers/{acpi => platform/x86}/wmi.c (100%) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged fs/lockd/host.c +Auto-merged fs/lockd/svc.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged include/linux/lockd/lockd.h +Removed include/linux/lockd/sm_inter.h +Merge made by recursive. + fs/lockd/clntproc.c | 7 +- + fs/lockd/host.c | 170 ++----------- + fs/lockd/mon.c | 569 ++++++++++++++++++++++++++++++---------- + fs/lockd/svc.c | 23 ++- + fs/lockd/svc4proc.c | 13 +- + fs/lockd/svcproc.c | 13 +- + fs/lockd/svcsubs.c | 1 - + fs/lockd/xdr.c | 5 +- + fs/lockd/xdr4.c | 5 +- + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4state.c | 7 +- + fs/nfsd/nfsctl.c | 479 +++++++++++++++++++++++++++++++-- + fs/nfsd/nfsfh.c | 30 ++- + include/linux/lockd/lockd.h | 68 +++-- + include/linux/lockd/sm_inter.h | 48 ---- + include/linux/lockd/xdr.h | 15 +- + include/linux/nfsd/nfsfh.h | 4 + + include/linux/sunrpc/svc.h | 5 +- + net/sunrpc/svc_xprt.c | 22 ++- + net/sunrpc/svcsock.c | 21 ++- + 20 files changed, 1047 insertions(+), 460 deletions(-) + delete mode 100644 include/linux/lockd/sm_inter.h +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/media/dvb/Kconfig +Merge made by recursive. + drivers/firewire/fw-card.c | 20 +- + drivers/firewire/fw-cdev.c | 63 ++- + drivers/firewire/fw-device.c | 11 +- + drivers/firewire/fw-device.h | 6 + + drivers/firewire/fw-ohci.c | 73 +-- + drivers/firewire/fw-sbp2.c | 21 +- + drivers/firewire/fw-topology.c | 16 +- + drivers/firewire/fw-transaction.c | 2 + + drivers/firewire/fw-transaction.h | 13 +- + drivers/ieee1394/csr.c | 12 +- + drivers/ieee1394/csr.h | 10 +- + drivers/ieee1394/csr1212.c | 45 +- + drivers/ieee1394/csr1212.h | 9 +- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/dv1394-private.h | 44 +- + drivers/ieee1394/dv1394.c | 12 +- + drivers/ieee1394/eth1394.c | 28 +- + drivers/ieee1394/eth1394.h | 16 +- + drivers/ieee1394/highlevel.c | 9 +- + drivers/ieee1394/highlevel.h | 7 +- + drivers/ieee1394/hosts.c | 6 +- + drivers/ieee1394/hosts.h | 2 +- + drivers/ieee1394/ieee1394.h | 3 + + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 30 +- + drivers/ieee1394/nodemgr.h | 21 +- + drivers/ieee1394/ohci1394.c | 26 +- + drivers/ieee1394/pcilynx.c | 2 +- + drivers/ieee1394/pcilynx.h | 2 +- + drivers/ieee1394/raw1394.c | 2 +- + drivers/ieee1394/sbp2.c | 4 +- + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + include/linux/firewire-cdev.h | 2 +- + 52 files changed, 3619 insertions(+), 246 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + Documentation/ioctl/ioctl-number.txt | 4 + + drivers/mtd/ubi/build.c | 5 +- + drivers/mtd/ubi/cdev.c | 3 +- + drivers/mtd/ubi/debug.h | 10 +- + drivers/mtd/ubi/eba.c | 51 +++-- + drivers/mtd/ubi/io.c | 28 ++- + drivers/mtd/ubi/ubi.h | 45 ++-- + drivers/mtd/ubi/wl.c | 489 +++++++++++++++------------------- + 8 files changed, 305 insertions(+), 330 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged MAINTAINERS +Removed arch/powerpc/kvm/booke_host.c +Auto-merged arch/x86/kernel/cpu/mtrr/main.c +Auto-merged arch/x86/kernel/reboot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c +Recorded preimage for 'arch/x86/kernel/reboot.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/reboot.c'. +Created commit d5ed3dd: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 - + arch/ia64/include/asm/kvm.h | 20 +- + arch/ia64/include/asm/kvm_host.h | 202 +++-- + arch/ia64/kvm/Makefile | 2 +- + arch/ia64/kvm/asm-offsets.c | 11 +- + arch/ia64/kvm/kvm-ia64.c | 203 +++-- + arch/ia64/kvm/kvm_lib.c | 15 + + arch/ia64/kvm/kvm_minstate.h | 4 +- + arch/ia64/kvm/misc.h | 3 +- + arch/ia64/kvm/mmio.c | 38 +- + arch/ia64/kvm/process.c | 44 +- + arch/ia64/kvm/vcpu.c | 115 ++- + arch/ia64/kvm/vcpu.h | 5 +- + arch/ia64/kvm/vmm.c | 29 + + arch/ia64/kvm/vmm_ivt.S | 1469 +++++++++++++-------------- + arch/ia64/kvm/vtlb.c | 9 +- + arch/powerpc/include/asm/disassemble.h | 80 ++ + arch/powerpc/include/asm/kvm.h | 7 + + arch/powerpc/include/asm/kvm_44x.h | 61 ++ + arch/powerpc/include/asm/kvm_host.h | 122 ++- + arch/powerpc/include/asm/kvm_ppc.h | 83 +- + arch/powerpc/include/asm/mmu-44x.h | 1 + + arch/powerpc/kernel/asm-offsets.c | 21 +- + arch/powerpc/kvm/44x.c | 228 +++++ + arch/powerpc/kvm/44x_emulate.c | 371 +++++++ + arch/powerpc/kvm/44x_tlb.c | 463 +++++++-- + arch/powerpc/kvm/44x_tlb.h | 26 +- + arch/powerpc/kvm/Kconfig | 28 +- + arch/powerpc/kvm/Makefile | 12 +- + arch/powerpc/kvm/{booke_guest.c => booke.c} | 418 ++++----- + arch/powerpc/kvm/booke.h | 60 ++ + arch/powerpc/kvm/booke_host.c | 83 -- + arch/powerpc/kvm/booke_interrupts.S | 72 +- + arch/powerpc/kvm/emulate.c | 447 +-------- + arch/powerpc/kvm/powerpc.c | 134 +--- + arch/powerpc/kvm/timing.c | 239 +++++ + arch/powerpc/kvm/timing.h | 102 ++ + arch/s390/include/asm/kvm.h | 7 + + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/kvm-s390.c | 45 +- + arch/x86/include/asm/kvm.h | 23 + + arch/x86/include/asm/kvm_host.h | 89 ++- + arch/x86/include/asm/kvm_x86_emulate.h | 11 +- + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/mtrr.h | 25 + + arch/x86/{kvm => include/asm}/svm.h | 4 - + arch/x86/include/asm/virtext.h | 132 +++ + arch/x86/{kvm => include/asm}/vmx.h | 32 +- + 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/crash.c | 18 + + arch/x86/kernel/kvmclock.c | 10 +- + arch/x86/kernel/reboot.c | 62 ++- + arch/x86/kvm/i8254.c | 25 +- + arch/x86/kvm/i8254.h | 1 + + arch/x86/kvm/i8259.c | 52 +- + arch/x86/kvm/irq.h | 6 + + arch/x86/kvm/kvm_svm.h | 18 +- + arch/x86/kvm/lapic.c | 58 +- + arch/x86/kvm/mmu.c | 603 ++++++++---- + arch/x86/kvm/paging_tmpl.h | 209 ++-- + arch/x86/kvm/svm.c | 911 +++++++++++++++-- + arch/x86/kvm/vmx.c | 618 ++++++++---- + arch/x86/kvm/x86.c | 376 +++++-- + arch/x86/kvm/x86_emulate.c | 312 ++++--- + fs/anon_inodes.c | 7 +- + include/linux/kvm.h | 78 ++- + include/linux/kvm_host.h | 18 +- + include/linux/kvm_types.h | 3 +- + virt/kvm/ioapic.c | 8 +- + virt/kvm/ioapic.h | 2 + + virt/kvm/irq_comm.c | 19 +- + virt/kvm/kvm_main.c | 426 ++++++-- + virt/kvm/kvm_trace.c | 1 + + 75 files changed, 6292 insertions(+), 3190 deletions(-) + create mode 100644 arch/ia64/kvm/kvm_lib.c + create mode 100644 arch/powerpc/include/asm/disassemble.h + create mode 100644 arch/powerpc/include/asm/kvm_44x.h + create mode 100644 arch/powerpc/kvm/44x.c + create mode 100644 arch/powerpc/kvm/44x_emulate.c + rename arch/powerpc/kvm/{booke_guest.c => booke.c} (56%) + create mode 100644 arch/powerpc/kvm/booke.h + delete mode 100644 arch/powerpc/kvm/booke_host.c + create mode 100644 arch/powerpc/kvm/timing.c + create mode 100644 arch/powerpc/kvm/timing.h + rename arch/x86/{kvm => include/asm}/svm.h (98%) + create mode 100644 arch/x86/include/asm/virtext.h + rename arch/x86/{kvm => include/asm}/vmx.h (91%) +$ git reset --hard HEAD^ +HEAD is now at cceb858 Merge commit 'ubi/linux-next' +Merging dlm/next +$ git merge dlm/next +Auto-merged fs/dlm/netlink.c +Merge made by recursive. + fs/dlm/ast.c | 56 ++++----- + fs/dlm/ast.h | 4 +- + fs/dlm/debug_fs.c | 310 ++++++++++++++++++++++++++++++++++++++++--------- + fs/dlm/dir.c | 18 ++-- + fs/dlm/dlm_internal.h | 4 +- + fs/dlm/lock.c | 31 +++--- + fs/dlm/lowcomms.c | 8 +- + fs/dlm/memory.c | 6 +- + fs/dlm/midcomms.c | 2 +- + fs/dlm/netlink.c | 1 - + fs/dlm/user.c | 4 +- + fs/dlm/user.h | 2 +- + 12 files changed, 316 insertions(+), 130 deletions(-) +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Removed fs/ocfs2/ocfs2_jbd_compat.h +Merge made by recursive. + Documentation/filesystems/ocfs2.txt | 3 +- + fs/Kconfig | 18 +- + fs/Makefile | 1 + + fs/configfs/dir.c | 59 + + fs/dquot.c | 436 ++++-- + fs/ext3/super.c | 16 +- + fs/ext4/super.c | 15 +- + fs/jbd2/commit.c | 9 + + fs/jbd2/journal.c | 19 + + fs/jbd2/transaction.c | 47 + + fs/ocfs2/Makefile | 7 + + fs/ocfs2/acl.c | 479 ++++++ + fs/ocfs2/acl.h | 58 + + fs/ocfs2/alloc.c | 710 ++++++--- + fs/ocfs2/alloc.h | 30 +- + fs/ocfs2/aops.c | 59 +- + fs/ocfs2/blockcheck.c | 477 ++++++ + fs/ocfs2/blockcheck.h | 82 + + fs/ocfs2/buffer_head_io.c | 32 +- + fs/ocfs2/buffer_head_io.h | 27 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 399 ++++- + fs/ocfs2/dir.h | 2 + + fs/ocfs2/dlm/dlmast.c | 52 +- + fs/ocfs2/dlm/dlmcommon.h | 3 + + fs/ocfs2/dlm/dlmdebug.c | 53 +- + fs/ocfs2/dlm/dlmdomain.c | 1 + + fs/ocfs2/dlm/dlmmaster.c | 42 +- + fs/ocfs2/dlm/dlmthread.c | 3 +- + fs/ocfs2/dlmglue.c | 168 ++- + fs/ocfs2/dlmglue.h | 19 + + fs/ocfs2/extent_map.c | 96 +- + fs/ocfs2/extent_map.h | 24 + + fs/ocfs2/file.c | 209 ++-- + fs/ocfs2/file.h | 3 + + fs/ocfs2/inode.c | 175 ++- + fs/ocfs2/inode.h | 18 +- + fs/ocfs2/journal.c | 364 ++++- + fs/ocfs2/journal.h | 128 ++- + fs/ocfs2/localalloc.c | 26 +- + fs/ocfs2/namei.c | 318 +++-- + fs/ocfs2/ocfs2.h | 46 +- + fs/ocfs2/ocfs2_fs.h | 213 +++- + fs/ocfs2/ocfs2_jbd_compat.h | 82 - + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota.h | 119 ++ + fs/ocfs2/quota_global.c | 1025 ++++++++++++ + fs/ocfs2/quota_local.c | 1253 +++++++++++++++ + fs/ocfs2/resize.c | 76 +- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/suballoc.c | 363 +++-- + fs/ocfs2/suballoc.h | 18 +- + fs/ocfs2/super.c | 328 ++++- + fs/ocfs2/symlink.c | 2 +- + fs/ocfs2/xattr.c | 2984 +++++++++++++++++++++-------------- + fs/ocfs2/xattr.h | 45 + + fs/quota.c | 11 +- + fs/quota_tree.c | 645 ++++++++ + fs/quota_tree.h | 25 + + fs/quota_v1.c | 28 +- + fs/quota_v2.c | 631 +------- + {include/linux => fs}/quotaio_v1.h | 0 + {include/linux => fs}/quotaio_v2.h | 33 +- + fs/reiserfs/super.c | 10 +- + include/linux/Kbuild | 4 - + include/linux/dqblk_qtree.h | 56 + + include/linux/dqblk_v1.h | 7 - + include/linux/dqblk_v2.h | 22 +- + include/linux/jbd2.h | 32 + + include/linux/journal-head.h | 8 + + include/linux/quota.h | 108 +- + include/linux/quotaops.h | 96 +- + 73 files changed, 9815 insertions(+), 3153 deletions(-) + create mode 100644 fs/ocfs2/acl.c + create mode 100644 fs/ocfs2/acl.h + create mode 100644 fs/ocfs2/blockcheck.c + create mode 100644 fs/ocfs2/blockcheck.h + delete mode 100644 fs/ocfs2/ocfs2_jbd_compat.h + create mode 100644 fs/ocfs2/quota.h + create mode 100644 fs/ocfs2/quota_global.c + create mode 100644 fs/ocfs2/quota_local.c + create mode 100644 fs/quota_tree.c + create mode 100644 fs/quota_tree.h + rename {include/linux => fs}/quotaio_v1.h (100%) + rename {include/linux => fs}/quotaio_v2.h (68%) + create mode 100644 include/linux/dqblk_qtree.h +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/ext3/namei.c +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/balloc.c +Auto-merged fs/ext4/ialloc.c +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/namei.c +Auto-merged fs/ext4/super.c +Auto-merged include/linux/jbd2.h +Merge made by recursive. + fs/ext3/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext3/namei.c | 7 ++++ + fs/ext3/super.c | 12 +++++++ + fs/ext4/balloc.c | 2 +- + fs/ext4/ext4.h | 3 ++ + fs/ext4/ext4_sb.h | 1 + + fs/ext4/extents.c | 11 ++---- + fs/ext4/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext4/inode.c | 76 ++++++++++++++++++++++++++++++++----------- + fs/ext4/namei.c | 7 ++++ + fs/ext4/super.c | 25 ++++++++------ + include/linux/ext3_fs.h | 28 +++++++++++++++- + include/linux/ext3_fs_sb.h | 1 + + 13 files changed, 268 insertions(+), 59 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Auto-merged include/linux/netdevice.h +Auto-merged net/core/dev.c +Auto-merged net/ipv4/tcp.c +Auto-merged net/ipv4/tcp_input.c +Auto-merged net/ipv4/tcp_ipv4.c +Auto-merged net/ipv6/tcp_ipv6.c +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 96 ++--- + Documentation/dmaengine.txt | 1 + + arch/avr32/include/asm/atmel-mci.h | 6 +- + arch/avr32/mach-at32ap/at32ap700x.c | 15 +- + crypto/async_tx/async_tx.c | 350 +--------------- + drivers/dca/dca-core.c | 2 +- + drivers/dma/Kconfig | 2 - + drivers/dma/dmaengine.c | 773 ++++++++++++++++++++++++--------- + drivers/dma/dmatest.c | 129 ++---- + drivers/dma/dw_dmac.c | 119 +++--- + drivers/dma/fsldma.c | 5 +- + drivers/dma/ioat.c | 92 ++--- + drivers/dma/ioat_dma.c | 5 +- + drivers/dma/iop-adma.c | 30 +-- + drivers/dma/mv_xor.c | 11 +- + drivers/mmc/host/atmel-mci.c | 103 ++---- + include/linux/async_tx.h | 17 +- + include/linux/dmaengine.h | 181 +++------ + include/linux/dw_dmac.h | 31 +- + include/linux/netdevice.h | 3 - + include/net/netdma.h | 11 - + net/core/dev.c | 147 +------ + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 26 files changed, 887 insertions(+), 1253 deletions(-) + create mode 100644 Documentation/dmaengine.txt +$ git am -3 ../patches/0001-net-async_tx-merge-fix.patch +Applying: net: async_tx merge fix +$ git reset HEAD^ +net/core/dev.c: locally modified +$ git add . +$ git commit -v -a --amend +Created commit 16b1d50: Merge commit 'async_tx/next' +Merging udf/for_next +$ git merge udf/for_next +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 663 insertions(+), 590 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merged arch/arm/mach-pxa/corgi.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c +Auto-merged arch/arm/mach-pxa/poodle.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c +Auto-merged arch/arm/mach-pxa/spitz.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c +Auto-merged drivers/mtd/maps/ixp2000.c +Auto-merged drivers/mtd/maps/ixp4xx.c +Auto-merged drivers/mtd/onenand/omap2.c +Auto-merged drivers/mtd/ubi/build.c +Resolved 'arch/arm/mach-pxa/corgi.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/poodle.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/spitz.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0b001e8: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-pxa/corgi.c | 54 ++++++ + arch/arm/mach-pxa/poodle.c | 51 ++++++ + arch/arm/mach-pxa/spitz.c | 77 ++++++++ + drivers/mtd/chips/cfi_cmdset_0001.c | 12 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 14 +- + drivers/mtd/chips/fwh_lock.h | 4 +- + drivers/mtd/devices/lart.c | 6 +- + drivers/mtd/devices/m25p80.c | 53 +++--- + drivers/mtd/devices/mtd_dataflash.c | 52 +++--- + drivers/mtd/ftl.c | 100 +++++----- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/inftlmount.c | 4 +- + drivers/mtd/maps/Kconfig | 17 ++- + drivers/mtd/maps/alchemy-flash.c | 2 +- + drivers/mtd/maps/amd76xrom.c | 4 +- + drivers/mtd/maps/cfi_flagadm.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 4 +- + drivers/mtd/maps/dbox2-flash.c | 2 +- + drivers/mtd/maps/edb7312.c | 2 +- + drivers/mtd/maps/esb2rom.c | 4 +- + drivers/mtd/maps/fortunet.c | 2 +- + drivers/mtd/maps/h720x-flash.c | 2 +- + drivers/mtd/maps/ichxrom.c | 4 +- + drivers/mtd/maps/impa7.c | 2 +- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ipaq-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 4 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/mbx860.c | 2 +- + drivers/mtd/maps/nettel.c | 5 +- + drivers/mtd/maps/octagon-5066.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/physmap.c | 39 ++--- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/redwood.c | 2 +- + drivers/mtd/maps/rpxlite.c | 2 +- + drivers/mtd/maps/sbc8240.c | 2 +- + drivers/mtd/maps/scb2_flash.c | 8 +- + drivers/mtd/maps/sharpsl-flash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/maps/uclinux.c | 4 +- + drivers/mtd/maps/vmax301.c | 2 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 +- + drivers/mtd/mtdchar.c | 6 +- + drivers/mtd/mtdconcat.c | 37 +++-- + drivers/mtd/mtdcore.c | 16 ++- + drivers/mtd/mtdoops.c | 9 +- + drivers/mtd/mtdpart.c | 34 ++-- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/nand_base.c | 25 ++- + drivers/mtd/nand/nand_bbt.c | 31 ++-- + drivers/mtd/nand/nandsim.c | 338 ++++++++++++++++++++++++++++++----- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/sharpsl.c | 247 +++++++++++++------------- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/nftlcore.c | 2 +- + drivers/mtd/nftlmount.c | 4 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/onenand/omap2.c | 2 +- + drivers/mtd/onenand/onenand_base.c | 8 +- + drivers/mtd/rfd_ftl.c | 29 ++-- + drivers/mtd/ssfdc.c | 7 +- + drivers/mtd/ubi/build.c | 4 +- + drivers/mtd/ubi/gluebi.c | 17 +- + drivers/mtd/ubi/vmt.c | 4 +- + fs/jffs2/compr_rubin.c | 120 +++++++------ + fs/jffs2/erase.c | 5 +- + include/linux/mtd/concat.h | 2 +- + include/linux/mtd/ftl.h | 38 ++-- + include/linux/mtd/mtd.h | 75 ++++++-- + include/linux/mtd/nand.h | 7 +- + include/linux/mtd/partitions.h | 6 +- + include/linux/mtd/sharpsl.h | 20 ++ + 76 files changed, 1109 insertions(+), 572 deletions(-) + create mode 100644 include/linux/mtd/sharpsl.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_realtek.c | 3 +- + sound/usb/usbmidi.c | 42 ++++++++++++++++++++-------------------- + sound/usb/usbmixer.c | 6 ++-- + 3 files changed, 26 insertions(+), 25 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 ++- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 51 +++++++++----------- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 9 ++++ + drivers/cpufreq/cpufreq.c | 55 ++++++++++++++-------- + include/linux/cpufreq.h | 1 + + 5 files changed, 74 insertions(+), 48 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging rr_cpumask/master +$ git merge rr_cpumask/master +Auto-merged arch/ia64/include/asm/topology.h +Auto-merged arch/mips/include/asm/mach-ip27/topology.h +Auto-merged arch/powerpc/include/asm/topology.h +Auto-merged arch/sh/include/asm/topology.h +Auto-merged arch/x86/include/asm/topology.h +Auto-merged arch/x86/kernel/io_apic.c +CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged fs/seq_file.c +Auto-merged include/linux/interrupt.h +Auto-merged init/main.c +Auto-merged kernel/rcuclassic.c +CONFLICT (content): Merge conflict in kernel/rcuclassic.c +Auto-merged kernel/sched.c +CONFLICT (content): Merge conflict in kernel/sched.c +Auto-merged kernel/softirq.c +Auto-merged kernel/time/tick-common.c +CONFLICT (content): Merge conflict in kernel/time/tick-common.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/trace/trace.h +Auto-merged kernel/trace/trace_boot.c +Auto-merged kernel/trace/trace_functions_graph.c +Auto-merged kernel/trace/trace_hw_branches.c +Auto-merged kernel/trace/trace_power.c +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Recorded preimage for 'arch/x86/kernel/io_apic.c' +Recorded preimage for 'kernel/time/tick-common.c' +Resolved 'kernel/rcuclassic.c' using previous resolution. +Resolved 'kernel/sched.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 0254862 Merge commit 'cpufreq/next' +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Merge made by recursive. + drivers/mmc/card/block.c | 122 ++++++++++++++++++++++++++------- + drivers/mmc/core/core.c | 77 +++++++++++++++++++++ + drivers/mmc/core/mmc.c | 18 ++++- + drivers/mmc/host/Makefile | 3 + + drivers/mmc/host/at91_mci.c | 4 +- + drivers/mmc/host/mmc_spi.c | 4 +- + drivers/mmc/host/of_mmc_spi.c | 149 +++++++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/pxamci.c | 2 +- + drivers/mmc/host/ricoh_mmc.c | 17 +++-- + drivers/mmc/host/sdhci-pci.c | 2 +- + drivers/mmc/host/sdhci.c | 17 +++-- + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sdricoh_cs.c | 4 +- + drivers/mmc/host/tmio_mmc.c | 3 +- + include/linux/mmc/core.h | 2 + + include/linux/mmc/host.h | 2 + + include/linux/spi/mmc_spi.h | 15 ++++- + 17 files changed, 392 insertions(+), 51 deletions(-) + create mode 100644 drivers/mmc/host/of_mmc_spi.c +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/daemon.c +Removed fs/gfs2/daemon.h +Auto-merged fs/gfs2/inode.c +Removed fs/gfs2/ops_dentry.h +Removed fs/gfs2/ops_fstype.h +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged fs/ioctl.c +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/Makefile | 2 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/bmap.c | 77 +++-------- + fs/gfs2/bmap.h | 34 +++++- + fs/gfs2/daemon.c | 136 ------------------- + fs/gfs2/daemon.h | 17 --- + fs/gfs2/dir.c | 62 +++++----- + fs/gfs2/dir.h | 1 + + fs/gfs2/eattr.c | 40 +++--- + fs/gfs2/glock.c | 303 ++++++++++++++++++++++--------------------- + fs/gfs2/glock.h | 2 +- + fs/gfs2/glops.c | 56 ++++++--- + fs/gfs2/incore.h | 55 +++------ + fs/gfs2/inode.c | 53 ++++---- + fs/gfs2/inode.h | 13 ++- + fs/gfs2/locking/dlm/mount.c | 12 ++- + fs/gfs2/locking/dlm/sysfs.c | 16 ++- + fs/gfs2/main.c | 15 ++- + fs/gfs2/mount.c | 29 +---- + fs/gfs2/ops_address.c | 32 +++--- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 --- + fs/gfs2/ops_export.c | 5 +- + fs/gfs2/ops_file.c | 22 ++-- + fs/gfs2/ops_fstype.c | 125 ++++++++++++------ + fs/gfs2/ops_fstype.h | 19 --- + fs/gfs2/ops_inode.c | 75 +++++++++-- + fs/gfs2/ops_inode.h | 25 ---- + fs/gfs2/ops_super.c | 149 +++++++++++++++++++-- + fs/gfs2/ops_super.h | 17 --- + fs/gfs2/quota.c | 113 +++++++++++++++-- + fs/gfs2/quota.h | 24 ++-- + fs/gfs2/recovery.c | 48 +++++++- + fs/gfs2/recovery.h | 14 +- + fs/gfs2/rgrp.c | 58 ++++----- + fs/gfs2/super.c | 246 +---------------------------------- + fs/gfs2/super.h | 13 +- + fs/gfs2/sys.c | 66 +++------- + fs/gfs2/sys.h | 4 - + fs/gfs2/util.c | 1 + + fs/gfs2/util.h | 1 + + fs/ioctl.c | 44 +++++-- + include/linux/fs.h | 3 + + 43 files changed, 964 insertions(+), 1084 deletions(-) + delete mode 100644 fs/gfs2/daemon.c + delete mode 100644 fs/gfs2/daemon.h + 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 +Already up-to-date. +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged fs/fcntl.c +Auto-merged fs/ioctl.c +CONFLICT (content): Merge conflict in fs/ioctl.c +Resolved 'fs/ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 77e461c: Merge commit 'bkl-removal/bkl-removal' +$ git diff -M --stat --summary HEAD^.. + drivers/char/rtc.c | 17 ++++------------- + 1 files changed, 4 insertions(+), 13 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merged fs/ubifs/budget.c +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 3 + + fs/ubifs/budget.c | 208 +++++++++------------------ + fs/ubifs/commit.c | 25 ++-- + fs/ubifs/compress.c | 18 ++-- + fs/ubifs/debug.c | 265 ++++++++++++++++++++++++++++++---- + fs/ubifs/debug.h | 117 ++++++++++++---- + fs/ubifs/file.c | 8 +- + fs/ubifs/ioctl.c | 2 + + fs/ubifs/journal.c | 4 +- + fs/ubifs/key.h | 32 +++-- + fs/ubifs/lprops.c | 14 +- + fs/ubifs/lpt.c | 45 +++--- + fs/ubifs/lpt_commit.c | 210 +++++++++++++++++++++++----- + fs/ubifs/orphan.c | 2 +- + fs/ubifs/replay.c | 15 ++- + fs/ubifs/sb.c | 20 ++-- + fs/ubifs/super.c | 255 +++++++++++++++++++++++---------- + fs/ubifs/tnc.c | 31 ++-- + fs/ubifs/tnc_commit.c | 9 +- + fs/ubifs/ubifs-media.h | 7 + + fs/ubifs/ubifs.h | 111 +++++++-------- + 21 files changed, 927 insertions(+), 474 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +CONFLICT (content): Merge conflict in drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +CONFLICT (content): Merge conflict in firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/net/tg3.c' using previous resolution. +Resolved 'firmware/Makefile' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b9266bd: 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 | 787 +--- + 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 | 120 + + 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, 20558 insertions(+), 22497 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 +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 15 ++- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 25 +-- + drivers/leds/leds-alix2.c | 209 +++++++++++++++++++++ + drivers/leds/leds-ams-delta.c | 4 +- + drivers/leds/leds-pca9532.c | 77 ++++++-- + drivers/leds/leds-wm8350.c | 333 ++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-timer.c | 92 +++++----- + drivers/mfd/wm8350-core.c | 3 + + drivers/regulator/wm8350-regulator.c | 91 +++++++++ + include/linux/leds-pca9532.h | 2 + + include/linux/leds.h | 2 +- + include/linux/mfd/wm8350/pmic.h | 36 ++++ + 13 files changed, 803 insertions(+), 88 deletions(-) + create mode 100644 drivers/leds/leds-alix2.c + create mode 100644 drivers/leds/leds-wm8350.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/backlight.c | 33 +++++++++---------- + drivers/video/backlight/cr_bllcd.c | 18 ++++------ + drivers/video/backlight/{da903x.c => da903x_bl.c} | 0 + drivers/video/backlight/hp680_bl.c | 20 +++++------- + drivers/video/backlight/lcd.c | 36 +++++++++----------- + drivers/video/backlight/progear_bl.c | 20 +++++------- + drivers/video/backlight/tosa_lcd.c | 27 ++++++++++++++- + drivers/video/backlight/vgg2432a4.c | 2 +- + 9 files changed, 81 insertions(+), 77 deletions(-) + rename drivers/video/backlight/{da903x.c => da903x_bl.c} (100%) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merged fs/block_dev.c +Merge made by recursive. + drivers/md/bitmap.c | 3 +- + drivers/md/faulty.c | 3 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 418 +++++++++++++++++++++++++++++++------------- + drivers/md/multipath.c | 3 +- + drivers/md/raid0.c | 178 +++++++++---------- + drivers/md/raid1.c | 11 +- + drivers/md/raid10.c | 3 +- + drivers/md/raid5.c | 8 +- + fs/block_dev.c | 14 ++ + include/linux/raid/md_k.h | 20 ++- + include/linux/raid/md_p.h | 2 + + include/linux/raid/raid0.h | 10 +- + 13 files changed, 431 insertions(+), 245 deletions(-) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/traps.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 85bc6e2: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/kmemcheck.h | 42 ++ + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged drivers/mfd/wm8350-core.c +Auto-merged drivers/power/power_supply_sysfs.c +Auto-merged drivers/regulator/wm8350-regulator.c +Auto-merged include/linux/mfd/wm8350/pmic.h +Auto-merged include/linux/power_supply.h +Merge made by recursive. + drivers/i2c/chips/Kconfig | 23 - + drivers/i2c/chips/Makefile | 2 - + drivers/mfd/Kconfig | 66 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/da903x.c | 12 + + drivers/mfd/dm355evm_msp.c | 420 +++++++ + drivers/{i2c/chips => mfd}/menelaus.c | 0 + drivers/mfd/mfd-core.c | 1 + + drivers/{i2c/chips => mfd}/tps65010.c | 0 + drivers/mfd/twl4030-core.c | 472 ++++---- + drivers/mfd/twl4030-irq.c | 30 +- + drivers/mfd/wm8350-core.c | 266 ++++- + drivers/mfd/wm8350-i2c.c | 4 +- + drivers/mfd/wm8350-regmap.c | 2100 ++++++++++++++++++++++++++++++++- + drivers/mfd/wm8400-core.c | 31 +- + drivers/power/Kconfig | 14 + + drivers/power/Makefile | 2 + + drivers/power/da9030_battery.c | 600 ++++++++++ + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/wm8350_power.c | 532 +++++++++ + drivers/regulator/wm8350-regulator.c | 7 + + include/linux/i2c/dm355evm_msp.h | 79 ++ + include/linux/i2c/twl4030.h | 81 +- + include/linux/mfd/da903x.h | 44 +- + include/linux/mfd/wm8350/comparator.h | 8 + + include/linux/mfd/wm8350/core.h | 52 +- + include/linux/mfd/wm8350/pmic.h | 4 + + include/linux/mfd/wm8350/supply.h | 25 +- + include/linux/power_supply.h | 1 + + 29 files changed, 4544 insertions(+), 341 deletions(-) + create mode 100644 drivers/mfd/dm355evm_msp.c + rename drivers/{i2c/chips => mfd}/menelaus.c (100%) + rename drivers/{i2c/chips => mfd}/tps65010.c (100%) + create mode 100644 drivers/power/da9030_battery.c + create mode 100644 drivers/power/wm8350_power.c + create mode 100644 include/linux/i2c/dm355evm_msp.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 136 ++++----- + drivers/Makefile | 4 +- + drivers/regulator/core.c | 403 ++++++++++++++--------- + drivers/regulator/da903x.c | 12 +- + 4 files changed, 315 insertions(+), 240 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Auto-merged Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 6e87d51: Merge commit 'lblnet/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 12 + + include/net/cipso_ipv4.h | 6 +- + include/net/netlabel.h | 86 ++++++- + net/ipv4/cipso_ipv4.c | 88 +++++-- + net/netlabel/netlabel_cipso_v4.c | 61 ++---- + net/netlabel/netlabel_domainhash.c | 67 +++++ + net/netlabel/netlabel_domainhash.h | 4 + + net/netlabel/netlabel_kapi.c | 347 +++++++++++++++++++++----- + net/netlabel/netlabel_unlabeled.c | 26 +- + net/netlabel/netlabel_unlabeled.h | 15 ++ + security/selinux/Kconfig | 27 -- + security/selinux/hooks.c | 6 +- + security/selinux/selinuxfs.c | 16 +- + security/smack/smack.h | 31 +++- + security/smack/smack_access.c | 28 ++- + security/smack/smack_lsm.c | 310 +++++++++++++++++++---- + security/smack/smackfs.c | 369 ++++++++++++++++++---------- + 17 files changed, 1123 insertions(+), 376 deletions(-) +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged MAINTAINERS +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/hvc_console.c +Auto-merged drivers/char/hvsi.c +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/isdn/gigaset/ser-gigaset.c +Auto-merged drivers/net/slip.c +Auto-merged drivers/net/usb/hso.c +Auto-merged drivers/net/wan/x25_asy.c +Auto-merged drivers/net/wireless/strip.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged drivers/usb/serial/ftdi_sio.h +Auto-merged fs/devpts/inode.c +CONFLICT (content): Merge conflict in fs/devpts/inode.c +Auto-merged include/linux/pci_ids.h +Auto-merged include/linux/serial_core.h +Auto-merged include/linux/tty.h +Resolved 'fs/devpts/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 5af7893: Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/devpts.txt | 132 ++++++ + MAINTAINERS | 6 + + drivers/char/Kconfig | 13 +- + drivers/char/amiserial.c | 34 +- + drivers/char/cyclades.c | 2 +- + drivers/char/epca.c | 265 ++++-------- + drivers/char/esp.c | 61 ++- + drivers/char/generic_serial.c | 76 ++-- + drivers/char/hvc_console.c | 2 +- + drivers/char/hvsi.c | 12 +- + drivers/char/isicom.c | 166 ++------ + drivers/char/istallion.c | 221 +++------- + drivers/char/moxa.c | 26 +- + drivers/char/mxser.c | 150 ++----- + drivers/char/n_r3964.c | 12 +- + drivers/char/n_tty.c | 792 ++++++++++++++++++++++++++-------- + drivers/char/nozomi.c | 85 ++-- + drivers/char/pcmcia/synclink_cs.c | 479 ++++++++------------- + drivers/char/pty.c | 57 +++- + drivers/char/rio/rio_linux.c | 35 +- + drivers/char/riscom8.c | 194 ++------- + drivers/char/rocket.c | 320 +++++---------- + drivers/char/rocket.h | 2 +- + drivers/char/rocket_int.h | 5 - + drivers/char/selection.c | 2 +- + drivers/char/ser_a2232.c | 23 +- + drivers/char/serial167.c | 32 +- + drivers/char/specialix.c | 34 +- + drivers/char/stallion.c | 169 ++------ + drivers/char/sx.c | 31 +- + drivers/char/synclink.c | 177 ++++----- + drivers/char/synclink_gt.c | 120 ++--- + drivers/char/synclinkmp.c | 171 +++----- + drivers/char/tty_io.c | 39 +- + drivers/char/tty_ldisc.c | 30 +- + drivers/char/tty_port.c | 225 ++++++++++ + drivers/char/vme_scc.c | 27 +- + drivers/char/vt.c | 16 +- + drivers/char/vt_ioctl.c | 2 +- + drivers/net/usb/hso.c | 434 +++++++++++++++++-- + drivers/serial/8250.c | 225 +++++++--- + drivers/serial/8250_pci.c | 134 ++++--- + drivers/serial/bfin_5xx.c | 239 ++++++----- + drivers/serial/bfin_sport_uart.c | 60 ++-- + drivers/serial/jsm/jsm_tty.c | 2 +- + drivers/serial/serial_core.c | 155 +++---- + drivers/usb/serial/console.c | 13 + + drivers/usb/serial/ftdi_sio.c | 9 +- + drivers/usb/serial/kl5kusb105.c | 1 + + drivers/usb/serial/mct_u232.c | 2 +- + drivers/usb/serial/mos7840.c | 3 + + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/usb-serial.c | 26 +- + fs/devpts/inode.c | 472 ++++++++++++++++++-- + include/linux/8250_pci.h | 2 +- + include/linux/generic_serial.h | 1 - + include/linux/istallion.h | 2 - + include/linux/pci_ids.h | 2 + + include/linux/serial.h | 3 +- + include/linux/serial_8250.h | 3 + + include/linux/serial_core.h | 69 ++-- + include/linux/tty.h | 27 ++- + include/linux/tty_driver.h | 6 +- + net/irda/ircomm/ircomm_tty.c | 5 +- + 64 files changed, 3538 insertions(+), 2604 deletions(-) + create mode 100644 Documentation/filesystems/devpts.txt +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Merge made by recursive. + arch/ia64/include/asm/swiotlb.h | 39 +------ + arch/x86/include/asm/swiotlb.h | 38 +------ + arch/x86/kernel/pci-swiotlb_64.c | 2 +- + include/linux/swiotlb.h | 3 +- + lib/swiotlb.c | 236 ++++++++++++++++---------------------- + 5 files changed, 104 insertions(+), 214 deletions(-) +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged drivers/uwb/wlp/eda.c +CONFLICT (content): Merge conflict in drivers/uwb/wlp/eda.c +Removed include/linux/uwb/debug.h +Resolved 'drivers/uwb/wlp/eda.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit bdcd3ee: Merge commit 'uwb/for-upstream' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-uwb_rc | 14 +- + Documentation/usb/wusb-cbaf | 9 - + drivers/usb/host/hwa-hc.c | 159 ++---- + drivers/usb/host/whci/Kbuild | 1 + + drivers/usb/host/whci/asl.c | 46 +- + drivers/usb/host/whci/debug.c | 189 +++++++ + drivers/usb/host/whci/hcd.c | 6 +- + drivers/usb/host/whci/hw.c | 8 +- + drivers/usb/host/whci/int.c | 1 - + drivers/usb/host/whci/pzl.c | 49 +-- + drivers/usb/host/whci/qset.c | 40 -- + drivers/usb/host/whci/whcd.h | 11 +- + drivers/usb/host/whci/whci-hc.h | 2 + + drivers/usb/host/whci/wusb.c | 43 +-- + drivers/usb/wusbcore/cbaf.c | 1 - + drivers/usb/wusbcore/crypto.c | 79 ++-- + drivers/usb/wusbcore/dev-sysfs.c | 4 - + drivers/usb/wusbcore/devconnect.c | 233 +-------- + drivers/usb/wusbcore/mmc.c | 118 ++--- + drivers/usb/wusbcore/pal.c | 16 +- + drivers/usb/wusbcore/reservation.c | 21 +- + drivers/usb/wusbcore/rh.c | 104 ++--- + drivers/usb/wusbcore/security.c | 78 +--- + drivers/usb/wusbcore/wa-nep.c | 16 +- + drivers/usb/wusbcore/wa-rpipe.c | 68 +-- + drivers/usb/wusbcore/wa-xfer.c | 180 ++----- + drivers/usb/wusbcore/wusbhc.h | 36 +- + drivers/uwb/Makefile | 3 + + drivers/uwb/address.c | 2 +- + drivers/uwb/allocator.c | 386 ++++++++++++++ + drivers/uwb/beacon.c | 134 ++--- + drivers/uwb/driver.c | 4 +- + drivers/uwb/drp-avail.c | 4 +- + drivers/uwb/drp-ie.c | 161 +++++-- + drivers/uwb/drp.c | 695 +++++++++++++++++++------- + drivers/uwb/est.c | 14 +- + drivers/uwb/hwa-rc.c | 53 ++- + drivers/uwb/i1480/dfu/dfu.c | 10 +- + drivers/uwb/i1480/dfu/mac.c | 18 - + drivers/uwb/i1480/dfu/usb.c | 27 - + drivers/uwb/i1480/i1480u-wlp/lc.c | 5 +- + drivers/uwb/i1480/i1480u-wlp/netdev.c | 53 +-- + drivers/uwb/i1480/i1480u-wlp/rx.c | 25 +- + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 3 +- + drivers/uwb/i1480/i1480u-wlp/tx.c | 66 +--- + drivers/uwb/ie-rcv.c | 55 ++ + drivers/uwb/ie.c | 463 ++++++------------ + drivers/uwb/lc-dev.c | 23 +- + drivers/uwb/lc-rc.c | 62 +-- + drivers/uwb/neh.c | 72 ++-- + drivers/uwb/pal.c | 25 +- + drivers/uwb/radio.c | 202 ++++++++ + drivers/uwb/reset.c | 47 ++- + drivers/uwb/rsv.c | 565 ++++++++++++++++----- + drivers/uwb/umc-bus.c | 62 ++- + drivers/uwb/umc-dev.c | 11 +- + drivers/uwb/uwb-debug.c | 151 ++++-- + drivers/uwb/uwb-internal.h | 126 ++++- + drivers/uwb/uwbd.c | 176 +++---- + drivers/uwb/whc-rc.c | 118 ++--- + drivers/uwb/whci.c | 6 +- + drivers/uwb/wlp/eda.c | 19 +- + drivers/uwb/wlp/messages.c | 181 +------- + drivers/uwb/wlp/sysfs.c | 2 +- + drivers/uwb/wlp/txrx.c | 37 +-- + drivers/uwb/wlp/wlp-internal.h | 4 - + drivers/uwb/wlp/wlp-lc.c | 80 +-- + drivers/uwb/wlp/wss-lc.c | 130 +---- + include/linux/usb/wusb-wa.h | 1 + + include/linux/uwb.h | 123 ++++-- + include/linux/uwb/debug-cmd.h | 13 +- + include/linux/uwb/debug.h | 82 --- + include/linux/uwb/spec.h | 53 ++ + include/linux/uwb/umc.h | 2 + + include/linux/wlp.h | 3 +- + 75 files changed, 3252 insertions(+), 2837 deletions(-) + create mode 100644 drivers/usb/host/whci/debug.c + create mode 100644 drivers/uwb/allocator.c + create mode 100644 drivers/uwb/ie-rcv.c + create mode 100644 drivers/uwb/radio.c + delete mode 100644 include/linux/uwb/debug.h +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/Kconfig | 19 ++ + drivers/watchdog/Makefile | 2 + + drivers/watchdog/ib700wdt.c | 49 ++-- + drivers/watchdog/sch311x_wdt.c | 578 ++++++++++++++++++++++++++++++++++++++++ + drivers/watchdog/wm8350_wdt.c | 329 +++++++++++++++++++++++ + 5 files changed, 947 insertions(+), 30 deletions(-) + create mode 100644 drivers/watchdog/sch311x_wdt.c + create mode 100644 drivers/watchdog/wm8350_wdt.c +Merging proc/proc +$ git merge proc/proc +Auto-merged Documentation/filesystems/proc.txt +Auto-merged fs/proc/base.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 1 + + arch/mips/kernel/stacktrace.c | 24 +++- + fs/proc/base.c | 225 ++++++++++++++++++++---------------- + fs/proc/generic.c | 8 +- + fs/proc/inode.c | 3 - + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +- + 7 files changed, 151 insertions(+), 120 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 228 ++++++++++++++++++++++++++++++++++++----- + include/linux/dma_remapping.h | 137 +------------------------ + include/linux/dmar.h | 1 - + include/linux/intel-iommu.h | 5 - + 4 files changed, 205 insertions(+), 166 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Auto-merged arch/powerpc/kernel/time.c +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/x86/xen/time.c +Auto-merged include/linux/sched.h +Auto-merged kernel/sched.c +Auto-merged kernel/time/tick-sched.c +Merge made by recursive. + arch/ia64/kernel/time.c | 18 +- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/time.c | 18 +- + arch/s390/include/asm/cpu.h | 7 +- + arch/s390/include/asm/cputime.h | 42 ++-- + arch/s390/include/asm/lowcore.h | 49 ++-- + arch/s390/include/asm/system.h | 4 +- + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/include/asm/timer.h | 16 +- + arch/s390/include/asm/vdso.h | 15 +- + arch/s390/kernel/asm-offsets.c | 5 + + arch/s390/kernel/entry.S | 5 +- + arch/s390/kernel/entry64.S | 50 ++-- + arch/s390/kernel/head64.S | 2 + + arch/s390/kernel/process.c | 43 +--- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/setup.c | 2 + + arch/s390/kernel/smp.c | 34 ++- + arch/s390/kernel/vdso.c | 123 ++++++++- + arch/s390/kernel/vdso64/clock_getres.S | 5 + + arch/s390/kernel/vdso64/clock_gettime.S | 39 +++- + arch/s390/kernel/vtime.c | 486 +++++++++++++++++-------------- + arch/x86/xen/time.c | 10 +- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/s390mach.c | 3 + + include/linux/kernel_stat.h | 13 +- + include/linux/sched.h | 1 - + kernel/sched.c | 115 +++++--- + kernel/time/tick-sched.c | 12 +- + kernel/timer.c | 15 - + 30 files changed, 683 insertions(+), 456 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/scsi/Makefile +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 +++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 45 + + drivers/scsi/osd/Kconfig | 53 ++ + drivers/scsi/osd/Makefile | 37 + + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_uld.c | 457 +++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 ++++++++ + include/scsi/osd_initiator.h | 428 ++++++++++ + include/scsi/osd_protocol.h | 579 ++++++++++++++ + include/scsi/osd_sec.h | 45 + + include/scsi/osd_sense.h | 260 ++++++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4640 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_sense.h + create mode 100644 include/scsi/osd_types.h +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merged fs/fuse/dev.c +Auto-merged fs/fuse/dir.c +Merge made by recursive. + fs/fuse/control.c | 6 +- + fs/fuse/dev.c | 113 ++++++++--- + fs/fuse/dir.c | 48 +++--- + fs/fuse/file.c | 457 ++++++++++++++++++++++++++++++++++++++++++-- + fs/fuse/fuse_i.h | 83 ++++++--- + fs/fuse/inode.c | 157 ++++++++------- + include/linux/fuse.h | 79 +++++++- + include/linux/miscdevice.h | 42 ++-- + 8 files changed, 783 insertions(+), 202 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Auto-merged Documentation/RCU/00-INDEX +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 + + Documentation/RCU/rcubarrier.txt | 304 ++++++++++++++++++++++++++++++++++++++ + Documentation/bad_memory.txt | 45 ++++++ + 3 files changed, 351 insertions(+), 0 deletions(-) + create mode 100644 Documentation/RCU/rcubarrier.txt + create mode 100644 Documentation/bad_memory.txt +Merging nommu/master +$ git merge nommu/master +Auto-merged arch/powerpc/lib/dma-noncoherent.c +Auto-merged fs/binfmt_elf_fdpic.c +Auto-merged fs/binfmt_flat.c +Auto-merged include/linux/mm.h +Auto-merged include/linux/mm_types.h +Auto-merged ipc/shm.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c01a718: Merge commit 'nommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/nommu-mmap.txt | 31 +- + Documentation/sysctl/vm.txt | 18 + + arch/arm/include/asm/mmu.h | 1 - + arch/arm/mm/dma-mapping.c | 28 +- + arch/blackfin/include/asm/mmu.h | 1 - + arch/blackfin/kernel/ptrace.c | 6 +- + arch/blackfin/kernel/traps.c | 11 +- + arch/frv/kernel/ptrace.c | 11 +- + arch/h8300/include/asm/mmu.h | 1 - + arch/m68knommu/include/asm/mmu.h | 1 - + arch/sh/include/asm/mmu.h | 1 - + fs/binfmt_elf_fdpic.c | 35 +-- + fs/binfmt_flat.c | 34 +- + fs/proc/internal.h | 2 - + fs/proc/meminfo.c | 6 + + fs/proc/nommu.c | 71 ++-- + fs/proc/task_nommu.c | 120 ++++-- + include/asm-frv/mmu.h | 1 - + include/asm-m32r/mmu.h | 1 - + include/linux/mm.h | 26 +- + include/linux/mm_types.h | 19 +- + init/initramfs.c | 1 + + ipc/shm.c | 12 + + kernel/fork.c | 4 +- + kernel/sysctl.c | 14 + + lib/Kconfig.debug | 7 + + mm/mmap.c | 10 + + mm/nommu.c | 1027 ++++++++++++++++++++++++++------------ + mm/tiny-shmem.c | 11 - + 29 files changed, 982 insertions(+), 529 deletions(-) +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merged MAINTAINERS +Auto-merged arch/m68k/Kconfig +Auto-merged arch/s390/Kconfig +Auto-merged arch/x86/kernel/mfgpt_32.c +Auto-merged drivers/char/epca.c +Auto-merged drivers/hwmon/fschmd.c +Auto-merged drivers/infiniband/hw/mlx4/cq.c +Auto-merged drivers/input/keyboard/atkbd.c +Auto-merged drivers/mtd/ubi/eba.c +Auto-merged drivers/mtd/ubi/io.c +Auto-merged drivers/mtd/ubi/wl.c +Auto-merged drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merged drivers/scsi/lpfc/lpfc_sli.c +Auto-merged drivers/scsi/scsi_error.c +Auto-merged drivers/video/console/vgacon.c +Auto-merged fs/proc/task_nommu.c +Auto-merged fs/ubifs/budget.c +Auto-merged fs/ubifs/journal.c +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Auto-merged include/acpi/actypes.h +Auto-merged include/linux/mtd/mtd.h +Auto-merged init/main.c +Auto-merged kernel/printk.c +Auto-merged mm/slub.c +Merge made by recursive. + CREDITS | 2 +- + Documentation/dell_rbu.txt | 4 ++-- + Documentation/hwmon/abituguru-datasheet | 6 +++--- + Documentation/laptops/thinkpad-acpi.txt | 2 +- + Documentation/networking/rxrpc.txt | 2 +- + Documentation/networking/tuntap.txt | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + MAINTAINERS | 3 ++- + arch/blackfin/kernel/kgdb.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/m68k/Kconfig | 2 +- + arch/m68k/kernel/traps.c | 2 +- + arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | 2 +- + arch/powerpc/kernel/kprobes.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- + arch/s390/Kconfig | 2 +- + arch/s390/kernel/kprobes.c | 2 +- + arch/sparc/kernel/kprobes.c | 2 +- + arch/x86/kernel/kprobes.c | 2 +- + arch/x86/kernel/mfgpt_32.c | 2 +- + drivers/acpi/executer/exprep.c | 2 +- + drivers/acpi/executer/exresolv.c | 2 +- + drivers/acpi/executer/exstore.c | 2 +- + drivers/acpi/resources/rscreate.c | 2 +- + drivers/acpi/utilities/utobject.c | 4 ++-- + drivers/char/epca.c | 2 +- + drivers/cpufreq/Kconfig | 4 ++-- + drivers/hwmon/fschmd.c | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/macintosh/Kconfig | 2 +- + drivers/message/i2o/i2o_scsi.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/misc/phantom.c | 2 +- + drivers/mtd/devices/pmc551.c | 2 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 4 ++-- + drivers/mtd/ubi/vtbl.c | 2 +- + drivers/mtd/ubi/wl.c | 4 ++-- + drivers/net/bnx2x_link.c | 2 +- + drivers/net/e1000/e1000_hw.c | 4 ++-- + drivers/net/slip.h | 2 +- + drivers/net/tehuti.c | 4 ++-- + drivers/net/tokenring/smctr.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 ++-- + drivers/net/wireless/strip.c | 2 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 2 +- + drivers/s390/block/dasd_eer.c | 4 ++-- + drivers/s390/char/vmlogrdr.c | 4 ++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++-- + drivers/scsi/lpfc/lpfc_sli.c | 10 +++++----- + drivers/scsi/scsi_error.c | 2 +- + drivers/serial/crisv10.c | 4 ++-- + drivers/video/console/vgacon.c | 2 +- + fs/ncpfs/ioctl.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/proc/task_nommu.c | 2 +- + fs/ubifs/Kconfig | 2 +- + fs/ubifs/budget.c | 4 ++-- + fs/ubifs/gc.c | 2 +- + fs/ubifs/journal.c | 2 +- + fs/ubifs/shrinker.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/acpi/acmacros.h | 4 ++-- + include/acpi/actypes.h | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/ncp_fs.h | 2 +- + include/linux/spi/spi.h | 4 ++-- + include/mtd/ubi-user.h | 2 +- + init/main.c | 3 ++- + kernel/pid.c | 2 +- + kernel/printk.c | 2 +- + kernel/time/jiffies.c | 2 +- + lib/radix-tree.c | 11 ++++++----- + mm/slub.c | 2 +- + net/sctp/auth.c | 4 ++-- + net/sctp/sm_statefuns.c | 6 +++--- + net/sctp/socket.c | 2 +- + net/sctp/tsnmap.c | 2 +- + sound/oss/aedsp16.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + 86 files changed, 117 insertions(+), 114 deletions(-) +Applying tracing/kmemtrace: fix for build fix diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..c4b4c17b2120 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,117 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series driver-core +Unchanged quilt series usb +Unchanged quilt series device-mapper +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Importing ide based on 6a94cb73064c952255336cc57731904174b2c58f +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 6a94cb73064c952255336cc57731904174b2c58f +HEAD is now at 6a94cb7 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +tx493x-fix-intendation.patch +ide-remove-chipset-type-fixup-from-ide_host_register.patch +ide-small-ide_register_port-cleanup.patch +ide-factor-out-device-type-classifying-from-do_identify.patch +ide-move-sysfs-support-to-ide-sysfs-c.patch +ide-dont-execute-the-next-queued-command-from-the-hard-irq-context-v2.patch +ide-remove-ide-pm-hack-from-do_ide_request.patch +ide-remove-paranoia-checks-for-hwgroup-busy.patch +ide-add-ide_un-lock_hwgroup-helpers.patch +ide-use-per-device-request-queue-locks-v2.patch +ide-cd-move-debug-defines-into-header.patch +ide-make-ide_aflag_numbering-continuous-again.patch +ide-floppy-allocate-only-toplevel-packet-commands.patch +ide-remove-ide-scsi.patch +ide-atapi-add-a-dev_is_idecd-inline.patch +ide-atapi-combine-drive-specific-assignments.patch +ide-atapi-setup-dma-for-ide-cd.patch +ide-atapi-accomodate-transfer-length-calculation-for-ide-cd.patch +ide-atapi-teach-ide-atapi-about-drive-waiting_for_dma.patch +ide-cd-move-cdrom_timer_expiry-to-ide-atapi.patch +ide-atapi-remove-ide-scsi-remnants-from-ide_issue_pc.patch +ide-atapi-remove-ide-scsi-remnants-from-ide_transfer_pc.patch +ide-atapi-remove-ide-scsi-remnants-from-ide_pc_intr.patch +ide-remove-the-last-ide-scsi-remnants.patch +ide-atapi-compute-cmd_len-based-on-device-type-in-ide_transfer_pc.patch +ide-atapi-assign-expiry-and-timeout-based-on-device-type.patch +ide-atapi-split-drive-specific-functionality-in-ide_issue_pc.patch +ide-cd-remove-xferlen-arg-to-cdrom_start_packet_command.patch +ide-cd-remove-handler-wrappers.patch +ide-atapi-remove-timeout-arg-to-ide_issue_pc.patch +ide-atapi-put-the-rest-of-non-ide-cd-code-into-the-else-clause-of-ide_transfer_pc.patch +ide-atapi-start-dma-in-a-drive-specific-way.patch +ide-fix-setting-nien-on-idle-devices.patch +ide-add-cur_port-to-struct-ide_host-and-use-it-for-serialized-hosts.patch +ide-use-per-port-irq-handlers.patch +ide-remove-hwgroup-hwif-and-drive-hwif-next.patch +ide-use-lock-bitops-for-ports-serialization.patch +ide-merge-ide_hwgroup_t-with-ide_hwif_t.patch +ide-update-ide_unregister-documentation.patch +ide-move-ide_init_port_data-and-friends-to-ide-probe-c.patch +ide-remove-hwif-macro.patch +ide-remove-local_irq_set-macro.patch +ide-remove-ide_pci_enablebit_t-typedef.patch +ide-remove-byte-typedef.patch +ide-remove-ide_driver_t-typedef.patch +ide-unexport-ide_wait_not_busy.patch +ide-remove-error-method-from-struct-ide_driver.patch +amd74xx-use-ide_get_pair_dev-helper.patch +cmd640-use-ide_get_pair_dev-helper.patch +cmd64x-use-ide_get_pair_dev-helper.patch +it821x-use-ide_get_pair_dev-helper.patch +ide-numa-aware-allocation-of-host-and-port-structures.patch +ide-dynamic-allocation-of-device-structures.patch +ide-add-port-and-host-iterators.patch +ide-fix-drive-s-dword-io-handling.patch +ide-cd-wait-for-drq-to-get-set-per-default.patch +ide-cd-start-dma-before-sending-the-actual-packet-command.patch +ide-cd-convert-to-ide-atapi-facilities.patch +ide-make-paranoia-handler-check-in-ide_intr-more-strict.patch +ide-use-ide_pci_is_in_compatibility_mode-helper-in-setup-pci-c.patch +ide-remove-superfluous-hwif-variable-assignment-from-ide_timer_expiry.patch +ide-struct-ide_atapi_pc-remove-unused-fields-and-update-documentation.patch +ide-remove-unused-ide_hwif_t-sg_mapped-field.patch +ide-remove-now-redundant-cur_dev-checks.patch +ide-fix-ide_port_scan-to-do-acpi-setup-after-initializing-request-queues.patch +Importing rr based on rr_cpumask/master +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard 8c384cdee3e04d6194a2c2b192b624754f990835 +HEAD is now at 8c384cd cpumask: CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +module:remove_config_kmod.patch +module:compare-sym-values-for-export-mark-in-proc-kallsyms.patch +module:print_unload_info-no-proc.patch +module:parisc_fix_loading_failure_of_large_kernel_modules.patch +stop_machine:introduce_stop_machine_create_destroy.patch +module:convert_to_stop_machine_create_destroy.patch +cpumask:fix-impossible-percpu-accesses-x86.patch +misc:work_on_cpu-acpi.patch +misc:work_on_cpu-dcdbas.patch +misc:work_on_cpu-pci.patch +misc:work_on_cpu-powerpc-sysfs.patch +cpumask:topology_core_cpumask-and-topology_thread_cpumask-x86.patch +cpumask:use-topology_core_cpumask-and-topology_thread_cpumask.patch +cpualloc:big_percpu_alloc.patch +cpualloc:move-net-to-big_alloc_percpu.patch +cpualloc:remove-alignment-on-cpu_workqueue_struct.patch +cpualloc:remove-percpu_ptr-users.patch +cpualloc:add-align-arg-to-__alloc_percpu.patch +cpualloc:make_the_per_cpu_reserve_configurable.patch +cpualloc:parse-percpu-earlier.patch +cpualloc:generalize-percpu_modalloc-percpu_modfree.patch +cpualloc:expose-module-percpu-allocator.patch +cpualloc:use-module-allocator.patch +cpualloc:documentation.patch +cpualloc:get_cpu_ptr.patch +cpualloc:read_percpu.patch +cpualloc:rename-per_cpu-vars.patch +Context reduced to (1/1) to apply fragment at 137 +cpualloc:remove-per_cpu__-prefix.patch +cpualloc:__percpu-annotation-for-sparse.patch +Unchanged quilt series ttydev +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d32aafa562d8 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090102 |