diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-09 12:53:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-09 12:53:13 +1000 |
| commit | d1a1614ba756268afb0b36480f75ec90c4be7b62 (patch) | |
| tree | dc7fd8922f4885c610647fabc45ed8dc25a413d6 | |
| parent | 3d8ca513933e84ba5769607974621615f6bf17d5 (diff) | |
Add linux-next specific files for 20100809next-20100809
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 171 | ||||
| -rw-r--r-- | Next/Trees | 173 | ||||
| -rw-r--r-- | Next/merge.log | 5166 | ||||
| -rw-r--r-- | Next/quilt-import.log | 26 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5537 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..53b37b71284c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,171 @@ +Name SHA1 +---- ---- +origin 45d7f32c7a43cbb9592886d38190e379e2eb2226 +fixes 140236b4b1c749c9b795ea3d11558a0eb5a3a080 +arm-current 5bf5f3cc5e1f0a3341669b5d71dfb2d825f0f435 +m68k-current b37fa16e78d6f9790462b3181602a26b5af36260 +powerpc-merge 7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14 +sparc-current 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +scsi-rc-fixes 8f83d7688026729c9d356d865f65a8996f090048 +net-current e225567960db50e9810a152c8621c7a6ed94de71 +sound-current 74bf40f0793fed9e01eb6164c2ce63e8c27ca205 +pci-current a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c +wireless-current a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8 +kbuild-current 58f915a311c1eac464e0e1caca2f85a05b66c930 +driver-core.current 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +tty.current 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +usb.current 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +staging.current 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +cpufreq-current c2f4a2c6e08c7635316dfd25ef706e9104384c56 +input-current d01d0756f75e7a5b4b43764ad45b83c4340f11d6 +md-current 6e17b0276452912cb13445e5ea552b599984675f +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 00ca28a507b215dcd121735f16764ea4173c4ff9 +ide-curent a62f49ab56ad2f59e88bbeb34e7ab41f0d45161d +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +gcl-current 2b07be2493681220cac4d185494a4edb0b8efd1e +arm aa9a629d231ddec80103a7e999af256ea83a0374 +davinci cce3dddb87e4b72b1787527eec6826a43a562e71 +i.MX a5e02d3f700f8a97bb71435074e9925a17f492f4 +msm 074f8ddc0359dbd2645dda4097bf4b81bf703250 +omap d21872b3683ff37f73c68993749a6e6aeeaed265 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 67a3e12b05e055c0415c556a315a3d3eb637e29e +s5p d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 +tegra 2a9ecdc6d9bd83d6a862cec4e34bcbc90a1eb35c +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin aab2393e2ec52c74b419af7c26a12e21584e483b +cris 85d9865721c62a551547984e6cc8bd3ba732e294 +ia64 ec0db7e64bd25c54b64f7241a00e5c159333a4b0 +m68k f3da833da32976a0e8996d745d535ae274bbce68 +m68knommu d5334592b5de33d41403b184d5c233c66ca1de11 +microblaze 2d5973cb5ac5d04662f86e19a06a4c52fa4c4ae3 +mips fc1caf6eafb30ea185720e29f7f5eccca61ecd60 +parisc 210501aa570fdaa8b06e56fd1c04f31f2d3f368b +powerpc 42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea +4xx ff349103964d43c28b7b80bdecf7ace0113b3dda +52xx-and-virtex ee110066130b79b7abf63bbd836d382699252b81 +galak c4b6a77663f5879de20561144716cfb675815e82 +s390 e22b6c49adea0c0e210f07dca668e183e5dfa07e +sh 57682827b9a5edb52e33af0be9082b51bffcd5c7 +genesis beccb12f6fbcc73339f127ff1f00638f076c933f +sparc 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +tile ab11b487402f97975f3ac1eeea09c82f4431481e +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph e7fdb915217126d23ff2aafb2d5fdce21b763df1 +cifs 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs d36da03ca332b245b105830776484b4b75f7e9bd +ext3 5f11e6a44059f728dddd8d0dbe5b4368ea93575b +ext4 6c7a120ac6c62316ab1fc78dfc0a7b13f3bfcbff +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse 2d45ba381a74a743eeaa2b06c7c5c0d2bf73ba1a +gfs2 0809f6ec18bbce54c996f5c36f4b9d371075c98b +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 45d7f32c7a43cbb9592886d38190e379e2eb2226 +nfsd 7fa53cc872332b265bc5ba1266f39586f218ad4a +nilfs2 89c0fd014d34d409a7b196667c2b9a4813b6c968 +ocfs2 415cf32c9cdfcc60f34d0ac17f29634e941ba7d2 +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 4f86b8fd48cb9b9a5b45aa0249e44c9d4fd7d796 +udf 581b7e9fc00789782cb3bdca58db49f6f0f66608 +v9fs 327aec03ac4c7bbf5e41ff03ac3a84c424589f27 +ubifs 4a386c3e177ca2fbc70c9283d0b46537844763a0 +xfs 6b0a2996a0c023d84bc27ec7528a6e54cb5ea264 +vfs f9bc82bcea89ca85cde0cdec808e73ec3eb603a3 +pci 763e9db9994e27a7d2cb3701c8a097a867d0e0b4 +hid 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +i2c 060991d74f40695f048517755457ff91ae3db048 +bjdooks-i2c bd588d8800abd6c6c92b85f07cc2c4a5780c7b8f +jdelvare-hwmon c868eb3ea9b639d1848e8cec945b67e23190c252 +kernel-doc fa4171be95bfb3bb9e4ca38adee20ca065a508d8 +v4l-dvb f6bb00a1cbd26d1e0921f35fcde3c8f2972b2da3 +kbuild 4630da333a416c71313ea084b3f5ea29fa27d3a6 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 89590054fb61a577b1b0b1235263bec9c6998578 +libata 752e386c247664152f2cce37915d1f50631d7f42 +infiniband 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +acpi 4d74d992be79dbd0ce83b1221e1dd0a78a4c76d9 +idle-test 0394c6676e3fa48587fbe4821390d3264672c530 +ieee1394 e78483c5aeb0d7fbb0e365802145f1045e62957e +ubi 64d4b4c90a876401e503c3a3260e9d0ed066f271 +kvm 3444d7da1839b851eefedd372978d8a982316c36 +dlm f70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40 +swiotlb 9fe6206f400646a2322096b56c59891d530e8d51 +swiotlb-xen fe96eb404e33b59bb39f7050205f7c56c1c7d686 +ibft 57a5f3c99c99f70f8fdfa0bbc83b98c48f56551a +scsi 7e41dfdaf11a45ab4f4dfc444a7d42bf79dd9356 +async_tx b0ebeb9c09cb5b84bb2f33927c84c7648845fcec +net 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +wireless 8f1d2d2be73a98c21e68fe2a26f633892d4abdd1 +mtd 6ae0185fe201eae0548dace2a84acb5050fc8606 +crypto 4015d9a865e3bcc42d88bedc8ce1551000bab664 +sound 8c58b1fce724f4b94f3e06dceb38bb89e74d6449 +cpufreq 9d1f44ee206a23b975d7d7c6f759efb25e0e61ac +rr df736f6915a24373481fde09ede0b573348cddbf +input 22462d9fcf5b29184716aca486058943b2d6995f +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 4bf9007819a3cad208e6e3f1bb2e57e815a5fc05 +device-mapper 58e2490783e5a21b866eab05bd42d53d917b9306 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 127c03cdbad9bd5af5d7f33bd31a1015a90cb77f +battery 808be4b22f47886d2279852ada3d186fc20909bc +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +kgdb 350db96a8da2bb930c35a4446a2633e5b754f35a +slab 513901457a256b2cbb35612339c92bb513d15e1a +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 6e17b0276452912cb13445e5ea552b599984675f +mfd ec91a57b7b505c2edb5383f3ef5a5ce4cc6f35c3 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 96576a9e1a0cdb8a43d3af5846be0948f52b4460 +viafb ac3aa5375db246f0af98e519fab478523a6212ed +voltage 4e249bf64e0621847b23c84e2f4e3cd2dbf5e102 +security-testing 7c8acaff3e9f5a3fe040e9af17449cf8fdf5740e +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb 32d12e8cd19f86d424cab68a29c9f09a3fe97259 +watchdog be70623dcfd302a00b6cfd85f1224d8a227cf95e +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 2d9e667efdfb4e986074d98e7d9a424003c7c43b +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 5002dd18c5940ce63b917d84f2b852c3b96009bb +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 8d4b9d1bfef117862a2889dec4dac227068544c9 +bluetooth adb08edea0119f7a5484a9f6a385fbcecdf85a63 +fsnotify 1968f5eed54ce47bde488fd9a450912e4a2d7138 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +catalin 23137be2952fed2985ae1a359e71b16193d961b6 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac f8c6d1e8a05e4a0b7ac15ca578699eb4953c2eb6 +devicetree fbe0f8348fd6c3d016a3f48756eb729b41a67c22 +spi b4225885deb569f7afcf1f3a9f069f74cc9db591 +limits f33ebbe9da2c3c24664a0ad4f8fd83f293547e63 +omap_dss2 ece350d3949e9a60b39e4f9853be118e98d48fbc +xen 7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1 +tip 5238a179c93755dc401a89b20c25eaab3a985ddf +lost-spurious-irq fa7cd37f808c487f722d7a2ce9c0923a323922df +edac-amd c4799c7570475352c8c5de82ae938f7a02f206fa +oprofile a7c55cbee0c1bae9bf5a15a08300e91d88706e45 +percpu 099a19d91ca429944743d51bef8fee240e94d8e3 +workqueues 38f51568005873a241a8ae6bf28c9ddd3f6a11ed +sfi e29df91e67428c1a651d18df6ec047fcb30282d3 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +drivers-x86 5aa06930fbcfcb6b03fcb18b753122b10ac47a87 +hwpoison 2eb51b2cf72edb16005f9aa33f674850bce9b311 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +bkl-core 5f202bd5ca64132cdd7f186656bc0221f257733d +bkl-procfs 99df95a22f7cfcf85405d4edc07c2d953542f0dd +bkl-ioctl 29f367bfbf5a8de46cb7320647e44f20d18cff44 +driver-core 9d93a41adb769cab5ce612d53f61100d63dc195a +tty d9e8ff844d8fdfd9ddfad590671e7616c840b3a1 +usb ef9e653d603a81fcac4bb4a2c53025ccb1acb7a5 +staging-next b12d1995f650e92f26184afd28e6cf40bf64467a +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +scsi-post-merge fc1caf6eafb30ea185720e29f7f5eccca61ecd60 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b3710fbaaf9c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,173 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/ +staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +gcl-current git git://git.secretlab.ca/git/linux-2.6#merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://android.git.kernel.org/kernel/tegra.git#for-next +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +genesis git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master +swiotlb-xen git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#master +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#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 +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +viafb git git://git.lwn.net/linux-2.6.git#viafb-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 +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +lost-spurious-irq git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#lost-spurious-irq +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +bkl-core git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/core +bkl-procfs git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/procfs +bkl-ioctl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/ioctl +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/ +staging-next git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +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..9020d268caaf --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5166 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4a386c3 Merge branch 'x86-xsave-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating 4a386c3..45d7f32 +Fast-forward + Documentation/filesystems/caching/fscache.txt | 10 +- + Documentation/filesystems/nilfs2.txt | 12 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/kernel-parameters.txt | 167 +- + Documentation/networking/dns_resolver.txt | 146 + + Documentation/slow-work.txt | 322 -- + Documentation/sound/alsa/HD-Audio-Models.txt | 6 + + Documentation/sound/alsa/Procfile.txt | 8 + + Documentation/sound/alsa/alsa-parameters.txt | 135 + + Documentation/sound/oss/oss-parameters.txt | 51 + + MAINTAINERS | 27 +- + arch/arm/Kconfig | 24 +- + arch/arm/Makefile | 1 + + arch/arm/configs/am3517_evm_defconfig | 127 - + arch/arm/configs/cm_t35_defconfig | 157 - + arch/arm/configs/devkit8000_defconfig | 184 -- + arch/arm/configs/igep0020_defconfig | 179 -- + arch/arm/configs/omap3_beagle_defconfig | 134 - + arch/arm/configs/omap3_evm_defconfig | 160 - + arch/arm/configs/omap3_pandora_defconfig | 158 - + arch/arm/configs/omap3_stalker_lks_defconfig | 150 - + arch/arm/configs/omap3_touchbook_defconfig | 621 ---- + arch/arm/configs/omap_2430sdp_defconfig | 136 - + arch/arm/configs/omap_3430sdp_defconfig | 178 -- + arch/arm/configs/omap_3630sdp_defconfig | 154 - + arch/arm/configs/omap_apollon_2420_defconfig | 92 - + arch/arm/configs/omap_h4_2420_defconfig | 107 - + arch/arm/configs/omap_ldp_defconfig | 135 - + arch/arm/configs/omap_zoom2_defconfig | 143 - + arch/arm/configs/omap_zoom3_defconfig | 155 - + arch/arm/configs/overo_defconfig | 275 -- + arch/arm/configs/rx51_defconfig | 222 -- + arch/arm/mach-davinci/Kconfig | 12 + + arch/arm/mach-davinci/Makefile | 3 + + arch/arm/mach-davinci/board-da830-evm.c | 34 +- + arch/arm/mach-davinci/board-da850-evm.c | 54 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 39 +- + arch/arm/mach-davinci/board-tnetv107x-evm.c | 174 ++ + arch/arm/mach-davinci/da830.c | 5 - + arch/arm/mach-davinci/da850.c | 25 - + arch/arm/mach-davinci/devices-da8xx.c | 50 +- + arch/arm/mach-davinci/devices-tnetv107x.c | 320 ++ + arch/arm/mach-davinci/dm355.c | 22 +- + arch/arm/mach-davinci/dm365.c | 28 +- + arch/arm/mach-davinci/dm644x.c | 22 +- + arch/arm/mach-davinci/dm646x.c | 30 +- + arch/arm/mach-davinci/dma.c | 62 +- + arch/arm/mach-davinci/gpio-tnetv107x.c | 205 ++ + arch/arm/mach-davinci/include/mach/asp.h | 51 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 3 +- + arch/arm/mach-davinci/include/mach/debug-macro.S | 50 +- + arch/arm/mach-davinci/include/mach/dm646x.h | 1 + + arch/arm/mach-davinci/include/mach/edma.h | 11 + + arch/arm/mach-davinci/include/mach/gpio.h | 22 +- + arch/arm/mach-davinci/include/mach/serial.h | 21 + + arch/arm/mach-davinci/include/mach/tnetv107x.h | 55 + + arch/arm/mach-davinci/include/mach/uncompress.h | 87 +- + arch/arm/mach-davinci/tnetv107x.c | 753 +++++ + arch/arm/mach-ep93xx/clock.c | 67 +- + arch/arm/mach-ep93xx/core.c | 67 + + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 10 + + arch/arm/mach-ep93xx/include/mach/platform.h | 3 + + arch/arm/mach-ep93xx/snappercl15.c | 1 + + arch/arm/mach-kirkwood/common.c | 38 + + arch/arm/mach-kirkwood/common.h | 2 + + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 + + arch/arm/mach-kirkwood/openrd-setup.c | 13 + + arch/arm/mach-omap1/Kconfig | 13 + + arch/arm/mach-omap1/Makefile | 3 + + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 12 + + arch/arm/mach-omap1/board-generic.c | 4 +- + arch/arm/mach-omap1/board-h2.c | 31 +- + arch/arm/mach-omap1/board-h3.c | 15 +- + arch/arm/mach-omap1/board-htcherald.c | 2 +- + arch/arm/mach-omap1/board-innovator.c | 4 +- + arch/arm/mach-omap1/board-nokia770.c | 136 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-omap1/board-palmte.c | 86 +- + arch/arm/mach-omap1/board-palmtt.c | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 2 +- + arch/arm/mach-omap1/board-perseus2.c | 12 + + arch/arm/mach-omap1/board-sx1.c | 2 +- + arch/arm/mach-omap1/board-voiceblue.c | 2 +- + arch/arm/mach-omap1/clock.c | 22 +- + arch/arm/mach-omap1/clock.h | 2 +- + arch/arm/mach-omap1/clock_data.c | 149 +- + arch/arm/mach-omap1/devices.c | 72 - + arch/arm/mach-omap1/include/mach/debug-macro.S | 10 +- + arch/arm/mach-omap1/mailbox.c | 55 +- + arch/arm/mach-omap1/mcbsp.c | 3 - + arch/arm/mach-omap1/mux.c | 6 +- + arch/arm/mach-omap1/serial.c | 7 + + arch/arm/mach-omap1/usb.c | 530 ++++ + arch/arm/mach-omap2/Kconfig | 89 + + arch/arm/mach-omap2/Makefile | 23 +- + arch/arm/mach-omap2/board-2430sdp.c | 23 +- + arch/arm/mach-omap2/board-3430sdp.c | 24 +- + arch/arm/mach-omap2/board-3630sdp.c | 129 +- + arch/arm/mach-omap2/board-4430sdp.c | 70 +- + arch/arm/mach-omap2/board-am3517evm.c | 8 +- + arch/arm/mach-omap2/board-apollon.c | 30 +- + arch/arm/mach-omap2/board-cm-t35.c | 28 +- + arch/arm/mach-omap2/board-devkit8000.c | 169 +- + .../{board-sdp-flash.c => board-flash.c} | 93 +- + arch/arm/mach-omap2/board-generic.c | 1 - + arch/arm/mach-omap2/board-h4.c | 60 +- + arch/arm/mach-omap2/board-igep0020.c | 8 +- + arch/arm/mach-omap2/board-ldp.c | 43 +- + arch/arm/mach-omap2/board-n8x0.c | 11 + + arch/arm/mach-omap2/board-omap3beagle.c | 32 +- + arch/arm/mach-omap2/board-omap3evm.c | 15 +- + arch/arm/mach-omap2/board-omap3pandora.c | 156 +- + arch/arm/mach-omap2/board-omap3stalker.c | 8 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 33 +- + arch/arm/mach-omap2/board-omap4panda.c | 304 ++ + arch/arm/mach-omap2/board-overo.c | 74 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 78 +- + arch/arm/mach-omap2/board-rx51-video.c | 1 - + arch/arm/mach-omap2/board-rx51.c | 2 +- + arch/arm/mach-omap2/board-zoom2.c | 64 +- + arch/arm/mach-omap2/board-zoom3.c | 64 +- + arch/arm/mach-omap2/clock3xxx_data.c | 2 +- + arch/arm/mach-omap2/cm.c | 6 +- + arch/arm/mach-omap2/devices.c | 88 +- + arch/arm/mach-omap2/gpmc-nand.c | 37 +- + arch/arm/mach-omap2/gpmc.c | 284 ++- + arch/arm/mach-omap2/i2c.c | 27 +- + arch/arm/mach-omap2/id.c | 64 +- + .../include/mach/{board-sdp.h => board-flash.h} | 9 +- + arch/arm/mach-omap2/include/mach/board-zoom.h | 6 + + arch/arm/mach-omap2/include/mach/debug-macro.S | 29 +- + arch/arm/mach-omap2/include/mach/id.h | 22 + + arch/arm/mach-omap2/include/mach/omap4-common.h | 7 + + arch/arm/mach-omap2/io.c | 13 +- + arch/arm/mach-omap2/iommu2.c | 44 +- + arch/arm/mach-omap2/mailbox.c | 182 +- + arch/arm/mach-omap2/mcbsp.c | 23 +- + arch/arm/mach-omap2/mux.c | 338 +-- + arch/arm/mach-omap2/mux.h | 28 +- + arch/arm/mach-omap2/mux2420.c | 688 +++++ + arch/arm/mach-omap2/mux2420.h | 282 ++ + arch/arm/mach-omap2/mux2430.c | 791 +++++ + arch/arm/mach-omap2/mux2430.h | 370 +++ + arch/arm/mach-omap2/mux34xx.c | 8 +- + arch/arm/mach-omap2/omap-headsmp.S | 16 - + arch/arm/mach-omap2/omap-hotplug.c | 79 + + arch/arm/mach-omap2/omap-iommu.c | 2 +- + arch/arm/mach-omap2/omap-smp.c | 3 +- + arch/arm/mach-omap2/omap44xx-smc.S | 25 + + arch/arm/mach-omap2/omap_hwmod.c | 106 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 79 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 81 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 92 +- + arch/arm/mach-omap2/omap_hwmod_common_data.c | 3 + + arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 + + arch/arm/mach-omap2/pm.c | 84 + + arch/arm/mach-omap2/pm24xx.c | 1 - + arch/arm/mach-omap2/pm34xx.c | 7 +- + arch/arm/mach-omap2/pm44xx.c | 135 + + arch/arm/mach-omap2/powerdomain.c | 1 + + arch/arm/mach-omap2/powerdomains34xx.h | 12 +- + arch/arm/mach-omap2/serial.c | 80 +- + arch/arm/mach-omap2/usb-ehci.c | 1 - + arch/arm/mach-omap2/usb-fs.c | 359 +++ + arch/arm/mach-omap2/usb-musb.c | 1 - + arch/arm/mach-omap2/usb-tusb6010.c | 14 +- + arch/arm/mach-tegra/Kconfig | 50 + + arch/arm/mach-tegra/Makefile | 14 + + arch/arm/mach-tegra/Makefile.boot | 3 + + arch/arm/mach-tegra/board-harmony-pinmux.c | 144 + + arch/arm/mach-tegra/board-harmony.c | 127 + + arch/arm/mach-tegra/board-harmony.h | 22 + + arch/arm/mach-tegra/board.h | 32 + + arch/arm/mach-tegra/clock.c | 488 +++ + arch/arm/mach-tegra/clock.h | 147 + + arch/arm/mach-tegra/common.c | 61 + + arch/arm/mach-tegra/gpio-names.h | 247 ++ + arch/arm/mach-tegra/gpio.c | 348 +++ + arch/arm/mach-tegra/headsmp.S | 61 + + arch/arm/mach-tegra/hotplug.c | 140 + + arch/arm/mach-tegra/include/mach/barriers.h | 30 + + arch/arm/mach-tegra/include/mach/clk.h | 26 + + arch/arm/mach-tegra/include/mach/clkdev.h | 32 + + arch/arm/mach-tegra/include/mach/debug-macro.S | 46 + + arch/arm/mach-tegra/include/mach/entry-macro.S | 118 + + arch/arm/mach-tegra/include/mach/gpio.h | 53 + + arch/arm/mach-tegra/include/mach/hardware.h | 24 + + arch/arm/mach-tegra/include/mach/io.h | 79 + + arch/arm/mach-tegra/include/mach/iomap.h | 203 ++ + arch/arm/mach-tegra/include/mach/irqs.h | 173 ++ + arch/arm/mach-tegra/include/mach/memory.h | 28 + + arch/arm/mach-tegra/include/mach/pinmux.h | 348 +++ + arch/arm/mach-tegra/include/mach/smp.h | 30 + + arch/arm/mach-tegra/include/mach/system.h | 39 + + arch/arm/mach-tegra/include/mach/timex.h | 26 + + arch/arm/mach-tegra/include/mach/uncompress.h | 78 + + arch/arm/mach-tegra/include/mach/vmalloc.h | 28 + + arch/arm/mach-tegra/io.c | 78 + + arch/arm/mach-tegra/irq.c | 34 + + arch/arm/mach-tegra/localtimer.c | 25 + + arch/arm/mach-tegra/pinmux.c | 945 ++++++ + arch/arm/mach-tegra/platsmp.c | 156 + + arch/arm/mach-tegra/tegra2_clocks.c | 1359 +++++++++ + arch/arm/mach-tegra/timer.c | 187 ++ + arch/arm/mm/Kconfig | 3 +- + arch/arm/plat-mxc/include/mach/ssi.h | 3 + + arch/arm/plat-omap/Kconfig | 33 +- + arch/arm/plat-omap/Makefile | 1 + + arch/arm/plat-omap/common.c | 10 +- + arch/arm/plat-omap/debug-leds.c | 2 +- + arch/arm/plat-omap/devices.c | 124 - + arch/arm/plat-omap/dma.c | 11 +- + arch/arm/plat-omap/gpio.c | 4 +- + arch/arm/plat-omap/i2c.c | 12 +- + arch/arm/plat-omap/include/plat/board.h | 8 + + arch/arm/plat-omap/include/plat/clock.h | 130 +- + arch/arm/plat-omap/include/plat/common.h | 9 +- + arch/arm/plat-omap/include/plat/cpu.h | 17 +- + arch/arm/plat-omap/include/plat/display.h | 9 +- + arch/arm/plat-omap/include/plat/dma.h | 1 + + arch/arm/plat-omap/include/plat/dsp_common.h | 40 - + arch/arm/plat-omap/include/plat/gpmc.h | 42 +- + arch/arm/plat-omap/include/plat/iommu.h | 2 + + arch/arm/plat-omap/include/plat/mailbox.h | 20 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 2 + + arch/arm/plat-omap/include/plat/mux.h | 224 +-- + arch/arm/plat-omap/include/plat/nand.h | 6 +- + arch/arm/plat-omap/include/plat/nokia-dsi-panel.h | 31 + + arch/arm/plat-omap/include/plat/omap-pm.h | 130 +- + arch/arm/plat-omap/include/plat/omap_device.h | 2 + + arch/arm/plat-omap/include/plat/omap_hwmod.h | 14 +- + arch/arm/plat-omap/include/plat/smp.h | 1 + + arch/arm/plat-omap/include/plat/uncompress.h | 6 + + arch/arm/plat-omap/include/plat/usb.h | 49 +- + arch/arm/plat-omap/iommu.c | 27 +- + arch/arm/plat-omap/iopgtable.h | 8 +- + arch/arm/plat-omap/mailbox.c | 248 +- + arch/arm/plat-omap/mcbsp.c | 51 +- + arch/arm/plat-omap/mux.c | 2 +- + arch/arm/plat-omap/omap-pm-noop.c | 61 +- + arch/arm/plat-omap/omap_device.c | 37 +- + arch/arm/plat-omap/usb.c | 644 +---- + arch/arm/plat-orion/include/plat/audio.h | 11 + + arch/cris/Kconfig | 5 +- + arch/cris/Kconfig.debug | 6 + + arch/cris/arch-v10/drivers/Kconfig | 2 +- + arch/cris/arch-v10/drivers/eeprom.c | 2 - + arch/cris/arch-v10/drivers/gpio.c | 82 +- + arch/cris/arch-v10/drivers/i2c.c | 39 +- + arch/cris/arch-v10/drivers/i2c.h | 3 +- + arch/cris/arch-v10/drivers/sync_serial.c | 30 +- + arch/cris/arch-v10/kernel/fasttimer.c | 6 +- + arch/cris/arch-v10/kernel/head.S | 2 +- + arch/cris/arch-v10/kernel/time.c | 54 +- + arch/cris/arch-v32/drivers/cryptocop.c | 28 +- + arch/cris/arch-v32/drivers/i2c.c | 12 +- + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 28 +- + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 42 +- + arch/cris/arch-v32/drivers/sync_serial.c | 30 +- + arch/cris/arch-v32/kernel/cacheflush.S | 5 + + arch/cris/arch-v32/kernel/entry.S | 80 +- + arch/cris/arch-v32/kernel/head.S | 44 +- + arch/cris/arch-v32/kernel/irq.c | 47 +- + arch/cris/arch-v32/kernel/kgdb.c | 16 +- + arch/cris/arch-v32/kernel/kgdb_asm.S | 2 +- + arch/cris/arch-v32/kernel/pinmux.c | 229 -- + arch/cris/arch-v32/kernel/setup.c | 74 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/cris/arch-v32/kernel/time.c | 85 +- + arch/cris/arch-v32/kernel/traps.c | 6 +- + arch/cris/arch-v32/lib/checksum.S | 3 + + arch/cris/arch-v32/lib/checksumcopy.S | 3 + + arch/cris/arch-v32/lib/spinlock.S | 7 + + arch/cris/arch-v32/mach-a3/Kconfig | 4 + + arch/cris/arch-v32/mach-a3/dram_init.S | 16 +- + arch/cris/arch-v32/mach-a3/hw_settings.S | 2 + + arch/cris/arch-v32/mm/init.c | 23 +- + arch/cris/arch-v32/mm/mmu.S | 4 + + arch/cris/boot/Makefile | 2 +- + arch/cris/boot/compressed/misc.c | 65 +- + arch/cris/include/arch-v32/arch/cache.h | 2 + + arch/cris/include/arch-v32/arch/dma.h | 80 +- + arch/cris/include/arch-v32/arch/io.h | 20 +- + arch/cris/include/arch-v32/arch/memmap.h | 25 +- + arch/cris/include/arch-v32/arch/pgtable.h | 8 + + arch/cris/include/arch-v32/arch/uaccess.h | 7 +- + arch/cris/include/arch-v32/mach-a3/mach/dma.h | 27 + + .../cris/include/arch-v32/mach-a3/mach/startup.inc | 28 +- + arch/cris/include/arch-v32/mach-fs/mach/dma.h | 79 + + arch/cris/include/arch-v32/mach-fs/mach/memmap.h | 24 + + .../cris/include/arch-v32/mach-fs/mach/startup.inc | 5 + + arch/cris/include/asm/etraxgpio.h | 96 +- + arch/cris/include/asm/sync_serial.h | 27 +- + arch/cris/kernel/profile.c | 15 +- + arch/cris/kernel/time.c | 7 +- + arch/cris/kernel/vmlinux.lds.S | 14 +- + arch/cris/mm/fault.c | 45 +- + arch/ia64/kernel/smpboot.c | 2 +- + arch/tile/Kbuild | 3 + + arch/tile/Kconfig | 356 +++ + arch/tile/Kconfig.debug | 43 + + arch/tile/Makefile | 52 + + arch/tile/configs/tile_defconfig | 1290 ++++++++ + arch/tile/include/arch/abi.h | 98 + + arch/tile/include/arch/chip.h | 23 + + arch/tile/include/arch/chip_tile64.h | 255 ++ + arch/tile/include/arch/chip_tilepro.h | 255 ++ + arch/tile/include/arch/icache.h | 94 + + arch/tile/include/arch/interrupts.h | 19 + + arch/tile/include/arch/interrupts_32.h | 304 ++ + arch/tile/include/arch/sim_def.h | 512 ++++ + arch/tile/include/arch/spr_def.h | 19 + + arch/tile/include/arch/spr_def_32.h | 162 + + arch/tile/include/asm/Kbuild | 3 + + arch/tile/include/asm/asm-offsets.h | 1 + + arch/tile/include/asm/atomic.h | 159 + + arch/tile/include/asm/atomic_32.h | 370 +++ + arch/tile/include/asm/auxvec.h | 20 + + arch/tile/include/asm/backtrace.h | 193 ++ + arch/tile/include/asm/bitops.h | 126 + + arch/tile/include/asm/bitops_32.h | 132 + + arch/tile/include/asm/bitsperlong.h | 26 + + arch/tile/include/asm/bug.h | 1 + + arch/tile/include/asm/bugs.h | 1 + + arch/tile/include/asm/byteorder.h | 1 + + arch/tile/include/asm/cache.h | 52 + + arch/tile/include/asm/cacheflush.h | 140 + + arch/tile/include/asm/checksum.h | 24 + + arch/tile/include/asm/compat.h | 257 ++ + arch/tile/include/asm/cputime.h | 1 + + arch/tile/include/asm/current.h | 31 + + arch/tile/include/asm/delay.h | 34 + + arch/tile/include/asm/device.h | 1 + + arch/tile/include/asm/div64.h | 1 + + arch/tile/include/asm/dma-mapping.h | 102 + + arch/tile/include/asm/dma.h | 25 + + arch/tile/include/asm/elf.h | 167 + + arch/tile/include/asm/emergency-restart.h | 1 + + arch/tile/include/asm/errno.h | 1 + + arch/tile/include/asm/fcntl.h | 1 + + arch/tile/include/asm/fixmap.h | 124 + + arch/tile/include/asm/ftrace.h | 20 + + arch/tile/include/asm/futex.h | 141 + + arch/tile/include/asm/hardirq.h | 47 + + arch/tile/include/asm/hardwall.h | 56 + + arch/tile/include/asm/highmem.h | 73 + + arch/tile/include/asm/homecache.h | 125 + + arch/tile/include/asm/hugetlb.h | 109 + + arch/tile/include/asm/hv_driver.h | 60 + + arch/tile/include/asm/hw_irq.h | 18 + + arch/tile/include/asm/ide.h | 25 + + arch/tile/include/asm/io.h | 279 ++ + arch/tile/include/asm/ioctl.h | 1 + + arch/tile/include/asm/ioctls.h | 1 + + arch/tile/include/asm/ipc.h | 1 + + arch/tile/include/asm/ipcbuf.h | 1 + + arch/tile/include/asm/irq.h | 87 + + arch/tile/include/asm/irq_regs.h | 1 + + arch/tile/include/asm/irqflags.h | 266 ++ + arch/tile/include/asm/kdebug.h | 1 + + arch/tile/include/asm/kexec.h | 53 + + arch/tile/include/asm/kmap_types.h | 43 + + arch/tile/include/asm/linkage.h | 51 + + arch/tile/include/asm/local.h | 1 + + arch/tile/include/asm/memprof.h | 33 + + arch/tile/include/asm/mman.h | 40 + + arch/tile/include/asm/mmu.h | 31 + + arch/tile/include/asm/mmu_context.h | 131 + + arch/tile/include/asm/mmzone.h | 81 + + arch/tile/include/asm/module.h | 1 + + arch/tile/include/asm/msgbuf.h | 1 + + arch/tile/include/asm/mutex.h | 1 + + arch/tile/include/asm/opcode-tile.h | 30 + + arch/tile/include/asm/opcode-tile_32.h | 1506 ++++++++++ + arch/tile/include/asm/opcode-tile_64.h | 1506 ++++++++++ + arch/tile/include/asm/opcode_constants.h | 26 + + arch/tile/include/asm/opcode_constants_32.h | 480 +++ + arch/tile/include/asm/opcode_constants_64.h | 480 +++ + arch/tile/include/asm/page.h | 339 +++ + arch/tile/include/asm/param.h | 1 + + arch/tile/include/asm/pci-bridge.h | 117 + + arch/tile/include/asm/pci.h | 128 + + arch/tile/include/asm/percpu.h | 24 + + arch/tile/include/asm/pgalloc.h | 119 + + arch/tile/include/asm/pgtable.h | 480 +++ + arch/tile/include/asm/pgtable_32.h | 129 + + arch/tile/include/asm/poll.h | 1 + + arch/tile/include/asm/posix_types.h | 1 + + arch/tile/include/asm/processor.h | 338 +++ + arch/tile/include/asm/ptrace.h | 166 + + arch/tile/include/asm/resource.h | 1 + + arch/tile/include/asm/scatterlist.h | 22 + + arch/tile/include/asm/sections.h | 44 + + arch/tile/include/asm/sembuf.h | 1 + + arch/tile/include/asm/setup.h | 32 + + arch/tile/include/asm/shmbuf.h | 1 + + arch/tile/include/asm/shmparam.h | 1 + + arch/tile/include/asm/sigcontext.h | 27 + + arch/tile/include/asm/sigframe.h | 33 + + arch/tile/include/asm/siginfo.h | 30 + + arch/tile/include/asm/signal.h | 32 + + arch/tile/include/asm/smp.h | 147 + + arch/tile/include/asm/socket.h | 1 + + arch/tile/include/asm/sockios.h | 1 + + arch/tile/include/asm/spinlock.h | 24 + + arch/tile/include/asm/spinlock_32.h | 199 ++ + arch/tile/include/asm/spinlock_types.h | 60 + + arch/tile/include/asm/stack.h | 74 + + arch/tile/include/asm/stat.h | 1 + + arch/tile/include/asm/statfs.h | 1 + + arch/tile/include/asm/string.h | 32 + + arch/tile/include/asm/swab.h | 29 + + arch/tile/include/asm/syscall.h | 79 + + arch/tile/include/asm/syscalls.h | 108 + + arch/tile/include/asm/system.h | 248 ++ + arch/tile/include/asm/termbits.h | 1 + + arch/tile/include/asm/termios.h | 1 + + arch/tile/include/asm/thread_info.h | 166 + + arch/tile/include/asm/timex.h | 47 + + arch/tile/include/asm/tlb.h | 25 + + arch/tile/include/asm/tlbflush.h | 128 + + arch/tile/include/asm/topology.h | 85 + + arch/tile/include/asm/traps.h | 62 + + arch/tile/include/asm/types.h | 1 + + arch/tile/include/asm/uaccess.h | 580 ++++ + arch/tile/include/asm/ucontext.h | 1 + + arch/tile/include/asm/unaligned.h | 24 + + arch/tile/include/asm/unistd.h | 46 + + arch/tile/include/asm/user.h | 21 + + arch/tile/include/asm/xor.h | 1 + + arch/tile/include/hv/drv_pcie_rc_intf.h | 38 + + arch/tile/include/hv/hypervisor.h | 2375 +++++++++++++++ + arch/tile/include/hv/pagesize.h | 32 + + arch/tile/include/hv/syscall_public.h | 42 + + arch/tile/kernel/Makefile | 17 + + arch/tile/kernel/asm-offsets.c | 76 + + arch/tile/kernel/backtrace.c | 621 ++++ + arch/tile/kernel/compat.c | 167 + + arch/tile/kernel/compat_signal.c | 435 +++ + arch/tile/kernel/early_printk.c | 109 + + arch/tile/kernel/entry.S | 141 + + arch/tile/kernel/hardwall.c | 796 +++++ + arch/tile/kernel/head_32.S | 180 ++ + arch/tile/kernel/hvglue.lds | 58 + + arch/tile/kernel/init_task.c | 59 + + arch/tile/kernel/intvec_32.S | 2008 +++++++++++++ + arch/tile/kernel/irq.c | 334 +++ + arch/tile/kernel/machine_kexec.c | 279 ++ + arch/tile/kernel/messaging.c | 116 + + arch/tile/kernel/module.c | 257 ++ + arch/tile/kernel/pci-dma.c | 251 ++ + arch/tile/kernel/proc.c | 91 + + arch/tile/kernel/process.c | 671 +++++ + arch/tile/kernel/ptrace.c | 205 ++ + arch/tile/kernel/reboot.c | 51 + + arch/tile/kernel/regs_32.S | 145 + + arch/tile/kernel/relocate_kernel.S | 280 ++ + arch/tile/kernel/setup.c | 1511 ++++++++++ + arch/tile/kernel/signal.c | 358 +++ + arch/tile/kernel/single_step.c | 663 ++++ + arch/tile/kernel/smp.c | 256 ++ + arch/tile/kernel/smpboot.c | 278 ++ + arch/tile/kernel/stack.c | 486 +++ + arch/tile/kernel/sys.c | 120 + + arch/tile/kernel/tile-desc_32.c | 2498 ++++++++++++++++ + arch/tile/kernel/time.c | 221 ++ + arch/tile/kernel/tlb.c | 97 + + arch/tile/kernel/traps.c | 317 ++ + arch/tile/kernel/vmlinux.lds.S | 98 + + arch/tile/lib/Makefile | 16 + + arch/tile/lib/atomic_32.c | 330 ++ + arch/tile/lib/atomic_asm_32.S | 196 ++ + arch/tile/lib/cacheflush.c | 23 + + arch/tile/lib/checksum.c | 102 + + arch/tile/lib/cpumask.c | 52 + + arch/tile/lib/delay.c | 34 + + arch/tile/lib/exports.c | 79 + + arch/tile/lib/mb_incoherent.S | 34 + + arch/tile/lib/memchr_32.c | 68 + + arch/tile/lib/memcpy_32.S | 628 ++++ + arch/tile/lib/memcpy_tile64.c | 271 ++ + arch/tile/lib/memmove_32.c | 63 + + arch/tile/lib/memset_32.c | 275 ++ + arch/tile/lib/spinlock_32.c | 221 ++ + arch/tile/lib/spinlock_common.h | 64 + + arch/tile/lib/strchr_32.c | 66 + + arch/tile/lib/strlen_32.c | 36 + + arch/tile/lib/uaccess.c | 32 + + arch/tile/lib/usercopy_32.S | 223 ++ + arch/tile/mm/Makefile | 9 + + arch/tile/mm/elf.c | 164 + + arch/tile/mm/extable.c | 30 + + arch/tile/mm/fault.c | 867 ++++++ + arch/tile/mm/highmem.c | 328 ++ + arch/tile/mm/homecache.c | 433 +++ + arch/tile/mm/hugetlbpage.c | 343 +++ + arch/tile/mm/init.c | 1085 +++++++ + arch/tile/mm/migrate.h | 50 + + arch/tile/mm/migrate_32.S | 211 ++ + arch/tile/mm/mmap.c | 75 + + arch/tile/mm/pgtable.c | 530 ++++ + arch/um/drivers/hostaudio_kern.c | 6 + + arch/x86/kernel/smpboot.c | 2 +- + drivers/acpi/acpica/acevents.h | 4 +- + drivers/acpi/acpica/acglobal.h | 7 - + drivers/acpi/acpica/achware.h | 5 +- + drivers/acpi/acpica/aclocal.h | 6 +- + drivers/acpi/acpica/acnamesp.h | 7 - + drivers/acpi/acpica/acobject.h | 16 +- + drivers/acpi/acpica/acpredef.h | 13 +- + drivers/acpi/acpica/acstruct.h | 32 +- + drivers/acpi/acpica/dsinit.c | 14 +- + drivers/acpi/acpica/dsmethod.c | 20 +- + drivers/acpi/acpica/dsmthdat.c | 16 +- + drivers/acpi/acpica/dsobject.c | 16 +- + drivers/acpi/acpica/dsopcode.c | 6 +- + drivers/acpi/acpica/dsutils.c | 4 +- + drivers/acpi/acpica/evevent.c | 5 +- + drivers/acpi/acpica/evgpe.c | 69 +- + drivers/acpi/acpica/evgpeblk.c | 70 +- + drivers/acpi/acpica/evgpeinit.c | 236 +-- + drivers/acpi/acpica/evrgnini.c | 10 +- + drivers/acpi/acpica/evxfevnt.c | 249 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/exfldio.c | 4 +- + drivers/acpi/acpica/exprep.c | 23 +- + drivers/acpi/acpica/exregion.c | 6 +- + drivers/acpi/acpica/hwgpe.c | 35 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/nsaccess.c | 9 +- + drivers/acpi/acpica/nsalloc.c | 94 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsinit.c | 16 +- + drivers/acpi/acpica/nsnames.c | 4 +- + drivers/acpi/acpica/nsparse.c | 4 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 7 + + drivers/acpi/acpica/nssearch.c | 15 +- + drivers/acpi/acpica/nsutils.c | 113 - + drivers/acpi/acpica/nswalk.c | 15 +- + drivers/acpi/acpica/nsxfobj.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/utxface.c | 8 +- + drivers/acpi/button.c | 6 +- + drivers/acpi/ec.c | 39 +- + drivers/acpi/osl.c | 60 +- + drivers/acpi/scan.c | 7 +- + drivers/acpi/sleep.c | 15 +- + drivers/acpi/system.c | 6 +- + drivers/acpi/wakeup.c | 18 +- + drivers/ata/libata-core.c | 20 +- + drivers/ata/libata-eh.c | 4 +- + drivers/ata/libata-scsi.c | 10 +- + drivers/ata/libata-sff.c | 9 +- + drivers/ata/libata.h | 1 - + drivers/char/Makefile | 1 + + drivers/char/hvc_tile.c | 67 + + drivers/firewire/Kconfig | 24 + + drivers/firewire/Makefile | 1 + + drivers/firewire/core-card.c | 218 +- + drivers/firewire/core-cdev.c | 409 ++- + drivers/firewire/core-device.c | 11 +- + drivers/firewire/core-iso.c | 34 +- + drivers/firewire/core-topology.c | 22 +- + drivers/firewire/core-transaction.c | 306 ++- + drivers/firewire/core.h | 24 +- + drivers/firewire/net.c | 4 +- + drivers/firewire/nosy-user.h | 25 + + drivers/firewire/nosy.c | 721 +++++ + drivers/firewire/nosy.h | 237 ++ + drivers/firewire/ohci.c | 701 ++++- + drivers/firewire/ohci.h | 1 + + drivers/firewire/sbp2.c | 13 +- + drivers/gpu/drm/drm_crtc_helper.c | 29 +- + drivers/ieee1394/dv1394.c | 18 +- + drivers/ieee1394/eth1394.c | 3 - + drivers/ieee1394/raw1394.c | 7 +- + drivers/ieee1394/sbp2.c | 11 +- + drivers/ieee1394/video1394.c | 17 +- + drivers/infiniband/core/cm.c | 10 +- + drivers/infiniband/core/user_mad.c | 2 - + drivers/infiniband/core/verbs.c | 4 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- + drivers/infiniband/hw/cxgb4/cm.c | 91 +- + drivers/infiniband/hw/cxgb4/cq.c | 4 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 + + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 240 +- + drivers/infiniband/hw/cxgb4/t4.h | 32 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 10 + + drivers/infiniband/hw/ehca/ehca_eq.c | 8 +- + drivers/infiniband/hw/ehca/ehca_main.c | 3 +- + drivers/infiniband/hw/ehca/ehca_mrmw.c | 5 - + drivers/infiniband/hw/ehca/ehca_qp.c | 2 +- + drivers/infiniband/hw/ehca/hcp_if.c | 32 +- + drivers/infiniband/hw/ehca/hcp_phyp.c | 11 +- + drivers/infiniband/hw/ehca/hcp_phyp.h | 2 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 13 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- + drivers/infiniband/hw/nes/nes.c | 37 +- + drivers/infiniband/hw/nes/nes.h | 2 + + drivers/infiniband/hw/nes/nes_cm.c | 10 +- + drivers/infiniband/hw/nes/nes_hw.c | 23 +- + drivers/infiniband/hw/nes/nes_hw.h | 3 +- + drivers/infiniband/hw/nes/nes_nic.c | 15 +- + drivers/infiniband/hw/nes/nes_utils.c | 5 + + drivers/infiniband/hw/nes/nes_verbs.c | 21 +- + drivers/infiniband/hw/qib/qib.h | 4 + + drivers/infiniband/hw/qib/qib_common.h | 16 +- + drivers/infiniband/hw/qib/qib_driver.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 203 +- + drivers/infiniband/hw/qib/qib_fs.c | 18 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 4 +- + drivers/infiniband/hw/qib/qib_init.c | 2 +- + drivers/infiniband/hw/qib/qib_qp.c | 2 +- + drivers/infiniband/hw/qib/qib_rc.c | 47 +- + drivers/infiniband/hw/qib/qib_sdma.c | 2 + + drivers/infiniband/hw/qib/qib_sysfs.c | 21 +- + drivers/infiniband/hw/qib/qib_tx.c | 2 +- + drivers/infiniband/hw/qib/qib_uc.c | 6 - + drivers/infiniband/hw/qib/qib_ud.c | 17 +- + drivers/infiniband/hw/qib/qib_verbs.c | 7 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 118 +- + drivers/media/dvb/firewire/firedtv-fw.c | 4 +- + drivers/media/video/ivtv/ivtv-driver.c | 26 +- + drivers/media/video/ivtv/ivtv-driver.h | 8 +- + drivers/media/video/ivtv/ivtv-irq.c | 15 +- + drivers/media/video/ivtv/ivtv-irq.h | 2 +- + drivers/mtd/nand/omap2.c | 218 +- + drivers/pci/pci-acpi.c | 6 +- + drivers/usb/gadget/f_audio.c | 6 +- + drivers/usb/gadget/gmidi.c | 2 +- + drivers/video/Kconfig | 2 +- + drivers/video/console/Kconfig | 2 +- + drivers/video/omap/lcd_apollon.c | 3 - + drivers/video/omap2/displays/panel-taal.c | 567 +++- + .../video/omap2/displays/panel-toppoly-tdo35s.c | 8 +- + drivers/video/omap2/dss/dispc.c | 16 +- + drivers/video/omap2/dss/display.c | 4 +- + drivers/video/omap2/dss/dsi.c | 463 ++-- + drivers/video/omap2/dss/dss.c | 6 + + drivers/video/omap2/dss/dss.h | 11 +- + drivers/video/omap2/dss/manager.c | 236 +- + drivers/video/omap2/dss/overlay.c | 2 +- + drivers/video/omap2/dss/rfbi.c | 2 +- + drivers/video/omap2/omapfb/omapfb-ioctl.c | 188 +- + drivers/video/omap2/omapfb/omapfb-main.c | 229 +- + drivers/video/omap2/omapfb/omapfb-sysfs.c | 70 +- + drivers/video/omap2/omapfb/omapfb.h | 29 +- + drivers/video/via/chip.h | 1 - + drivers/video/via/hw.c | 587 +++-- + drivers/video/via/hw.h | 14 +- + drivers/video/via/ioctl.h | 3 - + drivers/video/via/lcd.c | 117 +- + drivers/video/via/lcd.h | 5 - + drivers/video/via/share.h | 309 -- + drivers/video/via/via-core.c | 22 +- + drivers/video/via/via-gpio.c | 2 +- + drivers/video/via/viafbdev.c | 284 +-- + fs/afs/Kconfig | 1 + + fs/afs/cell.c | 40 +- + fs/afs/main.c | 9 +- + fs/cachefiles/namei.c | 13 +- + fs/cachefiles/rdwr.c | 4 +- + fs/cifs/Kconfig | 18 +- + fs/cifs/README | 5 +- + fs/cifs/cifs_debug.c | 25 + + fs/cifs/cifs_dfs_ref.c | 5 +- + fs/cifs/cifs_spnego.c | 4 + + fs/cifs/cifsfs.c | 18 +- + fs/cifs/cifsglob.h | 8 +- + fs/cifs/cifsproto.h | 4 +- + fs/cifs/connect.c | 1 + + fs/cifs/dir.c | 2 +- + fs/cifs/dns_resolve.c | 231 +-- + fs/cifs/dns_resolve.h | 2 - + fs/cifs/file.c | 30 +- + fs/cifs/inode.c | 43 +- + fs/cifs/misc.c | 20 +- + fs/cifs/netmisc.c | 45 +- + fs/dlm/lowcomms.c | 2 +- + fs/dlm/netlink.c | 15 +- + fs/exec.c | 7 - + fs/ext3/Kconfig | 1 + + fs/ext3/inode.c | 80 +- + fs/ext3/namei.c | 3 +- + fs/ext3/resize.c | 2 - + fs/ext3/super.c | 17 +- + fs/ext4/acl.c | 1 + + fs/ext4/balloc.c | 6 +- + fs/ext4/block_validity.c | 8 +- + fs/ext4/dir.c | 23 +- + fs/ext4/ext4.h | 152 +- + fs/ext4/ext4_jbd2.c | 71 +- + fs/ext4/ext4_jbd2.h | 56 +- + fs/ext4/extents.c | 18 +- + fs/ext4/file.c | 5 +- + fs/ext4/ialloc.c | 4 +- + fs/ext4/inode.c | 205 +- + fs/ext4/mballoc.c | 153 +- + fs/ext4/migrate.c | 2 +- + fs/ext4/move_extent.c | 10 +- + fs/ext4/namei.c | 40 +- + fs/ext4/resize.c | 8 +- + fs/ext4/super.c | 334 ++- + fs/ext4/xattr.c | 3 +- + fs/fscache/Kconfig | 1 - + fs/fscache/internal.h | 8 + + fs/fscache/main.c | 106 +- + fs/fscache/object-list.c | 11 +- + fs/fscache/object.c | 106 +- + fs/fscache/operation.c | 67 +- + fs/fscache/page.c | 36 +- + fs/fuse/dev.c | 229 ++- + fs/fuse/file.c | 2 +- + fs/fuse/fuse_i.h | 3 + + fs/gfs2/Kconfig | 1 - + fs/gfs2/incore.h | 3 +- + fs/gfs2/main.c | 14 +- + fs/gfs2/ops_fstype.c | 8 +- + fs/gfs2/quota.c | 10 +- + fs/gfs2/recovery.c | 54 +- + fs/gfs2/recovery.h | 6 +- + fs/gfs2/sys.c | 3 +- + fs/jbd/journal.c | 7 - + fs/jbd/recovery.c | 11 +- + fs/jbd2/checkpoint.c | 18 +- + fs/jbd2/commit.c | 50 +- + fs/jbd2/journal.c | 121 +- + fs/jbd2/recovery.c | 10 +- + fs/jbd2/transaction.c | 233 +- + fs/nfs/Kconfig | 10 +- + fs/nfs/callback_proc.c | 19 +- + fs/nfs/client.c | 21 +- + fs/nfs/delegation.c | 16 +- + fs/nfs/delegation.h | 4 +- + fs/nfs/dir.c | 9 - + fs/nfs/direct.c | 29 +- + fs/nfs/file.c | 51 +- + fs/nfs/inode.c | 74 +- + fs/nfs/internal.h | 7 +- + fs/nfs/nfs2xdr.c | 7 +- + fs/nfs/nfs3xdr.c | 8 +- + fs/nfs/nfs4_fs.h | 57 +- + fs/nfs/nfs4proc.c | 474 ++-- + fs/nfs/nfs4renewd.c | 4 +- + fs/nfs/nfs4state.c | 82 +- + fs/nfs/nfs4xdr.c | 107 +- + fs/nfs/pagelist.c | 8 +- + fs/nfs/read.c | 3 +- + fs/nfs/super.c | 4 + + fs/nfs/unlink.c | 2 +- + fs/nfs/write.c | 9 +- + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4callback.c | 57 +- + fs/nfsd/nfs4state.c | 381 ++- + fs/nfsd/nfs4xdr.c | 3 +- + fs/nfsd/nfsctl.c | 24 +- + fs/nfsd/nfsd.h | 1 + + fs/nfsd/nfsproc.c | 4 +- + fs/nfsd/nfssvc.c | 151 +- + fs/nfsd/state.h | 40 +- + fs/nfsd/vfs.c | 79 +- + fs/nfsd/vfs.h | 4 +- + fs/nilfs2/bmap.c | 6 +- + fs/nilfs2/bmap.h | 16 +- + fs/nilfs2/bmap_union.h | 42 - + fs/nilfs2/btnode.c | 23 +- + fs/nilfs2/btnode.h | 4 +- + fs/nilfs2/btree.c | 914 ++++--- + fs/nilfs2/btree.h | 12 +- + fs/nilfs2/dir.c | 33 +- + fs/nilfs2/direct.c | 96 +- + fs/nilfs2/direct.h | 11 - + fs/nilfs2/gcinode.c | 17 +- + fs/nilfs2/mdt.c | 1 + + fs/nilfs2/nilfs.h | 22 +- + fs/nilfs2/page.c | 5 +- + fs/nilfs2/page.h | 2 + + fs/nilfs2/recovery.c | 348 ++- + fs/nilfs2/segbuf.h | 24 +- + fs/nilfs2/segment.c | 19 +- + fs/nilfs2/segment.h | 10 +- + fs/nilfs2/super.c | 333 ++- + fs/nilfs2/the_nilfs.c | 161 +- + fs/nilfs2/the_nilfs.h | 23 +- + fs/ocfs2/journal.c | 4 +- + fs/quota/dquot.c | 79 +- + fs/quota/quota_tree.c | 85 +- + fs/quota/quota_tree.h | 6 - + fs/quota/quota_v1.c | 3 +- + fs/quota/quota_v2.c | 11 +- + fs/udf/file.c | 1 - + fs/udf/super.c | 2 - + fs/xfs/linux-2.6/xfs_quotaops.c | 10 +- + fs/xfs/quota/xfs_qm_syscalls.c | 32 +- + include/acpi/acoutput.h | 3 +- + include/acpi/acpixf.h | 13 +- + include/acpi/actbl2.h | 48 + + include/acpi/actypes.h | 8 +- + include/asm-generic/unistd.h | 33 +- + include/drm/drm_crtc.h | 3 +- + include/keys/dns_resolver-type.h | 23 + + include/linux/cpu.h | 2 + + include/linux/dns_resolver.h | 34 + + include/linux/dqblk_xfs.h | 24 +- + include/linux/ext3_fs.h | 1 - + include/linux/firewire-cdev.h | 501 +++- + include/linux/firewire.h | 62 +- + include/linux/fscache-cache.h | 47 +- + include/linux/fuse.h | 34 +- + include/linux/jbd2.h | 16 +- + include/linux/kthread.h | 65 + + include/linux/libata.h | 1 + + include/linux/list.h | 13 +- + include/linux/nfs4.h | 1 + + include/linux/nfs_fs.h | 13 +- + include/linux/nfs_fs_sb.h | 7 +- + include/linux/nfs_mount.h | 1 + + include/linux/nfs_page.h | 1 + + include/linux/nfs_xdr.h | 12 +- + include/linux/nilfs2_fs.h | 67 +- + include/linux/omapfb.h | 5 +- + include/linux/quotaops.h | 26 +- + include/linux/slow-work.h | 163 - + include/linux/sunrpc/auth.h | 21 +- + include/linux/sunrpc/cache.h | 1 + + include/linux/sunrpc/clnt.h | 5 +- + include/linux/sunrpc/sched.h | 7 +- + include/linux/sunrpc/xprt.h | 1 + + include/linux/types.h | 12 + + include/linux/usb/audio-v2.h | 17 +- + include/linux/usb/audio.h | 12 +- + include/linux/workqueue.h | 154 +- + include/rdma/ib_verbs.h | 2 +- + include/sound/asound.h | 6 +- + include/sound/pcm.h | 6 +- + include/sound/sh_fsi.h | 49 +- + include/sound/soc-dapm.h | 2 + + include/sound/soc.h | 21 + + include/sound/tlv320dac33-plat.h | 2 + + include/sound/uda134x.h | 12 + + include/trace/events/ext4.h | 20 +- + include/trace/events/workqueue.h | 92 - + init/Kconfig | 24 - + init/main.c | 7 - + kernel/Makefile | 2 - + kernel/async.c | 141 +- + kernel/kthread.c | 164 + + kernel/power/process.c | 21 +- + kernel/slow-work-debugfs.c | 227 -- + kernel/slow-work.c | 1068 ------- + kernel/slow-work.h | 72 - + kernel/sysctl.c | 8 - + kernel/trace/Kconfig | 11 - + kernel/trace/trace.c | 8 - + kernel/workqueue.c | 3160 +++++++++++++++++--- + kernel/workqueue_sched.h | 13 +- + net/Kconfig | 1 + + net/Makefile | 1 + + net/dns_resolver/Kconfig | 27 + + net/dns_resolver/Makefile | 7 + + net/dns_resolver/dns_key.c | 211 ++ + net/dns_resolver/dns_query.c | 160 + + net/dns_resolver/internal.h | 44 + + net/sunrpc/auth.c | 157 +- + net/sunrpc/auth_generic.c | 23 +- + net/sunrpc/auth_gss/auth_gss.c | 29 +- + net/sunrpc/auth_null.c | 2 +- + net/sunrpc/auth_unix.c | 21 +- + net/sunrpc/cache.c | 8 +- + net/sunrpc/clnt.c | 182 +- + net/sunrpc/sched.c | 104 +- + net/sunrpc/sunrpc_syms.c | 16 +- + net/sunrpc/xprt.c | 3 + + scripts/checksyscalls.sh | 1 - + security/selinux/Makefile | 2 +- + sound/core/pcm_lib.c | 25 +- + sound/core/pcm_misc.c | 16 + + sound/drivers/Kconfig | 24 +- + sound/isa/msnd/msnd_pinnacle.c | 5 +- + sound/isa/sb/emu8000_pcm.c | 9 +- + sound/oss/au1550_ac97.c | 91 +- + sound/oss/dmasound/dmasound_core.c | 63 +- + sound/oss/midi_synth.c | 4 +- + sound/oss/msnd_pinnacle.c | 35 +- + sound/oss/sh_dac_audio.c | 27 +- + sound/oss/soundcard.c | 20 +- + sound/oss/swarm_cs4297a.c | 41 +- + sound/oss/vidc.c | 3 - + sound/oss/vwsnd.c | 32 +- + sound/oss/waveartist.c | 10 +- + sound/pci/als4000.c | 4 +- + sound/pci/asihpi/asihpi.c | 16 +- + sound/pci/asihpi/hpi.h | 68 +- + sound/pci/asihpi/hpi6000.c | 7 + + sound/pci/asihpi/hpi_internal.h | 40 +- + sound/pci/asihpi/hpicmn.c | 10 +- + sound/pci/asihpi/hpidebug.c | 2 +- + sound/pci/asihpi/hpidebug.h | 4 +- + sound/pci/asihpi/hpifunc.c | 327 ++- + sound/pci/asihpi/hpimsgx.c | 2 +- + sound/pci/asihpi/hpioctl.c | 21 +- + sound/pci/echoaudio/echoaudio.c | 2 + + sound/pci/hda/hda_codec.c | 97 +- + sound/pci/hda/hda_codec.h | 32 +- + sound/pci/hda/hda_hwdep.c | 4 +- + sound/pci/hda/hda_intel.c | 5 +- + sound/pci/hda/hda_proc.c | 7 +- + sound/pci/hda/patch_analog.c | 7 +- + sound/pci/hda/patch_conexant.c | 95 +- + sound/pci/hda/patch_hdmi.c | 43 +- + sound/pci/hda/patch_intelhdmi.c | 3 +- + sound/pci/hda/patch_nvhdmi.c | 3 +- + sound/pci/hda/patch_realtek.c | 720 ++++- + sound/pci/hda/patch_sigmatel.c | 12 +- + sound/pci/hda/patch_via.c | 32 +- + sound/pci/riptide/riptide.c | 18 +- + sound/pci/sis7019.c | 16 +- + sound/pci/via82xx.c | 9 +- + sound/soc/Kconfig | 4 + + sound/soc/Makefile | 4 + + sound/soc/atmel/atmel-pcm.c | 1 - + sound/soc/atmel/atmel_ssc_dai.c | 1 - + sound/soc/au1x/psc-ac97.c | 13 +- + sound/soc/au1x/psc-i2s.c | 13 +- + sound/soc/au1x/psc.h | 1 - + sound/soc/blackfin/bf5xx-ac97.c | 6 +- + sound/soc/blackfin/bf5xx-tdm.c | 6 +- + sound/soc/codecs/Kconfig | 20 +- + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ad1836.c | 1 + + sound/soc/codecs/ad193x.c | 41 +- + sound/soc/codecs/ad193x.h | 5 + + sound/soc/codecs/ak4642.c | 36 +- + sound/soc/codecs/cs42l51.c | 763 +++++ + sound/soc/codecs/cs42l51.h | 163 + + sound/soc/codecs/da7210.c | 48 +- + sound/soc/codecs/jz4740.c | 511 ++++ + sound/soc/codecs/jz4740.h | 20 + + sound/soc/codecs/spdif_transciever.c | 94 +- + sound/soc/codecs/spdif_transciever.h | 1 + + sound/soc/codecs/tlv320aic23.c | 7 +- + sound/soc/codecs/tlv320dac33.c | 180 +- + sound/soc/codecs/twl4030.c | 388 ++-- + sound/soc/codecs/twl4030.h | 4 + + sound/soc/codecs/twl6040.c | 58 +- + sound/soc/codecs/uda134x.c | 64 +- + sound/soc/codecs/uda134x.h | 5 +- + sound/soc/codecs/wm2000.c | 2 + + sound/soc/codecs/wm8523.c | 10 +- + sound/soc/codecs/wm8711.c | 3 +- + sound/soc/codecs/wm8741.c | 579 ++++ + sound/soc/codecs/wm8741.h | 214 ++ + sound/soc/codecs/wm8750.c | 11 +- + sound/soc/codecs/wm8904.c | 13 +- + sound/soc/codecs/wm8940.c | 7 +- + sound/soc/codecs/wm8955.c | 10 +- + sound/soc/codecs/wm8960.c | 99 +- + sound/soc/codecs/wm8961.c | 9 +- + sound/soc/codecs/wm8974.c | 3 +- + sound/soc/codecs/wm8978.c | 10 +- + sound/soc/codecs/wm8990.c | 4 - + sound/soc/codecs/wm8994.c | 75 + + sound/soc/codecs/wm8994.h | 3 + + sound/soc/codecs/wm9081.c | 11 +- + sound/soc/codecs/wm_hubs.c | 2 + + sound/soc/davinci/davinci-i2s.c | 163 +- + sound/soc/davinci/davinci-i2s.h | 5 + + sound/soc/davinci/davinci-mcasp.c | 6 +- + sound/soc/davinci/davinci-pcm.c | 7 +- + sound/soc/davinci/davinci-pcm.h | 3 +- + sound/soc/davinci/davinci-vcif.c | 2 +- + sound/soc/ep93xx/Kconfig | 18 + + sound/soc/ep93xx/Makefile | 11 + + sound/soc/ep93xx/ep93xx-i2s.c | 487 +++ + sound/soc/ep93xx/ep93xx-i2s.h | 18 + + sound/soc/ep93xx/ep93xx-pcm.c | 319 ++ + sound/soc/ep93xx/ep93xx-pcm.h | 22 + + sound/soc/ep93xx/snappercl15.c | 150 + + sound/soc/fsl/mpc5200_psc_i2s.c | 1 - + sound/soc/fsl/mpc5200_psc_i2s.h | 12 - + sound/soc/imx/Kconfig | 19 +- + sound/soc/imx/Makefile | 2 + + sound/soc/imx/eukrea-tlv320.c | 137 + + sound/soc/imx/imx-pcm-dma-mx2.c | 6 +- + sound/soc/imx/imx-pcm-fiq.c | 6 +- + sound/soc/imx/imx-ssi.c | 11 +- + sound/soc/jz4740/Kconfig | 23 + + sound/soc/jz4740/Makefile | 13 + + sound/soc/jz4740/jz4740-i2s.c | 540 ++++ + sound/soc/jz4740/jz4740-i2s.h | 18 + + sound/soc/jz4740/jz4740-pcm.c | 373 +++ + sound/soc/jz4740/jz4740-pcm.h | 22 + + sound/soc/jz4740/qi_lb60.c | 166 + + sound/soc/kirkwood/Kconfig | 20 + + sound/soc/kirkwood/Makefile | 9 + + sound/soc/kirkwood/kirkwood-dma.c | 383 +++ + sound/soc/kirkwood/kirkwood-dma.h | 17 + + sound/soc/kirkwood/kirkwood-i2s.c | 495 +++ + sound/soc/kirkwood/kirkwood-i2s.h | 17 + + sound/soc/kirkwood/kirkwood-openrd.c | 126 + + sound/soc/kirkwood/kirkwood.h | 129 + + sound/soc/nuc900/Kconfig | 27 + + sound/soc/nuc900/Makefile | 11 + + sound/soc/nuc900/nuc900-ac97.c | 430 +++ + sound/soc/nuc900/nuc900-audio.c | 81 + + sound/soc/nuc900/nuc900-audio.h | 117 + + sound/soc/nuc900/nuc900-pcm.c | 354 +++ + sound/soc/omap/omap-mcbsp.c | 175 +- + sound/soc/omap/omap3pandora.c | 36 +- + sound/soc/omap/rx51.c | 73 +- + sound/soc/s3c24xx/Kconfig | 10 +- + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/s3c-ac97.c | 1 - + sound/soc/s3c24xx/s3c-i2s-v2.c | 3 +- + sound/soc/s3c24xx/smartq_wm8987.c | 295 ++ + sound/soc/s3c24xx/smdk_wm9713.c | 3 + + sound/soc/s6000/s6000-i2s.c | 38 +- + sound/soc/sh/Kconfig | 4 +- + sound/soc/sh/fsi-ak4642.c | 13 +- + sound/soc/sh/fsi-da7210.c | 13 +- + sound/soc/sh/fsi.c | 257 ++- + sound/soc/soc-core.c | 115 +- + sound/sound_core.c | 9 +- + sound/usb/card.c | 2 +- + sound/usb/clock.c | 59 +- + sound/usb/clock.h | 4 +- + sound/usb/endpoint.c | 5 +- + sound/usb/format.c | 9 +- + sound/usb/midi.c | 14 +- + sound/usb/mixer.c | 77 +- + sound/usb/mixer.h | 1 - + sound/usb/pcm.h | 3 - + sound/usb/quirks-table.h | 30 +- + sound/usb/quirks.c | 1 + + tools/firewire/Makefile | 19 + + tools/firewire/decode-fcp.c | 213 ++ + tools/firewire/list.h | 62 + + tools/firewire/nosy-dump.c | 1031 +++++++ + tools/firewire/nosy-dump.h | 173 ++ + 1045 files changed, 81146 insertions(+), 18282 deletions(-) + create mode 100644 Documentation/networking/dns_resolver.txt + delete mode 100644 Documentation/slow-work.txt + create mode 100644 Documentation/sound/alsa/alsa-parameters.txt + create mode 100644 Documentation/sound/oss/oss-parameters.txt + delete mode 100644 arch/arm/configs/am3517_evm_defconfig + delete mode 100644 arch/arm/configs/cm_t35_defconfig + delete mode 100644 arch/arm/configs/devkit8000_defconfig + delete mode 100644 arch/arm/configs/igep0020_defconfig + delete mode 100644 arch/arm/configs/omap3_beagle_defconfig + delete mode 100644 arch/arm/configs/omap3_evm_defconfig + delete mode 100644 arch/arm/configs/omap3_pandora_defconfig + delete mode 100644 arch/arm/configs/omap3_stalker_lks_defconfig + delete mode 100644 arch/arm/configs/omap3_touchbook_defconfig + delete mode 100644 arch/arm/configs/omap_2430sdp_defconfig + delete mode 100644 arch/arm/configs/omap_3430sdp_defconfig + delete mode 100644 arch/arm/configs/omap_3630sdp_defconfig + delete mode 100644 arch/arm/configs/omap_apollon_2420_defconfig + delete mode 100644 arch/arm/configs/omap_h4_2420_defconfig + delete mode 100644 arch/arm/configs/omap_ldp_defconfig + delete mode 100644 arch/arm/configs/omap_zoom2_defconfig + delete mode 100644 arch/arm/configs/omap_zoom3_defconfig + delete mode 100644 arch/arm/configs/overo_defconfig + delete mode 100644 arch/arm/configs/rx51_defconfig + create mode 100644 arch/arm/mach-davinci/board-tnetv107x-evm.c + create mode 100644 arch/arm/mach-davinci/devices-tnetv107x.c + create mode 100644 arch/arm/mach-davinci/gpio-tnetv107x.c + create mode 100644 arch/arm/mach-davinci/include/mach/tnetv107x.h + create mode 100644 arch/arm/mach-davinci/tnetv107x.c + create mode 100644 arch/arm/mach-omap1/usb.c + rename arch/arm/mach-omap2/{board-sdp-flash.c => board-flash.c} (66%) + create mode 100644 arch/arm/mach-omap2/board-omap4panda.c + rename arch/arm/mach-omap2/include/mach/{board-sdp.h => board-flash.h} (71%) + create mode 100644 arch/arm/mach-omap2/include/mach/id.h + create mode 100644 arch/arm/mach-omap2/mux2420.c + create mode 100644 arch/arm/mach-omap2/mux2420.h + create mode 100644 arch/arm/mach-omap2/mux2430.c + create mode 100644 arch/arm/mach-omap2/mux2430.h + create mode 100644 arch/arm/mach-omap2/omap-hotplug.c + create mode 100644 arch/arm/mach-omap2/pm.c + create mode 100644 arch/arm/mach-omap2/pm44xx.c + create mode 100644 arch/arm/mach-omap2/usb-fs.c + create mode 100644 arch/arm/mach-tegra/Kconfig + create mode 100644 arch/arm/mach-tegra/Makefile + create mode 100644 arch/arm/mach-tegra/Makefile.boot + create mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c + create mode 100644 arch/arm/mach-tegra/board-harmony.c + create mode 100644 arch/arm/mach-tegra/board-harmony.h + create mode 100644 arch/arm/mach-tegra/board.h + create mode 100644 arch/arm/mach-tegra/clock.c + create mode 100644 arch/arm/mach-tegra/clock.h + create mode 100644 arch/arm/mach-tegra/common.c + create mode 100644 arch/arm/mach-tegra/gpio-names.h + create mode 100644 arch/arm/mach-tegra/gpio.c + create mode 100644 arch/arm/mach-tegra/headsmp.S + create mode 100644 arch/arm/mach-tegra/hotplug.c + create mode 100644 arch/arm/mach-tegra/include/mach/barriers.h + create mode 100644 arch/arm/mach-tegra/include/mach/clk.h + create mode 100644 arch/arm/mach-tegra/include/mach/clkdev.h + create mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-tegra/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-tegra/include/mach/gpio.h + create mode 100644 arch/arm/mach-tegra/include/mach/hardware.h + create mode 100644 arch/arm/mach-tegra/include/mach/io.h + create mode 100644 arch/arm/mach-tegra/include/mach/iomap.h + create mode 100644 arch/arm/mach-tegra/include/mach/irqs.h + create mode 100644 arch/arm/mach-tegra/include/mach/memory.h + create mode 100644 arch/arm/mach-tegra/include/mach/pinmux.h + create mode 100644 arch/arm/mach-tegra/include/mach/smp.h + create mode 100644 arch/arm/mach-tegra/include/mach/system.h + create mode 100644 arch/arm/mach-tegra/include/mach/timex.h + create mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h + create mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-tegra/io.c + create mode 100644 arch/arm/mach-tegra/irq.c + create mode 100644 arch/arm/mach-tegra/localtimer.c + create mode 100644 arch/arm/mach-tegra/pinmux.c + create mode 100644 arch/arm/mach-tegra/platsmp.c + create mode 100644 arch/arm/mach-tegra/tegra2_clocks.c + create mode 100644 arch/arm/mach-tegra/timer.c + delete mode 100644 arch/arm/plat-omap/include/plat/dsp_common.h + create mode 100644 arch/arm/plat-omap/include/plat/nokia-dsi-panel.h + create mode 100644 arch/arm/plat-orion/include/plat/audio.h + delete mode 100644 arch/cris/arch-v32/kernel/pinmux.c + create mode 100644 arch/cris/include/arch-v32/mach-fs/mach/dma.h + create mode 100644 arch/cris/include/arch-v32/mach-fs/mach/memmap.h + create mode 100644 arch/tile/Kbuild + create mode 100644 arch/tile/Kconfig + create mode 100644 arch/tile/Kconfig.debug + create mode 100644 arch/tile/Makefile + create mode 100644 arch/tile/configs/tile_defconfig + create mode 100644 arch/tile/include/arch/abi.h + create mode 100644 arch/tile/include/arch/chip.h + create mode 100644 arch/tile/include/arch/chip_tile64.h + create mode 100644 arch/tile/include/arch/chip_tilepro.h + create mode 100644 arch/tile/include/arch/icache.h + create mode 100644 arch/tile/include/arch/interrupts.h + create mode 100644 arch/tile/include/arch/interrupts_32.h + create mode 100644 arch/tile/include/arch/sim_def.h + create mode 100644 arch/tile/include/arch/spr_def.h + create mode 100644 arch/tile/include/arch/spr_def_32.h + create mode 100644 arch/tile/include/asm/Kbuild + create mode 100644 arch/tile/include/asm/asm-offsets.h + create mode 100644 arch/tile/include/asm/atomic.h + create mode 100644 arch/tile/include/asm/atomic_32.h + create mode 100644 arch/tile/include/asm/auxvec.h + create mode 100644 arch/tile/include/asm/backtrace.h + create mode 100644 arch/tile/include/asm/bitops.h + create mode 100644 arch/tile/include/asm/bitops_32.h + create mode 100644 arch/tile/include/asm/bitsperlong.h + create mode 100644 arch/tile/include/asm/bug.h + create mode 100644 arch/tile/include/asm/bugs.h + create mode 100644 arch/tile/include/asm/byteorder.h + create mode 100644 arch/tile/include/asm/cache.h + create mode 100644 arch/tile/include/asm/cacheflush.h + create mode 100644 arch/tile/include/asm/checksum.h + create mode 100644 arch/tile/include/asm/compat.h + create mode 100644 arch/tile/include/asm/cputime.h + create mode 100644 arch/tile/include/asm/current.h + create mode 100644 arch/tile/include/asm/delay.h + create mode 100644 arch/tile/include/asm/device.h + create mode 100644 arch/tile/include/asm/div64.h + create mode 100644 arch/tile/include/asm/dma-mapping.h + create mode 100644 arch/tile/include/asm/dma.h + create mode 100644 arch/tile/include/asm/elf.h + create mode 100644 arch/tile/include/asm/emergency-restart.h + create mode 100644 arch/tile/include/asm/errno.h + create mode 100644 arch/tile/include/asm/fcntl.h + create mode 100644 arch/tile/include/asm/fixmap.h + create mode 100644 arch/tile/include/asm/ftrace.h + create mode 100644 arch/tile/include/asm/futex.h + create mode 100644 arch/tile/include/asm/hardirq.h + create mode 100644 arch/tile/include/asm/hardwall.h + create mode 100644 arch/tile/include/asm/highmem.h + create mode 100644 arch/tile/include/asm/homecache.h + create mode 100644 arch/tile/include/asm/hugetlb.h + create mode 100644 arch/tile/include/asm/hv_driver.h + create mode 100644 arch/tile/include/asm/hw_irq.h + create mode 100644 arch/tile/include/asm/ide.h + create mode 100644 arch/tile/include/asm/io.h + create mode 100644 arch/tile/include/asm/ioctl.h + create mode 100644 arch/tile/include/asm/ioctls.h + create mode 100644 arch/tile/include/asm/ipc.h + create mode 100644 arch/tile/include/asm/ipcbuf.h + create mode 100644 arch/tile/include/asm/irq.h + create mode 100644 arch/tile/include/asm/irq_regs.h + create mode 100644 arch/tile/include/asm/irqflags.h + create mode 100644 arch/tile/include/asm/kdebug.h + create mode 100644 arch/tile/include/asm/kexec.h + create mode 100644 arch/tile/include/asm/kmap_types.h + create mode 100644 arch/tile/include/asm/linkage.h + create mode 100644 arch/tile/include/asm/local.h + create mode 100644 arch/tile/include/asm/memprof.h + create mode 100644 arch/tile/include/asm/mman.h + create mode 100644 arch/tile/include/asm/mmu.h + create mode 100644 arch/tile/include/asm/mmu_context.h + create mode 100644 arch/tile/include/asm/mmzone.h + create mode 100644 arch/tile/include/asm/module.h + create mode 100644 arch/tile/include/asm/msgbuf.h + create mode 100644 arch/tile/include/asm/mutex.h + create mode 100644 arch/tile/include/asm/opcode-tile.h + create mode 100644 arch/tile/include/asm/opcode-tile_32.h + create mode 100644 arch/tile/include/asm/opcode-tile_64.h + create mode 100644 arch/tile/include/asm/opcode_constants.h + create mode 100644 arch/tile/include/asm/opcode_constants_32.h + create mode 100644 arch/tile/include/asm/opcode_constants_64.h + create mode 100644 arch/tile/include/asm/page.h + create mode 100644 arch/tile/include/asm/param.h + create mode 100644 arch/tile/include/asm/pci-bridge.h + create mode 100644 arch/tile/include/asm/pci.h + create mode 100644 arch/tile/include/asm/percpu.h + create mode 100644 arch/tile/include/asm/pgalloc.h + create mode 100644 arch/tile/include/asm/pgtable.h + create mode 100644 arch/tile/include/asm/pgtable_32.h + create mode 100644 arch/tile/include/asm/poll.h + create mode 100644 arch/tile/include/asm/posix_types.h + create mode 100644 arch/tile/include/asm/processor.h + create mode 100644 arch/tile/include/asm/ptrace.h + create mode 100644 arch/tile/include/asm/resource.h + create mode 100644 arch/tile/include/asm/scatterlist.h + create mode 100644 arch/tile/include/asm/sections.h + create mode 100644 arch/tile/include/asm/sembuf.h + create mode 100644 arch/tile/include/asm/setup.h + create mode 100644 arch/tile/include/asm/shmbuf.h + create mode 100644 arch/tile/include/asm/shmparam.h + create mode 100644 arch/tile/include/asm/sigcontext.h + create mode 100644 arch/tile/include/asm/sigframe.h + create mode 100644 arch/tile/include/asm/siginfo.h + create mode 100644 arch/tile/include/asm/signal.h + create mode 100644 arch/tile/include/asm/smp.h + create mode 100644 arch/tile/include/asm/socket.h + create mode 100644 arch/tile/include/asm/sockios.h + create mode 100644 arch/tile/include/asm/spinlock.h + create mode 100644 arch/tile/include/asm/spinlock_32.h + create mode 100644 arch/tile/include/asm/spinlock_types.h + create mode 100644 arch/tile/include/asm/stack.h + create mode 100644 arch/tile/include/asm/stat.h + create mode 100644 arch/tile/include/asm/statfs.h + create mode 100644 arch/tile/include/asm/string.h + create mode 100644 arch/tile/include/asm/swab.h + create mode 100644 arch/tile/include/asm/syscall.h + create mode 100644 arch/tile/include/asm/syscalls.h + create mode 100644 arch/tile/include/asm/system.h + create mode 100644 arch/tile/include/asm/termbits.h + create mode 100644 arch/tile/include/asm/termios.h + create mode 100644 arch/tile/include/asm/thread_info.h + create mode 100644 arch/tile/include/asm/timex.h + create mode 100644 arch/tile/include/asm/tlb.h + create mode 100644 arch/tile/include/asm/tlbflush.h + create mode 100644 arch/tile/include/asm/topology.h + create mode 100644 arch/tile/include/asm/traps.h + create mode 100644 arch/tile/include/asm/types.h + create mode 100644 arch/tile/include/asm/uaccess.h + create mode 100644 arch/tile/include/asm/ucontext.h + create mode 100644 arch/tile/include/asm/unaligned.h + create mode 100644 arch/tile/include/asm/unistd.h + create mode 100644 arch/tile/include/asm/user.h + create mode 100644 arch/tile/include/asm/xor.h + create mode 100644 arch/tile/include/hv/drv_pcie_rc_intf.h + create mode 100644 arch/tile/include/hv/hypervisor.h + create mode 100644 arch/tile/include/hv/pagesize.h + create mode 100644 arch/tile/include/hv/syscall_public.h + create mode 100644 arch/tile/kernel/Makefile + create mode 100644 arch/tile/kernel/asm-offsets.c + create mode 100644 arch/tile/kernel/backtrace.c + create mode 100644 arch/tile/kernel/compat.c + create mode 100644 arch/tile/kernel/compat_signal.c + create mode 100644 arch/tile/kernel/early_printk.c + create mode 100644 arch/tile/kernel/entry.S + create mode 100644 arch/tile/kernel/hardwall.c + create mode 100644 arch/tile/kernel/head_32.S + create mode 100644 arch/tile/kernel/hvglue.lds + create mode 100644 arch/tile/kernel/init_task.c + create mode 100644 arch/tile/kernel/intvec_32.S + create mode 100644 arch/tile/kernel/irq.c + create mode 100644 arch/tile/kernel/machine_kexec.c + create mode 100644 arch/tile/kernel/messaging.c + create mode 100644 arch/tile/kernel/module.c + create mode 100644 arch/tile/kernel/pci-dma.c + create mode 100644 arch/tile/kernel/proc.c + create mode 100644 arch/tile/kernel/process.c + create mode 100644 arch/tile/kernel/ptrace.c + create mode 100644 arch/tile/kernel/reboot.c + create mode 100644 arch/tile/kernel/regs_32.S + create mode 100644 arch/tile/kernel/relocate_kernel.S + create mode 100644 arch/tile/kernel/setup.c + create mode 100644 arch/tile/kernel/signal.c + create mode 100644 arch/tile/kernel/single_step.c + create mode 100644 arch/tile/kernel/smp.c + create mode 100644 arch/tile/kernel/smpboot.c + create mode 100644 arch/tile/kernel/stack.c + create mode 100644 arch/tile/kernel/sys.c + create mode 100644 arch/tile/kernel/tile-desc_32.c + create mode 100644 arch/tile/kernel/time.c + create mode 100644 arch/tile/kernel/tlb.c + create mode 100644 arch/tile/kernel/traps.c + create mode 100644 arch/tile/kernel/vmlinux.lds.S + create mode 100644 arch/tile/lib/Makefile + create mode 100644 arch/tile/lib/atomic_32.c + create mode 100644 arch/tile/lib/atomic_asm_32.S + create mode 100644 arch/tile/lib/cacheflush.c + create mode 100644 arch/tile/lib/checksum.c + create mode 100644 arch/tile/lib/cpumask.c + create mode 100644 arch/tile/lib/delay.c + create mode 100644 arch/tile/lib/exports.c + create mode 100644 arch/tile/lib/mb_incoherent.S + create mode 100644 arch/tile/lib/memchr_32.c + create mode 100644 arch/tile/lib/memcpy_32.S + create mode 100644 arch/tile/lib/memcpy_tile64.c + create mode 100644 arch/tile/lib/memmove_32.c + create mode 100644 arch/tile/lib/memset_32.c + create mode 100644 arch/tile/lib/spinlock_32.c + create mode 100644 arch/tile/lib/spinlock_common.h + create mode 100644 arch/tile/lib/strchr_32.c + create mode 100644 arch/tile/lib/strlen_32.c + create mode 100644 arch/tile/lib/uaccess.c + create mode 100644 arch/tile/lib/usercopy_32.S + create mode 100644 arch/tile/mm/Makefile + create mode 100644 arch/tile/mm/elf.c + create mode 100644 arch/tile/mm/extable.c + create mode 100644 arch/tile/mm/fault.c + create mode 100644 arch/tile/mm/highmem.c + create mode 100644 arch/tile/mm/homecache.c + create mode 100644 arch/tile/mm/hugetlbpage.c + create mode 100644 arch/tile/mm/init.c + create mode 100644 arch/tile/mm/migrate.h + create mode 100644 arch/tile/mm/migrate_32.S + create mode 100644 arch/tile/mm/mmap.c + create mode 100644 arch/tile/mm/pgtable.c + create mode 100644 drivers/char/hvc_tile.c + create mode 100644 drivers/firewire/nosy-user.h + create mode 100644 drivers/firewire/nosy.c + create mode 100644 drivers/firewire/nosy.h + delete mode 100644 fs/nilfs2/bmap_union.h + create mode 100644 include/keys/dns_resolver-type.h + create mode 100644 include/linux/dns_resolver.h + delete mode 100644 include/linux/slow-work.h + delete mode 100644 include/trace/events/workqueue.h + delete mode 100644 kernel/slow-work-debugfs.c + delete mode 100644 kernel/slow-work.c + delete mode 100644 kernel/slow-work.h + create mode 100644 net/dns_resolver/Kconfig + create mode 100644 net/dns_resolver/Makefile + create mode 100644 net/dns_resolver/dns_key.c + create mode 100644 net/dns_resolver/dns_query.c + create mode 100644 net/dns_resolver/internal.h + create mode 100644 sound/soc/codecs/cs42l51.c + create mode 100644 sound/soc/codecs/cs42l51.h + create mode 100644 sound/soc/codecs/jz4740.c + create mode 100644 sound/soc/codecs/jz4740.h + create mode 100644 sound/soc/codecs/wm8741.c + create mode 100644 sound/soc/codecs/wm8741.h + create mode 100644 sound/soc/ep93xx/Kconfig + create mode 100644 sound/soc/ep93xx/Makefile + create mode 100644 sound/soc/ep93xx/ep93xx-i2s.c + create mode 100644 sound/soc/ep93xx/ep93xx-i2s.h + create mode 100644 sound/soc/ep93xx/ep93xx-pcm.c + create mode 100644 sound/soc/ep93xx/ep93xx-pcm.h + create mode 100644 sound/soc/ep93xx/snappercl15.c + delete mode 100644 sound/soc/fsl/mpc5200_psc_i2s.h + create mode 100644 sound/soc/imx/eukrea-tlv320.c + create mode 100644 sound/soc/jz4740/Kconfig + create mode 100644 sound/soc/jz4740/Makefile + create mode 100644 sound/soc/jz4740/jz4740-i2s.c + create mode 100644 sound/soc/jz4740/jz4740-i2s.h + create mode 100644 sound/soc/jz4740/jz4740-pcm.c + create mode 100644 sound/soc/jz4740/jz4740-pcm.h + create mode 100644 sound/soc/jz4740/qi_lb60.c + create mode 100644 sound/soc/kirkwood/Kconfig + create mode 100644 sound/soc/kirkwood/Makefile + create mode 100644 sound/soc/kirkwood/kirkwood-dma.c + create mode 100644 sound/soc/kirkwood/kirkwood-dma.h + create mode 100644 sound/soc/kirkwood/kirkwood-i2s.c + create mode 100644 sound/soc/kirkwood/kirkwood-i2s.h + create mode 100644 sound/soc/kirkwood/kirkwood-openrd.c + create mode 100644 sound/soc/kirkwood/kirkwood.h + create mode 100644 sound/soc/nuc900/Kconfig + create mode 100644 sound/soc/nuc900/Makefile + create mode 100644 sound/soc/nuc900/nuc900-ac97.c + create mode 100644 sound/soc/nuc900/nuc900-audio.c + create mode 100644 sound/soc/nuc900/nuc900-audio.h + create mode 100644 sound/soc/nuc900/nuc900-pcm.c + create mode 100644 sound/soc/s3c24xx/smartq_wm8987.c + create mode 100644 tools/firewire/Makefile + create mode 100644 tools/firewire/decode-fcp.c + create mode 100644 tools/firewire/list.h + create mode 100644 tools/firewire/nosy-dump.c + create mode 100644 tools/firewire/nosy-dump.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/boot/compressed/head.S | 5 +- + arch/arm/include/asm/hardware/coresight.h | 8 ++- + arch/arm/kernel/entry-common.S | 124 ++++++++++++++++++---------- + arch/arm/kernel/etm.c | 4 +- + arch/arm/plat-mxc/include/mach/gpio.h | 1 + + drivers/video/imxfb.c | 19 ++++- + 6 files changed, 109 insertions(+), 52 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 - + drivers/char/pcmcia/ipwireless/network.c | 2 +- + drivers/isdn/sc/ioctl.c | 10 +- + drivers/net/cxgb3/cxgb3_main.c | 25 +- + drivers/net/cxgb4vf/cxgb4vf_main.c | 31 +- + drivers/net/davinci_emac.c | 2 +- + drivers/net/enic/enic_main.c | 17 +- + drivers/net/ppp_async.c | 6 +- + drivers/net/ppp_synctty.c | 6 +- + drivers/net/pppoe.c | 4 +- + drivers/net/usb/usbnet.c | 1 - + drivers/net/via-velocity.c | 4 +- + drivers/net/virtio_net.c | 14 + + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 ++- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 18 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 388 +++++++++++++++++++++++- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 17 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 3 +- + drivers/net/wireless/ath/ath9k/calib.c | 118 ++++---- + drivers/net/wireless/ath/ath9k/calib.h | 8 +- + drivers/net/wireless/ath/ath9k/htc.h | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 10 +- + drivers/net/wireless/ath/ath9k/hw.c | 25 +- + drivers/net/wireless/ath/ath9k/hw.h | 25 +- + drivers/net/wireless/ath/ath9k/main.c | 104 ++++--- + drivers/net/wireless/ath/ath9k/recv.c | 10 +- + drivers/net/wireless/ath/ath9k/xmit.c | 36 +-- + drivers/net/wireless/ipw2x00/ipw2100.c | 4 + + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 6 +- + drivers/net/wireless/libertas/cfg.c | 214 ++++++++++--- + drivers/net/wireless/libertas/dev.h | 5 + + drivers/net/wireless/libertas/main.c | 1 + + drivers/net/wireless/p54/p54pci.c | 2 + + drivers/net/wireless/rt2x00/rt2x00pci.c | 21 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 2 + + drivers/net/wireless/wl12xx/wl1271_spi.c | 3 +- + include/linux/ppp_channel.h | 2 +- + include/linux/skbuff.h | 5 + + include/net/bluetooth/hci_core.h | 2 +- + net/atm/pppoatm.c | 2 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_sock.c | 8 +- + net/bluetooth/hci_sysfs.c | 3 +- + net/bluetooth/l2cap.c | 24 ++- + net/bluetooth/rfcomm/tty.c | 2 +- + net/core/dev.c | 5 +- + net/irda/irnet/irnet_ppp.c | 2 +- + net/l2tp/l2tp_ppp.c | 5 +- + net/mac80211/main.c | 2 + + net/mac80211/scan.c | 14 - + net/rxrpc/ar-ack.c | 3 + + net/rxrpc/ar-call.c | 6 +- + net/sched/act_nat.c | 23 +- + net/sched/cls_flow.c | 96 ++++--- + net/sched/cls_rsvp.h | 12 +- + net/sched/sch_sfq.c | 29 ++- + 65 files changed, 1045 insertions(+), 434 deletions(-) +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/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Merge made by recursive. + drivers/md/bitmap.c | 508 ++++++++++++++++++++++++++++----------------------- + drivers/md/bitmap.h | 6 + + drivers/md/md.c | 286 ++++++++++++++++++----------- + drivers/md/md.h | 55 ++++++- + drivers/md/raid10.c | 18 ++ + drivers/md/raid5.c | 168 ++++++++++------- + drivers/md/raid5.h | 9 +- + 7 files changed, 643 insertions(+), 407 deletions(-) +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Merge made by recursive. + crypto/Kconfig | 8 ++++---- + crypto/ahash.c | 7 +++++-- + crypto/algboss.c | 8 ++++---- + crypto/testmgr.c | 4 ++-- + 4 files changed, 15 insertions(+), 12 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Merge made by recursive. + drivers/ide/ide-cd.c | 14 +++++++++++--- + drivers/ide/via82cxxx.c | 2 +- + 2 files changed, 12 insertions(+), 4 deletions(-) +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging MAINTAINERS +Removing arch/arm/mach-pxa/e330.c +Removing arch/arm/mach-pxa/e350.c +Removing arch/arm/mach-pxa/e400.c +Removing arch/arm/mach-pxa/e740.c +Removing arch/arm/mach-pxa/e750.c +Removing arch/arm/mach-pxa/e800.c +Removing arch/arm/mach-pxa/imote2.c +Removing arch/arm/mach-pxa/include/mach/sharpsl.h +Removing arch/arm/mach-pxa/sharpsl.h +Removing arch/arm/plat-pxa/pmu.c +Auto-merging drivers/ata/Kconfig +Auto-merging drivers/ata/Makefile +Auto-merging drivers/pcmcia/Makefile +Auto-merging drivers/video/Kconfig +Removing include/linux/wm97xx_batt.h +Merge made by recursive. + MAINTAINERS | 21 +- + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/common/it8152.c | 8 - + arch/arm/include/asm/dma-mapping.h | 8 + + arch/arm/include/asm/elf.h | 2 + + arch/arm/include/asm/hardware/scoop.h | 29 +- + arch/arm/kernel/module.c | 34 + + arch/arm/mach-clps711x/include/mach/hardware.h | 7 - + arch/arm/mach-gemini/Kconfig | 21 + + arch/arm/mach-gemini/Makefile | 3 + + arch/arm/mach-gemini/board-nas4220b.c | 111 +++ + arch/arm/mach-gemini/board-wbd111.c | 143 +++ + arch/arm/mach-gemini/board-wbd222.c | 143 +++ + arch/arm/mach-h720x/include/mach/hardware.h | 2 - + arch/arm/mach-integrator/include/mach/hardware.h | 1 - + arch/arm/mach-ixp23xx/include/mach/hardware.h | 1 - + arch/arm/mach-mmp/aspenite.c | 6 +- + arch/arm/mach-mmp/avengers_lite.c | 3 +- + arch/arm/mach-mmp/common.c | 2 +- + arch/arm/mach-mmp/common.h | 11 +- + arch/arm/mach-mmp/flint.c | 3 +- + arch/arm/mach-mmp/include/mach/devices.h | 4 + + arch/arm/mach-mmp/include/mach/mmp2.h | 7 + + arch/arm/mach-mmp/include/mach/pxa168.h | 5 + + arch/arm/mach-mmp/include/mach/pxa910.h | 5 + + arch/arm/mach-mmp/irq-mmp2.c | 1 + + arch/arm/mach-mmp/jasper.c | 3 +- + arch/arm/mach-mmp/mmp2.c | 22 + + arch/arm/mach-mmp/tavorevb.c | 3 +- + arch/arm/mach-mmp/time.c | 21 - + arch/arm/mach-mmp/ttc_dkb.c | 3 +- + arch/arm/mach-pxa/Kconfig | 80 ++- + arch/arm/mach-pxa/Makefile | 13 +- + arch/arm/mach-pxa/balloon3.c | 732 ++++++++++++---- + arch/arm/mach-pxa/cm-x300.c | 4 +- + arch/arm/mach-pxa/colibri-pxa270-evalboard.c | 111 +++ + arch/arm/mach-pxa/colibri-pxa270-income.c | 272 ++++++ + arch/arm/mach-pxa/colibri-pxa270.c | 176 +++- + arch/arm/mach-pxa/colibri-pxa320.c | 40 + + arch/arm/mach-pxa/corgi.c | 5 +- + arch/arm/mach-pxa/corgi_pm.c | 11 +- + arch/arm/mach-pxa/devices.c | 14 + + arch/arm/mach-pxa/devices.h | 1 + + arch/arm/mach-pxa/e330.c | 78 -- + arch/arm/mach-pxa/e350.c | 79 -- + arch/arm/mach-pxa/e400.c | 155 ---- + arch/arm/mach-pxa/e740.c | 225 ----- + arch/arm/mach-pxa/e750.c | 226 ----- + arch/arm/mach-pxa/e800.c | 229 ----- + arch/arm/mach-pxa/eseries.c | 809 +++++++++++++++++ + arch/arm/mach-pxa/imote2.c | 590 ------------- + arch/arm/mach-pxa/include/mach/balloon3.h | 75 ++- + arch/arm/mach-pxa/include/mach/colibri.h | 32 +- + arch/arm/mach-pxa/include/mach/corgi.h | 5 - + arch/arm/mach-pxa/include/mach/gumstix.h | 12 +- + arch/arm/mach-pxa/include/mach/hardware.h | 5 - + arch/arm/mach-pxa/include/mach/palm27x.h | 81 ++ + arch/arm/mach-pxa/include/mach/pata_pxa.h | 33 + + arch/arm/mach-pxa/include/mach/sharpsl.h | 35 - + arch/arm/mach-pxa/include/mach/sharpsl_pm.h | 9 + + arch/arm/mach-pxa/include/mach/spitz.h | 2 - + arch/arm/mach-pxa/mioa701.c | 10 +- + arch/arm/mach-pxa/palm27x.c | 477 ++++++++++ + arch/arm/mach-pxa/palmld.c | 292 ++----- + arch/arm/mach-pxa/palmt5.c | 283 +------ + arch/arm/mach-pxa/palmte2.c | 20 +- + arch/arm/mach-pxa/palmtreo.c | 354 ++------- + arch/arm/mach-pxa/palmtx.c | 299 +------ + arch/arm/mach-pxa/palmz72.c | 264 +----- + arch/arm/mach-pxa/poodle.c | 2 - + arch/arm/mach-pxa/pxa25x.c | 1 + + arch/arm/mach-pxa/pxa27x.c | 1 + + arch/arm/mach-pxa/pxa3xx.c | 15 +- + arch/arm/mach-pxa/raumfeld.c | 29 +- + arch/arm/mach-pxa/sharpsl.h | 26 - + arch/arm/mach-pxa/sharpsl_pm.c | 23 - + arch/arm/mach-pxa/sleep.S | 7 - + arch/arm/mach-pxa/spitz.c | 727 +++++++++------- + arch/arm/mach-pxa/spitz_pm.c | 11 +- + arch/arm/mach-pxa/stargate2.c | 679 ++++++++++----- + arch/arm/mach-pxa/trizeps4.c | 6 +- + arch/arm/mach-pxa/vpac270.c | 126 +++- + arch/arm/mach-pxa/z2.c | 118 +++- + arch/arm/mach-sa1100/include/mach/irqs.h | 2 +- + arch/arm/mach-shmobile/Kconfig | 26 + + arch/arm/mach-shmobile/Makefile | 6 +- + arch/arm/mach-shmobile/board-ap4evb.c | 817 +++++++++++++++++- + arch/arm/mach-shmobile/board-g3evm.c | 59 ++- + arch/arm/mach-shmobile/board-g4evm.c | 153 +++- + arch/arm/mach-shmobile/clock-sh7367.c | 357 +++++++-- + arch/arm/mach-shmobile/clock-sh7372.c | 560 ++++++++++++ + arch/arm/mach-shmobile/clock-sh7377.c | 369 ++++++++ + arch/arm/mach-shmobile/clock.c | 44 + + arch/arm/mach-shmobile/include/mach/common.h | 10 + + arch/arm/mach-shmobile/include/mach/irqs.h | 6 + + arch/arm/mach-shmobile/include/mach/memory.h | 3 + + arch/arm/mach-shmobile/include/mach/sh7372.h | 30 + + arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +- + arch/arm/mach-shmobile/intc-sh7367.c | 178 ++++- + arch/arm/mach-shmobile/intc-sh7372.c | 232 +++++- + arch/arm/mach-shmobile/intc-sh7377.c | 300 +++++++- + arch/arm/mach-shmobile/pfc-sh7372.c | 3 + + arch/arm/mach-shmobile/setup-sh7367.c | 30 +- + arch/arm/mach-shmobile/setup-sh7372.c | 391 ++++++++- + arch/arm/mach-shmobile/setup-sh7377.c | 34 +- + arch/arm/mach-versatile/include/mach/hardware.h | 9 - + arch/arm/plat-pxa/Makefile | 1 - + arch/arm/plat-pxa/pmu.c | 33 - + arch/sh/boards/mach-ap325rxa/setup.c | 2 +- + arch/sh/boards/mach-kfr2r09/Makefile | 6 +- + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 2 +- + arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 16 +- + drivers/ata/Kconfig | 11 + + drivers/ata/Makefile | 2 + + drivers/ata/pata_pxa.c | 411 +++++++++ + drivers/dma/Kconfig | 2 +- + drivers/dma/shdma.c | 8 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 121 ++- + drivers/net/irda/sh_irda.c | 6 +- + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/pxa2xx_balloon3.c | 158 ++++ + drivers/power/wm97xx_battery.c | 16 - + drivers/serial/sh-sci.c | 42 +- + drivers/serial/sh-sci.h | 29 +- + drivers/sh/Makefile | 5 +- + drivers/sh/clk-cpg.c | 58 ++- + drivers/video/Kconfig | 15 + + drivers/video/Makefile | 2 + + drivers/video/sh_mipi_dsi.c | 505 +++++++++++ + drivers/video/sh_mobile_hdmi.c | 1028 ++++++++++++++++++++++ + drivers/video/sh_mobile_lcdcfb.c | 196 +++-- + include/linux/serial_core.h | 3 + + include/linux/sh_clk.h | 23 +- + include/linux/wm97xx_batt.h | 16 - + include/video/mipi_display.h | 130 +++ + include/video/sh_mipi_dsi.h | 35 + + include/video/sh_mobile_hdmi.h | 22 + + include/video/sh_mobile_lcdc.h | 41 +- + 140 files changed, 10826 insertions(+), 4290 deletions(-) + create mode 100644 arch/arm/mach-gemini/board-nas4220b.c + create mode 100644 arch/arm/mach-gemini/board-wbd111.c + create mode 100644 arch/arm/mach-gemini/board-wbd222.c + create mode 100644 arch/arm/mach-pxa/colibri-pxa270-evalboard.c + create mode 100644 arch/arm/mach-pxa/colibri-pxa270-income.c + delete mode 100644 arch/arm/mach-pxa/e330.c + delete mode 100644 arch/arm/mach-pxa/e350.c + delete mode 100644 arch/arm/mach-pxa/e400.c + delete mode 100644 arch/arm/mach-pxa/e740.c + delete mode 100644 arch/arm/mach-pxa/e750.c + delete mode 100644 arch/arm/mach-pxa/e800.c + delete mode 100644 arch/arm/mach-pxa/imote2.c + create mode 100644 arch/arm/mach-pxa/include/mach/palm27x.h + create mode 100644 arch/arm/mach-pxa/include/mach/pata_pxa.h + delete mode 100644 arch/arm/mach-pxa/include/mach/sharpsl.h + create mode 100644 arch/arm/mach-pxa/palm27x.c + delete mode 100644 arch/arm/mach-pxa/sharpsl.h + create mode 100644 arch/arm/mach-shmobile/clock-sh7372.c + create mode 100644 arch/arm/mach-shmobile/clock-sh7377.c + create mode 100644 arch/arm/mach-shmobile/clock.c + delete mode 100644 arch/arm/plat-pxa/pmu.c + create mode 100644 drivers/ata/pata_pxa.c + create mode 100644 drivers/pcmcia/pxa2xx_balloon3.c + create mode 100644 drivers/video/sh_mipi_dsi.c + create mode 100644 drivers/video/sh_mobile_hdmi.c + delete mode 100644 include/linux/wm97xx_batt.h + create mode 100644 include/video/mipi_display.h + create mode 100644 include/video/sh_mipi_dsi.h + create mode 100644 include/video/sh_mobile_hdmi.h +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 9 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 263 ++++++++++++++++++++ + arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx25/mach-cpuimx25.c | 4 +- + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 4 +- + arch/arm/plat-mxc/include/mach/eukrea-baseboards.h | 4 +- + 8 files changed, 281 insertions(+), 8 deletions(-) + create mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c +Merging msm/for-next +$ git merge msm/for-next +Auto-merging arch/arm/mach-msm/acpuclock-arm11.c +Auto-merging arch/arm/mach-msm/board-trout.c +Merge made by recursive. + arch/arm/mach-msm/Kconfig | 7 + + arch/arm/mach-msm/Makefile | 4 +- + arch/arm/mach-msm/acpuclock-arm11.c | 1 - + arch/arm/mach-msm/board-msm7x30.c | 28 ++- + arch/arm/mach-msm/board-qsd8x50.c | 27 ++- + arch/arm/mach-msm/board-trout-gpio.c | 115 +++++++++ + arch/arm/mach-msm/board-trout-mmc.c | 189 +++++++++++++++ + arch/arm/mach-msm/board-trout.c | 11 + + arch/arm/mach-msm/clock.c | 1 - + arch/arm/mach-msm/devices-msm7x30.c | 21 ++ + arch/arm/mach-msm/devices-qsd8x50.c | 21 ++ + arch/arm/mach-msm/devices.h | 33 +++ + arch/arm/mach-msm/gpio.c | 32 +++ + arch/arm/mach-msm/gpio_hw-7x30.h | 100 ++++++++ + arch/arm/mach-msm/gpio_hw-7xxx.h | 84 +++++++ + arch/arm/mach-msm/gpio_hw-8x50.h | 100 ++++++++ + arch/arm/mach-msm/gpio_hw.h | 35 +++ + arch/arm/mach-msm/include/mach/gpio.h | 2 + + arch/arm/mach-msm/msm7200a-gpio.c | 421 +++++++++++++++++++++++++++++++++ + arch/arm/mach-msm/msm7200a-gpio.h | 87 +++++++ + arch/arm/mach-msm/smd.c | 2 +- + drivers/mmc/host/msm_sdcc.c | 38 ++-- + drivers/video/msm/mddi.c | 4 +- + drivers/video/msm/mdp.c | 1 - + 24 files changed, 1334 insertions(+), 30 deletions(-) + create mode 100644 arch/arm/mach-msm/board-trout-mmc.c + create mode 100644 arch/arm/mach-msm/gpio_hw-7x30.h + create mode 100644 arch/arm/mach-msm/gpio_hw-7xxx.h + create mode 100644 arch/arm/mach-msm/gpio_hw-8x50.h + create mode 100644 arch/arm/mach-msm/gpio_hw.h + create mode 100644 arch/arm/mach-msm/msm7200a-gpio.c + create mode 100644 arch/arm/mach-msm/msm7200a-gpio.h +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next +$ git merge s5p/for-next +Recorded preimage for 'arch/arm/Kconfig' +Resolved 'arch/arm/mm/Kconfig' using previous resolution. +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Removing arch/arm/configs/s5pc110_defconfig +Auto-merging arch/arm/mm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/serial/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/Kconfig'. +[master 556f2d3] Merge remote branch 's5p/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 34 ++- + arch/arm/Makefile | 1 + + arch/arm/configs/s5pc110_defconfig | 66 --- + arch/arm/configs/s5pv210_defconfig | 5 + + arch/arm/mach-s3c64xx/Kconfig | 15 + + arch/arm/mach-s3c64xx/Makefile | 2 + + arch/arm/mach-s3c64xx/clock.c | 24 +- + arch/arm/mach-s3c64xx/dev-audio.c | 2 +- + arch/arm/mach-s3c64xx/dev-spi.c | 2 +- + arch/arm/mach-s3c64xx/gpiolib.c | 2 +- + arch/arm/mach-s3c64xx/include/mach/map.h | 6 + + arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 5 + + arch/arm/mach-s3c64xx/mach-smdk6410.c | 33 ++ + arch/arm/mach-s3c64xx/s3c6410.c | 6 +- + arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 2 +- + arch/arm/mach-s3c64xx/setup-i2c0.c | 2 +- + arch/arm/mach-s3c64xx/setup-i2c1.c | 2 +- + arch/arm/mach-s3c64xx/setup-ide.c | 46 ++ + arch/arm/mach-s3c64xx/setup-keypad.c | 34 ++ + arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | 17 +- + arch/arm/mach-s5p6440/Kconfig | 13 +- + arch/arm/mach-s5p6440/Makefile | 1 + + arch/arm/mach-s5p6440/cpu.c | 3 +- + arch/arm/mach-s5p6440/dev-audio.c | 2 +- + arch/arm/mach-s5p6440/dev-spi.c | 2 +- + arch/arm/mach-s5p6440/gpio.c | 4 +- + arch/arm/mach-s5p6440/include/mach/irqs.h | 2 +- + arch/arm/mach-s5p6440/include/mach/map.h | 4 +- + arch/arm/mach-s5p6440/include/mach/system.h | 7 +- + arch/arm/mach-s5p6440/mach-smdk6440.c | 51 ++- + arch/arm/mach-s5p6440/setup-i2c0.c | 7 +- + arch/arm/mach-s5p6440/setup-i2c1.c | 30 ++ + arch/arm/mach-s5p6442/Kconfig | 1 + + arch/arm/mach-s5p6442/clock.c | 6 + + arch/arm/mach-s5p6442/dev-audio.c | 2 +- + arch/arm/mach-s5p6442/dev-spi.c | 2 +- + arch/arm/mach-s5p6442/include/mach/irqs.h | 2 +- + arch/arm/mach-s5p6442/include/mach/map.h | 3 + + arch/arm/mach-s5p6442/include/mach/system.h | 7 +- + arch/arm/mach-s5p6442/mach-smdk6442.c | 25 +- + arch/arm/mach-s5pc100/Kconfig | 20 +- + arch/arm/mach-s5pc100/Makefile | 2 + + arch/arm/mach-s5pc100/clock.c | 8 +- + arch/arm/mach-s5pc100/cpu.c | 5 + + arch/arm/mach-s5pc100/dev-audio.c | 2 +- + arch/arm/mach-s5pc100/dev-spi.c | 2 +- + arch/arm/mach-s5pc100/include/mach/irqs.h | 4 +- + arch/arm/mach-s5pc100/include/mach/map.h | 21 + + arch/arm/mach-s5pc100/include/mach/regs-clock.h | 3 + + arch/arm/mach-s5pc100/include/mach/system.h | 9 +- + arch/arm/mach-s5pc100/mach-smdkc100.c | 75 +++- + arch/arm/mach-s5pc100/setup-ide.c | 70 +++ + arch/arm/mach-s5pc100/setup-keypad.c | 34 ++ + arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 22 +- + arch/arm/mach-s5pc100/setup-sdhci.c | 8 +- + arch/arm/mach-s5pv210/Kconfig | 81 +++- + arch/arm/mach-s5pv210/Makefile | 2 + + arch/arm/mach-s5pv210/cpu.c | 29 +- + arch/arm/mach-s5pv210/dev-audio.c | 2 +- + arch/arm/mach-s5pv210/dev-onenand.c | 7 +- + arch/arm/mach-s5pv210/dev-spi.c | 2 +- + arch/arm/mach-s5pv210/gpiolib.c | 14 + + arch/arm/mach-s5pv210/include/mach/gpio.h | 12 +- + arch/arm/mach-s5pv210/include/mach/irqs.h | 4 +- + arch/arm/mach-s5pv210/include/mach/map.h | 16 + + arch/arm/mach-s5pv210/include/mach/memory.h | 9 +- + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 2 + + arch/arm/mach-s5pv210/include/mach/system.h | 7 +- + arch/arm/mach-s5pv210/mach-aquila.c | 409 ++++++++++++++++- + arch/arm/mach-s5pv210/mach-goni.c | 434 +++++++++++++++++- + arch/arm/mach-s5pv210/mach-smdkc110.c | 66 ++- + arch/arm/mach-s5pv210/mach-smdkv210.c | 93 +++- + arch/arm/mach-s5pv210/setup-fb-24bpp.c | 2 +- + arch/arm/mach-s5pv210/setup-i2c0.c | 2 +- + arch/arm/mach-s5pv210/setup-i2c1.c | 2 +- + arch/arm/mach-s5pv210/setup-i2c2.c | 2 +- + arch/arm/mach-s5pv210/setup-ide.c | 50 ++ + arch/arm/mach-s5pv210/setup-keypad.c | 34 ++ + arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 44 ++- + arch/arm/mach-s5pv210/setup-sdhci.c | 4 +- + arch/arm/mach-s5pv310/Kconfig | 45 ++ + arch/arm/mach-s5pv310/Makefile | 30 ++ + arch/arm/mach-s5pv310/Makefile.boot | 2 + + arch/arm/mach-s5pv310/clock.c | 544 ++++++++++++++++++++++ + arch/arm/mach-s5pv310/cpu.c | 122 +++++ + arch/arm/mach-s5pv310/headsmp.S | 41 ++ + arch/arm/mach-s5pv310/include/mach/debug-macro.S | 36 ++ + arch/arm/mach-s5pv310/include/mach/entry-macro.S | 84 ++++ + arch/arm/mach-s5pv310/include/mach/gpio.h | 135 ++++++ + arch/arm/mach-s5pv310/include/mach/hardware.h | 18 + + arch/arm/mach-s5pv310/include/mach/io.h | 26 + + arch/arm/mach-s5pv310/include/mach/irqs.h | 74 +++ + arch/arm/mach-s5pv310/include/mach/map.h | 69 +++ + arch/arm/mach-s5pv310/include/mach/memory.h | 22 + + arch/arm/mach-s5pv310/include/mach/pwm-clock.h | 70 +++ + arch/arm/mach-s5pv310/include/mach/regs-clock.h | 62 +++ + arch/arm/mach-s5pv310/include/mach/regs-irq.h | 19 + + arch/arm/mach-s5pv310/include/mach/smp.h | 29 ++ + arch/arm/mach-s5pv310/include/mach/system.h | 22 + + arch/arm/mach-s5pv310/include/mach/timex.h | 29 ++ + arch/arm/mach-s5pv310/include/mach/uncompress.h | 30 ++ + arch/arm/mach-s5pv310/include/mach/vmalloc.h | 22 + + arch/arm/mach-s5pv310/init.c | 41 ++ + arch/arm/mach-s5pv310/irq-combiner.c | 125 +++++ + arch/arm/mach-s5pv310/localtimer.c | 25 + + arch/arm/mach-s5pv310/mach-smdkv310.c | 92 ++++ + arch/arm/mach-s5pv310/mach-universal_c210.c | 86 ++++ + arch/arm/mach-s5pv310/platsmp.c | 192 ++++++++ + arch/arm/mach-s5pv310/setup-i2c0.c | 28 ++ + arch/arm/mach-s5pv310/setup-i2c1.c | 25 + + arch/arm/mach-s5pv310/setup-i2c2.c | 25 + + arch/arm/mach-s5pv310/time.c | 287 ++++++++++++ + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-s5p/Kconfig | 5 +- + arch/arm/plat-s5p/Makefile | 6 + + arch/arm/plat-s5p/cpu.c | 19 +- + arch/arm/plat-s5p/dev-fimc0.c | 36 ++ + arch/arm/plat-s5p/dev-fimc1.c | 36 ++ + arch/arm/plat-s5p/dev-fimc2.c | 36 ++ + arch/arm/plat-s5p/dev-pmu.c | 36 ++ + arch/arm/plat-s5p/include/plat/map-s5p.h | 23 +- + arch/arm/plat-s5p/include/plat/pll.h | 41 ++ + arch/arm/plat-s5p/include/plat/reset.h | 16 + + arch/arm/plat-s5p/include/plat/s5pv310.h | 34 ++ + arch/arm/plat-s5p/include/plat/system-reset.h | 31 ++ + arch/arm/plat-s5p/irq.c | 2 + + arch/arm/plat-samsung/Kconfig | 15 + + arch/arm/plat-samsung/Makefile | 7 +- + arch/arm/plat-samsung/dev-hsmmc.c | 5 + + arch/arm/plat-samsung/dev-hsmmc1.c | 5 + + arch/arm/plat-samsung/dev-hsmmc2.c | 5 + + arch/arm/plat-samsung/dev-hsmmc3.c | 77 +++ + arch/arm/plat-samsung/dev-ide.c | 44 ++ + arch/arm/plat-samsung/dev-keypad.c | 50 ++ + arch/arm/plat-samsung/dev-wdt.c | 2 +- + arch/arm/plat-samsung/gpiolib.c | 2 +- + arch/arm/plat-samsung/include/plat/adc-core.h | 28 ++ + arch/arm/plat-samsung/include/plat/ata-core.h | 28 ++ + arch/arm/plat-samsung/include/plat/ata.h | 36 ++ + arch/arm/plat-samsung/include/plat/devs.h | 20 + + arch/arm/plat-samsung/include/plat/fimc-core.h | 44 ++ + arch/arm/plat-samsung/include/plat/keypad-core.h | 31 ++ + arch/arm/plat-samsung/include/plat/keypad.h | 13 + + arch/arm/plat-samsung/include/plat/regs-ata.h | 56 +++ + arch/arm/plat-samsung/include/plat/regs-rtc.h | 3 + + arch/arm/plat-samsung/include/plat/regs-serial.h | 2 + + arch/arm/plat-samsung/include/plat/sdhci.h | 127 +++--- + arch/arm/plat-samsung/platformdata.c | 37 ++ + drivers/i2c/busses/Kconfig | 11 +- + drivers/rtc/Kconfig | 9 +- + drivers/rtc/rtc-s3c.c | 44 ++- + drivers/serial/Kconfig | 4 +- + drivers/serial/s5pv210.c | 8 + + drivers/serial/samsung.c | 9 +- + 154 files changed, 5222 insertions(+), 374 deletions(-) + delete mode 100644 arch/arm/configs/s5pc110_defconfig + create mode 100644 arch/arm/mach-s3c64xx/setup-ide.c + create mode 100644 arch/arm/mach-s3c64xx/setup-keypad.c + create mode 100644 arch/arm/mach-s5p6440/setup-i2c1.c + create mode 100644 arch/arm/mach-s5pc100/setup-ide.c + create mode 100644 arch/arm/mach-s5pc100/setup-keypad.c + create mode 100644 arch/arm/mach-s5pv210/setup-ide.c + create mode 100644 arch/arm/mach-s5pv210/setup-keypad.c + create mode 100644 arch/arm/mach-s5pv310/Kconfig + create mode 100644 arch/arm/mach-s5pv310/Makefile + create mode 100644 arch/arm/mach-s5pv310/Makefile.boot + create mode 100644 arch/arm/mach-s5pv310/clock.c + create mode 100644 arch/arm/mach-s5pv310/cpu.c + create mode 100644 arch/arm/mach-s5pv310/headsmp.S + create mode 100644 arch/arm/mach-s5pv310/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-s5pv310/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s5pv310/include/mach/gpio.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/hardware.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/io.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/irqs.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/map.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/memory.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/pwm-clock.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-clock.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-irq.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/smp.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/system.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/timex.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/uncompress.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-s5pv310/init.c + create mode 100644 arch/arm/mach-s5pv310/irq-combiner.c + create mode 100644 arch/arm/mach-s5pv310/localtimer.c + create mode 100644 arch/arm/mach-s5pv310/mach-smdkv310.c + create mode 100644 arch/arm/mach-s5pv310/mach-universal_c210.c + create mode 100644 arch/arm/mach-s5pv310/platsmp.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c0.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c1.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c2.c + create mode 100644 arch/arm/mach-s5pv310/time.c + create mode 100644 arch/arm/plat-s5p/dev-fimc0.c + create mode 100644 arch/arm/plat-s5p/dev-fimc1.c + create mode 100644 arch/arm/plat-s5p/dev-fimc2.c + create mode 100644 arch/arm/plat-s5p/dev-pmu.c + create mode 100644 arch/arm/plat-s5p/include/plat/reset.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5pv310.h + create mode 100644 arch/arm/plat-s5p/include/plat/system-reset.h + create mode 100644 arch/arm/plat-samsung/dev-hsmmc3.c + create mode 100644 arch/arm/plat-samsung/dev-ide.c + create mode 100644 arch/arm/plat-samsung/dev-keypad.c + create mode 100644 arch/arm/plat-samsung/include/plat/adc-core.h + create mode 100644 arch/arm/plat-samsung/include/plat/ata-core.h + create mode 100644 arch/arm/plat-samsung/include/plat/ata.h + create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h + create mode 100644 arch/arm/plat-samsung/include/plat/keypad-core.h + create mode 100644 arch/arm/plat-samsung/include/plat/regs-ata.h + create mode 100644 arch/arm/plat-samsung/platformdata.c +Merging tegra/for-next +$ git merge tegra/for-next +Recorded preimage for 'arch/arm/Kconfig' +Recorded preimage for 'arch/arm/mm/Kconfig' +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/mm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/Kconfig'. +Recorded resolution for 'arch/arm/mm/Kconfig'. +[master 0570294] Merge remote branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/tegra_defconfig | 1095 ++++++++++++++++++++++++++++++++++++++ + 1 files changed, 1095 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/configs/tegra_defconfig +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Removing Documentation/blackfin/Filesystems +Removing Documentation/blackfin/cachefeatures.txt +Auto-merging arch/blackfin/Kconfig +Merge made by recursive. + Documentation/blackfin/00-INDEX | 11 +- + Documentation/blackfin/Filesystems | 169 --------------- + Documentation/blackfin/bfin-spi-notes.txt | 14 ++ + Documentation/blackfin/cachefeatures.txt | 55 ----- + arch/blackfin/Kconfig | 20 ++- + arch/blackfin/Makefile | 3 +- + arch/blackfin/boot/Makefile | 11 +- + arch/blackfin/configs/BF518F-EZBRD_defconfig | 163 +++++++++------ + arch/blackfin/configs/BF526-EZBRD_defconfig | 129 +++++++++--- + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 149 ++++++++++---- + arch/blackfin/configs/BF527-EZKIT_defconfig | 139 +++++++++--- + arch/blackfin/configs/BF533-EZKIT_defconfig | 93 +++++++-- + arch/blackfin/configs/BF533-STAMP_defconfig | 131 ++++++++---- + arch/blackfin/configs/BF537-STAMP_defconfig | 141 +++++++++---- + arch/blackfin/configs/BF538-EZKIT_defconfig | 121 ++++++++--- + arch/blackfin/configs/BF548-EZKIT_defconfig | 156 ++++++++++---- + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 85 +++++++- + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 123 ++++++++--- + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/include/asm/bfin_rotary.h | 74 +++++++- + arch/blackfin/include/asm/bfin_sdh.h | 119 ++++++++++- + arch/blackfin/include/asm/bitops.h | 2 +- + arch/blackfin/include/asm/cdef_LPBlackfin.h | 8 +- + arch/blackfin/include/asm/def_LPBlackfin.h | 18 ++ + arch/blackfin/include/asm/dma.h | 1 + + arch/blackfin/include/asm/elf.h | 1 + + arch/blackfin/include/asm/ftrace.h | 16 ++ + arch/blackfin/include/asm/gpio.h | 111 +++++----- + arch/blackfin/include/asm/io.h | 8 +- + arch/blackfin/include/asm/mem_init.h | 18 -- + arch/blackfin/include/asm/portmux.h | 10 +- + arch/blackfin/kernel/Makefile | 1 + + arch/blackfin/kernel/bfin_dma_5xx.c | 19 ++- + arch/blackfin/kernel/bfin_gpio.c | 111 +++++----- + arch/blackfin/kernel/cplb-mpu/cplbinit.c | 4 - + arch/blackfin/kernel/ftrace-entry.S | 85 +++++++- + arch/blackfin/kernel/ftrace.c | 86 ++++++++- + arch/blackfin/kernel/setup.c | 7 + + arch/blackfin/kernel/vmlinux.lds.S | 7 +- + arch/blackfin/mach-bf518/Kconfig | 61 ++++++ + arch/blackfin/mach-bf518/include/mach/anomaly.h | 21 ++- + arch/blackfin/mach-bf518/include/mach/bf518.h | 105 +++++++++ + arch/blackfin/mach-bf518/include/mach/defBF514.h | 135 ------------ + .../mach-bf518/include/mach/defBF51x_base.h | 144 ++----------- + arch/blackfin/mach-bf518/include/mach/gpio.h | 83 ++++---- + arch/blackfin/mach-bf518/include/mach/portmux.h | 7 +- + arch/blackfin/mach-bf527/Kconfig | 66 ++++++ + arch/blackfin/mach-bf527/include/mach/anomaly.h | 22 ++- + arch/blackfin/mach-bf527/include/mach/bf527.h | 120 +++++++++++ + .../mach-bf527/include/mach/defBF52x_base.h | 225 ++------------------ + arch/blackfin/mach-bf527/include/mach/gpio.h | 96 ++++---- + arch/blackfin/mach-bf527/include/mach/portmux.h | 3 +- + arch/blackfin/mach-bf533/include/mach/anomaly.h | 10 +- + arch/blackfin/mach-bf533/include/mach/gpio.h | 32 ++-- + arch/blackfin/mach-bf533/include/mach/portmux.h | 3 +- + arch/blackfin/mach-bf537/include/mach/anomaly.h | 11 +- + arch/blackfin/mach-bf537/include/mach/defBF534.h | 36 ++-- + arch/blackfin/mach-bf537/include/mach/gpio.h | 96 ++++---- + arch/blackfin/mach-bf537/include/mach/portmux.h | 7 +- + arch/blackfin/mach-bf538/include/mach/anomaly.h | 16 +- + arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 64 ------ + arch/blackfin/mach-bf538/include/mach/defBF539.h | 14 +- + arch/blackfin/mach-bf538/include/mach/gpio.h | 108 +++++----- + arch/blackfin/mach-bf538/include/mach/portmux.h | 1 + + arch/blackfin/mach-bf548/include/mach/anomaly.h | 16 +- + .../mach-bf548/include/mach/cdefBF54x_base.h | 16 +- + arch/blackfin/mach-bf548/include/mach/defBF542.h | 130 ----------- + arch/blackfin/mach-bf548/include/mach/defBF544.h | 6 +- + arch/blackfin/mach-bf548/include/mach/defBF547.h | 136 +------------ + .../mach-bf548/include/mach/defBF54x_base.h | 152 +------------- + arch/blackfin/mach-bf548/include/mach/gpio.h | 10 + + arch/blackfin/mach-bf548/include/mach/portmux.h | 3 +- + arch/blackfin/mach-bf561/include/mach/anomaly.h | 13 +- + arch/blackfin/mach-bf561/include/mach/gpio.h | 96 ++++---- + arch/blackfin/mach-bf561/include/mach/portmux.h | 3 +- + arch/blackfin/mach-common/arch_checks.c | 16 +- + arch/blackfin/mach-common/cache.S | 15 +- + arch/blackfin/mach-common/dpmc_modes.S | 24 -- + arch/blackfin/mach-common/pm.c | 17 +- + 87 files changed, 2477 insertions(+), 2090 deletions(-) + delete mode 100644 Documentation/blackfin/Filesystems + create mode 100644 Documentation/blackfin/bfin-spi-notes.txt + delete mode 100644 Documentation/blackfin/cachefeatures.txt +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already uptodate! +Merge made by recursive. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/mac/config.c | 9 +++++++++ + arch/m68k/mac/misc.c | 6 +++--- + arch/m68k/sun3/leds.c | 4 ++-- + drivers/zorro/proc.c | 17 +++++++++-------- + 4 files changed, 23 insertions(+), 13 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/ide.h | 13 +++++++++++-- + arch/m68knommu/kernel/process.c | 10 +++++----- + drivers/serial/68328serial.c | 8 -------- + drivers/spi/coldfire_qspi.c | 1 + + 4 files changed, 17 insertions(+), 15 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Merge made by recursive. + arch/powerpc/include/asm/mpc52xx.h | 1 + + arch/powerpc/include/asm/mpc52xx_psc.h | 1 + + arch/powerpc/kernel/setup-common.c | 2 + + arch/powerpc/platforms/52xx/mpc52xx_common.c | 106 ++++++++++++++++++++++++++ + sound/soc/fsl/mpc5200_psc_ac97.c | 22 +++++- + 5 files changed, 128 insertions(+), 4 deletions(-) +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/ccwdev.h | 2 + + arch/s390/include/asm/topology.h | 2 - + arch/s390/kernel/head.S | 2 +- + arch/s390/mm/cmm.c | 11 +++++- + drivers/s390/block/dasd_eckd.c | 73 +++++++++++++++++++++++++++++++------- + drivers/s390/cio/ccwreq.c | 16 +++++++-- + drivers/s390/cio/chsc.c | 48 +++++++++++++++++++++++++ + drivers/s390/cio/chsc.h | 2 + + drivers/s390/cio/device.c | 47 ++++++++++++++++++++++-- + drivers/s390/cio/device_pgid.c | 3 ++ + drivers/s390/cio/io_sch.h | 10 +++-- + drivers/s390/net/smsgiucv_app.c | 7 ++++ + 12 files changed, 194 insertions(+), 29 deletions(-) +Merging sh/master +$ git merge sh/master +Resolved 'drivers/Makefile' using previous resolution. +Auto-merging arch/sh/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/i2c/busses/i2c-sh_mobile.c +Auto-merging drivers/serial/sh-sci.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6915960] Merge remote branch 'sh/master' +$ git diff -M --stat --summary HEAD^.. + arch/sh/Kconfig | 3 +- + arch/sh/boards/Kconfig | 16 + + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-sh2007.c | 133 +++ + arch/sh/boards/board-sh7757lcr.c | 374 +++++++ + arch/sh/configs/sh2007_defconfig | 1357 +++++++++++++++++++++++++ + arch/sh/configs/sh7757lcr_defconfig | 1126 ++++++++++++++++++++ + arch/sh/drivers/dma/dma-api.c | 4 +- + arch/sh/drivers/pci/pci-sh7751.c | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/sh/include/asm/Kbuild | 2 + + arch/sh/include/asm/elf.h | 27 +- + arch/sh/include/asm/fixmap.h | 4 +- + arch/sh/include/asm/irq.h | 2 +- + arch/sh/include/asm/kprobes.h | 1 - + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/include/asm/processor_64.h | 3 - + arch/sh/include/asm/ptrace.h | 169 ++-- + arch/sh/include/asm/ptrace_32.h | 83 ++ + arch/sh/include/asm/ptrace_64.h | 20 + + arch/sh/include/asm/system_32.h | 13 +- + arch/sh/include/asm/tlbflush.h | 2 + + arch/sh/include/cpu-sh4/cpu/sh7757.h | 301 +++--- + arch/sh/include/mach-common/mach/sh2007.h | 117 +++ + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/cpu/sh4/probe.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 199 ++-- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 1582 +++++++++++++++++------------ + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 66 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 +++-- + arch/sh/kernel/kprobes.c | 100 +- + arch/sh/kernel/ptrace.c | 33 + + arch/sh/kernel/ptrace_32.c | 27 + + arch/sh/kernel/ptrace_64.c | 79 ++ + arch/sh/kernel/reboot.c | 4 + + arch/sh/mm/consistent.c | 3 +- + arch/sh/mm/init.c | 52 +- + arch/sh/mm/tlbflush_32.c | 16 + + arch/sh/mm/tlbflush_64.c | 5 + + arch/sh/tools/mach-types | 2 + + drivers/Makefile | 2 +- + drivers/clocksource/sh_cmt.c | 12 +- + drivers/i2c/busses/i2c-sh_mobile.c | 23 +- + drivers/serial/sh-sci.h | 17 +- + drivers/sh/clk.c | 17 +- + sound/soc/sh/siu_pcm.c | 2 + + 47 files changed, 5042 insertions(+), 1193 deletions(-) + create mode 100644 arch/sh/boards/board-sh2007.c + create mode 100644 arch/sh/boards/board-sh7757lcr.c + create mode 100644 arch/sh/configs/sh2007_defconfig + create mode 100644 arch/sh/configs/sh7757lcr_defconfig + create mode 100644 arch/sh/include/asm/ptrace_32.h + create mode 100644 arch/sh/include/asm/ptrace_64.h + create mode 100644 arch/sh/include/mach-common/mach/sh2007.h + create mode 100644 arch/sh/kernel/ptrace.c +Merging genesis/master +$ git merge genesis/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7a472e4] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Merge made by recursive. + fs/ceph/Kconfig | 10 + + fs/ceph/Makefile | 2 +- + fs/ceph/README | 1 + + fs/ceph/addr.c | 2 +- + fs/ceph/armor.c | 6 +- + fs/ceph/auth.c | 6 +- + fs/ceph/auth_x.c | 6 +- + fs/ceph/buffer.c | 16 - + fs/ceph/caps.c | 282 ++++---- + fs/ceph/ceph_frag.h | 4 +- + fs/ceph/ceph_fs.c | 50 +- + fs/ceph/ceph_fs.h | 38 +- + fs/ceph/ceph_hash.h | 4 +- + fs/ceph/ceph_strings.c | 1 + + fs/ceph/crush/crush.h | 4 +- + fs/ceph/crush/hash.h | 4 +- + fs/ceph/crush/mapper.h | 4 +- + fs/ceph/crypto.c | 27 +- + fs/ceph/crypto.h | 4 +- + fs/ceph/debugfs.c | 15 +- + fs/ceph/decode.h | 11 +- + fs/ceph/dir.c | 2 + + fs/ceph/file.c | 72 ++- + fs/ceph/inode.c | 5 +- + fs/ceph/ioctl.c | 24 + + fs/ceph/ioctl.h | 2 + + fs/ceph/mds_client.c | 169 ++++- + fs/ceph/mds_client.h | 30 +- + fs/ceph/mdsmap.c | 6 +- + fs/ceph/mdsmap.h | 8 + + fs/ceph/messenger.c | 229 +++++- + fs/ceph/messenger.h | 4 + + fs/ceph/mon_client.c | 173 ++++- + fs/ceph/mon_client.h | 5 + + fs/ceph/msgr.h | 4 +- + fs/ceph/osd_client.c | 362 ++++++++-- + fs/ceph/osd_client.h | 67 ++ + fs/ceph/osdmap.c | 20 +- + fs/ceph/osdmap.h | 2 + + fs/ceph/pagelist.c | 2 +- + fs/ceph/pagelist.h | 2 +- + fs/ceph/rados.h | 13 +- + fs/ceph/rbd.c | 1830 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ceph/rbd.h | 8 + + fs/ceph/rbd_types.h | 71 ++ + fs/ceph/super.c | 276 ++++++-- + fs/ceph/super.h | 66 ++- + fs/ceph/xattr.c | 2 + + 48 files changed, 3433 insertions(+), 518 deletions(-) + create mode 100644 fs/ceph/rbd.c + create mode 100644 fs/ceph/rbd.h + create mode 100644 fs/ceph/rbd_types.h +$ git am -3 ../patches/0001-ceph-update-for-removal-of-request-flag-wrappers.patch +Applying: ceph: update for removal of request flag wrappers +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ceph/rbd.c +$ git add . +$ git commit -v -a --amend +[master 38e1e58] Merge remote branch 'ceph/for-next' +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/file.c | 56 +++++++++++++++++++++++++++++----------------- + fs/ecryptfs/inode.c | 5 ++- + fs/ecryptfs/messaging.c | 2 +- + 3 files changed, 39 insertions(+), 24 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3585985] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. + fs/logfs/dir.c | 2 +- + fs/logfs/file.c | 6 +++--- + fs/logfs/logfs.h | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/acl.c | 33 +++++++++++-- + fs/ocfs2/cluster/tcp.c | 17 +++++-- + fs/ocfs2/dlm/dlmmaster.c | 9 +--- + fs/ocfs2/dlm/dlmrecovery.c | 22 ++++----- + fs/ocfs2/dlm/dlmthread.c | 114 +++++++++++++++++++++----------------------- + fs/ocfs2/refcounttree.c | 20 ++++++-- + 6 files changed, 122 insertions(+), 93 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Merge made by recursive. + fs/omfs/dir.c | 22 ++++++++-------------- + fs/omfs/file.c | 10 +++++----- + fs/omfs/inode.c | 44 +++++++++++++++++++++++++++++++++----------- + fs/omfs/omfs.h | 1 + + fs/omfs/omfs_fs.h | 1 + + 5 files changed, 48 insertions(+), 30 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Merge made by recursive. + Documentation/filesystems/squashfs.txt | 2 +- + fs/squashfs/Kconfig | 25 +++++- + fs/squashfs/Makefile | 4 +- + fs/squashfs/decompressor.c | 6 ++ + fs/squashfs/lzo_wrapper.c | 136 ++++++++++++++++++++++++++++++++ + fs/squashfs/squashfs.h | 3 + + fs/squashfs/xattr.c | 4 +- + fs/squashfs/xattr.h | 2 +- + 8 files changed, 171 insertions(+), 11 deletions(-) + create mode 100644 fs/squashfs/lzo_wrapper.c +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Resolved 'fs/nilfs2/super.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_aops.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. +Auto-merging drivers/staging/pohmelfs/inode.c +Auto-merging fs/9p/v9fs_vfs.h +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_super.c +Auto-merging fs/block_dev.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/compat.c +Auto-merging fs/direct-io.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/xattr.c +Auto-merging fs/freevxfs/vxfs_super.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +Auto-merging fs/ncpfs/inode.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nilfs2/dir.c +Auto-merging fs/nilfs2/nilfs.h +Auto-merging fs/nilfs2/recovery.c +Auto-merging fs/nilfs2/super.c +CONFLICT (content): Merge conflict in fs/nilfs2/super.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/dlmfs/dlmfs.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/omfs/file.c +Auto-merging fs/omfs/inode.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/ubifs/super.c +Auto-merging fs/udf/file.c +Auto-merging fs/udf/super.c +Auto-merging fs/xfs/linux-2.6/xfs_aops.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_aops.c +Auto-merging fs/xfs/linux-2.6/xfs_iops.c +Auto-merging fs/xfs/linux-2.6/xfs_linux.h +Auto-merging fs/xfs/linux-2.6/xfs_super.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c +Auto-merging fs/xfs/xfs_vnodeops.c +Auto-merging include/linux/ext3_fs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/reiserfs_fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e6443a3] Merge remote branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 22 +- + Documentation/filesystems/porting | 45 +++ + arch/alpha/kernel/osf_sys.c | 8 +- + arch/mips/include/asm/statfs.h | 12 +- + arch/parisc/hpux/sys_hpux.c | 10 +- + arch/powerpc/platforms/cell/spufs/inode.c | 12 +- + arch/s390/hypfs/inode.c | 6 +- + arch/s390/include/asm/statfs.h | 9 +- + arch/um/include/shared/os.h | 3 + + arch/um/kernel/ksyms.c | 3 + + arch/um/os-Linux/file.c | 15 + + arch/um/os-Linux/user_syms.c | 4 + + drivers/staging/pohmelfs/inode.c | 18 +- + fs/9p/v9fs_vfs.h | 2 +- + fs/9p/vfs_inode.c | 19 +- + fs/9p/vfs_super.c | 4 +- + fs/adfs/inode.c | 16 +- + fs/affs/affs.h | 3 +- + fs/affs/file.c | 11 +- + fs/affs/inode.c | 38 ++- + fs/affs/super.c | 32 +-- + fs/afs/inode.c | 5 +- + fs/afs/internal.h | 2 +- + fs/afs/super.c | 2 +- + fs/attr.c | 88 +++--- + fs/bfs/bfs.h | 1 - + fs/bfs/file.c | 17 +- + fs/bfs/inode.c | 116 +++----- + fs/binfmt_misc.c | 5 +- + fs/block_dev.c | 17 +- + fs/btrfs/ctree.h | 4 +- + fs/btrfs/inode.c | 34 ++- + fs/btrfs/super.c | 2 +- + fs/buffer.c | 180 ++-------- + fs/cachefiles/bind.c | 2 +- + fs/cachefiles/daemon.c | 6 +- + fs/cifs/cifsfs.c | 9 +- + fs/cifs/inode.c | 86 +++--- + fs/coda/inode.c | 8 +- + fs/compat.c | 10 +- + fs/cramfs/inode.c | 88 +++--- + fs/dcache.c | 27 ++- + fs/direct-io.c | 74 ++--- + fs/drop_caches.c | 2 +- + fs/ecryptfs/inode.c | 18 +- + fs/ecryptfs/super.c | 14 +- + fs/exofs/exofs.h | 3 +- + fs/exofs/file.c | 1 - + fs/exofs/inode.c | 127 +++---- + fs/exofs/super.c | 2 +- + fs/ext2/balloc.c | 11 +- + fs/ext2/dir.c | 23 +- + fs/ext2/ext2.h | 5 +- + fs/ext2/ialloc.c | 13 +- + fs/ext2/inode.c | 87 +++--- + fs/ext2/super.c | 14 +- + fs/ext2/xattr.c | 25 +- + fs/ext3/ialloc.c | 12 - + fs/ext3/inode.c | 63 +++- + fs/ext3/super.c | 14 +- + fs/ext3/xattr.c | 12 +- + fs/ext4/ext4.h | 3 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 53 ++- + fs/ext4/super.c | 10 +- + fs/ext4/xattr.c | 12 +- + fs/fat/fat.h | 1 - + fs/fat/file.c | 49 +-- + fs/fat/inode.c | 26 +- + fs/freevxfs/vxfs_extern.h | 2 +- + fs/freevxfs/vxfs_inode.c | 8 +- + fs/freevxfs/vxfs_super.c | 2 +- + fs/fs-writeback.c | 8 +- + fs/fuse/dir.c | 17 +- + fs/fuse/inode.c | 6 +- + fs/gfs2/aops.c | 10 +- + fs/gfs2/inode.c | 27 +- + fs/gfs2/ops_inode.c | 18 +- + fs/gfs2/super.c | 43 +-- + fs/gfs2/xattr.c | 24 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 70 ++++- + fs/hfs/super.c | 2 +- + fs/hfsplus/hfsplus_fs.h | 1 + + fs/hfsplus/inode.c | 77 ++++- + fs/hfsplus/super.c | 10 +- + fs/hostfs/hostfs.h | 22 +- + fs/hostfs/hostfs_kern.c | 517 +++++++++++++---------------- + fs/hostfs/hostfs_user.c | 112 ++----- + fs/hpfs/file.c | 11 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 24 +- + fs/hpfs/super.c | 2 +- + fs/hppfs/hppfs.c | 8 +- + fs/hugetlbfs/inode.c | 41 +-- + fs/inode.c | 177 ++++------- + fs/jffs2/dir.c | 16 +- + fs/jffs2/fs.c | 10 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/super.c | 2 +- + fs/jffs2/xattr.c | 2 +- + fs/jfs/file.c | 14 +- + fs/jfs/inode.c | 63 +++- + fs/jfs/jfs_inode.h | 2 +- + fs/jfs/super.c | 8 +- + fs/libfs.c | 70 +--- + fs/logfs/dir.c | 5 +- + fs/logfs/file.c | 18 +- + fs/logfs/inode.c | 51 +-- + fs/logfs/journal.c | 2 - + fs/logfs/logfs.h | 4 +- + fs/logfs/readwrite.c | 62 ++-- + fs/logfs/segment.c | 1 - + fs/logfs/super.c | 23 +- + fs/mbcache.c | 168 +++------- + fs/minix/bitmap.c | 6 +- + fs/minix/dir.c | 21 +- + fs/minix/file.c | 22 ++ + fs/minix/inode.c | 35 ++- + fs/minix/minix.h | 4 +- + fs/ncpfs/inode.c | 36 +- + fs/nfs/inode.c | 13 +- + fs/nfs/internal.h | 4 +- + fs/nfs/super.c | 4 +- + fs/nfsd/nfs4xdr.c | 6 +- + fs/nfsd/vfs.c | 10 +- + fs/nilfs2/dir.c | 25 +- + fs/nilfs2/gcdat.c | 2 +- + fs/nilfs2/inode.c | 78 ++++- + fs/nilfs2/nilfs.h | 2 +- + fs/nilfs2/recovery.c | 11 +- + fs/nilfs2/super.c | 20 +- + fs/notify/inode_mark.c | 6 +- + fs/notify/inotify/inotify.c | 7 +- + fs/ntfs/inode.c | 10 +- + fs/ntfs/inode.h | 2 +- + fs/ntfs/super.c | 2 +- + fs/ocfs2/aops.c | 9 +- + fs/ocfs2/dlmfs/dlmfs.c | 15 +- + fs/ocfs2/file.c | 22 +- + fs/ocfs2/inode.c | 29 +- + fs/ocfs2/inode.h | 5 +- + fs/ocfs2/super.c | 3 +- + fs/omfs/file.c | 36 ++- + fs/omfs/inode.c | 9 +- + fs/proc/base.c | 16 +- + fs/proc/generic.c | 18 +- + fs/proc/inode.c | 6 +- + fs/proc/proc_sysctl.c | 15 +- + fs/qnx4/inode.c | 11 +- + fs/quota/dquot.c | 2 +- + fs/ramfs/file-nommu.c | 7 +- + fs/reiserfs/file.c | 50 ++-- + fs/reiserfs/inode.c | 134 +++++--- + fs/reiserfs/super.c | 10 +- + fs/smbfs/inode.c | 12 +- + fs/statfs.c | 95 ++++-- + fs/super.c | 9 + + fs/sync.c | 25 -- + fs/sysfs/inode.c | 8 +- + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 2 +- + fs/sysv/dir.c | 21 +- + fs/sysv/file.c | 22 ++ + fs/sysv/ialloc.c | 1 - + fs/sysv/inode.c | 19 +- + fs/sysv/itree.c | 19 +- + fs/sysv/super.c | 1 - + fs/sysv/sysv.h | 4 +- + fs/ubifs/file.c | 23 +- + fs/ubifs/super.c | 12 +- + fs/ubifs/ubifs.h | 2 +- + fs/udf/file.c | 22 ++ + fs/udf/ialloc.c | 2 - + fs/udf/inode.c | 61 ++-- + fs/udf/super.c | 3 +- + fs/udf/udfdecl.h | 3 +- + fs/ufs/dir.c | 13 +- + fs/ufs/ialloc.c | 2 - + fs/ufs/inode.c | 63 +++-- + fs/ufs/super.c | 2 +- + fs/ufs/truncate.c | 16 +- + fs/ufs/ufs.h | 2 +- + fs/ufs/util.h | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 62 +++- + fs/xfs/linux-2.6/xfs_iops.c | 20 +- + fs/xfs/linux-2.6/xfs_linux.h | 2 - + fs/xfs/linux-2.6/xfs_super.c | 6 +- + fs/xfs/xfs_vnodeops.c | 38 ++- + include/asm-generic/statfs.h | 9 +- + include/linux/buffer_head.h | 20 +- + include/linux/dcache.h | 1 + + include/linux/ext3_fs.h | 2 +- + include/linux/fs.h | 65 +--- + include/linux/mbcache.h | 20 +- + include/linux/mm.h | 1 + + include/linux/reiserfs_fs.h | 2 +- + include/linux/reiserfs_fs_i.h | 4 +- + include/linux/statfs.h | 25 ++- + ipc/mqueue.c | 16 +- + kernel/acct.c | 2 +- + mm/shmem.c | 23 +- + mm/truncate.c | 38 ++- + 203 files changed, 2542 insertions(+), 2450 deletions(-) +$ git am -3 ../patches/0001-v9fs-fixup-for-inode_setattr-being-removed.patch +Applying: v9fs: fixup for inode_setattr being removed +$ git reset HEAD^ +Unstaged changes after reset: +M fs/9p/vfs_inode.c +$ git add . +$ git commit -v -a --amend +[master 881e48e] Merge remote branch 'vfs/for-next' +$ git am -3 ../patches/0001-xfs-update-tracing-for-clear_inode-to-evit_inode-tra.patch +Applying: xfs: update tracing for clear_inode to evit_inode transition +$ git reset HEAD^ +Unstaged changes after reset: +M fs/xfs/linux-2.6/xfs_super.c +M fs/xfs/linux-2.6/xfs_trace.h +$ git add . +$ git commit -v -a --amend +[master 6897489] Merge remote branch 'vfs/for-next' +$ git am -3 ../patches/0001-cifs-fix-for-clear_inode-evict_inode-API-change.patch +Applying: cifs: fix for clear_inode -> evict_inode API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/cifs/cifsfs.c +$ git add . +$ git commit -v -a --amend +[master 617dade] Merge remote branch 'vfs/for-next' +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging drivers/i2c/i2c-core.c +Auto-merging drivers/media/video/cx88/cx88-i2c.c +Auto-merging drivers/media/video/em28xx/em28xx-cards.c +Merge made by recursive. + Documentation/i2c/instantiating-devices | 2 +- + drivers/i2c/Kconfig | 13 ++ + drivers/i2c/Makefile | 3 +- + drivers/i2c/i2c-core.c | 158 +++++++++++---- + drivers/i2c/i2c-dev.c | 66 +++++-- + drivers/i2c/i2c-mux.c | 165 ++++++++++++++++ + drivers/i2c/muxes/Kconfig | 18 ++ + drivers/i2c/muxes/Makefile | 8 + + drivers/i2c/muxes/pca954x.c | 301 +++++++++++++++++++++++++++++ + drivers/macintosh/therm_windtunnel.c | 4 +- + drivers/media/video/bt8xx/bttv-i2c.c | 2 +- + drivers/media/video/cx18/cx18-i2c.c | 3 +- + drivers/media/video/cx23885/cx23885-i2c.c | 15 +- + drivers/media/video/cx88/cx88-i2c.c | 19 +-- + drivers/media/video/em28xx/em28xx-cards.c | 2 +- + drivers/media/video/ivtv/ivtv-i2c.c | 9 +- + drivers/media/video/v4l2-common.c | 3 +- + drivers/usb/host/ohci-pnx4008.c | 2 +- + drivers/video/matrox/i2c-matroxfb.c | 2 +- + include/linux/i2c-mux.h | 46 +++++ + include/linux/i2c.h | 33 ++-- + include/linux/i2c/pca954x.h | 47 +++++ + 22 files changed, 805 insertions(+), 116 deletions(-) + create mode 100644 drivers/i2c/i2c-mux.c + create mode 100644 drivers/i2c/muxes/Kconfig + create mode 100644 drivers/i2c/muxes/Makefile + create mode 100644 drivers/i2c/muxes/pca954x.c + create mode 100644 include/linux/i2c-mux.h + create mode 100644 include/linux/i2c/pca954x.h +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'arch/arm/plat-omap/i2c.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-cpm.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/plat-omap/i2c.c +CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c +Auto-merging drivers/i2c/busses/i2c-cpm.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c +Auto-merging drivers/i2c/busses/i2c-ibm_iic.c +Auto-merging drivers/i2c/busses/i2c-mpc.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c +Auto-merging drivers/i2c/busses/i2c-pxa.c +Auto-merging drivers/i2c/busses/i2c-s3c2410.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 55beb22] Merge remote branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Merge made by recursive. + Documentation/hwmon/emc2103 | 33 ++ + Documentation/hwmon/ltc4245 | 24 ++- + Documentation/hwmon/sysfs-interface | 29 ++- + Documentation/hwmon/w83627ehf | 15 +- + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asc7621.c | 9 +- + drivers/hwmon/emc1403.c | 33 ++ + drivers/hwmon/emc2103.c | 740 +++++++++++++++++++++++++++++++++++ + drivers/hwmon/it87.c | 46 ++- + drivers/hwmon/lm75.c | 39 ++ + drivers/hwmon/lm75.h | 1 + + drivers/hwmon/ltc4245.c | 177 ++++++++- + drivers/hwmon/pc87360.c | 30 +- + drivers/hwmon/w83627ehf.c | 97 ++++- + include/linux/i2c/ltc4245.h | 21 + + 17 files changed, 1258 insertions(+), 54 deletions(-) + create mode 100644 Documentation/hwmon/emc2103 + create mode 100644 drivers/hwmon/emc2103.c + create mode 100644 include/linux/i2c/ltc4245.h +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fa684fa] Merge branch 'quilt/kernel-doc' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 130 +----------------------------- + Documentation/scsi/scsi-parameters.txt | 139 ++++++++++++++++++++++++++++++++ + 2 files changed, 141 insertions(+), 128 deletions(-) + create mode 100644 Documentation/scsi/scsi-parameters.txt +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Removing drivers/media/IR/keymaps/rc-empty.c +Auto-merging drivers/media/video/cx23885/cx23885-i2c.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtv-i2c.c +Auto-merging drivers/media/video/v4l2-common.c +Removing drivers/staging/lirc/lirc_ene0100.c +Removing drivers/staging/lirc/lirc_streamzap.c +Merge made by recursive. + .../DocBook/v4l/lirc_device_interface.xml | 16 + + Documentation/DocBook/v4l/pixfmt-packed-rgb.xml | 78 + + Documentation/video4linux/v4l2-controls.txt | 648 +++++++ + MAINTAINERS | 6 + + drivers/media/IR/Kconfig | 36 +- + drivers/media/IR/Makefile | 2 + + drivers/media/IR/ene_ir.c | 1023 +++++++++++ + drivers/media/IR/ene_ir.h | 235 +++ + drivers/media/IR/imon.c | 20 +- + drivers/media/IR/ir-core-priv.h | 13 +- + drivers/media/IR/ir-jvc-decoder.c | 14 +- + drivers/media/IR/ir-keytable.c | 13 +- + drivers/media/IR/ir-lirc-codec.c | 124 ++- + drivers/media/IR/ir-nec-decoder.c | 25 +- + drivers/media/IR/ir-raw-event.c | 159 ++- + drivers/media/IR/ir-sysfs.c | 2 + + drivers/media/IR/keymaps/Makefile | 2 +- + drivers/media/IR/keymaps/rc-empty.c | 44 - + drivers/media/IR/keymaps/rc-rc5-streamzap.c | 81 + + drivers/media/IR/keymaps/rc-rc6-mce.c | 2 + + drivers/media/IR/mceusb.c | 21 +- + drivers/media/IR/rc-map.c | 23 + + drivers/media/IR/streamzap.c | 741 ++++++++ + drivers/media/common/tuners/Kconfig | 2 +- + drivers/media/dvb/bt8xx/dst.c | 10 +- + drivers/media/dvb/frontends/Kconfig | 2 +- + drivers/media/dvb/siano/smscoreapi.c | 6 +- + drivers/media/video/Kconfig | 16 +- + drivers/media/video/Makefile | 3 +- + drivers/media/video/cs53l32a.c | 107 +- + drivers/media/video/cx2341x.c | 747 +++++++-- + drivers/media/video/cx23885/Kconfig | 2 +- + drivers/media/video/cx23885/Makefile | 5 +- + drivers/media/video/cx23885/cx23885-av.c | 35 + + drivers/media/video/cx23885/cx23885-av.h | 27 + + drivers/media/video/cx23885/cx23885-cards.c | 114 ++- + drivers/media/video/cx23885/cx23885-core.c | 124 ++- + drivers/media/video/cx23885/cx23885-i2c.c | 27 +- + drivers/media/video/cx23885/cx23885-input.c | 72 +- + drivers/media/video/cx23885/cx23885-ir.c | 24 +- + drivers/media/video/cx23885/cx23885-reg.h | 1 + + drivers/media/video/cx23885/cx23885-vbi.c | 2 +- + drivers/media/video/cx23885/cx23885-video.c | 23 +- + drivers/media/video/cx23885/cx23885.h | 9 +- + drivers/media/video/cx23885/cx23888-ir.c | 142 +- + drivers/media/video/cx25840/Makefile | 2 +- + drivers/media/video/cx25840/cx25840-audio.c | 144 +-- + drivers/media/video/cx25840/cx25840-core.c | 540 +++++-- + drivers/media/video/cx25840/cx25840-core.h | 52 +- + drivers/media/video/cx25840/cx25840-ir.c | 1279 ++++++++++++++ + drivers/media/video/gspca/gspca.c | 21 +- + drivers/media/video/gspca/sonixj.c | 10 +- + drivers/media/video/gspca/sq930x.c | 347 +--- + drivers/media/video/gspca/t613.c | 4 +- + drivers/media/video/gspca/vc032x.c | 360 ++++- + drivers/media/video/gspca/zc3xx.c | 1715 +++++++++---------- + drivers/media/video/ivtv/ivtv-controls.c | 276 +--- + drivers/media/video/ivtv/ivtv-controls.h | 6 +- + drivers/media/video/ivtv/ivtv-driver.c | 26 +- + drivers/media/video/ivtv/ivtv-driver.h | 4 +- + drivers/media/video/ivtv/ivtv-fileops.c | 23 +- + drivers/media/video/ivtv/ivtv-firmware.c | 6 +- + drivers/media/video/ivtv/ivtv-gpio.c | 77 +- + drivers/media/video/ivtv/ivtv-i2c.c | 7 + + drivers/media/video/ivtv/ivtv-ioctl.c | 31 +- + drivers/media/video/ivtv/ivtv-streams.c | 24 +- + drivers/media/video/msp3400-driver.c | 248 +-- + drivers/media/video/msp3400-driver.h | 18 +- + drivers/media/video/msp3400-kthreads.c | 16 +- + drivers/media/video/mt9m111.c | 40 +- + drivers/media/video/mx2_camera.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 14 +- + drivers/media/video/s5p-fimc/Makefile | 3 + + drivers/media/video/s5p-fimc/fimc-core.c | 1586 +++++++++++++++++ + drivers/media/video/s5p-fimc/fimc-core.h | 471 +++++ + drivers/media/video/s5p-fimc/fimc-reg.c | 527 ++++++ + drivers/media/video/s5p-fimc/regs-fimc.h | 293 +++ + drivers/media/video/saa7115.c | 183 +-- + drivers/media/video/saa717x.c | 323 +--- + drivers/media/video/soc_camera.c | 9 +- + drivers/media/video/tvp7002.c | 10 +- + drivers/media/video/usbvideo/usbvideo.c | 12 +- + drivers/media/video/uvc/uvc_driver.c | 9 + + drivers/media/video/uvc/uvc_queue.c | 13 +- + drivers/media/video/uvc/uvc_video.c | 19 +- + drivers/media/video/uvc/uvcvideo.h | 5 +- + drivers/media/video/v4l2-common.c | 479 +----- + drivers/media/video/v4l2-ctrls.c | 1851 ++++++++++++++++++++ + drivers/media/video/v4l2-dev.c | 8 +- + drivers/media/video/v4l2-device.c | 7 + + drivers/media/video/v4l2-ioctl.c | 46 +- + drivers/media/video/wm8739.c | 179 +-- + drivers/media/video/wm8775.c | 79 +- + drivers/staging/lirc/Kconfig | 29 +- + drivers/staging/lirc/Makefile | 2 - + drivers/staging/lirc/lirc_ene0100.c | 646 ------- + drivers/staging/lirc/lirc_it87.c | 9 +- + drivers/staging/lirc/lirc_parallel.c | 4 +- + drivers/staging/lirc/lirc_streamzap.c | 821 --------- + include/linux/videodev2.h | 1 + + include/media/cx2341x.h | 97 + + include/media/cx25840.h | 87 + + include/media/ir-core.h | 41 +- + include/media/lirc.h | 5 +- + include/media/rc-map.h | 1 + + include/media/v4l2-ctrls.h | 460 +++++ + include/media/v4l2-dev.h | 4 + + include/media/v4l2-device.h | 4 + + include/media/v4l2-subdev.h | 54 +- + 109 files changed, 13451 insertions(+), 5048 deletions(-) + create mode 100644 Documentation/video4linux/v4l2-controls.txt + create mode 100644 drivers/media/IR/ene_ir.c + create mode 100644 drivers/media/IR/ene_ir.h + delete mode 100644 drivers/media/IR/keymaps/rc-empty.c + create mode 100644 drivers/media/IR/keymaps/rc-rc5-streamzap.c + create mode 100644 drivers/media/IR/streamzap.c + create mode 100644 drivers/media/video/cx23885/cx23885-av.c + create mode 100644 drivers/media/video/cx23885/cx23885-av.h + create mode 100644 drivers/media/video/cx25840/cx25840-ir.c + create mode 100644 drivers/media/video/s5p-fimc/Makefile + create mode 100644 drivers/media/video/s5p-fimc/fimc-core.c + create mode 100644 drivers/media/video/s5p-fimc/fimc-core.h + create mode 100644 drivers/media/video/s5p-fimc/fimc-reg.c + create mode 100644 drivers/media/video/s5p-fimc/regs-fimc.h + create mode 100644 drivers/media/video/v4l2-ctrls.c + delete mode 100644 drivers/staging/lirc/lirc_ene0100.c + delete mode 100644 drivers/staging/lirc/lirc_streamzap.c + create mode 100644 include/media/v4l2-ctrls.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Already uptodate! +Merge made by recursive. +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Merge made by recursive. + drivers/ide/ide-taskfile.c | 10 +++------- + drivers/ide/tx4938ide.c | 2 +- + drivers/ide/tx4939ide.c | 2 +- + 3 files changed, 5 insertions(+), 9 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +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-merging drivers/acpi/Makefile +Auto-merging drivers/acpi/internal.h +Merge made by recursive. + Documentation/acpi/method-customizing.txt | 2 + + arch/x86/kernel/cpu/mcheck/mce-apei.c | 4 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/acpica/acevents.h | 4 + + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/aclocal.h | 1 + + drivers/acpi/acpica/evgpe.c | 73 ++++++++++ + drivers/acpi/acpica/evxface.c | 77 +++++++---- + drivers/acpi/acpica/evxfevnt.c | 62 ++-------- + drivers/acpi/apei/Kconfig | 9 ++ + drivers/acpi/apei/Makefile | 1 + + drivers/acpi/apei/apei-base.c | 4 +- + drivers/acpi/apei/erst-dbg.c | 206 +++++++++++++++++++++++++++++ + drivers/acpi/apei/ghes.c | 172 +++++++++++++----------- + drivers/acpi/apei/hest.c | 76 ++++++++++- + drivers/acpi/bus.c | 1 + + drivers/acpi/debug.c | 75 ----------- + drivers/acpi/debugfs.c | 92 +++++++++++++ + drivers/acpi/internal.h | 6 + + drivers/acpi/sleep.c | 60 +++------ + drivers/acpi/sleep.h | 5 +- + drivers/acpi/wakeup.c | 48 ++------ + include/acpi/acpixf.h | 2 +- + include/linux/cper.h | 8 +- + 24 files changed, 661 insertions(+), 330 deletions(-) + create mode 100644 drivers/acpi/apei/erst-dbg.c + create mode 100644 drivers/acpi/debugfs.c +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Auto-merging drivers/idle/intel_idle.c +Merge made by recursive. + drivers/idle/intel_idle.c | 59 ++++----------------------------------------- + 1 files changed, 5 insertions(+), 54 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Resolved 'drivers/xen/Kconfig' using previous resolution. +Resolved 'drivers/xen/Makefile' using previous resolution. +Resolved 'include/xen/xen-ops.h' using previous resolution. +Auto-merging arch/x86/xen/Makefile +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging drivers/xen/Kconfig +CONFLICT (content): Merge conflict in drivers/xen/Kconfig +Auto-merging drivers/xen/Makefile +CONFLICT (content): Merge conflict in drivers/xen/Makefile +Auto-merging include/linux/vmalloc.h +Auto-merging include/xen/xen-ops.h +CONFLICT (content): Merge conflict in include/xen/xen-ops.h +Auto-merging mm/vmalloc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 65fc6aa] Merge remote branch 'swiotlb-xen/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/xen/page.h | 8 +- + arch/x86/include/asm/xen/swiotlb-xen.h | 14 + + arch/x86/kernel/pci-dma.c | 7 +- + arch/x86/xen/Makefile | 1 + + arch/x86/xen/enlighten.c | 4 + + arch/x86/xen/mmu.c | 293 ++++++++++++++++++- + arch/x86/xen/pci-swiotlb-xen.c | 58 ++++ + drivers/xen/Kconfig | 5 + + drivers/xen/Makefile | 1 + + drivers/xen/balloon.c | 15 +- + drivers/xen/swiotlb-xen.c | 515 ++++++++++++++++++++++++++++++++ + include/linux/vmalloc.h | 2 + + include/xen/interface/memory.h | 50 +++ + include/xen/swiotlb-xen.h | 65 ++++ + include/xen/xen-ops.h | 6 + + mm/vmalloc.c | 4 + + 16 files changed, 1024 insertions(+), 24 deletions(-) + create mode 100644 arch/x86/include/asm/xen/swiotlb-xen.h + create mode 100644 arch/x86/xen/pci-swiotlb-xen.c + create mode 100644 drivers/xen/swiotlb-xen.c + create mode 100644 include/xen/swiotlb-xen.h +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Merge made by recursive. + drivers/firmware/Kconfig | 8 - + drivers/firmware/Makefile | 1 - + drivers/scsi/53c700.c | 3 - + drivers/scsi/Kconfig | 8 + + drivers/scsi/Makefile | 1 + + drivers/scsi/be2iscsi/Kconfig | 1 + + drivers/scsi/be2iscsi/be_cmds.h | 147 +++++++++-- + drivers/scsi/be2iscsi/be_iscsi.c | 76 +++-- + drivers/scsi/be2iscsi/be_iscsi.h | 2 + + drivers/scsi/be2iscsi/be_main.c | 311 ++++++++++++++++++++ + drivers/scsi/be2iscsi/be_main.h | 7 +- + drivers/scsi/be2iscsi/be_mgmt.c | 71 +++++ + drivers/scsi/ibmvscsi/ibmvfc.c | 380 ++++++++++++++----------- + drivers/scsi/ibmvscsi/ibmvfc.h | 6 +- + drivers/{firmware => scsi}/iscsi_boot_sysfs.c | 0 + drivers/scsi/libfc/fc_fcp.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 3 + + drivers/scsi/lpfc/lpfc_attr.c | 46 +++- + drivers/scsi/lpfc/lpfc_bsg.c | 9 - + drivers/scsi/lpfc/lpfc_compat.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 76 +++++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 17 +- + drivers/scsi/lpfc/lpfc_hw.h | 32 ++- + drivers/scsi/lpfc/lpfc_init.c | 132 ++++++--- + drivers/scsi/lpfc/lpfc_mbox.c | 8 +- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 36 ++- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 13 +- + drivers/scsi/qla4xxx/ql4_def.h | 36 +++- + drivers/scsi/qla4xxx/ql4_fw.h | 20 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 2 + + drivers/scsi/qla4xxx/ql4_init.c | 14 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 3 + + drivers/scsi/qla4xxx/ql4_mbx.c | 48 +++- + drivers/scsi/qla4xxx/ql4_nx.c | 14 +- + drivers/scsi/qla4xxx/ql4_os.c | 315 ++++++++++++++++++++- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + 39 files changed, 1505 insertions(+), 362 deletions(-) + rename drivers/{firmware => scsi}/iscsi_boot_sysfs.c (100%) +Merging async_tx/next +$ git merge async_tx/next +Resolved 'arch/arm/mach-ux500/devices-db8500.c' using previous resolution. +Auto-merging arch/arm/mach-ux500/devices-db8500.c +CONFLICT (content): Merge conflict in arch/arm/mach-ux500/devices-db8500.c +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/at_hdmac.c +Auto-merging drivers/pci/intel-iommu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d3cb65] Merge remote branch 'async_tx/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-ux500/devices-db8500.c | 28 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 6 +- + arch/arm/mach-ux500/ste-dma40-db8500.h | 2 +- + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 4 +- + drivers/dma/Kconfig | 20 + + drivers/dma/Makefile | 2 + + drivers/dma/at_hdmac.c | 4 +- + drivers/dma/coh901318.c | 169 ++++ + drivers/dma/dmatest.c | 2 +- + drivers/dma/intel_mid_dma.c | 1143 ++++++++++++++++++++++++ + drivers/dma/intel_mid_dma_regs.h | 260 ++++++ + drivers/dma/ioat/dma.h | 1 + + drivers/dma/ioat/dma_v2.c | 24 +- + drivers/dma/ioat/dma_v3.c | 5 +- + drivers/dma/pch_dma.c | 957 ++++++++++++++++++++ + drivers/dma/ste_dma40.c | 860 +++++++++++------- + drivers/dma/ste_dma40_ll.c | 40 +- + drivers/dma/ste_dma40_ll.h | 15 +- + drivers/dma/timb_dma.c | 8 +- + drivers/pci/intel-iommu.c | 28 + + include/linux/dmaengine.h | 71 ++ + include/linux/intel_mid_dma.h | 86 ++ + include/linux/pch_dma.h | 37 + + 23 files changed, 3390 insertions(+), 382 deletions(-) + create mode 100644 drivers/dma/intel_mid_dma.c + create mode 100644 drivers/dma/intel_mid_dma_regs.h + create mode 100644 drivers/dma/pch_dma.c + create mode 100644 include/linux/intel_mid_dma.h + create mode 100644 include/linux/pch_dma.h +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/maps/Kconfig' using previous resolution. +Auto-merging drivers/mtd/maps/Kconfig +CONFLICT (content): Merge conflict in drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/maps/physmap_of.c +CONFLICT (delete/modify): drivers/mtd/maps/redwood.c deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/maps/redwood.c left in tree. +Auto-merging drivers/mtd/mtdchar.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/denali.c +Auto-merging drivers/mtd/nand/fsl_upm.c +Auto-merging drivers/mtd/nand/mxc_nand.c +Auto-merging drivers/mtd/nand/socrates_nand.c +Auto-merging fs/jffs2/dir.c +Auto-merging fs/jffs2/file.c +Auto-merging fs/jffs2/fs.c +Auto-merging include/linux/jffs2.h +Removing include/linux/mtd/compatmac.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/mtd/maps/redwood.c +drivers/mtd/maps/Kconfig: needs merge +drivers/mtd/maps/redwood.c: needs merge +rm 'drivers/mtd/maps/redwood.c' +$ git commit -v -a +[master 6fcf1bb] Merge remote branch 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/blackfin/include/asm/nand.h | 3 - + drivers/mtd/Kconfig | 12 +- + drivers/mtd/afs.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 31 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 17 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 1 - + drivers/mtd/chips/cfi_probe.c | 4 +- + drivers/mtd/chips/cfi_util.c | 1 - + drivers/mtd/chips/chipreg.c | 1 - + drivers/mtd/chips/map_absent.c | 1 - + drivers/mtd/chips/map_ram.c | 1 - + drivers/mtd/chips/map_rom.c | 1 - + drivers/mtd/cmdlinepart.c | 17 +- + drivers/mtd/devices/docecc.c | 1 - + drivers/mtd/devices/docprobe.c | 1 - + drivers/mtd/devices/m25p80.c | 43 +- + drivers/mtd/devices/mtd_dataflash.c | 12 +- + drivers/mtd/devices/mtdram.c | 1 - + drivers/mtd/devices/pmc551.c | 1 - + drivers/mtd/devices/sst25l.c | 2 +- + drivers/mtd/ftl.c | 2 +- + drivers/mtd/inftlcore.c | 6 +- + drivers/mtd/inftlmount.c | 5 +- + drivers/mtd/lpddr/lpddr_cmds.c | 20 +- + drivers/mtd/maps/Kconfig | 8 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/ixp4xx.c | 35 +- + drivers/mtd/maps/physmap.c | 14 +- + drivers/mtd/maps/physmap_of.c | 6 +- + drivers/mtd/maps/redwood.c | 131 ---- + drivers/mtd/mtd_blkdevs.c | 26 +- + drivers/mtd/mtdblock.c | 19 +- + drivers/mtd/mtdblock_ro.c | 19 +- + drivers/mtd/mtdchar.c | 59 ++- + drivers/mtd/mtdconcat.c | 38 +- + drivers/mtd/mtdcore.c | 21 +- + drivers/mtd/mtdoops.c | 2 +- + drivers/mtd/mtdpart.c | 31 +- + drivers/mtd/mtdsuper.c | 2 + + drivers/mtd/nand/Kconfig | 33 +- + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/bf5xx_nand.c | 117 ++-- + drivers/mtd/nand/davinci_nand.c | 17 + + drivers/mtd/nand/denali.c | 1240 ++++++++++++++--------------------- + drivers/mtd/nand/denali.h | 140 ++--- + drivers/mtd/nand/diskonchip.c | 6 +- + drivers/mtd/nand/mxc_nand.c | 600 ++++++++++++----- + drivers/mtd/nand/nand_base.c | 79 ++- + drivers/mtd/nand/nand_bbt.c | 103 +++- + drivers/mtd/nand/nand_ids.c | 4 + + drivers/mtd/nand/nandsim.c | 14 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/r852.c | 6 +- + drivers/mtd/nand/rtc_from4.c | 1 - + drivers/mtd/nand/s3c2410.c | 15 +- + drivers/mtd/nand/sm_common.c | 2 +- + drivers/mtd/nftlcore.c | 25 +- + drivers/mtd/nftlmount.c | 3 +- + drivers/mtd/ofpart.c | 4 +- + drivers/mtd/onenand/Kconfig | 4 +- + drivers/mtd/onenand/onenand_base.c | 49 +- + drivers/mtd/onenand/onenand_bbt.c | 1 - + drivers/mtd/onenand/samsung.c | 21 +- + drivers/mtd/redboot.c | 18 + + drivers/mtd/rfd_ftl.c | 2 +- + drivers/mtd/ssfdc.c | 2 +- + drivers/mtd/tests/mtd_pagetest.c | 9 +- + fs/jffs2/background.c | 1 + + fs/jffs2/build.c | 1 + + fs/jffs2/compr.c | 5 +- + fs/jffs2/compr.h | 1 + + fs/jffs2/compr_lzo.c | 1 + + fs/jffs2/compr_rtime.c | 1 + + fs/jffs2/compr_rubin.c | 1 + + fs/jffs2/compr_zlib.c | 1 + + fs/jffs2/debug.c | 1 + + fs/jffs2/debug.h | 1 + + fs/jffs2/dir.c | 1 + + fs/jffs2/erase.c | 1 + + fs/jffs2/file.c | 1 + + fs/jffs2/fs.c | 1 + + fs/jffs2/gc.c | 1 + + fs/jffs2/ioctl.c | 1 + + fs/jffs2/jffs2_fs_i.h | 1 + + fs/jffs2/jffs2_fs_sb.h | 1 + + fs/jffs2/nodelist.h | 1 - + include/linux/jffs2.h | 3 +- + include/linux/mtd/bbm.h | 24 +- + include/linux/mtd/blktrans.h | 16 +- + include/linux/mtd/cfi.h | 20 +- + include/linux/mtd/cfi_endian.h | 19 + + include/linux/mtd/compatmac.h | 10 - + include/linux/mtd/concat.h | 17 +- + include/linux/mtd/doc2000.h | 23 +- + include/linux/mtd/flashchip.h | 21 +- + include/linux/mtd/gen_probe.h | 19 +- + include/linux/mtd/map.h | 19 +- + include/linux/mtd/mtd.h | 19 +- + include/linux/mtd/nand.h | 8 +- + include/linux/mtd/nand_ecc.h | 4 +- + include/linux/mtd/nftl.h | 17 +- + include/linux/mtd/onenand.h | 2 + + include/linux/mtd/physmap.h | 1 + + include/mtd/mtd-abi.h | 18 +- + include/mtd/mtd-user.h | 17 +- + include/mtd/nftl-user.h | 16 +- + include/mtd/ubi-user.h | 2 +- + 107 files changed, 1910 insertions(+), 1525 deletions(-) + delete mode 100644 drivers/mtd/maps/redwood.c + delete mode 100644 include/linux/mtd/compatmac.h +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/oss/ad1848.c | 2 +- + sound/oss/au1550_ac97.c | 1 - + sound/pci/hda/hda_codec.c | 150 ++++++++++++++++++++++++++++++++++++++-- + sound/pci/hda/hda_codec.h | 12 +++ + sound/pci/hda/hda_intel.c | 6 +- + sound/pci/hda/patch_realtek.c | 39 +++++++++++ + 6 files changed, 197 insertions(+), 13 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Resolved 'arch/um/drivers/hostaudio_kern.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Auto-merging arch/um/drivers/hostaudio_kern.c +CONFLICT (content): Merge conflict in arch/um/drivers/hostaudio_kern.c +Auto-merging drivers/acpi/debug.c +Auto-merging drivers/message/fusion/mptbase.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +Auto-merging drivers/net/wireless/libertas/if_usb.c +Auto-merging drivers/net/wireless/libertas_tf/if_usb.c +Auto-merging drivers/scsi/bfa/bfad.c +Auto-merging drivers/staging/rtl8192e/r8192E_core.c +Auto-merging drivers/staging/rtl8192su/r8192U_core.c +Auto-merging drivers/usb/atm/ueagle-atm.c +Auto-merging init/main.c +Auto-merging kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merging scripts/mod/modpost.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ed5b60e] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-hotplug.txt | 2 +- + arch/um/drivers/hostaudio_kern.c | 10 + + drivers/acpi/debug.c | 32 +++- + drivers/char/hvc_iucv.c | 9 +- + drivers/char/ipmi/ipmi_watchdog.c | 42 +++-- + drivers/ide/ide.c | 20 ++- + drivers/input/misc/ati_remote2.c | 26 ++- + drivers/input/mouse/psmouse-base.c | 14 +- + drivers/message/fusion/mptbase.c | 3 +- + drivers/misc/lkdtm.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 54 ++++-- + drivers/net/wireless/libertas/if_sdio.c | 32 +++- + drivers/net/wireless/libertas/if_usb.c | 3 + + drivers/net/wireless/libertas_tf/if_usb.c | 3 + + drivers/scsi/bfa/bfad.c | 2 + + drivers/staging/rtl8187se/r8180_core.c | 6 +- + drivers/staging/rtl8192e/r8192E_core.c | 6 +- + drivers/staging/rtl8192su/r8192U_core.c | 6 +- + drivers/usb/atm/ueagle-atm.c | 2 + + drivers/video/uvesafb.c | 7 +- + drivers/video/vt8623fb.c | 2 + + fs/nfs/callback.c | 11 +- + include/linux/moduleparam.h | 288 ++++++++++++++++++++++------- + init/main.c | 8 +- + kernel/params.c | 233 ++++++++++++++++------- + net/mac80211/rate.c | 2 + + net/sunrpc/xprtsock.c | 26 ++- + scripts/mod/modpost.c | 13 ++ + 28 files changed, 627 insertions(+), 239 deletions(-) +$ git am -3 ../patches/0001-nfs-update-for-module_param_named-API-change.patch +Applying: nfs: update for module_param_named API change +$ git reset HEAD^ +Unstaged changes after reset: +M net/sunrpc/auth.c +$ git add . +$ git commit -v -a --amend +[master 828f09b] Merge branch 'quilt/rr' +$ git am -3 ../patches/0001-AppArmor-update-for-module_param_named-API-change.patch +Applying: AppArmor: update for module_param_named API change +$ git reset HEAD^ +Unstaged changes after reset: +M security/apparmor/lsm.c +$ git add . +$ git commit -v -a --amend +[master 8e623d0] Merge branch 'quilt/rr' +Merging input/next +$ git merge input/next +Auto-merging drivers/hid/hid-wacom.c +Auto-merging drivers/input/mouse/synaptics.c +Auto-merging drivers/input/tablet/wacom_wac.c +Merge made by recursive. + drivers/hid/hid-wacom.c | 49 ++++++------ + drivers/input/evdev.c | 152 +++++++++++++++++------------------ + drivers/input/input.c | 46 ++++++++++- + drivers/input/joydev.c | 31 ++++---- + drivers/input/joystick/a3d.c | 3 +- + drivers/input/joystick/adi.c | 2 +- + drivers/input/joystick/amijoy.c | 4 +- + drivers/input/joystick/gf2k.c | 20 +++--- + drivers/input/joystick/interact.c | 14 +-- + drivers/input/joystick/sidewinder.c | 18 +++-- + drivers/input/keyboard/gpio_keys.c | 22 +++++ + drivers/input/keyboard/hil_kbd.c | 21 +++-- + drivers/input/misc/adxl34x.c | 1 - + drivers/input/misc/uinput.c | 29 ++++--- + drivers/input/mouse/elantech.c | 31 +++++--- + drivers/input/mouse/elantech.h | 7 +- + drivers/input/mouse/pc110pad.c | 4 +- + drivers/input/mouse/synaptics.c | 4 +- + drivers/input/mousedev.c | 44 ++++++---- + drivers/input/tablet/aiptek.c | 15 ++-- + drivers/input/tablet/wacom_wac.c | 4 +- + include/linux/gpio_keys.h | 2 + + include/linux/input.h | 53 +++++++----- + 23 files changed, 332 insertions(+), 244 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Resolved 'drivers/block/virtio_blk.c' using previous resolution. +Resolved 'drivers/scsi/scsi_error.c' using previous resolution. +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/block/cciss.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/nbd.c +Auto-merging drivers/block/virtio_blk.c +CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/ide/ide-cd.c +Auto-merging drivers/ide/ide-gd.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/mtd/mtd_blkdevs.c +Auto-merging drivers/scsi/scsi_error.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/staging/hv/blkvsc_drv.c +Auto-merging fs/block_dev.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/fs.h +Auto-merging mm/backing-dev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1c54ad4] Merge remote branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/scatterlist.h | 2 - + arch/avr32/include/asm/scatterlist.h | 2 - + arch/blackfin/include/asm/scatterlist.h | 2 - + arch/cris/include/asm/scatterlist.h | 2 - + arch/frv/include/asm/scatterlist.h | 2 - + arch/h8300/include/asm/scatterlist.h | 2 - + arch/ia64/include/asm/scatterlist.h | 9 - + arch/m32r/include/asm/scatterlist.h | 2 - + arch/m68k/include/asm/scatterlist.h | 3 - + arch/microblaze/include/asm/scatterlist.h | 2 - + arch/mips/include/asm/scatterlist.h | 2 - + arch/mn10300/include/asm/scatterlist.h | 2 - + arch/parisc/include/asm/scatterlist.h | 1 - + arch/powerpc/include/asm/scatterlist.h | 3 - + arch/s390/include/asm/scatterlist.h | 2 - + arch/score/include/asm/scatterlist.h | 2 - + arch/sh/include/asm/scatterlist.h | 2 - + arch/sparc/include/asm/scatterlist.h | 1 - + arch/um/drivers/ubd_kern.c | 7 +- + arch/x86/include/asm/scatterlist.h | 1 - + arch/xtensa/include/asm/scatterlist.h | 2 - + block/blk-barrier.c | 35 +- + block/blk-core.c | 117 ++- + block/blk-exec.c | 2 +- + block/blk-lib.c | 56 +- + block/blk-map.c | 2 +- + block/blk-merge.c | 9 +- + block/blk-settings.c | 17 + + block/blk-sysfs.c | 82 +- + block/blk.h | 6 +- + block/cfq-iosched.c | 21 +- + block/compat_ioctl.c | 56 - + block/elevator.c | 19 +- + block/ioctl.c | 21 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/block/DAC960.c | 13 +- + drivers/block/amiflop.c | 29 +- + drivers/block/aoe/aoeblk.c | 6 +- + drivers/block/ataflop.c | 32 +- + drivers/block/brd.c | 9 +- + drivers/block/cciss.c | 2165 +++++++++++++++++------------ + drivers/block/cciss.h | 135 ++- + drivers/block/cciss_cmd.h | 36 +- + drivers/block/cciss_scsi.c | 670 +++++----- + drivers/block/cpqarray.c | 78 +- + drivers/block/drbd/drbd_actlog.c | 8 +- + drivers/block/drbd/drbd_int.h | 16 +- + drivers/block/drbd/drbd_main.c | 102 +-- + drivers/block/drbd/drbd_nl.c | 4 - + drivers/block/drbd/drbd_proc.c | 19 +- + drivers/block/drbd/drbd_receiver.c | 135 +-- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/drbd/drbd_worker.c | 15 +- + drivers/block/floppy.c | 182 +-- + drivers/block/hd.c | 2 +- + drivers/block/loop.c | 9 +- + drivers/block/mg_disk.c | 4 +- + drivers/block/nbd.c | 7 +- + drivers/block/osdblk.c | 15 +- + drivers/block/paride/pcd.c | 21 +- + drivers/block/paride/pd.c | 11 +- + drivers/block/paride/pf.c | 26 +- + drivers/block/pktcdvd.c | 20 +- + drivers/block/ps3disk.c | 25 +- + drivers/block/swim.c | 20 +- + drivers/block/swim3.c | 32 +- + drivers/block/ub.c | 35 +- + drivers/block/umem.c | 2 +- + drivers/block/viodasd.c | 21 +- + drivers/block/virtio_blk.c | 88 +- + drivers/block/xd.c | 19 +- + drivers/block/xen-blkfront.c | 402 ++++-- + drivers/block/xsysace.c | 8 +- + drivers/block/z2ram.c | 13 +- + drivers/cdrom/cdrom.c | 46 +- + drivers/cdrom/gdrom.c | 48 +- + drivers/cdrom/viocd.c | 106 +- + drivers/ide/ide-atapi.c | 17 +- + drivers/ide/ide-cd.c | 98 +- + drivers/ide/ide-cd_ioctl.c | 2 +- + drivers/ide/ide-disk.c | 18 +- + drivers/ide/ide-disk_ioctl.c | 9 +- + drivers/ide/ide-eh.c | 5 +- + drivers/ide/ide-floppy.c | 27 +- + drivers/ide/ide-floppy_ioctl.c | 12 +- + drivers/ide/ide-gd.c | 19 +- + drivers/ide/ide-io.c | 8 +- + drivers/ide/ide-pm.c | 8 +- + drivers/ide/ide-tape.c | 22 +- + drivers/md/dm-io.c | 12 +- + drivers/md/dm-kcopyd.c | 2 +- + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm.c | 47 +- + drivers/md/linear.c | 2 +- + drivers/md/md.c | 16 +- + drivers/md/md.h | 4 +- + drivers/md/multipath.c | 8 +- + drivers/md/raid0.c | 2 +- + drivers/md/raid1.c | 22 +- + drivers/md/raid10.c | 12 +- + drivers/md/raid5.c | 2 +- + drivers/memstick/core/mspro_block.c | 12 +- + drivers/message/i2o/i2o_block.c | 30 +- + drivers/mmc/card/block.c | 5 + + drivers/mmc/card/queue.c | 4 +- + drivers/mtd/mtd_blkdevs.c | 15 +- + drivers/s390/block/dasd.c | 8 +- + drivers/s390/block/dcssblk.c | 5 + + drivers/s390/char/tape_block.c | 8 +- + drivers/scsi/aha1542.c | 25 - + drivers/scsi/osd/osd_initiator.c | 8 +- + drivers/scsi/scsi_error.c | 25 +- + drivers/scsi/scsi_lib.c | 14 +- + drivers/scsi/sd.c | 126 ++- + drivers/scsi/sd.h | 2 +- + drivers/scsi/sr.c | 25 +- + drivers/scsi/sun3_NCR5380.c | 2 +- + drivers/scsi/sun3_scsi.c | 2 +- + drivers/scsi/sun3_scsi_vme.c | 2 +- + drivers/staging/hv/blkvsc_drv.c | 13 +- + drivers/xen/xenbus/xenbus_client.c | 90 +- + fs/bio.c | 5 +- + fs/block_dev.c | 10 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/inode.c | 6 +- + fs/btrfs/volumes.c | 18 +- + fs/coda/psdev.c | 12 +- + fs/coda/upcall.c | 12 +- + fs/exofs/ios.c | 2 +- + fs/fs-writeback.c | 161 ++- + fs/gfs2/log.c | 4 +- + fs/gfs2/meta_io.c | 8 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/nilfs2/segbuf.c | 2 +- + fs/splice.c | 14 +- + include/linux/Kbuild | 1 + + include/linux/audit.h | 2 +- + include/linux/backing-dev.h | 23 +- + include/linux/bio.h | 158 +-- + include/linux/blk_types.h | 193 +++ + include/linux/blkdev.h | 142 +-- + include/linux/blktrace_api.h | 18 +- + include/linux/coda_psdev.h | 8 +- + include/linux/drbd.h | 2 +- + include/linux/drbd_nl.h | 9 +- + include/linux/fs.h | 45 +- + include/trace/events/block.h | 15 +- + include/trace/events/writeback.h | 159 +++ + kernel/power/block_io.c | 2 +- + kernel/trace/blktrace.c | 80 +- + mm/backing-dev.c | 445 +++---- + mm/page-writeback.c | 5 + + mm/page_io.c | 2 +- + 154 files changed, 4284 insertions(+), 3224 deletions(-) + create mode 100644 include/linux/blk_types.h + create mode 100644 include/trace/events/writeback.h +$ git reset --hard HEAD^ +HEAD is now at 64f22ae Merge remote branch 'input/next' +Merging refs/next/20100807/block +$ git merge refs/next/20100807/block +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ide/ide-cd.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/mtd/mtd_blkdevs.c +Auto-merging drivers/staging/hv/blkvsc_drv.c +Auto-merging fs/block_dev.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging include/linux/fs.h +Auto-merging mm/backing-dev.c +Merge made by recursive. + arch/alpha/include/asm/scatterlist.h | 2 - + arch/avr32/include/asm/scatterlist.h | 2 - + arch/blackfin/include/asm/scatterlist.h | 2 - + arch/cris/include/asm/scatterlist.h | 2 - + arch/frv/include/asm/scatterlist.h | 2 - + arch/h8300/include/asm/scatterlist.h | 2 - + arch/ia64/include/asm/scatterlist.h | 9 - + arch/m32r/include/asm/scatterlist.h | 2 - + arch/m68k/include/asm/scatterlist.h | 3 - + arch/microblaze/include/asm/scatterlist.h | 2 - + arch/mips/include/asm/scatterlist.h | 2 - + arch/mn10300/include/asm/scatterlist.h | 2 - + arch/parisc/include/asm/scatterlist.h | 1 - + arch/powerpc/include/asm/scatterlist.h | 3 - + arch/s390/include/asm/scatterlist.h | 2 - + arch/score/include/asm/scatterlist.h | 2 - + arch/sh/include/asm/scatterlist.h | 2 - + arch/sparc/include/asm/scatterlist.h | 1 - + arch/um/drivers/ubd_kern.c | 7 +- + arch/x86/include/asm/scatterlist.h | 1 - + arch/xtensa/include/asm/scatterlist.h | 2 - + block/blk-barrier.c | 35 +- + block/blk-core.c | 112 +- + block/blk-exec.c | 2 +- + block/blk-lib.c | 48 +- + block/blk-map.c | 2 +- + block/blk-merge.c | 9 +- + block/blk-settings.c | 17 + + block/blk-sysfs.c | 82 +- + block/blk.h | 6 +- + block/cfq-iosched.c | 21 +- + block/compat_ioctl.c | 56 - + block/elevator.c | 19 +- + block/ioctl.c | 21 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/block/DAC960.c | 13 +- + drivers/block/amiflop.c | 29 +- + drivers/block/aoe/aoeblk.c | 6 +- + drivers/block/ataflop.c | 32 +- + drivers/block/brd.c | 9 +- + drivers/block/cciss.c | 2165 +++++++++++++++++------------ + drivers/block/cciss.h | 135 ++- + drivers/block/cciss_cmd.h | 36 +- + drivers/block/cciss_scsi.c | 670 +++++----- + drivers/block/cpqarray.c | 78 +- + drivers/block/drbd/drbd_actlog.c | 8 +- + drivers/block/drbd/drbd_int.h | 16 +- + drivers/block/drbd/drbd_main.c | 102 +-- + drivers/block/drbd/drbd_nl.c | 4 - + drivers/block/drbd/drbd_proc.c | 19 +- + drivers/block/drbd/drbd_receiver.c | 135 +-- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/drbd/drbd_worker.c | 15 +- + drivers/block/floppy.c | 182 +-- + drivers/block/hd.c | 2 +- + drivers/block/loop.c | 9 +- + drivers/block/mg_disk.c | 4 +- + drivers/block/nbd.c | 7 +- + drivers/block/osdblk.c | 15 +- + drivers/block/paride/pcd.c | 21 +- + drivers/block/paride/pd.c | 11 +- + drivers/block/paride/pf.c | 26 +- + drivers/block/pktcdvd.c | 20 +- + drivers/block/ps3disk.c | 25 +- + drivers/block/swim.c | 20 +- + drivers/block/swim3.c | 32 +- + drivers/block/ub.c | 35 +- + drivers/block/umem.c | 2 +- + drivers/block/viodasd.c | 21 +- + drivers/block/virtio_blk.c | 88 +- + drivers/block/xd.c | 19 +- + drivers/block/xen-blkfront.c | 393 ++++-- + drivers/block/xsysace.c | 8 +- + drivers/block/z2ram.c | 13 +- + drivers/cdrom/cdrom.c | 46 +- + drivers/cdrom/gdrom.c | 48 +- + drivers/cdrom/viocd.c | 106 +- + drivers/ide/ide-atapi.c | 17 +- + drivers/ide/ide-cd.c | 98 +- + drivers/ide/ide-cd_ioctl.c | 2 +- + drivers/ide/ide-disk.c | 18 +- + drivers/ide/ide-disk_ioctl.c | 9 +- + drivers/ide/ide-eh.c | 5 +- + drivers/ide/ide-floppy.c | 27 +- + drivers/ide/ide-floppy_ioctl.c | 12 +- + drivers/ide/ide-gd.c | 19 +- + drivers/ide/ide-io.c | 8 +- + drivers/ide/ide-pm.c | 8 +- + drivers/ide/ide-tape.c | 22 +- + drivers/md/dm-io.c | 12 +- + drivers/md/dm-kcopyd.c | 2 +- + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm.c | 47 +- + drivers/md/linear.c | 2 +- + drivers/md/md.c | 16 +- + drivers/md/md.h | 4 +- + drivers/md/multipath.c | 8 +- + drivers/md/raid0.c | 2 +- + drivers/md/raid1.c | 22 +- + drivers/md/raid10.c | 12 +- + drivers/md/raid5.c | 2 +- + drivers/memstick/core/mspro_block.c | 12 +- + drivers/message/i2o/i2o_block.c | 30 +- + drivers/mmc/card/block.c | 5 + + drivers/mmc/card/queue.c | 4 +- + drivers/mtd/mtd_blkdevs.c | 15 +- + drivers/s390/block/dasd.c | 8 +- + drivers/s390/block/dcssblk.c | 5 + + drivers/s390/char/tape_block.c | 8 +- + drivers/scsi/aha1542.c | 25 - + drivers/scsi/osd/osd_initiator.c | 8 +- + drivers/scsi/scsi_error.c | 12 +- + drivers/scsi/scsi_lib.c | 14 +- + drivers/scsi/sd.c | 126 ++- + drivers/scsi/sd.h | 2 +- + drivers/scsi/sr.c | 25 +- + drivers/scsi/sun3_NCR5380.c | 2 +- + drivers/scsi/sun3_scsi.c | 2 +- + drivers/scsi/sun3_scsi_vme.c | 2 +- + drivers/staging/hv/blkvsc_drv.c | 13 +- + drivers/xen/xenbus/xenbus_client.c | 90 +- + fs/bio.c | 5 +- + fs/block_dev.c | 10 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/inode.c | 6 +- + fs/btrfs/volumes.c | 18 +- + fs/coda/psdev.c | 12 +- + fs/coda/upcall.c | 12 +- + fs/exofs/ios.c | 2 +- + fs/fs-writeback.c | 161 ++- + fs/gfs2/log.c | 4 +- + fs/gfs2/meta_io.c | 8 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/nilfs2/segbuf.c | 2 +- + fs/splice.c | 14 +- + include/linux/Kbuild | 1 + + include/linux/audit.h | 2 +- + include/linux/backing-dev.h | 23 +- + include/linux/bio.h | 158 +-- + include/linux/blk_types.h | 193 +++ + include/linux/blkdev.h | 142 +-- + include/linux/blktrace_api.h | 18 +- + include/linux/coda_psdev.h | 8 +- + include/linux/drbd.h | 2 +- + include/linux/drbd_nl.h | 9 +- + include/linux/fs.h | 45 +- + include/trace/events/block.h | 15 +- + include/trace/events/writeback.h | 159 +++ + kernel/power/block_io.c | 2 +- + kernel/trace/blktrace.c | 80 +- + mm/backing-dev.c | 445 +++---- + mm/page-writeback.c | 5 + + mm/page_io.c | 2 +- + 154 files changed, 4264 insertions(+), 3209 deletions(-) + create mode 100644 include/linux/blk_types.h + create mode 100644 include/trace/events/writeback.h +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Resolved 'drivers/md/dm.c' using previous resolution. +Auto-merging Documentation/devices.txt +Auto-merging drivers/md/dm-raid1.c +Auto-merging drivers/md/dm-stripe.c +Auto-merging drivers/md/dm.c +CONFLICT (content): Merge conflict in drivers/md/dm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9d585bf] Merge branch 'quilt/device-mapper' +$ git diff -M --stat --summary HEAD^.. + Documentation/devices.txt | 1 + + drivers/md/dm-crypt.c | 339 +++++++++++++++++++++------------------ + drivers/md/dm-delay.c | 6 +- + drivers/md/dm-exception-store.c | 4 +- + drivers/md/dm-exception-store.h | 3 +- + drivers/md/dm-ioctl.c | 206 ++++++++++++------------ + drivers/md/dm-linear.c | 3 +- + drivers/md/dm-mpath.c | 1 + + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-snap-persistent.c | 6 +- + drivers/md/dm-snap.c | 62 +++++-- + drivers/md/dm-stripe.c | 87 +++++++++-- + drivers/md/dm-table.c | 99 +++++++++++- + drivers/md/dm-target.c | 5 + + drivers/md/dm-zero.c | 5 + + drivers/md/dm.c | 267 +++++++++++++++++++++++------- + drivers/md/dm.h | 9 +- + include/linux/device-mapper.h | 16 ++- + include/linux/dm-ioctl.h | 5 +- + include/linux/miscdevice.h | 1 + + 20 files changed, 754 insertions(+), 373 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Resolved 'drivers/power/Kconfig' using previous resolution. +Resolved 'drivers/power/Makefile' using previous resolution. +Auto-merging drivers/power/Kconfig +CONFLICT (content): Merge conflict in drivers/power/Kconfig +Auto-merging drivers/power/Makefile +CONFLICT (content): Merge conflict in drivers/power/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da580dc] Merge remote branch 'battery/master' +$ git diff -M --stat --summary HEAD^.. + drivers/power/Kconfig | 13 + + drivers/power/Makefile | 2 + + drivers/power/intel_mid_battery.c | 799 +++++++++++++++++++++++++++++++++++++ + drivers/power/s3c_adc_battery.c | 431 ++++++++++++++++++++ + include/linux/s3c_adc_battery.h | 36 ++ + 5 files changed, 1281 insertions(+), 0 deletions(-) + create mode 100644 drivers/power/intel_mid_battery.c + create mode 100644 drivers/power/s3c_adc_battery.c + create mode 100644 include/linux/s3c_adc_battery.h +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Merge made by recursive. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + drivers/char/keyboard.c | 37 +++++++++++++++++++++++++++++++++++++ + drivers/serial/kgdboc.c | 13 +++++++++++++ + include/linux/kbd_kern.h | 1 + + 3 files changed, 51 insertions(+), 0 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already uptodate! +Merge made by recursive. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/touchscreen/Makefile +Removing include/linux/mfd/mc13783-private.h +Merge made by recursive. + drivers/gpio/Kconfig | 7 + + drivers/gpio/Makefile | 1 + + drivers/gpio/stmpe-gpio.c | 399 +++++++++++++ + drivers/gpio/wm831x-gpio.c | 32 ++ + drivers/hwmon/mc13783-adc.c | 17 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/stmpe-keypad.c | 386 +++++++++++++ + drivers/input/touchscreen/Kconfig | 10 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/stmpe-ts.c | 397 +++++++++++++ + drivers/mfd/88pm860x-core.c | 86 ++-- + drivers/mfd/Kconfig | 65 +++- + drivers/mfd/Makefile | 4 + + drivers/mfd/ab3100-otp.c | 16 +- + drivers/mfd/ab3550-core.c | 23 +- + drivers/mfd/ab8500-spi.c | 7 +- + drivers/mfd/abx500-core.c | 2 +- + drivers/mfd/davinci_voicecodec.c | 6 +- + drivers/mfd/janz-cmodio.c | 1 + + drivers/mfd/jz4740-adc.c | 394 +++++++++++++ + drivers/mfd/max8925-core.c | 27 + + drivers/mfd/mc13783-core.c | 30 +- + drivers/mfd/menelaus.c | 75 ++- + drivers/mfd/mfd-core.c | 4 +- + drivers/mfd/stmpe.c | 985 +++++++++++++++++++++++++++++++++ + drivers/mfd/stmpe.h | 183 ++++++ + drivers/mfd/t7l66xb.c | 3 +- + drivers/mfd/tc6387xb.c | 16 +- + drivers/mfd/tc6393xb.c | 4 +- + drivers/mfd/tps6586x.c | 375 +++++++++++++ + drivers/mfd/twl6030-pwm.c | 163 ++++++ + drivers/mfd/ucb1400_core.c | 2 +- + drivers/mfd/wm831x-core.c | 14 + + drivers/mfd/wm8350-core.c | 6 +- + drivers/mfd/wm8994-core.c | 4 +- + include/linux/jz4740-adc.h | 32 ++ + include/linux/mfd/mc13783-private.h | 220 -------- + include/linux/mfd/mc13783.h | 2 + + include/linux/mfd/stmpe.h | 201 +++++++ + include/linux/mfd/wm8994/gpio.h | 4 + + 41 files changed, 3884 insertions(+), 331 deletions(-) + create mode 100644 drivers/gpio/stmpe-gpio.c + create mode 100644 drivers/input/keyboard/stmpe-keypad.c + create mode 100644 drivers/input/touchscreen/stmpe-ts.c + create mode 100644 drivers/mfd/jz4740-adc.c + create mode 100644 drivers/mfd/stmpe.c + create mode 100644 drivers/mfd/stmpe.h + create mode 100644 drivers/mfd/tps6586x.c + create mode 100644 drivers/mfd/twl6030-pwm.c + create mode 100644 include/linux/jz4740-adc.h + delete mode 100644 include/linux/mfd/mc13783-private.h + create mode 100644 include/linux/mfd/stmpe.h +$ git reset --hard HEAD^ +HEAD is now at 76f1df7 Merge remote branch 'slab/for-next' +Merging refs/next/20100807/mfd +$ git merge refs/next/20100807/mfd +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/touchscreen/Makefile +Removing include/linux/mfd/mc13783-private.h +Merge made by recursive. + drivers/gpio/Kconfig | 7 + + drivers/gpio/Makefile | 1 + + drivers/gpio/stmpe-gpio.c | 399 +++++++++++++ + drivers/gpio/wm831x-gpio.c | 32 ++ + drivers/hwmon/mc13783-adc.c | 17 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/stmpe-keypad.c | 386 +++++++++++++ + drivers/input/touchscreen/Kconfig | 10 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/stmpe-ts.c | 397 +++++++++++++ + drivers/mfd/88pm860x-core.c | 86 ++-- + drivers/mfd/Kconfig | 51 ++- + drivers/mfd/Makefile | 3 + + drivers/mfd/ab3100-otp.c | 16 +- + drivers/mfd/ab3550-core.c | 23 +- + drivers/mfd/ab8500-spi.c | 7 +- + drivers/mfd/abx500-core.c | 2 +- + drivers/mfd/davinci_voicecodec.c | 6 +- + drivers/mfd/janz-cmodio.c | 1 + + drivers/mfd/jz4740-adc.c | 394 +++++++++++++ + drivers/mfd/max8925-core.c | 27 + + drivers/mfd/mc13783-core.c | 30 +- + drivers/mfd/mfd-core.c | 4 +- + drivers/mfd/stmpe.c | 985 +++++++++++++++++++++++++++++++++ + drivers/mfd/stmpe.h | 183 ++++++ + drivers/mfd/t7l66xb.c | 3 +- + drivers/mfd/tc6387xb.c | 16 +- + drivers/mfd/tc6393xb.c | 4 +- + drivers/mfd/twl6030-pwm.c | 163 ++++++ + drivers/mfd/ucb1400_core.c | 2 +- + drivers/mfd/wm831x-core.c | 14 + + drivers/mfd/wm8350-core.c | 6 +- + drivers/mfd/wm8994-core.c | 4 +- + include/linux/jz4740-adc.h | 32 ++ + include/linux/mfd/mc13783-private.h | 220 -------- + include/linux/mfd/mc13783.h | 2 + + include/linux/mfd/stmpe.h | 201 +++++++ + include/linux/mfd/wm8994/gpio.h | 4 + + 39 files changed, 3440 insertions(+), 310 deletions(-) + create mode 100644 drivers/gpio/stmpe-gpio.c + create mode 100644 drivers/input/keyboard/stmpe-keypad.c + create mode 100644 drivers/input/touchscreen/stmpe-ts.c + create mode 100644 drivers/mfd/jz4740-adc.c + create mode 100644 drivers/mfd/stmpe.c + create mode 100644 drivers/mfd/stmpe.h + create mode 100644 drivers/mfd/twl6030-pwm.c + create mode 100644 include/linux/jz4740-adc.h + delete mode 100644 include/linux/mfd/mc13783-private.h + create mode 100644 include/linux/mfd/stmpe.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 viafb/viafb-next +$ git merge viafb/viafb-next +Auto-merging drivers/video/via/via-core.c +Merge made by recursive. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Merge made by recursive. + drivers/mfd/Kconfig | 10 + + drivers/mfd/Makefile | 1 + + drivers/mfd/ab8500-core.c | 4 +- + drivers/mfd/max8998.c | 160 ++++++++ + drivers/regulator/Kconfig | 34 ++ + drivers/regulator/Makefile | 5 + + drivers/regulator/ab8500.c | 427 +++++++++++++++++++++ + drivers/regulator/ad5398.c | 288 +++++++++++++++ + drivers/regulator/isl6271a-regulator.c | 236 ++++++++++++ + drivers/regulator/max8998.c | 635 ++++++++++++++++++++++++++++++++ + drivers/regulator/tps65023-regulator.c | 2 + + drivers/regulator/tps6586x-regulator.c | 394 ++++++++++++++++++++ + include/linux/mfd/ab8500.h | 6 + + include/linux/mfd/max8998-private.h | 112 ++++++ + include/linux/mfd/max8998.h | 78 ++++ + include/linux/regulator/ab8500.h | 25 ++ + 16 files changed, 2416 insertions(+), 1 deletions(-) + create mode 100644 drivers/mfd/max8998.c + create mode 100644 drivers/regulator/ab8500.c + create mode 100644 drivers/regulator/ad5398.c + create mode 100644 drivers/regulator/isl6271a-regulator.c + create mode 100644 drivers/regulator/max8998.c + create mode 100644 drivers/regulator/tps6586x-regulator.c + create mode 100644 include/linux/mfd/max8998-private.h + create mode 100644 include/linux/mfd/max8998.h + create mode 100644 include/linux/regulator/ab8500.h +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merging include/linux/wlp.h +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/watchdog/Makefile +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + drivers/watchdog/Kconfig | 18 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/f71808e_wdt.c | 768 ++++++++++++++++++++++++++++++++++++++++ + drivers/watchdog/hpwdt.c | 4 +- + drivers/watchdog/s3c2410_wdt.c | 17 +- + drivers/watchdog/sch311x_wdt.c | 4 +- + drivers/watchdog/sp805_wdt.c | 387 ++++++++++++++++++++ + drivers/watchdog/wdt_pci.c | 15 +- + include/linux/pci_ids.h | 3 + + 9 files changed, 1192 insertions(+), 26 deletions(-) + create mode 100644 drivers/watchdog/f71808e_wdt.c + create mode 100644 drivers/watchdog/sp805_wdt.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging fs/exofs/file.c +Auto-merging fs/exofs/inode.c +Auto-merging fs/exofs/ios.c +Auto-merging fs/exofs/super.c +Merge made by recursive. + fs/exofs/file.c | 29 +++++++++++++++++------------ + fs/exofs/inode.c | 9 ++------- + fs/exofs/ios.c | 44 ++++++++++++-------------------------------- + fs/exofs/super.c | 1 - + 4 files changed, 31 insertions(+), 52 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Already up-to-date. +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/compat.c +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/inode_mark.c +CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree. +Auto-merging fs/open.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/fs.h +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/audit.c +Auto-merging kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/notify/inotify/inotify.c +fs/notify/inotify/inotify.c: needs merge +rm 'fs/notify/inotify/inotify.c' +$ git commit -v -a +[master 9686c3b] Merge remote branch 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/ia32/sys_ia32.c | 9 + + arch/x86/include/asm/sys_ia32.h | 3 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/file_table.c | 9 + + fs/inode.c | 8 +- + fs/namei.c | 2 +- + fs/namespace.c | 5 + + fs/nfsd/vfs.c | 4 +- + fs/notify/Kconfig | 1 + + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 213 +++---- + fs/notify/fanotify/Kconfig | 26 + + fs/notify/fanotify/Makefile | 1 + + fs/notify/fanotify/fanotify.c | 212 +++++++ + fs/notify/fanotify/fanotify_user.c | 760 ++++++++++++++++++++++++ + fs/notify/fsnotify.c | 201 ++++++-- + fs/notify/fsnotify.h | 27 +- + fs/notify/group.c | 182 +------ + fs/notify/inode_mark.c | 331 ++++-------- + fs/notify/inotify/Kconfig | 15 - + fs/notify/inotify/Makefile | 1 - + fs/notify/inotify/inotify.c | 872 ---------------------------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 151 ++++-- + fs/notify/inotify/inotify_user.c | 369 ++++++++----- + fs/notify/mark.c | 371 ++++++++++++ + fs/notify/notification.c | 236 +++++--- + fs/notify/vfsmount_mark.c | 187 ++++++ + fs/open.c | 3 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/dnotify.h | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 16 +- + include/linux/fsnotify.h | 161 +++--- + include/linux/fsnotify_backend.h | 211 +++++--- + include/linux/inotify.h | 185 +------ + include/linux/mount.h | 6 +- + include/linux/security.h | 1 + + include/linux/syscalls.h | 4 + + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 +- + kernel/audit_tree.c | 237 +++++---- + kernel/audit_watch.c | 274 +++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 7 +- + security/security.c | 16 +- + 58 files changed, 3197 insertions(+), 2378 deletions(-) + create mode 100644 fs/notify/fanotify/Kconfig + create mode 100644 fs/notify/fanotify/Makefile + create mode 100644 fs/notify/fanotify/fanotify.c + create mode 100644 fs/notify/fanotify/fanotify_user.c + delete mode 100644 fs/notify/inotify/inotify.c + create mode 100644 fs/notify/mark.c + create mode 100644 fs/notify/vfsmount_mark.c + create mode 100644 include/linux/fanotify.h +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5692cec] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging catalin/for-next +$ git merge catalin/for-next +Resolved 'arch/arm/include/asm/io.h' using previous resolution. +Resolved 'arch/arm/kernel/entry-armv.S' using previous resolution. +Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution. +Resolved 'arch/arm/mm/mmu.c' using previous resolution. +Auto-merging arch/arm/include/asm/io.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/io.h +Auto-merging arch/arm/kernel/entry-armv.S +CONFLICT (content): Merge conflict in arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/mm/cache-l2x0.c +CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/mmu.c +CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/proc-v6.S +Auto-merging arch/arm/mm/proc-v7.S +Auto-merging lib/Kconfig.debug +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 31d9f59] Merge remote branch 'catalin/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/assembler.h | 13 +++-- + arch/arm/include/asm/cacheflush.h | 9 +-- + arch/arm/include/asm/domain.h | 31 +++++++++++- + arch/arm/include/asm/futex.h | 9 ++-- + arch/arm/include/asm/pgtable.h | 29 ++++++++++- + arch/arm/include/asm/smp_plat.h | 4 ++ + arch/arm/include/asm/tlbflush.h | 12 ++++- + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +++--- + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 ++ + arch/arm/kernel/traps.c | 14 ++++-- + arch/arm/lib/getuser.S | 13 +++-- + arch/arm/lib/putuser.S | 29 ++++++----- + arch/arm/lib/uaccess.S | 83 ++++++++++++++++--------------- + arch/arm/mm/Kconfig | 16 ++++++ + arch/arm/mm/cache-l2x0.c | 15 +++++- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 6 ++ + arch/arm/mm/fault-armv.c | 8 ++-- + arch/arm/mm/flush.c | 46 +++++++++++++---- + arch/arm/mm/mmu.c | 20 ++++++- + arch/arm/mm/proc-macros.S | 7 +++ + arch/arm/mm/proc-v7.S | 5 +- + lib/Kconfig.debug | 7 +++ + mm/kmemleak.c | 98 ++++++++++++++++++++++++++++--------- + 28 files changed, 361 insertions(+), 146 deletions(-) +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by recursive. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/edac/i7core_edac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9886924] Merge remote branch 'i7core_edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Auto-merging drivers/ata/sata_fsl.c +Auto-merging drivers/block/xsysace.c +Auto-merging drivers/infiniband/hw/ehca/ehca_main.c +Auto-merging drivers/macintosh/therm_windtunnel.c +Auto-merging drivers/mtd/maps/physmap_of.c +Auto-merging drivers/pcmcia/m8xx_pcmcia.c +Auto-merging sound/soc/fsl/mpc5200_psc_ac97.c +Auto-merging sound/soc/fsl/mpc5200_psc_i2s.c +Merge made by recursive. + arch/powerpc/platforms/83xx/mpc837x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +- + arch/powerpc/sysdev/fsl_rio.c | 2 +- + drivers/ata/pata_mpc52xx.c | 8 ++-- + drivers/ata/pata_of_platform.c | 4 +- + drivers/ata/sata_fsl.c | 8 ++-- + drivers/atm/fore200e.c | 26 +++++++------- + drivers/block/xsysace.c | 4 +- + drivers/char/hw_random/n2-drv.c | 4 +- + drivers/char/hw_random/n2rng.h | 2 +- + drivers/char/hw_random/pasemi-rng.c | 4 +- + drivers/char/ipmi/ipmi_si_intf.c | 4 +- + drivers/char/rtc.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 4 +- + drivers/crypto/amcc/crypto4xx_core.c | 4 +- + drivers/crypto/amcc/crypto4xx_core.h | 2 +- + drivers/crypto/n2_core.c | 26 +++++++------- + drivers/crypto/talitos.c | 6 ++-- + drivers/dma/fsldma.c | 4 +- + drivers/dma/mpc512x_dma.c | 4 +- + drivers/dma/ppc4xx/adma.c | 8 ++-- + drivers/edac/mpc85xx_edac.c | 12 +++--- + drivers/edac/ppc4xx_edac.c | 12 +++--- + drivers/hwmon/ams/ams.h | 2 +- + drivers/hwmon/ultra45_env.c | 4 +- + drivers/i2c/busses/i2c-cpm.c | 8 ++-- + drivers/i2c/busses/i2c-ibm_iic.c | 6 ++-- + drivers/i2c/busses/i2c-mpc.c | 4 +- + drivers/infiniband/hw/ehca/ehca_classes.h | 2 +- + drivers/infiniband/hw/ehca/ehca_main.c | 4 +- + drivers/input/misc/sparcspkr.c | 10 +++--- + drivers/input/serio/i8042-sparcio.h | 8 ++-- + drivers/input/serio/xilinx_ps2.c | 4 +- + drivers/leds/leds-gpio.c | 4 +- + drivers/macintosh/macio_sysfs.c | 6 ++-- + drivers/macintosh/smu.c | 6 ++-- + drivers/macintosh/therm_adt746x.c | 2 +- + drivers/macintosh/therm_pm72.c | 6 ++-- + drivers/macintosh/therm_windtunnel.c | 6 ++-- + drivers/media/video/fsl-viu.c | 8 ++-- + drivers/mmc/host/mmc_spi.c | 1 + + drivers/mmc/host/sdhci-of-core.c | 8 ++-- + drivers/mtd/maps/physmap_of.c | 8 ++-- + drivers/mtd/maps/sun_uflash.c | 6 ++-- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 4 +- + drivers/mtd/nand/mpc5121_nfc.c | 4 +- + drivers/mtd/nand/ndfc.c | 6 ++-- + drivers/mtd/nand/pasemi_nand.c | 4 +- + drivers/mtd/nand/socrates_nand.c | 4 +- + drivers/net/can/mscan/mpc5xxx_can.c | 18 +++++----- + drivers/net/can/sja1000/sja1000_of_platform.c | 4 +- + drivers/net/ehea/ehea.h | 4 +- + drivers/net/ehea/ehea_main.c | 12 +++--- + drivers/net/fec_mpc52xx.c | 8 ++-- + drivers/net/fec_mpc52xx_phy.c | 4 +- + drivers/net/fs_enet/fs_enet-main.c | 4 +- + drivers/net/fs_enet/mac-fcc.c | 2 +- + drivers/net/fs_enet/mac-fec.c | 2 +- + drivers/net/fs_enet/mac-scc.c | 2 +- + drivers/net/fs_enet/mii-bitbang.c | 4 +- + drivers/net/fs_enet/mii-fec.c | 4 +- + drivers/net/fsl_pq_mdio.c | 4 +- + drivers/net/gianfar.c | 10 +++--- + drivers/net/gianfar.h | 2 +- + drivers/net/greth.c | 6 ++-- + drivers/net/greth.h | 2 +- + drivers/net/ibm_newemac/core.c | 6 ++-- + drivers/net/ibm_newemac/core.h | 12 +++--- + drivers/net/ibm_newemac/mal.c | 4 +- + drivers/net/ibm_newemac/mal.h | 2 +- + drivers/net/ibm_newemac/rgmii.c | 18 +++++----- + drivers/net/ibm_newemac/rgmii.h | 16 ++++---- + drivers/net/ibm_newemac/tah.c | 14 ++++---- + drivers/net/ibm_newemac/tah.h | 12 +++--- + drivers/net/ibm_newemac/zmii.c | 18 +++++----- + drivers/net/ibm_newemac/zmii.h | 16 ++++---- + drivers/net/ll_temac_main.c | 8 ++-- + drivers/net/myri_sbus.c | 4 +- + drivers/net/myri_sbus.h | 2 +- + drivers/net/niu.c | 8 ++-- + drivers/net/phy/mdio-gpio.c | 4 +- + drivers/net/sunbmac.c | 18 +++++----- + drivers/net/sunbmac.h | 4 +- + drivers/net/sunhme.c | 22 ++++++------ + drivers/net/sunhme.h | 2 +- + drivers/net/sunlance.c | 20 ++++++------ + drivers/net/sunqe.c | 16 ++++---- + drivers/net/sunqe.h | 4 +- + drivers/net/ucc_geth.c | 8 ++-- + drivers/net/xilinx_emaclite.c | 6 ++-- + drivers/of/device.c | 2 +- + drivers/parport/parport_sunbpp.c | 4 +- + drivers/pcmcia/electra_cf.c | 6 ++-- + drivers/pcmcia/m8xx_pcmcia.c | 4 +- + drivers/rtc/rtc-mpc5121.c | 4 +- + drivers/sbus/char/bbc_envctrl.c | 6 ++-- + drivers/sbus/char/bbc_i2c.c | 18 +++++----- + drivers/sbus/char/bbc_i2c.h | 10 +++--- + drivers/sbus/char/display7seg.c | 4 +- + drivers/sbus/char/envctrl.c | 4 +- + drivers/sbus/char/flash.c | 4 +- + drivers/sbus/char/uctrl.c | 4 +- + drivers/scsi/qlogicpti.c | 14 ++++---- + drivers/scsi/qlogicpti.h | 2 +- + drivers/scsi/sun_esp.c | 44 ++++++++++++------------ + drivers/serial/apbuart.c | 2 +- + drivers/serial/cpm_uart/cpm_uart_core.c | 4 +- + drivers/serial/mpc52xx_uart.c | 8 ++-- + drivers/serial/nwpserial.c | 2 +- + drivers/serial/of_serial.c | 6 ++-- + drivers/serial/sunhv.c | 4 +- + drivers/serial/sunsab.c | 8 ++-- + drivers/serial/sunsu.c | 8 ++-- + drivers/serial/sunzilog.c | 6 ++-- + drivers/serial/uartlite.c | 4 +- + drivers/serial/ucc_uart.c | 4 +- + drivers/spi/mpc512x_psc_spi.c | 4 +- + drivers/spi/mpc52xx_psc_spi.c | 4 +- + drivers/spi/mpc52xx_spi.c | 4 +- + drivers/spi/spi_mpc8xxx.c | 4 +- + drivers/spi/spi_ppc4xx.c | 6 ++-- + drivers/spi/xilinx_spi_of.c | 6 ++-- + drivers/usb/gadget/fsl_qe_udc.c | 10 +++--- + drivers/usb/host/ehci-ppc-of.c | 6 ++-- + drivers/usb/host/ehci-xilinx-of.c | 12 +++--- + drivers/usb/host/fhci-hcd.c | 4 +- + drivers/usb/host/isp1760-if.c | 4 +- + drivers/usb/host/ohci-ppc-of.c | 6 ++-- + drivers/video/bw2.c | 4 +- + drivers/video/cg14.c | 6 ++-- + drivers/video/cg3.c | 4 +- + drivers/video/cg6.c | 6 ++-- + drivers/video/ffb.c | 4 +- + drivers/video/fsl-diu-fb.c | 8 ++-- + drivers/video/leo.c | 6 ++-- + drivers/video/mb862xx/mb862xxfb.c | 4 +- + drivers/video/p9100.c | 4 +- + drivers/video/platinumfb.c | 4 +- + drivers/video/sunxvr1000.c | 4 +- + drivers/video/tcx.c | 6 ++-- + drivers/video/xilinxfb.c | 4 +- + drivers/watchdog/cpwd.c | 4 +- + drivers/watchdog/gef_wdt.c | 2 +- + drivers/watchdog/mpc8xxx_wdt.c | 4 +- + drivers/watchdog/riowd.c | 4 +- + include/linux/of_device.h | 16 --------- + include/linux/of_platform.h | 14 ++++++-- + sound/aoa/soundbus/core.c | 2 +- + sound/aoa/soundbus/soundbus.h | 2 +- + sound/aoa/soundbus/sysfs.c | 2 +- + sound/soc/fsl/mpc5200_dma.c | 4 +- + sound/soc/fsl/mpc5200_dma.h | 4 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 4 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 4 +- + sound/soc/fsl/mpc8610_hpcd.c | 4 +- + sound/sparc/amd7930.c | 8 ++-- + sound/sparc/cs4231.c | 18 +++++----- + sound/sparc/dbri.c | 8 ++-- + 159 files changed, 523 insertions(+), 530 deletions(-) +Merging spi/next-spi +$ git merge spi/next-spi +Auto-merging drivers/mmc/host/mmc_spi.c +Auto-merging drivers/spi/mpc512x_psc_spi.c +CONFLICT (content): Merge conflict in drivers/spi/mpc512x_psc_spi.c +Auto-merging drivers/spi/spi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/spi/mpc512x_psc_spi.c'. +[master 7bc0d2c] Merge remote branch 'spi/next-spi' +$ git diff -M --stat --summary HEAD^.. + drivers/mmc/host/mmc_spi.c | 59 ++--------- + drivers/spi/amba-pl022.c | 6 +- + drivers/spi/mpc512x_psc_spi.c | 14 ++-- + drivers/spi/omap_spi_100k.c | 23 ++-- + drivers/spi/spi.c | 225 ++++++++++++++++++++++++++++++++++------ + drivers/spi/spi_bitbang.c | 9 +- + drivers/spi/spi_bitbang_txrx.h | 16 ++- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_gpio.c | 109 +++++++++++++++---- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/spi/spi_s3c24xx_gpio.c | 8 +- + drivers/spi/spi_sh_sci.c | 8 +- + include/linux/spi/spi.h | 12 ++ + include/linux/spi/spi_gpio.h | 5 + + 14 files changed, 352 insertions(+), 146 deletions(-) +$ git am -3 ../patches/0001-spi-update-for-of_device-to-platform_device-replacem.patch +Applying: spi: update for of_device to platform_device replacement +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/ata/sata_dwc_460ex.c +$ git add . +$ git commit -v -a --amend +[master 652fcf96] Merge remote branch 'spi/next-spi' +Merging limits/writable_limits +$ git merge limits/writable_limits +Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. +Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. +Resolved 'include/asm-generic/unistd.h' using previous resolution. +Auto-merging arch/x86/ia32/ia32entry.S +CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/include/asm/unistd_32.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S +Auto-merging include/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/asm-generic/unistd.h +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging kernel/posix-cpu-timers.c +Auto-merging security/capability.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d586c33] Merge remote branch 'limits/writable_limits' +$ git diff -M --stat --summary HEAD^.. + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + include/asm-generic/unistd.h | 4 +- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 9 ++ + include/linux/security.h | 9 +- + include/linux/syscalls.h | 4 + + kernel/compat.c | 17 +--- + kernel/posix-cpu-timers.c | 8 +- + kernel/sys.c | 202 ++++++++++++++++++++++++++++-------- + security/capability.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 12 ++- + 15 files changed, 207 insertions(+), 75 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/kernel/apic/apic.c +Auto-merging arch/x86/kernel/process.c +Merge made by recursive. + arch/x86/include/asm/uv/uv_bau.h | 151 ++++++--- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/mpparse.c | 16 + + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/tlb_uv.c | 740 +++++++++++++++++++++++++------------- + arch/x86/oprofile/nmi_int.c | 1 + + tools/perf/builtin-report.c | 31 ++- + tools/perf/builtin-timechart.c | 4 +- + tools/perf/builtin-trace.c | 19 +- + tools/perf/util/hist.c | 3 + + tools/perf/util/newt.c | 242 ++++++++++++- + tools/perf/util/probe-finder.c | 1 - + tools/perf/util/sort.c | 6 +- + tools/perf/util/symbol.c | 30 ++- + tools/perf/util/symbol.h | 1 + + 15 files changed, 913 insertions(+), 335 deletions(-) +Merging lost-spurious-irq/lost-spurious-irq +$ git merge lost-spurious-irq/lost-spurious-irq +Resolved 'drivers/ata/sata_fsl.c' using previous resolution. +Resolved 'drivers/ata/sata_mv.c' using previous resolution. +Resolved 'drivers/ata/sata_nv.c' using previous resolution. +Resolved 'include/linux/libata.h' using previous resolution. +Auto-merging arch/arm/mach-bcmring/core.c +Auto-merging arch/arm/mach-ep93xx/core.c +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Auto-merging arch/arm/mach-mmp/time.c +Auto-merging arch/arm/plat-iop/time.c +Auto-merging arch/ia64/kernel/time.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/sata_fsl.c +CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c +Auto-merging drivers/ata/sata_mv.c +CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c +Auto-merging drivers/ata/sata_nv.c +CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/libata.h +CONFLICT (content): Merge conflict in include/linux/libata.h +Auto-merging kernel/irq/manage.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e2257a6] Merge remote branch 'lost-spurious-irq/lost-spurious-irq' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-at91/at91rm9200_time.c | 2 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-cns3xxx/core.c | 2 +- + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-footbridge/dc21285-timer.c | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 2 +- + arch/arm/mach-h720x/cpu-h7201.c | 2 +- + arch/arm/mach-h720x/cpu-h7202.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 3 - + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-nuc93x/time.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-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-shark/core.c | 2 +- + arch/arm/mach-u300/timer.c | 2 +- + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-samsung/time.c | 2 +- + arch/arm/plat-versatile/timer-sp.c | 2 +- + arch/blackfin/kernel/time-ts.c | 6 +- + arch/ia64/kernel/time.c | 2 +- + arch/parisc/kernel/irq.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 5 +- + arch/x86/kernel/time.c | 2 +- + drivers/ata/libata-core.c | 54 ++- + drivers/ata/libata-eh.c | 4 +- + drivers/ata/libata-sff.c | 37 +- + drivers/ata/sata_fsl.c | 8 +- + drivers/ata/sata_mv.c | 25 +- + drivers/ata/sata_nv.c | 57 +-- + drivers/clocksource/sh_cmt.c | 3 +- + drivers/clocksource/sh_mtu2.c | 3 +- + drivers/clocksource/sh_tmu.c | 3 +- + drivers/usb/core/hcd.c | 1 + + include/linux/interrupt.h | 43 +- + include/linux/irq.h | 40 +- + include/linux/libata.h | 2 + + kernel/irq/chip.c | 20 +- + kernel/irq/handle.c | 7 +- + kernel/irq/internals.h | 10 +- + kernel/irq/manage.c | 18 +- + kernel/irq/proc.c | 5 +- + kernel/irq/spurious.c | 978 +++++++++++++++++++++++++----- + 59 files changed, 1062 insertions(+), 344 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + kernel/workqueue.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Resolved 'mm/memory-failure.c' using previous resolution. +Auto-merging mm/memory-failure.c +CONFLICT (content): Merge conflict in mm/memory-failure.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 75a5f92] Merge remote branch 'hwpoison/hwpoison' +$ git diff -M --stat --summary HEAD^.. + include/linux/hugetlb.h | 14 +--- + include/linux/hugetlb_inline.h | 22 +++++++ + include/linux/pagemap.h | 9 +++- + include/linux/poison.h | 9 --- + include/linux/rmap.h | 5 ++ + mm/hugetlb.c | 104 ++++++++++++++++++++++++++++++++++- + mm/hwpoison-inject.c | 15 +++-- + mm/memory-failure.c | 120 ++++++++++++++++++++++++++++++---------- + mm/rmap.c | 59 ++++++++++++++++++++ + 9 files changed, 299 insertions(+), 58 deletions(-) + create mode 100644 include/linux/hugetlb_inline.h +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging bkl-core/bkl/core +$ git merge bkl-core/bkl/core +Already up-to-date. +Merging bkl-procfs/bkl/procfs +$ git merge bkl-procfs/bkl/procfs +Already up-to-date. +Merging bkl-ioctl/bkl/ioctl +$ git merge bkl-ioctl/bkl/ioctl +Auto-merging net/sunrpc/cache.c +Merge made by recursive. + fs/ncpfs/ioctl.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging drivers/base/platform.c +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +Merge made by recursive. +Merging quilt/tty +$ git merge quilt/tty +Resolved 'drivers/char/vt.c' using previous resolution. +Resolved 'include/linux/serial_core.h' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/char/Makefile +Auto-merging drivers/char/keyboard.c +Auto-merging drivers/char/tty_io.c +Auto-merging drivers/char/vt.c +CONFLICT (content): Merge conflict in drivers/char/vt.c +Auto-merging drivers/gpu/drm/i915/intel_fb.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/serial/68328serial.c +Auto-merging drivers/serial/8250.c +Auto-merging drivers/serial/Kconfig +Auto-merging drivers/video/console/fbcon.c +Auto-merging include/linux/fb.h +Auto-merging include/linux/serial_core.h +CONFLICT (content): Merge conflict in include/linux/serial_core.h +Auto-merging include/linux/tty.h +Auto-merging lib/Kconfig.debug +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2b15b75] Merge branch 'quilt/tty' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 3 + + arch/alpha/include/asm/ioctls.h | 4 +- + arch/alpha/include/asm/termbits.h | 1 + + arch/arm/include/asm/ioctls.h | 2 + + arch/arm/include/asm/termbits.h | 1 + + arch/avr32/include/asm/ioctls.h | 4 +- + arch/avr32/include/asm/termbits.h | 1 + + arch/cris/include/asm/ioctls.h | 4 +- + arch/cris/include/asm/termbits.h | 1 + + arch/frv/include/asm/ioctls.h | 2 + + arch/frv/include/asm/termbits.h | 1 + + arch/h8300/include/asm/ioctls.h | 2 + + arch/h8300/include/asm/termbits.h | 1 + + arch/ia64/include/asm/ioctls.h | 4 +- + arch/ia64/include/asm/termbits.h | 1 + + arch/m32r/include/asm/ioctls.h | 4 +- + arch/m32r/include/asm/termbits.h | 1 + + arch/m68k/include/asm/ioctls.h | 2 + + arch/m68k/include/asm/termbits.h | 1 + + arch/mips/include/asm/ioctls.h | 5 +- + arch/mips/include/asm/termbits.h | 1 + + arch/mn10300/include/asm/ioctls.h | 4 +- + arch/mn10300/include/asm/termbits.h | 1 + + arch/parisc/include/asm/ioctls.h | 4 +- + arch/parisc/include/asm/termbits.h | 1 + + arch/powerpc/include/asm/ioctls.h | 2 + + arch/powerpc/include/asm/termbits.h | 1 + + arch/s390/include/asm/ioctls.h | 2 + + arch/sh/include/asm/ioctls.h | 2 + + arch/sparc/include/asm/ioctls.h | 2 + + arch/sparc/include/asm/termbits.h | 1 + + arch/xtensa/include/asm/ioctls.h | 2 + + arch/xtensa/include/asm/termbits.h | 1 + + drivers/char/Makefile | 1 + + drivers/char/amiserial.c | 25 +- + drivers/char/briq_panel.c | 6 +- + drivers/char/cyclades.c | 22 +- + drivers/char/epca.c | 4 +- + drivers/char/ip2/ip2main.c | 4 + + drivers/char/isicom.c | 13 +- + drivers/char/istallion.c | 68 +- + drivers/char/keyboard.c | 10 +- + drivers/char/mxser.c | 2 +- + drivers/char/n_gsm.c | 1 - + drivers/char/n_hdlc.c | 16 +- + drivers/char/n_r3964.c | 10 +- + drivers/char/n_tty.c | 17 +- + drivers/char/nozomi.c | 4 +- + drivers/char/pty.c | 47 +- + drivers/char/riscom8.c | 14 +- + drivers/char/rocket.c | 28 +- + drivers/char/selection.c | 13 +- + drivers/char/serial167.c | 8 +- + drivers/char/specialix.c | 13 +- + drivers/char/stallion.c | 20 +- + drivers/char/sx.c | 12 +- + drivers/char/synclink.c | 21 +- + drivers/char/synclink_gt.c | 92 +- + drivers/char/synclinkmp.c | 43 +- + drivers/char/tty_io.c | 150 ++-- + drivers/char/tty_ioctl.c | 18 +- + drivers/char/tty_ldisc.c | 43 +- + drivers/char/tty_mutex.c | 47 + + drivers/char/tty_port.c | 4 +- + drivers/char/vc_screen.c | 4 +- + drivers/char/vt.c | 37 +- + drivers/char/vt_ioctl.c | 17 +- + drivers/gpu/drm/i915/intel_fb.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 + + drivers/gpu/drm/radeon/radeon_fb.c | 2 +- + drivers/serial/21285.c | 10 +- + drivers/serial/68328serial.c | 18 +- + drivers/serial/68360serial.c | 4 +- + drivers/serial/8250.c | 46 +- + drivers/serial/8250_early.c | 57 +- + drivers/serial/8250_pci.c | 13 + + drivers/serial/Kconfig | 44 + + drivers/serial/Makefile | 4 + + drivers/serial/altera_uart.c | 2 +- + drivers/serial/atmel_serial.c | 11 +- + drivers/serial/bfin_5xx.c | 7 +- + drivers/serial/crisv10.c | 12 +- + drivers/serial/imx.c | 10 +- + drivers/serial/ioc3_serial.c | 9 +- + drivers/serial/ioc4_serial.c | 9 +- + drivers/serial/max3100.c | 7 +- + drivers/serial/max3107-aava.c | 344 +++++++ + drivers/serial/max3107.c | 1197 ++++++++++++++++++++++++ + drivers/serial/max3107.h | 441 +++++++++ + drivers/serial/mcf.c | 31 +- + drivers/serial/mfd.c | 1498 +++++++++++++++++++++++++++++++ + drivers/serial/mrst_max3110.c | 844 +++++++++++++++++ + drivers/serial/mrst_max3110.h | 59 ++ + drivers/serial/serial_core.c | 288 +++---- + drivers/serial/timbuart.c | 6 +- + drivers/usb/class/cdc-acm.c | 12 +- + drivers/usb/serial/digi_acceleport.c | 14 +- + drivers/video/console/fbcon.c | 4 +- + drivers/video/console/vgacon.c | 2 - + fs/compat_ioctl.c | 1 + + include/asm-generic/ioctls.h | 8 +- + include/asm-generic/termbits.h | 1 + + include/linux/console_struct.h | 4 +- + include/linux/fb.h | 4 + + include/linux/istallion.h | 2 +- + include/linux/serial.h | 9 +- + include/linux/serial_8250.h | 5 + + include/linux/serial_core.h | 11 +- + include/linux/serial_mfd.h | 47 + + include/linux/serial_reg.h | 16 + + include/linux/tty.h | 68 ++ + include/linux/vt_kern.h | 64 ++- + lib/Kconfig.debug | 10 + + 113 files changed, 5524 insertions(+), 639 deletions(-) + create mode 100644 drivers/char/tty_mutex.c + create mode 100644 drivers/serial/max3107-aava.c + create mode 100644 drivers/serial/max3107.c + create mode 100644 drivers/serial/max3107.h + create mode 100644 drivers/serial/mfd.c + create mode 100644 drivers/serial/mrst_max3110.c + create mode 100644 drivers/serial/mrst_max3110.h + create mode 100644 include/linux/serial_mfd.h +Merging quilt/usb +$ git merge quilt/usb +Auto-merging drivers/usb/atm/ueagle-atm.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging drivers/usb/gadget/gmidi.c +Auto-merging drivers/usb/host/ohci-hcd.c +Merge made by recursive. + .../testing/sysfs-devices-platform-_UDC_-gadget | 12 + + Documentation/usb/ehci.txt | 2 +- + Documentation/usb/gadget_multi.txt | 150 +++ + Documentation/usb/gadget_serial.txt | 87 +-- + Documentation/usb/hotplug.txt | 4 +- + Documentation/usb/linux-cdc-acm.inf | 107 ++ + Documentation/usb/linux.inf | 228 +--- + arch/arm/mach-mx3/mach-armadillo5x0.c | 4 +- + arch/arm/mach-mx3/mach-mx31lilly.c | 4 +- + arch/arm/mach-mx3/mach-mx31lite.c | 2 +- + arch/arm/mach-mx3/mach-mx31moboard.c | 2 +- + arch/arm/mach-mx3/mach-pcm037.c | 4 +- + arch/arm/mach-mx3/mach-pcm043.c | 2 +- + arch/arm/mach-mx3/mx31moboard-smartbot.c | 2 +- + .../arm/plat-samsung/include/plat/regs-usb-hsotg.h | 2 + + drivers/staging/usbip/vhci_hcd.c | 6 +- + drivers/usb/Makefile | 2 +- + drivers/usb/atm/cxacru.c | 11 +- + drivers/usb/atm/speedtch.c | 10 +- + drivers/usb/atm/ueagle-atm.c | 5 +- + drivers/usb/atm/usbatm.c | 23 +- + drivers/usb/atm/usbatm.h | 22 +- + drivers/usb/atm/xusbatm.c | 10 +- + drivers/usb/c67x00/c67x00-hcd.c | 4 +- + drivers/usb/class/usblp.c | 371 +++--- + drivers/usb/core/devio.c | 7 +- + drivers/usb/core/driver.c | 11 +- + drivers/usb/core/endpoint.c | 9 +- + drivers/usb/core/generic.c | 4 +- + drivers/usb/core/hcd-pci.c | 202 ++- + drivers/usb/core/hcd.c | 79 +- + drivers/usb/core/hub.c | 13 +- + drivers/usb/core/inode.c | 4 - + drivers/usb/core/quirks.c | 3 + + drivers/usb/core/urb.c | 50 +- + drivers/usb/core/usb.c | 6 +- + drivers/usb/gadget/Kconfig | 52 +- + drivers/usb/gadget/Makefile | 3 +- + drivers/usb/gadget/audio.c | 4 +- + drivers/usb/gadget/cdc2.c | 4 +- + drivers/usb/gadget/composite.c | 73 +- + drivers/usb/gadget/dbgp.c | 434 +++++++ + drivers/usb/gadget/dummy_hcd.c | 6 +- + drivers/usb/gadget/ether.c | 6 +- + drivers/usb/gadget/f_fs.c | 38 +- + drivers/usb/gadget/f_hid.c | 6 +- + drivers/usb/gadget/f_loopback.c | 4 +- + drivers/usb/gadget/f_mass_storage.c | 125 ++- + drivers/usb/gadget/f_sourcesink.c | 2 +- + drivers/usb/gadget/file_storage.c | 104 ++- + drivers/usb/gadget/g_ffs.c | 176 +-- + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/hid.c | 4 +- + drivers/usb/gadget/inode.c | 16 +- + drivers/usb/gadget/langwell_udc.c | 6 +- + drivers/usb/gadget/mass_storage.c | 24 +- + drivers/usb/gadget/multi.c | 262 +++-- + drivers/usb/gadget/printer.c | 9 +- + drivers/usb/gadget/s3c-hsotg.c | 153 ++- + drivers/usb/gadget/serial.c | 4 +- + drivers/usb/gadget/storage_common.c | 105 ++- + drivers/usb/gadget/u_ether.c | 15 +- + drivers/usb/gadget/u_serial.c | 1 + + drivers/usb/gadget/webcam.c | 4 +- + drivers/usb/gadget/zero.c | 2 +- + drivers/usb/host/Kconfig | 11 +- + drivers/usb/host/ehci-au1xxx.c | 2 +- + drivers/usb/host/ehci-dbg.c | 196 +++- + drivers/usb/host/ehci-fsl.c | 3 +- + drivers/usb/host/ehci-hcd.c | 49 +- + drivers/usb/host/ehci-hub.c | 25 +- + drivers/usb/host/ehci-lpm.c | 83 ++ + drivers/usb/host/ehci-omap.c | 36 + + drivers/usb/host/ehci-pci.c | 26 +- + drivers/usb/host/ehci-q.c | 3 +- + drivers/usb/host/ehci-sched.c | 182 ++-- + drivers/usb/host/ehci.h | 18 +- + drivers/usb/host/hwa-hc.c | 4 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/isp1362.h | 24 +- + drivers/usb/host/isp1760-hcd.c | 3 +- + drivers/usb/host/ohci-dbg.c | 4 +- + drivers/usb/host/ohci-hcd.c | 6 +- + drivers/usb/host/ohci-hub.c | 23 +- + drivers/usb/host/ohci-pci.c | 2 +- + drivers/usb/host/ohci-ssb.c | 52 +- + drivers/usb/host/oxu210hp-hcd.c | 7 +- + drivers/usb/host/sl811-hcd.c | 5 +- + drivers/usb/host/uhci-debug.c | 23 +- + drivers/usb/host/uhci-hcd.c | 87 +- + drivers/usb/host/uhci-hcd.h | 7 +- + drivers/usb/host/uhci-hub.c | 6 +- + drivers/usb/host/uhci-q.c | 4 +- + drivers/usb/host/whci/hcd.c | 2 +- + drivers/usb/host/whci/qset.c | 2 +- + drivers/usb/host/xhci-mem.c | 101 +- + drivers/usb/host/xhci-pci.c | 9 + + drivers/usb/host/xhci-ring.c | 1332 +++++++++++++++----- + drivers/usb/host/xhci.c | 344 +++--- + drivers/usb/host/xhci.h | 30 +- + drivers/usb/misc/ftdi-elan.c | 4 +- + drivers/usb/misc/iowarrior.c | 23 +- + drivers/usb/misc/legousbtower.c | 6 +- + drivers/usb/misc/rio500.c | 15 +- + drivers/usb/misc/sisusbvga/sisusb.c | 10 +- + drivers/usb/misc/usblcd.c | 24 +- + drivers/usb/misc/usbtest.c | 14 +- + drivers/usb/mon/mon_bin.c | 24 +- + drivers/usb/musb/musb_core.c | 7 +- + drivers/usb/musb/musb_debugfs.c | 32 +- + drivers/usb/musb/musb_gadget_ep0.c | 3 + + drivers/usb/musb/musb_virthub.c | 2 +- + drivers/usb/musb/musbhsdma.c | 5 +- + drivers/usb/musb/omap2430.c | 6 - + drivers/usb/otg/Kconfig | 2 - + drivers/usb/otg/ulpi.c | 134 ++- + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/cp210x.c | 4 + + drivers/usb/serial/ftdi_sio.c | 4 + + drivers/usb/serial/ftdi_sio_ids.h | 10 + + drivers/usb/serial/generic.c | 15 +- + drivers/usb/serial/io_ti.c | 4 +- + drivers/usb/serial/ipaq.c | 1 - + drivers/usb/serial/iuu_phoenix.c | 54 +- + drivers/usb/serial/option.c | 17 +- + drivers/usb/serial/ssu100.c | 698 ++++++++++ + drivers/usb/serial/usb-serial.c | 32 +- + drivers/usb/storage/freecom.c | 23 +- + drivers/usb/storage/isd200.c | 3 +- + drivers/usb/storage/usb.c | 4 + + drivers/usb/usb-skeleton.c | 8 +- + include/linux/usb.h | 5 +- + include/linux/usb/composite.h | 6 + + include/linux/usb/ehci_def.h | 23 + + include/linux/usb/functionfs.h | 6 +- + include/linux/usb/hcd.h | 31 +- + include/linux/usb/otg.h | 11 +- + include/linux/usb/quirks.h | 4 + + include/linux/usb/ulpi.h | 40 + + 140 files changed, 5019 insertions(+), 2126 deletions(-) + create mode 100644 Documentation/usb/gadget_multi.txt + create mode 100644 Documentation/usb/linux-cdc-acm.inf + create mode 100644 drivers/usb/gadget/dbgp.c + create mode 100644 drivers/usb/host/ehci-lpm.c + create mode 100644 drivers/usb/serial/ssu100.c +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..8e9db3c28855 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,26 @@ +Importing driver-core.current based on 2.6.35-git2 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +Unchanged quilt series usb.current +Importing staging.current based on quilt/usb.current +Unchanged quilt series staging.current +Importing i2c based on 2.6.35-rc5-git3 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.35-rc5-git3 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.35-rc3 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.35-rc6-19-g86c65a7 +Unchanged quilt series rr +Importing device-mapper based on v2.6.35-rc5-176-gcd5b8f8 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +Unchanged quilt series driver-core +Importing tty based on quilt/driver-core +Unchanged quilt series tty +Importing usb based on quilt/tty +Unchanged quilt series usb diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..49c6d8b91de6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100809 |