diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-03 17:54:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-03 17:54:26 +1100 |
| commit | 2afa434ee9392947cf3ce927ee57aa787462465a (patch) | |
| tree | 9a627d1e697e763d68e7bff2391fdcc5d1c34b94 | |
| parent | 880ce2eac937be6f224e70c58b9cb450e36f5e6e (diff) | |
Add linux-next specific files for 20110303next-20110303
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 185 | ||||
| -rw-r--r-- | Next/Trees | 187 | ||||
| -rw-r--r-- | Next/merge.log | 8990 | ||||
| -rw-r--r-- | Next/quilt-import.log | 45 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9408 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..8938b904b216 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,185 @@ +Name SHA1 +---- ---- +origin dd9c1549edef02290edced639f67b54a25abbe0e +fixes 6f576d57f1fa0d6026b495d8746d56d949989161 +kbuild-current b7bd182176960fdd139486cadb9962b39f8a2b50 +arm-current 493f3358cb289ccf716c5a14fa5bb52ab75943e5 +m68k-current 85e2efbb1db9a18d218006706d6e4fbeb0216213 +powerpc-merge e0780b720f75487911e0174ec3dec2da49f7bbfa +52xx-and-virtex-current dd9c1549edef02290edced639f67b54a25abbe0e +sparc-current dbb988cf34a62e69c8863f212be212c6841004ba +scsi-rc-fixes 52208ae3fc60cbcb214c10fb8b82304199e2cc3a +net-current 0197b087ed6384760656f1e4a620a3e92d8dc0b0 +sound-current 11be6a269d2ad3e94c0597f21786092b8340a822 +pci-current 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d +wireless-current 2b799a6b25bb9f9fbc478782cd9503e8066ab618 +driver-core.current ebf53826e105f488f4f628703a108e98940d1dc5 +tty.current dd9c1549edef02290edced639f67b54a25abbe0e +usb.current dd9c1549edef02290edced639f67b54a25abbe0e +staging.current 85e2efbb1db9a18d218006706d6e4fbeb0216213 +cpufreq-current 853cee26e2a0c5f97386beca4c67b11c3cd85b8e +input-current 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 +md-current f0b4f7e2f29af678bd9af43422c537dcb6008603 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 9d20b571f5bda7273656e1b86ef91eddc94adacc +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current d60cf53a30956e47919788b2ef49287786a959c9 +rmobile-current 0acb6209a2443797cf2e15b3d978a03efa0765a3 +fbdev-current 45f1798484748894c348a76fcf0b9ec43d891795 +devicetree-current a74ea43df1afc68f265c0ac2cb64031d855ae97b +spi-current 0f3e1d27a7e3f98d996d707d649128e229b65deb +arm 0b5a2ef525da60533bada974b51d261037a9ca42 +davinci 2e3e2a5e4fef586ae9b1cfef42823c0aef1797f4 +i.MX 6a3f3c9fc55cca16ccde663ed093a4db7d95187c +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm bd32344a6baa8baac9c2b3e9c6c649cc4ed53920 +omap 8971fe3684c0d1c0924f5409b78447cb558497fd +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 6965f4727f4e62ec3a866d46268cf23333127590 +s5p 357d17723e59105f48f007b1bb364700a996cd45 +tegra ccac05152e7c6a8103b9e7a801bc995180a800fc +ux500-core 1a3d630b5cfd8c419f8acaade54a38701bf0f16e +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin afe8a887550f7cc24eb16449670b93f6b43c32d8 +cris 60cc10ed86d8aedf464e1a7b95c65b0c3425a9ed +ia64 ce153a162f0d2decf0f76c5d9db18344bf58acc0 +m68k 87ec8a4240cf251ee46ef1a08214b0a706fd4e9a +m68knommu f486ba8310e072b92157ca34f48c342b64d86774 +microblaze 4a508dd259f5995b8d31c576b894263f5947d654 +mips 7ccc13016a363197733c63688f21bb6a521db498 +parisc 1c0f647690f1b9471d63af48dec960bc59492e61 +powerpc 8dbdea8444d303a772bceb1ba963f0e3273bfc5e +4xx 21a06b0459f5e3ecdeccacfbf076c229514c1840 +52xx-and-virtex 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d +galak b49d81ded47e9d01f7128fce50d224ccc2150960 +s390 1c240d9c095e659b6ac432f0d2b28432891211de +sh 18e9550273b8a4d28044202f51cb2c3c9254d7c6 +rmobile ad054cbd7323a675588c7aa5d714a3663c48ca25 +sparc 5562096141bb3b427d198d54e7a2f4614fb3f5d9 +tile 81711cee933599fa114abb0d258d8bbabef8adfb +unicore32 80a44ac4ac769b464094511bb66732d0d1e7d6d9 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph 766fc43973b16f9becb6b7402b3e052dbb84adee +cifs 4ca2658c29a6dbc8b050d58a56cc5168ac039180 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 55f9cf6bbaa682958a7dd2755f883b768270c3ce +ext3 3c26bdb42320f9f39d30c6f115476bbb66b74dc5 +ext4 b616844310a6c8a4ab405d3436bbb6e53cfd852f +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse ddc9340e494c95ffd5f4636950ef0510d3a00ec4 +gfs2 4c16c36ad62fff8485215bd803d778eb2bd0b8bd +hfsplus 99943814ce60e4cd0165f19781abbfcc826f8d87 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs dd9c1549edef02290edced639f67b54a25abbe0e +nfsd 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d +nilfs2 50c276fb7dd7a2c9a35e47e76a3a560dcd6b1a7b +ocfs2 74cd531aa836b555751efdff16b0edc36913bbea +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs efccfce01c8a1b68af79a87b479f25c74329855a +ubifs 10ac27970274e9094aee84a6452a25bf1b7e59e1 +xfs eeb2036b8a148629b762ae6d85cff0be8106f081 +vfs f03c65993b98eeb909a4012ce7833c5857d74755 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci 3449248c8731e8474980856d76bbf9bac9b0682f +hid 2fa403e8b494acf6262a165664efee551dc7cc79 +i2c 5b6a5807d2a162711335f91ba137e51797c709af +bjdooks-i2c 61431772526cd31a79d3e211c49fe474e20135b7 +jdelvare-hwmon 67b4c6c20f9511aeff61f226f65f093e7018682a +hwmon-staging b6f27cf0c1010b4ef57e40c447a48e274b0b145e +kernel-doc 418043437bc6c4cfb10ff5d3a281a1f50f90ff2c +v4l-dvb dbcd7c6230b2f3cd79144f95e9008f26d9d6ac48 +kbuild aa87a555a325033a2c76f948404e79aaea29e853 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 467b41c688c79d1b5e076fbdf082f9cd5d6a000c +infiniband cc7fb05946fb1cd2fd0582f9e39f759e20dfeefa +acpi cd9a0137881aedae31815b3f74312e02921b1bfd +idle-test 15e123e5d7e8ee9ba3717e743d8eb5fd0fe57712 +powertools a829eb4d7e08b316e2d48880ecab3630497f300f +ieee1394 d63e275a354f614b2dc9a3a55c31dedc593833da +ubi a87f29cbbcbd5bd1e4990367cd18967e9bbeacff +kvm dcac28c466a596d21ae8fdcbd5e4e645cfb32ede +dlm b9d41052794385f9d47ebb7acf4a772f3ad02398 +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 853e2bd2103aaa91d1ba1c0b57ba17628d836f03 +async_tx 0670e7157f75ec6d2231fbc6f67b075d6b6d486f +net 3872b284087081ee5cb0e4630954c2f7a2153cf5 +wireless e46395a4b3d32d161d8b6d8e4a002972b1faae3e +bluetooth b8534e0f2b09e47790c261af0aee86fc88c6eb3c +mtd 154bf89f5e3e3dc59666926f27ca4a0866f39157 +crypto 442a4fffffa26fc3080350b4d50172f7589c3ac2 +sound 8da6e8f80a7cf6141cd3bf22196434f1305904d1 +sound-asoc 4a5f7bda8fe9d0ed08ed4c5beb5dc3fa62f09d05 +cpufreq f4608821b9edc0f1390e1b348c1045f794a2a086 +rr a69e1385164a03faf36903e579c3328214a2a024 +input 0d3c07378bb7d423302d7cb0dcd3fa5a26c40220 +input-mt ebf53826e105f488f4f628703a108e98940d1dc5 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 763414b132ab9d6f8e23657a87cc1dc823d1e34e +device-mapper de0fe84496af2fb104d5623937b1b6c0605f8273 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 33619f0d3ff715a2a5499520967d526ad931d70d +battery dcbc9169ed3ce7cd12328fec8b9eb9f7b91ce130 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 223658de27ca7682f56e376109657ef3818d0f37 +kgdb 62f6d9b5d890c6dacf17e629d91085937990ccc0 +slab 852a905242e1ec8a20ab12659a2a5285320e4927 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md f0b4f7e2f29af678bd9af43422c537dcb6008603 +mfd be04a9aaf8a99f6ca64c532ab0aafb00a78b44d4 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 486af1896f3a4a388410215c5a2014b9d09a79f5 +fbdev 45f1798484748894c348a76fcf0b9ec43d891795 +viafb b884a94ed16d1a633e76f80fb1bd75d0e7373ce3 +omap_dss2 799a6268ead76a3572ede4e5bf0d296f4fa3ce96 +voltage a9c3809db31be860db4e8ecf8ab359159c935a3b +security-testing eae61f3c829439f8f9121b5cd48a14be04df451f +selinux 0b24dcb7f2f7a0ce9b762eef0362c21c88f47b32 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog d22e371b6e75f5f0717218045da183ae4feb0950 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 7a6610139a1e1d9297dd1c5d178022eac36839cb +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 260752f57ce1a9a8e6b27f94a79e4c454811f679 +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial dd65c736d1b5312c80c88a64bf521db4959eded5 +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 697310dde9d87e60d2e7a8af2fc3a906438eee23 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +catalin c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree 9f15444fefdb33509132ff5c9be60cb315c44cb2 +spi 57d9c10dd91f942f836592f407d6351e2969548a +tip 6a254c0c7bdfa26245777bee5d63cdfa6bba1ff5 +rcu 0cb0124fcd98f7a5ea23aaa8d4e9f44e696fea88 +oprofile 7bb2e269aefe4539313922ab4a89367cd52a51d1 +xen-two 0b02dbbcf863d6aa985f13be72a9bea38bd54b92 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd 496474771a852d2b0ac2bcb47740e1ed11804cda +percpu b9ec40af0e18fb7d02106be148036c2ea490fdf9 +workqueues 24d51add7438f9696a7205927bf9de3c5c787a58 +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 c80297acbb55237adc128b3b2e0b74f0cf34764e +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core b7e14fea4413440b9054b7fb1628bb9c545c509c +tty 751b3840d216f1ecd3b91ff5251bf7703b690cd8 +usb 60b0bf0f11a02a6c288c7a923b2521aa7cfdc6c3 +staging e343d3ea73e97b339ecb1d39f1cdd306da24a175 +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-config 76222c6ce2f0a831d6b291877c470760e6d0397b +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c7a1950c853a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,187 @@ +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 +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-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 +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/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 +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-linus +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 +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#for-next +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 +linux-spec git http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next +msm git git://codeaurora.org/quic/kernel/davidb/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 +ux500-core git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core +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/jejb/parisc-2.6.git#for-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#powerpc/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#sh-latest +rmobile git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest +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 +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git#unicore32 +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 +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +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 +vfs-scale git git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working +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/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +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 +powertools git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#tools-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 +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 +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-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 +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/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 +input-mt git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.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 +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +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 +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-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 +selinux git git://git.infradead.org/users/eparis/selinux.git#master +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 +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 +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +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 +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.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 +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +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..76269b183973 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8990 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at dd9c154 Linux 2.6.38-rc7 +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Updating dd9c154..e0780b7 +Fast-forward + arch/powerpc/include/asm/machdep.h | 6 ++++++ + arch/powerpc/kernel/machine_kexec.c | 5 ++++- + arch/powerpc/kernel/process.c | 8 +++++--- + arch/powerpc/mm/tlb_hash64.c | 6 +++--- + 4 files changed, 18 insertions(+), 7 deletions(-) +Merging 52xx-and-virtex-current/powerpc/merge +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Auto-merging arch/sparc/kernel/traps_64.c +Merge made by recursive. + arch/sparc/kernel/iommu.c | 3 --- + arch/sparc/kernel/ldc.c | 28 ++++++++++++++++++---------- + arch/sparc/kernel/pci.c | 1 + + arch/sparc/kernel/pci_common.c | 11 +++++++---- + arch/sparc/kernel/pci_fire.c | 2 -- + arch/sparc/kernel/pci_schizo.c | 4 +--- + arch/sparc/kernel/pci_sun4v.c | 3 +-- + arch/sparc/kernel/pcr.c | 2 +- + arch/sparc/kernel/ptrace_64.c | 3 ++- + arch/sparc/kernel/smp_64.c | 11 ++++------- + arch/sparc/kernel/sys_sparc_64.c | 21 +++++++++++++-------- + arch/sparc/kernel/time_64.c | 4 +--- + arch/sparc/kernel/traps_64.c | 3 +-- + 13 files changed, 50 insertions(+), 46 deletions(-) +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/target/target_core_tmr.c | 5 +++++ + drivers/target/target_core_transport.c | 8 ++++++-- + include/target/target_core_transport.h | 2 ++ + 3 files changed, 13 insertions(+), 2 deletions(-) +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/networking/00-INDEX | 6 --- + MAINTAINERS | 2 +- + drivers/isdn/hardware/eicon/istream.c | 2 +- + drivers/net/bnx2x/bnx2x.h | 28 +++++++----- + drivers/net/bnx2x/bnx2x_cmn.c | 65 +++++++++++++++++++++++------ + drivers/net/bnx2x/bnx2x_cmn.h | 20 +++++++++ + drivers/net/bnx2x/bnx2x_ethtool.c | 25 +++++------ + drivers/net/bnx2x/bnx2x_init.h | 2 +- + drivers/net/bnx2x/bnx2x_main.c | 18 ++++++-- + drivers/net/bnx2x/bnx2x_stats.c | 4 +- + drivers/net/can/softing/softing_main.c | 1 + + drivers/net/cnic.c | 33 +++++++++++---- + drivers/net/davinci_emac.c | 2 +- + drivers/net/dnet.c | 3 +- + drivers/net/e1000/e1000_osdep.h | 3 +- + drivers/net/e1000e/netdev.c | 3 +- + drivers/net/fec.c | 3 +- + drivers/net/igbvf/vf.c | 2 +- + drivers/net/macb.c | 2 +- + drivers/net/pcmcia/fmvj18x_cs.c | 1 + + drivers/net/skge.c | 3 - + drivers/net/wireless/ath/ath9k/hif_usb.c | 9 ++-- + drivers/net/wireless/ath/ath9k/mac.c | 5 +- + drivers/net/wireless/ath/carl9170/usb.c | 2 + + drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +- + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/rndis_wlan.c | 3 + + drivers/tty/serial/serial_cs.c | 1 + + drivers/usb/gadget/f_phonet.c | 15 +++++-- + lib/nlattr.c | 2 +- + net/core/dev_addr_lists.c | 2 +- + net/dcb/dcbnl.c | 2 +- + net/dccp/input.c | 7 +-- + net/ipv6/route.c | 17 +++++--- + net/netfilter/ipvs/ip_vs_ctl.c | 4 +- + net/netfilter/nf_log.c | 4 ++ + net/netlink/af_netlink.c | 18 ++++++-- + 37 files changed, 217 insertions(+), 105 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 driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +++--- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- + drivers/cpufreq/cpufreq.c | 27 +++++++++++++++------------ + 3 files changed, 28 insertions(+), 18 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merging drivers/input/mouse/bcm5974.c +Merge made by recursive. + drivers/input/evdev.c | 10 ++++++---- + drivers/input/mouse/bcm5974.c | 8 ++++---- + 2 files changed, 10 insertions(+), 8 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Merge made by recursive. + arch/sh/include/asm/sections.h | 2 +- + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 13 +++++++++---- + arch/sh/lib/delay.c | 10 ++++++++++ + arch/sh/mm/cache.c | 3 ++- + 4 files changed, 22 insertions(+), 6 deletions(-) +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Merge made by recursive. + arch/arm/mach-shmobile/board-ag5evm.c | 1 + + arch/arm/mach-shmobile/clock-sh73a0.c | 17 ++++++++++++++--- + .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 10 +++++----- + .../mach-shmobile/include/mach/head-mackerel.txt | 10 +++++----- + 4 files changed, 25 insertions(+), 13 deletions(-) +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Merge made by recursive. + arch/x86/platform/olpc/olpc_dt.c | 3 +- + drivers/of/pdt.c | 112 ++++++++++++++----------------------- + drivers/usb/host/ehci-xilinx-of.c | 1 + + fs/proc/proc_devtree.c | 2 +- + 4 files changed, 45 insertions(+), 73 deletions(-) +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next +$ git merge arm/for-next +Removing Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen +Removing Documentation/arm/Sharp-LH/CompactFlash +Removing Documentation/arm/Sharp-LH/IOBarrier +Removing Documentation/arm/Sharp-LH/KEV7A400 +Removing Documentation/arm/Sharp-LH/LCDPanels +Removing Documentation/arm/Sharp-LH/LPD7A400 +Removing Documentation/arm/Sharp-LH/LPD7A40X +Removing Documentation/arm/Sharp-LH/SDRAM +Removing Documentation/arm/Sharp-LH/VectoredInterruptController +Removing arch/arm/configs/lpd7a400_defconfig +Removing arch/arm/configs/lpd7a404_defconfig +Removing arch/arm/include/asm/cpu-multi32.h +Removing arch/arm/include/asm/cpu-single.h +Removing arch/arm/kernel/ptrace.h +Removing arch/arm/mach-aaec2000/Kconfig +Removing arch/arm/mach-aaec2000/Makefile +Removing arch/arm/mach-aaec2000/Makefile.boot +Removing arch/arm/mach-aaec2000/aaed2000.c +Removing arch/arm/mach-aaec2000/core.c +Removing arch/arm/mach-aaec2000/core.h +Removing arch/arm/mach-aaec2000/include/mach/aaec2000.h +Removing arch/arm/mach-aaec2000/include/mach/aaed2000.h +Removing arch/arm/mach-aaec2000/include/mach/debug-macro.S +Removing arch/arm/mach-aaec2000/include/mach/entry-macro.S +Removing arch/arm/mach-aaec2000/include/mach/hardware.h +Removing arch/arm/mach-aaec2000/include/mach/io.h +Removing arch/arm/mach-aaec2000/include/mach/irqs.h +Removing arch/arm/mach-aaec2000/include/mach/memory.h +Removing arch/arm/mach-aaec2000/include/mach/system.h +Removing arch/arm/mach-aaec2000/include/mach/timex.h +Removing arch/arm/mach-aaec2000/include/mach/uncompress.h +Removing arch/arm/mach-aaec2000/include/mach/vmalloc.h +Removing arch/arm/mach-lh7a40x/Kconfig +Removing arch/arm/mach-lh7a40x/Makefile +Removing arch/arm/mach-lh7a40x/Makefile.boot +Removing arch/arm/mach-lh7a40x/arch-kev7a400.c +Removing arch/arm/mach-lh7a40x/arch-lpd7a40x.c +Removing arch/arm/mach-lh7a40x/clcd.c +Removing arch/arm/mach-lh7a40x/clocks.c +Removing arch/arm/mach-lh7a40x/common.h +Removing arch/arm/mach-lh7a40x/include/mach/clocks.h +Removing arch/arm/mach-lh7a40x/include/mach/constants.h +Removing arch/arm/mach-lh7a40x/include/mach/debug-macro.S +Removing arch/arm/mach-lh7a40x/include/mach/dma.h +Removing arch/arm/mach-lh7a40x/include/mach/entry-macro.S +Removing arch/arm/mach-lh7a40x/include/mach/hardware.h +Removing arch/arm/mach-lh7a40x/include/mach/io.h +Removing arch/arm/mach-lh7a40x/include/mach/irqs.h +Removing arch/arm/mach-lh7a40x/include/mach/memory.h +Removing arch/arm/mach-lh7a40x/include/mach/registers.h +Removing arch/arm/mach-lh7a40x/include/mach/ssp.h +Removing arch/arm/mach-lh7a40x/include/mach/system.h +Removing arch/arm/mach-lh7a40x/include/mach/timex.h +Removing arch/arm/mach-lh7a40x/include/mach/uncompress.h +Removing arch/arm/mach-lh7a40x/include/mach/vmalloc.h +Removing arch/arm/mach-lh7a40x/irq-kev7a400.c +Removing arch/arm/mach-lh7a40x/irq-lh7a400.c +Removing arch/arm/mach-lh7a40x/irq-lh7a404.c +Removing arch/arm/mach-lh7a40x/irq-lpd7a40x.c +Removing arch/arm/mach-lh7a40x/lcd-panel.h +Removing arch/arm/mach-lh7a40x/ssp-cpld.c +Removing arch/arm/mach-lh7a40x/time.c +Removing arch/arm/mach-realview/headsmp.S +Removing arch/arm/mach-realview/localtimer.c +Auto-merging arch/arm/plat-versatile/headsmp.S +Auto-merging arch/arm/plat-versatile/localtimer.c +Removing drivers/tty/serial/serial_lh7a40x.c +Removing drivers/usb/gadget/lh7a40x_udc.c +Removing drivers/usb/gadget/lh7a40x_udc.h +Removing drivers/usb/host/ohci-lh7a404.c +Merge made by recursive. + Documentation/arm/SH-Mobile/Makefile | 8 + + Documentation/arm/SH-Mobile/vrl4.c | 169 ++ + Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 + + Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen | 61 - + Documentation/arm/Sharp-LH/CompactFlash | 32 - + Documentation/arm/Sharp-LH/IOBarrier | 45 - + Documentation/arm/Sharp-LH/KEV7A400 | 8 - + Documentation/arm/Sharp-LH/LCDPanels | 59 - + Documentation/arm/Sharp-LH/LPD7A400 | 15 - + Documentation/arm/Sharp-LH/LPD7A40X | 16 - + Documentation/arm/Sharp-LH/SDRAM | 51 - + .../arm/Sharp-LH/VectoredInterruptController | 80 - + arch/arm/Kconfig | 95 +- + arch/arm/Makefile | 7 +- + arch/arm/boot/Makefile | 4 + + arch/arm/boot/compressed/Makefile | 21 +- + arch/arm/boot/compressed/head-shmobile.S | 30 + + arch/arm/boot/compressed/head-vt8500.S | 46 + + arch/arm/boot/compressed/head.S | 251 ++-- + arch/arm/boot/compressed/misc.c | 2 +- + arch/arm/boot/compressed/mmcif-sh7372.c | 87 + + arch/arm/boot/compressed/vmlinux.lds.in | 3 - + arch/arm/common/Kconfig | 2 + + arch/arm/common/gic.c | 25 +- + arch/arm/configs/lpd7a400_defconfig | 68 - + arch/arm/configs/lpd7a404_defconfig | 81 - + arch/arm/configs/u8500_defconfig | 59 +- + arch/arm/configs/vexpress_defconfig | 140 ++ + arch/arm/include/asm/bitops.h | 60 +- + arch/arm/include/asm/cacheflush.h | 136 +-- + arch/arm/include/asm/cpu-multi32.h | 69 - + arch/arm/include/asm/cpu-single.h | 44 - + arch/arm/include/asm/cputype.h | 3 +- + arch/arm/include/asm/fncpy.h | 94 + + arch/arm/include/asm/glue-cache.h | 146 ++ + arch/arm/include/asm/glue-df.h | 110 + + arch/arm/include/asm/glue-pf.h | 57 + + arch/arm/include/asm/glue-proc.h | 264 +++ + arch/arm/include/asm/glue.h | 138 -- + arch/arm/include/asm/highmem.h | 29 +- + arch/arm/include/asm/localtimer.h | 8 +- + arch/arm/include/asm/mach/arch.h | 4 - + arch/arm/include/asm/memory.h | 75 +- + arch/arm/include/asm/module.h | 27 +- + arch/arm/include/asm/outercache.h | 14 +- + arch/arm/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/pgtable.h | 26 +- + arch/arm/include/asm/pmu.h | 14 + + arch/arm/include/asm/proc-fns.h | 306 +--- + arch/arm/include/asm/processor.h | 12 - + arch/arm/include/asm/ptrace.h | 2 - + arch/arm/include/asm/setup.h | 8 +- + arch/arm/include/asm/smp_scu.h | 7 + + arch/arm/include/asm/spinlock.h | 53 +- + arch/arm/include/asm/system.h | 17 +- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/include/asm/tls.h | 11 +- + arch/arm/include/asm/traps.h | 1 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/armksyms.c | 22 +- + arch/arm/kernel/asm-offsets.c | 11 + + arch/arm/kernel/bios32.c | 5 + + arch/arm/kernel/debug.S | 2 +- + arch/arm/kernel/entry-armv.S | 3 +- + arch/arm/kernel/entry-header.S | 14 +- + arch/arm/kernel/etm.c | 4 +- + arch/arm/kernel/head-common.S | 90 - + arch/arm/kernel/head-nommu.S | 3 - + arch/arm/kernel/head.S | 144 +- + arch/arm/kernel/hw_breakpoint.c | 26 +- + arch/arm/kernel/irq.c | 50 +- + arch/arm/kernel/module.c | 35 +- + arch/arm/kernel/perf_event.c | 17 +- + arch/arm/kernel/perf_event_v6.c | 4 +- + arch/arm/kernel/ptrace.c | 389 +---- + arch/arm/kernel/ptrace.h | 37 - + arch/arm/kernel/return_address.c | 1 + + arch/arm/kernel/setup.c | 75 +- + arch/arm/kernel/signal.c | 9 - + arch/arm/kernel/sleep.S | 134 ++ + arch/arm/kernel/smp.c | 7 +- + arch/arm/kernel/smp_scu.c | 23 + + arch/arm/kernel/tcm.c | 2 +- + arch/arm/kernel/traps.c | 10 +- + arch/arm/kernel/vmlinux.lds.S | 4 + + arch/arm/lib/bitops.h | 50 +- + arch/arm/lib/changebit.S | 10 +- + arch/arm/lib/clearbit.S | 11 +- + arch/arm/lib/setbit.S | 11 +- + arch/arm/lib/testchangebit.S | 9 +- + arch/arm/lib/testclearbit.S | 9 +- + arch/arm/lib/testsetbit.S | 9 +- + arch/arm/lib/uaccess_with_memcpy.c | 7 +- + arch/arm/mach-aaec2000/Kconfig | 11 - + arch/arm/mach-aaec2000/Makefile | 9 - + arch/arm/mach-aaec2000/Makefile.boot | 1 - + arch/arm/mach-aaec2000/aaed2000.c | 102 - + arch/arm/mach-aaec2000/core.c | 298 --- + arch/arm/mach-aaec2000/core.h | 28 - + arch/arm/mach-aaec2000/include/mach/aaec2000.h | 207 -- + arch/arm/mach-aaec2000/include/mach/aaed2000.h | 40 - + arch/arm/mach-aaec2000/include/mach/debug-macro.S | 35 - + arch/arm/mach-aaec2000/include/mach/entry-macro.S | 40 - + arch/arm/mach-aaec2000/include/mach/hardware.h | 50 - + arch/arm/mach-aaec2000/include/mach/io.h | 18 - + arch/arm/mach-aaec2000/include/mach/irqs.h | 46 - + arch/arm/mach-aaec2000/include/mach/memory.h | 17 - + arch/arm/mach-aaec2000/include/mach/system.h | 24 - + arch/arm/mach-aaec2000/include/mach/timex.h | 18 - + arch/arm/mach-aaec2000/include/mach/uncompress.h | 46 - + arch/arm/mach-aaec2000/include/mach/vmalloc.h | 16 - + arch/arm/mach-at91/board-snapper9260.c | 1 + + arch/arm/mach-at91/include/mach/gpio.h | 11 +- + arch/arm/mach-at91/include/mach/memory.h | 2 +- + arch/arm/mach-bcmring/include/mach/hardware.h | 2 +- + arch/arm/mach-bcmring/include/mach/memory.h | 2 +- + arch/arm/mach-clps711x/include/mach/memory.h | 2 +- + arch/arm/mach-cns3xxx/include/mach/memory.h | 2 +- + arch/arm/mach-davinci/include/mach/memory.h | 4 +- + arch/arm/mach-dove/Kconfig | 2 +- + arch/arm/mach-dove/include/mach/memory.h | 2 +- + arch/arm/mach-ebsa110/include/mach/memory.h | 2 +- + arch/arm/mach-ep93xx/edb93xx.c | 33 + + arch/arm/mach-ep93xx/gpio.c | 33 +- + arch/arm/mach-ep93xx/include/mach/gpio.h | 2 - + arch/arm/mach-ep93xx/include/mach/memory.h | 10 +- + arch/arm/mach-footbridge/dc21285-timer.c | 84 +- + arch/arm/mach-footbridge/include/mach/memory.h | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 129 +- + arch/arm/mach-gemini/board-nas4220b.c | 1 + + arch/arm/mach-gemini/board-rut1xx.c | 1 + + arch/arm/mach-gemini/board-wbd111.c | 1 + + arch/arm/mach-gemini/board-wbd222.c | 1 + + arch/arm/mach-gemini/common.h | 1 + + arch/arm/mach-gemini/devices.c | 26 + + arch/arm/mach-gemini/include/mach/memory.h | 4 +- + arch/arm/mach-h720x/include/mach/memory.h | 2 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/common.h | 1 + + arch/arm/mach-integrator/core.c | 7 +- + arch/arm/mach-integrator/impd1.c | 5 + + arch/arm/mach-integrator/include/mach/cm.h | 4 +- + arch/arm/mach-integrator/include/mach/memory.h | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 44 +- + arch/arm/mach-integrator/integrator_cp.c | 239 +-- + arch/arm/mach-iop13xx/include/mach/memory.h | 2 +- + arch/arm/mach-iop32x/include/mach/memory.h | 2 +- + arch/arm/mach-iop33x/include/mach/memory.h | 2 +- + arch/arm/mach-ixp2000/include/mach/memory.h | 2 +- + arch/arm/mach-ixp23xx/include/mach/memory.h | 2 +- + arch/arm/mach-ixp4xx/include/mach/memory.h | 2 +- + arch/arm/mach-kirkwood/include/mach/memory.h | 2 +- + arch/arm/mach-ks8695/include/mach/memory.h | 2 +- + arch/arm/mach-lh7a40x/Kconfig | 74 - + arch/arm/mach-lh7a40x/Makefile | 17 - + arch/arm/mach-lh7a40x/Makefile.boot | 4 - + arch/arm/mach-lh7a40x/arch-kev7a400.c | 118 -- + arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 422 ---- + arch/arm/mach-lh7a40x/clcd.c | 241 --- + arch/arm/mach-lh7a40x/clocks.c | 108 - + arch/arm/mach-lh7a40x/common.h | 17 - + arch/arm/mach-lh7a40x/include/mach/clocks.h | 18 - + arch/arm/mach-lh7a40x/include/mach/constants.h | 91 - + arch/arm/mach-lh7a40x/include/mach/debug-macro.S | 37 - + arch/arm/mach-lh7a40x/include/mach/dma.h | 86 - + arch/arm/mach-lh7a40x/include/mach/entry-macro.S | 149 -- + arch/arm/mach-lh7a40x/include/mach/hardware.h | 62 - + arch/arm/mach-lh7a40x/include/mach/io.h | 20 - + arch/arm/mach-lh7a40x/include/mach/irqs.h | 200 -- + arch/arm/mach-lh7a40x/include/mach/memory.h | 28 - + arch/arm/mach-lh7a40x/include/mach/registers.h | 224 -- + arch/arm/mach-lh7a40x/include/mach/ssp.h | 70 - + arch/arm/mach-lh7a40x/include/mach/system.h | 19 - + arch/arm/mach-lh7a40x/include/mach/timex.h | 17 - + arch/arm/mach-lh7a40x/include/mach/uncompress.h | 38 - + arch/arm/mach-lh7a40x/include/mach/vmalloc.h | 10 - + arch/arm/mach-lh7a40x/irq-kev7a400.c | 93 - + arch/arm/mach-lh7a40x/irq-lh7a400.c | 91 - + arch/arm/mach-lh7a40x/irq-lh7a404.c | 175 -- + arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 128 -- + arch/arm/mach-lh7a40x/lcd-panel.h | 345 ---- + arch/arm/mach-lh7a40x/ssp-cpld.c | 343 ---- + arch/arm/mach-lh7a40x/time.c | 71 - + arch/arm/mach-loki/include/mach/memory.h | 2 +- + arch/arm/mach-lpc32xx/include/mach/memory.h | 2 +- + arch/arm/mach-mmp/include/mach/memory.h | 2 +- + arch/arm/mach-msm/board-msm7x27.c | 8 +- + arch/arm/mach-msm/board-msm7x30.c | 8 +- + arch/arm/mach-msm/board-qsd8x50.c | 4 +- + arch/arm/mach-msm/board-sapphire.c | 2 +- + arch/arm/mach-msm/include/mach/memory.h | 10 +- + arch/arm/mach-msm/timer.c | 3 +- + arch/arm/mach-mv78xx0/include/mach/memory.h | 2 +- + arch/arm/mach-mx3/mach-kzm_arm11_01.c | 2 +- + arch/arm/mach-mxs/gpio.c | 30 +- + arch/arm/mach-mxs/icoll.c | 16 +- + arch/arm/mach-netx/include/mach/memory.h | 2 +- + arch/arm/mach-nomadik/include/mach/memory.h | 2 +- + arch/arm/mach-ns9xxx/include/mach/memory.h | 2 +- + arch/arm/mach-nuc93x/include/mach/memory.h | 2 +- + arch/arm/mach-omap1/include/mach/debug-macro.S | 9 +- + arch/arm/mach-omap1/pm.h | 6 +- + arch/arm/mach-omap1/sleep.S | 3 + + arch/arm/mach-omap1/sram.S | 1 + + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/include/mach/debug-macro.S | 13 +- + arch/arm/mach-omap2/pm.h | 2 +- + arch/arm/mach-omap2/sleep24xx.S | 2 + + arch/arm/mach-omap2/sleep34xx.S | 2 + + arch/arm/mach-omap2/sram242x.S | 3 + + arch/arm/mach-omap2/sram243x.S | 3 + + arch/arm/mach-omap2/sram34xx.S | 1 + + arch/arm/mach-omap2/timer-mpu.c | 7 +- + arch/arm/mach-orion5x/include/mach/memory.h | 2 +- + arch/arm/mach-pnx4008/include/mach/memory.h | 2 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/include/mach/memory.h | 2 +- + arch/arm/mach-pxa/include/mach/pm.h | 5 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/pm.c | 5 - + arch/arm/mach-pxa/pxa25x.c | 4 +- + arch/arm/mach-pxa/pxa27x.c | 4 +- + arch/arm/mach-pxa/pxa3xx.c | 7 +- + arch/arm/mach-pxa/sleep.S | 191 +-- + arch/arm/mach-pxa/zeus.c | 2 +- + arch/arm/mach-realview/Kconfig | 5 +- + arch/arm/mach-realview/Makefile | 3 +- + arch/arm/mach-realview/core.c | 233 +-- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-realview/headsmp.S | 40 - + arch/arm/mach-realview/include/mach/memory.h | 4 +- + arch/arm/mach-realview/localtimer.c | 26 - + arch/arm/mach-realview/platsmp.c | 98 +- + arch/arm/mach-realview/realview_eb.c | 24 +- + arch/arm/mach-realview/realview_pb1176.c | 24 +- + arch/arm/mach-realview/realview_pb11mp.c | 24 +- + arch/arm/mach-realview/realview_pba8.c | 24 +- + arch/arm/mach-realview/realview_pbx.c | 24 +- + arch/arm/mach-rpc/include/mach/memory.h | 2 +- + arch/arm/mach-s3c2400/include/mach/memory.h | 2 +- + arch/arm/mach-s3c2410/include/mach/memory.h | 2 +- + arch/arm/mach-s3c24a0/include/mach/memory.h | 2 +- + arch/arm/mach-s3c64xx/include/mach/memory.h | 2 +- + arch/arm/mach-s3c64xx/sleep.S | 63 +- + arch/arm/mach-s5p6442/include/mach/memory.h | 2 +- + arch/arm/mach-s5p64x0/include/mach/memory.h | 2 +- + arch/arm/mach-s5pc100/include/mach/memory.h | 2 +- + arch/arm/mach-s5pv210/include/mach/memory.h | 2 +- + arch/arm/mach-s5pv210/sleep.S | 105 +- + arch/arm/mach-s5pv310/include/mach/memory.h | 2 +- + arch/arm/mach-s5pv310/localtimer.c | 3 +- + arch/arm/mach-sa1100/include/mach/memory.h | 2 +- + arch/arm/mach-sa1100/pm.c | 12 +- + arch/arm/mach-sa1100/sleep.S | 72 +- + arch/arm/mach-shark/include/mach/memory.h | 2 +- + arch/arm/mach-shmobile/include/mach/memory.h | 2 +- + arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h | 29 + + .../mach-shmobile/include/mach/mmcif-mackerel.h | 39 + + arch/arm/mach-shmobile/include/mach/mmcif.h | 18 + + arch/arm/mach-shmobile/localtimer.c | 3 +- + arch/arm/mach-spear3xx/clock.c | 473 ++++- + arch/arm/mach-spear3xx/include/mach/generic.h | 10 +- + arch/arm/mach-spear3xx/include/mach/hardware.h | 2 + + arch/arm/mach-spear3xx/include/mach/misc_regs.h | 141 +- + arch/arm/mach-spear3xx/spear300.c | 14 +- + arch/arm/mach-spear3xx/spear300_evb.c | 11 +- + arch/arm/mach-spear3xx/spear310.c | 11 +- + arch/arm/mach-spear3xx/spear310_evb.c | 11 +- + arch/arm/mach-spear3xx/spear320.c | 11 +- + arch/arm/mach-spear3xx/spear320_evb.c | 11 +- + arch/arm/mach-spear3xx/spear3xx.c | 41 +- + arch/arm/mach-spear6xx/clock.c | 350 +++- + arch/arm/mach-spear6xx/include/mach/generic.h | 3 +- + arch/arm/mach-spear6xx/include/mach/hardware.h | 3 +- + arch/arm/mach-spear6xx/include/mach/misc_regs.h | 141 +- + arch/arm/mach-spear6xx/spear600_evb.c | 2 +- + arch/arm/mach-spear6xx/spear6xx.c | 31 + + arch/arm/mach-tcc8k/board-tcc8000-sdk.c | 2 +- + arch/arm/mach-tegra/include/mach/memory.h | 2 +- + arch/arm/mach-tegra/localtimer.c | 3 +- + arch/arm/mach-u300/include/mach/memory.h | 6 +- + arch/arm/mach-u300/u300.c | 2 +- + arch/arm/mach-ux500/cpu-db8500.c | 51 +- + arch/arm/mach-ux500/include/mach/memory.h | 2 +- + arch/arm/mach-ux500/localtimer.c | 3 +- + arch/arm/mach-versatile/core.c | 295 +--- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/mach-versatile/include/mach/hardware.h | 2 +- + arch/arm/mach-versatile/include/mach/memory.h | 2 +- + arch/arm/mach-versatile/versatile_ab.c | 1 + + arch/arm/mach-versatile/versatile_pb.c | 6 +- + arch/arm/mach-vexpress/Kconfig | 3 + + arch/arm/mach-vexpress/Makefile | 3 +- + arch/arm/mach-vexpress/core.h | 1 + + arch/arm/mach-vexpress/ct-ca9x4.c | 70 +- + arch/arm/mach-vexpress/include/mach/memory.h | 2 +- + arch/arm/mach-vexpress/platsmp.c | 94 +- + arch/arm/mach-vexpress/v2m.c | 31 +- + arch/arm/mach-vt8500/Kconfig | 73 + + arch/arm/mach-vt8500/Makefile | 9 + + arch/arm/mach-vt8500/Makefile.boot | 3 + + arch/arm/mach-vt8500/bv07.c | 77 + + arch/arm/mach-vt8500/devices-vt8500.c | 91 + + arch/arm/mach-vt8500/devices-wm8505.c | 99 + + arch/arm/mach-vt8500/devices.c | 270 +++ + arch/arm/mach-vt8500/devices.h | 88 + + arch/arm/mach-vt8500/gpio.c | 240 +++ + arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 + + arch/arm/mach-vt8500/include/mach/entry-macro.S | 32 + + arch/arm/mach-vt8500/include/mach/gpio.h | 6 + + arch/arm/mach-vt8500/include/mach/hardware.h | 12 + + arch/arm/mach-vt8500/include/mach/i8042.h | 18 + + arch/arm/mach-vt8500/include/mach/io.h | 28 + + arch/arm/mach-vt8500/include/mach/irqs.h | 22 + + arch/arm/mach-vt8500/include/mach/memory.h | 28 + + arch/arm/mach-vt8500/include/mach/system.h | 18 + + arch/arm/mach-vt8500/include/mach/timex.h | 26 + + arch/arm/mach-vt8500/include/mach/uncompress.h | 37 + + arch/arm/mach-vt8500/include/mach/vmalloc.h | 20 + + arch/arm/mach-vt8500/include/mach/vt8500_irqs.h | 88 + + arch/arm/mach-vt8500/include/mach/vt8500_regs.h | 79 + + arch/arm/mach-vt8500/include/mach/vt8500fb.h | 31 + + arch/arm/mach-vt8500/include/mach/wm8505_irqs.h | 115 ++ + arch/arm/mach-vt8500/include/mach/wm8505_regs.h | 78 + + arch/arm/mach-vt8500/irq.c | 177 ++ + arch/arm/mach-vt8500/pwm.c | 265 +++ + arch/arm/mach-vt8500/timer.c | 155 ++ + arch/arm/mach-vt8500/wm8505_7in.c | 77 + + arch/arm/mach-w90x900/include/mach/memory.h | 2 +- + arch/arm/mm/Kconfig | 55 +- + arch/arm/mm/Makefile | 1 + + arch/arm/mm/abort-ev6.S | 6 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm/mm/fault-armv.c | 7 +- + arch/arm/mm/fault.c | 39 +- + arch/arm/mm/idmap.c | 35 +- + arch/arm/mm/init.c | 6 +- + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmap.c | 2 +- + arch/arm/mm/mmu.c | 81 +- + arch/arm/mm/pgd.c | 24 +- + arch/arm/mm/proc-arm1020.S | 3 + + arch/arm/mm/proc-arm1020e.S | 3 + + arch/arm/mm/proc-arm1022.S | 3 + + arch/arm/mm/proc-arm1026.S | 3 + + arch/arm/mm/proc-arm6_7.S | 6 + + arch/arm/mm/proc-arm720.S | 3 + + arch/arm/mm/proc-arm740.S | 3 + + arch/arm/mm/proc-arm7tdmi.S | 3 + + arch/arm/mm/proc-arm920.S | 37 + + arch/arm/mm/proc-arm922.S | 3 + + arch/arm/mm/proc-arm925.S | 3 + + arch/arm/mm/proc-arm926.S | 37 + + arch/arm/mm/proc-arm940.S | 3 + + arch/arm/mm/proc-arm946.S | 3 + + arch/arm/mm/proc-arm9tdmi.S | 3 + + arch/arm/mm/proc-fa526.S | 3 + + arch/arm/mm/proc-feroceon.S | 3 + + arch/arm/mm/proc-mohawk.S | 3 + + arch/arm/mm/proc-sa110.S | 3 + + arch/arm/mm/proc-sa1100.S | 39 + + arch/arm/mm/proc-v6.S | 50 + + arch/arm/mm/proc-v7.S | 116 +- + arch/arm/mm/proc-xsc3.S | 48 +- + arch/arm/mm/proc-xscale.S | 45 +- + arch/arm/mm/vmregion.c | 17 +- + arch/arm/plat-mxc/include/mach/memory.h | 18 +- + arch/arm/plat-omap/include/plat/memory.h | 4 +- + arch/arm/plat-omap/include/plat/serial.h | 2 +- + arch/arm/plat-omap/include/plat/sram.h | 14 +- + arch/arm/plat-omap/sram.c | 14 +- + arch/arm/plat-s3c24xx/sleep.S | 57 +- + arch/arm/plat-samsung/include/plat/pm.h | 12 +- + arch/arm/plat-samsung/pm.c | 16 +- + arch/arm/plat-spear/Makefile | 4 +- + arch/arm/plat-spear/clock.c | 844 +++++++-- + arch/arm/plat-spear/include/plat/clock.h | 166 ++- + arch/arm/plat-spear/include/plat/hardware.h | 23 + + arch/arm/plat-spear/include/plat/memory.h | 2 +- + arch/arm/plat-spear/time.c | 21 +- + arch/arm/plat-stmp3xxx/include/mach/memory.h | 2 +- + arch/arm/plat-tcc/include/mach/memory.h | 2 +- + arch/arm/plat-versatile/Kconfig | 17 + + arch/arm/plat-versatile/Makefile | 13 +- + arch/arm/plat-versatile/clcd.c | 182 ++ + arch/arm/plat-versatile/fpga-irq.c | 72 + + .../{mach-vexpress => plat-versatile}/headsmp.S | 8 +- + arch/arm/plat-versatile/include/plat/clcd.h | 9 + + arch/arm/plat-versatile/include/plat/fpga-irq.h | 12 + + .../{mach-vexpress => plat-versatile}/localtimer.c | 5 +- + arch/arm/plat-versatile/platsmp.c | 104 + + arch/arm/vfp/vfpmodule.c | 9 +- + drivers/amba/bus.c | 348 +++- + drivers/char/hw_random/nomadik-rng.c | 2 +- + drivers/dma/amba-pl08x.c | 2 +- + drivers/dma/pl330.c | 2 +- + drivers/gpio/pl061.c | 2 +- + drivers/input/serio/ambakmi.c | 3 +- + drivers/mmc/host/mmci.c | 348 +++- + drivers/mmc/host/mmci.h | 15 +- + drivers/net/smc91x.h | 62 - + drivers/rtc/rtc-pl030.c | 2 +- + drivers/rtc/rtc-pl031.c | 2 +- + drivers/spi/amba-pl022.c | 2 +- + drivers/tty/serial/Kconfig | 23 - + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl010.c | 2 +- + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/serial_lh7a40x.c | 682 ------- + drivers/usb/Kconfig | 1 - + drivers/usb/gadget/Kconfig | 12 - + drivers/usb/gadget/Makefile | 1 - + drivers/usb/gadget/gadget_chips.h | 8 - + drivers/usb/gadget/lh7a40x_udc.c | 2152 -------------------- + drivers/usb/gadget/lh7a40x_udc.h | 259 --- + drivers/usb/host/ohci-hcd.c | 5 - + drivers/usb/host/ohci-lh7a404.c | 252 --- + drivers/usb/host/ohci.h | 10 - + drivers/video/Kconfig | 81 +- + drivers/video/amba-clcd.c | 105 +- + drivers/video/cyber2000fb.c | 263 +++- + drivers/video/cyber2000fb.h | 16 +- + drivers/watchdog/sp805_wdt.c | 2 +- + include/linux/amba/bus.h | 8 +- + include/linux/amba/clcd.h | 90 +- + include/linux/amba/mmci.h | 17 + + sound/arm/aaci.c | 285 ++-- + sound/arm/aaci.h | 9 +- + 428 files changed, 9521 insertions(+), 12799 deletions(-) + create mode 100644 Documentation/arm/SH-Mobile/Makefile + create mode 100644 Documentation/arm/SH-Mobile/vrl4.c + create mode 100644 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt + delete mode 100644 Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen + delete mode 100644 Documentation/arm/Sharp-LH/CompactFlash + delete mode 100644 Documentation/arm/Sharp-LH/IOBarrier + delete mode 100644 Documentation/arm/Sharp-LH/KEV7A400 + delete mode 100644 Documentation/arm/Sharp-LH/LCDPanels + delete mode 100644 Documentation/arm/Sharp-LH/LPD7A400 + delete mode 100644 Documentation/arm/Sharp-LH/LPD7A40X + delete mode 100644 Documentation/arm/Sharp-LH/SDRAM + delete mode 100644 Documentation/arm/Sharp-LH/VectoredInterruptController + create mode 100644 arch/arm/boot/compressed/head-vt8500.S + create mode 100644 arch/arm/boot/compressed/mmcif-sh7372.c + delete mode 100644 arch/arm/configs/lpd7a400_defconfig + delete mode 100644 arch/arm/configs/lpd7a404_defconfig + create mode 100644 arch/arm/configs/vexpress_defconfig + delete mode 100644 arch/arm/include/asm/cpu-multi32.h + delete mode 100644 arch/arm/include/asm/cpu-single.h + create mode 100644 arch/arm/include/asm/fncpy.h + create mode 100644 arch/arm/include/asm/glue-cache.h + create mode 100644 arch/arm/include/asm/glue-df.h + create mode 100644 arch/arm/include/asm/glue-pf.h + create mode 100644 arch/arm/include/asm/glue-proc.h + delete mode 100644 arch/arm/kernel/ptrace.h + create mode 100644 arch/arm/kernel/sleep.S + delete mode 100644 arch/arm/mach-aaec2000/Kconfig + delete mode 100644 arch/arm/mach-aaec2000/Makefile + delete mode 100644 arch/arm/mach-aaec2000/Makefile.boot + delete mode 100644 arch/arm/mach-aaec2000/aaed2000.c + delete mode 100644 arch/arm/mach-aaec2000/core.c + delete mode 100644 arch/arm/mach-aaec2000/core.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/aaec2000.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/aaed2000.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-aaec2000/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-aaec2000/include/mach/hardware.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/io.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/irqs.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/memory.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/system.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/timex.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-lh7a40x/Kconfig + delete mode 100644 arch/arm/mach-lh7a40x/Makefile + delete mode 100644 arch/arm/mach-lh7a40x/Makefile.boot + delete mode 100644 arch/arm/mach-lh7a40x/arch-kev7a400.c + delete mode 100644 arch/arm/mach-lh7a40x/arch-lpd7a40x.c + delete mode 100644 arch/arm/mach-lh7a40x/clcd.c + delete mode 100644 arch/arm/mach-lh7a40x/clocks.c + delete mode 100644 arch/arm/mach-lh7a40x/common.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/clocks.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/constants.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/dma.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/io.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/memory.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/registers.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/ssp.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/system.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/timex.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-lh7a40x/irq-kev7a400.c + delete mode 100644 arch/arm/mach-lh7a40x/irq-lh7a400.c + delete mode 100644 arch/arm/mach-lh7a40x/irq-lh7a404.c + delete mode 100644 arch/arm/mach-lh7a40x/irq-lpd7a40x.c + delete mode 100644 arch/arm/mach-lh7a40x/lcd-panel.h + delete mode 100644 arch/arm/mach-lh7a40x/ssp-cpld.c + delete mode 100644 arch/arm/mach-lh7a40x/time.c + delete mode 100644 arch/arm/mach-realview/headsmp.S + delete mode 100644 arch/arm/mach-realview/localtimer.c + create mode 100644 arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h + create mode 100644 arch/arm/mach-shmobile/include/mach/mmcif-mackerel.h + create mode 100644 arch/arm/mach-shmobile/include/mach/mmcif.h + create mode 100644 arch/arm/mach-vt8500/Kconfig + create mode 100644 arch/arm/mach-vt8500/Makefile + create mode 100644 arch/arm/mach-vt8500/Makefile.boot + create mode 100644 arch/arm/mach-vt8500/bv07.c + create mode 100644 arch/arm/mach-vt8500/devices-vt8500.c + create mode 100644 arch/arm/mach-vt8500/devices-wm8505.c + create mode 100644 arch/arm/mach-vt8500/devices.c + create mode 100644 arch/arm/mach-vt8500/devices.h + create mode 100644 arch/arm/mach-vt8500/gpio.c + create mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-vt8500/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-vt8500/include/mach/gpio.h + create mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h + create mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h + create mode 100644 arch/arm/mach-vt8500/include/mach/io.h + create mode 100644 arch/arm/mach-vt8500/include/mach/irqs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/memory.h + create mode 100644 arch/arm/mach-vt8500/include/mach/system.h + create mode 100644 arch/arm/mach-vt8500/include/mach/timex.h + create mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_irqs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_regs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vt8500fb.h + create mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_irqs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_regs.h + create mode 100644 arch/arm/mach-vt8500/irq.c + create mode 100644 arch/arm/mach-vt8500/pwm.c + create mode 100644 arch/arm/mach-vt8500/timer.c + create mode 100644 arch/arm/mach-vt8500/wm8505_7in.c + create mode 100644 arch/arm/plat-spear/include/plat/hardware.h + create mode 100644 arch/arm/plat-versatile/Kconfig + create mode 100644 arch/arm/plat-versatile/clcd.c + create mode 100644 arch/arm/plat-versatile/fpga-irq.c + rename arch/arm/{mach-vexpress => plat-versatile}/headsmp.S (75%) + create mode 100644 arch/arm/plat-versatile/include/plat/clcd.h + create mode 100644 arch/arm/plat-versatile/include/plat/fpga-irq.h + rename arch/arm/{mach-vexpress => plat-versatile}/localtimer.c (80%) + create mode 100644 arch/arm/plat-versatile/platsmp.c + delete mode 100644 drivers/tty/serial/serial_lh7a40x.c + delete mode 100644 drivers/usb/gadget/lh7a40x_udc.c + delete mode 100644 drivers/usb/gadget/lh7a40x_udc.h + delete mode 100644 drivers/usb/host/ohci-lh7a404.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 3 +- + arch/arm/mach-davinci/board-da850-evm.c | 18 ++- + arch/arm/mach-davinci/board-mityomapl138.c | 83 +++++++- + arch/arm/mach-davinci/board-omapl138-hawk.c | 284 +++++++++++++++++++++++++++ + arch/arm/mach-davinci/da850.c | 83 +++------ + arch/arm/mach-davinci/dm355.c | 5 +- + arch/arm/mach-davinci/dm365.c | 5 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 7 - + arch/arm/mach-davinci/include/mach/mux.h | 4 + + arch/arm/mach-davinci/include/mach/spi.h | 15 +- + drivers/spi/davinci_spi.c | 11 +- + 11 files changed, 423 insertions(+), 95 deletions(-) +Merging i.MX/for-next +$ git merge i.MX/for-next +Auto-merging arch/arm/mach-mx3/mach-kzm_arm11_01.c +Auto-merging arch/arm/mach-mx5/devices-imx50.h +Auto-merging arch/arm/mach-mxs/gpio.c +Removing arch/arm/plat-mxc/ehci.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/Makefile +Auto-merging drivers/video/Kconfig +Auto-merging sound/soc/imx/eukrea-tlv320.c +Merge made by recursive. + arch/arm/configs/mx51_defconfig | 53 +- + arch/arm/mach-imx/Kconfig | 12 + + arch/arm/mach-imx/Makefile | 5 +- + arch/arm/mach-imx/clock-imx1.c | 1 + + arch/arm/mach-imx/clock-imx25.c | 3 + + arch/arm/mach-imx/devices-imx1.h | 7 + + arch/arm/mach-imx/dma-v1.c | 2 +- + arch/arm/mach-imx/ehci-imx25.c | 80 + + arch/arm/mach-imx/ehci-imx27.c | 82 + + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +- + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +- + arch/arm/mach-imx/mach-cpuimx27.c | 25 +- + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 27 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 32 +- + arch/arm/mach-imx/mach-imx27ipcam.c | 78 + + arch/arm/mach-imx/mach-imx27lite.c | 11 +- + arch/arm/mach-imx/mach-mx1ads.c | 22 +- + arch/arm/mach-imx/mach-mx21ads.c | 11 +- + arch/arm/mach-imx/mach-mx25_3ds.c | 32 +- + arch/arm/mach-imx/mach-mx27_3ds.c | 30 +- + arch/arm/mach-imx/mach-mx27ads.c | 11 +- + arch/arm/mach-imx/mach-mxt_td60.c | 12 +- + arch/arm/mach-imx/mach-pca100.c | 28 +- + arch/arm/mach-imx/mach-pcm038.c | 27 +- + arch/arm/mach-imx/mach-scb9328.c | 13 +- + arch/arm/mach-imx/mm-imx1.c | 7 +- + arch/arm/mach-imx/mm-imx21.c | 7 +- + arch/arm/mach-imx/mm-imx25.c | 7 +- + arch/arm/mach-imx/mm-imx27.c | 7 +- + arch/arm/mach-mx3/Kconfig | 25 + + arch/arm/mach-mx3/Makefile | 6 +- + arch/arm/mach-mx3/devices-imx35.h | 2 +- + arch/arm/mach-mx3/ehci-imx31.c | 83 + + arch/arm/mach-mx3/ehci-imx35.c | 80 + + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 4 +- + arch/arm/mach-mx3/iomux-imx31.c | 12 +- + arch/arm/mach-mx3/mach-armadillo5x0.c | 21 +- + arch/arm/mach-mx3/mach-bug.c | 66 + + arch/arm/mach-mx3/mach-cpuimx35.c | 31 +- + arch/arm/mach-mx3/mach-kzm_arm11_01.c | 17 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 59 +- + arch/arm/mach-mx3/mach-mx31ads.c | 57 +- + arch/arm/mach-mx3/mach-mx31lilly.c | 33 +- + arch/arm/mach-mx3/mach-mx31lite.c | 25 +- + arch/arm/mach-mx3/mach-mx31moboard.c | 28 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 37 +- + arch/arm/mach-mx3/mach-pcm037.c | 27 +- + arch/arm/mach-mx3/mach-pcm037_eet.c | 2 - + arch/arm/mach-mx3/mach-pcm043.c | 46 +- + arch/arm/mach-mx3/mach-qong.c | 22 +- + arch/arm/mach-mx3/mach-vpr200.c | 328 +++ + arch/arm/mach-mx3/mm.c | 23 +- + arch/arm/mach-mx3/mx31moboard-devboard.c | 7 +- + arch/arm/mach-mx3/mx31moboard-marxbot.c | 6 +- + arch/arm/mach-mx3/mx31moboard-smartbot.c | 7 +- + arch/arm/mach-mx5/Kconfig | 24 +- + arch/arm/mach-mx5/Makefile | 4 +- + arch/arm/mach-mx5/board-cpuimx51.c | 20 +- + arch/arm/mach-mx5/board-cpuimx51sd.c | 31 +- + arch/arm/mach-mx5/board-mx50_rdp.c | 34 +- + arch/arm/mach-mx5/board-mx51_3ds.c | 43 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 43 +- + arch/arm/mach-mx5/board-mx51_efikamx.c | 211 +- + arch/arm/mach-mx5/board-mx51_efikasb.c | 283 +++ + arch/arm/mach-mx5/board-mx53_evk.c | 40 +- + arch/arm/mach-mx5/board-mx53_loco.c | 178 ++- + arch/arm/mach-mx5/board-mx53_smd.c | 40 +- + arch/arm/mach-mx5/clock-mx51-mx53.c | 148 ++- + arch/arm/mach-mx5/cpu.c | 11 +- + arch/arm/mach-mx5/crm_regs.h | 7 + + .../mach-mx5/{devices-mx50.h => devices-imx50.h} | 8 + + arch/arm/mach-mx5/devices-imx53.h | 4 + + arch/arm/mach-mx5/efika.h | 10 + + arch/arm/mach-mx5/ehci.c | 156 ++ + arch/arm/mach-mx5/mm-mx50.c | 6 +- + arch/arm/mach-mx5/mm.c | 14 +- + arch/arm/mach-mx5/mx51_efika.c | 636 +++++ + arch/arm/mach-mxc91231/iomux.c | 14 +- + arch/arm/mach-mxc91231/magx-zn5.c | 11 +- + arch/arm/mach-mxc91231/mm.c | 7 +- + arch/arm/mach-mxs/Kconfig | 21 + + arch/arm/mach-mxs/Makefile | 5 + + arch/arm/mach-mxs/clock-mx23.c | 8 +- + arch/arm/mach-mxs/clock-mx28.c | 19 +- + arch/arm/mach-mxs/devices-mx23.h | 11 + + arch/arm/mach-mxs/devices-mx28.h | 23 + + arch/arm/mach-mxs/devices.c | 2 + + arch/arm/mach-mxs/devices/Kconfig | 16 + + arch/arm/mach-mxs/devices/Makefile | 5 + + arch/arm/mach-mxs/devices/platform-auart.c | 64 + + arch/arm/mach-mxs/devices/platform-fec.c | 5 +- + arch/arm/mach-mxs/devices/platform-flexcan.c | 51 + + arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 51 + + arch/arm/mach-mxs/devices/platform-mxs-pwm.c | 22 + + arch/arm/mach-mxs/devices/platform-mxsfb.c | 46 + + arch/arm/mach-mxs/gpio.c | 45 +- + arch/arm/mach-mxs/include/mach/common.h | 1 + + arch/arm/mach-mxs/include/mach/devices-common.h | 35 + + arch/arm/mach-mxs/include/mach/mx23.h | 12 +- + arch/arm/mach-mxs/include/mach/mxs.h | 9 +- + arch/arm/mach-mxs/include/mach/mxsfb.h | 48 + + arch/arm/mach-mxs/include/mach/uncompress.h | 1 + + arch/arm/mach-mxs/mach-mx23evk.c | 11 + + arch/arm/mach-mxs/mach-mx28evk.c | 56 +- + arch/arm/mach-mxs/mach-tx28.c | 183 ++ + arch/arm/mach-mxs/module-tx28.c | 131 + + arch/arm/mach-mxs/module-tx28.h | 9 + + arch/arm/mach-mxs/ocotp.c | 90 + + arch/arm/mach-mxs/pm.c | 43 + + arch/arm/mach-mxs/regs-clkctrl-mx23.h | 124 - + arch/arm/mach-mxs/regs-clkctrl-mx28.h | 177 -- + arch/arm/mach-mxs/system.c | 2 + + arch/arm/plat-mxc/Makefile | 1 - + arch/arm/plat-mxc/devices.c | 2 + + arch/arm/plat-mxc/devices/platform-fec.c | 9 +- + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 10 + + arch/arm/plat-mxc/devices/platform-imx2-wdt.c | 9 + + arch/arm/plat-mxc/devices/platform-spi_imx.c | 9 + + arch/arm/plat-mxc/ehci.c | 369 --- + arch/arm/plat-mxc/gpio.c | 1 + + arch/arm/plat-mxc/include/mach/common.h | 10 + + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 8 +- + arch/arm/plat-mxc/include/mach/iomux-mx35.h | 14 +- + arch/arm/plat-mxc/include/mach/iomux-mx50.h | 44 +- + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 4 +- + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 2639 +++++++++++++++++--- + arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 8 +- + arch/arm/plat-mxc/include/mach/mx1.h | 7 +- + arch/arm/plat-mxc/include/mach/mx53.h | 2 +- + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 7 +- + arch/arm/plat-mxc/include/mach/uncompress.h | 7 + + drivers/tty/serial/Kconfig | 15 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/mxs-auart.c | 798 ++++++ + drivers/usb/host/ehci-mxc.c | 5 - + drivers/video/Kconfig | 9 + + drivers/video/Makefile | 1 + + drivers/video/mxsfb.c | 914 +++++++ + sound/soc/imx/Kconfig | 3 +- + sound/soc/imx/eukrea-tlv320.c | 3 +- + 140 files changed, 8202 insertions(+), 1717 deletions(-) + create mode 100644 arch/arm/mach-imx/ehci-imx25.c + create mode 100644 arch/arm/mach-imx/ehci-imx27.c + create mode 100644 arch/arm/mach-imx/mach-imx27ipcam.c + create mode 100644 arch/arm/mach-mx3/ehci-imx31.c + create mode 100644 arch/arm/mach-mx3/ehci-imx35.c + create mode 100644 arch/arm/mach-mx3/mach-bug.c + create mode 100644 arch/arm/mach-mx3/mach-vpr200.c + create mode 100644 arch/arm/mach-mx5/board-mx51_efikasb.c + rename arch/arm/mach-mx5/{devices-mx50.h => devices-imx50.h} (78%) + create mode 100644 arch/arm/mach-mx5/efika.h + create mode 100644 arch/arm/mach-mx5/ehci.c + create mode 100644 arch/arm/mach-mx5/mx51_efika.c + create mode 100644 arch/arm/mach-mxs/devices/platform-auart.c + create mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c + create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-i2c.c + create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-pwm.c + create mode 100644 arch/arm/mach-mxs/devices/platform-mxsfb.c + create mode 100644 arch/arm/mach-mxs/include/mach/mxsfb.h + create mode 100644 arch/arm/mach-mxs/mach-tx28.c + create mode 100644 arch/arm/mach-mxs/module-tx28.c + create mode 100644 arch/arm/mach-mxs/module-tx28.h + create mode 100644 arch/arm/mach-mxs/ocotp.c + create mode 100644 arch/arm/mach-mxs/pm.c + delete mode 100644 arch/arm/plat-mxc/ehci.c + create mode 100644 drivers/tty/serial/mxs-auart.c + create mode 100644 drivers/video/mxsfb.c +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Resolved 'arch/arm/mach-msm/board-msm7x27.c' using previous resolution. +Resolved 'arch/arm/mach-msm/board-msm7x30.c' using previous resolution. +Resolved 'arch/arm/mach-msm/board-qsd8x50.c' using previous resolution. +Resolved 'arch/arm/mach-msm/board-sapphire.c' using previous resolution. +Resolved 'arch/arm/mach-msm/include/mach/memory.h' using previous resolution. +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mach-msm/board-msm7x27.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x27.c +Auto-merging arch/arm/mach-msm/board-msm7x30.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c +Auto-merging arch/arm/mach-msm/board-qsd8x50.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-qsd8x50.c +Auto-merging arch/arm/mach-msm/board-sapphire.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-sapphire.c +Removing arch/arm/mach-msm/clock-dummy.c +Auto-merging arch/arm/mach-msm/devices-iommu.c +Removing arch/arm/mach-msm/gpiomux-7x30.c +Auto-merging arch/arm/mach-msm/include/mach/memory.h +CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/memory.h +Auto-merging arch/arm/mach-msm/timer.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d8fb24a] Merge remote-tracking branch 'msm/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + arch/arm/mach-msm/Kconfig | 35 +++- + arch/arm/mach-msm/Makefile | 29 +- + arch/arm/mach-msm/board-halibut.c | 2 - + arch/arm/mach-msm/board-mahimahi.c | 2 - + arch/arm/mach-msm/board-msm7x27.c | 8 - + arch/arm/mach-msm/board-msm7x30.c | 29 ++- + arch/arm/mach-msm/board-msm8960.c | 91 +++++++ + arch/arm/mach-msm/board-msm8x60.c | 4 - + arch/arm/mach-msm/board-qsd8x50.c | 86 ++++++- + arch/arm/mach-msm/board-sapphire.c | 2 - + arch/arm/mach-msm/board-trout-gpio.c | 2 - + arch/arm/mach-msm/board-trout.c | 3 +- + arch/arm/mach-msm/clock-7x30.h | 61 ++--- + arch/arm/mach-msm/clock-debug.c | 130 +++++++++ + arch/arm/mach-msm/clock-dummy.c | 54 ---- + arch/arm/mach-msm/clock-pcom.c | 7 + + arch/arm/mach-msm/clock-pcom.h | 51 ++--- + arch/arm/mach-msm/clock.c | 192 +------------ + arch/arm/mach-msm/clock.h | 55 +---- + .../{devices-msm8x60-iommu.c => devices-iommu.c} | 54 ++-- + arch/arm/mach-msm/devices-msm7x00.c | 36 ++-- + arch/arm/mach-msm/devices-msm7x30.c | 11 +- + arch/arm/mach-msm/devices-msm8960.c | 85 ++++++ + arch/arm/mach-msm/devices-qsd8x50.c | 213 ++++++++++++++- + arch/arm/mach-msm/devices.h | 11 +- + arch/arm/mach-msm/gpiomux-7x30.c | 38 --- + arch/arm/mach-msm/gpiomux-8x50.c | 23 ++ + arch/arm/mach-msm/headsmp.S | 2 +- + arch/arm/mach-msm/include/mach/board.h | 4 +- + arch/arm/mach-msm/include/mach/clk.h | 31 +-- + arch/arm/mach-msm/include/mach/clkdev.h | 19 ++ + arch/arm/mach-msm/include/mach/cpu.h | 54 ++++ + arch/arm/mach-msm/include/mach/io.h | 1 + + arch/arm/mach-msm/include/mach/irqs-7x30.h | 31 +-- + arch/arm/mach-msm/include/mach/irqs-8960.h | 277 +++++++++++++++++++ + arch/arm/mach-msm/include/mach/irqs-8x50.h | 31 +-- + arch/arm/mach-msm/include/mach/irqs.h | 3 + + arch/arm/mach-msm/include/mach/memory.h | 2 + + arch/arm/mach-msm/include/mach/mmc.h | 11 + + arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 16 +- + arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 14 +- + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 48 ++++ + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 22 +- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 61 +---- + arch/arm/mach-msm/include/mach/msm_iomap.h | 9 +- + arch/arm/mach-msm/include/mach/sirc.h | 31 +-- + arch/arm/mach-msm/include/mach/smp.h | 30 +-- + arch/arm/mach-msm/io.c | 41 ++- + arch/arm/mach-msm/scm-boot.h | 30 +-- + arch/arm/mach-msm/scm.h | 30 +-- + arch/arm/mach-msm/timer.c | 46 ++-- + drivers/mmc/host/msm_sdcc.c | 40 +++- + drivers/mmc/host/msm_sdcc.h | 1 + + drivers/tty/serial/msm_serial.c | 286 +++++++++++++++++--- + drivers/tty/serial/msm_serial.h | 28 ++- + drivers/video/msm/msm_fb.c | 11 +- + 57 files changed, 1687 insertions(+), 838 deletions(-) + create mode 100644 arch/arm/mach-msm/board-msm8960.c + create mode 100644 arch/arm/mach-msm/clock-debug.c + delete mode 100644 arch/arm/mach-msm/clock-dummy.c + rename arch/arm/mach-msm/{devices-msm8x60-iommu.c => devices-iommu.c} (93%) + create mode 100644 arch/arm/mach-msm/devices-msm8960.c + delete mode 100644 arch/arm/mach-msm/gpiomux-7x30.c + create mode 100644 arch/arm/mach-msm/include/mach/clkdev.h + create mode 100644 arch/arm/mach-msm/include/mach/cpu.h + create mode 100644 arch/arm/mach-msm/include/mach/irqs-8960.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8960.h +Merging omap/for-next +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging arch/arm/mach-omap2/include/mach/debug-macro.S +Auto-merging arch/arm/plat-omap/include/plat/serial.h +Auto-merging arch/arm/plat-omap/sram.c +Auto-merging drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/musb/musb_core.h +Merge made by recursive. + Documentation/hwspinlock.txt | 293 ++ + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-omap1/Makefile | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 16 +- + arch/arm/mach-omap1/board-fsample.c | 4 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-htcherald.c | 4 +- + arch/arm/mach-omap1/board-innovator.c | 2 +- + arch/arm/mach-omap1/board-nokia770.c | 6 +- + arch/arm/mach-omap1/board-palmte.c | 13 - + arch/arm/mach-omap1/board-voiceblue.c | 107 +- + arch/arm/mach-omap1/mcbsp.c | 327 ++- + arch/arm/mach-omap1/reset.c | 25 + + arch/arm/mach-omap2/Kconfig | 28 +- + arch/arm/mach-omap2/Makefile | 28 +- + arch/arm/mach-omap2/board-2430sdp.c | 29 +- + arch/arm/mach-omap2/board-3430sdp.c | 103 +- + arch/arm/mach-omap2/board-3630sdp.c | 11 +- + arch/arm/mach-omap2/board-4430sdp.c | 133 +- + arch/arm/mach-omap2/board-am3517crane.c | 8 +- + arch/arm/mach-omap2/board-am3517evm.c | 28 +- + arch/arm/mach-omap2/board-apollon.c | 8 +- + arch/arm/mach-omap2/board-cm-t35.c | 30 +- + arch/arm/mach-omap2/board-cm-t3517.c | 8 +- + arch/arm/mach-omap2/board-devkit8000.c | 21 +- + arch/arm/mach-omap2/board-flash.c | 32 +- + arch/arm/mach-omap2/board-flash.h | 4 +- + arch/arm/mach-omap2/board-generic.c | 8 +- + arch/arm/mach-omap2/board-h4.c | 9 +- + arch/arm/mach-omap2/board-igep0020.c | 30 +- + arch/arm/mach-omap2/board-igep0030.c | 12 +- + arch/arm/mach-omap2/board-ldp.c | 10 +- + arch/arm/mach-omap2/board-n8x0.c | 20 +- + arch/arm/mach-omap2/board-omap3beagle.c | 19 +- + arch/arm/mach-omap2/board-omap3evm.c | 237 +- + arch/arm/mach-omap2/board-omap3logic.c | 9 +- + arch/arm/mach-omap2/board-omap3pandora.c | 24 +- + arch/arm/mach-omap2/board-omap3stalker.c | 29 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 9 +- + arch/arm/mach-omap2/board-omap4panda.c | 78 +- + arch/arm/mach-omap2/board-overo.c | 8 +- + arch/arm/mach-omap2/board-rm680.c | 10 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 8 +- + arch/arm/mach-omap2/board-rx51-video.c | 15 +- + arch/arm/mach-omap2/board-rx51.c | 8 +- + arch/arm/mach-omap2/board-ti8168evm.c | 62 + + arch/arm/mach-omap2/board-zoom-display.c | 15 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- + arch/arm/mach-omap2/board-zoom.c | 19 +- + arch/arm/mach-omap2/clkt_clksel.c | 2 +- + arch/arm/mach-omap2/clock2430_data.c | 12 +- + arch/arm/mach-omap2/clock2xxx.h | 4 +- + arch/arm/mach-omap2/clock3xxx_data.c | 17 +- + arch/arm/mach-omap2/clock44xx_data.c | 20 +- + arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 16 +- + arch/arm/mach-omap2/common.c | 25 +- + arch/arm/mach-omap2/control.h | 6 + + arch/arm/mach-omap2/devices.c | 611 +--- + arch/arm/mach-omap2/display.c | 45 + + arch/arm/mach-omap2/gpmc-nand.c | 7 +- + arch/arm/mach-omap2/gpmc-onenand.c | 113 +- + arch/arm/mach-omap2/gpmc.c | 56 +- + arch/arm/mach-omap2/hsmmc.c | 421 ++- + arch/arm/mach-omap2/hwspinlock.c | 63 + + arch/arm/mach-omap2/id.c | 64 +- + arch/arm/mach-omap2/include/mach/debug-macro.S | 12 + + arch/arm/mach-omap2/include/mach/entry-macro.S | 13 + + arch/arm/mach-omap2/io.c | 36 +- + arch/arm/mach-omap2/iommu2.c | 33 +- + arch/arm/mach-omap2/irq.c | 9 +- + arch/arm/mach-omap2/mailbox.c | 74 +- + arch/arm/mach-omap2/mcbsp.c | 231 +- + arch/arm/mach-omap2/mux.c | 78 +- + arch/arm/mach-omap2/mux.h | 3 +- + arch/arm/mach-omap2/omap_hwmod.c | 177 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1442 +++++++- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2603 +++++++++++--- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3448 +++++++++++++++--- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4282 +++++++++++++++++++--- + arch/arm/mach-omap2/omap_phy_internal.c | 93 + + arch/arm/mach-omap2/opp2xxx.h | 2 +- + arch/arm/mach-omap2/powerdomains2xxx_data.c | 6 +- + arch/arm/mach-omap2/prcm-common.h | 8 + + arch/arm/mach-omap2/prcm.c | 5 +- + arch/arm/mach-omap2/serial.c | 17 +- + arch/arm/mach-omap2/timer-gp.c | 7 +- + arch/arm/mach-omap2/usb-musb.c | 219 +- + arch/arm/plat-omap/common.c | 11 +- + arch/arm/plat-omap/counter_32k.c | 4 +- + arch/arm/plat-omap/devices.c | 10 +- + arch/arm/plat-omap/dma.c | 2 +- + arch/arm/plat-omap/i2c.c | 2 +- + arch/arm/plat-omap/include/plat/board.h | 4 +- + arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 + + arch/arm/plat-omap/include/plat/clock.h | 1 + + arch/arm/plat-omap/include/plat/common.h | 1 + + arch/arm/plat-omap/include/plat/cpu.h | 44 +- + arch/arm/plat-omap/include/plat/display.h | 11 + + arch/arm/plat-omap/include/plat/dmtimer.h | 11 + + arch/arm/plat-omap/include/plat/fpga.h | 92 +- + arch/arm/plat-omap/include/plat/gpmc.h | 18 +- + arch/arm/plat-omap/include/plat/hardware.h | 1 + + arch/arm/plat-omap/include/plat/io.h | 12 +- + arch/arm/plat-omap/include/plat/iommu.h | 16 +- + arch/arm/plat-omap/include/plat/irqs.h | 9 +- + arch/arm/plat-omap/include/plat/l3_2xxx.h | 20 + + arch/arm/plat-omap/include/plat/l3_3xxx.h | 20 + + arch/arm/plat-omap/include/plat/l4_2xxx.h | 24 + + arch/arm/plat-omap/include/plat/l4_3xxx.h | 10 + + arch/arm/plat-omap/include/plat/mcbsp.h | 64 +- + arch/arm/plat-omap/include/plat/mcspi.h | 11 + + arch/arm/plat-omap/include/plat/mmc.h | 29 +- + arch/arm/plat-omap/include/plat/multi.h | 4 +- + arch/arm/plat-omap/include/plat/nand.h | 11 + + arch/arm/plat-omap/include/plat/omap_hwmod.h | 17 +- + arch/arm/plat-omap/include/plat/onenand.h | 10 +- + arch/arm/plat-omap/include/plat/prcm.h | 1 - + arch/arm/plat-omap/include/plat/sdrc.h | 8 +- + arch/arm/plat-omap/include/plat/serial.h | 9 +- + arch/arm/plat-omap/include/plat/system.h | 38 +- + arch/arm/plat-omap/include/plat/ti816x.h | 27 + + arch/arm/plat-omap/include/plat/uncompress.h | 7 + + arch/arm/plat-omap/include/plat/usb.h | 4 + + arch/arm/plat-omap/io.c | 5 +- + arch/arm/plat-omap/iommu.c | 55 +- + arch/arm/plat-omap/mcbsp.c | 203 +- + arch/arm/plat-omap/sram.c | 20 +- + drivers/Kconfig | 2 + + drivers/Makefile | 2 + + drivers/hwspinlock/Kconfig | 22 + + drivers/hwspinlock/Makefile | 6 + + drivers/hwspinlock/hwspinlock_core.c | 548 +++ + drivers/hwspinlock/hwspinlock_internal.h | 61 + + drivers/hwspinlock/omap_hwspinlock.c | 231 ++ + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/omap_hsmmc.c | 30 +- + drivers/mtd/nand/Kconfig | 17 - + drivers/mtd/nand/omap2.c | 367 ++- + drivers/mtd/onenand/omap2.c | 36 +- + drivers/spi/omap2_mcspi.c | 222 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/musb/musb_core.h | 6 +- + drivers/usb/musb/musbhsdma.h | 2 +- + drivers/usb/otg/isp1301_omap.c | 2 +- + drivers/w1/masters/Kconfig | 2 +- + include/linux/hwspinlock.h | 292 ++ + include/linux/mtd/onenand_regs.h | 1 + + sound/soc/omap/omap-mcbsp.c | 126 +- + sound/soc/omap/omap-mcbsp.h | 4 +- + 150 files changed, 14915 insertions(+), 4111 deletions(-) + create mode 100644 Documentation/hwspinlock.txt + create mode 100644 arch/arm/mach-omap1/reset.c + create mode 100644 arch/arm/mach-omap2/board-ti8168evm.c + create mode 100644 arch/arm/mach-omap2/display.c + create mode 100644 arch/arm/mach-omap2/hwspinlock.c + create mode 100644 arch/arm/plat-omap/include/plat/l3_2xxx.h + create mode 100644 arch/arm/plat-omap/include/plat/l3_3xxx.h + create mode 100644 arch/arm/plat-omap/include/plat/l4_2xxx.h + create mode 100644 arch/arm/plat-omap/include/plat/ti816x.h + create mode 100644 drivers/hwspinlock/Kconfig + create mode 100644 drivers/hwspinlock/Makefile + create mode 100644 drivers/hwspinlock/hwspinlock_core.c + create mode 100644 drivers/hwspinlock/hwspinlock_internal.h + create mode 100644 drivers/hwspinlock/omap_hwspinlock.c + create mode 100644 include/linux/hwspinlock.h +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c2440/mach-rx1950.c +Merge made by recursive. + arch/arm/mach-s3c2410/h1940-bluetooth.c | 11 +- + arch/arm/mach-s3c2410/include/mach/h1940.h | 3 + + arch/arm/mach-s3c2410/mach-h1940.c | 302 ++++++++++++++++++++++++++-- + arch/arm/mach-s3c2440/mach-rx1950.c | 57 ++++++ + 4 files changed, 356 insertions(+), 17 deletions(-) +Merging s5p/for-next +$ git merge s5p/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/mach-exynos4/Kconfig +Auto-merging arch/arm/mach-exynos4/clock.c +Auto-merging arch/arm/mach-exynos4/cpu.c +Auto-merging arch/arm/mach-exynos4/cpufreq.c +Auto-merging arch/arm/mach-exynos4/dev-audio.c +Auto-merging arch/arm/mach-exynos4/dev-pd.c +Auto-merging arch/arm/mach-exynos4/dev-sysmmu.c +Auto-merging arch/arm/mach-exynos4/dma.c +Auto-merging arch/arm/mach-exynos4/gpiolib.c +Auto-merging arch/arm/mach-exynos4/headsmp.S +Auto-merging arch/arm/mach-exynos4/hotplug.c +Auto-merging arch/arm/mach-exynos4/include/mach/debug-macro.S +Auto-merging arch/arm/mach-exynos4/include/mach/entry-macro.S +Auto-merging arch/arm/mach-exynos4/include/mach/hardware.h +Auto-merging arch/arm/mach-exynos4/include/mach/io.h +Auto-merging arch/arm/mach-exynos4/include/mach/irqs.h +Auto-merging arch/arm/mach-exynos4/include/mach/memory.h +Auto-merging arch/arm/mach-exynos4/include/mach/pwm-clock.h +Auto-merging arch/arm/mach-exynos4/include/mach/regs-clock.h +Auto-merging arch/arm/mach-exynos4/include/mach/regs-irq.h +Auto-merging arch/arm/mach-exynos4/include/mach/regs-mem.h +Auto-merging arch/arm/mach-exynos4/include/mach/regs-pmu.h +Auto-merging arch/arm/mach-exynos4/include/mach/regs-sysmmu.h +Auto-merging arch/arm/mach-exynos4/include/mach/smp.h +Auto-merging arch/arm/mach-exynos4/include/mach/sysmmu.h +Auto-merging arch/arm/mach-exynos4/include/mach/system.h +Auto-merging arch/arm/mach-exynos4/include/mach/timex.h +Auto-merging arch/arm/mach-exynos4/include/mach/uncompress.h +Auto-merging arch/arm/mach-exynos4/include/mach/vmalloc.h +Auto-merging arch/arm/mach-exynos4/init.c +Auto-merging arch/arm/mach-exynos4/irq-combiner.c +Auto-merging arch/arm/mach-exynos4/irq-eint.c +Auto-merging arch/arm/mach-exynos4/localtimer.c +Auto-merging arch/arm/mach-exynos4/mach-smdkc210.c +Auto-merging arch/arm/mach-exynos4/mach-smdkv310.c +Auto-merging arch/arm/mach-exynos4/mach-universal_c210.c +Auto-merging arch/arm/mach-exynos4/platsmp.c +Auto-merging arch/arm/mach-exynos4/setup-i2c0.c +Auto-merging arch/arm/mach-exynos4/setup-i2c1.c +Auto-merging arch/arm/mach-exynos4/setup-i2c2.c +Auto-merging arch/arm/mach-exynos4/setup-i2c3.c +Auto-merging arch/arm/mach-exynos4/setup-i2c4.c +Auto-merging arch/arm/mach-exynos4/setup-i2c5.c +Auto-merging arch/arm/mach-exynos4/setup-i2c6.c +Auto-merging arch/arm/mach-exynos4/setup-i2c7.c +Auto-merging arch/arm/mach-exynos4/setup-sdhci-gpio.c +Auto-merging arch/arm/mach-exynos4/setup-sdhci.c +Auto-merging arch/arm/mach-exynos4/time.c +Removing arch/arm/mach-s5pv310/Makefile +Removing arch/arm/mach-s5pv310/include/mach/gpio.h +Removing arch/arm/mach-s5pv310/include/mach/map.h +Removing arch/arm/mach-s5pv310/include/mach/regs-gpio.h +Auto-merging arch/arm/mm/Kconfig +Removing arch/arm/plat-s5p/include/plat/s5pv310.h +Auto-merging drivers/tty/serial/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 12 +- + arch/arm/Makefile | 2 +- + arch/arm/configs/exynos4_defconfig | 70 +++++++ + arch/arm/{mach-s5pv310 => mach-exynos4}/Kconfig | 105 +++++------ + arch/arm/mach-exynos4/Makefile | 43 +++++ + .../{mach-s5pv310 => mach-exynos4}/Makefile.boot | 0 + arch/arm/{mach-s5pv310 => mach-exynos4}/clock.c | 190 ++++++++++---------- + arch/arm/{mach-s5pv310 => mach-exynos4}/cpu.c | 87 +++++----- + arch/arm/{mach-s5pv310 => mach-exynos4}/cpufreq.c | 100 +++++----- + .../arm/{mach-s5pv310 => mach-exynos4}/dev-audio.c | 143 ++++++++------- + arch/arm/{mach-s5pv310 => mach-exynos4}/dev-pd.c | 40 ++-- + .../{mach-s5pv310 => mach-exynos4}/dev-sysmmu.c | 78 ++++---- + arch/arm/{mach-s5pv310 => mach-exynos4}/dma.c | 50 +++--- + arch/arm/{mach-s5pv310 => mach-exynos4}/gpiolib.c | 154 ++++++++-------- + arch/arm/{mach-s5pv310 => mach-exynos4}/headsmp.S | 6 +- + arch/arm/{mach-s5pv310 => mach-exynos4}/hotplug.c | 10 +- + .../include/mach/debug-macro.S | 6 +- + .../include/mach/dma.h | 0 + .../include/mach/entry-macro.S | 4 +- + arch/arm/mach-exynos4/include/mach/gpio.h | 135 ++++++++++++++ + .../include/mach/hardware.h | 8 +- + .../include/mach/io.h | 8 +- + .../include/mach/irqs.h | 8 +- + arch/arm/mach-exynos4/include/mach/map.h | 144 +++++++++++++++ + .../include/mach/memory.h | 8 +- + .../include/mach/pwm-clock.h | 8 +- + .../include/mach/regs-clock.h | 8 +- + arch/arm/mach-exynos4/include/mach/regs-gpio.h | 42 +++++ + .../include/mach/regs-irq.h | 8 +- + .../include/mach/regs-mem.h | 6 +- + .../include/mach/regs-pmu.h | 8 +- + .../include/mach/regs-sysmmu.h | 6 +- + .../include/mach/smp.h | 2 +- + .../include/mach/sysmmu.h | 18 +- + .../include/mach/system.h | 8 +- + .../include/mach/timex.h | 8 +- + .../include/mach/uncompress.h | 8 +- + .../include/mach/vmalloc.h | 8 +- + arch/arm/{mach-s5pv310 => mach-exynos4}/init.c | 10 +- + .../{mach-s5pv310 => mach-exynos4}/irq-combiner.c | 4 +- + arch/arm/{mach-s5pv310 => mach-exynos4}/irq-eint.c | 62 ++++---- + .../{mach-s5pv310 => mach-exynos4}/localtimer.c | 2 +- + .../{mach-s5pv310 => mach-exynos4}/mach-smdkc210.c | 48 +++--- + .../{mach-s5pv310 => mach-exynos4}/mach-smdkv310.c | 48 +++--- + .../mach-universal_c210.c | 22 ++-- + arch/arm/{mach-s5pv310 => mach-exynos4}/platsmp.c | 12 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c0.c | 4 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c1.c | 4 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c2.c | 4 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c3.c | 4 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c4.c | 4 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c5.c | 4 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c6.c | 4 +- + .../{mach-s5pv310 => mach-exynos4}/setup-i2c7.c | 4 +- + .../setup-sdhci-gpio.c | 52 +++--- + .../{mach-s5pv310 => mach-exynos4}/setup-sdhci.c | 12 +- + arch/arm/{mach-s5pv310 => mach-exynos4}/time.c | 64 ++++---- + arch/arm/mach-s3c2440/Kconfig | 1 + + arch/arm/mach-s3c2440/include/mach/gta02.h | 26 ++-- + arch/arm/mach-s3c2440/mach-gta02.c | 71 ++++++-- + arch/arm/mach-s5p64x0/include/mach/gpio.h | 4 +- + arch/arm/mach-s5pv210/mach-aquila.c | 52 ++---- + arch/arm/mach-s5pv210/mach-goni.c | 103 ++++++----- + arch/arm/mach-s5pv310/Makefile | 43 ----- + arch/arm/mach-s5pv310/include/mach/gpio.h | 135 -------------- + arch/arm/mach-s5pv310/include/mach/map.h | 144 --------------- + arch/arm/mach-s5pv310/include/mach/regs-gpio.h | 42 ----- + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-s5p/Kconfig | 8 +- + arch/arm/plat-s5p/cpu.c | 25 ++-- + arch/arm/plat-s5p/include/plat/exynos4.h | 34 ++++ + arch/arm/plat-s5p/include/plat/s5pv310.h | 34 ---- + arch/arm/plat-samsung/include/plat/devs.h | 23 ++- + arch/arm/plat-samsung/include/plat/pd.h | 4 +- + arch/arm/plat-samsung/include/plat/sdhci.h | 63 ++++--- + drivers/mtd/onenand/Kconfig | 2 +- + drivers/tty/serial/Kconfig | 4 +- + sound/soc/samsung/Kconfig | 2 +- + 78 files changed, 1429 insertions(+), 1310 deletions(-) + create mode 100644 arch/arm/configs/exynos4_defconfig + rename arch/arm/{mach-s5pv310 => mach-exynos4}/Kconfig (58%) + create mode 100644 arch/arm/mach-exynos4/Makefile + rename arch/arm/{mach-s5pv310 => mach-exynos4}/Makefile.boot (100%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/clock.c (83%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/cpu.c (67%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/cpufreq.c (82%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/dev-audio.c (57%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/dev-pd.c (74%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/dev-sysmmu.c (62%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/dma.c (74%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/gpiolib.c (58%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/headsmp.S (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/hotplug.c (94%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/debug-macro.S (86%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/dma.h (100%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/entry-macro.S (95%) + create mode 100644 arch/arm/mach-exynos4/include/mach/gpio.h + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/hardware.h (67%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/io.h (76%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/irqs.h (96%) + create mode 100644 arch/arm/mach-exynos4/include/mach/map.h + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/memory.h (72%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/pwm-clock.h (90%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/regs-clock.h (97%) + create mode 100644 arch/arm/mach-exynos4/include/mach/regs-gpio.h + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/regs-irq.h (66%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/regs-mem.h (74%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/regs-pmu.h (77%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/regs-sysmmu.h (79%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/smp.h (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/sysmmu.h (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/system.h (69%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/timex.h (81%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/uncompress.h (80%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/include/mach/vmalloc.h (72%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/init.c (73%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/irq-combiner.c (96%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/irq-eint.c (72%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/localtimer.c (92%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/mach-smdkc210.c (87%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/mach-smdkv310.c (87%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/mach-universal_c210.c (93%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/platsmp.c (92%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c0.c (87%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c1.c (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c2.c (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c3.c (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c4.c (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c5.c (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c6.c (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-i2c7.c (85%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-sdhci-gpio.c (69%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/setup-sdhci.c (83%) + rename arch/arm/{mach-s5pv310 => mach-exynos4}/time.c (78%) + delete mode 100644 arch/arm/mach-s5pv310/Makefile + delete mode 100644 arch/arm/mach-s5pv310/include/mach/gpio.h + delete mode 100644 arch/arm/mach-s5pv310/include/mach/map.h + delete mode 100644 arch/arm/mach-s5pv310/include/mach/regs-gpio.h + create mode 100644 arch/arm/plat-s5p/include/plat/exynos4.h + delete mode 100644 arch/arm/plat-s5p/include/plat/s5pv310.h +Merging tegra/for-next +$ git merge tegra/for-next +Removing arch/arm/mach-tegra/tegra2_dvfs.c +Auto-merging arch/arm/mach-tegra/tegra2_emc.h +Merge made by recursive. + arch/arm/configs/tegra_defconfig | 123 +++ + arch/arm/mach-tegra/Kconfig | 28 + + arch/arm/mach-tegra/Makefile | 10 +- + arch/arm/mach-tegra/board-harmony-pinmux.c | 19 +- + arch/arm/mach-tegra/board-harmony.c | 62 +- + arch/arm/mach-tegra/board-seaboard-pinmux.c | 179 ++++ + arch/arm/mach-tegra/board-seaboard.c | 196 ++++ + arch/arm/mach-tegra/board-seaboard.h | 38 + + arch/arm/mach-tegra/board-trimslice-pinmux.c | 145 +++ + arch/arm/mach-tegra/board-trimslice.c | 103 ++ + .../{tegra2_dvfs.h => board-trimslice.h} | 14 +- + arch/arm/mach-tegra/board.h | 4 +- + arch/arm/mach-tegra/clock.c | 532 +++++----- + arch/arm/mach-tegra/clock.h | 129 +-- + arch/arm/mach-tegra/common.c | 27 +- + arch/arm/mach-tegra/cpu-tegra.c | 100 ++- + arch/arm/mach-tegra/devices.c | 505 +++++++++ + arch/arm/mach-tegra/devices.h | 46 + + arch/arm/mach-tegra/dma.c | 243 +++-- + arch/arm/mach-tegra/gpio.c | 15 + + arch/arm/mach-tegra/include/mach/clk.h | 6 +- + arch/arm/mach-tegra/include/mach/debug-macro.S | 25 +- + arch/arm/mach-tegra/include/mach/gpio.h | 9 +- + .../mach/harmony_audio.h} | 14 +- + arch/arm/mach-tegra/include/mach/iomap.h | 47 + + arch/arm/mach-tegra/include/mach/irqs.h | 14 +- + arch/arm/mach-tegra/include/mach/legacy_irq.h | 4 + + arch/arm/mach-tegra/include/mach/pinmux-t2.h | 10 + + arch/arm/mach-tegra/include/mach/powergate.h | 40 + + arch/arm/mach-tegra/include/mach/suspend.h | 38 + + arch/arm/mach-tegra/include/mach/system.h | 10 +- + arch/arm/mach-tegra/include/mach/uncompress.h | 18 +- + arch/arm/mach-tegra/irq.c | 186 ++-- + arch/arm/mach-tegra/legacy_irq.c | 109 ++- + arch/arm/mach-tegra/pinmux-t2-tables.c | 26 +- + arch/arm/mach-tegra/powergate.c | 212 ++++ + arch/arm/mach-tegra/tegra2_clocks.c | 1120 +++++++++++++++----- + arch/arm/mach-tegra/tegra2_dvfs.c | 86 -- + arch/arm/mach-tegra/tegra2_emc.c | 178 ++++ + .../arm/mach-tegra/{tegra2_dvfs.h => tegra2_emc.h} | 17 +- + arch/arm/mach-tegra/timer.c | 77 ++- + 41 files changed, 3724 insertions(+), 1040 deletions(-) + create mode 100644 arch/arm/configs/tegra_defconfig + create mode 100644 arch/arm/mach-tegra/board-seaboard-pinmux.c + create mode 100644 arch/arm/mach-tegra/board-seaboard.c + create mode 100644 arch/arm/mach-tegra/board-seaboard.h + create mode 100644 arch/arm/mach-tegra/board-trimslice-pinmux.c + create mode 100644 arch/arm/mach-tegra/board-trimslice.c + copy arch/arm/mach-tegra/{tegra2_dvfs.h => board-trimslice.h} (70%) + create mode 100644 arch/arm/mach-tegra/devices.c + create mode 100644 arch/arm/mach-tegra/devices.h + copy arch/arm/mach-tegra/{tegra2_dvfs.h => include/mach/harmony_audio.h} (69%) + create mode 100644 arch/arm/mach-tegra/include/mach/powergate.h + create mode 100644 arch/arm/mach-tegra/include/mach/suspend.h + create mode 100644 arch/arm/mach-tegra/powergate.c + delete mode 100644 arch/arm/mach-tegra/tegra2_dvfs.c + create mode 100644 arch/arm/mach-tegra/tegra2_emc.c + rename arch/arm/mach-tegra/{tegra2_dvfs.h => tegra2_emc.h} (58%) +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Resolved 'arch/arm/configs/u8500_defconfig' using previous resolution. +Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution. +Auto-merging arch/arm/configs/u8500_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/u8500_defconfig +Removing arch/arm/mach-ux500/board-mop500-keypads.c +Auto-merging arch/arm/mach-ux500/cpu-db8500.c +CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cfbf5cf] Merge remote-tracking branch 'ux500-core/ux500-core' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/u8500_defconfig | 6 +- + arch/arm/mach-u300/core.c | 179 +++++++++++-- + arch/arm/mach-u300/mmc.c | 160 ++--------- + arch/arm/mach-u300/spi.c | 21 +- + arch/arm/mach-ux500/Makefile | 8 +- + arch/arm/mach-ux500/board-mop500-keypads.c | 229 --------------- + arch/arm/mach-ux500/board-mop500-pins.c | 241 ++++++++++++++++ + arch/arm/mach-ux500/board-mop500-regulators.c | 62 ++++ + arch/arm/mach-ux500/board-mop500-sdi.c | 184 ++++++++----- + arch/arm/mach-ux500/board-mop500-stuib.c | 205 ++++++++++++++ + arch/arm/mach-ux500/board-mop500-u8500uib.c | 111 ++++++++ + arch/arm/mach-ux500/board-mop500-uib.c | 135 +++++++++ + arch/arm/mach-ux500/board-mop500.c | 328 +++++++++++++++++---- + arch/arm/mach-ux500/board-mop500.h | 25 ++- + arch/arm/mach-ux500/board-u5500-sdi.c | 25 ++ + arch/arm/mach-ux500/board-u5500.c | 6 +- + arch/arm/mach-ux500/clock.c | 6 +- + arch/arm/mach-ux500/cpu-db5500.c | 53 ++++- + arch/arm/mach-ux500/cpu-db8500.c | 25 ++ + arch/arm/mach-ux500/devices-common.c | 1 + + arch/arm/mach-ux500/devices-common.h | 7 +- + arch/arm/mach-ux500/devices-db5500.h | 19 +- + arch/arm/mach-ux500/devices-db8500.c | 67 +++++- + arch/arm/mach-ux500/devices-db8500.h | 15 +- + arch/arm/mach-ux500/dma-db5500.c | 16 + + arch/arm/mach-ux500/include/mach/uncompress.h | 6 +- + arch/arm/mach-ux500/include/mach/usb.h | 25 ++ + arch/arm/mach-ux500/usb.c | 160 +++++++++++ + arch/arm/plat-nomadik/gpio.c | 375 +++++++++++++++++++++---- + arch/arm/plat-nomadik/include/plat/gpio.h | 3 + + 30 files changed, 2091 insertions(+), 612 deletions(-) + delete mode 100644 arch/arm/mach-ux500/board-mop500-keypads.c + create mode 100644 arch/arm/mach-ux500/board-mop500-pins.c + create mode 100644 arch/arm/mach-ux500/board-mop500-stuib.c + create mode 100644 arch/arm/mach-ux500/board-mop500-u8500uib.c + create mode 100644 arch/arm/mach-ux500/board-mop500-uib.c + create mode 100644 arch/arm/mach-ux500/include/mach/usb.h + create mode 100644 arch/arm/mach-ux500/usb.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v32/kernel/smp.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + Documentation/ABI/testing/pstore | 35 ++++ + Documentation/ABI/testing/sysfs-fs-pstore | 7 + + arch/ia64/configs/generic_defconfig | 1 + + arch/ia64/configs/gensparse_defconfig | 1 + + arch/ia64/include/asm/dma-mapping.h | 2 + + arch/ia64/kernel/mca.c | 5 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/ia64/sn/pci/tioca_provider.c | 2 +- + drivers/acpi/apei/Kconfig | 1 + + drivers/acpi/apei/erst.c | 136 ++++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/pstore/Kconfig | 13 ++ + fs/pstore/Makefile | 7 + + fs/pstore/inode.c | 285 +++++++++++++++++++++++++++++ + fs/pstore/internal.h | 7 + + fs/pstore/platform.c | 202 ++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/pstore.h | 60 ++++++ + 19 files changed, 766 insertions(+), 3 deletions(-) + create mode 100644 Documentation/ABI/testing/pstore + create mode 100644 Documentation/ABI/testing/sysfs-fs-pstore + create mode 100644 fs/pstore/Kconfig + create mode 100644 fs/pstore/Makefile + create mode 100644 fs/pstore/inode.c + create mode 100644 fs/pstore/internal.h + create mode 100644 fs/pstore/platform.c + create mode 100644 include/linux/pstore.h +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/Kconfig | 33 +++++- + arch/m68k/Makefile | 1 + + arch/m68k/amiga/chipram.c | 4 - + arch/m68k/emu/Makefile | 9 ++ + arch/m68k/emu/natfeat.c | 78 +++++++++++ + arch/m68k/emu/nfblock.c | 195 ++++++++++++++++++++++++++ + arch/m68k/emu/nfcon.c | 162 ++++++++++++++++++++++ + arch/m68k/emu/nfeth.c | 270 +++++++++++++++++++++++++++++++++++++ + arch/m68k/include/asm/natfeat.h | 22 +++ + arch/m68k/include/asm/processor.h | 2 + + arch/m68k/kernel/setup.c | 5 + + arch/m68k/kernel/signal.c | 24 +++- + arch/m68k/kernel/traps.c | 20 ++- + arch/m68k/math-emu/Makefile | 4 +- + arch/m68k/mm/fault.c | 16 +-- + 15 files changed, 813 insertions(+), 32 deletions(-) + create mode 100644 arch/m68k/emu/Makefile + create mode 100644 arch/m68k/emu/natfeat.c + create mode 100644 arch/m68k/emu/nfblock.c + create mode 100644 arch/m68k/emu/nfcon.c + create mode 100644 arch/m68k/emu/nfeth.c + create mode 100644 arch/m68k/include/asm/natfeat.h +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/Kconfig | 1 + + arch/m68knommu/kernel/irq.c | 6 +++- + arch/m68knommu/platform/5249/intc2.c | 20 ++++++++-------- + arch/m68knommu/platform/5272/intc.c | 33 +++++++++++++++----------- + arch/m68knommu/platform/68328/ints.c | 12 ++++---- + arch/m68knommu/platform/68360/ints.c | 18 +++++++------- + arch/m68knommu/platform/coldfire/intc-2.c | 16 ++++++++---- + arch/m68knommu/platform/coldfire/intc-simr.c | 18 +++++++++---- + arch/m68knommu/platform/coldfire/intc.c | 20 ++++++++-------- + 9 files changed, 81 insertions(+), 63 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 +Merge made by recursive. + arch/mips/Kconfig | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) +Merging parisc/for-next +$ git merge parisc/for-next +Merge made by recursive. + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/cacheflush.h | 31 +++-- + arch/parisc/include/asm/irq.h | 13 +-- + arch/parisc/include/asm/pgtable.h | 14 +-- + arch/parisc/kernel/cache.c | 109 +++------------- + arch/parisc/kernel/entry.S | 217 +++++++++++++++++------------- + arch/parisc/kernel/irq.c | 64 +++++---- + arch/parisc/kernel/pacache.S | 245 +++++++++++++++------------------- + drivers/parisc/dino.c | 22 ++-- + drivers/parisc/eisa.c | 12 +- + drivers/parisc/gsc.c | 22 ++-- + drivers/parisc/iosapic.c | 40 +++--- + drivers/parisc/superio.c | 12 +- + 13 files changed, 375 insertions(+), 427 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Auto-merging arch/powerpc/kernel/cputable.c +Merge made by recursive. + arch/powerpc/boot/dts/canyonlands.dts | 24 +++++ + arch/powerpc/include/asm/cputable.h | 3 +- + arch/powerpc/kernel/cputable.c | 22 ++++- + arch/powerpc/mm/tlb_nohash_low.S | 35 +++++++ + arch/powerpc/platforms/44x/44x.h | 4 + + arch/powerpc/platforms/44x/Kconfig | 1 - + arch/powerpc/platforms/44x/Makefile | 1 + + arch/powerpc/platforms/44x/canyonlands.c | 134 ++++++++++++++++++++++++++++ + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 - + 9 files changed, 218 insertions(+), 7 deletions(-) + create mode 100644 arch/powerpc/platforms/44x/canyonlands.c +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/Kconfig | 20 +++++--------------- + arch/s390/Makefile | 3 +-- + drivers/s390/block/dasd_eckd.c | 1 + + drivers/s390/block/xpram.c | 4 ++-- + drivers/s390/char/keyboard.c | 3 ++- + drivers/s390/cio/cio.c | 6 +----- + drivers/s390/cio/cio.h | 2 -- + 7 files changed, 12 insertions(+), 27 deletions(-) +Merging sh/sh-latest +$ git merge sh/sh-latest +Auto-merging drivers/watchdog/Kconfig +Merge made by recursive. + arch/sh/boot/compressed/Makefile | 2 + + arch/sh/drivers/pci/pcie-sh7786.c | 46 +++-- + arch/sh/mm/Makefile | 2 + + drivers/tty/serial/sh-sci.c | 425 ++++++++++++++++++------------------- + drivers/tty/serial/sh-sci.h | 39 ---- + drivers/watchdog/Kconfig | 8 - + drivers/watchdog/shwdt.c | 365 +++++++++++++++----------------- + include/linux/serial_sci.h | 16 +- + kernel/gcov/Kconfig | 2 +- + 9 files changed, 420 insertions(+), 485 deletions(-) +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Auto-merging arch/sparc/kernel/pci.c +Auto-merging arch/sparc/kernel/pci_fire.c +Auto-merging arch/sparc/kernel/pci_sun4v.c +Removing arch/sparc/kernel/tick14.c +Merge made by recursive. + arch/sparc/Kconfig | 34 ++++ + arch/sparc/Makefile | 3 +- + arch/sparc/boot/Makefile | 31 ++++ + arch/sparc/include/asm/irq_64.h | 18 +- + arch/sparc/include/asm/leon.h | 3 - + arch/sparc/include/asm/leon_amba.h | 6 + + arch/sparc/include/asm/mmu_32.h | 3 + + arch/sparc/include/asm/smp_32.h | 6 + + arch/sparc/kernel/Makefile | 2 +- + arch/sparc/kernel/cpu.c | 2 +- + arch/sparc/kernel/entry.h | 4 +- + arch/sparc/kernel/ioport.c | 108 +++++++----- + arch/sparc/kernel/irq.h | 42 ++++- + arch/sparc/kernel/irq_32.c | 260 +++++++++++++----------------- + arch/sparc/kernel/irq_64.c | 312 ++++++++++++++++++------------------ + arch/sparc/kernel/kernel.h | 49 ++++++ + arch/sparc/kernel/leon_kernel.c | 11 +- + arch/sparc/kernel/leon_pmc.c | 82 ++++++++++ + arch/sparc/kernel/leon_smp.c | 36 ++--- + arch/sparc/kernel/of_device_32.c | 59 +------ + arch/sparc/kernel/pci.c | 10 +- + arch/sparc/kernel/pci_fire.c | 8 +- + arch/sparc/kernel/pci_impl.h | 4 +- + arch/sparc/kernel/pci_msi.c | 44 +++--- + arch/sparc/kernel/pci_sun4v.c | 6 +- + arch/sparc/kernel/prom_irqtrans.c | 16 +- + arch/sparc/kernel/setup_32.c | 19 +-- + arch/sparc/kernel/sun4c_irq.c | 85 ++++++----- + arch/sparc/kernel/sun4d_irq.c | 298 +++++++++++++++++++--------------- + arch/sparc/kernel/sun4d_smp.c | 176 ++++++++------------- + arch/sparc/kernel/sun4m_irq.c | 202 +++++++++++------------ + arch/sparc/kernel/sun4m_smp.c | 91 +++-------- + arch/sparc/kernel/tick14.c | 39 ----- + arch/sparc/kernel/time_32.c | 2 +- + arch/sparc/prom/misc_32.c | 4 - + 35 files changed, 1065 insertions(+), 1010 deletions(-) + create mode 100644 arch/sparc/kernel/leon_pmc.c + delete mode 100644 arch/sparc/kernel/tick14.c +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Recorded preimage for 'drivers/video/Kconfig' +Auto-merging MAINTAINERS +Auto-merging drivers/video/Kconfig +CONFLICT (content): Merge conflict in drivers/video/Kconfig +Auto-merging drivers/video/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/video/Kconfig'. +[master 81a6381] Merge remote-tracking branch 'unicore32/unicore32' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 16 + + arch/unicore32/.gitignore | 21 + + arch/unicore32/Kconfig | 275 ++++++++ + arch/unicore32/Kconfig.debug | 68 ++ + arch/unicore32/Makefile | 95 +++ + arch/unicore32/boot/Makefile | 47 ++ + arch/unicore32/boot/compressed/Makefile | 68 ++ + arch/unicore32/boot/compressed/head.S | 204 ++++++ + arch/unicore32/boot/compressed/misc.c | 126 ++++ + arch/unicore32/boot/compressed/piggy.S.in | 6 + + arch/unicore32/boot/compressed/vmlinux.lds.in | 61 ++ + arch/unicore32/configs/debug_defconfig | 215 +++++++ + arch/unicore32/include/asm/Kbuild | 2 + + arch/unicore32/include/asm/assembler.h | 131 ++++ + arch/unicore32/include/asm/bitops.h | 47 ++ + arch/unicore32/include/asm/byteorder.h | 24 + + arch/unicore32/include/asm/cache.h | 27 + + arch/unicore32/include/asm/cacheflush.h | 211 ++++++ + arch/unicore32/include/asm/checksum.h | 41 ++ + arch/unicore32/include/asm/cpu-single.h | 45 ++ + arch/unicore32/include/asm/cputype.h | 33 + + arch/unicore32/include/asm/delay.h | 52 ++ + arch/unicore32/include/asm/dma-mapping.h | 124 ++++ + arch/unicore32/include/asm/dma.h | 23 + + arch/unicore32/include/asm/elf.h | 94 +++ + arch/unicore32/include/asm/fpstate.h | 26 + + arch/unicore32/include/asm/fpu-ucf64.h | 53 ++ + arch/unicore32/include/asm/futex.h | 143 +++++ + arch/unicore32/include/asm/gpio.h | 104 +++ + arch/unicore32/include/asm/hwcap.h | 32 + + arch/unicore32/include/asm/io.h | 55 ++ + arch/unicore32/include/asm/irq.h | 105 +++ + arch/unicore32/include/asm/irqflags.h | 53 ++ + arch/unicore32/include/asm/linkage.h | 22 + + arch/unicore32/include/asm/memblock.h | 46 ++ + arch/unicore32/include/asm/memory.h | 123 ++++ + arch/unicore32/include/asm/mmu.h | 17 + + arch/unicore32/include/asm/mmu_context.h | 87 +++ + arch/unicore32/include/asm/mutex.h | 20 + + arch/unicore32/include/asm/page.h | 80 +++ + arch/unicore32/include/asm/pci.h | 46 ++ + arch/unicore32/include/asm/pgalloc.h | 110 ++++ + arch/unicore32/include/asm/pgtable-hwdef.h | 55 ++ + arch/unicore32/include/asm/pgtable.h | 317 +++++++++ + arch/unicore32/include/asm/processor.h | 92 +++ + arch/unicore32/include/asm/ptrace.h | 133 ++++ + arch/unicore32/include/asm/sigcontext.h | 29 + + arch/unicore32/include/asm/stacktrace.h | 31 + + arch/unicore32/include/asm/string.h | 38 ++ + arch/unicore32/include/asm/suspend.h | 30 + + arch/unicore32/include/asm/system.h | 161 +++++ + arch/unicore32/include/asm/thread_info.h | 154 +++++ + arch/unicore32/include/asm/timex.h | 34 + + arch/unicore32/include/asm/tlb.h | 98 +++ + arch/unicore32/include/asm/tlbflush.h | 195 ++++++ + arch/unicore32/include/asm/traps.h | 21 + + arch/unicore32/include/asm/uaccess.h | 47 ++ + arch/unicore32/include/asm/unistd.h | 18 + + arch/unicore32/include/mach/PKUnity.h | 104 +++ + arch/unicore32/include/mach/bitfield.h | 24 + + arch/unicore32/include/mach/dma.h | 48 ++ + arch/unicore32/include/mach/hardware.h | 36 + + arch/unicore32/include/mach/map.h | 20 + + arch/unicore32/include/mach/memory.h | 58 ++ + arch/unicore32/include/mach/ocd.h | 36 + + arch/unicore32/include/mach/pm.h | 43 ++ + arch/unicore32/include/mach/regs-ac97.h | 32 + + arch/unicore32/include/mach/regs-dmac.h | 81 +++ + arch/unicore32/include/mach/regs-gpio.h | 70 ++ + arch/unicore32/include/mach/regs-i2c.h | 63 ++ + arch/unicore32/include/mach/regs-intc.h | 28 + + arch/unicore32/include/mach/regs-nand.h | 79 +++ + arch/unicore32/include/mach/regs-ost.h | 92 +++ + arch/unicore32/include/mach/regs-pci.h | 94 +++ + arch/unicore32/include/mach/regs-pm.h | 126 ++++ + arch/unicore32/include/mach/regs-ps2.h | 20 + + arch/unicore32/include/mach/regs-resetc.h | 34 + + arch/unicore32/include/mach/regs-rtc.h | 37 ++ + arch/unicore32/include/mach/regs-sdc.h | 156 +++++ + arch/unicore32/include/mach/regs-spi.h | 98 +++ + arch/unicore32/include/mach/regs-uart.h | 3 + + arch/unicore32/include/mach/regs-umal.h | 229 +++++++ + arch/unicore32/include/mach/regs-unigfx.h | 200 ++++++ + arch/unicore32/include/mach/uncompress.h | 34 + + arch/unicore32/kernel/Makefile | 33 + + arch/unicore32/kernel/asm-offsets.c | 112 ++++ + arch/unicore32/kernel/clock.c | 390 ++++++++++++ + arch/unicore32/kernel/cpu-ucv2.c | 93 +++ + arch/unicore32/kernel/debug-macro.S | 89 +++ + arch/unicore32/kernel/debug.S | 85 +++ + arch/unicore32/kernel/dma.c | 183 ++++++ + arch/unicore32/kernel/early_printk.c | 59 ++ + arch/unicore32/kernel/elf.c | 38 ++ + arch/unicore32/kernel/entry.S | 824 ++++++++++++++++++++++++ + arch/unicore32/kernel/fpu-ucf64.c | 126 ++++ + arch/unicore32/kernel/gpio.c | 122 ++++ + arch/unicore32/kernel/head.S | 252 ++++++++ + arch/unicore32/kernel/hibernate.c | 160 +++++ + arch/unicore32/kernel/hibernate_asm.S | 117 ++++ + arch/unicore32/kernel/init_task.c | 44 ++ + arch/unicore32/kernel/irq.c | 426 +++++++++++++ + arch/unicore32/kernel/ksyms.c | 99 +++ + arch/unicore32/kernel/ksyms.h | 15 + + arch/unicore32/kernel/module.c | 152 +++++ + arch/unicore32/kernel/pci.c | 404 ++++++++++++ + arch/unicore32/kernel/pm.c | 123 ++++ + arch/unicore32/kernel/process.c | 389 ++++++++++++ + arch/unicore32/kernel/ptrace.c | 149 +++++ + arch/unicore32/kernel/puv3-core.c | 285 +++++++++ + arch/unicore32/kernel/puv3-nb0916.c | 145 +++++ + arch/unicore32/kernel/pwm.c | 263 ++++++++ + arch/unicore32/kernel/rtc.c | 380 +++++++++++ + arch/unicore32/kernel/setup.c | 360 +++++++++++ + arch/unicore32/kernel/setup.h | 30 + + arch/unicore32/kernel/signal.c | 494 +++++++++++++++ + arch/unicore32/kernel/sleep.S | 202 ++++++ + arch/unicore32/kernel/stacktrace.c | 131 ++++ + arch/unicore32/kernel/sys.c | 126 ++++ + arch/unicore32/kernel/time.c | 143 +++++ + arch/unicore32/kernel/traps.c | 333 ++++++++++ + arch/unicore32/kernel/vmlinux.lds.S | 61 ++ + arch/unicore32/lib/Makefile | 27 + + arch/unicore32/lib/backtrace.S | 163 +++++ + arch/unicore32/lib/clear_user.S | 57 ++ + arch/unicore32/lib/copy_from_user.S | 108 ++++ + arch/unicore32/lib/copy_page.S | 39 ++ + arch/unicore32/lib/copy_template.S | 214 +++++++ + arch/unicore32/lib/copy_to_user.S | 96 +++ + arch/unicore32/lib/delay.S | 51 ++ + arch/unicore32/lib/findbit.S | 98 +++ + arch/unicore32/lib/strncpy_from_user.S | 45 ++ + arch/unicore32/lib/strnlen_user.S | 42 ++ + arch/unicore32/mm/Kconfig | 50 ++ + arch/unicore32/mm/Makefile | 15 + + arch/unicore32/mm/alignment.c | 523 +++++++++++++++ + arch/unicore32/mm/cache-ucv2.S | 212 ++++++ + arch/unicore32/mm/dma-swiotlb.c | 34 + + arch/unicore32/mm/extable.c | 24 + + arch/unicore32/mm/fault.c | 479 ++++++++++++++ + arch/unicore32/mm/flush.c | 98 +++ + arch/unicore32/mm/init.c | 517 +++++++++++++++ + arch/unicore32/mm/ioremap.c | 261 ++++++++ + arch/unicore32/mm/mm.h | 39 ++ + arch/unicore32/mm/mmu.c | 533 ++++++++++++++++ + arch/unicore32/mm/pgd.c | 102 +++ + arch/unicore32/mm/proc-macros.S | 145 +++++ + arch/unicore32/mm/proc-syms.c | 23 + + arch/unicore32/mm/proc-ucv2.S | 134 ++++ + arch/unicore32/mm/tlb-ucv2.S | 89 +++ + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-puv3.c | 306 +++++++++ + drivers/input/serio/i8042-unicore32io.h | 73 +++ + drivers/input/serio/i8042.h | 2 + + drivers/pci/Makefile | 1 + + drivers/video/Kconfig | 11 + + drivers/video/Makefile | 1 + + drivers/video/fb-puv3.c | 846 +++++++++++++++++++++++++ + include/asm-generic/ftrace.h | 16 + + include/asm-generic/io.h | 33 +- + include/asm-generic/sizes.h | 47 ++ + include/asm-generic/uaccess.h | 8 +- + include/linux/fb.h | 2 + + 163 files changed, 19472 insertions(+), 17 deletions(-) + create mode 100644 arch/unicore32/.gitignore + create mode 100644 arch/unicore32/Kconfig + create mode 100644 arch/unicore32/Kconfig.debug + create mode 100644 arch/unicore32/Makefile + create mode 100644 arch/unicore32/boot/Makefile + create mode 100644 arch/unicore32/boot/compressed/Makefile + create mode 100644 arch/unicore32/boot/compressed/head.S + create mode 100644 arch/unicore32/boot/compressed/misc.c + create mode 100644 arch/unicore32/boot/compressed/piggy.S.in + create mode 100644 arch/unicore32/boot/compressed/vmlinux.lds.in + create mode 100644 arch/unicore32/configs/debug_defconfig + create mode 100644 arch/unicore32/include/asm/Kbuild + create mode 100644 arch/unicore32/include/asm/assembler.h + create mode 100644 arch/unicore32/include/asm/bitops.h + create mode 100644 arch/unicore32/include/asm/byteorder.h + create mode 100644 arch/unicore32/include/asm/cache.h + create mode 100644 arch/unicore32/include/asm/cacheflush.h + create mode 100644 arch/unicore32/include/asm/checksum.h + create mode 100644 arch/unicore32/include/asm/cpu-single.h + create mode 100644 arch/unicore32/include/asm/cputype.h + create mode 100644 arch/unicore32/include/asm/delay.h + create mode 100644 arch/unicore32/include/asm/dma-mapping.h + create mode 100644 arch/unicore32/include/asm/dma.h + create mode 100644 arch/unicore32/include/asm/elf.h + create mode 100644 arch/unicore32/include/asm/fpstate.h + create mode 100644 arch/unicore32/include/asm/fpu-ucf64.h + create mode 100644 arch/unicore32/include/asm/futex.h + create mode 100644 arch/unicore32/include/asm/gpio.h + create mode 100644 arch/unicore32/include/asm/hwcap.h + create mode 100644 arch/unicore32/include/asm/io.h + create mode 100644 arch/unicore32/include/asm/irq.h + create mode 100644 arch/unicore32/include/asm/irqflags.h + create mode 100644 arch/unicore32/include/asm/linkage.h + create mode 100644 arch/unicore32/include/asm/memblock.h + create mode 100644 arch/unicore32/include/asm/memory.h + create mode 100644 arch/unicore32/include/asm/mmu.h + create mode 100644 arch/unicore32/include/asm/mmu_context.h + create mode 100644 arch/unicore32/include/asm/mutex.h + create mode 100644 arch/unicore32/include/asm/page.h + create mode 100644 arch/unicore32/include/asm/pci.h + create mode 100644 arch/unicore32/include/asm/pgalloc.h + create mode 100644 arch/unicore32/include/asm/pgtable-hwdef.h + create mode 100644 arch/unicore32/include/asm/pgtable.h + create mode 100644 arch/unicore32/include/asm/processor.h + create mode 100644 arch/unicore32/include/asm/ptrace.h + create mode 100644 arch/unicore32/include/asm/sigcontext.h + create mode 100644 arch/unicore32/include/asm/stacktrace.h + create mode 100644 arch/unicore32/include/asm/string.h + create mode 100644 arch/unicore32/include/asm/suspend.h + create mode 100644 arch/unicore32/include/asm/system.h + create mode 100644 arch/unicore32/include/asm/thread_info.h + create mode 100644 arch/unicore32/include/asm/timex.h + create mode 100644 arch/unicore32/include/asm/tlb.h + create mode 100644 arch/unicore32/include/asm/tlbflush.h + create mode 100644 arch/unicore32/include/asm/traps.h + create mode 100644 arch/unicore32/include/asm/uaccess.h + create mode 100644 arch/unicore32/include/asm/unistd.h + create mode 100644 arch/unicore32/include/mach/PKUnity.h + create mode 100644 arch/unicore32/include/mach/bitfield.h + create mode 100644 arch/unicore32/include/mach/dma.h + create mode 100644 arch/unicore32/include/mach/hardware.h + create mode 100644 arch/unicore32/include/mach/map.h + create mode 100644 arch/unicore32/include/mach/memory.h + create mode 100644 arch/unicore32/include/mach/ocd.h + create mode 100644 arch/unicore32/include/mach/pm.h + create mode 100644 arch/unicore32/include/mach/regs-ac97.h + create mode 100644 arch/unicore32/include/mach/regs-dmac.h + create mode 100644 arch/unicore32/include/mach/regs-gpio.h + create mode 100644 arch/unicore32/include/mach/regs-i2c.h + create mode 100644 arch/unicore32/include/mach/regs-intc.h + create mode 100644 arch/unicore32/include/mach/regs-nand.h + create mode 100644 arch/unicore32/include/mach/regs-ost.h + create mode 100644 arch/unicore32/include/mach/regs-pci.h + create mode 100644 arch/unicore32/include/mach/regs-pm.h + create mode 100644 arch/unicore32/include/mach/regs-ps2.h + create mode 100644 arch/unicore32/include/mach/regs-resetc.h + create mode 100644 arch/unicore32/include/mach/regs-rtc.h + create mode 100644 arch/unicore32/include/mach/regs-sdc.h + create mode 100644 arch/unicore32/include/mach/regs-spi.h + create mode 100644 arch/unicore32/include/mach/regs-uart.h + create mode 100644 arch/unicore32/include/mach/regs-umal.h + create mode 100644 arch/unicore32/include/mach/regs-unigfx.h + create mode 100644 arch/unicore32/include/mach/uncompress.h + create mode 100644 arch/unicore32/kernel/Makefile + create mode 100644 arch/unicore32/kernel/asm-offsets.c + create mode 100644 arch/unicore32/kernel/clock.c + create mode 100644 arch/unicore32/kernel/cpu-ucv2.c + create mode 100644 arch/unicore32/kernel/debug-macro.S + create mode 100644 arch/unicore32/kernel/debug.S + create mode 100644 arch/unicore32/kernel/dma.c + create mode 100644 arch/unicore32/kernel/early_printk.c + create mode 100644 arch/unicore32/kernel/elf.c + create mode 100644 arch/unicore32/kernel/entry.S + create mode 100644 arch/unicore32/kernel/fpu-ucf64.c + create mode 100644 arch/unicore32/kernel/gpio.c + create mode 100644 arch/unicore32/kernel/head.S + create mode 100644 arch/unicore32/kernel/hibernate.c + create mode 100644 arch/unicore32/kernel/hibernate_asm.S + create mode 100644 arch/unicore32/kernel/init_task.c + create mode 100644 arch/unicore32/kernel/irq.c + create mode 100644 arch/unicore32/kernel/ksyms.c + create mode 100644 arch/unicore32/kernel/ksyms.h + create mode 100644 arch/unicore32/kernel/module.c + create mode 100644 arch/unicore32/kernel/pci.c + create mode 100644 arch/unicore32/kernel/pm.c + create mode 100644 arch/unicore32/kernel/process.c + create mode 100644 arch/unicore32/kernel/ptrace.c + create mode 100644 arch/unicore32/kernel/puv3-core.c + create mode 100644 arch/unicore32/kernel/puv3-nb0916.c + create mode 100644 arch/unicore32/kernel/pwm.c + create mode 100644 arch/unicore32/kernel/rtc.c + create mode 100644 arch/unicore32/kernel/setup.c + create mode 100644 arch/unicore32/kernel/setup.h + create mode 100644 arch/unicore32/kernel/signal.c + create mode 100644 arch/unicore32/kernel/sleep.S + create mode 100644 arch/unicore32/kernel/stacktrace.c + create mode 100644 arch/unicore32/kernel/sys.c + create mode 100644 arch/unicore32/kernel/time.c + create mode 100644 arch/unicore32/kernel/traps.c + create mode 100644 arch/unicore32/kernel/vmlinux.lds.S + create mode 100644 arch/unicore32/lib/Makefile + create mode 100644 arch/unicore32/lib/backtrace.S + create mode 100644 arch/unicore32/lib/clear_user.S + create mode 100644 arch/unicore32/lib/copy_from_user.S + create mode 100644 arch/unicore32/lib/copy_page.S + create mode 100644 arch/unicore32/lib/copy_template.S + create mode 100644 arch/unicore32/lib/copy_to_user.S + create mode 100644 arch/unicore32/lib/delay.S + create mode 100644 arch/unicore32/lib/findbit.S + create mode 100644 arch/unicore32/lib/strncpy_from_user.S + create mode 100644 arch/unicore32/lib/strnlen_user.S + create mode 100644 arch/unicore32/mm/Kconfig + create mode 100644 arch/unicore32/mm/Makefile + create mode 100644 arch/unicore32/mm/alignment.c + create mode 100644 arch/unicore32/mm/cache-ucv2.S + create mode 100644 arch/unicore32/mm/dma-swiotlb.c + create mode 100644 arch/unicore32/mm/extable.c + create mode 100644 arch/unicore32/mm/fault.c + create mode 100644 arch/unicore32/mm/flush.c + create mode 100644 arch/unicore32/mm/init.c + create mode 100644 arch/unicore32/mm/ioremap.c + create mode 100644 arch/unicore32/mm/mm.h + create mode 100644 arch/unicore32/mm/mmu.c + create mode 100644 arch/unicore32/mm/pgd.c + create mode 100644 arch/unicore32/mm/proc-macros.S + create mode 100644 arch/unicore32/mm/proc-syms.c + create mode 100644 arch/unicore32/mm/proc-ucv2.S + create mode 100644 arch/unicore32/mm/tlb-ucv2.S + create mode 100644 drivers/i2c/busses/i2c-puv3.c + create mode 100644 drivers/input/serio/i8042-unicore32io.h + create mode 100644 drivers/video/fb-puv3.c + create mode 100644 include/asm-generic/ftrace.h + create mode 100644 include/asm-generic/sizes.h +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 4db84ec] Merge remote-tracking 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 +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/Kconfig | 34 ++- + fs/cifs/README | 28 -- + fs/cifs/TODO | 2 + + fs/cifs/cache.c | 6 +- + fs/cifs/cifs_debug.c | 215 +++++------ + fs/cifs/cifs_debug.h | 12 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifs_fs_sb.h | 4 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/cifs_spnego.h | 2 +- + fs/cifs/cifsacl.c | 4 +- + fs/cifs/cifsacl.h | 2 +- + fs/cifs/cifsencrypt.c | 20 +- + fs/cifs/cifsfs.c | 25 +- + fs/cifs/cifsfs.h | 6 +- + fs/cifs/cifsglob.h | 125 ++++--- + fs/cifs/cifsproto.h | 169 +++++---- + fs/cifs/cifssmb.c | 395 ++++++++++--------- + fs/cifs/connect.c | 132 ++++--- + fs/cifs/dir.c | 8 +- + fs/cifs/export.c | 4 +- + fs/cifs/file.c | 38 +- + fs/cifs/fscache.c | 6 +- + fs/cifs/fscache.h | 8 +- + fs/cifs/inode.c | 42 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/link.c | 12 +- + fs/cifs/misc.c | 35 +- + fs/cifs/readdir.c | 8 +- + fs/cifs/sess.c | 61 ++-- + fs/cifs/smb2glob.h | 258 +++++++++++++ + fs/cifs/smb2pdu.h | 996 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/transport.c | 24 +- + fs/cifs/xattr.c | 8 +- + 34 files changed, 2016 insertions(+), 683 deletions(-) + create mode 100644 fs/cifs/smb2glob.h + create mode 100644 fs/cifs/smb2pdu.h +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/ext2/namei.c | 9 ++------- + fs/ext3/balloc.c | 10 ++++------ + fs/ext3/super.c | 7 +++++++ + fs/jbd/journal.c | 2 +- + fs/jbd2/journal.c | 2 +- + fs/quota/quota_v2.c | 2 +- + 6 files changed, 16 insertions(+), 16 deletions(-) +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + Documentation/ABI/testing/sysfs-fs-ext4 | 13 +- + Documentation/filesystems/ext4.txt | 207 +++++++++++++++++++- + fs/ext4/extents.c | 195 ++++++++++++++---- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 339 ++++++++++++------------------- + fs/ext4/ioctl.c | 6 + + fs/ext4/mballoc.c | 21 ++- + fs/ext4/mballoc.h | 2 +- + fs/ext4/migrate.c | 10 +- + fs/ext4/page-io.c | 13 +- + fs/ext4/resize.c | 4 +- + fs/ext4/super.c | 44 +++-- + fs/ext4/xattr.c | 2 +- + 13 files changed, 561 insertions(+), 297 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Merge made by recursive. + fs/fuse/cuse.c | 12 ++++++++++-- + fs/fuse/fuse_i.h | 1 - + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/main.c +Merge made by recursive. + fs/gfs2/acl.c | 7 +- + fs/gfs2/bmap.c | 20 ++- + fs/gfs2/file.c | 15 ++- + fs/gfs2/glock.c | 392 +++++++++++++++++++------------------------------- + fs/gfs2/glock.h | 39 +++--- + fs/gfs2/glops.c | 23 ++-- + fs/gfs2/incore.h | 5 +- + fs/gfs2/lock_dlm.c | 14 +-- + fs/gfs2/lops.c | 3 +- + fs/gfs2/main.c | 6 +- + fs/gfs2/ops_fstype.c | 7 +- + fs/gfs2/ops_inode.c | 10 +- + fs/gfs2/quota.c | 6 +- + fs/gfs2/rgrp.c | 34 ++++- + fs/gfs2/rgrp.h | 2 + + 15 files changed, 264 insertions(+), 319 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 deletions(-) +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/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 4129907] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +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 +Merge made by recursive. + fs/nilfs2/alloc.c | 12 +++-- + fs/nilfs2/bmap.c | 11 ----- + fs/nilfs2/bmap.h | 3 - + fs/nilfs2/btree.c | 6 +- + fs/nilfs2/dir.c | 5 +-- + fs/nilfs2/direct.c | 4 +- + fs/nilfs2/file.c | 2 +- + fs/nilfs2/inode.c | 43 ++++++++++++++------- + fs/nilfs2/ioctl.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ + fs/nilfs2/nilfs.h | 20 ++++++++++ + fs/nilfs2/segment.c | 3 +- + fs/nilfs2/the_nilfs.c | 11 +++-- + include/linux/nilfs2_fs.h | 26 ++---------- + 13 files changed, 169 insertions(+), 69 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/dir.c | 12 +++-- + fs/ocfs2/dlm/dlmdomain.c | 28 ++++++++------ + fs/ocfs2/dlmglue.c | 97 +++++++++++++++++++++++---------------------- + fs/ocfs2/ioctl.c | 38 ++++++++++++++---- + fs/ocfs2/ocfs2.h | 23 +++++++---- + 5 files changed, 117 insertions(+), 81 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + fs/udf/balloc.c | 4 +- + fs/udf/file.c | 7 +- + fs/udf/inode.c | 239 +++++++++++++++++++++++++++++++++++++---------------- + fs/udf/truncate.c | 146 +++++++++++++------------------- + fs/udf/udfdecl.h | 12 +-- + 5 files changed, 236 insertions(+), 172 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + fs/9p/acl.c | 28 +++-- + fs/9p/cache.c | 204 +++++++++++----------------- + fs/9p/cache.h | 64 +++------- + fs/9p/fid.c | 114 +++++++++++----- + fs/9p/fid.h | 5 +- + fs/9p/v9fs.c | 108 +++++++++++++--- + fs/9p/v9fs.h | 53 ++++++-- + fs/9p/v9fs_vfs.h | 26 +++- + fs/9p/vfs_addr.c | 194 +++++++++++++++++++++++++--- + fs/9p/vfs_dentry.c | 47 ++++++-- + fs/9p/vfs_dir.c | 1 - + fs/9p/vfs_file.c | 316 +++++++++++++++++++++++++++++++++++--------- + fs/9p/vfs_inode.c | 307 +++++++++++++++++++++++++++++++------------ + fs/9p/vfs_inode_dotl.c | 198 +++++++++++++++++++--------- + fs/9p/vfs_super.c | 65 +++++++--- + include/net/9p/9p.h | 12 ++- + include/net/9p/client.h | 1 + + include/net/9p/transport.h | 9 ++ + net/9p/Makefile | 1 + + net/9p/client.c | 166 +++++++++++++++++------- + net/9p/protocol.c | 44 ++++++ + net/9p/trans_common.c | 97 ++++++++++++++ + net/9p/trans_common.h | 32 +++++ + net/9p/trans_virtio.c | 129 +++++++++++++++++- + 24 files changed, 1660 insertions(+), 561 deletions(-) + create mode 100644 net/9p/trans_common.c + create mode 100644 net/9p/trans_common.h +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/super.c +Merge made by recursive. + fs/ubifs/commit.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/ubifs/debug.c | 6 ++-- + fs/ubifs/io.c | 12 +++++++--- + fs/ubifs/recovery.c | 23 +++++++++++++++++++- + fs/ubifs/scan.c | 2 +- + fs/ubifs/super.c | 11 +-------- + fs/ubifs/tnc.c | 10 ++++++-- + fs/ubifs/ubifs.h | 21 ++++++++--------- + 8 files changed, 110 insertions(+), 33 deletions(-) +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + .../filesystems/xfs-delayed-logging-design.txt | 7 -- + fs/xfs/linux-2.6/xfs_ioctl.c | 11 ++- + fs/xfs/linux-2.6/xfs_super.c | 1 + + fs/xfs/quota/xfs_qm.c | 7 -- + fs/xfs/xfs_bmap.c | 7 ++ + fs/xfs/xfs_inode.c | 5 +- + fs/xfs/xfs_inode.h | 23 ++++-- + fs/xfs/xfs_rtalloc.c | 84 ++++++++------------ + fs/xfs/xfs_rw.c | 18 +--- + fs/xfs/xfs_trans.h | 2 - + fs/xfs/xfs_trans_inode.c | 22 ----- + fs/xfs/xfs_vnodeops.c | 61 ++++----------- + 12 files changed, 89 insertions(+), 159 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging drivers/pci/pci-sysfs.c +Merge made by recursive. + arch/x86/pci/irq.c | 15 +++++-------- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/probe.c | 4 ++- + drivers/pci/quirks.c | 52 ----------------------------------------------- + include/linux/pci.h | 5 ++++ + include/linux/pci_ids.h | 3 ++ + 6 files changed, 18 insertions(+), 63 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Auto-merging drivers/hid/Kconfig +Auto-merging include/linux/hid-roccat.h +Merge made by recursive. + Documentation/ABI/testing/sysfs-driver-hid | 10 + + .../ABI/testing/sysfs-driver-hid-roccat-arvo | 53 ++ + .../ABI/testing/sysfs-driver-hid-roccat-kone | 8 + + .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 11 + + .../ABI/testing/sysfs-driver-hid-roccat-kovaplus | 100 +++ + .../ABI/testing/sysfs-driver-hid-roccat-pyra | 9 + + Documentation/ioctl/ioctl-number.txt | 1 + + drivers/hid/Kconfig | 37 + + drivers/hid/Makefile | 5 + + drivers/hid/hid-core.c | 38 + + drivers/hid/hid-gyration.c | 5 + + drivers/hid/hid-ids.h | 11 + + drivers/hid/hid-input.c | 31 +- + drivers/hid/hid-keytouch.c | 66 ++ + drivers/hid/hid-lcpower.c | 70 ++ + drivers/hid/hid-multitouch.c | 28 +- + drivers/hid/hid-roccat-arvo.c | 450 ++++++++++++ + drivers/hid/hid-roccat-arvo.h | 98 +++ + drivers/hid/hid-roccat-common.c | 62 ++ + drivers/hid/hid-roccat-common.h | 23 + + drivers/hid/hid-roccat-kone.c | 156 ++--- + drivers/hid/hid-roccat-koneplus.c | 165 ++--- + drivers/hid/hid-roccat-kovaplus.c | 715 ++++++++++++++++++++ + drivers/hid/hid-roccat-kovaplus.h | 157 +++++ + drivers/hid/hid-roccat-pyra.c | 174 ++---- + drivers/hid/hid-roccat.c | 53 ++- + drivers/hid/hid-sony.c | 20 + + drivers/hid/hidraw.c | 112 +++- + drivers/hid/usbhid/hid-core.c | 35 + + {drivers/hid => include/linux}/hid-roccat.h | 19 +- + include/linux/hid.h | 5 +- + include/linux/hidraw.h | 3 + + net/bluetooth/hidp/core.c | 197 +++++- + net/bluetooth/hidp/hidp.h | 15 + + 34 files changed, 2529 insertions(+), 413 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-arvo + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus + create mode 100644 drivers/hid/hid-keytouch.c + create mode 100644 drivers/hid/hid-lcpower.c + create mode 100644 drivers/hid/hid-roccat-arvo.c + create mode 100644 drivers/hid/hid-roccat-arvo.h + create mode 100644 drivers/hid/hid-roccat-common.c + create mode 100644 drivers/hid/hid-roccat-common.h + create mode 100644 drivers/hid/hid-roccat-kovaplus.c + create mode 100644 drivers/hid/hid-roccat-kovaplus.h + rename {drivers/hid => include/linux}/hid-roccat.h (52%) +Merging quilt/i2c +$ git merge quilt/i2c +Removing include/linux/i2c-id.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 ++++ + Documentation/i2c/instantiating-devices | 2 +- + Documentation/i2c/upgrading-clients | 18 ++++---- + drivers/i2c/Makefile | 1 + + drivers/i2c/i2c-boardinfo.c | 2 +- + drivers/i2c/i2c-core.c | 28 +++++++++---- + drivers/i2c/i2c-dev.c | 60 ++++++++++++++++++---------- + include/linux/i2c-id.h | 37 ----------------- + include/linux/i2c.h | 17 ++++---- + 9 files changed, 89 insertions(+), 85 deletions(-) + delete mode 100644 include/linux/i2c-id.h +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-pxa/balloon3.c +Auto-merging arch/arm/mach-pxa/pxa27x.c +Auto-merging arch/arm/mach-pxa/pxa3xx.c +Auto-merging arch/arm/mach-pxa/zeus.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +Merge made by recursive. + Documentation/i2c/busses/i2c-diolan-u2c | 26 + + MAINTAINERS | 6 + + arch/arm/mach-mmp/include/mach/mmp2.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa168.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa910.h | 2 +- + arch/arm/mach-pxa/balloon3.c | 3 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-evalboard.c | 3 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 3 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/csb726.c | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/palm27x.c | 3 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 3 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/pxa95x.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/saarb.c | 3 +- + arch/arm/mach-pxa/spitz.c | 3 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + arch/arm/mach-pxa/tavorevb3.c | 3 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/vpac270.c | 3 +- + arch/arm/mach-pxa/xcep.c | 3 +- + arch/arm/mach-pxa/z2.c | 3 +- + arch/arm/mach-pxa/zeus.c | 3 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- + drivers/i2c/busses/Kconfig | 49 ++- + drivers/i2c/busses/Makefile | 4 + + drivers/i2c/busses/i2c-diolan-u2c.c | 535 +++++++++++++++ + drivers/i2c/busses/i2c-eg20t.c | 161 +++-- + drivers/i2c/busses/i2c-mxs.c | 412 ++++++++++++ + drivers/i2c/busses/i2c-pxa-pci.c | 176 +++++ + drivers/i2c/busses/i2c-pxa.c | 116 +++- + drivers/i2c/busses/i2c-tegra.c | 700 ++++++++++++++++++++ + include/linux/i2c-tegra.h | 25 + + .../plat/i2c.h => include/linux/i2c/pxa-i2c.h | 0 + 50 files changed, 2152 insertions(+), 146 deletions(-) + create mode 100644 Documentation/i2c/busses/i2c-diolan-u2c + create mode 100644 drivers/i2c/busses/i2c-diolan-u2c.c + create mode 100644 drivers/i2c/busses/i2c-mxs.c + create mode 100644 drivers/i2c/busses/i2c-pxa-pci.c + create mode 100644 drivers/i2c/busses/i2c-tegra.c + create mode 100644 include/linux/i2c-tegra.h + rename arch/arm/plat-pxa/include/plat/i2c.h => include/linux/i2c/pxa-i2c.h (100%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging Documentation/misc-devices/lis3lv02d +Auto-merging MAINTAINERS +Auto-merging drivers/misc/lis3lv02d/lis3lv02d.c +Auto-merging drivers/misc/lis3lv02d/lis3lv02d_i2c.c +Auto-merging drivers/misc/lis3lv02d/lis3lv02d_spi.c +Auto-merging drivers/platform/x86/hp_accel.c +Merge made by recursive. + Documentation/hwmon/ads1015 | 67 +++++ + Documentation/hwmon/lm75 | 5 + + Documentation/hwmon/w83795 | 127 +++++++++ + Documentation/{hwmon => laptops}/hpfall.c | 0 + Documentation/{hwmon => misc-devices}/lis3lv02d | 4 +- + MAINTAINERS | 4 +- + drivers/hwmon/Kconfig | 76 +----- + drivers/hwmon/Makefile | 4 +- + drivers/hwmon/ads1015.c | 282 +++++++++++++++++++++ + drivers/hwmon/lm75.c | 66 ++++-- + drivers/hwmon/sht15.c | 2 +- + drivers/misc/Kconfig | 9 + + drivers/misc/Makefile | 1 + + drivers/misc/lis3lv02d/Kconfig | 37 +++ + drivers/misc/lis3lv02d/Makefile | 7 + + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.c | 3 +- + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.h | 0 + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_i2c.c | 2 +- + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_spi.c | 2 +- + drivers/platform/x86/Kconfig | 18 ++ + drivers/platform/x86/Makefile | 1 + + drivers/{hwmon => platform/x86}/hp_accel.c | 6 +- + include/linux/i2c/ads1015.h | 28 ++ + 23 files changed, 650 insertions(+), 101 deletions(-) + create mode 100644 Documentation/hwmon/ads1015 + create mode 100644 Documentation/hwmon/w83795 + rename Documentation/{hwmon => laptops}/hpfall.c (100%) + rename Documentation/{hwmon => misc-devices}/lis3lv02d (96%) + create mode 100644 drivers/hwmon/ads1015.c + create mode 100644 drivers/misc/lis3lv02d/Kconfig + create mode 100644 drivers/misc/lis3lv02d/Makefile + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.c (99%) + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.h (100%) + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_i2c.c (99%) + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_spi.c (98%) + rename drivers/{hwmon => platform/x86}/hp_accel.c (99%) + create mode 100644 include/linux/i2c/ads1015.h +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Resolved 'drivers/hwmon/Makefile' using previous resolution. +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +CONFLICT (content): Merge conflict in drivers/hwmon/Makefile +Auto-merging drivers/misc/lis3lv02d/lis3lv02d_spi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d7eae97] Merge remote-tracking branch 'hwmon-staging/hwmon-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwmon/lineage-pem | 77 ++ + Documentation/hwmon/lm85 | 12 +- + Documentation/hwmon/max6639 | 49 + + Documentation/hwmon/pmbus | 215 +++++ + drivers/hwmon/Kconfig | 76 ++ + drivers/hwmon/Makefile | 9 + + drivers/hwmon/lineage-pem.c | 589 ++++++++++++ + drivers/hwmon/lm85.c | 136 ++-- + drivers/hwmon/max16064.c | 91 ++ + drivers/hwmon/max34440.c | 199 ++++ + drivers/hwmon/max6639.c | 653 +++++++++++++ + drivers/hwmon/max8688.c | 158 +++ + drivers/hwmon/pmbus.c | 203 ++++ + drivers/hwmon/pmbus.h | 313 ++++++ + drivers/hwmon/pmbus_core.c | 1628 ++++++++++++++++++++++++++++++++ + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 19 +- + include/linux/i2c/max6639.h | 14 + + include/linux/i2c/pmbus.h | 45 + + 18 files changed, 4415 insertions(+), 71 deletions(-) + create mode 100644 Documentation/hwmon/lineage-pem + create mode 100644 Documentation/hwmon/max6639 + create mode 100644 Documentation/hwmon/pmbus + create mode 100644 drivers/hwmon/lineage-pem.c + create mode 100644 drivers/hwmon/max16064.c + create mode 100644 drivers/hwmon/max34440.c + create mode 100644 drivers/hwmon/max6639.c + create mode 100644 drivers/hwmon/max8688.c + create mode 100644 drivers/hwmon/pmbus.c + create mode 100644 drivers/hwmon/pmbus.h + create mode 100644 drivers/hwmon/pmbus_core.c + create mode 100644 include/linux/i2c/max6639.h + create mode 100644 include/linux/i2c/pmbus.h +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/00-INDEX | 4 ---- + Documentation/devicetree/00-INDEX | 8 ++++++++ + Documentation/powerpc/00-INDEX | 4 ---- + 3 files changed, 8 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/00-INDEX +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging Documentation/feature-removal-schedule.txt +Removing drivers/media/dvb/firewire/firedtv-1394.c +Removing drivers/staging/dabusb/Kconfig +Removing drivers/staging/dabusb/Makefile +Removing drivers/staging/dabusb/TODO +Removing drivers/staging/dabusb/dabusb.c +Removing drivers/staging/dabusb/dabusb.h +Removing drivers/staging/se401/Kconfig +Removing drivers/staging/se401/Makefile +Removing drivers/staging/se401/TODO +Removing drivers/staging/se401/se401.c +Removing drivers/staging/se401/se401.h +Removing drivers/staging/se401/videodev.h +Removing drivers/staging/usbvideo/Kconfig +Removing drivers/staging/usbvideo/Makefile +Removing drivers/staging/usbvideo/TODO +Removing drivers/staging/usbvideo/usbvideo.c +Removing drivers/staging/usbvideo/usbvideo.h +Removing drivers/staging/usbvideo/vicam.c +Removing drivers/staging/usbvideo/videodev.h +Auto-merging include/media/s5p_fimc.h +Merge made by recursive. + Documentation/DocBook/media-entities.tmpl | 8 + + Documentation/DocBook/v4l/common.xml | 2 + + Documentation/DocBook/v4l/compat.xml | 11 + + Documentation/DocBook/v4l/dev-capture.xml | 13 +- + Documentation/DocBook/v4l/dev-output.xml | 13 +- + Documentation/DocBook/v4l/func-mmap.xml | 10 +- + Documentation/DocBook/v4l/func-munmap.xml | 3 +- + Documentation/DocBook/v4l/io.xml | 283 ++- + Documentation/DocBook/v4l/pixfmt-nv12m.xml | 154 + + Documentation/DocBook/v4l/pixfmt-yuv420m.xml | 162 + + Documentation/DocBook/v4l/pixfmt.xml | 118 +- + Documentation/DocBook/v4l/planar-apis.xml | 62 + + Documentation/DocBook/v4l/v4l2.xml | 22 +- + Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 2 + + Documentation/DocBook/v4l/vidioc-g-fmt.xml | 15 +- + Documentation/DocBook/v4l/vidioc-qbuf.xml | 24 +- + Documentation/DocBook/v4l/vidioc-querybuf.xml | 14 +- + Documentation/DocBook/v4l/vidioc-querycap.xml | 18 +- + Documentation/dvb/get_dvb_firmware | 8 +- + Documentation/feature-removal-schedule.txt | 36 - + Documentation/video4linux/gspca.txt | 1 + + drivers/media/common/tuners/tda9887.c | 9 +- + drivers/media/common/tuners/tea5761.c | 33 +- + drivers/media/common/tuners/tuner-types.c | 21 + + drivers/media/common/tuners/tuner-xc2028.c | 14 +- + drivers/media/common/tuners/xc5000.c | 56 +- + drivers/media/common/tuners/xc5000.h | 1 + + drivers/media/dvb/Kconfig | 2 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 1 - + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/dib0700.h | 2 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 47 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1410 ++++++++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 + + drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 +++++ + drivers/media/dvb/firewire/Kconfig | 8 +- + drivers/media/dvb/firewire/Makefile | 5 +- + drivers/media/dvb/firewire/firedtv-1394.c | 300 -- + drivers/media/dvb/firewire/firedtv-avc.c | 15 +- + drivers/media/dvb/firewire/firedtv-dvb.c | 135 +- + drivers/media/dvb/firewire/firedtv-fe.c | 8 +- + drivers/media/dvb/firewire/firedtv-fw.c | 146 +- + drivers/media/dvb/firewire/firedtv.h | 45 +- + drivers/media/dvb/frontends/Kconfig | 15 + + drivers/media/dvb/frontends/Makefile | 2 + + drivers/media/dvb/frontends/dib0090.c | 1595 ++++++++-- + drivers/media/dvb/frontends/dib0090.h | 31 + + drivers/media/dvb/frontends/dib7000p.c | 1945 +++++++++---- + drivers/media/dvb/frontends/dib7000p.h | 96 +- + drivers/media/dvb/frontends/dib8000.c | 821 ++++-- + drivers/media/dvb/frontends/dib8000.h | 20 + + drivers/media/dvb/frontends/dib9000.c | 2350 ++++++++++++++ + drivers/media/dvb/frontends/dib9000.h | 131 + + drivers/media/dvb/frontends/dibx000_common.c | 279 ++- + drivers/media/dvb/frontends/dibx000_common.h | 152 +- + drivers/media/dvb/frontends/ds3000.c | 40 +- + drivers/media/dvb/frontends/dvb-pll.c | 79 +- + drivers/media/dvb/frontends/stv0367.c | 3441 ++++++++++++++++++++ + drivers/media/dvb/frontends/stv0367.h | 66 + + drivers/media/dvb/frontends/stv0367_priv.h | 212 ++ + drivers/media/dvb/frontends/stv0367_regs.h | 3614 ++++++++++++++++++++++ + drivers/media/dvb/frontends/stv090x.c | 286 ++- + drivers/media/dvb/frontends/stv090x.h | 16 + + drivers/media/dvb/frontends/stv090x_reg.h | 16 +- + drivers/media/dvb/ngene/Makefile | 3 + + drivers/media/dvb/ngene/ngene-cards.c | 179 +- + drivers/media/dvb/ngene/ngene-core.c | 236 ++- + drivers/media/dvb/ngene/ngene-dvb.c | 71 +- + drivers/media/dvb/ngene/ngene.h | 24 + + drivers/media/radio/si470x/radio-si470x-common.c | 1 - + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 + + drivers/media/video/Kconfig | 45 +- + drivers/media/video/Makefile | 8 + + drivers/media/video/adv7343.c | 167 +- + drivers/media/video/adv7343_regs.h | 8 +- + drivers/media/video/au0828/au0828-cards.c | 3 +- + drivers/media/video/au0828/au0828-video.c | 28 +- + drivers/media/video/bt819.c | 129 +- + drivers/media/video/bt8xx/bttv-cards.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 373 +-- + drivers/media/video/cs5345.c | 87 +- + drivers/media/video/cx18/cx18-av-audio.c | 92 +- + drivers/media/video/cx18/cx18-av-core.c | 175 +- + drivers/media/video/cx18/cx18-av-core.h | 12 +- + drivers/media/video/cx18/cx18-controls.c | 285 +-- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 31 +- + drivers/media/video/cx18/cx18-driver.h | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 32 +- + drivers/media/video/cx18/cx18-ioctl.c | 24 +- + drivers/media/video/cx18/cx18-mailbox.c | 5 +- + drivers/media/video/cx18/cx18-mailbox.h | 5 - + drivers/media/video/cx18/cx18-streams.c | 16 +- + drivers/media/video/cx231xx/cx231xx-417.c | 4 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 14 +- + drivers/media/video/cx231xx/cx231xx-cards.c | 246 +- + drivers/media/video/cx231xx/cx231xx-core.c | 16 +- + drivers/media/video/cx231xx/cx231xx-i2c.c | 31 +- + drivers/media/video/cx231xx/cx231xx-video.c | 20 +- + drivers/media/video/cx231xx/cx231xx.h | 5 + + drivers/media/video/cx23885/Kconfig | 12 +- + drivers/media/video/cx23885/Makefile | 1 + + drivers/media/video/cx23885/altera-ci.c | 832 +++++ + drivers/media/video/cx23885/altera-ci.h | 102 + + drivers/media/video/cx23885/cx23885-cards.c | 110 +- + drivers/media/video/cx23885/cx23885-core.c | 37 +- + drivers/media/video/cx23885/cx23885-dvb.c | 172 +- + drivers/media/video/cx23885/cx23885-reg.h | 1 + + drivers/media/video/cx23885/cx23885-video.c | 7 +- + drivers/media/video/cx23885/cx23885.h | 7 +- + drivers/media/video/cx88/cx88-alsa.c | 118 +- + drivers/media/video/cx88/cx88-cards.c | 7 +- + drivers/media/video/cx88/cx88-tvaudio.c | 8 +- + drivers/media/video/cx88/cx88-video.c | 78 +- + drivers/media/video/cx88/cx88.h | 13 +- + drivers/media/video/em28xx/em28xx-video.c | 33 +- + drivers/media/video/gspca/Kconfig | 10 + + drivers/media/video/gspca/Makefile | 2 + + drivers/media/video/gspca/cpia1.c | 6 +- + drivers/media/video/gspca/ov519.c | 90 +- + drivers/media/video/gspca/ov534.c | 980 ++++--- + drivers/media/video/gspca/sn9c20x.c | 40 +- + drivers/media/video/gspca/sonixj.c | 353 ++- + drivers/media/video/gspca/vicam.c | 381 +++ + drivers/media/video/gspca/zc3xx.c | 4 + + drivers/media/video/mem2mem_testdev.c | 227 +- + drivers/media/video/mx3_camera.c | 415 ++-- + drivers/media/video/noon010pc30.c | 792 +++++ + drivers/media/video/omap1_camera.c | 66 +- + drivers/media/video/omap24xxcam.c | 1 + + drivers/media/video/ov9740.c | 1009 ++++++ + drivers/media/video/pwc/pwc-if.c | 38 +- + drivers/media/video/pwc/pwc-v4l.c | 1032 +++---- + drivers/media/video/pwc/pwc.h | 3 +- + drivers/media/video/s5p-fimc/fimc-capture.c | 550 ++-- + drivers/media/video/s5p-fimc/fimc-core.c | 872 +++--- + drivers/media/video/s5p-fimc/fimc-core.h | 134 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 199 +- + drivers/media/video/s5p-fimc/regs-fimc.h | 29 +- + drivers/media/video/saa7110.c | 115 +- + drivers/media/video/saa7134/saa7134-cards.c | 43 +- + drivers/media/video/saa7134/saa7134-core.c | 35 +- + drivers/media/video/saa7134/saa7134-empress.c | 4 + + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/saa7164/saa7164-api.c | 10 +- + drivers/media/video/saa7164/saa7164-buffer.c | 16 +- + drivers/media/video/saa7164/saa7164-bus.c | 8 +- + drivers/media/video/saa7164/saa7164-cmd.c | 10 +- + drivers/media/video/saa7164/saa7164-core.c | 8 +- + drivers/media/video/saa7164/saa7164-dvb.c | 4 +- + drivers/media/video/saa7164/saa7164-encoder.c | 8 +- + drivers/media/video/saa7164/saa7164-fw.c | 2 +- + drivers/media/video/saa7164/saa7164-vbi.c | 8 +- + drivers/media/video/sh_mobile_ceu_camera.c | 276 +- + drivers/media/video/sn9c102/sn9c102_core.c | 6 +- + drivers/media/video/soc_camera.c | 131 +- + drivers/media/video/soc_mediabus.c | 14 + + drivers/media/video/tlv320aic23b.c | 74 +- + drivers/media/video/tuner-core.c | 1213 ++++---- + drivers/media/video/tvp514x.c | 236 +-- + drivers/media/video/tvp5150.c | 199 +- + drivers/media/video/tvp7002.c | 117 +- + drivers/media/video/v4l2-common.c | 1 - + drivers/media/video/v4l2-compat-ioctl32.c | 244 ++- + drivers/media/video/v4l2-ctrls.c | 2 + + drivers/media/video/v4l2-ioctl.c | 493 +++- + drivers/media/video/v4l2-mem2mem.c | 232 +- + drivers/media/video/videobuf2-core.c | 1804 +++++++++++ + drivers/media/video/videobuf2-dma-contig.c | 185 ++ + drivers/media/video/videobuf2-dma-sg.c | 292 ++ + drivers/media/video/videobuf2-memops.c | 235 ++ + drivers/media/video/videobuf2-vmalloc.c | 132 + + drivers/media/video/vivi.c | 585 ++-- + drivers/media/video/vpx3220.c | 137 +- + drivers/media/video/wm8775.c | 126 +- + drivers/staging/Kconfig | 8 +- + drivers/staging/Makefile | 5 +- + drivers/staging/altera-stapl/Kconfig | 8 + + drivers/staging/altera-stapl/Makefile | 3 + + drivers/staging/altera-stapl/altera-comp.c | 142 + + drivers/staging/altera-stapl/altera-exprt.h | 33 + + drivers/staging/altera-stapl/altera-jtag.c | 1020 ++++++ + drivers/staging/altera-stapl/altera-jtag.h | 113 + + drivers/staging/altera-stapl/altera-lpt.c | 70 + + drivers/staging/altera-stapl/altera.c | 2527 +++++++++++++++ + drivers/staging/cxd2099/Kconfig | 11 + + drivers/staging/cxd2099/Makefile | 5 + + drivers/staging/cxd2099/TODO | 12 + + drivers/staging/cxd2099/cxd2099.c | 574 ++++ + drivers/staging/cxd2099/cxd2099.h | 41 + + drivers/staging/dabusb/Kconfig | 14 - + drivers/staging/dabusb/Makefile | 2 - + drivers/staging/dabusb/TODO | 5 - + drivers/staging/dabusb/dabusb.c | 914 ------ + drivers/staging/dabusb/dabusb.h | 85 - + drivers/staging/easycap/easycap_ioctl.c | 5 - + drivers/staging/se401/Kconfig | 13 - + drivers/staging/se401/Makefile | 1 - + drivers/staging/se401/TODO | 5 - + drivers/staging/se401/se401.c | 1492 --------- + drivers/staging/se401/se401.h | 236 -- + drivers/staging/se401/videodev.h | 318 -- + drivers/staging/tm6000/tm6000-alsa.c | 13 +- + drivers/staging/tm6000/tm6000-cards.c | 68 +- + drivers/staging/tm6000/tm6000-core.c | 298 ++- + drivers/staging/tm6000/tm6000-regs.h | 63 +- + drivers/staging/tm6000/tm6000-stds.c | 33 +- + drivers/staging/tm6000/tm6000-video.c | 327 ++- + drivers/staging/tm6000/tm6000.h | 23 +- + drivers/staging/usbvideo/Kconfig | 15 - + drivers/staging/usbvideo/Makefile | 2 - + drivers/staging/usbvideo/TODO | 5 - + drivers/staging/usbvideo/usbvideo.c | 2230 ------------- + drivers/staging/usbvideo/usbvideo.h | 395 --- + drivers/staging/usbvideo/vicam.c | 952 ------ + drivers/staging/usbvideo/videodev.h | 318 -- + include/linux/videodev2.h | 141 +- + include/media/noon010pc30.h | 28 + + include/media/rc-map.h | 1 + + include/media/{s3c_fimc.h => s5p_fimc.h} | 20 +- + include/media/soc_camera.h | 22 +- + include/media/soc_mediabus.h | 1 + + include/media/tuner.h | 16 +- + include/media/v4l2-chip-ident.h | 4 + + include/media/v4l2-ioctl.h | 16 + + include/media/v4l2-mem2mem.h | 56 +- + include/media/v4l2-subdev.h | 2 + + include/media/videobuf2-core.h | 380 +++ + include/media/videobuf2-dma-contig.h | 29 + + include/media/videobuf2-dma-sg.h | 32 + + include/media/videobuf2-memops.h | 45 + + include/media/videobuf2-vmalloc.h | 20 + + include/media/wm8775.h | 9 + + include/staging/altera.h | 49 + + 239 files changed, 36003 insertions(+), 14802 deletions(-) + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12m.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420m.xml + create mode 100644 Documentation/DocBook/v4l/planar-apis.xml + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + delete mode 100644 drivers/media/dvb/firewire/firedtv-1394.c + create mode 100644 drivers/media/dvb/frontends/dib9000.c + create mode 100644 drivers/media/dvb/frontends/dib9000.h + create mode 100644 drivers/media/dvb/frontends/stv0367.c + create mode 100644 drivers/media/dvb/frontends/stv0367.h + create mode 100644 drivers/media/dvb/frontends/stv0367_priv.h + create mode 100644 drivers/media/dvb/frontends/stv0367_regs.h + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + create mode 100644 drivers/media/video/cx23885/altera-ci.c + create mode 100644 drivers/media/video/cx23885/altera-ci.h + create mode 100644 drivers/media/video/gspca/vicam.c + create mode 100644 drivers/media/video/noon010pc30.c + create mode 100644 drivers/media/video/ov9740.c + create mode 100644 drivers/media/video/videobuf2-core.c + create mode 100644 drivers/media/video/videobuf2-dma-contig.c + create mode 100644 drivers/media/video/videobuf2-dma-sg.c + create mode 100644 drivers/media/video/videobuf2-memops.c + create mode 100644 drivers/media/video/videobuf2-vmalloc.c + create mode 100644 drivers/staging/altera-stapl/Kconfig + create mode 100644 drivers/staging/altera-stapl/Makefile + create mode 100644 drivers/staging/altera-stapl/altera-comp.c + create mode 100644 drivers/staging/altera-stapl/altera-exprt.h + create mode 100644 drivers/staging/altera-stapl/altera-jtag.c + create mode 100644 drivers/staging/altera-stapl/altera-jtag.h + create mode 100644 drivers/staging/altera-stapl/altera-lpt.c + create mode 100644 drivers/staging/altera-stapl/altera.c + create mode 100644 drivers/staging/cxd2099/Kconfig + create mode 100644 drivers/staging/cxd2099/Makefile + create mode 100644 drivers/staging/cxd2099/TODO + create mode 100644 drivers/staging/cxd2099/cxd2099.c + create mode 100644 drivers/staging/cxd2099/cxd2099.h + delete mode 100644 drivers/staging/dabusb/Kconfig + delete mode 100644 drivers/staging/dabusb/Makefile + delete mode 100644 drivers/staging/dabusb/TODO + delete mode 100644 drivers/staging/dabusb/dabusb.c + delete mode 100644 drivers/staging/dabusb/dabusb.h + delete mode 100644 drivers/staging/se401/Kconfig + delete mode 100644 drivers/staging/se401/Makefile + delete mode 100644 drivers/staging/se401/TODO + delete mode 100644 drivers/staging/se401/se401.c + delete mode 100644 drivers/staging/se401/se401.h + delete mode 100644 drivers/staging/se401/videodev.h + delete mode 100644 drivers/staging/usbvideo/Kconfig + delete mode 100644 drivers/staging/usbvideo/Makefile + delete mode 100644 drivers/staging/usbvideo/TODO + delete mode 100644 drivers/staging/usbvideo/usbvideo.c + delete mode 100644 drivers/staging/usbvideo/usbvideo.h + delete mode 100644 drivers/staging/usbvideo/vicam.c + delete mode 100644 drivers/staging/usbvideo/videodev.h + create mode 100644 include/media/noon010pc30.h + rename include/media/{s3c_fimc.h => s5p_fimc.h} (75%) + create mode 100644 include/media/videobuf2-core.h + create mode 100644 include/media/videobuf2-dma-contig.h + create mode 100644 include/media/videobuf2-dma-sg.h + create mode 100644 include/media/videobuf2-memops.h + create mode 100644 include/media/videobuf2-vmalloc.h + create mode 100644 include/staging/altera.h +$ git reset --hard HEAD^ +HEAD is now at 34b2035 Merge branch 'quilt/kernel-doc' +Merging refs/next/20110225/v4l-dvb +$ git merge refs/next/20110225/v4l-dvb +Auto-merging include/media/s5p_fimc.h +Merge made by recursive. + Documentation/DocBook/media-entities.tmpl | 8 + + Documentation/DocBook/v4l/common.xml | 2 + + Documentation/DocBook/v4l/compat.xml | 11 + + Documentation/DocBook/v4l/dev-capture.xml | 13 +- + Documentation/DocBook/v4l/dev-output.xml | 13 +- + Documentation/DocBook/v4l/func-mmap.xml | 10 +- + Documentation/DocBook/v4l/func-munmap.xml | 3 +- + Documentation/DocBook/v4l/io.xml | 283 +++- + Documentation/DocBook/v4l/pixfmt-nv12m.xml | 154 ++ + Documentation/DocBook/v4l/pixfmt-yuv420m.xml | 162 ++ + Documentation/DocBook/v4l/pixfmt.xml | 118 ++- + Documentation/DocBook/v4l/planar-apis.xml | 81 + + Documentation/DocBook/v4l/v4l2.xml | 22 +- + Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 2 + + Documentation/DocBook/v4l/vidioc-g-fmt.xml | 15 +- + Documentation/DocBook/v4l/vidioc-qbuf.xml | 24 +- + Documentation/DocBook/v4l/vidioc-querybuf.xml | 14 +- + Documentation/DocBook/v4l/vidioc-querycap.xml | 24 +- + Documentation/dvb/get_dvb_firmware | 8 +- + drivers/media/common/tuners/tuner-types.c | 21 + + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/dib0700.h | 2 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 47 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1410 ++++++++++++++-- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 + + drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 +++++++++ + drivers/media/dvb/frontends/Kconfig | 8 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/dib0090.c | 1595 +++++++++++++---- + drivers/media/dvb/frontends/dib0090.h | 31 + + drivers/media/dvb/frontends/dib7000p.c | 1945 +++++++++++++++------ + drivers/media/dvb/frontends/dib7000p.h | 96 +- + drivers/media/dvb/frontends/dib8000.c | 821 ++++++---- + drivers/media/dvb/frontends/dib8000.h | 20 + + drivers/media/dvb/frontends/dib9000.c | 2350 +++++++++++++++++++++++++ + drivers/media/dvb/frontends/dib9000.h | 131 ++ + drivers/media/dvb/frontends/dibx000_common.c | 279 +++- + drivers/media/dvb/frontends/dibx000_common.h | 152 ++- + drivers/media/dvb/frontends/stv090x.c | 286 +++- + drivers/media/dvb/frontends/stv090x.h | 16 + + drivers/media/dvb/frontends/stv090x_reg.h | 16 +- + drivers/media/dvb/ngene/Makefile | 3 + + drivers/media/dvb/ngene/ngene-cards.c | 179 ++- + drivers/media/dvb/ngene/ngene-core.c | 236 ++- + drivers/media/dvb/ngene/ngene-dvb.c | 71 +- + drivers/media/dvb/ngene/ngene.h | 24 + + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 + + drivers/media/video/Kconfig | 36 +- + drivers/media/video/Makefile | 7 + + drivers/media/video/adv7343.c | 167 +-- + drivers/media/video/adv7343_regs.h | 8 +- + drivers/media/video/bt819.c | 129 +- + drivers/media/video/cs5345.c | 87 +- + drivers/media/video/cx18/cx18-av-audio.c | 92 +- + drivers/media/video/cx18/cx18-av-core.c | 175 +-- + drivers/media/video/cx18/cx18-av-core.h | 12 +- + drivers/media/video/cx18/cx18-controls.c | 285 +--- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 30 +- + drivers/media/video/cx18/cx18-driver.h | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 32 +- + drivers/media/video/cx18/cx18-ioctl.c | 24 +- + drivers/media/video/cx18/cx18-mailbox.c | 5 +- + drivers/media/video/cx18/cx18-mailbox.h | 5 - + drivers/media/video/cx18/cx18-streams.c | 16 +- + drivers/media/video/mem2mem_testdev.c | 227 ++-- + drivers/media/video/noon010pc30.c | 792 +++++++++ + drivers/media/video/s5p-fimc/fimc-capture.c | 550 ++++--- + drivers/media/video/s5p-fimc/fimc-core.c | 872 +++++----- + drivers/media/video/s5p-fimc/fimc-core.h | 134 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 199 ++- + drivers/media/video/s5p-fimc/regs-fimc.h | 29 +- + drivers/media/video/saa7110.c | 115 +- + drivers/media/video/saa7134/saa7134-cards.c | 39 + + drivers/media/video/saa7134/saa7134-core.c | 35 +- + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/tlv320aic23b.c | 74 +- + drivers/media/video/tvp514x.c | 236 +-- + drivers/media/video/tvp5150.c | 157 +-- + drivers/media/video/tvp7002.c | 117 +- + drivers/media/video/v4l2-compat-ioctl32.c | 229 ++- + drivers/media/video/v4l2-ioctl.c | 455 +++++- + drivers/media/video/v4l2-mem2mem.c | 232 ++-- + drivers/media/video/videobuf2-core.c | 1804 +++++++++++++++++++ + drivers/media/video/videobuf2-dma-contig.c | 185 ++ + drivers/media/video/videobuf2-dma-sg.c | 292 +++ + drivers/media/video/videobuf2-memops.c | 232 +++ + drivers/media/video/videobuf2-vmalloc.c | 132 ++ + drivers/media/video/vivi.c | 585 ++++--- + drivers/media/video/vpx3220.c | 137 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/cxd2099/Kconfig | 11 + + drivers/staging/cxd2099/Makefile | 5 + + drivers/staging/cxd2099/TODO | 12 + + drivers/staging/cxd2099/cxd2099.c | 574 ++++++ + drivers/staging/cxd2099/cxd2099.h | 41 + + include/linux/videodev2.h | 131 ++- + include/media/noon010pc30.h | 28 + + include/media/rc-map.h | 1 + + include/media/{s3c_fimc.h => s5p_fimc.h} | 20 +- + include/media/tuner.h | 1 + + include/media/v4l2-chip-ident.h | 3 + + include/media/v4l2-ioctl.h | 16 + + include/media/v4l2-mem2mem.h | 56 +- + include/media/videobuf2-core.h | 380 ++++ + include/media/videobuf2-dma-contig.h | 29 + + include/media/videobuf2-dma-sg.h | 32 + + include/media/videobuf2-memops.h | 45 + + include/media/videobuf2-vmalloc.h | 20 + + 115 files changed, 17691 insertions(+), 4326 deletions(-) + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12m.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420m.xml + create mode 100644 Documentation/DocBook/v4l/planar-apis.xml + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + create mode 100644 drivers/media/dvb/frontends/dib9000.c + create mode 100644 drivers/media/dvb/frontends/dib9000.h + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + create mode 100644 drivers/media/video/noon010pc30.c + create mode 100644 drivers/media/video/videobuf2-core.c + create mode 100644 drivers/media/video/videobuf2-dma-contig.c + create mode 100644 drivers/media/video/videobuf2-dma-sg.c + create mode 100644 drivers/media/video/videobuf2-memops.c + create mode 100644 drivers/media/video/videobuf2-vmalloc.c + create mode 100644 drivers/staging/cxd2099/Kconfig + create mode 100644 drivers/staging/cxd2099/Makefile + create mode 100644 drivers/staging/cxd2099/TODO + create mode 100644 drivers/staging/cxd2099/cxd2099.c + create mode 100644 drivers/staging/cxd2099/cxd2099.h + create mode 100644 include/media/noon010pc30.h + rename include/media/{s3c_fimc.h => s5p_fimc.h} (75%) + create mode 100644 include/media/videobuf2-core.h + create mode 100644 include/media/videobuf2-dma-contig.h + create mode 100644 include/media/videobuf2-dma-sg.h + create mode 100644 include/media/videobuf2-memops.h + create mode 100644 include/media/videobuf2-vmalloc.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging Makefile +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Makefile | 7 +- + lib/Kconfig.debug | 4 - + scripts/extract-ikconfig | 9 +- + scripts/setlocalversion | 14 ++- + scripts/tags.sh | 9 ++ + scripts/unifdef.c | 247 ++++++++++++++++++++++++++++++++++------------ + 6 files changed, 211 insertions(+), 79 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/Kconfig | 12 +++++ + drivers/ata/ahci.c | 5 +- + drivers/ata/ahci.h | 6 +-- + drivers/ata/ata_generic.c | 2 +- + drivers/ata/ata_piix.c | 2 +- + drivers/ata/libata-acpi.c | 3 +- + drivers/ata/libata-core.c | 54 ++++++++++---------- + drivers/ata/libata-eh.c | 60 ++++++++++++++++++---- + drivers/ata/libata-scsi.c | 4 +- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/libata.h | 1 + + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_at32.c | 2 +- + drivers/ata/pata_bf54x.c | 4 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_it821x.c | 4 +- + drivers/ata/pata_ixp4xx_cf.c | 2 +- + drivers/ata/pata_macio.c | 3 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_ninja32.c | 2 +- + drivers/ata/pata_octeon_cf.c | 3 +- + drivers/ata/pata_palmld.c | 2 +- + drivers/ata/pata_pcmcia.c | 2 +- + drivers/ata/pata_pdc2027x.c | 6 +-- + drivers/ata/pata_pxa.c | 1 - + drivers/ata/pata_rb532_cf.c | 1 - + drivers/ata/pata_samsung_cf.c | 1 - + drivers/ata/pata_scc.c | 2 +- + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pdc_adma.c | 4 +- + drivers/ata/sata_dwc_460ex.c | 75 +++++++++++++++++++++------- + drivers/ata/sata_fsl.c | 3 +- + drivers/ata/sata_mv.c | 3 +- + drivers/ata/sata_nv.c | 14 ++--- + drivers/ata/sata_promise.c | 4 +- + drivers/ata/sata_qstor.c | 3 +- + drivers/ata/sata_sil.c | 3 +- + drivers/ata/sata_sil24.c | 3 +- + drivers/ata/sata_sis.c | 2 +- + drivers/ata/sata_svw.c | 12 ++--- + drivers/ata/sata_sx4.c | 5 +- + drivers/ata/sata_uli.c | 3 +- + drivers/ata/sata_via.c | 9 ++-- + drivers/ata/sata_vsc.c | 3 +- + drivers/scsi/ipr.c | 9 ++-- + drivers/scsi/libsas/sas_ata.c | 94 +++++++++++++++++++++++++++++++---- + drivers/scsi/libsas/sas_scsi_host.c | 14 +++++- + include/linux/libata.h | 7 +-- + include/scsi/sas_ata.h | 22 ++++++++ + 49 files changed, 323 insertions(+), 163 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/qib/qib_mad.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) +Merging acpi/test +$ git merge acpi/test +Recorded preimage for 'arch/parisc/Kconfig' +Auto-merging arch/m68k/Kconfig +Auto-merging arch/parisc/Kconfig +CONFLICT (content): Merge conflict in arch/parisc/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/sparc/Kconfig +CONFLICT (content): Merge conflict in arch/sparc/Kconfig +Auto-merging drivers/acpi/apei/Kconfig +Auto-merging drivers/acpi/apei/erst.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/parisc/Kconfig'. +Recorded resolution for 'arch/sparc/Kconfig'. +[master f47d707] Merge remote-tracking branch 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + Documentation/acpi/apei/output_format.txt | 25 +++ + arch/Kconfig | 3 + + arch/alpha/Kconfig | 1 + + arch/avr32/Kconfig | 1 + + arch/frv/Kconfig | 1 + + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/acpi.h | 6 +- + arch/ia64/kernel/acpi.c | 14 +-- + arch/m68k/Kconfig | 1 + + arch/parisc/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/sh/Kconfig | 1 + + arch/sparc/Kconfig | 1 + + arch/tile/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/acpi.h | 5 +- + arch/x86/kernel/acpi/sleep.c | 13 +- + arch/x86/kernel/acpi/sleep.h | 2 + + arch/x86/kernel/cpu/mcheck/mce-apei.c | 42 +++-- + drivers/acpi/apei/Kconfig | 9 + + drivers/acpi/apei/cper.c | 18 ++- + drivers/acpi/apei/erst-dbg.c | 24 +++- + drivers/acpi/apei/erst.c | 235 +++++++++++++++++++++----- + drivers/acpi/apei/ghes.c | 186 +++++++++++++++++++-- + drivers/acpi/button.c | 11 +- + drivers/acpi/nvs.c | 22 ++- + drivers/acpi/osl.c | 139 +++++++++------- + drivers/acpi/scan.c | 1 - + drivers/acpi/sleep.c | 28 +--- + drivers/pci/pci-acpi.c | 16 +-- + drivers/pci/pcie/aer/aerdrv.h | 9 +- + drivers/pci/pcie/aer/aerdrv_errprint.c | 182 ++++++++++++--------- + include/acpi/acpi_bus.h | 1 - + include/acpi/apei.h | 5 +- + include/linux/acpi_io.h | 3 +- + include/linux/aer.h | 24 +++ + include/linux/bitmap.h | 1 + + include/linux/cper.h | 2 + + include/linux/genalloc.h | 46 +++++- + include/linux/llist.h | 98 +++++++++++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/bitmap.c | 2 - + lib/genalloc.c | 256 +++++++++++++++++++++++------ + lib/llist.c | 119 +++++++++++++ + 46 files changed, 1210 insertions(+), 354 deletions(-) + create mode 100644 include/linux/llist.h + create mode 100644 lib/llist.c +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Merge made by recursive. + arch/x86/include/asm/msr-index.h | 5 ++++ + drivers/idle/intel_idle.c | 46 ++++++++++++++++++++++++++++--------- + 2 files changed, 40 insertions(+), 11 deletions(-) +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/Kconfig | 3 +- + drivers/firewire/core-card.c | 5 ++- + drivers/firewire/core-cdev.c | 54 +++++++++++++++++--------------- + drivers/firewire/core-device.c | 3 +- + drivers/firewire/core-iso.c | 22 ++++++------ + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/ohci.c | 64 +++++++++++++++++++++++++++++++++++-- + include/linux/firewire.h | 2 +- + 8 files changed, 109 insertions(+), 46 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/build.c | 4 ++- + drivers/mtd/ubi/io.c | 43 +++++++++++++++++++++--- + drivers/mtd/ubi/scan.c | 86 ++++++++++++++++++++++++++++++----------------- + drivers/mtd/ubi/scan.h | 2 + + 4 files changed, 98 insertions(+), 37 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/include/asm/msr-index.h +Merge made by recursive. + arch/alpha/include/asm/errno.h | 2 + + arch/ia64/kvm/kvm-ia64.c | 2 + + arch/mips/include/asm/errno.h | 2 + + arch/parisc/include/asm/errno.h | 2 + + arch/powerpc/kvm/book3s.c | 14 +- + arch/powerpc/kvm/booke.c | 14 +- + arch/sparc/include/asm/errno.h | 2 + + arch/x86/include/asm/kvm_emulate.h | 1 + + arch/x86/include/asm/kvm_host.h | 4 +- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kvm/emulate.c | 12 +- + arch/x86/kvm/i8259.c | 25 +-- + arch/x86/kvm/lapic.c | 4 - + arch/x86/kvm/mmu.c | 16 +- + arch/x86/kvm/svm.c | 22 ++- + arch/x86/kvm/vmx.c | 101 ++++++---- + arch/x86/kvm/x86.c | 126 ++++++------ + drivers/infiniband/hw/ipath/ipath_user_pages.c | 6 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 6 +- + include/asm-generic/cputime.h | 3 + + include/asm-generic/errno.h | 2 + + include/linux/interrupt.h | 7 + + include/linux/jiffies.h | 1 + + include/linux/kvm_host.h | 31 ++- + include/linux/mm.h | 13 +- + include/linux/sched.h | 13 +- + kernel/fork.c | 1 + + kernel/pid.c | 2 + + kernel/sched.c | 274 +++++++++++++++++++++--- + kernel/sched_debug.c | 2 +- + kernel/sched_fair.c | 271 ++++++++++++++++-------- + kernel/sched_idletask.c | 26 +-- + kernel/sched_rt.c | 19 +- + kernel/sched_stoptask.c | 7 +- + kernel/softirq.c | 3 +- + kernel/sysctl.c | 7 - + kernel/time.c | 23 ++- + mm/internal.h | 5 - + mm/memory-failure.c | 32 --- + mm/memory.c | 63 +++++- + virt/kvm/kvm_main.c | 139 +++++++++---- + 42 files changed, 876 insertions(+), 432 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Resolved 'drivers/scsi/libsas/sas_ata.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_scsi_host.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/message/fusion/mptctl.c +Auto-merging drivers/net/bnx2x/bnx2x_main.c +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +Auto-merging drivers/scsi/fcoe/fcoe_ctlr.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/libsas/sas_ata.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c +Removing drivers/scsi/mpt2sas/mpi/mpi2_history.txt +Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c +Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/scsi/scsi.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 530ee62] Merge remote-tracking branch 'scsi/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/ChangeLog.megaraid_sas | 23 + + Documentation/scsi/hpsa.txt | 11 + + Documentation/scsi/scsi_mid_low_api.txt | 14 +- + MAINTAINERS | 3 +- + block/blk-core.c | 23 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 26 + + drivers/md/dm-mpath.c | 22 +- + drivers/message/fusion/lsi/mpi_cnfg.h | 1 + + drivers/message/fusion/lsi/mpi_ioc.h | 1 + + drivers/message/fusion/mptbase.c | 7 +- + drivers/message/fusion/mptctl.c | 4 +- + drivers/message/fusion/mptsas.c | 7 +- + drivers/net/bnx2x/bnx2x_main.c | 7 - + drivers/s390/scsi/zfcp_aux.c | 80 +- + drivers/s390/scsi/zfcp_def.h | 15 +- + drivers/s390/scsi/zfcp_erp.c | 4 +- + drivers/s390/scsi/zfcp_ext.h | 9 +- + drivers/s390/scsi/zfcp_fc.c | 333 +++-- + drivers/s390/scsi/zfcp_fc.h | 124 +- + drivers/s390/scsi/zfcp_fsf.c | 27 +- + drivers/s390/scsi/zfcp_scsi.c | 71 +- + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 1 + + drivers/scsi/NCR5380.c | 3 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 4 +- + drivers/scsi/be2iscsi/be_iscsi.c | 18 +- + drivers/scsi/be2iscsi/be_iscsi.h | 4 +- + drivers/scsi/be2iscsi/be_main.c | 3 +- + drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 1080 +++++++++++ + drivers/scsi/bnx2fc/Kconfig | 11 + + drivers/scsi/bnx2fc/Makefile | 3 + + drivers/scsi/bnx2fc/bnx2fc.h | 511 ++++++ + drivers/scsi/bnx2fc/bnx2fc_constants.h | 206 +++ + drivers/scsi/bnx2fc/bnx2fc_debug.h | 70 + + drivers/scsi/bnx2fc/bnx2fc_els.c | 515 ++++++ + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2535 ++++++++++++++++++++++++++ + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 1868 +++++++++++++++++++ + drivers/scsi/bnx2fc/bnx2fc_io.c | 1833 +++++++++++++++++++ + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 844 +++++++++ + drivers/scsi/bnx2i/bnx2i.h | 4 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 125 ++- + drivers/scsi/bnx2i/bnx2i_init.c | 29 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 53 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 56 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.h | 19 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 7 +- + drivers/scsi/cxgbi/libcxgbi.c | 66 +- + drivers/scsi/cxgbi/libcxgbi.h | 5 +- + drivers/scsi/device_handler/scsi_dh.c | 112 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 18 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 2 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 7 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 25 +- + drivers/scsi/fcoe/Makefile | 2 + + drivers/scsi/fcoe/fcoe.c | 621 +++---- + drivers/scsi/fcoe/fcoe.h | 50 +- + drivers/scsi/fcoe/{libfcoe.c => fcoe_ctlr.c} | 40 +- + drivers/scsi/fcoe/fcoe_transport.c | 770 ++++++++ + drivers/scsi/fcoe/libfcoe.h | 31 + + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/vnic_dev.c | 2 +- + drivers/scsi/hpsa.c | 325 ++-- + drivers/scsi/hpsa.h | 9 +- + drivers/scsi/hpsa_cmd.h | 4 +- + drivers/scsi/ipr.c | 9 +- + drivers/scsi/iscsi_tcp.c | 134 +- + drivers/scsi/iscsi_tcp.h | 4 + + drivers/scsi/libfc/fc_exch.c | 111 +- + drivers/scsi/libfc/fc_fcp.c | 39 +- + drivers/scsi/libfc/fc_libfc.c | 120 ++ + drivers/scsi/libfc/fc_libfc.h | 14 + + drivers/scsi/libfc/fc_lport.c | 69 +- + drivers/scsi/libfc/fc_npiv.c | 10 +- + drivers/scsi/libfc/fc_rport.c | 191 ++- + drivers/scsi/libiscsi.c | 44 +- + drivers/scsi/libsas/Kconfig | 8 - + drivers/scsi/libsas/Makefile | 4 - + drivers/scsi/libsas/sas_ata.c | 67 +- + drivers/scsi/libsas/sas_dump.c | 4 - + drivers/scsi/libsas/sas_dump.h | 12 - + drivers/scsi/libsas/sas_expander.c | 5 + + drivers/scsi/libsas/sas_internal.h | 6 +- + drivers/scsi/libsas/sas_scsi_host.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 15 +- + drivers/scsi/lpfc/lpfc_attr.c | 123 +- + drivers/scsi/lpfc/lpfc_crtn.h | 9 +- + drivers/scsi/lpfc/lpfc_ct.c | 49 + + drivers/scsi/lpfc/lpfc_debugfs.c | 962 +++++++++- + drivers/scsi/lpfc/lpfc_debugfs.h | 60 +- + drivers/scsi/lpfc/lpfc_els.c | 173 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 18 +- + drivers/scsi/lpfc/lpfc_hw.h | 11 +- + drivers/scsi/lpfc/lpfc_hw4.h | 104 +- + drivers/scsi/lpfc/lpfc_init.c | 134 +- + drivers/scsi/lpfc/lpfc_mbox.c | 19 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 11 +- + drivers/scsi/lpfc/lpfc_scsi.c | 113 +- + drivers/scsi/lpfc/lpfc_sli.c | 217 ++-- + drivers/scsi/lpfc/lpfc_sli4.h | 8 +- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/lpfc/lpfc_vport.c | 4 + + drivers/scsi/megaraid/megaraid_sas.h | 10 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 147 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 19 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 5 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 6 +- + drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 384 ---- + drivers/scsi/mpt2sas/mpi/mpi2_sas.h | 7 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 8 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 128 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 40 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 - + drivers/scsi/osd/osd_initiator.c | 20 +- + drivers/scsi/pm8001/pm8001_hwi.c | 37 +- + drivers/scsi/pm8001/pm8001_init.c | 27 +- + drivers/scsi/pm8001/pm8001_sas.h | 10 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 9 +- + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_gs.c | 21 +- + drivers/scsi/qla2xxx/qla_init.c | 41 +- + drivers/scsi/qla2xxx/qla_iocb.c | 52 +- + drivers/scsi/qla2xxx/qla_mbx.c | 45 +- + drivers/scsi/qla2xxx/qla_nx.c | 191 ++- + drivers/scsi/qla2xxx/qla_os.c | 57 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_devinfo.c | 85 + + drivers/scsi/scsi_error.c | 24 +- + drivers/scsi/scsi_lib.c | 28 +- + drivers/scsi/scsi_priv.h | 2 + + drivers/scsi/scsi_transport_iscsi.c | 104 +- + include/linux/pci_ids.h | 2 + + include/scsi/fc/fc_ns.h | 11 +- + include/scsi/fc_encode.h | 26 +- + include/scsi/libfc.h | 74 +- + include/scsi/libfcoe.h | 105 ++ + include/scsi/libiscsi.h | 8 +- + include/scsi/scsi.h | 5 + + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_transport_iscsi.h | 6 +- + 140 files changed, 14871 insertions(+), 2477 deletions(-) + create mode 100644 drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h + create mode 100644 drivers/scsi/bnx2fc/Kconfig + create mode 100644 drivers/scsi/bnx2fc/Makefile + create mode 100644 drivers/scsi/bnx2fc/bnx2fc.h + create mode 100644 drivers/scsi/bnx2fc/bnx2fc_constants.h + create mode 100644 drivers/scsi/bnx2fc/bnx2fc_debug.h + create mode 100644 drivers/scsi/bnx2fc/bnx2fc_els.c + create mode 100644 drivers/scsi/bnx2fc/bnx2fc_fcoe.c + create mode 100644 drivers/scsi/bnx2fc/bnx2fc_hwi.c + create mode 100644 drivers/scsi/bnx2fc/bnx2fc_io.c + create mode 100644 drivers/scsi/bnx2fc/bnx2fc_tgt.c + rename drivers/scsi/fcoe/{libfcoe.c => fcoe_ctlr.c} (98%) + create mode 100644 drivers/scsi/fcoe/fcoe_transport.c + create mode 100644 drivers/scsi/fcoe/libfcoe.h + delete mode 100644 drivers/scsi/mpt2sas/mpi/mpi2_history.txt +Merging async_tx/next +$ git merge async_tx/next +Merge made by recursive. + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 22 +- + arch/avr32/mach-at32ap/at32ap700x.c | 6 + + drivers/dma/dw_dmac.c | 36 +- + drivers/dma/ste_dma40.c | 1402 +++++++++++------------- + drivers/dma/ste_dma40_ll.c | 218 ++--- + drivers/dma/ste_dma40_ll.h | 66 +- + include/linux/dw_dmac.h | 5 + + 7 files changed, 794 insertions(+), 961 deletions(-) +Merging net/master +$ git merge net/master +Recorded preimage for 'drivers/net/bnx2x/bnx2x.h' +Recorded preimage for 'lib/Makefile' +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging MAINTAINERS +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/net/bnx2x/bnx2x.h +CONFLICT (content): Merge conflict in drivers/net/bnx2x/bnx2x.h +Auto-merging drivers/net/bnx2x/bnx2x_cmn.c +Auto-merging drivers/net/bnx2x/bnx2x_cmn.h +Auto-merging drivers/net/bnx2x/bnx2x_ethtool.c +Auto-merging drivers/net/bnx2x/bnx2x_main.c +Auto-merging drivers/net/cnic.c +Auto-merging drivers/net/dm9000.c +Auto-merging drivers/net/e1000e/netdev.c +Auto-merging drivers/net/fec.c +Auto-merging drivers/net/sfc/ethtool.c +Auto-merging drivers/net/wireless/ath/ath9k/mac.c +Removing drivers/net/wireless/ath/ath9k/virtual.c +Auto-merging drivers/net/wireless/rt2x00/rt2800pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Auto-merging include/linux/interrupt.h +Auto-merging include/net/ipv6.h +Auto-merging include/net/sch_generic.h +Auto-merging kernel/irq/manage.c +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging net/bluetooth/hidp/core.c +Auto-merging net/bluetooth/l2cap_core.c +Removing net/ipv4/fib_hash.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv6/route.c +Auto-merging net/mac80211/iface.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/netfilter/nf_log.c +Auto-merging net/sched/sch_generic.c +Auto-merging net/wireless/wext-compat.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/bnx2x/bnx2x.h'. +Recorded resolution for 'lib/Makefile'. +[master 45720db] Merge remote-tracking branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 18 + + Documentation/networking/batman-adv.txt | 16 +- + Documentation/networking/ip-sysctl.txt | 11 + + MAINTAINERS | 4 +- + drivers/bluetooth/ath3k.c | 287 ++- + drivers/bluetooth/btusb.c | 13 +- + drivers/bluetooth/hci_ldisc.c | 1 + + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/nes/nes.c | 3 +- + drivers/infiniband/hw/nes/nes_cm.c | 2 +- + drivers/net/Kconfig | 7 +- + drivers/net/atl1c/atl1c_hw.c | 15 +- + drivers/net/atl1c/atl1c_hw.h | 43 +- + drivers/net/atl1c/atl1c_main.c | 5 +- + drivers/net/atl1e/atl1e_ethtool.c | 12 +- + drivers/net/atl1e/atl1e_hw.c | 34 +- + drivers/net/atl1e/atl1e_hw.h | 111 +- + drivers/net/atl1e/atl1e_main.c | 10 +- + drivers/net/atlx/atl1.c | 77 +- + drivers/net/atlx/atl2.c | 2 +- + drivers/net/ax88796.c | 810 ++--- + drivers/net/benet/be.h | 16 +- + drivers/net/benet/be_cmds.c | 145 +- + drivers/net/benet/be_cmds.h | 61 +- + drivers/net/benet/be_ethtool.c | 77 +- + drivers/net/benet/be_hw.h | 47 + + drivers/net/benet/be_main.c | 221 +- + drivers/net/bna/bnad.c | 108 +- + drivers/net/bna/bnad.h | 2 +- + drivers/net/bnx2.c | 8 +- + drivers/net/bnx2.h | 4 +- + drivers/net/bnx2x/bnx2x.h | 35 +- + drivers/net/bnx2x/bnx2x_cmn.c | 70 +- + drivers/net/bnx2x/bnx2x_cmn.h | 6 +- + drivers/net/bnx2x/bnx2x_dcb.c | 137 +- + drivers/net/bnx2x/bnx2x_dcb.h | 5 +- + drivers/net/bnx2x/bnx2x_ethtool.c | 58 +- + drivers/net/bnx2x/bnx2x_hsi.h | 114 +- + drivers/net/bnx2x/bnx2x_link.c | 2527 +++++++------ + drivers/net/bnx2x/bnx2x_link.h | 34 +- + drivers/net/bnx2x/bnx2x_main.c | 598 +++- + drivers/net/bnx2x/bnx2x_reg.h | 1 + + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 253 +- + drivers/net/bonding/bond_sysfs.c | 4 +- + drivers/net/bonding/bonding.h | 27 +- + drivers/net/can/Kconfig | 2 + + drivers/net/can/Makefile | 1 + + drivers/net/can/c_can/Kconfig | 15 + + drivers/net/can/c_can/Makefile | 8 + + drivers/net/can/c_can/c_can.c | 1158 ++++++ + drivers/net/can/c_can/c_can.h | 86 + + drivers/net/can/c_can/c_can_platform.c | 215 ++ + drivers/net/cnic.c | 184 +- + drivers/net/cnic.h | 2 +- + drivers/net/cnic_if.h | 8 +- + drivers/net/cxgb3/cxgb3_offload.c | 5 +- + drivers/net/cxgb4/cxgb4_main.c | 1 - + drivers/net/dm9000.c | 7 +- + drivers/net/e1000e/e1000.h | 5 +- + drivers/net/e1000e/ethtool.c | 71 +- + drivers/net/e1000e/ich8lan.c | 3 +- + drivers/net/e1000e/lib.c | 4 +- + drivers/net/e1000e/netdev.c | 123 +- + drivers/net/e1000e/phy.c | 8 +- + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/enic.h | 11 +- + drivers/net/enic/enic_dev.c | 221 ++ + drivers/net/enic/enic_dev.h | 41 + + drivers/net/enic/enic_main.c | 326 +-- + drivers/net/enic/vnic_dev.c | 19 - + drivers/net/enic/vnic_dev.h | 8 - + drivers/net/enic/vnic_rq.h | 5 - + drivers/net/fec.c | 650 ++-- + drivers/net/hamradio/bpqether.c | 5 +- + drivers/net/igb/e1000_82575.c | 11 +- + drivers/net/igb/e1000_defines.h | 7 + + drivers/net/igb/e1000_hw.h | 1 + + drivers/net/igb/e1000_mbx.c | 38 +- + drivers/net/igb/e1000_regs.h | 4 + + drivers/net/igb/igb.h | 2 + + drivers/net/igb/igb_main.c | 102 +- + drivers/net/igbvf/ethtool.c | 6 +- + drivers/net/igbvf/igbvf.h | 3 - + drivers/net/igbvf/netdev.c | 63 +- + drivers/net/ipg.c | 4 +- + drivers/net/ixgbe/ixgbe.h | 5 +- + drivers/net/ixgbe/ixgbe_common.h | 4 +- + drivers/net/ixgbe/ixgbe_dcb.c | 177 +- + drivers/net/ixgbe/ixgbe_dcb.h | 10 +- + drivers/net/ixgbe/ixgbe_dcb_82598.c | 94 +- + drivers/net/ixgbe/ixgbe_dcb_82598.h | 23 +- + drivers/net/ixgbe/ixgbe_dcb_82599.c | 115 +- + drivers/net/ixgbe/ixgbe_dcb_82599.h | 24 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 211 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 34 +- + drivers/net/ixgbe/ixgbe_main.c | 40 +- + drivers/net/ixgbe/ixgbe_mbx.c | 2 + + drivers/net/ixgbe/ixgbe_mbx.h | 2 + + drivers/net/ixgbe/ixgbe_sriov.c | 29 +- + drivers/net/ixgbe/ixgbe_type.h | 2 + + drivers/net/ixgbevf/defines.h | 2 + + drivers/net/ixgbevf/ixgbevf_main.c | 37 +- + drivers/net/jme.c | 306 ++- + drivers/net/jme.h | 87 +- + drivers/net/loopback.c | 9 +- + drivers/net/macvtap.c | 18 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/phy/Kconfig | 1 - + drivers/net/phy/micrel.c | 24 +- + drivers/net/ppp_generic.c | 148 +- + drivers/net/qla3xxx.c | 10 +- + drivers/net/qlcnic/qlcnic.h | 5 - + drivers/net/qlcnic/qlcnic_main.c | 15 +- + drivers/net/r6040.c | 115 +- + drivers/net/sfc/efx.c | 82 +- + drivers/net/sfc/efx.h | 19 +- + drivers/net/sfc/ethtool.c | 37 +- + drivers/net/sfc/falcon.c | 22 +- + drivers/net/sfc/falcon_boards.c | 2 +- + drivers/net/sfc/falcon_xmac.c | 2 +- + drivers/net/sfc/filter.c | 117 +- + drivers/net/sfc/io.h | 2 +- + drivers/net/sfc/mcdi.c | 23 +- + drivers/net/sfc/mcdi.h | 4 +- + drivers/net/sfc/mcdi_mac.c | 2 +- + drivers/net/sfc/mcdi_pcol.h | 2 +- + drivers/net/sfc/mcdi_phy.c | 2 +- + drivers/net/sfc/mdio_10g.c | 34 +- + drivers/net/sfc/mdio_10g.h | 5 +- + drivers/net/sfc/mtd.c | 2 +- + drivers/net/sfc/net_driver.h | 83 +- + drivers/net/sfc/nic.c | 73 +- + drivers/net/sfc/nic.h | 9 +- + drivers/net/sfc/phy.h | 2 +- + drivers/net/sfc/qt202x_phy.c | 2 +- + drivers/net/sfc/regs.h | 8 +- + drivers/net/sfc/rx.c | 144 +- + drivers/net/sfc/selftest.c | 4 +- + drivers/net/sfc/selftest.h | 2 +- + drivers/net/sfc/siena.c | 24 +- + drivers/net/sfc/spi.h | 2 +- + drivers/net/sfc/tenxpress.c | 4 +- + drivers/net/sfc/tx.c | 92 +- + drivers/net/sfc/txc43128_phy.c | 4 +- + drivers/net/sfc/workarounds.h | 2 +- + drivers/net/sh_eth.c | 208 +- + drivers/net/sis900.c | 4 +- + drivers/net/smc91x.c | 13 + + drivers/net/sungem.c | 58 +- + drivers/net/sungem.h | 1 - + drivers/net/tg3.c | 161 +- + drivers/net/tg3.h | 13 +- + drivers/net/tlan.c | 3775 ++++++++++---------- + drivers/net/tlan.h | 192 +- + drivers/net/tun.c | 2 +- + drivers/net/typhoon.c | 3 +- + drivers/net/veth.c | 12 - + drivers/net/via-velocity.c | 9 + + drivers/net/via-velocity.h | 8 +- + drivers/net/vxge/vxge-config.c | 32 +- + drivers/net/vxge/vxge-config.h | 10 + + drivers/net/vxge/vxge-main.c | 234 +- + drivers/net/vxge/vxge-main.h | 23 +- + drivers/net/vxge/vxge-traffic.c | 116 +- + drivers/net/vxge/vxge-traffic.h | 14 +- + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wireless/ath/ar9170/Kconfig | 4 +- + drivers/net/wireless/ath/ar9170/main.c | 3 +- + drivers/net/wireless/ath/ath.h | 2 + + drivers/net/wireless/ath/ath5k/Kconfig | 11 + + drivers/net/wireless/ath/ath5k/ahb.c | 7 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 38 +- + drivers/net/wireless/ath/ath5k/attach.c | 7 +- + drivers/net/wireless/ath/ath5k/base.c | 114 +- + drivers/net/wireless/ath/ath5k/base.h | 3 - + drivers/net/wireless/ath/ath5k/caps.c | 48 +- + drivers/net/wireless/ath/ath5k/debug.c | 20 - + drivers/net/wireless/ath/ath5k/debug.h | 10 - + drivers/net/wireless/ath/ath5k/eeprom.c | 24 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 28 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 26 +- + drivers/net/wireless/ath/ath5k/pci.c | 9 +- + drivers/net/wireless/ath/ath5k/qcu.c | 46 +- + drivers/net/wireless/ath/ath5k/reg.h | 15 +- + drivers/net/wireless/ath/ath5k/trace.h | 107 + + drivers/net/wireless/ath/ath9k/Makefile | 1 - + drivers/net/wireless/ath/ath9k/ahb.c | 13 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 5 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 26 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 112 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 8 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 + + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 1141 ++++++ + drivers/net/wireless/ath/ath9k/ath9k.h | 115 +- + drivers/net/wireless/ath/ath9k/beacon.c | 82 +- + drivers/net/wireless/ath/ath9k/calib.c | 5 +- + drivers/net/wireless/ath/ath9k/common.c | 11 + + drivers/net/wireless/ath/ath9k/common.h | 4 +- + drivers/net/wireless/ath/ath9k/debug.c | 440 ++- + drivers/net/wireless/ath/ath9k/debug.h | 17 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 32 + + drivers/net/wireless/ath/ath9k/eeprom.h | 2 + + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 41 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 45 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 38 +- + drivers/net/wireless/ath/ath9k/gpio.c | 3 +- + drivers/net/wireless/ath/ath9k/htc.h | 3 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 3 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 29 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 35 +- + drivers/net/wireless/ath/ath9k/hw.c | 65 +- + drivers/net/wireless/ath/ath9k/hw.h | 4 + + drivers/net/wireless/ath/ath9k/init.c | 35 +- + drivers/net/wireless/ath/ath9k/mac.c | 14 +- + drivers/net/wireless/ath/ath9k/mac.h | 2 + + drivers/net/wireless/ath/ath9k/main.c | 755 ++-- + drivers/net/wireless/ath/ath9k/pci.c | 20 +- + drivers/net/wireless/ath/ath9k/rc.c | 3 +- + drivers/net/wireless/ath/ath9k/recv.c | 171 +- + drivers/net/wireless/ath/ath9k/reg.h | 21 + + drivers/net/wireless/ath/ath9k/virtual.c | 717 ---- + drivers/net/wireless/ath/ath9k/xmit.c | 308 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 1 + + drivers/net/wireless/ath/carl9170/fw.c | 15 + + drivers/net/wireless/ath/carl9170/fwcmd.h | 1 + + drivers/net/wireless/ath/carl9170/fwdesc.h | 28 +- + drivers/net/wireless/ath/carl9170/hw.h | 25 + + drivers/net/wireless/ath/carl9170/main.c | 9 +- + drivers/net/wireless/ath/carl9170/tx.c | 3 + + drivers/net/wireless/ath/carl9170/version.h | 8 +- + drivers/net/wireless/ath/carl9170/wlan.h | 20 +- + drivers/net/wireless/ath/key.c | 5 +- + drivers/net/wireless/ath/regd.c | 7 + + drivers/net/wireless/ath/regd.h | 1 + + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 26 +- + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-2000.c | 561 +++ + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 27 - + drivers/net/wireless/iwlwifi/iwl-3945.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 39 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 55 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.h | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 91 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 43 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 8 - + drivers/net/wireless/iwlwifi/iwl-agn.c | 339 ++- + drivers/net/wireless/iwlwifi/iwl-agn.h | 30 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 27 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 28 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 16 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 117 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 61 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 26 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 + + drivers/net/wireless/iwlwifi/iwl-led.c | 201 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 16 +- + drivers/net/wireless/iwlwifi/iwl-legacy.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 37 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 3 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 27 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 3 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 7 +- + drivers/net/wireless/libertas/cfg.c | 6 +- + drivers/net/wireless/libertas/cmd.c | 10 +- + drivers/net/wireless/libertas/dev.h | 2 + + drivers/net/wireless/libertas/if_spi.c | 368 ++- + drivers/net/wireless/libertas/main.c | 77 +- + drivers/net/wireless/mac80211_hwsim.c | 3 +- + drivers/net/wireless/mwl8k.c | 456 +++- + drivers/net/wireless/p54/eeprom.c | 208 +- + drivers/net/wireless/p54/eeprom.h | 7 + + drivers/net/wireless/p54/fwio.c | 12 +- + drivers/net/wireless/p54/lmac.h | 1 + + drivers/net/wireless/p54/main.c | 47 +- + drivers/net/wireless/p54/p54.h | 6 +- + drivers/net/wireless/p54/p54spi_eeprom.h | 9 +- + drivers/net/wireless/p54/txrx.c | 6 +- + drivers/net/wireless/rt2x00/Kconfig | 12 + + drivers/net/wireless/rt2x00/rt2400pci.c | 165 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 159 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 4 - + drivers/net/wireless/rt2x00/rt2800.h | 139 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 848 ++++- + drivers/net/wireless/rt2x00/rt2800lib.h | 4 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 232 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00.h | 39 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 74 +- + drivers/net/wireless/rt2x00/rt2x00ht.c | 1 - + drivers/net/wireless/rt2x00/rt2x00lib.h | 24 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 50 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 69 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 2 - + drivers/net/wireless/rt2x00/rt2x00usb.c | 8 +- + drivers/net/wireless/rt2x00/rt61pci.c | 238 +- + drivers/net/wireless/rt2x00/rt73usb.c | 61 +- + drivers/net/wireless/rtlwifi/Kconfig | 17 +- + drivers/net/wireless/rtlwifi/Makefile | 6 +- + drivers/net/wireless/rtlwifi/base.c | 76 +- + drivers/net/wireless/rtlwifi/base.h | 39 +- + drivers/net/wireless/rtlwifi/core.c | 17 +- + drivers/net/wireless/rtlwifi/debug.h | 1 + + drivers/net/wireless/rtlwifi/pci.c | 152 +- + drivers/net/wireless/rtlwifi/pci.h | 12 +- + drivers/net/wireless/rtlwifi/ps.c | 58 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 1388 +++++++ + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 2049 +++++++++++ + drivers/net/wireless/rtlwifi/rtl8192ce/Makefile | 2 + + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 144 + + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 1361 +------- + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/fw.c | 59 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 153 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 6 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2072 +----------- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 7 +- + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 73 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 7 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 2 + + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 170 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 464 ++-- + drivers/net/wireless/rtlwifi/rtl8192cu/Makefile | 15 + + drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 62 + + drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 116 + + drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 32 + + drivers/net/wireless/rtlwifi/rtl8192cu/fw.c | 30 + + drivers/net/wireless/rtlwifi/rtl8192cu/fw.h | 30 + + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2505 +++++++++++++ + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 107 + + drivers/net/wireless/rtlwifi/rtl8192cu/led.c | 142 + + drivers/net/wireless/rtlwifi/rtl8192cu/led.h | 37 + + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 1144 ++++++ + drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 180 + + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 611 ++++ + drivers/net/wireless/rtlwifi/rtl8192cu/phy.h | 34 + + drivers/net/wireless/rtlwifi/rtl8192cu/reg.h | 30 + + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 493 +++ + drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 30 + + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 327 ++ + drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 35 + + drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 1888 ++++++++++ + drivers/net/wireless/rtlwifi/rtl8192cu/table.h | 71 + + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 684 ++++ + drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 430 +++ + drivers/net/wireless/rtlwifi/usb.c | 1035 ++++++ + drivers/net/wireless/rtlwifi/usb.h | 164 + + drivers/net/wireless/rtlwifi/wifi.h | 668 +++- + drivers/net/wireless/wl1251/acx.c | 53 + + drivers/net/wireless/wl1251/acx.h | 72 + + drivers/net/wireless/wl1251/event.c | 18 + + drivers/net/wireless/wl1251/main.c | 18 +- + drivers/net/wireless/wl1251/ps.c | 11 + + drivers/net/wireless/wl1251/rx.c | 49 +- + drivers/net/wireless/wl1251/tx.c | 74 +- + drivers/net/wireless/wl1251/wl1251.h | 7 + + drivers/net/wireless/wl12xx/Kconfig | 2 +- + drivers/net/wireless/wl12xx/acx.c | 246 ++- + drivers/net/wireless/wl12xx/acx.h | 132 +- + drivers/net/wireless/wl12xx/boot.c | 35 +- + drivers/net/wireless/wl12xx/cmd.c | 318 ++- + drivers/net/wireless/wl12xx/cmd.h | 161 +- + drivers/net/wireless/wl12xx/conf.h | 125 +- + drivers/net/wireless/wl12xx/debugfs.c | 49 +- + drivers/net/wireless/wl12xx/event.c | 21 +- + drivers/net/wireless/wl12xx/event.h | 10 +- + drivers/net/wireless/wl12xx/init.c | 400 ++- + drivers/net/wireless/wl12xx/init.h | 2 +- + drivers/net/wireless/wl12xx/main.c | 1209 +++++-- + drivers/net/wireless/wl12xx/ps.c | 6 +- + drivers/net/wireless/wl12xx/rx.c | 22 +- + drivers/net/wireless/wl12xx/rx.h | 13 +- + drivers/net/wireless/wl12xx/sdio.c | 1 + + drivers/net/wireless/wl12xx/spi.c | 2 + + drivers/net/wireless/wl12xx/tx.c | 125 +- + drivers/net/wireless/wl12xx/tx.h | 10 +- + drivers/net/wireless/wl12xx/wl12xx.h | 152 +- + drivers/net/wireless/wl12xx/wl12xx_80211.h | 11 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 169 +- + drivers/net/wireless/zd1211rw/zd_chip.h | 5 +- + drivers/net/wireless/zd1211rw/zd_def.h | 2 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 448 ++- + drivers/net/wireless/zd1211rw/zd_mac.h | 24 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 597 +++- + drivers/net/wireless/zd1211rw/zd_usb.h | 37 +- + drivers/s390/net/qeth_core.h | 1 - + drivers/s390/net/qeth_core_main.c | 52 +- + drivers/s390/net/qeth_l2_main.c | 45 +- + drivers/s390/net/qeth_l3_main.c | 55 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/ssb/main.c | 44 +- + drivers/ssb/pci.c | 6 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 +- + include/linux/audit.h | 2 + + include/linux/cpu_rmap.h | 73 + + include/linux/dcbnl.h | 5 + + include/linux/dccp.h | 2 - + include/linux/ethtool.h | 91 +- + include/linux/if.h | 9 +- + include/linux/if_link.h | 1 + + include/linux/inetdevice.h | 1 + + include/linux/interrupt.h | 33 +- + include/linux/ip_vs.h | 8 + + include/linux/irqdesc.h | 3 + + include/linux/micrel_phy.h | 16 + + include/linux/net.h | 3 +- + include/linux/netdevice.h | 212 +- + include/linux/netfilter.h | 27 +- + include/linux/netfilter/Kbuild | 6 + + include/linux/netfilter/ipset/Kbuild | 4 + + include/linux/netfilter/ipset/ip_set.h | 452 +++ + include/linux/netfilter/ipset/ip_set_ahash.h | 1074 ++++++ + include/linux/netfilter/ipset/ip_set_bitmap.h | 31 + + include/linux/netfilter/ipset/ip_set_getport.h | 21 + + include/linux/netfilter/ipset/ip_set_hash.h | 26 + + include/linux/netfilter/ipset/ip_set_list.h | 27 + + include/linux/netfilter/ipset/ip_set_timeout.h | 127 + + include/linux/netfilter/ipset/pfxlen.h | 35 + + include/linux/netfilter/nf_conntrack_snmp.h | 9 + + include/linux/netfilter/nfnetlink.h | 3 +- + include/linux/netfilter/nfnetlink_conntrack.h | 9 + + include/linux/netfilter/x_tables.h | 3 +- + include/linux/netfilter/xt_AUDIT.h | 30 + + include/linux/netfilter/xt_CT.h | 12 +- + include/linux/netfilter/xt_NFQUEUE.h | 6 + + include/linux/netfilter/xt_TCPOPTSTRIP.h | 4 +- + include/linux/netfilter/xt_TPROXY.h | 10 +- + include/linux/netfilter/xt_cluster.h | 10 +- + include/linux/netfilter/xt_comment.h | 2 +- + include/linux/netfilter/xt_connlimit.h | 16 +- + include/linux/netfilter/xt_conntrack.h | 15 + + include/linux/netfilter/xt_devgroup.h | 21 + + include/linux/netfilter/xt_quota.h | 8 +- + include/linux/netfilter/xt_set.h | 56 + + include/linux/netfilter/xt_socket.h | 2 + + include/linux/netfilter/xt_time.h | 16 +- + include/linux/netfilter/xt_u32.h | 18 +- + include/linux/netfilter_bridge/ebt_802_3.h | 26 +- + include/linux/netfilter_bridge/ebt_among.h | 4 +- + include/linux/netfilter_bridge/ebt_arp.h | 6 +- + include/linux/netfilter_bridge/ebt_ip.h | 14 +- + include/linux/netfilter_bridge/ebt_ip6.h | 25 +- + include/linux/netfilter_bridge/ebt_limit.h | 10 +- + include/linux/netfilter_bridge/ebt_log.h | 8 +- + include/linux/netfilter_bridge/ebt_mark_m.h | 6 +- + include/linux/netfilter_bridge/ebt_nflog.h | 12 +- + include/linux/netfilter_bridge/ebt_pkttype.h | 6 +- + include/linux/netfilter_bridge/ebt_stp.h | 26 +- + include/linux/netfilter_bridge/ebt_ulog.h | 4 +- + include/linux/netfilter_bridge/ebt_vlan.h | 10 +- + include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 16 +- + include/linux/netfilter_ipv4/ipt_ECN.h | 8 +- + include/linux/netfilter_ipv4/ipt_SAME.h | 8 +- + include/linux/netfilter_ipv4/ipt_TTL.h | 6 +- + include/linux/netfilter_ipv4/ipt_addrtype.h | 16 +- + include/linux/netfilter_ipv4/ipt_ah.h | 6 +- + include/linux/netfilter_ipv4/ipt_ecn.h | 10 +- + include/linux/netfilter_ipv4/ipt_ttl.h | 6 +- + include/linux/netfilter_ipv6/ip6t_HL.h | 6 +- + include/linux/netfilter_ipv6/ip6t_REJECT.h | 4 +- + include/linux/netfilter_ipv6/ip6t_ah.h | 10 +- + include/linux/netfilter_ipv6/ip6t_frag.h | 10 +- + include/linux/netfilter_ipv6/ip6t_hl.h | 6 +- + include/linux/netfilter_ipv6/ip6t_ipv6header.h | 8 +- + include/linux/netfilter_ipv6/ip6t_mh.h | 6 +- + include/linux/netfilter_ipv6/ip6t_opts.h | 12 +- + include/linux/netfilter_ipv6/ip6t_rt.h | 13 +- + include/linux/pkt_sched.h | 107 + + include/linux/security.h | 7 +- + include/linux/skbuff.h | 11 +- + include/linux/ssb/ssb_regs.h | 7 +- + include/linux/tipc.h | 8 +- + include/linux/tipc_config.h | 32 +- + include/linux/xfrm.h | 1 + + include/net/bluetooth/bluetooth.h | 33 + + include/net/bluetooth/hci.h | 122 + + include/net/bluetooth/hci_core.h | 152 +- + include/net/bluetooth/l2cap.h | 53 +- + include/net/bluetooth/mgmt.h | 142 + + include/net/bluetooth/smp.h | 76 + + include/net/cfg80211.h | 3 +- + include/net/dst.h | 134 +- + include/net/dst_ops.h | 1 + + include/net/flow.h | 11 +- + include/net/icmp.h | 3 - + include/net/ieee80211_radiotap.h | 25 + + include/net/inet_sock.h | 31 +- + include/net/inetpeer.h | 44 +- + include/net/ip.h | 16 + + include/net/ip6_fib.h | 1 + + include/net/ip_fib.h | 27 +- + include/net/ip_vs.h | 315 ++- + include/net/ipv6.h | 16 +- + include/net/mac80211.h | 78 +- + include/net/net_namespace.h | 2 + + include/net/netevent.h | 1 - + include/net/netfilter/nf_conntrack.h | 23 +- + include/net/netfilter/nf_conntrack_ecache.h | 12 +- + include/net/netfilter/nf_conntrack_extend.h | 10 + + include/net/netfilter/nf_conntrack_helper.h | 6 + + include/net/netfilter/nf_conntrack_l3proto.h | 2 +- + include/net/netfilter/nf_conntrack_timestamp.h | 65 + + include/net/netfilter/nf_nat.h | 6 + + include/net/netfilter/nf_nat_core.h | 4 +- + include/net/netlink.h | 9 + + include/net/netns/conntrack.h | 4 +- + include/net/netns/ip_vs.h | 143 + + include/net/netns/ipv4.h | 1 - + include/net/phonet/pep.h | 22 +- + include/net/phonet/phonet.h | 1 + + include/net/protocol.h | 4 +- + include/net/route.h | 37 +- + include/net/sch_generic.h | 59 +- + include/net/sock.h | 9 +- + include/net/tcp.h | 16 +- + include/net/udp.h | 13 +- + include/net/udplite.h | 12 + + include/net/xfrm.h | 137 +- + kernel/audit.c | 2 + + kernel/irq/manage.c | 82 + + lib/Kconfig | 4 + + lib/Makefile | 2 + + lib/cpu_rmap.c | 269 ++ + net/8021q/vlan.c | 2 +- + net/9p/trans_rdma.c | 1 - + net/Kconfig | 6 + + net/batman-adv/Makefile | 2 +- + net/batman-adv/aggregation.c | 2 +- + net/batman-adv/aggregation.h | 2 +- + net/batman-adv/bat_debugfs.c | 6 +- + net/batman-adv/bat_debugfs.h | 2 +- + net/batman-adv/bat_sysfs.c | 2 +- + net/batman-adv/bat_sysfs.h | 2 +- + net/batman-adv/bitarray.c | 2 +- + net/batman-adv/bitarray.h | 2 +- + net/batman-adv/gateway_client.c | 2 +- + net/batman-adv/gateway_client.h | 2 +- + net/batman-adv/gateway_common.c | 2 +- + net/batman-adv/gateway_common.h | 2 +- + net/batman-adv/hard-interface.c | 13 +- + net/batman-adv/hard-interface.h | 6 +- + net/batman-adv/hash.c | 2 +- + net/batman-adv/hash.h | 7 +- + net/batman-adv/icmp_socket.c | 3 +- + net/batman-adv/icmp_socket.h | 4 +- + net/batman-adv/main.c | 3 +- + net/batman-adv/main.h | 17 +- + net/batman-adv/originator.c | 4 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/packet.h | 3 +- + net/batman-adv/ring_buffer.c | 2 +- + net/batman-adv/ring_buffer.h | 2 +- + net/batman-adv/routing.c | 27 +- + net/batman-adv/routing.h | 7 +- + net/batman-adv/send.c | 7 +- + net/batman-adv/send.h | 4 +- + net/batman-adv/soft-interface.c | 3 +- + net/batman-adv/soft-interface.h | 2 +- + net/batman-adv/translation-table.c | 3 +- + net/batman-adv/translation-table.h | 4 +- + net/batman-adv/types.h | 2 +- + net/batman-adv/unicast.c | 34 +- + net/batman-adv/unicast.h | 25 +- + net/batman-adv/vis.c | 2 +- + net/batman-adv/vis.h | 2 +- + net/bluetooth/Kconfig | 16 +- + net/bluetooth/Makefile | 4 +- + net/bluetooth/af_bluetooth.c | 53 +- + net/bluetooth/bnep/core.c | 2 - + net/bluetooth/bnep/sock.c | 1 + + net/bluetooth/cmtp/capi.c | 3 +- + net/bluetooth/cmtp/core.c | 11 +- + net/bluetooth/hci_conn.c | 78 +- + net/bluetooth/hci_core.c | 345 ++- + net/bluetooth/hci_event.c | 622 +++- + net/bluetooth/hci_sock.c | 6 +- + net/bluetooth/hci_sysfs.c | 58 +- + net/bluetooth/hidp/core.c | 11 +- + net/bluetooth/{l2cap.c => l2cap_core.c} | 1722 +++------- + net/bluetooth/l2cap_sock.c | 1156 ++++++ + net/bluetooth/mgmt.c | 1312 +++++++- + net/bluetooth/rfcomm/core.c | 2 - + net/bluetooth/sco.c | 17 +- + net/bridge/br_device.c | 17 + + net/bridge/br_if.c | 15 +- + net/bridge/br_private.h | 2 +- + net/bridge/netfilter/ebt_ip6.c | 46 +- + net/bridge/netfilter/ebtables.c | 3 + + net/caif/cfcnfg.c | 2 - + net/caif/cfdgml.c | 1 - + net/caif/cfserl.c | 1 - + net/caif/cfutill.c | 2 +- + net/caif/cfveil.c | 2 +- + net/core/dev.c | 451 ++- + net/core/dst.c | 43 +- + net/core/ethtool.c | 604 +++- + net/core/filter.c | 6 +- + net/core/flow.c | 14 +- + net/core/neighbour.c | 13 +- + net/core/net-sysfs.c | 17 +- + net/core/netpoll.c | 13 +- + net/core/pktgen.c | 234 +- + net/core/rtnetlink.c | 86 +- + net/core/skbuff.c | 7 +- + net/dccp/ccids/ccid2.c | 9 + + net/dccp/ipv4.c | 12 +- + net/dccp/ipv6.c | 68 +- + net/decnet/dn_route.c | 27 +- + net/decnet/dn_table.c | 1 - + net/ipv4/Kconfig | 42 +- + net/ipv4/Makefile | 4 +- + net/ipv4/af_inet.c | 6 +- + net/ipv4/ah4.c | 25 +- + net/ipv4/datagram.c | 2 +- + net/ipv4/devinet.c | 78 + + net/ipv4/fib_frontend.c | 63 +- + net/ipv4/fib_hash.c | 1133 ------ + net/ipv4/fib_lookup.h | 2 +- + net/ipv4/fib_rules.c | 12 +- + net/ipv4/fib_semantics.c | 125 +- + net/ipv4/fib_trie.c | 217 +- + net/ipv4/icmp.c | 224 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inetpeer.c | 52 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_output.c | 292 +- + net/ipv4/netfilter/Kconfig | 3 +- + net/ipv4/netfilter/arp_tables.c | 2 + + net/ipv4/netfilter/ip_tables.c | 2 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 7 +- + net/ipv4/netfilter/ipt_LOG.c | 3 +- + net/ipv4/netfilter/iptable_mangle.c | 2 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 17 +- + net/ipv4/netfilter/nf_nat_amanda.c | 8 +- + net/ipv4/netfilter/nf_nat_core.c | 33 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 +- + net/ipv4/raw.c | 5 +- + net/ipv4/route.c | 749 ++--- + net/ipv4/tcp.c | 11 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 13 +- + net/ipv4/tcp_timer.c | 3 - + net/ipv4/udp.c | 108 +- + net/ipv4/xfrm4_policy.c | 13 +- + net/ipv4/xfrm4_state.c | 6 +- + net/ipv6/addrconf.c | 3 - + net/ipv6/af_inet6.c | 19 +- + net/ipv6/datagram.c | 15 +- + net/ipv6/icmp.c | 133 +- + net/ipv6/inet6_connection_sock.c | 25 +- + net/ipv6/ip6_output.c | 96 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/mip6.c | 3 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/netfilter/ip6_tables.c | 2 + + net/ipv6/netfilter/ip6t_LOG.c | 3 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +- + net/ipv6/raw.c | 29 +- + net/ipv6/route.c | 83 +- + net/ipv6/sit.c | 23 +- + net/ipv6/syncookies.c | 7 +- + net/ipv6/tcp_ipv6.c | 63 +- + net/ipv6/udp.c | 17 +- + net/ipv6/xfrm6_policy.c | 11 +- + net/ipv6/xfrm6_state.c | 6 +- + net/key/af_key.c | 243 +- + net/l2tp/l2tp_ip.c | 4 +- + net/llc/llc_input.c | 25 +- + net/mac80211/Kconfig | 2 +- + net/mac80211/agg-rx.c | 7 +- + net/mac80211/agg-tx.c | 23 +- + net/mac80211/cfg.c | 27 +- + net/mac80211/debugfs.c | 6 + + net/mac80211/debugfs_netdev.c | 122 +- + net/mac80211/driver-ops.h | 6 +- + net/mac80211/driver-trace.h | 213 +- + net/mac80211/ibss.c | 14 +- + net/mac80211/ieee80211_i.h | 16 +- + net/mac80211/iface.c | 9 +- + net/mac80211/main.c | 85 +- + net/mac80211/mesh.c | 4 +- + net/mac80211/mlme.c | 84 +- + net/mac80211/offchannel.c | 68 +- + net/mac80211/rx.c | 115 +- + net/mac80211/scan.c | 96 +- + net/mac80211/sta_info.c | 3 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/status.c | 4 + + net/mac80211/tx.c | 30 +- + net/mac80211/util.c | 6 - + net/mac80211/work.c | 121 +- + net/mac80211/wpa.c | 39 +- + net/netfilter/Kconfig | 66 +- + net/netfilter/Makefile | 9 + + net/netfilter/core.c | 20 +- + net/netfilter/ipset/Kconfig | 122 + + net/netfilter/ipset/Makefile | 24 + + net/netfilter/ipset/ip_set_bitmap_ip.c | 587 +++ + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 652 ++++ + net/netfilter/ipset/ip_set_bitmap_port.c | 515 +++ + net/netfilter/ipset/ip_set_core.c | 1671 +++++++++ + net/netfilter/ipset/ip_set_getport.c | 141 + + net/netfilter/ipset/ip_set_hash_ip.c | 464 +++ + net/netfilter/ipset/ip_set_hash_ipport.c | 544 +++ + net/netfilter/ipset/ip_set_hash_ipportip.c | 562 +++ + net/netfilter/ipset/ip_set_hash_ipportnet.c | 628 ++++ + net/netfilter/ipset/ip_set_hash_net.c | 458 +++ + net/netfilter/ipset/ip_set_hash_netport.c | 578 +++ + net/netfilter/ipset/ip_set_list_set.c | 584 +++ + net/netfilter/ipset/pfxlen.c | 291 ++ + net/netfilter/ipvs/ip_vs_app.c | 98 +- + net/netfilter/ipvs/ip_vs_conn.c | 237 +- + net/netfilter/ipvs/ip_vs_core.c | 400 ++- + net/netfilter/ipvs/ip_vs_ctl.c | 892 +++-- + net/netfilter/ipvs/ip_vs_est.c | 134 +- + net/netfilter/ipvs/ip_vs_ftp.c | 61 +- + net/netfilter/ipvs/ip_vs_lblc.c | 82 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 99 +- + net/netfilter/ipvs/ip_vs_lc.c | 20 +- + net/netfilter/ipvs/ip_vs_nfct.c | 6 +- + net/netfilter/ipvs/ip_vs_nq.c | 2 +- + net/netfilter/ipvs/ip_vs_pe.c | 17 +- + net/netfilter/ipvs/ip_vs_pe_sip.c | 3 + + net/netfilter/ipvs/ip_vs_proto.c | 129 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 45 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 153 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 142 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 110 +- + net/netfilter/ipvs/ip_vs_rr.c | 2 +- + net/netfilter/ipvs/ip_vs_sched.c | 25 + + net/netfilter/ipvs/ip_vs_sed.c | 2 +- + net/netfilter/ipvs/ip_vs_sh.c | 2 +- + net/netfilter/ipvs/ip_vs_sync.c | 1239 +++++-- + net/netfilter/ipvs/ip_vs_wlc.c | 22 +- + net/netfilter/ipvs/ip_vs_wrr.c | 14 +- + net/netfilter/ipvs/ip_vs_xmit.c | 67 +- + net/netfilter/nf_conntrack_broadcast.c | 82 + + net/netfilter/nf_conntrack_core.c | 57 +- + net/netfilter/nf_conntrack_expect.c | 34 +- + net/netfilter/nf_conntrack_extend.c | 11 +- + net/netfilter/nf_conntrack_helper.c | 20 +- + net/netfilter/nf_conntrack_netbios_ns.c | 74 +- + net/netfilter/nf_conntrack_netlink.c | 49 +- + net/netfilter/nf_conntrack_proto.c | 24 +- + net/netfilter/nf_conntrack_proto_dccp.c | 3 + + net/netfilter/nf_conntrack_proto_sctp.c | 1 + + net/netfilter/nf_conntrack_proto_tcp.c | 18 +- + net/netfilter/nf_conntrack_snmp.c | 77 + + net/netfilter/nf_conntrack_standalone.c | 45 +- + net/netfilter/nf_conntrack_timestamp.c | 120 + + net/netfilter/nf_log.c | 6 +- + net/netfilter/nf_queue.c | 82 +- + net/netfilter/nfnetlink_log.c | 9 +- + net/netfilter/nfnetlink_queue.c | 22 +- + net/netfilter/x_tables.c | 98 +- + net/netfilter/xt_AUDIT.c | 204 ++ + net/netfilter/xt_CLASSIFY.c | 36 +- + net/netfilter/xt_IDLETIMER.c | 2 + + net/netfilter/xt_LED.c | 2 + + net/netfilter/xt_NFQUEUE.c | 34 +- + net/netfilter/xt_connlimit.c | 62 +- + net/netfilter/xt_conntrack.c | 80 +- + net/netfilter/xt_cpu.c | 2 + + net/netfilter/xt_devgroup.c | 82 + + net/netfilter/xt_iprange.c | 18 +- + net/netfilter/xt_ipvs.c | 2 +- + net/netfilter/xt_set.c | 359 ++ + net/packet/af_packet.c | 38 +- + net/phonet/af_phonet.c | 19 +- + net/phonet/pep.c | 244 +- + net/phonet/socket.c | 14 +- + net/rds/rds.h | 1 - + net/rose/af_rose.c | 7 - + net/rose/rose_route.c | 28 +- + net/sched/Kconfig | 39 +- + net/sched/Makefile | 4 + + net/sched/act_api.c | 46 +- + net/sched/act_csum.c | 2 +- + net/sched/act_gact.c | 8 +- + net/sched/act_ipt.c | 16 +- + net/sched/act_mirred.c | 4 +- + net/sched/act_nat.c | 2 +- + net/sched/act_pedit.c | 10 +- + net/sched/act_police.c | 9 +- + net/sched/act_simple.c | 10 +- + net/sched/act_skbedit.c | 8 +- + net/sched/cls_api.c | 33 +- + net/sched/cls_basic.c | 17 +- + net/sched/cls_cgroup.c | 8 +- + net/sched/cls_flow.c | 6 +- + net/sched/cls_fw.c | 38 +- + net/sched/cls_route.c | 126 +- + net/sched/cls_rsvp.h | 95 +- + net/sched/cls_tcindex.c | 2 +- + net/sched/cls_u32.c | 89 +- + net/sched/em_cmp.c | 47 +- + net/sched/em_meta.c | 46 +- + net/sched/em_nbyte.c | 3 +- + net/sched/em_text.c | 3 +- + net/sched/em_u32.c | 2 +- + net/sched/ematch.c | 37 +- + net/sched/sch_api.c | 173 +- + net/sched/sch_atm.c | 16 +- + net/sched/sch_cbq.c | 362 +- + net/sched/sch_choke.c | 688 ++++ + net/sched/sch_dsmark.c | 21 +- + net/sched/sch_fifo.c | 22 +- + net/sched/sch_generic.c | 40 +- + net/sched/sch_gred.c | 85 +- + net/sched/sch_hfsc.c | 37 +- + net/sched/sch_htb.c | 106 +- + net/sched/sch_mq.c | 1 - + net/sched/sch_mqprio.c | 418 +++ + net/sched/sch_multiq.c | 8 +- + net/sched/sch_netem.c | 411 ++- + net/sched/sch_prio.c | 34 +- + net/sched/sch_red.c | 61 +- + net/sched/sch_sfb.c | 709 ++++ + net/sched/sch_sfq.c | 67 +- + net/sched/sch_tbf.c | 39 +- + net/sched/sch_teql.c | 36 +- + net/sctp/socket.c | 9 +- + net/sctp/tsnmap.c | 2 +- + net/socket.c | 31 +- + net/sunrpc/svcsock.c | 32 +- + net/tipc/bcast.c | 47 +- + net/tipc/bcast.h | 3 +- + net/tipc/bearer.c | 100 +- + net/tipc/bearer.h | 67 +- + net/tipc/core.c | 3 +- + net/tipc/core.h | 3 +- + net/tipc/discover.c | 37 +- + net/tipc/discover.h | 9 +- + net/tipc/link.c | 82 +- + net/tipc/link.h | 28 +- + net/tipc/msg.c | 7 +- + net/tipc/msg.h | 22 +- + net/tipc/node.c | 4 +- + net/tipc/port.c | 306 +- + net/tipc/port.h | 73 +- + net/tipc/socket.c | 6 +- + net/tipc/subscr.c | 13 +- + net/unix/af_unix.c | 68 +- + net/wanrouter/wanmain.c | 2 - + net/wireless/core.c | 20 +- + net/wireless/nl80211.c | 6 +- + net/wireless/reg.c | 6 +- + net/wireless/util.c | 47 +- + net/wireless/wext-compat.c | 5 +- + net/xfrm/xfrm_algo.c | 8 +- + net/xfrm/xfrm_hash.h | 32 +- + net/xfrm/xfrm_policy.c | 146 +- + net/xfrm/xfrm_state.c | 60 +- + net/xfrm/xfrm_user.c | 50 +- + security/capability.c | 2 +- + security/security.c | 3 +- + security/selinux/include/xfrm.h | 2 +- + security/selinux/xfrm.c | 2 +- + 872 files changed, 64363 insertions(+), 23915 deletions(-) + create mode 100644 drivers/net/can/c_can/Kconfig + create mode 100644 drivers/net/can/c_can/Makefile + create mode 100644 drivers/net/can/c_can/c_can.c + create mode 100644 drivers/net/can/c_can/c_can.h + create mode 100644 drivers/net/can/c_can/c_can_platform.c + create mode 100644 drivers/net/enic/enic_dev.c + create mode 100644 drivers/net/enic/enic_dev.h + create mode 100644 drivers/net/wireless/ath/ath5k/trace.h + delete mode 100644 drivers/net/wireless/ath/ath9k/virtual.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-2000.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/Makefile + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/def.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/dm.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/dm.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/fw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/fw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/hw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/led.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/led.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/mac.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/phy.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/reg.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/rf.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/sw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/table.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192cu/trx.h + create mode 100644 drivers/net/wireless/rtlwifi/usb.c + create mode 100644 drivers/net/wireless/rtlwifi/usb.h + create mode 100644 include/linux/cpu_rmap.h + create mode 100644 include/linux/micrel_phy.h + create mode 100644 include/linux/netfilter/ipset/Kbuild + create mode 100644 include/linux/netfilter/ipset/ip_set.h + create mode 100644 include/linux/netfilter/ipset/ip_set_ahash.h + create mode 100644 include/linux/netfilter/ipset/ip_set_bitmap.h + create mode 100644 include/linux/netfilter/ipset/ip_set_getport.h + create mode 100644 include/linux/netfilter/ipset/ip_set_hash.h + create mode 100644 include/linux/netfilter/ipset/ip_set_list.h + create mode 100644 include/linux/netfilter/ipset/ip_set_timeout.h + create mode 100644 include/linux/netfilter/ipset/pfxlen.h + create mode 100644 include/linux/netfilter/nf_conntrack_snmp.h + create mode 100644 include/linux/netfilter/xt_AUDIT.h + create mode 100644 include/linux/netfilter/xt_devgroup.h + create mode 100644 include/linux/netfilter/xt_set.h + create mode 100644 include/net/bluetooth/smp.h + create mode 100644 include/net/netfilter/nf_conntrack_timestamp.h + create mode 100644 include/net/netns/ip_vs.h + create mode 100644 lib/cpu_rmap.c + rename net/bluetooth/{l2cap.c => l2cap_core.c} (76%) + create mode 100644 net/bluetooth/l2cap_sock.c + delete mode 100644 net/ipv4/fib_hash.c + create mode 100644 net/netfilter/ipset/Kconfig + create mode 100644 net/netfilter/ipset/Makefile + create mode 100644 net/netfilter/ipset/ip_set_bitmap_ip.c + create mode 100644 net/netfilter/ipset/ip_set_bitmap_ipmac.c + create mode 100644 net/netfilter/ipset/ip_set_bitmap_port.c + create mode 100644 net/netfilter/ipset/ip_set_core.c + create mode 100644 net/netfilter/ipset/ip_set_getport.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ip.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ipport.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ipportip.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ipportnet.c + create mode 100644 net/netfilter/ipset/ip_set_hash_net.c + create mode 100644 net/netfilter/ipset/ip_set_hash_netport.c + create mode 100644 net/netfilter/ipset/ip_set_list_set.c + create mode 100644 net/netfilter/ipset/pfxlen.c + create mode 100644 net/netfilter/nf_conntrack_broadcast.c + create mode 100644 net/netfilter/nf_conntrack_snmp.c + create mode 100644 net/netfilter/nf_conntrack_timestamp.c + create mode 100644 net/netfilter/xt_AUDIT.c + create mode 100644 net/netfilter/xt_devgroup.c + create mode 100644 net/netfilter/xt_set.c + create mode 100644 net/sched/sch_choke.c + create mode 100644 net/sched/sch_mqprio.c + create mode 100644 net/sched/sch_sfb.c +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/ath/ath9k/hif_usb.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-3945-fh.h +Auto-merging drivers/net/wireless/iwlegacy/iwl-3945-hw.h +Auto-merging drivers/net/wireless/iwlegacy/iwl-3945-rs.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-3945.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-3945.h +Auto-merging drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h +Auto-merging drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-4965-hw.h +Auto-merging drivers/net/wireless/iwlegacy/iwl-4965-led.h +Auto-merging drivers/net/wireless/iwlegacy/iwl-4965-rx.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-4965.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-led.h +Auto-merging drivers/net/wireless/iwlegacy/iwl-power.h +Auto-merging drivers/net/wireless/iwlegacy/iwl3945-base.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Removing drivers/net/wireless/iwlwifi/iwl-legacy.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192c/main.c +Auto-merging drivers/net/wireless/rtlwifi/wifi.h +Auto-merging drivers/staging/brcm80211/sys/wl_mac80211.c +Auto-merging drivers/staging/brcm80211/sys/wlc_mac80211.c +Auto-merging net/mac80211/Kconfig +Merge made by recursive. + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 5 +- + drivers/net/wireless/adm8211.c | 4 +- + drivers/net/wireless/at76c50x-usb.c | 10 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 2 +- + drivers/net/wireless/ath/ar9170/main.c | 5 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 4 +- + drivers/net/wireless/ath/ath5k/base.c | 7 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 8 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 43 +- + drivers/net/wireless/ath/ath9k/gpio.c | 166 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 78 +- + drivers/net/wireless/ath/ath9k/htc.h | 77 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 170 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 19 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 452 ++- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 84 +- + drivers/net/wireless/ath/ath9k/init.c | 22 + + drivers/net/wireless/ath/ath9k/main.c | 15 +- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/ath9k/reg.h | 1 + + drivers/net/wireless/ath/ath9k/wmi.c | 4 - + drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- + drivers/net/wireless/ath/carl9170/tx.c | 5 +- + drivers/net/wireless/b43/main.c | 6 +- + drivers/net/wireless/b43/phy_n.c | 28 +- + drivers/net/wireless/b43/tables_nphy.c | 1106 ++++++- + drivers/net/wireless/b43/tables_nphy.h | 27 + + drivers/net/wireless/b43/xmit.c | 75 +- + drivers/net/wireless/b43/xmit.h | 6 + + drivers/net/wireless/b43legacy/main.c | 5 +- + drivers/net/wireless/b43legacy/xmit.c | 2 +- + drivers/net/wireless/iwlegacy/Kconfig | 116 + + drivers/net/wireless/iwlegacy/Makefile | 25 + + .../{iwlwifi => iwlegacy}/iwl-3945-debugfs.c | 11 +- + .../{iwlwifi => iwlegacy}/iwl-3945-debugfs.h | 4 +- + .../wireless/{iwlwifi => iwlegacy}/iwl-3945-fh.h | 5 +- + .../wireless/{iwlwifi => iwlegacy}/iwl-3945-hw.h | 9 +- + .../wireless/{iwlwifi => iwlegacy}/iwl-3945-led.c | 4 +- + .../wireless/{iwlwifi => iwlegacy}/iwl-3945-led.h | 2 +- + .../wireless/{iwlwifi => iwlegacy}/iwl-3945-rs.c | 41 +- + .../net/wireless/{iwlwifi => iwlegacy}/iwl-3945.c | 253 +- + .../net/wireless/{iwlwifi => iwlegacy}/iwl-3945.h | 12 +- + drivers/net/wireless/iwlegacy/iwl-4965-calib.c | 967 ++++++ + .../iwl-legacy.h => iwlegacy/iwl-4965-calib.h} | 30 +- + drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c | 774 +++++ + .../iwl-4965-debugfs.h} | 35 +- + .../iwl-legacy.h => iwlegacy/iwl-4965-eeprom.c} | 107 +- + .../wireless/{iwlwifi => iwlegacy}/iwl-4965-hw.h | 26 +- + .../iwl-3945-led.c => iwlegacy/iwl-4965-led.c} | 30 +- + .../rtl8192cu/fw.c => iwlegacy/iwl-4965-led.h} | 17 +- + drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 1260 +++++++ + drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 2870 ++++++++++++++++ + .../iwl-agn-rx.c => iwlegacy/iwl-4965-rx.c} | 172 +- + drivers/net/wireless/iwlegacy/iwl-4965-sta.c | 721 ++++ + drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 1369 ++++++++ + drivers/net/wireless/iwlegacy/iwl-4965-ucode.c | 166 + + .../net/wireless/{iwlwifi => iwlegacy}/iwl-4965.c | 806 +---- + drivers/net/wireless/iwlegacy/iwl-4965.h | 282 ++ + drivers/net/wireless/iwlegacy/iwl-commands.h | 3405 ++++++++++++++++++ + drivers/net/wireless/iwlegacy/iwl-core.c | 2674 ++++++++++++++ + drivers/net/wireless/iwlegacy/iwl-core.h | 646 ++++ + drivers/net/wireless/iwlegacy/iwl-csr.h | 422 +++ + drivers/net/wireless/iwlegacy/iwl-debug.h | 198 ++ + drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1467 ++++++++ + drivers/net/wireless/iwlegacy/iwl-dev.h | 1426 ++++++++ + .../iwl-3945-led.h => iwlegacy/iwl-devtrace.c} | 23 +- + drivers/net/wireless/iwlegacy/iwl-devtrace.h | 270 ++ + drivers/net/wireless/iwlegacy/iwl-eeprom.c | 561 +++ + drivers/net/wireless/iwlegacy/iwl-eeprom.h | 344 ++ + drivers/net/wireless/iwlegacy/iwl-fh.h | 513 +++ + drivers/net/wireless/iwlegacy/iwl-hcmd.c | 271 ++ + drivers/net/wireless/iwlegacy/iwl-helpers.h | 181 + + drivers/net/wireless/iwlegacy/iwl-io.h | 545 +++ + drivers/net/wireless/iwlegacy/iwl-led.c | 188 + + .../{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-led.h} | 34 +- + drivers/net/wireless/iwlegacy/iwl-legacy-rs.h | 456 +++ + drivers/net/wireless/iwlegacy/iwl-power.c | 165 + + .../iwl-3945-led.c => iwlegacy/iwl-power.h} | 61 +- + drivers/net/wireless/iwlegacy/iwl-prph.h | 523 +++ + drivers/net/wireless/iwlegacy/iwl-rx.c | 302 ++ + drivers/net/wireless/iwlegacy/iwl-scan.c | 625 ++++ + drivers/net/wireless/iwlegacy/iwl-spectrum.h | 92 + + drivers/net/wireless/iwlegacy/iwl-sta.c | 816 +++++ + drivers/net/wireless/iwlegacy/iwl-sta.h | 148 + + drivers/net/wireless/iwlegacy/iwl-tx.c | 660 ++++ + .../wireless/{iwlwifi => iwlegacy}/iwl3945-base.c | 543 ++-- + drivers/net/wireless/iwlegacy/iwl4965-base.c | 3632 ++++++++++++++++++++ + drivers/net/wireless/iwlwifi/Kconfig | 124 +- + drivers/net/wireless/iwlwifi/Makefile | 41 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 2 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 81 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 58 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 110 +- + drivers/net/wireless/iwlwifi/iwl-agn.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 108 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 76 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 2 - + drivers/net/wireless/iwlwifi/iwl-dev.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 8 - + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 5 - + drivers/net/wireless/iwlwifi/iwl-led.c | 2 - + drivers/net/wireless/iwlwifi/iwl-legacy.c | 657 ---- + drivers/net/wireless/iwlwifi/iwl-power.c | 3 - + drivers/net/wireless/iwlwifi/iwl-rx.c | 392 ++- + drivers/net/wireless/iwlwifi/iwl-scan.c | 10 - + drivers/net/wireless/iwlwifi/iwl-sta.c | 11 - + drivers/net/wireless/iwlwifi/iwl-tx.c | 78 +- + drivers/net/wireless/libertas_tf/main.c | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 5 +- + drivers/net/wireless/mwl8k.c | 54 +- + drivers/net/wireless/orinoco/scan.c | 5 + + drivers/net/wireless/p54/eeprom.c | 7 +- + drivers/net/wireless/p54/fwio.c | 9 +- + drivers/net/wireless/p54/lmac.h | 2 +- + drivers/net/wireless/p54/main.c | 14 +- + drivers/net/wireless/p54/p54.h | 1 + + drivers/net/wireless/p54/txrx.c | 13 +- + drivers/net/wireless/rt2x00/rt2x00.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 5 +- + drivers/net/wireless/rtl818x/rtl8180/dev.c | 10 +- + drivers/net/wireless/rtl818x/rtl8187/dev.c | 8 +- + drivers/net/wireless/rtlwifi/Kconfig | 7 + + drivers/net/wireless/rtlwifi/Makefile | 8 +- + drivers/net/wireless/rtlwifi/base.c | 15 +- + drivers/net/wireless/rtlwifi/core.c | 9 +- + drivers/net/wireless/rtlwifi/efuse.c | 18 - + drivers/net/wireless/rtlwifi/efuse.h | 3 - + drivers/net/wireless/rtlwifi/rtl8192c/Makefile | 9 + + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 12 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 204 ++ + .../{rtl8192ce/fw.c => rtl8192c/fw_common.c} | 13 +- + .../{rtl8192ce/fw.h => rtl8192c/fw_common.h} | 0 + .../rtlwifi/{rtl8192cu/fw.h => rtl8192c/main.c} | 11 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 137 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 246 ++ + drivers/net/wireless/rtlwifi/rtl8192ce/Makefile | 1 - + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 7 +- + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 11 + + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 31 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 28 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 10 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 5 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 15 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 12 + + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 13 +- + drivers/net/wireless/rtlwifi/rtl8192cu/Makefile | 1 - + drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 7 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 9 + + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 38 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 12 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 19 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 17 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 18 + + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 7 +- + drivers/net/wireless/rtlwifi/wifi.h | 12 + + drivers/net/wireless/wl1251/main.c | 4 +- + drivers/net/wireless/wl1251/rx.c | 2 +- + drivers/net/wireless/wl12xx/acx.c | 28 +- + drivers/net/wireless/wl12xx/acx.h | 9 + + drivers/net/wireless/wl12xx/init.c | 2 +- + drivers/net/wireless/wl12xx/main.c | 151 +- + drivers/net/wireless/wl12xx/ps.c | 78 + + drivers/net/wireless/wl12xx/ps.h | 2 + + drivers/net/wireless/wl12xx/rx.c | 6 +- + drivers/net/wireless/wl12xx/rx.h | 4 - + drivers/net/wireless/wl12xx/tx.c | 237 ++- + drivers/net/wireless/wl12xx/tx.h | 5 +- + drivers/net/wireless/wl12xx/wl12xx.h | 37 + + drivers/net/wireless/zd1211rw/zd_mac.c | 5 +- + drivers/staging/brcm80211/sys/wl_mac80211.c | 28 +- + drivers/staging/brcm80211/sys/wlc_mac80211.c | 5 +- + drivers/staging/winbond/wbusb.c | 7 +- + include/linux/nl80211.h | 3 + + include/net/cfg80211.h | 5 +- + include/net/mac80211.h | 21 +- + net/bluetooth/Kconfig | 6 +- + net/mac80211/Kconfig | 2 +- + net/mac80211/cfg.c | 68 +- + net/mac80211/driver-ops.h | 35 +- + net/mac80211/driver-trace.h | 33 + + net/mac80211/ht.c | 5 +- + net/mac80211/ibss.c | 7 +- + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/mlme.c | 23 +- + net/mac80211/rx.c | 15 +- + net/mac80211/sta_info.h | 4 + + net/mac80211/status.c | 6 +- + net/mac80211/tx.c | 164 +- + net/wireless/nl80211.c | 56 +- + 201 files changed, 34374 insertions(+), 3387 deletions(-) + create mode 100644 drivers/net/wireless/iwlegacy/Kconfig + create mode 100644 drivers/net/wireless/iwlegacy/Makefile + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-debugfs.c (99%) + copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-debugfs.h (95%) + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-fh.h (98%) + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-hw.h (96%) + copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-led.c (94%) + copy drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-led.h (95%) + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945-rs.c (96%) + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945.c (92%) + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-3945.h (97%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.c + copy drivers/net/wireless/{iwlwifi/iwl-legacy.h => iwlegacy/iwl-4965-calib.h} (80%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c + rename drivers/net/wireless/{iwlwifi/iwl-3945-debugfs.h => iwlegacy/iwl-4965-debugfs.h} (61%) + rename drivers/net/wireless/{iwlwifi/iwl-legacy.h => iwlegacy/iwl-4965-eeprom.c} (53%) + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-4965-hw.h (97%) + copy drivers/net/wireless/{iwlwifi/iwl-3945-led.c => iwlegacy/iwl-4965-led.c} (73%) + rename drivers/net/wireless/{rtlwifi/rtl8192cu/fw.c => iwlegacy/iwl-4965-led.h} (71%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c + rename drivers/net/wireless/{iwlwifi/iwl-agn-rx.c => iwlegacy/iwl-4965-rx.c} (60%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl-4965.c (71%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-commands.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-csr.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h + copy drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-devtrace.c} (59%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c + rename drivers/net/wireless/{iwlwifi/iwl-3945-led.h => iwlegacy/iwl-led.h} (59%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c + rename drivers/net/wireless/{iwlwifi/iwl-3945-led.c => iwlegacy/iwl-power.h} (56%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl-prph.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-spectrum.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.c + create mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h + create mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c + rename drivers/net/wireless/{iwlwifi => iwlegacy}/iwl3945-base.c (90%) + create mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/Makefile + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h + rename drivers/net/wireless/rtlwifi/{rtl8192ce/fw.c => rtl8192c/fw_common.c} (98%) + rename drivers/net/wireless/rtlwifi/{rtl8192ce/fw.h => rtl8192c/fw_common.h} (100%) + rename drivers/net/wireless/rtlwifi/{rtl8192cu/fw.h => rtl8192c/main.c} (75%) + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + include/net/bluetooth/hci.h | 17 + + include/net/bluetooth/hci_core.h | 21 + + include/net/bluetooth/mgmt.h | 73 ++-- + net/bluetooth/af_bluetooth.c | 4 +- + net/bluetooth/hci_conn.c | 8 +- + net/bluetooth/hci_event.c | 69 ++++- + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/l2cap_core.c | 13 +- + net/bluetooth/mgmt.c | 751 +++++++++++++++++++++++++------------- + net/bluetooth/sco.c | 7 +- + 10 files changed, 663 insertions(+), 302 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/x86/crypto/aesni-intel_glue.c | 24 +- + crypto/ablkcipher.c | 3 +- + crypto/testmgr.c | 2 + + crypto/testmgr.h | 30 +- + drivers/char/hw_random/Kconfig | 12 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/omap-rng.c | 14 +- + drivers/char/hw_random/picoxcell-rng.c | 208 ++++ + drivers/char/random.c | 13 +- + drivers/crypto/Kconfig | 17 + + drivers/crypto/Makefile | 2 +- + drivers/crypto/omap-aes.c | 4 +- + drivers/crypto/omap-sham.c | 4 +- + drivers/crypto/picoxcell_crypto.c | 1867 ++++++++++++++++++++++++++++++++ + drivers/crypto/picoxcell_crypto_regs.h | 128 +++ + 15 files changed, 2297 insertions(+), 32 deletions(-) + create mode 100644 drivers/char/hw_random/picoxcell-rng.c + create mode 100644 drivers/crypto/picoxcell_crypto.c + create mode 100644 drivers/crypto/picoxcell_crypto_regs.h +Merging sound/for-next +$ git merge sound/for-next +Auto-merging arch/arm/mach-shmobile/board-ag5evm.c +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Removing sound/soc/samsung/ac97.h +Merge made by recursive. + arch/arm/mach-shmobile/board-ag5evm.c | 10 - + arch/arm/mach-shmobile/board-ap4evb.c | 13 +- + arch/arm/mach-shmobile/board-mackerel.c | 13 +- + arch/sh/boards/mach-ecovec24/setup.c | 6 +- + arch/sh/boards/mach-se/7724/setup.c | 6 +- + include/linux/mfd/wm8994/pdata.h | 12 +- + include/linux/mfd/wm8994/registers.h | 2 + + include/sound/ac97_codec.h | 5 + + include/sound/cs4271.h | 24 + + include/sound/hdspm.h | 179 +- + include/sound/mixer_oss.h | 3 + + include/sound/pcm.h | 91 +- + include/sound/sh_fsi.h | 76 +- + include/sound/soc-dapm.h | 16 + + include/sound/soc.h | 115 +- + include/sound/version.h | 2 +- + include/sound/wm8903.h | 20 +- + include/sound/wm9081.h | 9 +- + include/trace/events/asoc.h | 25 + + sound/core/device.c | 7 +- + sound/core/memalloc.c | 3 +- + sound/core/oss/linear.c | 7 +- + sound/core/oss/mixer_oss.c | 10 +- + sound/core/oss/mulaw.c | 2 +- + sound/core/oss/pcm_oss.c | 51 +- + sound/core/oss/pcm_plugin.c | 40 +- + sound/core/oss/pcm_plugin.h | 11 +- + sound/core/oss/route.c | 6 +- + sound/core/pcm.c | 10 +- + sound/core/pcm_misc.c | 35 +- + sound/core/pcm_native.c | 2 +- + sound/core/seq/seq_clientmgr.c | 7 +- + sound/core/seq/seq_memory.c | 6 +- + sound/core/seq/seq_memory.h | 4 + + sound/core/seq/seq_ports.c | 2 +- + sound/core/vmaster.c | 2 +- + sound/pci/Kconfig | 12 +- + sound/pci/ac97/ac97_codec.c | 90 +- + sound/pci/ac97/ac97_patch.c | 52 + + sound/pci/asihpi/asihpi.c | 774 ++-- + sound/pci/asihpi/hpi.h | 1214 +++---- + sound/pci/asihpi/hpi6000.c | 299 +- + sound/pci/asihpi/hpi6205.c | 603 ++-- + sound/pci/asihpi/hpi6205.h | 7 +- + sound/pci/asihpi/hpi_internal.h | 1118 +++---- + sound/pci/asihpi/hpicmn.c | 480 ++-- + sound/pci/asihpi/hpicmn.h | 24 +- + sound/pci/asihpi/hpidebug.c | 157 +- + sound/pci/asihpi/hpidebug.h | 323 +-- + sound/pci/asihpi/hpidspcd.c | 37 +- + sound/pci/asihpi/hpidspcd.h | 2 +- + sound/pci/asihpi/hpifunc.c | 2498 ++++---------- + sound/pci/asihpi/hpimsginit.c | 18 +- + sound/pci/asihpi/hpimsginit.h | 12 +- + sound/pci/asihpi/hpimsgx.c | 203 +- + sound/pci/asihpi/hpioctl.c | 85 +- + sound/pci/asihpi/hpios.h | 10 +- + sound/pci/au88x0/au88x0_eq.c | 3 +- + sound/pci/azt3328.c | 450 +++- + sound/pci/emu10k1/emu10k1_main.c | 2 +- + sound/pci/hda/patch_analog.c | 117 +- + sound/pci/hda/patch_hdmi.c | 22 +- + sound/pci/hda/patch_realtek.c | 24 +- + sound/pci/rme9652/hdspm.c | 4464 ++++++++++++++++++------ + sound/ppc/pmac.c | 6 +- + sound/soc/Kconfig | 2 + + sound/soc/Makefile | 2 + + sound/soc/codecs/Kconfig | 17 + + sound/soc/codecs/Makefile | 10 +- + sound/soc/codecs/ak4104.c | 1 - + sound/soc/codecs/ak4642.c | 24 + + sound/soc/codecs/cs4270.c | 6 +- + sound/soc/codecs/cs4271.c | 643 ++++ + sound/soc/codecs/max98088.c | 2 +- + sound/soc/codecs/sgtl5000.c | 1511 ++++++++ + sound/soc/codecs/sgtl5000.h | 400 +++ + sound/soc/codecs/sn95031.c | 949 +++++ + sound/soc/codecs/sn95031.h | 132 + + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/wm2000.c | 14 +- + sound/soc/codecs/wm8523.c | 8 +- + sound/soc/codecs/wm8741.c | 13 +- + sound/soc/codecs/wm8753.c | 296 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8900.c | 2 +- + sound/soc/codecs/wm8903.c | 641 +++- + sound/soc/codecs/wm8903.h | 8 + + sound/soc/codecs/wm8904.c | 43 +- + sound/soc/codecs/wm8955.c | 27 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 36 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8991.c | 1427 ++++++++ + sound/soc/codecs/wm8991.h | 833 +++++ + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8994-tables.c | 10 +- + sound/soc/codecs/wm8994.c | 178 +- + sound/soc/codecs/wm8995.c | 103 +- + sound/soc/codecs/wm9081.c | 34 +- + sound/soc/codecs/wm9090.c | 45 +- + sound/soc/codecs/wm_hubs.c | 3 +- + sound/soc/davinci/davinci-i2s.c | 28 +- + sound/soc/davinci/davinci-mcasp.c | 29 +- + sound/soc/ep93xx/Kconfig | 9 + + sound/soc/ep93xx/Makefile | 2 + + sound/soc/ep93xx/edb93xx.c | 142 + + sound/soc/ep93xx/ep93xx-ac97.c | 1 - + sound/soc/fsl/mpc8610_hpcd.c | 6 +- + sound/soc/fsl/p1022_ds.c | 6 +- + sound/soc/imx/imx-ssi.c | 5 +- + sound/soc/mid-x86/Kconfig | 14 + + sound/soc/mid-x86/Makefile | 5 + + sound/soc/mid-x86/mfld_machine.c | 452 +++ + sound/soc/mid-x86/sst_platform.c | 474 +++ + sound/soc/mid-x86/sst_platform.h | 63 + + sound/soc/omap/Kconfig | 1 + + sound/soc/omap/rx51.c | 93 +- + sound/soc/pxa/raumfeld.c | 20 +- + sound/soc/pxa/tosa.c | 4 +- + sound/soc/pxa/zylonite.c | 9 +- + sound/soc/samsung/ac97.c | 8 +- + sound/soc/samsung/ac97.h | 21 - + sound/soc/samsung/dma.c | 13 +- + sound/soc/samsung/dma.h | 8 - + sound/soc/samsung/goni_wm8994.c | 10 +- + sound/soc/samsung/h1940_uda1380.c | 9 - + sound/soc/samsung/i2s.c | 3 +- + sound/soc/samsung/jive_wm8750.c | 11 - + sound/soc/samsung/ln2440sbc_alc650.c | 7 - + sound/soc/samsung/neo1973_gta02_wm8753.c | 14 +- + sound/soc/samsung/neo1973_wm8753.c | 1 - + sound/soc/samsung/pcm.c | 118 +- + sound/soc/samsung/pcm.h | 107 - + sound/soc/samsung/rx1950_uda1380.c | 11 - + sound/soc/samsung/s3c-i2s-v2.c | 3 +- + sound/soc/samsung/s3c2412-i2s.c | 12 +- + sound/soc/samsung/s3c24xx-i2s.c | 14 +- + sound/soc/samsung/s3c24xx_simtec.c | 7 - + sound/soc/samsung/s3c24xx_simtec_hermes.c | 10 - + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 12 - + sound/soc/samsung/s3c24xx_uda134x.c | 9 +- + sound/soc/samsung/smartq_wm8987.c | 6 - + sound/soc/samsung/smdk2443_wm9710.c | 7 - + sound/soc/samsung/smdk_spdif.c | 5 - + sound/soc/samsung/smdk_wm8580.c | 7 +- + sound/soc/samsung/smdk_wm9713.c | 5 - + sound/soc/samsung/spdif.c | 3 +- + sound/soc/sh/fsi-ak4642.c | 24 +- + sound/soc/sh/fsi-da7210.c | 13 +- + sound/soc/sh/fsi-hdmi.c | 77 +- + sound/soc/sh/fsi.c | 203 +- + sound/soc/soc-cache.c | 386 +-- + sound/soc/soc-core.c | 378 ++- + sound/soc/soc-dapm.c | 200 +- + sound/soc/soc-jack.c | 58 +- + sound/soc/soc-utils.c | 23 +- + sound/soc/tegra/Kconfig | 26 + + sound/soc/tegra/Makefile | 15 + + sound/soc/tegra/harmony.c | 393 +++ + sound/soc/tegra/tegra_asoc_utils.c | 155 + + sound/soc/tegra/tegra_asoc_utils.h | 45 + + sound/soc/tegra/tegra_das.c | 265 ++ + sound/soc/tegra/tegra_das.h | 135 + + sound/soc/tegra/tegra_i2s.c | 503 +++ + sound/soc/tegra/tegra_i2s.h | 165 + + sound/soc/tegra/tegra_pcm.c | 404 +++ + sound/soc/tegra/tegra_pcm.h | 55 + + sound/usb/6fire/Makefile | 3 + + sound/usb/6fire/chip.c | 232 ++ + sound/usb/6fire/chip.h | 32 + + sound/usb/6fire/comm.c | 176 + + sound/usb/6fire/comm.h | 44 + + sound/usb/6fire/common.h | 30 + + sound/usb/6fire/control.c | 275 ++ + sound/usb/6fire/control.h | 37 + + sound/usb/6fire/firmware.c | 426 +++ + sound/usb/6fire/firmware.h | 27 + + sound/usb/6fire/midi.c | 203 ++ + sound/usb/6fire/midi.h | 46 + + sound/usb/6fire/pcm.c | 688 ++++ + sound/usb/6fire/pcm.h | 76 + + sound/usb/Kconfig | 17 + + sound/usb/Makefile | 2 +- + sound/usb/caiaq/audio.c | 1 + + sound/usb/caiaq/device.c | 6 + + sound/usb/caiaq/device.h | 1 + + sound/usb/mixer_quirks.c | 174 +- + sound/usb/quirks-table.h | 14 + + sound/usb/quirks.c | 56 +- + 189 files changed, 21223 insertions(+), 8040 deletions(-) + create mode 100644 include/sound/cs4271.h + create mode 100644 sound/soc/codecs/cs4271.c + create mode 100644 sound/soc/codecs/sgtl5000.c + create mode 100644 sound/soc/codecs/sgtl5000.h + create mode 100644 sound/soc/codecs/sn95031.c + create mode 100644 sound/soc/codecs/sn95031.h + create mode 100644 sound/soc/codecs/wm8991.c + create mode 100644 sound/soc/codecs/wm8991.h + create mode 100644 sound/soc/ep93xx/edb93xx.c + create mode 100644 sound/soc/mid-x86/Kconfig + create mode 100644 sound/soc/mid-x86/Makefile + create mode 100644 sound/soc/mid-x86/mfld_machine.c + create mode 100644 sound/soc/mid-x86/sst_platform.c + create mode 100644 sound/soc/mid-x86/sst_platform.h + delete mode 100644 sound/soc/samsung/ac97.h + create mode 100644 sound/soc/tegra/Kconfig + create mode 100644 sound/soc/tegra/Makefile + create mode 100644 sound/soc/tegra/harmony.c + create mode 100644 sound/soc/tegra/tegra_asoc_utils.c + create mode 100644 sound/soc/tegra/tegra_asoc_utils.h + create mode 100644 sound/soc/tegra/tegra_das.c + create mode 100644 sound/soc/tegra/tegra_das.h + create mode 100644 sound/soc/tegra/tegra_i2s.c + create mode 100644 sound/soc/tegra/tegra_i2s.h + create mode 100644 sound/soc/tegra/tegra_pcm.c + create mode 100644 sound/soc/tegra/tegra_pcm.h + create mode 100644 sound/usb/6fire/Makefile + create mode 100644 sound/usb/6fire/chip.c + create mode 100644 sound/usb/6fire/chip.h + create mode 100644 sound/usb/6fire/comm.c + create mode 100644 sound/usb/6fire/comm.h + create mode 100644 sound/usb/6fire/common.h + create mode 100644 sound/usb/6fire/control.c + create mode 100644 sound/usb/6fire/control.h + create mode 100644 sound/usb/6fire/firmware.c + create mode 100644 sound/usb/6fire/firmware.h + create mode 100644 sound/usb/6fire/midi.c + create mode 100644 sound/usb/6fire/midi.h + create mode 100644 sound/usb/6fire/pcm.c + create mode 100644 sound/usb/6fire/pcm.h +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Already up-to-date. +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + Documentation/cpu-freq/governors.txt | 11 +++++++++++ + drivers/cpufreq/cpufreq_conservative.c | 2 +- + drivers/cpufreq/cpufreq_ondemand.c | 17 +++++++++++------ + 3 files changed, 23 insertions(+), 7 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + drivers/block/virtio_blk.c | 88 ++++++++++++++++++++++++++++++++++++++----- + include/linux/module.h | 28 +++++++------ + include/linux/moduleparam.h | 7 ++- + kernel/params.c | 9 +++- + 4 files changed, 103 insertions(+), 29 deletions(-) +Merging input/next +$ git merge input/next +Auto-merging arch/arm/mach-s5pv210/mach-goni.c +Auto-merging drivers/hid/hid-input.c +Auto-merging drivers/input/input.c +Auto-merging drivers/input/touchscreen/ads7846.c +Removing drivers/input/touchscreen/qt602240_ts.c +Auto-merging drivers/media/dvb/dvb-usb/dvb-usb-remote.c +Auto-merging include/linux/i2c/atmel_mxt_ts.h +Merge made by recursive. + arch/arm/mach-s5pv210/mach-goni.c | 8 +- + drivers/hid/hid-input.c | 4 +- + drivers/input/input-polldev.c | 4 +- + drivers/input/input.c | 55 +- + drivers/input/keyboard/lm8323.c | 15 +- + drivers/input/keyboard/max7359_keypad.c | 17 +- + drivers/input/keyboard/mcs_touchkey.c | 57 +- + drivers/input/keyboard/omap4-keypad.c | 74 +- + drivers/input/misc/ad714x-i2c.c | 17 +- + drivers/input/misc/ad714x-spi.c | 17 +- + drivers/input/misc/adxl34x-i2c.c | 16 +- + drivers/input/misc/adxl34x-spi.c | 20 +- + drivers/input/misc/ati_remote2.c | 4 +- + drivers/input/misc/uinput.c | 48 +- + drivers/input/mouse/synaptics_i2c.c | 16 +- + drivers/input/sparse-keymap.c | 4 +- + drivers/input/touchscreen/Kconfig | 34 +- + drivers/input/touchscreen/Makefile | 3 +- + drivers/input/touchscreen/ad7877.c | 19 +- + drivers/input/touchscreen/ad7879-spi.c | 17 +- + drivers/input/touchscreen/ads7846.c | 16 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 1214 +++++++++++++++++ + drivers/input/touchscreen/qt602240_ts.c | 1406 -------------------- + drivers/input/touchscreen/wm831x-ts.c | 363 +++++ + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 109 +- + drivers/media/rc/rc-main.c | 4 +- + .../linux/i2c/{qt602240_ts.h => atmel_mxt_ts.h} | 34 +- + include/linux/i2c/mcs.h | 1 + + include/linux/input-polldev.h | 4 +- + include/linux/input.h | 12 +- + include/linux/mfd/wm831x/pdata.h | 3 +- + 31 files changed, 1937 insertions(+), 1678 deletions(-) + create mode 100644 drivers/input/touchscreen/atmel_mxt_ts.c + delete mode 100644 drivers/input/touchscreen/qt602240_ts.c + create mode 100644 drivers/input/touchscreen/wm831x-ts.c + rename include/linux/i2c/{qt602240_ts.h => atmel_mxt_ts.h} (50%) +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging block/blk-core.c +Merge made by recursive. + block/blk-core.c | 85 +++++---- + block/blk-flush.c | 441 +++++++++++++++++++++++++++++++-------------- + block/blk.h | 12 +- + block/cfq-iosched.c | 18 +- + block/elevator.c | 9 +- + include/linux/blk_types.h | 2 + + include/linux/blkdev.h | 23 ++- + include/linux/elevator.h | 1 + + 8 files changed, 393 insertions(+), 198 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging drivers/md/dm-mpath.c +Merge made by recursive. + Documentation/device-mapper/dm-flakey.txt | 18 +++ + drivers/md/Kconfig | 6 + + drivers/md/Makefile | 1 + + drivers/md/dm-crypt.c | 19 ++- + drivers/md/dm-flakey.c | 212 +++++++++++++++++++++++++++++ + drivers/md/dm-ioctl.c | 38 ++++-- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 17 ++- + drivers/md/dm-snap.c | 2 +- + include/linux/dm-ioctl.h | 12 ++- + 10 files changed, 298 insertions(+), 29 deletions(-) + create mode 100644 Documentation/device-mapper/dm-flakey.txt + create mode 100644 drivers/md/dm-flakey.c +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/leds/led-triggers.c | 20 + + drivers/power/Kconfig | 14 + + drivers/power/bq20z75.c | 278 +++++++++++-- + drivers/power/bq27x00_battery.c | 725 +++++++++++++++++++++++++-------- + drivers/power/ds2782_battery.c | 1 + + drivers/power/power_supply_core.c | 4 +- + drivers/power/power_supply_leds.c | 19 + + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/twl4030_charger.c | 25 +- + drivers/power/z2_battery.c | 1 + + include/linux/leds.h | 3 + + include/linux/power/bq20z75.h | 39 ++ + include/linux/power/bq27x00_battery.h | 19 + + include/linux/power_supply.h | 47 +++ + 14 files changed, 981 insertions(+), 216 deletions(-) + create mode 100644 include/linux/power/bq20z75.h + create mode 100644 include/linux/power/bq27x00_battery.h +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 96f2c90] Merge remote-tracking branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/card/block.c +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/mmc/host/msm_sdcc.c +Auto-merging drivers/mmc/host/sdhci-s3c.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-devices-mmc | 21 + + arch/arm/mach-mxs/include/mach/mmc.h | 18 + + arch/arm/plat-mxc/include/mach/esdhc.h | 12 +- + drivers/mmc/card/Kconfig | 3 +- + drivers/mmc/card/block.c | 1 + + drivers/mmc/card/mmc_test.c | 271 ++++++++- + drivers/mmc/core/Makefile | 3 +- + drivers/mmc/core/core.c | 9 +- + drivers/mmc/core/core.h | 2 + + drivers/mmc/core/host.c | 5 +- + drivers/mmc/core/mmc.c | 86 +++- + drivers/mmc/core/quirks.c | 85 +++ + drivers/mmc/core/sd.c | 1 + + drivers/mmc/core/sdio.c | 1 + + drivers/mmc/host/Kconfig | 11 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 19 +- + drivers/mmc/host/cb710-mmc.c | 2 +- + drivers/mmc/host/dw_mmc.c | 26 +- + drivers/mmc/host/dw_mmc.h | 2 +- + drivers/mmc/host/msm_sdcc.c | 8 - + drivers/mmc/host/mxcmmc.c | 183 ++++--- + drivers/mmc/host/mxs-mmc.c | 874 +++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-esdhc-imx.c | 134 ++++- + drivers/mmc/host/sdhci-esdhc.h | 1 - + drivers/mmc/host/sdhci-of-esdhc.c | 3 +- + drivers/mmc/host/sdhci-pci.c | 12 +- + drivers/mmc/host/sdhci-s3c.c | 3 + + drivers/mmc/host/sdhci-tegra.c | 6 +- + drivers/mmc/host/sh_mmcif.c | 62 +- + drivers/mmc/host/tmio_mmc.c | 86 ++-- + drivers/mmc/host/via-sdmmc.c | 3 - + include/linux/mmc/card.h | 6 + + include/linux/mmc/dw_mmc.h | 8 +- + include/linux/mmc/mmc.h | 3 + + 35 files changed, 1722 insertions(+), 249 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-mmc + create mode 100644 arch/arm/mach-mxs/include/mach/mmc.h + create mode 100644 drivers/mmc/core/quirks.c + create mode 100644 drivers/mmc/host/mxs-mmc.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging drivers/tty/serial/kgdboc.c +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 4 ++-- + drivers/misc/kgdbts.c | 2 +- + drivers/tty/serial/kgdboc.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slab.h | 1 - + mm/slab.c | 16 +++---------- + mm/slob.c | 6 ----- + mm/slub.c | 55 +++++++++++++++++++++++-------------------------- + 4 files changed, 30 insertions(+), 48 deletions(-) +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 +Resolved 'arch/arm/mach-imx/mach-mx27_3ds.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mach-pcm038.c' using previous resolution. +Resolved 'arch/arm/mach-mx3/mach-mx31_3ds.c' using previous resolution. +Resolved 'arch/arm/mach-mx3/mach-mx31moboard.c' using previous resolution. +Auto-merging arch/arm/mach-imx/mach-mx27_3ds.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx27_3ds.c +Auto-merging arch/arm/mach-imx/mach-pcm038.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-pcm038.c +Auto-merging arch/arm/mach-mx3/mach-mx31_3ds.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31_3ds.c +Auto-merging arch/arm/mach-mx3/mach-mx31moboard.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31moboard.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/mmc/host/tmio_mmc.c +Auto-merging include/linux/mfd/wm831x/pdata.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6bfe8f6] Merge remote-tracking branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwmon/twl4030-madc-hwmon | 45 ++ + arch/arm/mach-imx/mach-mx27_3ds.c | 7 +- + arch/arm/mach-imx/mach-pcm038.c | 6 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 9 +- + arch/arm/mach-mx3/mach-mx31moboard.c | 6 +- + arch/arm/mach-omap2/board-4430sdp.c | 7 + + arch/arm/mach-omap2/board-omap4panda.c | 7 + + arch/x86/platform/olpc/olpc-xo1.c | 42 +- + drivers/dma/timb_dma.c | 3 +- + drivers/gpio/janz-ttl.c | 3 +- + drivers/gpio/rdc321x-gpio.c | 3 +- + drivers/gpio/timbgpio.c | 6 +- + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/jz4740-hwmon.c | 4 +- + drivers/hwmon/twl4030-madc-hwmon.c | 157 +++++++ + drivers/i2c/busses/i2c-ocores.c | 3 +- + drivers/i2c/busses/i2c-xiic.c | 3 +- + drivers/input/misc/twl4030-vibra.c | 3 +- + drivers/leds/leds-mc13783.c | 7 +- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/video/timblogiw.c | 3 +- + drivers/mfd/Kconfig | 17 + + drivers/mfd/Makefile | 4 +- + drivers/mfd/ab3100-core.c | 10 +- + drivers/mfd/ab3550-core.c | 12 +- + drivers/mfd/ab8500-core.c | 56 ++- + drivers/mfd/ab8500-debugfs.c | 6 +- + drivers/mfd/ab8500-gpadc.c | 296 ++++++++++++ + drivers/mfd/ab8500-sysctrl.c | 80 ++++ + drivers/mfd/adp5520.c | 15 +- + drivers/mfd/asic3.c | 14 +- + drivers/mfd/cs5535-mfd.c | 37 ++ + drivers/mfd/davinci_voicecodec.c | 8 +- + drivers/mfd/htc-pasic3.c | 7 +- + drivers/mfd/janz-cmodio.c | 3 +- + drivers/mfd/jz4740-adc.c | 4 - + drivers/mfd/max8998.c | 4 +- + drivers/mfd/mc13xxx-core.c | 21 +- + drivers/mfd/mfd-core.c | 135 +++++- + drivers/mfd/pcf50633-core.c | 24 +- + drivers/mfd/rdc321x-southbridge.c | 4 +- + drivers/mfd/sh_mobile_sdhi.c | 4 +- + drivers/mfd/t7l66xb.c | 13 +- + drivers/mfd/tc6387xb.c | 7 +- + drivers/mfd/tc6393xb.c | 25 +- + drivers/mfd/timberdale.c | 81 ++--- + drivers/mfd/tps6586x.c | 36 +- + drivers/mfd/twl-core.c | 8 +- + drivers/mfd/twl4030-codec.c | 6 +- + drivers/mfd/twl4030-madc.c | 802 ++++++++++++++++++++++++++++++++ + drivers/mfd/ucb1x00-ts.c | 17 +- + drivers/mfd/vx855.c | 1 + + drivers/mfd/wl1273-core.c | 8 +- + drivers/mfd/wm831x-irq.c | 44 ++- + drivers/mfd/wm831x-spi.c | 24 +- + drivers/mfd/wm8400-core.c | 2 +- + drivers/mfd/wm8994-core.c | 23 + + drivers/mfd/wm8994-irq.c | 8 +- + drivers/mmc/host/tmio_mmc.c | 34 +- + drivers/mtd/nand/tmio_nand.c | 11 +- + drivers/net/can/janz-ican3.c | 3 +- + drivers/net/ks8842.c | 3 +- + drivers/power/jz4740-battery.c | 4 +- + drivers/regulator/ab3100.c | 3 +- + drivers/regulator/mc13783-regulator.c | 7 +- + drivers/regulator/mc13892-regulator.c | 7 +- + drivers/regulator/twl-regulator.c | 24 +- + drivers/spi/xilinx_spi.c | 3 +- + drivers/usb/host/ohci-tmio.c | 8 +- + drivers/video/tmiofb.c | 28 +- + drivers/w1/masters/ds1wm.c | 6 +- + drivers/watchdog/rdc321x_wdt.c | 3 +- + include/linux/i2c/twl.h | 2 + + include/linux/i2c/twl4030-madc.h | 141 ++++++ + include/linux/mfd/ab8500-gpadc.h | 28 ++ + include/linux/mfd/ab8500.h | 4 +- + include/linux/mfd/ab8500/sysctrl.h | 254 ++++++++++ + include/linux/mfd/abx500.h | 1 - + include/linux/mfd/core.h | 54 ++- + include/linux/mfd/mc13xxx.h | 3 +- + include/linux/mfd/wm831x/pdata.h | 6 + + include/linux/mfd/wm8994/core.h | 1 + + sound/soc/codecs/cq93vc.c | 3 +- + sound/soc/codecs/twl4030.c | 6 +- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm8400.c | 3 +- + sound/soc/davinci/davinci-vcif.c | 2 +- + 89 files changed, 2476 insertions(+), 385 deletions(-) + create mode 100644 Documentation/hwmon/twl4030-madc-hwmon + create mode 100644 drivers/hwmon/twl4030-madc-hwmon.c + create mode 100644 drivers/mfd/ab8500-gpadc.c + create mode 100644 drivers/mfd/ab8500-sysctrl.c + create mode 100644 drivers/mfd/twl4030-madc.c + create mode 100644 include/linux/i2c/twl4030-madc.h + create mode 100644 include/linux/mfd/ab8500-gpadc.h + create mode 100644 include/linux/mfd/ab8500/sysctrl.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/drm_info.c +Auto-merging drivers/gpu/drm/drm_irq.c +Removing drivers/gpu/drm/i830/Makefile +Removing drivers/gpu/drm/i830/i830_dma.c +Removing drivers/gpu/drm/i830/i830_drv.c +Removing drivers/gpu/drm/i830/i830_drv.h +Removing drivers/gpu/drm/i830/i830_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c +Auto-merging drivers/gpu/drm/radeon/evergreen_blit_kms.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/r600_blit_kms.c +Auto-merging drivers/gpu/drm/radeon/r600_cs.c +Auto-merging drivers/gpu/drm/radeon/r600d.h +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon_display.c +Auto-merging drivers/gpu/drm/radeon/radeon_fb.c +Auto-merging drivers/gpu/drm/radeon/radeon_mode.h +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/radeon/rv770.c +Auto-merging include/drm/drmP.h +Removing include/drm/i830_drm.h +Merge made by recursive. + drivers/gpu/drm/Kconfig | 47 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/drm_crtc.c | 33 + + drivers/gpu/drm/drm_drv.c | 48 +- + drivers/gpu/drm/drm_edid.c | 19 +- + drivers/gpu/drm/drm_edid_modes.h | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 5 + + drivers/gpu/drm/drm_gem.c | 5 +- + drivers/gpu/drm/drm_hashtab.c | 27 +- + drivers/gpu/drm/drm_info.c | 27 +- + drivers/gpu/drm/drm_ioctl.c | 115 +-- + drivers/gpu/drm/drm_irq.c | 14 +- + drivers/gpu/drm/drm_mm.c | 570 ++++++----- + drivers/gpu/drm/drm_modes.c | 6 +- + drivers/gpu/drm/drm_pci.c | 205 ++++- + drivers/gpu/drm/drm_platform.c | 75 ++- + drivers/gpu/drm/drm_stub.c | 21 +- + drivers/gpu/drm/drm_usb.c | 117 ++ + drivers/gpu/drm/i810/i810_dma.c | 18 +- + drivers/gpu/drm/i810/i810_drv.c | 20 +- + drivers/gpu/drm/i830/Makefile | 8 - + drivers/gpu/drm/i830/i830_dma.c | 1560 --------------------------- + drivers/gpu/drm/i830/i830_drv.c | 107 -- + drivers/gpu/drm/i830/i830_drv.h | 295 ----- + drivers/gpu/drm/i830/i830_irq.c | 186 ---- + drivers/gpu/drm/i915/i915_drv.c | 23 +- + drivers/gpu/drm/i915/i915_drv.h | 7 + + drivers/gpu/drm/i915/i915_gem.c | 103 ++- + drivers/gpu/drm/i915/intel_sdvo.c | 2 +- + drivers/gpu/drm/mga/mga_dma.c | 2 +- + drivers/gpu/drm/mga/mga_drv.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 41 +- + drivers/gpu/drm/nouveau/nouveau_bios.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 255 +++-- + drivers/gpu/drm/nouveau/nouveau_channel.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 75 ++- + drivers/gpu/drm/nouveau/nouveau_dma.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_dma.h | 7 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 2 - + drivers/gpu/drm/nouveau/nouveau_drv.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 45 +- + drivers/gpu/drm/nouveau/nouveau_fb.h | 3 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 192 +++-- + drivers/gpu/drm/nouveau/nouveau_gem.c | 44 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 139 ++- + drivers/gpu/drm/nouveau/nouveau_mm.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_notifier.c | 23 +- + drivers/gpu/drm/nouveau/nouveau_object.c | 46 +- + drivers/gpu/drm/nouveau/nouveau_ramht.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 369 ++++++- + drivers/gpu/drm/nouveau/nouveau_state.c | 50 +- + drivers/gpu/drm/nouveau/nouveau_temp.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_vm.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_vm.h | 19 +- + drivers/gpu/drm/nouveau/nv04_crtc.c | 2 +- + drivers/gpu/drm/nouveau/nv04_fifo.c | 17 +- + drivers/gpu/drm/nouveau/nv17_tv.c | 4 +- + drivers/gpu/drm/nouveau/nv17_tv.h | 2 +- + drivers/gpu/drm/nouveau/nv17_tv_modes.c | 2 +- + drivers/gpu/drm/nouveau/nv40_fb.c | 59 +- + drivers/gpu/drm/nouveau/nv50_crtc.c | 164 ++-- + drivers/gpu/drm/nouveau/nv50_cursor.c | 8 +- + drivers/gpu/drm/nouveau/nv50_dac.c | 6 +- + drivers/gpu/drm/nouveau/nv50_display.c | 191 +++- + drivers/gpu/drm/nouveau/nv50_display.h | 42 +- + drivers/gpu/drm/nouveau/nv50_evo.c | 290 ++++-- + drivers/gpu/drm/nouveau/nv50_evo.h | 8 +- + drivers/gpu/drm/nouveau/nv50_fb.c | 51 +- + drivers/gpu/drm/nouveau/nv50_fifo.c | 3 +- + drivers/gpu/drm/nouveau/nv50_gpio.c | 13 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 54 +- + drivers/gpu/drm/nouveau/nv50_instmem.c | 6 +- + drivers/gpu/drm/nouveau/nv50_sor.c | 6 +- + drivers/gpu/drm/nouveau/nv50_vm.c | 20 +- + drivers/gpu/drm/nouveau/nv50_vram.c | 65 +- + drivers/gpu/drm/nouveau/nvc0_fifo.c | 17 +- + drivers/gpu/drm/nouveau/nvc0_graph.c | 20 +- + drivers/gpu/drm/nouveau/nvc0_instmem.c | 2 +- + drivers/gpu/drm/nouveau/nvc0_vm.c | 6 +- + drivers/gpu/drm/nouveau/nvc0_vram.c | 62 +- + drivers/gpu/drm/r128/r128_drv.c | 14 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 8 +- + drivers/gpu/drm/radeon/evergreen_blit_kms.c | 2 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 31 + + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/r600_audio.c | 1 + + drivers/gpu/drm/radeon/r600_blit_kms.c | 2 +- + drivers/gpu/drm/radeon/r600_cs.c | 400 +++++-- + drivers/gpu/drm/radeon/r600_hdmi.c | 1 + + drivers/gpu/drm/radeon/r600d.h | 5 + + drivers/gpu/drm/radeon/radeon.h | 90 +-- + drivers/gpu/drm/radeon/radeon_asic.h | 77 ++- + drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- + drivers/gpu/drm/radeon/radeon_cp.c | 4 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 4 +- + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_drv.c | 52 +- + drivers/gpu/drm/radeon/radeon_fb.c | 12 +- + drivers/gpu/drm/radeon/radeon_gart.c | 38 +- + drivers/gpu/drm/radeon/radeon_gem.c | 96 ++- + drivers/gpu/drm/radeon/radeon_kms.c | 15 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- + drivers/gpu/drm/radeon/radeon_mode.h | 1 + + drivers/gpu/drm/radeon/radeon_object.c | 30 +- + drivers/gpu/drm/radeon/radeon_object.h | 7 +- + drivers/gpu/drm/radeon/radeon_ring.c | 4 +- + drivers/gpu/drm/radeon/radeon_test.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 10 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/savage/savage_drv.c | 14 +- + drivers/gpu/drm/sis/sis_drv.c | 13 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 13 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo.c | 3 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 34 +- + drivers/gpu/drm/ttm/ttm_tt.c | 12 +- + drivers/gpu/drm/via/via_drv.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- + include/drm/Kbuild | 1 - + include/drm/drm.h | 4 + + include/drm/drmP.h | 120 ++- + include/drm/drm_crtc.h | 13 +- + include/drm/drm_hashtab.h | 6 +- + include/drm/drm_mm.h | 49 +- + include/drm/drm_mode.h | 29 + + include/drm/drm_usb.h | 15 + + include/drm/i830_drm.h | 342 ------ + include/drm/nouveau_drm.h | 1 + + include/drm/radeon_drm.h | 1 + + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/drm/ttm/ttm_page_alloc.h | 8 +- + 135 files changed, 3500 insertions(+), 4345 deletions(-) + create mode 100644 drivers/gpu/drm/drm_usb.c + delete mode 100644 drivers/gpu/drm/i830/Makefile + delete mode 100644 drivers/gpu/drm/i830/i830_dma.c + delete mode 100644 drivers/gpu/drm/i830/i830_drv.c + delete mode 100644 drivers/gpu/drm/i830/i830_drv.h + delete mode 100644 drivers/gpu/drm/i830/i830_irq.c + create mode 100644 include/drm/drm_usb.h + delete mode 100644 include/drm/i830_drm.h +Merging fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/board-3430sdp.c +Auto-merging arch/arm/mach-omap2/board-devkit8000.c +Auto-merging arch/arm/mach-omap2/board-igep0020.c +Auto-merging arch/arm/mach-omap2/board-omap3evm.c +Auto-merging arch/arm/mach-omap2/board-omap3pandora.c +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c +Auto-merging arch/arm/mach-omap2/clock2430_data.c +Auto-merging arch/arm/mach-omap2/clock3xxx_data.c +Auto-merging arch/arm/mach-omap2/clock44xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2420_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2430_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +Merge made by recursive. + MAINTAINERS | 4 +- + arch/arm/mach-omap2/board-3430sdp.c | 8 +- + arch/arm/mach-omap2/board-cm-t35.c | 4 +- + arch/arm/mach-omap2/board-devkit8000.c | 12 +- + arch/arm/mach-omap2/board-igep0020.c | 10 +- + arch/arm/mach-omap2/board-omap3beagle.c | 12 +- + arch/arm/mach-omap2/board-omap3evm.c | 12 +- + arch/arm/mach-omap2/board-omap3pandora.c | 7 +- + arch/arm/mach-omap2/board-omap3stalker.c | 12 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 4 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 12 +- + arch/arm/mach-omap2/clock2420_data.c | 8 +- + arch/arm/mach-omap2/clock2430_data.c | 8 +- + arch/arm/mach-omap2/clock3xxx_data.c | 14 +- + arch/arm/mach-omap2/clock44xx_data.c | 15 +- + arch/arm/mach-omap2/display.c | 59 +++- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 13 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 12 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 23 +- + arch/arm/plat-omap/include/plat/display.h | 5 + + drivers/video/omap2/displays/panel-generic-dpi.c | 25 ++ + drivers/video/omap2/dss/Kconfig | 6 +- + drivers/video/omap2/dss/core.c | 450 ++-------------------- + drivers/video/omap2/dss/dispc.c | 160 +++++--- + drivers/video/omap2/dss/dpi.c | 37 +- + drivers/video/omap2/dss/dsi.c | 116 +++++- + drivers/video/omap2/dss/dss.c | 459 +++++++++++++++++++--- + drivers/video/omap2/dss/dss.h | 56 ++-- + drivers/video/omap2/dss/manager.c | 4 +- + drivers/video/omap2/dss/overlay.c | 4 +- + drivers/video/omap2/dss/rfbi.c | 128 ++++--- + drivers/video/omap2/dss/sdi.c | 26 +- + drivers/video/omap2/dss/venc.c | 122 ++++-- + drivers/video/omap2/omapfb/Kconfig | 6 +- + drivers/video/omap2/omapfb/omapfb-main.c | 23 +- + 35 files changed, 1080 insertions(+), 796 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merging fs/file_table.c +Auto-merging fs/open.c +Auto-merging include/linux/fs.h +Auto-merging security/security.c +Merge made by recursive. + fs/cachefiles/namei.c | 52 +++++- + fs/file_table.c | 5 +- + fs/open.c | 3 +- + include/linux/fs.h | 23 ++- + include/linux/ima.h | 6 - + include/linux/xattr.h | 2 + + security/integrity/ima/ima.h | 3 +- + security/integrity/ima/ima_api.c | 13 +- + security/integrity/ima/ima_iint.c | 5 - + security/integrity/ima/ima_main.c | 136 ++------------ + security/security.c | 3 + + security/selinux/ss/avtab.h | 1 - + security/selinux/ss/ebitmap.h | 1 - + security/smack/smack.h | 17 +- + security/smack/smack_access.c | 52 ++++-- + security/smack/smack_lsm.c | 282 ++++++++++++++++++++++++----- + security/smack/smackfs.c | 370 +++++++++++++++++++++++++------------ + security/tomoyo/file.c | 5 +- + 18 files changed, 632 insertions(+), 347 deletions(-) +Merging selinux/master +$ git merge selinux/master +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/xattr.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext3/namei.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/xfs/linux-2.6/xfs_iops.c +Auto-merging include/linux/ext3_fs.h +Auto-merging include/linux/security.h +Auto-merging kernel/sysctl.c +Auto-merging security/capability.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/ss/policydb.c +Auto-merging security/selinux/xfrm.c +Auto-merging security/smack/smack_lsm.c +Merge made by recursive. + fs/btrfs/inode.c | 13 +- + fs/btrfs/xattr.c | 6 +- + fs/btrfs/xattr.h | 3 +- + fs/ext2/ext2.h | 2 +- + fs/ext2/ialloc.c | 5 +- + fs/ext2/namei.c | 8 +- + fs/ext2/xattr.h | 6 +- + fs/ext2/xattr_security.c | 5 +- + fs/ext3/ialloc.c | 5 +- + fs/ext3/namei.c | 8 +- + fs/ext3/xattr.h | 4 +- + fs/ext3/xattr_security.c | 5 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/xattr.h | 4 +- + fs/ext4/xattr_security.c | 5 +- + fs/gfs2/inode.c | 7 +- + fs/jffs2/dir.c | 9 +- + fs/jffs2/nodelist.h | 2 +- + fs/jffs2/security.c | 5 +- + fs/jffs2/write.c | 18 ++-- + fs/jffs2/xattr.h | 5 +- + fs/jfs/jfs_xattr.h | 5 +- + fs/jfs/namei.c | 8 +- + fs/jfs/xattr.c | 6 +- + fs/ocfs2/namei.c | 4 +- + fs/ocfs2/refcounttree.c | 3 +- + fs/ocfs2/xattr.c | 10 +- + fs/ocfs2/xattr.h | 4 +- + fs/proc/proc_sysctl.c | 1 - + fs/reiserfs/namei.c | 9 +- + fs/reiserfs/xattr_security.c | 3 +- + fs/xfs/linux-2.6/xfs_iops.c | 9 +- + include/linux/ext3_fs.h | 3 +- + include/linux/reiserfs_xattr.h | 2 + + include/linux/security.h | 22 +--- + kernel/sysctl.c | 5 - + mm/shmem.c | 9 +- + security/capability.c | 9 +- + security/security.c | 11 +- + security/selinux/hooks.c | 237 ++++++++++++----------------------- + security/selinux/include/classmap.h | 3 +- + security/selinux/include/security.h | 8 +- + security/selinux/ss/avtab.h | 22 ++-- + security/selinux/ss/policydb.c | 130 +++++++++++++++++++ + security/selinux/ss/policydb.h | 14 ++- + security/selinux/ss/services.c | 45 +++++-- + security/selinux/xfrm.c | 2 +- + security/smack/smack_lsm.c | 5 +- + 48 files changed, 406 insertions(+), 310 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Auto-merging drivers/watchdog/Kconfig +Merge made by recursive. + arch/mips/include/asm/mach-jz4740/platform.h | 1 + + arch/mips/jz4740/platform.c | 16 + + drivers/watchdog/Kconfig | 34 ++- + drivers/watchdog/Makefile | 5 + + drivers/watchdog/alim1535_wdt.c | 10 +- + drivers/watchdog/alim7101_wdt.c | 2 +- + drivers/watchdog/bcm47xx_wdt.c | 4 +- + drivers/watchdog/bfin_wdt.c | 4 +- + drivers/watchdog/booke_wdt.c | 19 +- + drivers/watchdog/cpwd.c | 38 +- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/hpwdt.c | 2 +- + drivers/watchdog/i6300esb.c | 2 +- + drivers/watchdog/iTCO_wdt.c | 4 +- + drivers/watchdog/intel_scu_watchdog.c | 572 ++++++++++++++++++++++++++ + drivers/watchdog/intel_scu_watchdog.h | 66 +++ + drivers/watchdog/it8712f_wdt.c | 2 +- + drivers/watchdog/it87_wdt.c | 28 +- + drivers/watchdog/jz4740_wdt.c | 322 +++++++++++++++ + drivers/watchdog/machzwd.c | 2 +- + drivers/watchdog/max63xx_wdt.c | 2 +- + drivers/watchdog/mpc8xxx_wdt.c | 6 +- + drivers/watchdog/mpcore_wdt.c | 2 +- + drivers/watchdog/mtx-1_wdt.c | 14 +- + drivers/watchdog/nv_tco.c | 2 +- + drivers/watchdog/omap_wdt.h | 2 +- + drivers/watchdog/pc87413_wdt.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/pnx4008_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/sbc8360.c | 2 +- + drivers/watchdog/sbc_fitpc2_wdt.c | 2 +- + drivers/watchdog/sch311x_wdt.c | 2 +- + drivers/watchdog/smsc37b787_wdt.c | 4 +- + drivers/watchdog/softdog.c | 2 +- + drivers/watchdog/sp5100_tco.c | 2 +- + drivers/watchdog/ts72xx_wdt.c | 2 +- + drivers/watchdog/w83697ug_wdt.c | 6 +- + drivers/watchdog/wdt.c | 2 +- + drivers/watchdog/wdt977.c | 2 +- + drivers/watchdog/wdt_pci.c | 6 +- + drivers/watchdog/xen_wdt.c | 359 ++++++++++++++++ + include/xen/interface/sched.h | 34 ++ + 43 files changed, 1501 insertions(+), 95 deletions(-) + create mode 100644 drivers/watchdog/intel_scu_watchdog.c + create mode 100644 drivers/watchdog/intel_scu_watchdog.h + create mode 100644 drivers/watchdog/jz4740_wdt.c + create mode 100644 drivers/watchdog/xen_wdt.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/intel-iommu.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Merge made by recursive. + fs/exofs/dir.c | 15 ++++++--------- + fs/exofs/exofs.h | 2 ++ + fs/exofs/file.c | 5 ----- + fs/exofs/inode.c | 45 +++++++++++++++++++++++++++++++++++++-------- + fs/exofs/super.c | 18 ++++++++++++++++++ + 5 files changed, 63 insertions(+), 22 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 +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'fs/eventpoll.c' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Makefile +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/dma/timb_dma.c +Auto-merging drivers/gpu/drm/radeon/evergreen.c +Auto-merging drivers/gpu/drm/radeon/r100.c +Auto-merging drivers/gpu/drm/radeon/r300.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/radeon_ring.c +Auto-merging drivers/gpu/drm/radeon/rs690.c +Auto-merging drivers/gpu/drm/radeon/rv770.c +Auto-merging drivers/net/qla3xxx.c +Auto-merging drivers/net/sungem.h +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/usb/core/hub.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/eventpoll.c +CONFLICT (content): Merge conflict in fs/eventpoll.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/fuse/cuse.c +Auto-merging fs/ocfs2/dir.c +Auto-merging mm/memory.c +Auto-merging mm/mempolicy.c +Auto-merging mm/shmem.c +Auto-merging net/core/dev_addr_lists.c +Auto-merging net/mac80211/tx.c +Auto-merging sound/pci/au88x0/au88x0_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f2af6b2] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroups/memory.txt | 5 +- + Documentation/device-mapper/dm-crypt.txt | 2 +- + Documentation/filesystems/romfs.txt | 3 +- + Documentation/kbuild/kbuild.txt | 2 +- + Documentation/kbuild/makefiles.txt | 3 +- + Documentation/kvm/api.txt | 96 ++++++++++++++-------------- + Documentation/sysctl/kernel.txt | 2 +- + MAINTAINERS | 15 +++-- + Makefile | 2 +- + arch/alpha/include/asm/cacheflush.h | 2 +- + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/arm/plat-omap/Kconfig | 2 +- + arch/avr32/mm/cache.c | 2 +- + arch/cris/arch-v10/mm/init.c | 2 +- + arch/ia64/include/asm/perfmon.h | 2 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/oprofile/op_model_p4.c | 2 +- + arch/xtensa/configs/s6105_defconfig | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/block/smart1,2.h | 2 +- + drivers/bluetooth/btusb.c | 4 +- + drivers/cpuidle/sysfs.c | 2 +- + drivers/dma/coh901318.c | 4 +- + drivers/dma/shdma.c | 2 +- + drivers/dma/timb_dma.c | 2 +- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 69 +++++++++++++-------- + drivers/firmware/dcdbas.c | 4 +- + drivers/gpu/drm/drm_sman.c | 4 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/r100.c | 10 ++-- + drivers/gpu/drm/radeon/r300.c | 4 +- + drivers/gpu/drm/radeon/r420.c | 4 +- + drivers/gpu/drm/radeon/r520.c | 4 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/radeon_ring.c | 2 +- + drivers/gpu/drm/radeon/rs400.c | 4 +- + drivers/gpu/drm/radeon/rs600.c | 4 +- + drivers/gpu/drm/radeon/rs690.c | 4 +- + drivers/gpu/drm/radeon/rv515.c | 4 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/isdn/mISDN/hwchannel.c | 6 +- + drivers/message/i2o/i2o_config.c | 3 +- + drivers/mtd/nand/mxc_nand.c | 5 +- + drivers/net/atl1c/atl1c.h | 4 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/sungem.h | 2 +- + drivers/platform/x86/acer-wmi.c | 1 - + drivers/scsi/aic7xxx/aic79xx.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/osst.c | 10 +-- + drivers/scsi/qla4xxx/ql4_isr.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/target/target_core_hba.c | 1 - + drivers/tty/hvc/hvcs.c | 2 +- + drivers/tty/serial/pch_uart.c | 1 - + drivers/usb/core/hub.c | 2 +- + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/wusbcore/rh.c | 2 +- + drivers/watchdog/sbc_epx_c3.c | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/dcache.c | 4 +- + fs/direct-io.c | 6 +- + fs/eventpoll.c | 12 ++-- + fs/ext4/extents.c | 4 +- + fs/fuse/cuse.c | 2 +- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/notify/inotify/inotify_user.c | 2 +- + fs/ocfs2/dir.c | 2 +- + include/asm-generic/user.h | 4 +- + include/linux/mmzone.h | 2 +- + init/Kconfig | 6 +- + kernel/trace/ring_buffer.c | 2 +- + mm/memory.c | 6 +- + mm/mempolicy.c | 2 +- + mm/shmem.c | 2 +- + net/core/dev_addr_lists.c | 4 +- + net/ipv6/inet6_hashtables.c | 2 +- + net/mac80211/tx.c | 2 +- + sound/pci/au88x0/au88x0.h | 4 +- + sound/pci/au88x0/au88x0_core.c | 4 +- + 84 files changed, 221 insertions(+), 207 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging drivers/acpi/sleep.c +Auto-merging drivers/net/e1000e/netdev.c +Auto-merging drivers/scsi/Makefile +Auto-merging drivers/scsi/scsi_priv.h +Auto-merging drivers/usb/core/hub.c +Auto-merging include/acpi/acpi_bus.h +Merge made by recursive. + Documentation/ABI/testing/sysfs-devices-power | 20 +- + Documentation/power/devices.txt | 94 +++++++--- + Documentation/power/runtime_pm.txt | 13 +- + Documentation/power/states.txt | 12 +- + arch/x86/kernel/apm_32.c | 5 +- + arch/x86/xen/Kconfig | 2 +- + drivers/acpi/Kconfig | 1 - + drivers/acpi/bus.c | 23 +-- + drivers/acpi/sleep.c | 4 +- + drivers/base/power/Makefile | 3 +- + drivers/base/power/main.c | 175 ++++++++++--------- + drivers/base/power/opp.c | 2 +- + drivers/base/power/power.h | 21 +-- + drivers/base/power/runtime.c | 37 +++-- + drivers/base/power/sysfs.c | 78 ++++++--- + drivers/base/power/trace.c | 6 +- + drivers/base/power/wakeup.c | 109 ++++++++---- + drivers/net/e1000e/netdev.c | 8 +- + drivers/net/pch_gbe/pch_gbe_main.c | 2 +- + drivers/pci/pci-driver.c | 4 +- + drivers/scsi/Makefile | 2 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/usb/core/hcd-pci.c | 4 +- + drivers/usb/core/hub.c | 10 +- + include/acpi/acpi_bus.h | 2 +- + include/linux/device.h | 1 + + include/linux/pm.h | 19 +- + include/linux/pm_runtime.h | 6 + + include/linux/pm_wakeup.h | 8 +- + kernel/pm_qos_params.c | 24 +++ + kernel/power/Kconfig | 237 +++++++++++-------------- + kernel/power/main.c | 3 - + 33 files changed, 523 insertions(+), 416 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Recorded preimage for 'lib/Kconfig' +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'lib/Kconfig'. +[master bdee185] Merge remote-tracking branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + 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 +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/devicetree/next +$ git merge devicetree/devicetree/next +Auto-merging arch/sparc/kernel/pci_fire.c +Auto-merging arch/sparc/kernel/pci_schizo.c +Auto-merging arch/sparc/kernel/pci_sun4v.c +Auto-merging arch/sparc/kernel/time_32.c +Auto-merging arch/sparc/kernel/time_64.c +Auto-merging drivers/ata/sata_dwc_460ex.c +Auto-merging drivers/ata/sata_fsl.c +Auto-merging drivers/i2c/busses/i2c-ocores.c +Auto-merging drivers/i2c/i2c-core.c +Auto-merging drivers/spi/xilinx_spi.c +Auto-merging drivers/usb/host/ehci-xilinx-of.c +Auto-merging drivers/usb/host/ohci-hcd.c +Auto-merging drivers/watchdog/cpwd.c +Auto-merging drivers/watchdog/mpc8xxx_wdt.c +Auto-merging include/linux/device.h +Auto-merging include/linux/i2c.h +Merge made by recursive. + .../devicetree/bindings/serial/altera_jtaguart.txt | 4 + + .../devicetree/bindings/serial/altera_uart.txt | 7 + + .../devicetree/bindings/serio/altera_ps2.txt | 4 + + arch/microblaze/include/asm/pci-bridge.h | 12 + + arch/microblaze/include/asm/prom.h | 15 - + arch/microblaze/kernel/prom_parse.c | 77 ---- + arch/microblaze/pci/pci-common.c | 1 + + arch/microblaze/pci/pci_32.c | 1 + + arch/powerpc/include/asm/pci-bridge.h | 37 +- + arch/powerpc/include/asm/pci.h | 2 +- + arch/powerpc/include/asm/prom.h | 15 - + arch/powerpc/kernel/ibmebus.c | 404 +++++++++++++++++- + arch/powerpc/kernel/of_platform.c | 9 +- + arch/powerpc/kernel/pci-common.c | 12 +- + arch/powerpc/kernel/pci_32.c | 2 +- + arch/powerpc/kernel/pci_64.c | 6 +- + arch/powerpc/kernel/pci_dn.c | 9 +- + arch/powerpc/kernel/pci_of_scan.c | 4 +- + arch/powerpc/kernel/prom_parse.c | 84 ---- + arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 14 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 10 +- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 11 +- + arch/powerpc/platforms/82xx/ep8248e.c | 7 +- + arch/powerpc/platforms/83xx/suspend.c | 14 +- + arch/powerpc/platforms/cell/axon_msi.c | 11 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 9 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/powerpc/sysdev/axonram.c | 11 +- + arch/powerpc/sysdev/bestcomm/bestcomm.c | 9 +- + arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 9 +- + arch/powerpc/sysdev/fsl_msi.c | 13 +- + arch/powerpc/sysdev/fsl_pmc.c | 7 +- + arch/powerpc/sysdev/fsl_rio.c | 7 +- + arch/powerpc/sysdev/pmi.c | 9 +- + arch/powerpc/sysdev/qe_lib/qe.c | 7 +- + arch/sparc/include/asm/parport.h | 6 +- + arch/sparc/kernel/apc.c | 7 +- + arch/sparc/kernel/auxio_64.c | 7 +- + arch/sparc/kernel/central.c | 14 +- + arch/sparc/kernel/chmc.c | 19 +- + arch/sparc/kernel/pci_fire.c | 7 +- + arch/sparc/kernel/pci_psycho.c | 7 +- + arch/sparc/kernel/pci_sabre.c | 9 +- + arch/sparc/kernel/pci_schizo.c | 11 +- + arch/sparc/kernel/pci_sun4v.c | 7 +- + arch/sparc/kernel/pmc.c | 7 +- + arch/sparc/kernel/power.c | 6 +- + arch/sparc/kernel/time_32.c | 6 +- + arch/sparc/kernel/time_64.c | 18 +- + drivers/ata/pata_mpc52xx.c | 8 +- + drivers/ata/pata_of_platform.c | 9 +- + drivers/ata/sata_dwc_460ex.c | 9 +- + drivers/ata/sata_fsl.c | 9 +- + drivers/atm/fore200e.c | 17 +- + drivers/block/xsysace.c | 11 +- + drivers/char/hw_random/n2-drv.c | 16 +- + drivers/char/hw_random/pasemi-rng.c | 9 +- + drivers/char/ipmi/ipmi_si_intf.c | 70 +-- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 129 ++---- + drivers/crypto/amcc/crypto4xx_core.c | 9 +- + drivers/crypto/n2_core.c | 20 +- + drivers/crypto/talitos.c | 9 +- + drivers/dma/fsldma.c | 14 +- + drivers/dma/mpc512x_dma.c | 9 +- + drivers/dma/ppc4xx/adma.c | 11 +- + drivers/edac/mpc85xx_edac.c | 27 +- + drivers/edac/ppc4xx_edac.c | 23 +- + drivers/hwmon/ultra45_env.c | 9 +- + drivers/i2c/busses/i2c-cpm.c | 9 +- + drivers/i2c/busses/i2c-ibm_iic.c | 9 +- + drivers/i2c/busses/i2c-mpc.c | 22 +- + drivers/i2c/busses/i2c-ocores.c | 14 +- + drivers/i2c/i2c-core.c | 2 - + drivers/input/misc/sparcspkr.c | 22 +- + drivers/input/serio/altera_ps2.c | 15 +- + drivers/input/serio/i8042-sparcio.h | 8 +- + drivers/input/serio/xilinx_ps2.c | 9 +- + drivers/leds/leds-gpio.c | 214 ++++------ + drivers/macintosh/smu.c | 7 +- + drivers/macintosh/therm_pm72.c | 8 +- + drivers/macintosh/therm_windtunnel.c | 9 +- + drivers/media/video/fsl-viu.c | 9 +- + drivers/mmc/host/mmc_spi.c | 4 - + drivers/mmc/host/sdhci-of-core.c | 15 +- + drivers/mtd/maps/physmap_of.c | 15 +- + drivers/mtd/maps/sun_uflash.c | 8 +- + drivers/mtd/nand/fsl_upm.c | 9 +- + drivers/mtd/nand/mpc5121_nfc.c | 9 +- + drivers/mtd/nand/ndfc.c | 9 +- + drivers/mtd/nand/pasemi_nand.c | 9 +- + drivers/mtd/nand/socrates_nand.c | 9 +- + drivers/net/can/mscan/mpc5xxx_can.c | 15 +- + drivers/net/can/sja1000/sja1000_of_platform.c | 9 +- + drivers/net/ethoc.c | 8 +- + drivers/net/fec_mpc52xx.c | 13 +- + drivers/net/fec_mpc52xx.h | 2 +- + drivers/net/fec_mpc52xx_phy.c | 5 +- + drivers/net/fs_enet/fs_enet-main.c | 16 +- + drivers/net/fs_enet/mii-bitbang.c | 9 +- + drivers/net/fs_enet/mii-fec.c | 15 +- + drivers/net/fsl_pq_mdio.c | 9 +- + drivers/net/gianfar.c | 12 +- + drivers/net/greth.c | 8 +- + drivers/net/ibm_newemac/core.c | 9 +- + drivers/net/ibm_newemac/mal.c | 9 +- + drivers/net/ibm_newemac/rgmii.c | 9 +- + drivers/net/ibm_newemac/tah.c | 9 +- + drivers/net/ibm_newemac/zmii.c | 9 +- + drivers/net/ll_temac_main.c | 9 +- + drivers/net/myri_sbus.c | 8 +- + drivers/net/niu.c | 11 +- + drivers/net/phy/mdio-gpio.c | 9 +- + drivers/net/sunbmac.c | 9 +- + drivers/net/sunhme.c | 14 +- + drivers/net/sunlance.c | 8 +- + drivers/net/sunqe.c | 8 +- + drivers/net/ucc_geth.c | 8 +- + drivers/net/xilinx_emaclite.c | 9 +- + drivers/of/Kconfig | 6 + + drivers/of/Makefile | 1 + + drivers/of/device.c | 34 -- + drivers/of/of_pci.c | 91 ++++ + drivers/of/platform.c | 461 -------------------- + drivers/parport/parport_sunbpp.c | 8 +- + drivers/pcmcia/electra_cf.c | 9 +- + drivers/pcmcia/m8xx_pcmcia.c | 9 +- + drivers/rtc/rtc-mpc5121.c | 9 +- + drivers/sbus/char/bbc_i2c.c | 9 +- + drivers/sbus/char/display7seg.c | 9 +- + drivers/sbus/char/envctrl.c | 9 +- + drivers/sbus/char/flash.c | 9 +- + drivers/sbus/char/uctrl.c | 9 +- + drivers/scsi/qlogicpti.c | 14 +- + drivers/scsi/sun_esp.c | 8 +- + drivers/spi/mpc512x_psc_spi.c | 9 +- + drivers/spi/mpc52xx_psc_spi.c | 9 +- + drivers/spi/mpc52xx_spi.c | 9 +- + drivers/spi/pxa2xx_spi.c | 2 - + drivers/spi/pxa2xx_spi_pci.c | 2 - + drivers/spi/spi_fsl_espi.c | 11 +- + drivers/spi/spi_fsl_lib.c | 3 +- + drivers/spi/spi_fsl_lib.h | 3 +- + drivers/spi/spi_fsl_spi.c | 11 +- + drivers/spi/spi_ppc4xx.c | 9 +- + drivers/spi/xilinx_spi.c | 6 - + drivers/tty/serial/altera_jtaguart.c | 15 +- + drivers/tty/serial/altera_uart.c | 51 ++- + drivers/tty/serial/apbuart.c | 11 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 9 +- + drivers/tty/serial/mpc52xx_uart.c | 13 +- + drivers/tty/serial/of_serial.c | 14 +- + drivers/tty/serial/sunhv.c | 8 +- + drivers/tty/serial/sunsab.c | 8 +- + drivers/tty/serial/sunsu.c | 6 +- + drivers/tty/serial/sunzilog.c | 10 +- + drivers/tty/serial/uartlite.c | 103 +---- + drivers/tty/serial/ucc_uart.c | 9 +- + drivers/usb/gadget/fsl_qe_udc.c | 14 +- + drivers/usb/host/ehci-hcd.c | 12 +- + drivers/usb/host/ehci-ppc-of.c | 9 +- + drivers/usb/host/ehci-xilinx-of.c | 6 +- + drivers/usb/host/fhci-hcd.c | 9 +- + drivers/usb/host/isp1760-if.c | 9 +- + drivers/usb/host/ohci-hcd.c | 6 +- + drivers/usb/host/ohci-ppc-of.c | 9 +- + drivers/video/bw2.c | 8 +- + drivers/video/cg14.c | 8 +- + drivers/video/cg3.c | 9 +- + drivers/video/cg6.c | 9 +- + drivers/video/ffb.c | 9 +- + drivers/video/fsl-diu-fb.c | 9 +- + drivers/video/leo.c | 9 +- + drivers/video/mb862xx/mb862xxfb.c | 9 +- + drivers/video/p9100.c | 8 +- + drivers/video/platinumfb.c | 9 +- + drivers/video/sunxvr1000.c | 9 +- + drivers/video/tcx.c | 9 +- + drivers/video/xilinxfb.c | 11 +- + drivers/watchdog/cpwd.c | 9 +- + drivers/watchdog/gef_wdt.c | 9 +- + drivers/watchdog/mpc8xxx_wdt.c | 15 +- + drivers/watchdog/riowd.c | 9 +- + include/linux/device.h | 8 +- + include/linux/i2c.h | 2 - + include/linux/of.h | 6 +- + include/linux/of_device.h | 5 +- + include/linux/of_pci.h | 9 + + include/linux/of_platform.h | 18 +- + sound/soc/fsl/fsl_dma.c | 9 +- + sound/soc/fsl/fsl_ssi.c | 9 +- + sound/soc/fsl/mpc5200_dma.c | 24 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 9 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 9 +- + sound/sparc/amd7930.c | 8 +- + sound/sparc/cs4231.c | 16 +- + sound/sparc/dbri.c | 8 +- + 196 files changed, 1546 insertions(+), 1959 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/altera_jtaguart.txt + create mode 100644 Documentation/devicetree/bindings/serial/altera_uart.txt + create mode 100644 Documentation/devicetree/bindings/serio/altera_ps2.txt + create mode 100644 drivers/of/of_pci.c + create mode 100644 include/linux/of_pci.h +Merging spi/spi/next +$ git merge spi/spi/next +Auto-merging drivers/gpio/pca953x.c +Auto-merging drivers/spi/amba-pl022.c +Auto-merging drivers/spi/omap2_mcspi.c +Auto-merging drivers/spi/spi_sh_msiof.c +Merge made by recursive. + .../devicetree/bindings/spi/spi_altera.txt | 4 + + .../devicetree/bindings/spi/spi_oc_tiny.txt | 12 + + drivers/gpio/pca953x.c | 13 +- + drivers/gpio/sx150x.c | 54 ++- + drivers/spi/Kconfig | 19 + + drivers/spi/Makefile | 3 + + drivers/spi/amba-pl022.c | 73 ++-- + drivers/spi/omap2_mcspi.c | 29 +- + drivers/spi/spi_altera.c | 339 ++++++++++++ + drivers/spi/spi_bfin5xx.c | 104 +++-- + drivers/spi/spi_bitbang.c | 13 +- + drivers/spi/spi_imx.c | 12 +- + drivers/spi/spi_oc_tiny.c | 425 +++++++++++++++ + drivers/spi/spi_sh.c | 543 ++++++++++++++++++++ + drivers/spi/spi_sh_msiof.c | 127 ++++-- + drivers/spi/spidev.c | 12 + + include/linux/spi/spi_oc_tiny.h | 20 + + 17 files changed, 1656 insertions(+), 146 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi_altera.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi_oc_tiny.txt + create mode 100644 drivers/spi/spi_altera.c + create mode 100644 drivers/spi/spi_oc_tiny.c + create mode 100644 drivers/spi/spi_sh.c + create mode 100644 include/linux/spi/spi_oc_tiny.h +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/acpi/sleep.c' using previous resolution. +Auto-merging arch/sparc/kernel/time_32.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/acpi.h +Auto-merging arch/x86/kernel/acpi/sleep.c +CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c +Auto-merging arch/x86/kernel/acpi/sleep.h +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/kernel/apm_32.c +Auto-merging arch/x86/kernel/kgdb.c +Removing arch/x86/lib/memmove_64.c +Auto-merging arch/xtensa/kernel/time.c +Auto-merging drivers/acpi/sleep.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/of.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/security.h +Auto-merging init/Kconfig +Auto-merging kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7a9dbe9] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/i2c/ce4100-i2c.txt | 93 ++ + Documentation/devicetree/bindings/rtc/rtc-cmos.txt | 28 + + Documentation/devicetree/bindings/x86/ce4100.txt | 38 + + .../devicetree/bindings/x86/interrupt.txt | 29 + + Documentation/devicetree/bindings/x86/timer.txt | 6 + + Documentation/devicetree/booting-without-of.txt | 20 + + Documentation/kernel-parameters.txt | 4 + + Documentation/spinlocks.txt | 24 +- + Documentation/trace/ftrace-design.txt | 7 + + Documentation/trace/ftrace.txt | 148 +--- + Documentation/trace/kprobetrace.txt | 16 +- + arch/alpha/include/asm/rwsem.h | 36 - + arch/alpha/kernel/time.c | 8 +- + arch/arm/kernel/time.c | 4 +- + arch/arm/mach-clps711x/include/mach/time.h | 2 +- + arch/blackfin/kernel/time.c | 6 +- + arch/cris/arch-v10/kernel/time.c | 4 +- + arch/cris/arch-v32/kernel/time.c | 6 +- + arch/frv/kernel/time.c | 14 +- + arch/h8300/kernel/time.c | 4 +- + arch/h8300/kernel/timer/timer8.c | 2 +- + arch/ia64/include/asm/rwsem.h | 37 - + arch/ia64/kernel/time.c | 19 +- + arch/ia64/xen/time.c | 13 +- + arch/m32r/kernel/time.c | 5 +- + arch/m68k/bvme6000/config.c | 4 +- + arch/m68k/kernel/time.c | 4 +- + arch/m68k/mvme147/config.c | 4 +- + arch/m68k/mvme16x/config.c | 4 +- + arch/m68k/sun3/sun3ints.c | 2 +- + arch/m68knommu/kernel/time.c | 8 +- + arch/mips/kernel/vpe.c | 4 +- + arch/mn10300/kernel/time.c | 6 +- + arch/parisc/kernel/time.c | 7 +- + arch/powerpc/include/asm/rwsem.h | 51 - + arch/s390/include/asm/rwsem.h | 63 -- + arch/sh/include/asm/rwsem.h | 56 -- + arch/sparc/include/asm/rwsem.h | 46 - + arch/sparc/kernel/pcic.c | 4 +- + arch/sparc/kernel/time_32.c | 9 +- + arch/sparc/lib/atomic32.c | 2 +- + arch/um/Kconfig.common | 1 + + arch/um/drivers/ubd_kern.c | 2 +- + arch/um/kernel/irq.c | 31 +- + arch/x86/Kconfig | 30 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/acpi.h | 14 +- + arch/x86/include/asm/amd_nb.h | 14 +- + arch/x86/include/asm/apic.h | 38 +- + arch/x86/include/asm/apicdef.h | 12 + + arch/x86/include/asm/bootparam.h | 1 + + arch/x86/include/asm/cpufeature.h | 2 + + arch/x86/include/asm/e820.h | 2 +- + arch/x86/include/asm/entry_arch.h | 5 +- + arch/x86/include/asm/hw_irq.h | 24 + + arch/x86/include/asm/init.h | 6 +- + arch/x86/include/asm/io_apic.h | 44 +- + arch/x86/include/asm/ipi.h | 8 +- + arch/x86/include/asm/irq.h | 3 - + arch/x86/include/asm/irq_controller.h | 12 + + arch/x86/include/asm/irq_vectors.h | 45 +- + arch/x86/include/asm/kdebug.h | 1 - + arch/x86/include/asm/mpspec.h | 3 - + arch/x86/include/asm/nmi.h | 1 - + arch/x86/include/asm/numa.h | 52 + + arch/x86/include/asm/numa_32.h | 7 +- + arch/x86/include/asm/numa_64.h | 23 +- + arch/x86/include/asm/olpc_ofw.h | 14 +- + arch/x86/include/asm/page_types.h | 11 +- + arch/x86/include/asm/processor.h | 4 - + arch/x86/include/asm/prom.h | 70 ++- + arch/x86/include/asm/reboot.h | 5 +- + arch/x86/include/asm/rwsem.h | 80 +-- + arch/x86/include/asm/segment.h | 12 +- + arch/x86/include/asm/smp.h | 10 + + arch/x86/include/asm/system.h | 2 - + arch/x86/include/asm/topology.h | 19 +- + arch/x86/include/asm/trampoline.h | 33 +- + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/Makefile | 5 +- + arch/x86/kernel/acpi/boot.c | 8 +- + arch/x86/kernel/acpi/realmode/wakeup.S | 21 +- + arch/x86/kernel/acpi/realmode/wakeup.h | 5 +- + arch/x86/kernel/acpi/realmode/wakeup.lds.S | 28 +- + arch/x86/kernel/acpi/sleep.c | 64 +-- + arch/x86/kernel/acpi/sleep.h | 3 - + arch/x86/kernel/acpi/wakeup_rm.S | 10 +- + arch/x86/kernel/amd_nb.c | 84 ++- + arch/x86/kernel/apb_timer.c | 60 +-- + arch/x86/kernel/aperture_64.c | 33 +- + arch/x86/kernel/apic/apic.c | 87 ++- + arch/x86/kernel/apic/apic_flat_64.c | 4 - + arch/x86/kernel/apic/apic_noop.c | 26 +- + arch/x86/kernel/apic/bigsmp_32.c | 34 +- + arch/x86/kernel/apic/es7000_32.c | 35 +- + arch/x86/kernel/apic/hw_nmi.c | 1 - + arch/x86/kernel/apic/io_apic.c | 265 +++--- + arch/x86/kernel/apic/ipi.c | 12 +- + arch/x86/kernel/apic/numaq_32.c | 21 +- + arch/x86/kernel/apic/probe_32.c | 10 +- + arch/x86/kernel/apic/summit_32.c | 47 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 - + arch/x86/kernel/apic/x2apic_phys.c | 2 - + arch/x86/kernel/apic/x2apic_uv_x.c | 2 - + arch/x86/kernel/apm_32.c | 12 +- + arch/x86/kernel/asm-offsets.c | 65 ++ + arch/x86/kernel/asm-offsets_32.c | 69 -- + arch/x86/kernel/asm-offsets_64.c | 90 +-- + arch/x86/kernel/cpu/amd.c | 61 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 5 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 80 ++- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 7 +- + arch/x86/kernel/cpu/perf_event.c | 86 +- + arch/x86/kernel/cpu/perf_event_amd.c | 175 ++++- + arch/x86/kernel/cpu/perf_event_intel.c | 4 +- + arch/x86/kernel/cpu/perf_event_p4.c | 8 +- + arch/x86/kernel/cpu/perf_event_p6.c | 4 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 4 + + arch/x86/kernel/devicetree.c | 441 +++++++++ + arch/x86/kernel/dumpstack.c | 25 - + arch/x86/kernel/e820.c | 18 +- + arch/x86/kernel/entry_32.S | 2 +- + arch/x86/kernel/entry_64.S | 5 +- + arch/x86/kernel/head32.c | 9 - + arch/x86/kernel/head_32.S | 10 +- + arch/x86/kernel/head_64.S | 3 +- + arch/x86/kernel/ioport.c | 20 +- + arch/x86/kernel/irq.c | 11 +- + arch/x86/kernel/irqinit.c | 88 ++- + arch/x86/kernel/kgdb.c | 9 - + arch/x86/kernel/microcode_amd.c | 188 ++-- + arch/x86/kernel/microcode_core.c | 6 +- + arch/x86/kernel/process.c | 9 +- + arch/x86/kernel/reboot.c | 120 +-- + arch/x86/kernel/reboot_32.S | 135 +++ + arch/x86/kernel/rtc.c | 3 + + arch/x86/kernel/setup.c | 93 +- + arch/x86/kernel/setup_percpu.c | 11 +- + arch/x86/kernel/smpboot.c | 134 +-- + arch/x86/kernel/syscall_table_32.S | 1 + + arch/x86/kernel/trampoline.c | 42 +- + arch/x86/kernel/trampoline_32.S | 15 +- + arch/x86/kernel/trampoline_64.S | 28 +- + arch/x86/kernel/vmlinux.lds.S | 15 +- + arch/x86/kernel/x8664_ksyms_64.c | 1 + + arch/x86/kernel/x86_init.c | 1 + + arch/x86/lib/memmove_64.S | 197 ++++ + arch/x86/lib/memmove_64.c | 192 ---- + arch/x86/mm/Makefile | 1 + + arch/x86/mm/amdtopology_64.c | 142 +--- + arch/x86/mm/init.c | 56 +- + arch/x86/mm/init_32.c | 11 +- + arch/x86/mm/init_64.c | 126 ++- + arch/x86/mm/numa.c | 212 ++++- + arch/x86/mm/numa_32.c | 10 +- + arch/x86/mm/numa_64.c | 967 +++++++------------ + arch/x86/mm/numa_emulation.c | 475 +++++++++ + arch/x86/mm/numa_internal.h | 31 + + arch/x86/mm/srat_32.c | 6 +- + arch/x86/mm/srat_64.c | 367 +------- + arch/x86/mm/tlb.c | 11 +- + arch/x86/pci/amd_bus.c | 2 +- + arch/x86/pci/ce4100.c | 2 +- + arch/x86/platform/ce4100/ce4100.c | 24 +- + arch/x86/platform/ce4100/falconfalls.dts | 428 +++++++++ + arch/x86/platform/mrst/mrst.c | 2 + + arch/x86/platform/mrst/vrtc.c | 16 +- + arch/x86/platform/olpc/Makefile | 4 +- + arch/x86/xen/mmu.c | 2 +- + arch/x86/xen/xen-head.S | 4 +- + arch/xtensa/include/asm/rwsem.h | 37 - + arch/xtensa/kernel/time.c | 6 +- + drivers/acpi/numa.c | 9 +- + drivers/acpi/sleep.c | 1 + + drivers/char/mmtimer.c | 30 +- + drivers/of/Kconfig | 2 +- + drivers/of/of_pci.c | 1 + + drivers/rtc/rtc-cmos.c | 45 + + drivers/rtc/rtc-mrst.c | 13 +- + include/linux/cgroup.h | 4 +- + include/linux/cgroup_subsys.h | 4 + + include/linux/ftrace.h | 2 + + include/linux/interrupt.h | 45 +- + include/linux/irq.h | 366 ++++++-- + include/linux/irqdesc.h | 70 ++- + include/linux/kthread.h | 2 +- + include/linux/mm.h | 2 - + include/linux/of.h | 12 + + include/linux/pci_ids.h | 1 + + include/linux/perf_event.h | 37 +- + include/linux/posix-clock.h | 150 +++ + include/linux/posix-timers.h | 44 +- + include/linux/rwlock_types.h | 8 - + include/linux/rwsem-spinlock.h | 31 +- + include/linux/rwsem.h | 53 +- + include/linux/sched.h | 9 +- + include/linux/security.h | 9 +- + include/linux/spinlock_types.h | 8 - + include/linux/syscalls.h | 12 +- + include/linux/thread_info.h | 3 - + include/linux/time.h | 11 +- + include/linux/timex.h | 3 +- + init/Kconfig | 10 + + kernel/cgroup.c | 54 +- + kernel/compat.c | 136 ++- + kernel/cred.c | 2 +- + kernel/futex.c | 22 +- + kernel/hrtimer.c | 13 +- + kernel/irq/Kconfig | 29 +- + kernel/irq/autoprobe.c | 54 +- + kernel/irq/chip.c | 483 ++++------ + kernel/irq/compat.h | 72 ++ + kernel/irq/debug.h | 40 + + kernel/irq/handle.c | 144 +++- + kernel/irq/internals.h | 167 +++- + kernel/irq/irqdesc.c | 68 +- + kernel/irq/manage.c | 546 +++++++---- + kernel/irq/migration.c | 38 +- + kernel/irq/pm.c | 12 +- + kernel/irq/proc.c | 70 ++- + kernel/irq/resend.c | 17 +- + kernel/irq/settings.h | 138 +++ + kernel/irq/spurious.c | 163 ++-- + kernel/perf_event.c | 1001 ++++++++++++++++--- + kernel/posix-cpu-timers.c | 110 +-- + kernel/posix-timers.c | 321 ++++---- + kernel/rtmutex-debug.c | 1 - + kernel/rtmutex-tester.c | 40 +- + kernel/rtmutex.c | 318 +++---- + kernel/rtmutex_common.h | 16 +- + kernel/sched.c | 106 +-- + kernel/sched_autogroup.c | 15 +- + kernel/sched_autogroup.h | 5 + + kernel/sched_fair.c | 118 +-- + kernel/softirq.c | 21 +- + kernel/sysctl.c | 4 +- + kernel/time.c | 57 +- + kernel/time/Makefile | 3 +- + kernel/time/clockevents.c | 1 - + kernel/time/jiffies.c | 20 + + kernel/time/ntp.c | 13 + + kernel/time/posix-clock.c | 441 +++++++++ + kernel/time/tick-broadcast.c | 1 - + kernel/time/tick-common.c | 1 - + kernel/time/tick-internal.h | 9 + + kernel/time/tick-oneshot.c | 1 - + kernel/time/tick-sched.c | 1 - + kernel/time/timekeeping.c | 86 ++- + kernel/timer.c | 36 +- + kernel/trace/ftrace.c | 52 +- + kernel/trace/trace.c | 4 + + kernel/trace/trace_kprobe.c | 111 ++- + kernel/trace/trace_sched_switch.c | 48 - + kernel/trace/trace_syscalls.c | 42 +- + lib/rwsem.c | 10 +- + mm/Makefile | 8 +- + mm/bootmem.c | 180 +---- + mm/nobootmem.c | 435 +++++++++ + mm/page_alloc.c | 71 +- + scripts/checkpatch.pl | 5 - + scripts/kconfig/streamline_config.pl | 2 +- + scripts/rt-tester/rt-tester.py | 2 - + scripts/rt-tester/t2-l1-2rt-sameprio.tst | 5 - + scripts/rt-tester/t2-l1-pi.tst | 5 - + scripts/rt-tester/t2-l1-signal.tst | 5 - + scripts/rt-tester/t2-l2-2rt-deadlock.tst | 5 - + scripts/rt-tester/t3-l1-pi-1rt.tst | 5 - + scripts/rt-tester/t3-l1-pi-2rt.tst | 5 - + scripts/rt-tester/t3-l1-pi-3rt.tst | 5 - + scripts/rt-tester/t3-l1-pi-signal.tst | 5 - + scripts/rt-tester/t3-l1-pi-steal.tst | 5 - + scripts/rt-tester/t3-l2-pi.tst | 5 - + scripts/rt-tester/t4-l2-pi-deboost.tst | 5 - + .../rt-tester/t5-l4-pi-boost-deboost-setsched.tst | 5 - + scripts/rt-tester/t5-l4-pi-boost-deboost.tst | 5 - + security/commoncap.c | 2 +- + security/security.c | 2 +- + tools/perf/.gitignore | 1 - + tools/perf/Documentation/Makefile | 19 +- + tools/perf/Documentation/perf-list.txt | 23 +- + tools/perf/Documentation/perf-lock.txt | 12 +- + tools/perf/Documentation/perf-probe.txt | 26 +- + tools/perf/Documentation/perf-record.txt | 11 + + tools/perf/Documentation/perf-stat.txt | 11 + + tools/perf/Makefile | 649 ++----------- + tools/perf/bench/sched-pipe.c | 2 +- + tools/perf/builtin-annotate.c | 291 +----- + tools/perf/builtin-diff.c | 16 +- + tools/perf/builtin-inject.c | 82 +- + tools/perf/builtin-kmem.c | 10 +- + tools/perf/builtin-list.c | 43 +- + tools/perf/builtin-lock.c | 8 +- + tools/perf/builtin-probe.c | 70 ++- + tools/perf/builtin-record.c | 439 ++++----- + tools/perf/builtin-report.c | 114 ++- + tools/perf/builtin-sched.c | 27 +- + tools/perf/builtin-script.c | 17 +- + tools/perf/builtin-stat.c | 118 ++- + tools/perf/builtin-test.c | 184 ++++- + tools/perf/builtin-timechart.c | 13 +- + tools/perf/builtin-top.c | 1006 ++++++-------------- + tools/perf/perf.h | 26 + + tools/perf/python/twatch.py | 41 + + tools/perf/util/annotate.c | 605 ++++++++++++ + tools/perf/util/annotate.h | 103 ++ + tools/perf/util/build-id.c | 21 +- + tools/perf/util/cache.h | 7 +- + tools/perf/util/callchain.c | 227 +++--- + tools/perf/util/callchain.h | 76 ++- + tools/perf/util/cgroup.c | 178 ++++ + tools/perf/util/cgroup.h | 17 + + tools/perf/util/cpumap.c | 5 + + tools/perf/util/cpumap.h | 2 +- + tools/perf/util/debug.c | 2 +- + tools/perf/util/debug.h | 2 +- + tools/perf/util/event.c | 319 ++----- + tools/perf/util/event.h | 78 +- + tools/perf/util/evlist.c | 350 +++++++ + tools/perf/util/evlist.h | 64 ++ + tools/perf/util/evsel.c | 221 ++++- + tools/perf/util/evsel.h | 38 +- + tools/perf/util/exec_cmd.c | 19 - + tools/perf/util/header.c | 100 +- + tools/perf/util/header.h | 55 +- + tools/perf/util/hist.c | 237 +----- + tools/perf/util/hist.h | 48 +- + tools/perf/util/include/linux/list.h | 1 + + tools/perf/util/parse-events.c | 175 ++-- + tools/perf/util/parse-events.h | 12 +- + tools/perf/util/probe-event.c | 159 +++- + tools/perf/util/probe-event.h | 4 +- + tools/perf/util/probe-finder.c | 531 ++++++----- + tools/perf/util/python.c | 891 +++++++++++++++++ + .../util/scripting-engines/trace-event-python.c | 3 +- + tools/perf/util/session.c | 215 +++-- + tools/perf/util/session.h | 27 +- + tools/perf/util/setup.py | 19 + + tools/perf/util/strfilter.c | 200 ++++ + tools/perf/util/strfilter.h | 48 + + tools/perf/util/symbol.c | 4 +- + tools/perf/util/thread.c | 55 -- + tools/perf/util/thread.h | 14 - + tools/perf/util/thread_map.c | 64 ++ + tools/perf/util/thread_map.h | 15 + + tools/perf/util/top.c | 218 +++++ + tools/perf/util/top.h | 65 ++ + tools/perf/util/trace-event-parse.c | 2 +- + tools/perf/util/ui/browser.c | 7 + + tools/perf/util/ui/browsers/annotate.c | 178 +++-- + tools/perf/util/ui/browsers/hists.c | 19 +- + tools/perf/util/ui/browsers/map.c | 2 +- + tools/perf/util/ui/browsers/top.c | 200 ++++ + tools/perf/util/ui/helpline.c | 5 +- + tools/perf/util/ui/libslang.h | 6 +- + tools/perf/util/ui/setup.c | 8 +- + tools/perf/util/ui/ui.h | 8 + + tools/perf/util/util.h | 26 - + tools/testing/ktest/ktest.pl | 2 +- + 361 files changed, 15021 insertions(+), 9056 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/ce4100-i2c.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-cmos.txt + create mode 100644 Documentation/devicetree/bindings/x86/ce4100.txt + create mode 100644 Documentation/devicetree/bindings/x86/interrupt.txt + create mode 100644 Documentation/devicetree/bindings/x86/timer.txt + create mode 100644 arch/x86/include/asm/irq_controller.h + create mode 100644 arch/x86/kernel/devicetree.c + create mode 100644 arch/x86/kernel/reboot_32.S + create mode 100644 arch/x86/lib/memmove_64.S + delete mode 100644 arch/x86/lib/memmove_64.c + create mode 100644 arch/x86/mm/numa_emulation.c + create mode 100644 arch/x86/mm/numa_internal.h + create mode 100644 arch/x86/platform/ce4100/falconfalls.dts + create mode 100644 include/linux/posix-clock.h + create mode 100644 kernel/irq/compat.h + create mode 100644 kernel/irq/debug.h + create mode 100644 kernel/irq/settings.h + create mode 100644 kernel/time/posix-clock.c + create mode 100644 mm/nobootmem.c + create mode 100755 tools/perf/python/twatch.py + create mode 100644 tools/perf/util/annotate.c + create mode 100644 tools/perf/util/annotate.h + create mode 100644 tools/perf/util/cgroup.c + create mode 100644 tools/perf/util/cgroup.h + create mode 100644 tools/perf/util/evlist.c + create mode 100644 tools/perf/util/evlist.h + create mode 100644 tools/perf/util/python.c + create mode 100644 tools/perf/util/setup.py + create mode 100644 tools/perf/util/strfilter.c + create mode 100644 tools/perf/util/strfilter.h + create mode 100644 tools/perf/util/thread_map.c + create mode 100644 tools/perf/util/thread_map.h + create mode 100644 tools/perf/util/top.c + create mode 100644 tools/perf/util/top.h + create mode 100644 tools/perf/util/ui/browsers/top.c + create mode 100644 tools/perf/util/ui/ui.h +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Merge made by recursive. + Documentation/RCU/whatisRCU.txt | 31 +++++++++++++++++++ + Documentation/memory-barriers.txt | 58 +++++++++++++++++++++++++++++++++++++ + kernel/rcupdate.c | 10 +++--- + kernel/rcutiny_plugin.h | 2 +- + kernel/rcutorture.c | 1 - + 5 files changed, 95 insertions(+), 7 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging arch/Kconfig +Auto-merging arch/s390/Kconfig +Merge made by recursive. + arch/Kconfig | 3 + + arch/s390/Kconfig | 1 + + arch/s390/oprofile/Makefile | 2 +- + arch/s390/oprofile/hwsampler.c | 1256 ++++++++++++++++++++++++++++++++++ + arch/s390/oprofile/hwsampler.h | 113 +++ + arch/s390/oprofile/hwsampler_files.c | 162 +++++ + arch/s390/oprofile/init.c | 6 +- + drivers/oprofile/cpu_buffer.c | 24 +- + drivers/oprofile/timer_int.c | 4 +- + include/linux/oprofile.h | 7 + + 10 files changed, 1567 insertions(+), 11 deletions(-) + create mode 100644 arch/s390/oprofile/hwsampler.c + create mode 100644 arch/s390/oprofile/hwsampler.h + create mode 100644 arch/s390/oprofile/hwsampler_files.c +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Auto-merging arch/x86/xen/Kconfig +Auto-merging arch/x86/xen/mmu.c +Merge made by recursive. + arch/x86/include/asm/xen/page.h | 47 +++- + arch/x86/include/asm/xen/pci.h | 8 +- + arch/x86/pci/xen.c | 159 ++++++----- + arch/x86/xen/Kconfig | 8 + + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/mmu.c | 72 +++++- + arch/x86/xen/p2m.c | 207 ++++++++++++++- + arch/x86/xen/setup.c | 67 +++++- + arch/x86/xen/time.c | 4 +- + drivers/block/xen-blkfront.c | 8 +- + drivers/pci/xen-pcifront.c | 31 ++- + drivers/xen/Kconfig | 10 + + drivers/xen/Makefile | 2 + + drivers/xen/balloon.c | 2 +- + drivers/xen/events.c | 380 ++++++++++++--------------- + drivers/xen/gntalloc.c | 545 ++++++++++++++++++++++++++++++++++++++ + drivers/xen/gntdev.c | 387 ++++++++++++++++++---------- + drivers/xen/grant-table.c | 6 + + include/xen/events.h | 14 +- + include/xen/gntalloc.h | 82 ++++++ + include/xen/gntdev.h | 31 +++ + include/xen/interface/io/blkif.h | 16 +- + 22 files changed, 1611 insertions(+), 477 deletions(-) + create mode 100644 drivers/xen/gntalloc.c + create mode 100644 include/xen/gntalloc.h +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Auto-merging arch/x86/xen/enlighten.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/xen/balloon.c +Auto-merging include/xen/interface/io/blkif.h +Merge made by recursive. + arch/ia64/xen/suspend.c | 9 +-- + arch/x86/include/asm/xen/hypercall.h | 15 +++- + arch/x86/xen/enlighten.c | 6 +- + arch/x86/xen/smp.c | 38 +++++++++ + arch/x86/xen/suspend.c | 8 +- + arch/x86/xen/xen-ops.h | 2 + + drivers/block/xen-blkfront.c | 79 ++++++++++++++++- + drivers/xen/balloon.c | 14 ++- + drivers/xen/manage.c | 153 +++++++++++++++++++--------------- + drivers/xen/platform-pci.c | 3 - + include/xen/interface/io/blkif.h | 21 +++++ + include/xen/interface/xen.h | 4 +- + include/xen/xen-ops.h | 6 +- + 13 files changed, 257 insertions(+), 101 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Resolved 'include/linux/pci_ids.h' using previous resolution. +Auto-merging arch/x86/kernel/amd_nb.c +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bb79780] Merge remote-tracking branch 'edac-amd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/amd_nb.c | 2 +- + drivers/edac/amd64_edac.c | 1412 +++++++++++++++++++---------------------- + drivers/edac/amd64_edac.h | 357 ++++------- + drivers/edac/amd64_edac_inj.c | 8 +- + drivers/edac/edac_mc_sysfs.c | 26 +- + drivers/edac/mce_amd.c | 8 +- + drivers/edac/mce_amd.h | 28 +- + include/linux/pci_ids.h | 2 +- + 8 files changed, 825 insertions(+), 1018 deletions(-) +Merging percpu/for-next +$ git merge percpu/for-next +Resolved 'arch/x86/kernel/vmlinux.lds.S' using previous resolution. +Auto-merging arch/arm/kernel/vmlinux.lds.S +Auto-merging arch/cris/kernel/vmlinux.lds.S +Auto-merging arch/x86/include/asm/percpu.h +Auto-merging arch/x86/kernel/vmlinux.lds.S +CONFLICT (content): Merge conflict in arch/x86/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/vmlinux.lds.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0f56980] Merge remote-tracking branch 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/vmlinux.lds.S | 5 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/blackfin/kernel/vmlinux.lds.S | 2 +- + arch/cris/kernel/vmlinux.lds.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 2 +- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mn10300/kernel/vmlinux.lds.S | 2 +- + arch/parisc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/sh/kernel/vmlinux.lds.S | 2 +- + arch/sparc/kernel/vmlinux.lds.S | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 +- + arch/um/include/asm/common.lds.S | 2 +- + arch/x86/include/asm/percpu.h | 48 +++++++++++++ + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/cmpxchg16b_emu.S | 59 ++++++++++++++++ + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + include/asm-generic/vmlinux.lds.h | 35 ++++++---- + include/linux/percpu.h | 128 ++++++++++++++++++++++++++++++++++++ + 23 files changed, 279 insertions(+), 33 deletions(-) + create mode 100644 arch/x86/lib/cmpxchg16b_emu.S +Merging workqueues/for-next +$ git merge workqueues/for-next +Auto-merging arch/arm/plat-omap/mailbox.c +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/cpufreq/cpufreq_conservative.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +Auto-merging drivers/md/md.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c +Auto-merging drivers/scsi/be2iscsi/be_main.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging fs/aio.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +Merge made by recursive. + arch/arm/plat-omap/mailbox.c | 10 +-- + drivers/acpi/osl.c | 6 +- + drivers/cpufreq/cpufreq_conservative.c | 22 +--- + drivers/cpufreq/cpufreq_ondemand.c | 20 +--- + drivers/input/touchscreen/tps6507x-ts.c | 12 +-- + drivers/md/md.c | 2 +- + drivers/message/i2o/driver.c | 3 +- + drivers/misc/iwmc3200top/iwmc3200top.h | 4 +- + drivers/misc/iwmc3200top/main.c | 14 +-- + drivers/net/wireless/ipw2x00/ipw2100.c | 70 +++++------- + drivers/net/wireless/ipw2x00/ipw2100.h | 1 - + drivers/net/wireless/ipw2x00/ipw2200.c | 196 ++++++++++++++----------------- + drivers/net/wireless/ipw2x00/ipw2200.h | 2 - + drivers/scsi/be2iscsi/be_main.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/scsi_tgt_lib.c | 2 +- + fs/aio.c | 4 +- + fs/ext4/super.c | 7 +- + fs/nfs/inode.c | 2 +- + fs/ocfs2/quota.h | 3 - + fs/ocfs2/quota_global.c | 27 +---- + fs/ocfs2/super.c | 7 - + fs/reiserfs/journal.c | 2 +- + fs/xfs/linux-2.6/xfs_buf.c | 5 +- + fs/xfs/xfs_mru_cache.c | 2 +- + include/linux/workqueue.h | 4 + + kernel/workqueue.c | 6 +- + net/9p/trans_fd.c | 52 ++------ + net/rds/ib.c | 9 +-- + net/rds/ib.h | 2 - + net/rds/ib_rdma.c | 27 +---- + net/sunrpc/sched.c | 2 +- + 32 files changed, 190 insertions(+), 339 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 +Resolved 'drivers/hwmon/lm85.c' using previous resolution. +Auto-merging drivers/hwmon/lm85.c +CONFLICT (content): Merge conflict in drivers/hwmon/lm85.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/platform/x86/Makefile +Auto-merging include/linux/input.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 62d13ae] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-platform-eeepc-wmi | 21 + + Documentation/laptops/sony-laptop.txt | 37 +- + drivers/platform/x86/Kconfig | 37 + + drivers/platform/x86/Makefile | 6 +- + drivers/platform/x86/asus-laptop.c | 180 +---- + drivers/platform/x86/dell-wmi-aio.c | 171 +++++ + drivers/platform/x86/eeepc-wmi.c | 780 ++++++++++++++++---- + drivers/platform/x86/hp-wmi.c | 312 +++++++- + drivers/platform/x86/intel_mid_powerbtn.c | 148 ++++ + drivers/platform/x86/intel_mid_thermal.c | 575 +++++++++++++++ + drivers/platform/x86/sony-laptop.c | 492 ++++++++++--- + drivers/platform/x86/xo15-ebook.c | 181 +++++ + include/linux/input.h | 7 + + include/linux/sonypi.h | 1 + + 14 files changed, 2509 insertions(+), 439 deletions(-) + create mode 100644 drivers/platform/x86/dell-wmi-aio.c + create mode 100644 drivers/platform/x86/intel_mid_powerbtn.c + create mode 100644 drivers/platform/x86/intel_mid_thermal.c + create mode 100644 drivers/platform/x86/xo15-ebook.c +$ git am -3 ../patches/0001-OLPC-fix-for-removal-of-run_wake_count.patch +Applying: OLPC: fix for removal of run_wake_count +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/xo15-ebook.c +$ git add . +$ git commit -v -a --amend +[master b882b52] Merge remote-tracking branch 'drivers-x86/linux-next' +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Auto-merging arch/x86/mm/init_64.c +Auto-merging drivers/misc/Kconfig +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/ABI/testing/sysfs-firmware-dmi | 110 ++++ + Documentation/ABI/testing/sysfs-platform-kim | 48 ++ + Documentation/dynamic-debug-howto.txt | 12 +- + Documentation/filesystems/sysfs.txt | 16 +- + Documentation/memory-hotplug.txt | 47 +- + Documentation/zh_CN/SecurityBugs | 50 ++ + Documentation/zh_CN/SubmitChecklist | 109 ++++ + Documentation/zh_CN/SubmittingPatches | 4 +- + Documentation/zh_CN/magic-number.txt | 167 ++++++ + arch/powerpc/platforms/pseries/hotplug-memory.c | 66 ++- + arch/x86/mm/init_64.c | 14 + + drivers/base/core.c | 34 +- + drivers/base/firmware_class.c | 7 +- + drivers/base/memory.c | 197 +++++-- + drivers/base/node.c | 12 +- + drivers/base/sys.c | 65 ++- + drivers/firmware/Kconfig | 11 + + drivers/firmware/Makefile | 1 + + drivers/firmware/dmi-sysfs.c | 696 +++++++++++++++++++++++ + drivers/misc/Kconfig | 7 +- + drivers/misc/pch_phub.c | 69 ++- + drivers/misc/ti-st/st_core.c | 413 +++++--------- + drivers/misc/ti-st/st_kim.c | 491 ++++++++-------- + drivers/misc/ti-st/st_ll.c | 10 +- + fs/debugfs/inode.c | 26 +- + include/linux/dmi.h | 47 ++ + include/linux/dynamic_debug.h | 8 +- + include/linux/firmware.h | 4 +- + include/linux/kobject.h | 10 +- + include/linux/memory.h | 3 +- + include/linux/node.h | 6 +- + include/linux/platform_device.h | 11 +- + include/linux/ti_wilink_st.h | 76 ++- + init/Kconfig | 4 +- + lib/dynamic_debug.c | 61 ++- + 35 files changed, 2180 insertions(+), 732 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-dmi + create mode 100644 Documentation/ABI/testing/sysfs-platform-kim + create mode 100644 Documentation/zh_CN/SecurityBugs + create mode 100644 Documentation/zh_CN/SubmitChecklist + create mode 100644 Documentation/zh_CN/magic-number.txt + create mode 100644 drivers/firmware/dmi-sysfs.c +Merging tty/tty-next +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/Kconfig' using previous resolution. +Resolved 'drivers/tty/serial/Makefile' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/m68k/Kconfig +Auto-merging drivers/s390/char/keyboard.c +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/generic_serial/generic_serial.c +Auto-merging drivers/staging/generic_serial/ser_a2232.c +Auto-merging drivers/staging/generic_serial/sx.c +Auto-merging drivers/staging/generic_serial/vme_scc.c +Auto-merging drivers/staging/tty/epca.c +Auto-merging drivers/staging/tty/ip2/ip2main.c +Auto-merging drivers/staging/tty/istallion.c +Auto-merging drivers/staging/tty/riscom8.c +Auto-merging drivers/staging/tty/serial167.c +Auto-merging drivers/staging/tty/specialix.c +Auto-merging drivers/staging/tty/stallion.c +Auto-merging drivers/tty/amiserial.c +Auto-merging drivers/tty/cyclades.c +Auto-merging drivers/tty/ipwireless/tty.c +Auto-merging drivers/tty/isicom.c +Auto-merging drivers/tty/moxa.c +Auto-merging drivers/tty/mxser.c +Auto-merging drivers/tty/nozomi.c +Auto-merging drivers/tty/rocket.c +Auto-merging drivers/tty/serial/Kconfig +CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/Makefile +CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/altera_jtaguart.c +Auto-merging drivers/tty/serial/altera_uart.c +Auto-merging drivers/tty/serial/of_serial.c +Auto-merging drivers/tty/serial/pch_uart.c +Auto-merging drivers/tty/synclink.c +Auto-merging drivers/tty/synclink_gt.c +Auto-merging drivers/tty/synclinkmp.c +Auto-merging drivers/usb/serial/sierra.c +Auto-merging drivers/usb/serial/usb_wwan.c +Auto-merging net/bluetooth/rfcomm/tty.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 07ed7f5] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 16 +- + arch/alpha/include/asm/ioctls.h | 1 + + arch/ia64/hp/sim/simserial.c | 3 +- + arch/m68k/Kconfig | 8 - + arch/mips/include/asm/ioctls.h | 1 + + arch/parisc/include/asm/ioctls.h | 1 + + arch/powerpc/include/asm/ioctls.h | 1 + + arch/sh/include/asm/ioctls.h | 1 + + arch/sparc/include/asm/ioctls.h | 1 + + arch/xtensa/include/asm/ioctls.h | 1 + + drivers/bluetooth/hci_ath.c | 26 +- + drivers/char/Kconfig | 540 +------------------- + drivers/char/Makefile | 24 - + drivers/char/pcmcia/Makefile | 2 - + drivers/char/pcmcia/synclink_cs.c | 13 +- + drivers/char/ttyprintk.c | 2 +- + drivers/isdn/capi/capi.c | 10 +- + drivers/isdn/gigaset/interface.c | 12 +- + drivers/isdn/gigaset/ser-gigaset.c | 2 +- + drivers/isdn/i4l/isdn_tty.c | 7 +- + drivers/mmc/card/sdio_uart.c | 4 +- + drivers/net/irda/irtty-sir.c | 2 +- + drivers/net/usb/hso.c | 10 +- + drivers/net/wan/pc300_tty.c | 9 +- + drivers/s390/char/keyboard.c | 4 +- + drivers/s390/char/keyboard.h | 2 +- + drivers/s390/char/tty3270.c | 14 +- + drivers/staging/Kconfig | 4 + + drivers/staging/Makefile | 2 + + drivers/staging/generic_serial/Kconfig | 45 ++ + drivers/staging/generic_serial/Makefile | 6 + + drivers/staging/generic_serial/TODO | 6 + + .../generic_serial}/generic_serial.c | 4 +- + .../{char => staging/generic_serial}/rio/Makefile | 0 + .../{char => staging/generic_serial}/rio/board.h | 0 + .../{char => staging/generic_serial}/rio/cirrus.h | 0 + .../{char => staging/generic_serial}/rio/cmdblk.h | 0 + .../{char => staging/generic_serial}/rio/cmdpkt.h | 0 + .../{char => staging/generic_serial}/rio/daemon.h | 0 + .../{char => staging/generic_serial}/rio/errors.h | 0 + .../{char => staging/generic_serial}/rio/func.h | 0 + .../{char => staging/generic_serial}/rio/host.h | 0 + .../{char => staging/generic_serial}/rio/link.h | 0 + .../generic_serial}/rio/linux_compat.h | 0 + drivers/{char => staging/generic_serial}/rio/map.h | 0 + .../{char => staging/generic_serial}/rio/param.h | 0 + .../{char => staging/generic_serial}/rio/parmmap.h | 0 + drivers/{char => staging/generic_serial}/rio/pci.h | 0 + drivers/{char => staging/generic_serial}/rio/phb.h | 0 + drivers/{char => staging/generic_serial}/rio/pkt.h | 0 + .../{char => staging/generic_serial}/rio/port.h | 0 + .../{char => staging/generic_serial}/rio/protsts.h | 0 + drivers/{char => staging/generic_serial}/rio/rio.h | 0 + .../generic_serial}/rio/rio_linux.c | 0 + .../generic_serial}/rio/rio_linux.h | 0 + .../generic_serial}/rio/rioboard.h | 0 + .../{char => staging/generic_serial}/rio/rioboot.c | 0 + .../{char => staging/generic_serial}/rio/riocmd.c | 0 + .../{char => staging/generic_serial}/rio/rioctrl.c | 0 + .../{char => staging/generic_serial}/rio/riodrvr.h | 0 + .../{char => staging/generic_serial}/rio/rioinfo.h | 0 + .../{char => staging/generic_serial}/rio/rioinit.c | 0 + .../{char => staging/generic_serial}/rio/riointr.c | 0 + .../generic_serial}/rio/rioioctl.h | 0 + .../generic_serial}/rio/rioparam.c | 0 + .../generic_serial}/rio/rioroute.c | 0 + .../generic_serial}/rio/riospace.h | 0 + .../generic_serial}/rio/riotable.c | 0 + .../{char => staging/generic_serial}/rio/riotty.c | 0 + .../{char => staging/generic_serial}/rio/route.h | 0 + drivers/{char => staging/generic_serial}/rio/rup.h | 0 + .../{char => staging/generic_serial}/rio/unixrup.h | 0 + .../{char => staging/generic_serial}/ser_a2232.c | 6 +- + .../{char => staging/generic_serial}/ser_a2232.h | 0 + .../generic_serial}/ser_a2232fw.ax | 0 + .../{char => staging/generic_serial}/ser_a2232fw.h | 0 + drivers/{char => staging/generic_serial}/sx.c | 8 +- + drivers/{char => staging/generic_serial}/sx.h | 0 + .../{char => staging/generic_serial}/sxboards.h | 0 + .../{char => staging/generic_serial}/sxwindow.h | 0 + drivers/{char => staging/generic_serial}/vme_scc.c | 4 +- + drivers/staging/quatech_usb2/quatech_usb2.c | 6 +- + drivers/staging/serqt_usb2/serqt_usb2.c | 13 +- + drivers/staging/tty/Kconfig | 87 ++++ + drivers/staging/tty/Makefile | 7 + + drivers/staging/tty/TODO | 6 + + drivers/{char => staging/tty}/epca.c | 16 +- + drivers/{char => staging/tty}/epca.h | 0 + drivers/{char => staging/tty}/epcaconfig.h | 0 + drivers/{char => staging/tty}/ip2/Makefile | 0 + drivers/{char => staging/tty}/ip2/i2cmd.c | 0 + drivers/{char => staging/tty}/ip2/i2cmd.h | 0 + drivers/{char => staging/tty}/ip2/i2ellis.c | 0 + drivers/{char => staging/tty}/ip2/i2ellis.h | 0 + drivers/{char => staging/tty}/ip2/i2hw.h | 0 + drivers/{char => staging/tty}/ip2/i2lib.c | 0 + drivers/{char => staging/tty}/ip2/i2lib.h | 0 + drivers/{char => staging/tty}/ip2/i2pack.h | 0 + drivers/{char => staging/tty}/ip2/ip2.h | 0 + drivers/{char => staging/tty}/ip2/ip2ioctl.h | 0 + drivers/{char => staging/tty}/ip2/ip2main.c | 12 +- + drivers/{char => staging/tty}/ip2/ip2trace.h | 0 + drivers/{char => staging/tty}/ip2/ip2types.h | 0 + drivers/{char => staging/tty}/istallion.c | 8 +- + drivers/{char => staging/tty}/riscom8.c | 8 +- + drivers/{char => staging/tty}/riscom8.h | 0 + drivers/{char => staging/tty}/riscom8_reg.h | 0 + drivers/{char => staging/tty}/serial167.c | 7 +- + drivers/{char => staging/tty}/specialix.c | 6 +- + drivers/{char => staging/tty}/specialix_io8.h | 0 + drivers/{char => staging/tty}/stallion.c | 9 +- + drivers/tty/Kconfig | 321 ++++++++++++ + drivers/tty/Makefile | 15 + + drivers/{char => tty}/amiserial.c | 8 +- + drivers/{char => tty}/bfin_jtag_comm.c | 0 + drivers/{char => tty}/cyclades.c | 6 +- + drivers/tty/hvc/Kconfig | 105 ++++ + drivers/tty/hvc/Makefile | 1 + + drivers/tty/hvc/hvc_bfin_jtag.c | 105 ++++ + drivers/tty/hvc/hvc_dcc.c | 43 +-- + drivers/tty/hvc/hvsi.c | 6 +- + drivers/{char/pcmcia => tty}/ipwireless/Makefile | 0 + drivers/{char/pcmcia => tty}/ipwireless/hardware.c | 0 + drivers/{char/pcmcia => tty}/ipwireless/hardware.h | 0 + drivers/{char/pcmcia => tty}/ipwireless/main.c | 0 + drivers/{char/pcmcia => tty}/ipwireless/main.h | 0 + drivers/{char/pcmcia => tty}/ipwireless/network.c | 0 + drivers/{char/pcmcia => tty}/ipwireless/network.h | 0 + .../pcmcia => tty}/ipwireless/setup_protocol.h | 0 + drivers/{char/pcmcia => tty}/ipwireless/tty.c | 8 +- + drivers/{char/pcmcia => tty}/ipwireless/tty.h | 0 + drivers/{char => tty}/isicom.c | 8 +- + drivers/{char => tty}/moxa.c | 10 +- + drivers/{char => tty}/moxa.h | 0 + drivers/{char => tty}/mxser.c | 6 +- + drivers/{char => tty}/mxser.h | 0 + drivers/tty/n_gsm.c | 6 +- + drivers/{char => tty}/nozomi.c | 10 +- + drivers/tty/pty.c | 4 +- + drivers/{char => tty}/rocket.c | 8 +- + drivers/{char => tty}/rocket.h | 0 + drivers/{char => tty}/rocket_int.h | 0 + drivers/tty/serial/68328serial.c | 25 +- + drivers/tty/serial/68328serial.h | 1 - + drivers/tty/serial/68360serial.c | 6 +- + drivers/tty/serial/8250.c | 33 +- + drivers/tty/serial/Kconfig | 18 +- + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/altera_jtaguart.c | 85 ++-- + drivers/tty/serial/altera_uart.c | 22 +- + drivers/tty/serial/atmel_serial.c | 16 + + drivers/tty/serial/bfin_sport_uart.c | 2 +- + drivers/tty/serial/crisv10.c | 7 +- + drivers/tty/serial/ifx6x60.c | 68 ++- + drivers/tty/serial/ifx6x60.h | 6 +- + drivers/tty/serial/mfd.c | 73 +--- + drivers/tty/serial/mrst_max3110.c | 2 +- + drivers/tty/serial/msm_smd_tty.c | 236 +++++++++ + drivers/tty/serial/of_serial.c | 18 +- + drivers/tty/serial/omap-serial.c | 11 +- + drivers/tty/serial/pch_uart.c | 320 +++++++++---- + drivers/tty/serial/serial_core.c | 22 +- + drivers/{char => tty}/synclink.c | 13 +- + drivers/{char => tty}/synclink_gt.c | 19 +- + drivers/{char => tty}/synclinkmp.c | 17 +- + drivers/tty/tty_io.c | 22 +- + drivers/tty/tty_ioctl.c | 14 +- + drivers/tty/tty_ldisc.c | 17 +- + drivers/tty/vt/keyboard.c | 5 +- + drivers/tty/vt/vc_screen.c | 110 +++-- + drivers/tty/vt/vt.c | 27 +- + drivers/tty/vt/vt_ioctl.c | 12 +- + drivers/usb/class/cdc-acm.c | 6 +- + drivers/usb/serial/ark3116.c | 6 +- + drivers/usb/serial/belkin_sa.c | 8 +- + drivers/usb/serial/ch341.c | 7 +- + drivers/usb/serial/cp210x.c | 19 +- + drivers/usb/serial/cypress_m8.c | 12 +- + drivers/usb/serial/digi_acceleport.c | 14 +- + drivers/usb/serial/ftdi_sio.c | 12 +- + drivers/usb/serial/io_edgeport.c | 12 +- + drivers/usb/serial/io_ti.c | 6 +- + drivers/usb/serial/iuu_phoenix.c | 4 +- + drivers/usb/serial/keyspan.c | 4 +- + drivers/usb/serial/keyspan.h | 5 +- + drivers/usb/serial/keyspan_pda.c | 4 +- + drivers/usb/serial/kl5kusb105.c | 8 +- + drivers/usb/serial/kobil_sct.c | 12 +- + drivers/usb/serial/mct_u232.c | 8 +- + drivers/usb/serial/mos7720.c | 8 +- + drivers/usb/serial/mos7840.c | 6 +- + drivers/usb/serial/opticon.c | 4 +- + drivers/usb/serial/oti6858.c | 12 +- + drivers/usb/serial/pl2303.c | 6 +- + drivers/usb/serial/sierra.c | 4 +- + drivers/usb/serial/spcp8x5.c | 6 +- + drivers/usb/serial/ssu100.c | 6 +- + drivers/usb/serial/ti_usb_3410_5052.c | 14 +- + drivers/usb/serial/usb-serial.c | 12 +- + drivers/usb/serial/usb-wwan.h | 6 +- + drivers/usb/serial/usb_wwan.c | 6 +- + drivers/usb/serial/whiteheat.c | 12 +- + include/asm-generic/ioctls.h | 1 + + include/linux/kbd_kern.h | 3 +- + include/linux/kd.h | 1 + + include/linux/spi/ifx_modem.h | 19 +- + include/linux/tty.h | 5 +- + include/linux/tty_driver.h | 13 +- + include/linux/usb/serial.h | 6 +- + include/linux/vt_kern.h | 8 - + include/net/irda/ircomm_tty.h | 6 +- + net/bluetooth/rfcomm/tty.c | 6 +- + net/irda/ircomm/ircomm_tty_ioctl.c | 12 +- + 213 files changed, 1862 insertions(+), 1352 deletions(-) + create mode 100644 drivers/staging/generic_serial/Kconfig + create mode 100644 drivers/staging/generic_serial/Makefile + create mode 100644 drivers/staging/generic_serial/TODO + rename drivers/{char => staging/generic_serial}/generic_serial.c (99%) + rename drivers/{char => staging/generic_serial}/rio/Makefile (100%) + rename drivers/{char => staging/generic_serial}/rio/board.h (100%) + rename drivers/{char => staging/generic_serial}/rio/cirrus.h (100%) + rename drivers/{char => staging/generic_serial}/rio/cmdblk.h (100%) + rename drivers/{char => staging/generic_serial}/rio/cmdpkt.h (100%) + rename drivers/{char => staging/generic_serial}/rio/daemon.h (100%) + rename drivers/{char => staging/generic_serial}/rio/errors.h (100%) + rename drivers/{char => staging/generic_serial}/rio/func.h (100%) + rename drivers/{char => staging/generic_serial}/rio/host.h (100%) + rename drivers/{char => staging/generic_serial}/rio/link.h (100%) + rename drivers/{char => staging/generic_serial}/rio/linux_compat.h (100%) + rename drivers/{char => staging/generic_serial}/rio/map.h (100%) + rename drivers/{char => staging/generic_serial}/rio/param.h (100%) + rename drivers/{char => staging/generic_serial}/rio/parmmap.h (100%) + rename drivers/{char => staging/generic_serial}/rio/pci.h (100%) + rename drivers/{char => staging/generic_serial}/rio/phb.h (100%) + rename drivers/{char => staging/generic_serial}/rio/pkt.h (100%) + rename drivers/{char => staging/generic_serial}/rio/port.h (100%) + rename drivers/{char => staging/generic_serial}/rio/protsts.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rio.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rio_linux.c (100%) + rename drivers/{char => staging/generic_serial}/rio/rio_linux.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rioboard.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rioboot.c (100%) + rename drivers/{char => staging/generic_serial}/rio/riocmd.c (100%) + rename drivers/{char => staging/generic_serial}/rio/rioctrl.c (100%) + rename drivers/{char => staging/generic_serial}/rio/riodrvr.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rioinfo.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rioinit.c (100%) + rename drivers/{char => staging/generic_serial}/rio/riointr.c (100%) + rename drivers/{char => staging/generic_serial}/rio/rioioctl.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rioparam.c (100%) + rename drivers/{char => staging/generic_serial}/rio/rioroute.c (100%) + rename drivers/{char => staging/generic_serial}/rio/riospace.h (100%) + rename drivers/{char => staging/generic_serial}/rio/riotable.c (100%) + rename drivers/{char => staging/generic_serial}/rio/riotty.c (100%) + rename drivers/{char => staging/generic_serial}/rio/route.h (100%) + rename drivers/{char => staging/generic_serial}/rio/rup.h (100%) + rename drivers/{char => staging/generic_serial}/rio/unixrup.h (100%) + rename drivers/{char => staging/generic_serial}/ser_a2232.c (99%) + rename drivers/{char => staging/generic_serial}/ser_a2232.h (100%) + rename drivers/{char => staging/generic_serial}/ser_a2232fw.ax (100%) + rename drivers/{char => staging/generic_serial}/ser_a2232fw.h (100%) + rename drivers/{char => staging/generic_serial}/sx.c (99%) + rename drivers/{char => staging/generic_serial}/sx.h (100%) + rename drivers/{char => staging/generic_serial}/sxboards.h (100%) + rename drivers/{char => staging/generic_serial}/sxwindow.h (100%) + rename drivers/{char => staging/generic_serial}/vme_scc.c (99%) + create mode 100644 drivers/staging/tty/Kconfig + create mode 100644 drivers/staging/tty/Makefile + create mode 100644 drivers/staging/tty/TODO + rename drivers/{char => staging/tty}/epca.c (99%) + rename drivers/{char => staging/tty}/epca.h (100%) + rename drivers/{char => staging/tty}/epcaconfig.h (100%) + rename drivers/{char => staging/tty}/ip2/Makefile (100%) + rename drivers/{char => staging/tty}/ip2/i2cmd.c (100%) + rename drivers/{char => staging/tty}/ip2/i2cmd.h (100%) + rename drivers/{char => staging/tty}/ip2/i2ellis.c (100%) + rename drivers/{char => staging/tty}/ip2/i2ellis.h (100%) + rename drivers/{char => staging/tty}/ip2/i2hw.h (100%) + rename drivers/{char => staging/tty}/ip2/i2lib.c (100%) + rename drivers/{char => staging/tty}/ip2/i2lib.h (100%) + rename drivers/{char => staging/tty}/ip2/i2pack.h (100%) + rename drivers/{char => staging/tty}/ip2/ip2.h (100%) + rename drivers/{char => staging/tty}/ip2/ip2ioctl.h (100%) + rename drivers/{char => staging/tty}/ip2/ip2main.c (99%) + rename drivers/{char => staging/tty}/ip2/ip2trace.h (100%) + rename drivers/{char => staging/tty}/ip2/ip2types.h (100%) + rename drivers/{char => staging/tty}/istallion.c (99%) + rename drivers/{char => staging/tty}/riscom8.c (99%) + rename drivers/{char => staging/tty}/riscom8.h (100%) + rename drivers/{char => staging/tty}/riscom8_reg.h (100%) + rename drivers/{char => staging/tty}/serial167.c (99%) + rename drivers/{char => staging/tty}/specialix.c (99%) + rename drivers/{char => staging/tty}/specialix_io8.h (100%) + rename drivers/{char => staging/tty}/stallion.c (99%) + create mode 100644 drivers/tty/Kconfig + rename drivers/{char => tty}/amiserial.c (99%) + rename drivers/{char => tty}/bfin_jtag_comm.c (100%) + rename drivers/{char => tty}/cyclades.c (99%) + create mode 100644 drivers/tty/hvc/Kconfig + create mode 100644 drivers/tty/hvc/hvc_bfin_jtag.c + rename drivers/{char/pcmcia => tty}/ipwireless/Makefile (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/hardware.c (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/hardware.h (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/main.c (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/main.h (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/network.c (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/network.h (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/setup_protocol.h (100%) + rename drivers/{char/pcmcia => tty}/ipwireless/tty.c (98%) + rename drivers/{char/pcmcia => tty}/ipwireless/tty.h (100%) + rename drivers/{char => tty}/isicom.c (99%) + rename drivers/{char => tty}/moxa.c (99%) + rename drivers/{char => tty}/moxa.h (100%) + rename drivers/{char => tty}/mxser.c (99%) + rename drivers/{char => tty}/mxser.h (100%) + rename drivers/{char => tty}/nozomi.c (99%) + rename drivers/{char => tty}/rocket.c (99%) + rename drivers/{char => tty}/rocket.h (100%) + rename drivers/{char => tty}/rocket_int.h (100%) + create mode 100644 drivers/tty/serial/msm_smd_tty.c + rename drivers/{char => tty}/synclink.c (99%) + rename drivers/{char => tty}/synclink_gt.c (99%) + rename drivers/{char => tty}/synclinkmp.c (99%) +Merging usb/usb-next +$ git merge usb/usb-next +Resolved 'arch/arm/mach-omap2/board-4430sdp.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/board-omap3evm.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/clock3xxx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/usb-musb.c' using previous resolution. +Resolved 'arch/arm/plat-omap/include/plat/usb.h' using previous resolution. +Resolved 'drivers/usb/gadget/Kconfig' using previous resolution. +Resolved 'drivers/usb/musb/musb_core.h' using previous resolution. +Auto-merging arch/arm/mach-omap2/Makefile +Auto-merging arch/arm/mach-omap2/board-3430sdp.c +Auto-merging arch/arm/mach-omap2/board-3630sdp.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-omap2/board-am3517crane.c +Auto-merging arch/arm/mach-omap2/board-am3517evm.c +Auto-merging arch/arm/mach-omap2/board-cm-t35.c +Auto-merging arch/arm/mach-omap2/board-cm-t3517.c +Auto-merging arch/arm/mach-omap2/board-devkit8000.c +Auto-merging arch/arm/mach-omap2/board-igep0020.c +Auto-merging arch/arm/mach-omap2/board-igep0030.c +Auto-merging arch/arm/mach-omap2/board-omap3beagle.c +Auto-merging arch/arm/mach-omap2/board-omap3evm.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c +Auto-merging arch/arm/mach-omap2/board-omap3pandora.c +Auto-merging arch/arm/mach-omap2/board-omap3stalker.c +Auto-merging arch/arm/mach-omap2/board-omap3touchbook.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-omap2/board-overo.c +Auto-merging arch/arm/mach-omap2/board-zoom.c +Auto-merging arch/arm/mach-omap2/clock3xxx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clock3xxx_data.c +Auto-merging arch/arm/mach-omap2/clock44xx_data.c +Auto-merging arch/arm/mach-omap2/omap_phy_internal.c +Auto-merging arch/arm/mach-omap2/usb-host.c +Auto-merging arch/arm/mach-omap2/usb-musb.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/usb-musb.c +Auto-merging arch/arm/plat-omap/include/plat/usb.h +CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/usb.h +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/gadget/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/gadget/Makefile +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging drivers/usb/host/ohci-hcd.c +Auto-merging drivers/usb/host/ohci.h +Auto-merging drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/musb/musb_core.h +CONFLICT (content): Merge conflict in drivers/usb/musb/musb_core.h +Auto-merging drivers/usb/musb/omap2430.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/keyspan.c +Auto-merging drivers/usb/serial/keyspan_pda.c +Auto-merging drivers/usb/serial/kobil_sct.c +Auto-merging drivers/usb/serial/mct_u232.c +Auto-merging drivers/usb/serial/mos7720.c +Auto-merging drivers/usb/serial/opticon.c +Auto-merging drivers/usb/serial/sierra.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/usb/serial/usb_wwan.c +Auto-merging include/linux/i2c/twl.h +Auto-merging include/linux/usb/serial.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fd0f3b1] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/usb/usbmon.txt | 42 +- + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/board-3430sdp.c | 10 +- + arch/arm/mach-omap2/board-3630sdp.c | 10 +- + arch/arm/mach-omap2/board-4430sdp.c | 1 + + arch/arm/mach-omap2/board-am3517crane.c | 10 +- + arch/arm/mach-omap2/board-am3517evm.c | 12 +- + arch/arm/mach-omap2/board-cm-t35.c | 10 +- + arch/arm/mach-omap2/board-cm-t3517.c | 10 +- + arch/arm/mach-omap2/board-devkit8000.c | 10 +- + arch/arm/mach-omap2/board-igep0020.c | 10 +- + arch/arm/mach-omap2/board-igep0030.c | 10 +- + arch/arm/mach-omap2/board-omap3beagle.c | 10 +- + arch/arm/mach-omap2/board-omap3evm.c | 14 +- + arch/arm/mach-omap2/board-omap3pandora.c | 10 +- + arch/arm/mach-omap2/board-omap3stalker.c | 10 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 10 +- + arch/arm/mach-omap2/board-omap4panda.c | 11 +- + arch/arm/mach-omap2/board-overo.c | 10 +- + arch/arm/mach-omap2/board-zoom.c | 10 +- + arch/arm/mach-omap2/clock3xxx_data.c | 19 +- + arch/arm/mach-omap2/clock44xx_data.c | 10 +- + arch/arm/mach-omap2/omap_phy_internal.c | 29 +- + arch/arm/mach-omap2/{usb-ehci.c => usb-host.c} | 306 +++-- + arch/arm/mach-omap2/usb-musb.c | 4 + + arch/arm/plat-omap/include/plat/usb.h | 55 +- + drivers/mfd/Kconfig | 9 + + drivers/mfd/Makefile | 1 + + drivers/mfd/omap-usb-host.c | 1061 ++++++++++++++ + drivers/usb/atm/ueagle-atm.c | 19 +- + drivers/usb/core/buffer.c | 26 +- + drivers/usb/core/hcd.c | 30 +- + drivers/usb/core/hub.c | 48 +- + drivers/usb/core/usb.h | 13 + + drivers/usb/early/ehci-dbgp.c | 2 +- + drivers/usb/gadget/Kconfig | 12 + + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/at91_udc.c | 4 +- + drivers/usb/gadget/ci13xxx_udc.c | 344 ++++-- + drivers/usb/gadget/ci13xxx_udc.h | 9 + + drivers/usb/gadget/composite.c | 14 +- + drivers/usb/gadget/epautoconf.c | 7 + + drivers/usb/gadget/f_fs.c | 8 + + drivers/usb/gadget/fsl_mxc_udc.c | 21 +- + drivers/usb/gadget/fusb300_udc.c | 1744 ++++++++++++++++++++++++ + drivers/usb/gadget/fusb300_udc.h | 687 ++++++++++ + drivers/usb/gadget/m66592-udc.c | 2 +- + drivers/usb/gadget/pch_udc.c | 178 ++- + drivers/usb/gadget/s3c2410_udc.c | 16 +- + drivers/usb/host/Kconfig | 29 +- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-hcd.c | 24 +- + drivers/usb/host/ehci-hub.c | 28 +- + drivers/usb/host/ehci-lpm.c | 5 +- + drivers/usb/host/ehci-msm.c | 96 +-- + drivers/usb/host/ehci-omap.c | 882 ++----------- + drivers/usb/host/ehci-orion.c | 5 +- + drivers/usb/host/ehci-pci.c | 45 +- + drivers/usb/host/ehci-pmcmsp.c | 383 ++++++ + drivers/usb/host/ehci-q.c | 18 +- + drivers/usb/host/ehci-sched.c | 76 +- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/imx21-hcd.c | 5 +- + drivers/usb/host/isp1362-hcd.c | 7 +- + drivers/usb/host/isp1760-hcd.c | 1382 +++++++++---------- + drivers/usb/host/isp1760-hcd.h | 56 +- + drivers/usb/host/ohci-hcd.c | 18 +- + drivers/usb/host/ohci-omap3.c | 584 +-------- + drivers/usb/host/ohci-pci.c | 110 +-- + drivers/usb/host/ohci-q.c | 4 +- + drivers/usb/host/ohci.h | 4 +- + drivers/usb/host/pci-quirks.c | 258 ++++ + drivers/usb/host/pci-quirks.h | 10 + + drivers/usb/misc/usbtest.c | 236 +++- + drivers/usb/mon/mon_text.c | 3 + + drivers/usb/musb/musb_core.c | 65 +- + drivers/usb/musb/musb_core.h | 8 +- + drivers/usb/musb/musb_gadget.c | 217 ++-- + drivers/usb/musb/musb_gadget.h | 7 +- + drivers/usb/musb/musb_gadget_ep0.c | 24 +- + drivers/usb/musb/musb_host.c | 4 +- + drivers/usb/musb/omap2430.c | 176 ++-- + drivers/usb/musb/tusb6010_omap.c | 4 +- + drivers/usb/otg/ab8500-usb.c | 6 +- + drivers/usb/otg/msm72k_otg.c | 31 +- + drivers/usb/otg/nop-usb-xceiv.c | 2 +- + drivers/usb/otg/twl4030-usb.c | 8 +- + drivers/usb/otg/twl6030-usb.c | 56 +- + drivers/usb/serial/ftdi_sio.c | 2 +- + drivers/usb/serial/keyspan.c | 10 +- + drivers/usb/serial/keyspan_pda.c | 15 +- + drivers/usb/serial/kobil_sct.c | 2 +- + drivers/usb/serial/mct_u232.c | 107 ++- + drivers/usb/serial/mos7720.c | 3 +- + drivers/usb/serial/opticon.c | 156 ++- + drivers/usb/serial/sierra.c | 16 +- + drivers/usb/serial/usb-serial.c | 5 +- + drivers/usb/serial/usb_wwan.c | 43 +- + drivers/usb/storage/Kconfig | 10 + + drivers/usb/storage/Makefile | 2 + + drivers/usb/storage/realtek_cr.c | 675 +++++++++ + drivers/usb/storage/unusual_realtek.h | 41 + + drivers/usb/storage/usual-tables.c | 1 + + drivers/usb/wusbcore/wusbhc.h | 2 +- + drivers/uwb/scan.c | 2 +- + include/linux/i2c/twl.h | 2 + + include/linux/usb.h | 1 + + include/linux/usb/Kbuild | 1 + + include/linux/usb/ch11.h | 4 +- + include/linux/usb/ch9.h | 2 +- + include/linux/usb/hcd.h | 19 +- + include/linux/usb/otg.h | 7 +- + include/linux/usb/serial.h | 3 +- + tools/usb/Makefile | 13 + + tools/usb/ffs-test.c | 4 +- + tools/usb/hcd-tests.sh | 275 ++++ + 116 files changed, 7811 insertions(+), 3395 deletions(-) + rename arch/arm/mach-omap2/{usb-ehci.c => usb-host.c} (68%) + create mode 100644 drivers/mfd/omap-usb-host.c + create mode 100644 drivers/usb/gadget/fusb300_udc.c + create mode 100644 drivers/usb/gadget/fusb300_udc.h + create mode 100644 drivers/usb/host/ehci-pmcmsp.c + create mode 100644 drivers/usb/storage/realtek_cr.c + create mode 100644 drivers/usb/storage/unusual_realtek.h + create mode 100644 tools/usb/Makefile + create mode 100644 tools/usb/hcd-tests.sh +Merging staging/staging-next +$ git merge staging/staging-next +Auto-merging MAINTAINERS +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Removing drivers/staging/autofs/Kconfig +Removing drivers/staging/autofs/Makefile +Removing drivers/staging/autofs/TODO +Removing drivers/staging/autofs/autofs_i.h +Removing drivers/staging/autofs/dirhash.c +Removing drivers/staging/autofs/init.c +Removing drivers/staging/autofs/inode.c +Removing drivers/staging/autofs/root.c +Removing drivers/staging/autofs/symlink.c +Removing drivers/staging/autofs/waitq.c +Removing drivers/staging/brcm80211/brcmfmac/Kconfig +Auto-merging drivers/staging/brcm80211/brcmfmac/bcmcdc.h +Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdbus.h +Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h +Auto-merging drivers/staging/brcm80211/brcmfmac/dhdioctl.h +Auto-merging drivers/staging/brcm80211/brcmfmac/hndrte_cons.h +Auto-merging drivers/staging/brcm80211/brcmfmac/msgtrace.h +Auto-merging drivers/staging/brcm80211/brcmfmac/sdiovar.h +Auto-merging drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +Auto-merging drivers/staging/brcm80211/brcmsmac/d11.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wl_export.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wl_mac80211.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wl_ucode.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_alloc.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_alloc.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_antsel.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_antsel.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_bmac.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_cfg.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_channel.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_channel.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_key.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_main.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_main.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_pub.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_rate.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_scb.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_stf.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_stf.h +Removing drivers/staging/brcm80211/include/bcmendian.h +Removing drivers/staging/brcm80211/include/packed_section_end.h +Removing drivers/staging/brcm80211/include/packed_section_start.h +Removing drivers/staging/brcm80211/include/proto/802.1d.h +Removing drivers/staging/brcm80211/include/proto/ethernet.h +Removing drivers/staging/brcm80211/include/proto/wpa.h +Removing drivers/staging/brcm80211/include/rpc_osl.h +Removing drivers/staging/brcm80211/include/sbhndpio.h +Removing drivers/staging/brcm80211/include/spid.h +Removing drivers/staging/brcm80211/sys/d11ucode_ext.h +Removing drivers/staging/brcm80211/sys/wl_ucode_loader.c +Removing drivers/staging/brcm80211/sys/wlc_event.c +Removing drivers/staging/brcm80211/sys/wlc_event.h +Removing drivers/staging/easycap/easycap_debug.h +Removing drivers/staging/easycap/easycap_ioctl.h +Removing drivers/staging/easycap/easycap_sound.h +Removing drivers/staging/easycap/easycap_standard.h +Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h +Removing drivers/staging/ft1000/ft1000-usbResolved 'drivers/staging/brcm80211/brcmsmac/wl_mac80211.c' using previous resolution. +/ft1000_hw.h +Auto-merging drivers/staging/hv/hv_util.c +Removing drivers/staging/hv/osd.c +Removing drivers/staging/hv/osd.h +Removing drivers/staging/iio/adc/ad7298.c +Removing drivers/staging/iio/gyro/adis16060.h +Removing drivers/staging/iio/gyro/adis16080.h +Removing drivers/staging/iio/gyro/adis16130.h +Removing drivers/staging/iio/gyro/adis16251.h +Removing drivers/staging/iio/gyro/adis16251_core.c +Auto-merging drivers/staging/quatech_usb2/quatech_usb2.c +Removing drivers/staging/rtl8192e/ieee80211.h +Removing drivers/staging/rtl8712/farray.h +Removing drivers/staging/smbfs/Kconfig +Removing drivers/staging/smbfs/Makefile +Removing drivers/staging/smbfs/TODO +Removing drivers/staging/smbfs/cache.c +Removing drivers/staging/smbfs/dir.c +Removing drivers/staging/smbfs/file.c +Removing drivers/staging/smbfs/getopt.c +Removing drivers/staging/smbfs/getopt.h +Removing drivers/staging/smbfs/inode.c +Removing drivers/staging/smbfs/ioctl.c +Removing drivers/staging/smbfs/proc.c +Removing drivers/staging/smbfs/proto.h +Removing drivers/staging/smbfs/request.c +Removing drivers/staging/smbfs/request.h +Removing drivers/staging/smbfs/smb.h +Removing drivers/staging/smbfs/smb_debug.h +Removing drivers/staging/smbfs/smb_fs.h +Removing drivers/staging/smbfs/smb_fs_i.h +Removing drivers/staging/smbfs/smb_fs_sb.h +Removing drivers/staging/smbfs/smb_mount.h +Removing drivers/staging/smbfs/smbfs.txt +Removing drivers/staging/smbfs/smbiod.c +Removing drivers/staging/smbfs/smbno.h +Removing drivers/staging/smbfs/sock.c +Removing drivers/staging/smbfs/symlink.c +Auto-merging drivers/staging/solo6x10/core.c +Auto-merging drivers/staging/solo6x10/disp.c +Auto-merging drivers/staging/solo6x10/enc.c +Auto-merging drivers/staging/solo6x10/g723.c +Auto-merging drivers/staging/solo6x10/gpio.c +Auto-merging drivers/staging/solo6x10/i2c.c +Auto-merging drivers/staging/solo6x10/jpeg.h +Auto-merging drivers/staging/solo6x10/offsets.h +Auto-merging drivers/staging/solo6x10/osd-font.h +Auto-merging drivers/staging/solo6x10/p2m.c +Auto-merging drivers/staging/solo6x10/registers.h +Auto-merging drivers/staging/solo6x10/solo6x10.h +Auto-merging drivers/staging/solo6x10/tw28.c +Auto-merging drivers/staging/solo6x10/tw28.h +Auto-merging drivers/staging/solo6x10/v4l2-enc.c +Auto-merging drivers/staging/solo6x10/v4l2.c +Removing drivers/staging/ti-st/Kconfig +Removing drivers/staging/ti-st/Makefile +Removing drivers/staging/ti-st/TODO +Removing drivers/staging/ti-st/bt_drv.c +Removing drivers/staging/ti-st/bt_drv.h +Removing drivers/staging/ti-st/sysfs-uim +Removing drivers/staging/tidspbridge/gen/gb.c +Removing drivers/staging/tidspbridge/gen/gs.c +Removing drivers/staging/tidspbridge/include/dspbridge/dbldefs.h +Removing drivers/staging/tidspbridge/include/dspbridge/dehdefs.h +Removing drivers/staging/tidspbridge/include/dspbridge/dispdefs.h +Removing drivers/staging/tidspbridge/include/dspbridge/drvdefs.h +Removing drivers/staging/tidspbridge/include/dspbridge/gb.h +Removing drivers/staging/tidspbridge/include/dspbridge/gs.h +Removing drivers/staging/tidspbridge/include/dspbridge/iodefs.h +Removing drivers/staging/tidspbridge/include/dspbridge/ldr.h +Removing drivers/staging/tidspbridge/include/dspbridge/list.h +Removing drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h +Removing drivers/staging/tidspbridge/include/dspbridge/utildefs.h +Removing drivers/staging/westbridge/astoria/device/cyandevice_export.h +Removing drivers/staging/xgifb/XGI_accel.c +Removing drivers/staging/xgifb/XGI_accel.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 29ce507] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 - + drivers/bluetooth/Kconfig | 10 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btwilink.c | 395 + + drivers/connector/cn_queue.c | 7 +- + drivers/connector/connector.c | 2 +- + drivers/staging/Kconfig | 12 +- + drivers/staging/Makefile | 15 +- + drivers/staging/ath6kl/TODO | 31 +- + drivers/staging/ath6kl/bmi/include/bmi_internal.h | 12 +- + drivers/staging/ath6kl/bmi/src/bmi.c | 352 +- + .../staging/ath6kl/hif/common/hif_sdio_common.h | 4 +- + .../hif/sdio/linux_sdio/include/hif_internal.h | 24 +- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 175 +- + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 36 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 303 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 206 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 136 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 140 +- + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 227 +- + drivers/staging/ath6kl/htc2/htc.c | 74 +- + drivers/staging/ath6kl/htc2/htc_internal.h | 40 +- + drivers/staging/ath6kl/htc2/htc_recv.c | 254 +- + drivers/staging/ath6kl/htc2/htc_send.c | 66 +- + drivers/staging/ath6kl/htc2/htc_services.c | 48 +- + drivers/staging/ath6kl/include/a_debug.h | 20 +- + drivers/staging/ath6kl/include/a_drv_api.h | 4 +- + drivers/staging/ath6kl/include/aggr_recv_api.h | 10 +- + drivers/staging/ath6kl/include/ar3kconfig.h | 20 +- + drivers/staging/ath6kl/include/ar6000_diag.h | 26 +- + drivers/staging/ath6kl/include/ar6kap_common.h | 10 +- + drivers/staging/ath6kl/include/athbtfilter.h | 2 +- + drivers/staging/ath6kl/include/bmi.h | 90 +- + .../ath6kl/include/common/AR6002/AR6002_regdump.h | 34 +- + .../staging/ath6kl/include/common/AR6002/addrs.h | 6 +- + drivers/staging/ath6kl/include/common/a_hci.h | 386 +- + drivers/staging/ath6kl/include/common/athdefs.h | 85 +- + drivers/staging/ath6kl/include/common/bmi_msg.h | 92 +- + drivers/staging/ath6kl/include/common/btcoexGpio.h | 4 +- + drivers/staging/ath6kl/include/common/dbglog.h | 26 +- + .../staging/ath6kl/include/common/dset_internal.h | 6 +- + drivers/staging/ath6kl/include/common/dsetid.h | 12 +- + .../staging/ath6kl/include/common/epping_test.h | 44 +- + drivers/staging/ath6kl/include/common/gmboxif.h | 16 +- + drivers/staging/ath6kl/include/common/htc.h | 84 +- + drivers/staging/ath6kl/include/common/ini_dset.h | 6 +- + drivers/staging/ath6kl/include/common/pkt_log.h | 8 +- + drivers/staging/ath6kl/include/common/regdump.h | 8 +- + .../include/common/regulatory/reg_dbschema.h | 96 +- + drivers/staging/ath6kl/include/common/targaddrs.h | 96 +- + drivers/staging/ath6kl/include/common/testcmd.h | 60 +- + drivers/staging/ath6kl/include/common/wlan_dset.h | 6 +- + drivers/staging/ath6kl/include/common/wmi.h | 1398 ++-- + drivers/staging/ath6kl/include/common/wmi_thin.h | 156 +- + drivers/staging/ath6kl/include/common/wmix.h | 88 +- + drivers/staging/ath6kl/include/common_drv.h | 46 +- + drivers/staging/ath6kl/include/dset_api.h | 30 +- + drivers/staging/ath6kl/include/gpio_api.h | 22 +- + drivers/staging/ath6kl/include/hci_transport_api.h | 38 +- + drivers/staging/ath6kl/include/hif.h | 82 +- + drivers/staging/ath6kl/include/htc_api.h | 108 +- + drivers/staging/ath6kl/include/htc_packet.h | 20 +- + drivers/staging/ath6kl/include/target_reg_table.h | 84 +- + drivers/staging/ath6kl/include/wlan_api.h | 76 +- + drivers/staging/ath6kl/include/wmi_api.h | 466 +- + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 166 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 130 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 4 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 112 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 25 +- + drivers/staging/ath6kl/miscdrv/common_drv.c | 275 +- + drivers/staging/ath6kl/miscdrv/credit_dist.c | 8 +- + drivers/staging/ath6kl/miscdrv/miscdrv.h | 2 +- + drivers/staging/ath6kl/os/linux/ar6000_android.c | 45 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 1261 ++-- + drivers/staging/ath6kl/os/linux/ar6000_pm.c | 194 +- + drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 54 +- + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 60 +- + drivers/staging/ath6kl/os/linux/cfg80211.c | 229 +- + drivers/staging/ath6kl/os/linux/eeprom.c | 62 +- + .../staging/ath6kl/os/linux/export_hci_transport.c | 42 +- + drivers/staging/ath6kl/os/linux/hci_bridge.c | 154 +- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 268 +- + drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 4 +- + .../ath6kl/os/linux/include/ar6xapi_linux.h | 159 +- + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 241 +- + .../ath6kl/os/linux/include/athtypes_linux.h | 1 - + drivers/staging/ath6kl/os/linux/include/cfg80211.h | 20 +- + .../ath6kl/os/linux/include/export_hci_transport.h | 22 +- + .../staging/ath6kl/os/linux/include/osapi_linux.h | 34 +- + .../staging/ath6kl/os/linux/include/wlan_config.h | 7 + + .../ath6kl/os/linux/include/wmi_filter_linux.h | 13 +- + drivers/staging/ath6kl/os/linux/ioctl.c | 890 +- + drivers/staging/ath6kl/os/linux/netbuf.c | 60 +- + drivers/staging/ath6kl/os/linux/wireless_ext.c | 300 +- + drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 42 +- + drivers/staging/ath6kl/reorder/rcv_aggr.c | 94 +- + drivers/staging/ath6kl/wlan/include/ieee80211.h | 72 +- + .../staging/ath6kl/wlan/include/ieee80211_node.h | 10 +- + drivers/staging/ath6kl/wlan/src/wlan_node.c | 55 +- + drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 40 +- + drivers/staging/ath6kl/wlan/src/wlan_utils.c | 6 +- + drivers/staging/ath6kl/wmi/wmi.c | 1560 ++-- + drivers/staging/ath6kl/wmi/wmi_host.h | 42 +- + drivers/staging/autofs/Kconfig | 22 - + drivers/staging/autofs/Makefile | 7 - + drivers/staging/autofs/TODO | 8 - + drivers/staging/autofs/autofs_i.h | 165 - + drivers/staging/autofs/dirhash.c | 260 - + drivers/staging/autofs/init.c | 52 - + drivers/staging/autofs/inode.c | 288 - + drivers/staging/autofs/root.c | 648 -- + drivers/staging/autofs/symlink.c | 26 - + drivers/staging/autofs/waitq.c | 205 - + drivers/staging/bcm/Bcmchar.c | 169 +- + drivers/staging/bcm/CmHost.c | 2 +- + drivers/staging/brcm80211/Kconfig | 18 +- + drivers/staging/brcm80211/Makefile | 63 +- + drivers/staging/brcm80211/brcmfmac/Kconfig | 15 - + drivers/staging/brcm80211/brcmfmac/Makefile | 35 +- + drivers/staging/brcm80211/brcmfmac/aiutils.c | 1 + + .../brcm80211/{include => brcmfmac}/bcmcdc.h | 4 +- + .../brcm80211/{include => brcmfmac}/bcmsdbus.h | 2 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 4 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 43 +- + .../brcm80211/{include => brcmfmac}/bcmsdh_sdmmc.h | 36 +- + drivers/staging/brcm80211/brcmfmac/bcmutils.c | 1 + + drivers/staging/brcm80211/brcmfmac/bcmwifi.c | 1 + + drivers/staging/brcm80211/brcmfmac/dhd.h | 74 +- + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 55 +- + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 238 +- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 5 +- + drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 28 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 102 +- + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 3 - + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 184 +- + .../brcm80211/{include => brcmfmac}/dhdioctl.h | 7 - + drivers/staging/brcm80211/brcmfmac/hndpmu.c | 1 + + .../{include => brcmfmac}/hndrte_armtrap.h | 0 + .../brcm80211/{include => brcmfmac}/hndrte_cons.h | 5 + + drivers/staging/brcm80211/brcmfmac/linux_osl.c | 1 + + .../brcm80211/{include => brcmfmac}/msgtrace.h | 10 +- + drivers/staging/brcm80211/brcmfmac/sbutils.c | 1 + + .../brcm80211/{include => brcmfmac}/sdioh.h | 0 + .../brcm80211/{include => brcmfmac}/sdiovar.h | 6 - + drivers/staging/brcm80211/brcmfmac/siutils.c | 1 + + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 196 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 23 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 459 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.h | 9 +- + drivers/staging/brcm80211/brcmsmac/Makefile | 64 + + .../staging/brcm80211/{include => brcmsmac}/d11.h | 158 +- + .../brcm80211/{ => brcmsmac}/phy/phy_version.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_cmn.c | 246 +- + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_hal.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_int.h | 2 +- + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.c | 51 +- + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c | 64 +- + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_radio.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phyreg_n.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.c | 1 - + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.c | 1 - + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.h | 0 + .../staging/brcm80211/{sys => brcmsmac}/wl_dbg.h | 0 + .../brcm80211/{sys => brcmsmac}/wl_export.h | 4 +- + .../brcm80211/{sys => brcmsmac}/wl_mac80211.c | 559 +- + .../brcm80211/{sys => brcmsmac}/wl_mac80211.h | 32 +- + .../staging/brcm80211/{sys => brcmsmac}/wl_ucode.h | 26 +- + .../staging/brcm80211/brcmsmac/wl_ucode_loader.c | 111 + + .../brcm80211/{sys => brcmsmac}/wlc_alloc.c | 212 +- + .../brcm80211/{sys => brcmsmac}/wlc_alloc.h | 11 +- + .../brcm80211/{sys => brcmsmac}/wlc_ampdu.c | 159 +- + .../brcm80211/{sys => brcmsmac}/wlc_ampdu.h | 6 +- + .../brcm80211/{sys => brcmsmac}/wlc_antsel.c | 54 +- + .../brcm80211/{sys => brcmsmac}/wlc_antsel.h | 9 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_bmac.c | 1140 +-- + .../staging/brcm80211/{sys => brcmsmac}/wlc_bmac.h | 103 +- + .../brcm80211/{sys => brcmsmac}/wlc_bsscfg.h | 21 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_cfg.h | 6 - + .../brcm80211/{sys => brcmsmac}/wlc_channel.c | 269 +- + .../brcm80211/{sys => brcmsmac}/wlc_channel.h | 41 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_key.h | 12 +- + .../{sys/wlc_mac80211.c => brcmsmac/wlc_main.c} | 1187 ++-- + .../{sys/wlc_mac80211.h => brcmsmac/wlc_main.h} | 119 +- + .../brcm80211/{sys => brcmsmac}/wlc_phy_shim.c | 43 +- + .../brcm80211/{sys => brcmsmac}/wlc_phy_shim.h | 0 + .../staging/brcm80211/{sys => brcmsmac}/wlc_pub.h | 72 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_rate.c | 27 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_rate.h | 0 + .../staging/brcm80211/{sys => brcmsmac}/wlc_scb.h | 4 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_stf.c | 118 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_stf.h | 7 +- + .../brcm80211/{sys => brcmsmac}/wlc_types.h | 0 + drivers/staging/brcm80211/include/bcmdefs.h | 14 + + drivers/staging/brcm80211/include/bcmendian.h | 303 - + drivers/staging/brcm80211/include/bcmnvram.h | 6 - + drivers/staging/brcm80211/include/bcmsdh.h | 15 +- + drivers/staging/brcm80211/include/bcmsrom.h | 6 +- + drivers/staging/brcm80211/include/bcmutils.h | 56 +- + drivers/staging/brcm80211/include/bcmwifi.h | 25 - + drivers/staging/brcm80211/include/hnddma.h | 46 +- + drivers/staging/brcm80211/include/hndpmu.h | 47 +- + drivers/staging/brcm80211/include/nicpci.h | 10 +- + drivers/staging/brcm80211/include/osl.h | 79 +- + .../staging/brcm80211/include/packed_section_end.h | 32 - + .../brcm80211/include/packed_section_start.h | 36 - + drivers/staging/brcm80211/include/pcicfg.h | 8 +- + drivers/staging/brcm80211/include/proto/802.11.h | 134 +- + drivers/staging/brcm80211/include/proto/802.1d.h | 37 - + drivers/staging/brcm80211/include/proto/bcmeth.h | 8 +- + drivers/staging/brcm80211/include/proto/bcmevent.h | 24 +- + drivers/staging/brcm80211/include/proto/ethernet.h | 72 - + drivers/staging/brcm80211/include/proto/wpa.h | 33 - + drivers/staging/brcm80211/include/rpc_osl.h | 33 - + drivers/staging/brcm80211/include/sbhnddma.h | 4 +- + drivers/staging/brcm80211/include/sbhndpio.h | 52 - + drivers/staging/brcm80211/include/sbsdio.h | 2 +- + drivers/staging/brcm80211/include/siutils.h | 18 +- + drivers/staging/brcm80211/include/spid.h | 155 - + drivers/staging/brcm80211/include/wlioctl.h | 39 +- + drivers/staging/brcm80211/sys/d11ucode_ext.h | 35 - + drivers/staging/brcm80211/sys/wl_ucode_loader.c | 89 - + drivers/staging/brcm80211/sys/wlc_event.c | 232 - + drivers/staging/brcm80211/sys/wlc_event.h | 52 - + drivers/staging/brcm80211/util/aiutils.c | 65 +- + drivers/staging/brcm80211/util/bcmotp.c | 48 +- + drivers/staging/brcm80211/util/bcmsrom.c | 159 +- + .../brcm80211/{include => util}/bcmsrom_tbl.h | 0 + drivers/staging/brcm80211/util/bcmutils.c | 69 +- + drivers/staging/brcm80211/util/bcmwifi.c | 56 - + drivers/staging/brcm80211/util/hnddma.c | 1507 +--- + drivers/staging/brcm80211/util/hndpmu.c | 657 +- + drivers/staging/brcm80211/util/linux_osl.c | 88 - + drivers/staging/brcm80211/util/nicpci.c | 144 +- + drivers/staging/brcm80211/util/nvram/nvram_ro.c | 10 +- + .../staging/brcm80211/{include => util}/pci_core.h | 0 + .../staging/brcm80211/{include => util}/sbpcmcia.h | 0 + .../staging/brcm80211/{include => util}/sbsocram.h | 0 + drivers/staging/brcm80211/util/sbutils.c | 123 +- + drivers/staging/brcm80211/util/siutils.c | 218 +- + drivers/staging/brcm80211/util/siutils_priv.h | 2 - + drivers/staging/comedi/comedi_fops.c | 23 +- + drivers/staging/comedi/drivers.c | 4 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 62 +- + drivers/staging/comedi/drivers/icp_multi.c | 14 +- + drivers/staging/comedi/drivers/me4000.c | 8 +- + drivers/staging/comedi/drivers/pcl816.c | 2 +- + drivers/staging/comedi/drivers/pcl818.c | 4 +- + drivers/staging/comedi/drivers/rtd520.c | 321 +- + drivers/staging/cs5535_gpio/cs5535_gpio.c | 3 +- + drivers/staging/cxt1e1/hwprobe.c | 2 +- + drivers/staging/cxt1e1/linux.c | 2 +- + drivers/staging/cxt1e1/pmcc4.h | 2 +- + drivers/staging/cxt1e1/pmcc4_drv.c | 2 +- + drivers/staging/dabusb/dabusb.c | 338 +- + drivers/staging/dabusb/dabusb.h | 41 +- + drivers/staging/easycap/Kconfig | 43 +- + drivers/staging/easycap/Makefile | 17 +- + drivers/staging/easycap/easycap.h | 548 +- + drivers/staging/easycap/easycap_debug.h | 29 - + drivers/staging/easycap/easycap_ioctl.c | 4374 ++++----- + drivers/staging/easycap/easycap_ioctl.h | 28 - + drivers/staging/easycap/easycap_low.c | 1511 ++-- + drivers/staging/easycap/easycap_main.c | 7562 +++++++-------- + drivers/staging/easycap/easycap_settings.c | 49 +- + drivers/staging/easycap/easycap_sound.c | 1737 ++-- + drivers/staging/easycap/easycap_sound.h | 28 - + drivers/staging/easycap/easycap_sound_oss.c | 962 ++ + drivers/staging/easycap/easycap_standard.h | 27 - + drivers/staging/easycap/easycap_testcard.c | 495 +- + drivers/staging/echo/echo.c | 2 +- + drivers/staging/et131x/et1310_eeprom.c | 8 +- + drivers/staging/et131x/et1310_mac.c | 74 +- + drivers/staging/et131x/et1310_phy.c | 70 +- + drivers/staging/et131x/et1310_phy.h | 649 +- + drivers/staging/et131x/et1310_pm.c | 34 +- + drivers/staging/et131x/et1310_rx.c | 65 +- + drivers/staging/et131x/et1310_tx.c | 4 +- + drivers/staging/et131x/et131x.h | 4 +- + drivers/staging/et131x/et131x_adapter.h | 63 +- + drivers/staging/et131x/et131x_initpci.c | 50 +- + drivers/staging/et131x/et131x_isr.c | 18 +- + drivers/staging/et131x/et131x_netdev.c | 2 +- + drivers/staging/ft1000/Kconfig | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 263 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h | 1 - + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 3 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 36 +- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 1545 ++-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 505 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.h | 10 - + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 2 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 16 +- + drivers/staging/gma500/Kconfig | 12 + + drivers/staging/gma500/Makefile | 31 + + drivers/staging/gma500/TODO | 26 + + drivers/staging/gma500/psb_2d.c | 411 + + drivers/staging/gma500/psb_bl.c | 167 + + drivers/staging/gma500/psb_buffer.c | 450 + + drivers/staging/gma500/psb_drm.h | 696 ++ + drivers/staging/gma500/psb_drv.c | 1687 ++++ + drivers/staging/gma500/psb_drv.h | 1152 +++ + drivers/staging/gma500/psb_fb.c | 842 ++ + drivers/staging/gma500/psb_fb.h | 59 + + drivers/staging/gma500/psb_fence.c | 122 + + drivers/staging/gma500/psb_gtt.c | 1034 ++ + drivers/staging/gma500/psb_gtt.h | 105 + + drivers/staging/gma500/psb_intel_bios.c | 301 + + drivers/staging/gma500/psb_intel_bios.h | 430 + + drivers/staging/gma500/psb_intel_display.c | 1489 +++ + drivers/staging/gma500/psb_intel_display.h | 25 + + drivers/staging/gma500/psb_intel_drv.h | 247 + + drivers/staging/gma500/psb_intel_i2c.c | 169 + + drivers/staging/gma500/psb_intel_lvds.c | 889 ++ + drivers/staging/gma500/psb_intel_modes.c | 77 + + drivers/staging/gma500/psb_intel_opregion.c | 78 + + drivers/staging/gma500/psb_intel_reg.h | 1200 +++ + drivers/staging/gma500/psb_intel_sdvo.c | 1298 +++ + drivers/staging/gma500/psb_intel_sdvo_regs.h | 338 + + drivers/staging/gma500/psb_irq.c | 639 ++ + drivers/staging/gma500/psb_irq.h | 49 + + drivers/staging/gma500/psb_mmu.c | 919 ++ + drivers/staging/gma500/psb_powermgmt.c | 797 ++ + drivers/staging/gma500/psb_powermgmt.h | 96 + + drivers/staging/gma500/psb_pvr_glue.c | 73 + + drivers/staging/gma500/psb_pvr_glue.h | 25 + + drivers/staging/gma500/psb_reg.h | 588 ++ + drivers/staging/gma500/psb_reset.c | 90 + + drivers/staging/gma500/psb_sgx.c | 238 + + drivers/staging/gma500/psb_sgx.h | 32 + + drivers/staging/gma500/psb_ttm_fence.c | 605 ++ + drivers/staging/gma500/psb_ttm_fence_api.h | 272 + + drivers/staging/gma500/psb_ttm_fence_driver.h | 302 + + drivers/staging/gma500/psb_ttm_fence_user.c | 237 + + drivers/staging/gma500/psb_ttm_fence_user.h | 140 + + drivers/staging/gma500/psb_ttm_glue.c | 349 + + drivers/staging/gma500/psb_ttm_placement_user.c | 628 ++ + drivers/staging/gma500/psb_ttm_placement_user.h | 252 + + drivers/staging/gma500/psb_ttm_userobj_api.h | 85 + + drivers/staging/go7007/Kconfig | 1 - + drivers/staging/go7007/s2250-loader.c | 3 - + drivers/staging/hv/Kconfig | 8 + + drivers/staging/hv/Makefile | 5 +- + drivers/staging/hv/blkvsc.c | 24 +- + drivers/staging/hv/blkvsc_drv.c | 60 +- + drivers/staging/hv/channel.c | 223 +- + drivers/staging/hv/channel.h | 4 +- + drivers/staging/hv/channel_mgmt.c | 167 +- + drivers/staging/hv/channel_mgmt.h | 40 +- + drivers/staging/hv/connection.c | 212 +- + drivers/staging/hv/hv.c | 16 +- + drivers/staging/hv/hv_api.h | 5 + + drivers/staging/hv/hv_kvp.c | 346 + + drivers/staging/hv/hv_kvp.h | 184 + + drivers/staging/hv/hv_mouse_drv.c | 335 + + drivers/staging/hv/{hv_utils.c => hv_util.c} | 22 +- + drivers/staging/hv/logging.h | 3 + + drivers/staging/hv/mouse_vsc.c | 763 ++ + drivers/staging/hv/mousevsc_api.h | 73 + + drivers/staging/hv/netvsc.c | 283 +- + drivers/staging/hv/netvsc.h | 29 +- + drivers/staging/hv/netvsc_drv.c | 46 +- + drivers/staging/hv/osd.c | 194 - + drivers/staging/hv/osd.h | 66 - + drivers/staging/hv/ring_buffer.c | 1 - + drivers/staging/hv/ring_buffer.h | 2 +- + drivers/staging/hv/rndis_filter.c | 107 +- + drivers/staging/hv/storvsc.c | 152 +- + drivers/staging/hv/storvsc_drv.c | 34 +- + drivers/staging/hv/tools/hv_kvp_daemon.c | 470 + + drivers/staging/hv/utils.h | 15 +- + drivers/staging/hv/vmbus_api.h | 68 +- + drivers/staging/hv/vmbus_channel_interface.h | 28 +- + drivers/staging/hv/vmbus_drv.c | 247 +- + drivers/staging/hv/vmbus_hid_protocol.h | 120 + + drivers/staging/hv/vmbus_packet_format.h | 138 +- + drivers/staging/hv/vmbus_private.h | 59 +- + drivers/staging/hv/vstorage.h | 6 +- + drivers/staging/iio/Documentation/dac/max517 | 41 + + drivers/staging/iio/Documentation/generic_buffer.c | 66 +- + drivers/staging/iio/Documentation/iio_utils.h | 13 +- + drivers/staging/iio/Documentation/sysfs-bus-iio | 49 + + .../iio/Documentation/sysfs-bus-iio-trigger-sysfs | 11 + + drivers/staging/iio/Kconfig | 9 + + drivers/staging/iio/Makefile | 1 + + drivers/staging/iio/accel/Kconfig | 23 +- + drivers/staging/iio/accel/lis3l02dq.h | 10 + + drivers/staging/iio/accel/lis3l02dq_ring.c | 9 +- + drivers/staging/iio/adc/Kconfig | 35 +- + drivers/staging/iio/adc/Makefile | 11 +- + drivers/staging/iio/adc/ad7298.c | 501 - + drivers/staging/iio/adc/ad7298.h | 80 + + drivers/staging/iio/adc/ad7298_core.c | 287 + + drivers/staging/iio/adc/ad7298_ring.c | 258 + + drivers/staging/iio/adc/ad7476.h | 1 + + drivers/staging/iio/adc/ad7476_core.c | 2 +- + drivers/staging/iio/adc/ad7476_ring.c | 37 +- + drivers/staging/iio/adc/ad7606.h | 117 + + drivers/staging/iio/adc/ad7606_core.c | 556 ++ + drivers/staging/iio/adc/ad7606_par.c | 188 + + drivers/staging/iio/adc/ad7606_ring.c | 280 + + drivers/staging/iio/adc/ad7606_spi.c | 126 + + drivers/staging/iio/adc/ad7887.h | 1 + + drivers/staging/iio/adc/ad7887_ring.c | 36 +- + drivers/staging/iio/adc/ad799x.h | 1 + + drivers/staging/iio/adc/ad799x_core.c | 12 + + drivers/staging/iio/adc/ad799x_ring.c | 43 +- + drivers/staging/iio/dac/Kconfig | 14 +- + drivers/staging/iio/dac/Makefile | 1 + + drivers/staging/iio/dac/ad5446.c | 12 + + drivers/staging/iio/dac/ad5446.h | 2 + + drivers/staging/iio/dac/max517.c | 298 + + drivers/staging/iio/dac/max517.h | 19 + + drivers/staging/iio/dds/Kconfig | 5 +- + drivers/staging/iio/dds/ad9832.c | 488 +- + drivers/staging/iio/dds/ad9832.h | 128 + + drivers/staging/iio/gyro/Kconfig | 14 +- + drivers/staging/iio/gyro/adis16060.h | 101 - + drivers/staging/iio/gyro/adis16060_core.c | 178 +- + drivers/staging/iio/gyro/adis16080.h | 102 - + drivers/staging/iio/gyro/adis16080_core.c | 163 +- + drivers/staging/iio/gyro/adis16130.h | 108 - + drivers/staging/iio/gyro/adis16130_core.c | 207 +- + drivers/staging/iio/gyro/adis16251.h | 185 - + drivers/staging/iio/gyro/adis16251_core.c | 777 -- + drivers/staging/iio/gyro/adis16260_core.c | 49 +- + drivers/staging/iio/industrialio-ring.c | 25 +- + drivers/staging/iio/kfifo_buf.c | 196 + + drivers/staging/iio/kfifo_buf.h | 56 + + drivers/staging/iio/meter/ade7753.c | 208 +- + drivers/staging/iio/meter/ade7753.h | 64 - + drivers/staging/iio/meter/ade7754.c | 165 +- + drivers/staging/iio/meter/ade7754.h | 67 - + drivers/staging/iio/meter/ade7759.c | 165 +- + drivers/staging/iio/meter/ade7759.h | 65 - + drivers/staging/iio/meter/ade7854-spi.c | 120 +- + drivers/staging/iio/meter/ade7854.c | 78 +- + drivers/staging/iio/meter/ade7854.h | 69 - + drivers/staging/iio/ring_generic.h | 2 +- + drivers/staging/iio/ring_sw.c | 27 +- + drivers/staging/iio/ring_sw.h | 4 +- + drivers/staging/iio/trigger/Kconfig | 20 + + drivers/staging/iio/trigger/Makefile | 2 + + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 252 + + drivers/staging/iio/trigger/iio-trig-sysfs.c | 108 + + .../staging/intel_sst/intel_sst_stream_encoded.c | 8 +- + drivers/staging/intel_sst/intelmid.h | 4 +- + drivers/staging/intel_sst/intelmid_v0_control.c | 2 +- + drivers/staging/intel_sst/intelmid_v1_control.c | 4 +- + drivers/staging/intel_sst/intelmid_v2_control.c | 4 +- + drivers/staging/keucr/TODO | 3 +- + drivers/staging/keucr/smcommon.h | 2 - + drivers/staging/keucr/smilecc.c | 16 +- + drivers/staging/keucr/smilsub.c | 106 +- + drivers/staging/lirc/lirc_parallel.c | 2 +- + drivers/staging/msm/lcdc.c | 4 +- + drivers/staging/msm/mddi_toshiba.h | 30 +- + drivers/staging/msm/mddihost.h | 30 +- + drivers/staging/msm/mddihosti.h | 30 +- + drivers/staging/msm/mdp.h | 30 +- + drivers/staging/msm/mdp4.h | 30 +- + drivers/staging/msm/mdp_ppp_dq.h | 31 +- + drivers/staging/msm/msm_fb.h | 30 +- + drivers/staging/msm/msm_fb_def.h | 30 +- + drivers/staging/msm/msm_fb_panel.h | 30 +- + drivers/staging/msm/tvenc.h | 30 +- + drivers/staging/octeon/cvmx-cmd-queue.h | 16 +- + drivers/staging/octeon/cvmx-pko.c | 2 +- + drivers/staging/olpc_dcon/Kconfig | 22 +- + drivers/staging/olpc_dcon/Makefile | 7 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 599 +- + drivers/staging/olpc_dcon/olpc_dcon.h | 63 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 12 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 109 +- + drivers/staging/pohmelfs/config.c | 2 +- + drivers/staging/pohmelfs/dir.c | 1 - + drivers/staging/pohmelfs/inode.c | 10 +- + drivers/staging/pohmelfs/netfs.h | 2 +- + drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- + drivers/staging/quickstart/quickstart.c | 5 +- + drivers/staging/rt2860/common/ba_action.c | 2 +- + drivers/staging/rt2860/common/cmm_data.c | 2 +- + drivers/staging/rt2860/common/cmm_mac_pci.c | 2 +- + drivers/staging/rt2860/rt_linux.c | 3 +- + drivers/staging/rt2860/rt_linux.h | 12 +- + drivers/staging/rt2860/rtmp.h | 2 +- + drivers/staging/rt2860/wpa.h | 12 +- + drivers/staging/rtl8192e/dot11d.h | 9 +- + drivers/staging/rtl8192e/ieee80211.h | 2683 ----- + drivers/staging/rtl8192e/ieee80211/dot11d.c | 3 - + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 224 +- + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 6 - + .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 25 - + .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 1 - + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 224 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 275 +- + .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 33 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 46 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 19 +- + .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 207 +- + .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 41 +- + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 1 - + drivers/staging/rtl8192e/r8180_93cx6.c | 58 +- + drivers/staging/rtl8192e/r8190_rtl8256.c | 670 +-- + drivers/staging/rtl8192e/r8190_rtl8256.h | 4 - + drivers/staging/rtl8192e/r8192E.h | 537 +- + drivers/staging/rtl8192e/r8192E_core.c | 2259 +---- + drivers/staging/rtl8192e/r8192E_dm.c | 1340 +--- + drivers/staging/rtl8192e/r8192E_dm.h | 117 +- + drivers/staging/rtl8192e/r8192E_hw.h | 18 +- + drivers/staging/rtl8192e/r8192E_wx.c | 87 +- + drivers/staging/rtl8192e/r8192E_wx.h | 3 - + drivers/staging/rtl8192e/r8192_pm.c | 63 +- + drivers/staging/rtl8192e/r819xE_cmdpkt.c | 168 +- + drivers/staging/rtl8192e/r819xE_firmware.c | 14 +- + drivers/staging/rtl8192e/r819xE_phy.c | 1339 +--- + drivers/staging/rtl8192e/r819xE_phy.h | 20 - + drivers/staging/rtl8192u/r8192U.h | 6 - + drivers/staging/rtl8192u/r819xU_firmware.c | 76 +- + drivers/staging/rtl8192u/r819xU_firmware_img.c | 2900 ------ + drivers/staging/rtl8192u/r819xU_firmware_img.h | 7 - + drivers/staging/rtl8712/Kconfig | 1 + + drivers/staging/rtl8712/TODO | 2 - + drivers/staging/rtl8712/farray.h |10197 -------------------- + drivers/staging/rtl8712/hal_init.c | 23 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 23 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 2 - + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 2 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 2 +- + drivers/staging/rts_pstor/Kconfig | 16 + + drivers/staging/rts_pstor/Makefile | 16 + + drivers/staging/rts_pstor/TODO | 5 + + drivers/staging/rts_pstor/debug.h | 43 + + drivers/staging/rts_pstor/general.c | 35 + + drivers/staging/rts_pstor/general.h | 31 + + drivers/staging/rts_pstor/ms.c | 4244 ++++++++ + drivers/staging/rts_pstor/ms.h | 225 + + drivers/staging/rts_pstor/rtsx.c | 1124 +++ + drivers/staging/rts_pstor/rtsx.h | 183 + + drivers/staging/rts_pstor/rtsx_card.c | 1257 +++ + drivers/staging/rts_pstor/rtsx_card.h | 1093 +++ + drivers/staging/rts_pstor/rtsx_chip.c | 2337 +++++ + drivers/staging/rts_pstor/rtsx_chip.h | 989 ++ + drivers/staging/rts_pstor/rtsx_scsi.c | 3203 ++++++ + drivers/staging/rts_pstor/rtsx_scsi.h | 142 + + drivers/staging/rts_pstor/rtsx_sys.h | 50 + + drivers/staging/rts_pstor/rtsx_transport.c | 778 ++ + drivers/staging/rts_pstor/rtsx_transport.h | 66 + + drivers/staging/rts_pstor/sd.c | 4768 +++++++++ + drivers/staging/rts_pstor/sd.h | 295 + + drivers/staging/rts_pstor/spi.c | 812 ++ + drivers/staging/rts_pstor/spi.h | 65 + + drivers/staging/rts_pstor/trace.h | 117 + + drivers/staging/rts_pstor/xd.c | 2051 ++++ + drivers/staging/rts_pstor/xd.h | 188 + + drivers/staging/samsung-laptop/samsung-laptop.c | 618 +- + drivers/staging/sep/TODO | 1 + + drivers/staging/sep/sep_driver.c | 317 +- + drivers/staging/sep/sep_driver_api.h | 4 +- + drivers/staging/sep/sep_driver_config.h | 4 + + drivers/staging/smbfs/Kconfig | 56 - + drivers/staging/smbfs/Makefile | 18 - + drivers/staging/smbfs/TODO | 8 - + drivers/staging/smbfs/cache.c | 208 - + drivers/staging/smbfs/dir.c | 699 -- + drivers/staging/smbfs/file.c | 456 - + drivers/staging/smbfs/getopt.c | 64 - + drivers/staging/smbfs/getopt.h | 14 - + drivers/staging/smbfs/inode.c | 854 -- + drivers/staging/smbfs/ioctl.c | 68 - + drivers/staging/smbfs/proc.c | 3502 ------- + drivers/staging/smbfs/proto.h | 89 - + drivers/staging/smbfs/request.c | 817 -- + drivers/staging/smbfs/request.h | 70 - + drivers/staging/smbfs/smb.h | 118 - + drivers/staging/smbfs/smb_debug.h | 34 - + drivers/staging/smbfs/smb_fs.h | 153 - + drivers/staging/smbfs/smb_fs_i.h | 37 - + drivers/staging/smbfs/smb_fs_sb.h | 100 - + drivers/staging/smbfs/smb_mount.h | 65 - + drivers/staging/smbfs/smbfs.txt | 8 - + drivers/staging/smbfs/smbiod.c | 343 - + drivers/staging/smbfs/smbno.h | 363 - + drivers/staging/smbfs/sock.c | 385 - + drivers/staging/smbfs/symlink.c | 67 - + drivers/staging/solo6x10/Makefile | 5 +- + .../staging/solo6x10/{solo6010-core.c => core.c} | 105 +- + .../staging/solo6x10/{solo6010-disp.c => disp.c} | 21 +- + drivers/staging/solo6x10/{solo6010-enc.c => enc.c} | 56 +- + .../staging/solo6x10/{solo6010-g723.c => g723.c} | 48 +- + .../staging/solo6x10/{solo6010-gpio.c => gpio.c} | 15 +- + drivers/staging/solo6x10/{solo6010-i2c.c => i2c.c} | 34 +- + .../staging/solo6x10/{solo6010-jpeg.h => jpeg.h} | 6 +- + .../solo6x10/{solo6010-offsets.h => offsets.h} | 22 +- + .../solo6x10/{solo6010-osd-font.h => osd-font.h} | 6 +- + drivers/staging/solo6x10/{solo6010-p2m.c => p2m.c} | 51 +- + .../solo6x10/{solo6010-registers.h => registers.h} | 90 +- + .../staging/solo6x10/{solo6010.h => solo6x10.h} | 105 +- + .../staging/solo6x10/{solo6010-tw28.c => tw28.c} | 38 +- + .../staging/solo6x10/{solo6010-tw28.h => tw28.h} | 26 +- + .../solo6x10/{solo6010-v4l2-enc.c => v4l2-enc.c} | 389 +- + .../staging/solo6x10/{solo6010-v4l2.c => v4l2.c} | 72 +- + drivers/staging/speakup/keyhelp.c | 4 +- + drivers/staging/speakup/main.c | 127 +- + drivers/staging/speakup/spk_priv_keyinfo.h | 44 +- + drivers/staging/speakup/spk_types.h | 18 +- + drivers/staging/spectra/flash.c | 2 +- + drivers/staging/spectra/lld_nand.c | 2 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 10 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 1 - + drivers/staging/ti-st/Kconfig | 14 - + drivers/staging/ti-st/Makefile | 5 - + drivers/staging/ti-st/TODO | 8 - + drivers/staging/ti-st/bt_drv.c | 509 - + drivers/staging/ti-st/bt_drv.h | 61 - + drivers/staging/ti-st/sysfs-uim | 28 - + drivers/staging/tidspbridge/Makefile | 2 +- + drivers/staging/tidspbridge/TODO | 1 - + drivers/staging/tidspbridge/core/_deh.h | 2 +- + drivers/staging/tidspbridge/core/_msg_sm.h | 16 +- + drivers/staging/tidspbridge/core/_tiomap.h | 30 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 676 +- + drivers/staging/tidspbridge/core/dsp-clock.c | 52 +- + drivers/staging/tidspbridge/core/io_sm.c | 672 +- + drivers/staging/tidspbridge/core/msg_sm.c | 619 +- + drivers/staging/tidspbridge/core/tiomap3430.c | 199 +- + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 112 +- + drivers/staging/tidspbridge/core/tiomap_io.c | 96 +- + drivers/staging/tidspbridge/core/ue_deh.c | 28 +- + drivers/staging/tidspbridge/dynload/cload.c | 102 +- + .../staging/tidspbridge/dynload/dload_internal.h | 6 +- + drivers/staging/tidspbridge/gen/gb.c | 166 - + drivers/staging/tidspbridge/gen/gh.c | 38 +- + drivers/staging/tidspbridge/gen/gs.c | 88 - + drivers/staging/tidspbridge/gen/uuidutil.c | 22 +- + .../tidspbridge/include/dspbridge/_chnl_sm.h | 26 +- + .../tidspbridge/include/dspbridge/brddefs.h | 2 - + .../tidspbridge/include/dspbridge/cfgdefs.h | 50 +- + .../staging/tidspbridge/include/dspbridge/chnl.h | 21 - + .../tidspbridge/include/dspbridge/chnldefs.h | 9 +- + .../tidspbridge/include/dspbridge/chnlpriv.h | 21 +- + .../staging/tidspbridge/include/dspbridge/cmm.h | 2 +- + .../tidspbridge/include/dspbridge/cmmdefs.h | 39 +- + .../staging/tidspbridge/include/dspbridge/cod.h | 13 +- + .../tidspbridge/include/dspbridge/dbdcddef.h | 14 +- + .../staging/tidspbridge/include/dspbridge/dbdefs.h | 98 +- + .../tidspbridge/include/dspbridge/dbldefs.h | 141 - + .../staging/tidspbridge/include/dspbridge/dbll.h | 6 - + .../tidspbridge/include/dspbridge/dblldefs.h | 65 - + .../tidspbridge/include/dspbridge/dehdefs.h | 32 - + .../staging/tidspbridge/include/dspbridge/dev.h | 65 +- + .../staging/tidspbridge/include/dspbridge/disp.h | 15 +- + .../tidspbridge/include/dspbridge/dispdefs.h | 35 - + .../staging/tidspbridge/include/dspbridge/drv.h | 42 +- + .../tidspbridge/include/dspbridge/drvdefs.h | 25 - + .../tidspbridge/include/dspbridge/dspapi-ioctl.h | 216 +- + .../tidspbridge/include/dspbridge/dspdefs.h | 88 +- + .../staging/tidspbridge/include/dspbridge/dspdrv.h | 2 - + .../staging/tidspbridge/include/dspbridge/dspio.h | 4 +- + .../tidspbridge/include/dspbridge/dspioctl.h | 13 +- + .../tidspbridge/include/dspbridge/dynamic_loader.h | 2 - + drivers/staging/tidspbridge/include/dspbridge/gb.h | 79 - + drivers/staging/tidspbridge/include/dspbridge/gs.h | 59 - + .../tidspbridge/include/dspbridge/host_os.h | 9 - + drivers/staging/tidspbridge/include/dspbridge/io.h | 29 +- + .../staging/tidspbridge/include/dspbridge/io_sm.h | 143 +- + .../staging/tidspbridge/include/dspbridge/iodefs.h | 36 - + .../staging/tidspbridge/include/dspbridge/ldr.h | 29 - + .../staging/tidspbridge/include/dspbridge/list.h | 225 - + .../staging/tidspbridge/include/dspbridge/mbx_sh.h | 40 - + .../tidspbridge/include/dspbridge/mgrpriv.h | 4 +- + .../tidspbridge/include/dspbridge/nldrdefs.h | 24 +- + .../staging/tidspbridge/include/dspbridge/node.h | 22 +- + .../tidspbridge/include/dspbridge/nodepriv.h | 10 +- + .../staging/tidspbridge/include/dspbridge/pwr.h | 8 +- + .../staging/tidspbridge/include/dspbridge/pwr_sh.h | 33 - + .../include/dspbridge/resourcecleanup.h | 11 - + .../staging/tidspbridge/include/dspbridge/rms_sh.h | 9 - + .../staging/tidspbridge/include/dspbridge/strm.h | 62 - + .../tidspbridge/include/dspbridge/strmdefs.h | 6 +- + .../staging/tidspbridge/include/dspbridge/sync.h | 14 +- + .../tidspbridge/include/dspbridge/utildefs.h | 39 - + drivers/staging/tidspbridge/pmgr/chnl.c | 4 +- + drivers/staging/tidspbridge/pmgr/cmm.c | 675 +- + drivers/staging/tidspbridge/pmgr/cod.c | 20 +- + drivers/staging/tidspbridge/pmgr/dbll.c | 53 +- + drivers/staging/tidspbridge/pmgr/dev.c | 355 +- + drivers/staging/tidspbridge/pmgr/dspapi.c | 272 +- + drivers/staging/tidspbridge/pmgr/io.c | 9 +- + drivers/staging/tidspbridge/pmgr/ioobj.h | 4 +- + drivers/staging/tidspbridge/pmgr/msg.c | 4 +- + drivers/staging/tidspbridge/rmgr/dbdcd.c | 66 +- + drivers/staging/tidspbridge/rmgr/disp.c | 124 +- + drivers/staging/tidspbridge/rmgr/drv.c | 202 +- + drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 - + drivers/staging/tidspbridge/rmgr/mgr.c | 66 +- + drivers/staging/tidspbridge/rmgr/nldr.c | 117 +- + drivers/staging/tidspbridge/rmgr/node.c | 1092 +-- + drivers/staging/tidspbridge/rmgr/proc.c | 170 +- + drivers/staging/tidspbridge/rmgr/pwr.c | 8 +- + drivers/staging/tidspbridge/rmgr/rmm.c | 93 +- + drivers/staging/tidspbridge/rmgr/strm.c | 86 +- + drivers/staging/tm6000/tm6000-input.c | 4 +- + drivers/staging/usbip/Kconfig | 2 +- + drivers/staging/usbip/stub.h | 4 +- + drivers/staging/usbip/stub_dev.c | 12 +- + drivers/staging/usbip/stub_rx.c | 13 +- + drivers/staging/usbip/stub_tx.c | 17 +- + drivers/staging/usbip/usbip_common.c | 105 - + drivers/staging/usbip/usbip_common.h | 20 +- + drivers/staging/usbip/usbip_event.c | 38 +- + drivers/staging/usbip/vhci.h | 4 +- + drivers/staging/usbip/vhci_hcd.c | 10 +- + drivers/staging/usbip/vhci_rx.c | 16 +- + drivers/staging/usbip/vhci_sysfs.c | 9 +- + drivers/staging/usbip/vhci_tx.c | 17 +- + drivers/staging/usbvideo/usbvideo.c | 170 +- + drivers/staging/usbvideo/vicam.c | 164 +- + drivers/staging/vme/bridges/vme_ca91cx42.c | 3 - + drivers/staging/vme/bridges/vme_tsi148.c | 2 - + drivers/staging/vme/vme.c | 7 +- + drivers/staging/vt6655/device_main.c | 20 +- + drivers/staging/vt6656/Kconfig | 1 + + drivers/staging/vt6656/device.h | 3 + + drivers/staging/vt6656/firmware.c | 805 +-- + drivers/staging/vt6656/main_usb.c | 5 +- + drivers/staging/vt6656/power.c | 419 +- + .../staging/westbridge/astoria/api/src/cyasdma.c | 2 +- + .../staging/westbridge/astoria/api/src/cyasmisc.c | 20 +- + .../staging/westbridge/astoria/api/src/cyasmtp.c | 8 + + .../westbridge/astoria/api/src/cyasstorage.c | 33 +- + .../staging/westbridge/astoria/api/src/cyasusb.c | 37 +- + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 7 +- + .../westbridge/astoria/device/cyandevice_export.h | 132 - + .../staging/westbridge/astoria/device/cyasdevice.c | 7 +- + .../astoria/include/linux/westbridge/cyasdma.h | 2 +- + .../astoria/include/linux/westbridge/cyasmisc.h | 2 +- + .../astoria/include/linux/westbridge/cyasusb.h | 2 +- + drivers/staging/winbond/core.h | 1 + + drivers/staging/wlan-ng/hfa384x.h | 156 +- + drivers/staging/wlan-ng/p80211conv.c | 4 +- + drivers/staging/wlan-ng/p80211conv.h | 6 +- + drivers/staging/wlan-ng/p80211hdr.h | 6 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211metastruct.h | 30 +- + drivers/staging/wlan-ng/p80211mgmt.h | 18 +- + drivers/staging/wlan-ng/p80211msg.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 34 +- + drivers/staging/xgifb/Makefile | 2 +- + drivers/staging/xgifb/XGI_accel.c | 289 - + drivers/staging/xgifb/XGI_accel.h | 500 - + drivers/staging/xgifb/XGI_main.h | 10 - + drivers/staging/xgifb/XGI_main_26.c | 187 +- + drivers/staging/xgifb/XGIfb.h | 5 +- + drivers/staging/xgifb/vb_init.c | 23 +- + drivers/staging/xgifb/vb_setmode.c | 47 +- + drivers/staging/xgifb/vgatypes.h | 12 - + drivers/staging/zcache/Kconfig | 13 + + drivers/staging/zcache/Makefile | 3 + + drivers/staging/zcache/tmem.c | 710 ++ + drivers/staging/zcache/tmem.h | 195 + + drivers/staging/zcache/zcache.c | 1658 ++++ + drivers/staging/zram/Kconfig | 15 +- + drivers/staging/zram/Makefile | 3 +- + drivers/staging/zram/xvmalloc.c | 89 +- + drivers/staging/zram/xvmalloc_int.h | 23 +- + drivers/staging/zram/zram_drv.c | 50 +- + drivers/staging/zram/zram_drv.h | 1 + + drivers/staging/zram/zram_sysfs.c | 7 +- + include/linux/connector.h | 12 +- + 774 files changed, 82222 insertions(+), 72778 deletions(-) + create mode 100644 drivers/bluetooth/btwilink.c + delete mode 100644 drivers/staging/autofs/Kconfig + delete mode 100644 drivers/staging/autofs/Makefile + delete mode 100644 drivers/staging/autofs/TODO + delete mode 100644 drivers/staging/autofs/autofs_i.h + delete mode 100644 drivers/staging/autofs/dirhash.c + delete mode 100644 drivers/staging/autofs/init.c + delete mode 100644 drivers/staging/autofs/inode.c + delete mode 100644 drivers/staging/autofs/root.c + delete mode 100644 drivers/staging/autofs/symlink.c + delete mode 100644 drivers/staging/autofs/waitq.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/Kconfig + create mode 100644 drivers/staging/brcm80211/brcmfmac/aiutils.c + rename drivers/staging/brcm80211/{include => brcmfmac}/bcmcdc.h (97%) + rename drivers/staging/brcm80211/{include => brcmfmac}/bcmsdbus.h (99%) + rename drivers/staging/brcm80211/{include => brcmfmac}/bcmsdh_sdmmc.h (84%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmutils.c + create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmwifi.c + rename drivers/staging/brcm80211/{include => brcmfmac}/dhdioctl.h (95%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/hndpmu.c + rename drivers/staging/brcm80211/{include => brcmfmac}/hndrte_armtrap.h (100%) + rename drivers/staging/brcm80211/{include => brcmfmac}/hndrte_cons.h (96%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/linux_osl.c + rename drivers/staging/brcm80211/{include => brcmfmac}/msgtrace.h (88%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/sbutils.c + rename drivers/staging/brcm80211/{include => brcmfmac}/sdioh.h (100%) + rename drivers/staging/brcm80211/{include => brcmfmac}/sdiovar.h (90%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/siutils.c + create mode 100644 drivers/staging/brcm80211/brcmsmac/Makefile + rename drivers/staging/brcm80211/{include => brcmsmac}/d11.h (94%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/phy_version.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_cmn.c (92%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_hal.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_int.h (99%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.c (98%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c (99%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_radio.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phyreg_n.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.c (99%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.c (99%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_dbg.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_export.h (93%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_mac80211.c (78%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_mac80211.h (80%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_ucode.h (76%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_alloc.c (52%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_alloc.h (64%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_ampdu.c (92%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_ampdu.h (84%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_antsel.c (93%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_antsel.h (90%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bmac.c (76%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bmac.h (67%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bsscfg.h (88%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_cfg.h (99%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_channel.c (89%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_channel.h (69%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_key.h (92%) + rename drivers/staging/brcm80211/{sys/wlc_mac80211.c => brcmsmac/wlc_main.c} (89%) + rename drivers/staging/brcm80211/{sys/wlc_mac80211.h => brcmsmac/wlc_main.h} (92%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_phy_shim.c (93%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_phy_shim.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_pub.h (91%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_rate.c (98%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_rate.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_scb.h (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_stf.c (85%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_stf.h (88%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_types.h (100%) + delete mode 100644 drivers/staging/brcm80211/include/bcmendian.h + delete mode 100644 drivers/staging/brcm80211/include/packed_section_end.h + delete mode 100644 drivers/staging/brcm80211/include/packed_section_start.h + delete mode 100644 drivers/staging/brcm80211/include/proto/802.1d.h + delete mode 100644 drivers/staging/brcm80211/include/proto/ethernet.h + delete mode 100644 drivers/staging/brcm80211/include/proto/wpa.h + delete mode 100644 drivers/staging/brcm80211/include/rpc_osl.h + delete mode 100644 drivers/staging/brcm80211/include/sbhndpio.h + delete mode 100644 drivers/staging/brcm80211/include/spid.h + delete mode 100644 drivers/staging/brcm80211/sys/d11ucode_ext.h + delete mode 100644 drivers/staging/brcm80211/sys/wl_ucode_loader.c + delete mode 100644 drivers/staging/brcm80211/sys/wlc_event.c + delete mode 100644 drivers/staging/brcm80211/sys/wlc_event.h + rename drivers/staging/brcm80211/{include => util}/bcmsrom_tbl.h (100%) + rename drivers/staging/brcm80211/{include => util}/pci_core.h (100%) + rename drivers/staging/brcm80211/{include => util}/sbpcmcia.h (100%) + rename drivers/staging/brcm80211/{include => util}/sbsocram.h (100%) + delete mode 100644 drivers/staging/easycap/easycap_debug.h + delete mode 100644 drivers/staging/easycap/easycap_ioctl.h + delete mode 100644 drivers/staging/easycap/easycap_sound.h + create mode 100644 drivers/staging/easycap/easycap_sound_oss.c + delete mode 100644 drivers/staging/easycap/easycap_standard.h + delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h + delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_hw.h + create mode 100644 drivers/staging/gma500/Kconfig + create mode 100644 drivers/staging/gma500/Makefile + create mode 100644 drivers/staging/gma500/TODO + create mode 100644 drivers/staging/gma500/psb_2d.c + create mode 100644 drivers/staging/gma500/psb_bl.c + create mode 100644 drivers/staging/gma500/psb_buffer.c + create mode 100644 drivers/staging/gma500/psb_drm.h + create mode 100644 drivers/staging/gma500/psb_drv.c + create mode 100644 drivers/staging/gma500/psb_drv.h + create mode 100644 drivers/staging/gma500/psb_fb.c + create mode 100644 drivers/staging/gma500/psb_fb.h + create mode 100644 drivers/staging/gma500/psb_fence.c + create mode 100644 drivers/staging/gma500/psb_gtt.c + create mode 100644 drivers/staging/gma500/psb_gtt.h + create mode 100644 drivers/staging/gma500/psb_intel_bios.c + create mode 100644 drivers/staging/gma500/psb_intel_bios.h + create mode 100644 drivers/staging/gma500/psb_intel_display.c + create mode 100644 drivers/staging/gma500/psb_intel_display.h + create mode 100644 drivers/staging/gma500/psb_intel_drv.h + create mode 100644 drivers/staging/gma500/psb_intel_i2c.c + create mode 100644 drivers/staging/gma500/psb_intel_lvds.c + create mode 100644 drivers/staging/gma500/psb_intel_modes.c + create mode 100644 drivers/staging/gma500/psb_intel_opregion.c + create mode 100644 drivers/staging/gma500/psb_intel_reg.h + create mode 100644 drivers/staging/gma500/psb_intel_sdvo.c + create mode 100644 drivers/staging/gma500/psb_intel_sdvo_regs.h + create mode 100644 drivers/staging/gma500/psb_irq.c + create mode 100644 drivers/staging/gma500/psb_irq.h + create mode 100644 drivers/staging/gma500/psb_mmu.c + create mode 100644 drivers/staging/gma500/psb_powermgmt.c + create mode 100644 drivers/staging/gma500/psb_powermgmt.h + create mode 100644 drivers/staging/gma500/psb_pvr_glue.c + create mode 100644 drivers/staging/gma500/psb_pvr_glue.h + create mode 100644 drivers/staging/gma500/psb_reg.h + create mode 100644 drivers/staging/gma500/psb_reset.c + create mode 100644 drivers/staging/gma500/psb_sgx.c + create mode 100644 drivers/staging/gma500/psb_sgx.h + create mode 100644 drivers/staging/gma500/psb_ttm_fence.c + create mode 100644 drivers/staging/gma500/psb_ttm_fence_api.h + create mode 100644 drivers/staging/gma500/psb_ttm_fence_driver.h + create mode 100644 drivers/staging/gma500/psb_ttm_fence_user.c + create mode 100644 drivers/staging/gma500/psb_ttm_fence_user.h + create mode 100644 drivers/staging/gma500/psb_ttm_glue.c + create mode 100644 drivers/staging/gma500/psb_ttm_placement_user.c + create mode 100644 drivers/staging/gma500/psb_ttm_placement_user.h + create mode 100644 drivers/staging/gma500/psb_ttm_userobj_api.h + create mode 100644 drivers/staging/hv/hv_kvp.c + create mode 100644 drivers/staging/hv/hv_kvp.h + create mode 100644 drivers/staging/hv/hv_mouse_drv.c + rename drivers/staging/hv/{hv_utils.c => hv_util.c} (95%) + create mode 100644 drivers/staging/hv/mouse_vsc.c + create mode 100644 drivers/staging/hv/mousevsc_api.h + delete mode 100644 drivers/staging/hv/osd.c + delete mode 100644 drivers/staging/hv/osd.h + create mode 100644 drivers/staging/hv/tools/hv_kvp_daemon.c + create mode 100644 drivers/staging/hv/vmbus_hid_protocol.h + create mode 100644 drivers/staging/iio/Documentation/dac/max517 + create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-trigger-sysfs + delete mode 100644 drivers/staging/iio/adc/ad7298.c + create mode 100644 drivers/staging/iio/adc/ad7298.h + create mode 100644 drivers/staging/iio/adc/ad7298_core.c + create mode 100644 drivers/staging/iio/adc/ad7298_ring.c + create mode 100644 drivers/staging/iio/adc/ad7606.h + create mode 100644 drivers/staging/iio/adc/ad7606_core.c + create mode 100644 drivers/staging/iio/adc/ad7606_par.c + create mode 100644 drivers/staging/iio/adc/ad7606_ring.c + create mode 100644 drivers/staging/iio/adc/ad7606_spi.c + create mode 100644 drivers/staging/iio/dac/max517.c + create mode 100644 drivers/staging/iio/dac/max517.h + create mode 100644 drivers/staging/iio/dds/ad9832.h + delete mode 100644 drivers/staging/iio/gyro/adis16060.h + delete mode 100644 drivers/staging/iio/gyro/adis16080.h + delete mode 100644 drivers/staging/iio/gyro/adis16130.h + delete mode 100644 drivers/staging/iio/gyro/adis16251.h + delete mode 100644 drivers/staging/iio/gyro/adis16251_core.c + create mode 100644 drivers/staging/iio/kfifo_buf.c + create mode 100644 drivers/staging/iio/kfifo_buf.h + create mode 100644 drivers/staging/iio/trigger/iio-trig-bfin-timer.c + create mode 100644 drivers/staging/iio/trigger/iio-trig-sysfs.c + delete mode 100644 drivers/staging/rtl8192e/ieee80211.h + delete mode 100644 drivers/staging/rtl8712/farray.h + create mode 100644 drivers/staging/rts_pstor/Kconfig + create mode 100644 drivers/staging/rts_pstor/Makefile + create mode 100644 drivers/staging/rts_pstor/TODO + create mode 100644 drivers/staging/rts_pstor/debug.h + create mode 100644 drivers/staging/rts_pstor/general.c + create mode 100644 drivers/staging/rts_pstor/general.h + create mode 100644 drivers/staging/rts_pstor/ms.c + create mode 100644 drivers/staging/rts_pstor/ms.h + create mode 100644 drivers/staging/rts_pstor/rtsx.c + create mode 100644 drivers/staging/rts_pstor/rtsx.h + create mode 100644 drivers/staging/rts_pstor/rtsx_card.c + create mode 100644 drivers/staging/rts_pstor/rtsx_card.h + create mode 100644 drivers/staging/rts_pstor/rtsx_chip.c + create mode 100644 drivers/staging/rts_pstor/rtsx_chip.h + create mode 100644 drivers/staging/rts_pstor/rtsx_scsi.c + create mode 100644 drivers/staging/rts_pstor/rtsx_scsi.h + create mode 100644 drivers/staging/rts_pstor/rtsx_sys.h + create mode 100644 drivers/staging/rts_pstor/rtsx_transport.c + create mode 100644 drivers/staging/rts_pstor/rtsx_transport.h + create mode 100644 drivers/staging/rts_pstor/sd.c + create mode 100644 drivers/staging/rts_pstor/sd.h + create mode 100644 drivers/staging/rts_pstor/spi.c + create mode 100644 drivers/staging/rts_pstor/spi.h + create mode 100644 drivers/staging/rts_pstor/trace.h + create mode 100644 drivers/staging/rts_pstor/xd.c + create mode 100644 drivers/staging/rts_pstor/xd.h + delete mode 100644 drivers/staging/smbfs/Kconfig + delete mode 100644 drivers/staging/smbfs/Makefile + delete mode 100644 drivers/staging/smbfs/TODO + delete mode 100644 drivers/staging/smbfs/cache.c + delete mode 100644 drivers/staging/smbfs/dir.c + delete mode 100644 drivers/staging/smbfs/file.c + delete mode 100644 drivers/staging/smbfs/getopt.c + delete mode 100644 drivers/staging/smbfs/getopt.h + delete mode 100644 drivers/staging/smbfs/inode.c + delete mode 100644 drivers/staging/smbfs/ioctl.c + delete mode 100644 drivers/staging/smbfs/proc.c + delete mode 100644 drivers/staging/smbfs/proto.h + delete mode 100644 drivers/staging/smbfs/request.c + delete mode 100644 drivers/staging/smbfs/request.h + delete mode 100644 drivers/staging/smbfs/smb.h + delete mode 100644 drivers/staging/smbfs/smb_debug.h + delete mode 100644 drivers/staging/smbfs/smb_fs.h + delete mode 100644 drivers/staging/smbfs/smb_fs_i.h + delete mode 100644 drivers/staging/smbfs/smb_fs_sb.h + delete mode 100644 drivers/staging/smbfs/smb_mount.h + delete mode 100644 drivers/staging/smbfs/smbfs.txt + delete mode 100644 drivers/staging/smbfs/smbiod.c + delete mode 100644 drivers/staging/smbfs/smbno.h + delete mode 100644 drivers/staging/smbfs/sock.c + delete mode 100644 drivers/staging/smbfs/symlink.c + rename drivers/staging/solo6x10/{solo6010-core.c => core.c} (69%) + rename drivers/staging/solo6x10/{solo6010-disp.c => disp.c} (93%) + rename drivers/staging/solo6x10/{solo6010-enc.c => enc.c} (82%) + rename drivers/staging/solo6x10/{solo6010-g723.c => g723.c} (90%) + rename drivers/staging/solo6x10/{solo6010-gpio.c => gpio.c} (85%) + rename drivers/staging/solo6x10/{solo6010-i2c.c => i2c.c} (88%) + rename drivers/staging/solo6x10/{solo6010-jpeg.h => jpeg.h} (98%) + rename drivers/staging/solo6x10/{solo6010-offsets.h => offsets.h} (81%) + rename drivers/staging/solo6x10/{solo6010-osd-font.h => osd-font.h} (98%) + rename drivers/staging/solo6x10/{solo6010-p2m.c => p2m.c} (83%) + rename drivers/staging/solo6x10/{solo6010-registers.h => registers.h} (92%) + rename drivers/staging/solo6x10/{solo6010.h => solo6x10.h} (72%) + rename drivers/staging/solo6x10/{solo6010-tw28.c => tw28.c} (95%) + rename drivers/staging/solo6x10/{solo6010-tw28.h => tw28.h} (72%) + rename drivers/staging/solo6x10/{solo6010-v4l2-enc.c => v4l2-enc.c} (79%) + rename drivers/staging/solo6x10/{solo6010-v4l2.c => v4l2.c} (92%) + delete mode 100644 drivers/staging/ti-st/Kconfig + delete mode 100644 drivers/staging/ti-st/Makefile + delete mode 100644 drivers/staging/ti-st/TODO + delete mode 100644 drivers/staging/ti-st/bt_drv.c + delete mode 100644 drivers/staging/ti-st/bt_drv.h + delete mode 100644 drivers/staging/ti-st/sysfs-uim + delete mode 100644 drivers/staging/tidspbridge/gen/gb.c + delete mode 100644 drivers/staging/tidspbridge/gen/gs.c + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbldefs.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dehdefs.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dispdefs.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/drvdefs.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/gb.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/gs.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/iodefs.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/ldr.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/list.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/utildefs.h + delete mode 100644 drivers/staging/westbridge/astoria/device/cyandevice_export.h + delete mode 100644 drivers/staging/xgifb/XGI_accel.c + delete mode 100644 drivers/staging/xgifb/XGI_accel.h + create mode 100644 drivers/staging/zcache/Kconfig + create mode 100644 drivers/staging/zcache/Makefile + create mode 100644 drivers/staging/zcache/tmem.c + create mode 100644 drivers/staging/zcache/tmem.h + create mode 100644 drivers/staging/zcache/zcache.c +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/staging/easycap/easycap_ioctl.c +Auto-merging drivers/target/target_core_hba.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/tty/pty.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/tty/tty_ldisc.c +Auto-merging drivers/tty/vt/vc_screen.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/tty/vt/vt_ioctl.c +Removing include/trace/events/bkl.h +Merge made by recursive. + drivers/net/appletalk/Kconfig | 1 - + drivers/scsi/megaraid/megaraid_sas_fp.c | 1 - + drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 - + drivers/staging/easycap/easycap_ioctl.c | 1 - + drivers/target/target_core_device.c | 1 - + drivers/target/target_core_fabric_lib.c | 1 - + drivers/target/target_core_file.c | 1 - + drivers/target/target_core_hba.c | 1 - + drivers/target/target_core_iblock.c | 1 - + drivers/target/target_core_pscsi.c | 1 - + drivers/target/target_core_rd.c | 1 - + drivers/target/target_core_tpg.c | 1 - + drivers/target/target_core_transport.c | 1 - + drivers/tty/n_hdlc.c | 1 - + drivers/tty/n_r3964.c | 1 - + drivers/tty/pty.c | 1 - + drivers/tty/tty_io.c | 1 - + drivers/tty/tty_ldisc.c | 2 - + drivers/tty/vt/selection.c | 1 - + drivers/tty/vt/vc_screen.c | 1 - + drivers/tty/vt/vt.c | 1 - + drivers/tty/vt/vt_ioctl.c | 1 - + fs/adfs/Kconfig | 1 - + fs/adfs/dir.c | 6 -- + fs/adfs/inode.c | 6 -- + fs/adfs/super.c | 13 +---- + fs/hpfs/Kconfig | 2 +- + fs/hpfs/dir.c | 23 ++++---- + fs/hpfs/file.c | 9 ++-- + fs/hpfs/hpfs_fn.h | 22 ++++++++ + fs/hpfs/inode.c | 9 ++-- + fs/hpfs/namei.c | 49 ++++++++--------- + fs/hpfs/super.c | 23 +++----- + fs/locks.c | 1 - + fs/ufs/Kconfig | 1 - + fs/ufs/inode.c | 78 +++++++------------------- + fs/ufs/namei.c | 35 ++++++------ + fs/ufs/super.c | 64 +++++++++++++--------- + fs/ufs/truncate.c | 5 +- + fs/ufs/ufs.h | 6 ++- + fs/ufs/util.c | 2 +- + include/trace/events/bkl.h | 61 --------------------- + lib/kernel_lock.c | 7 --- + net/appletalk/ddp.c | 40 ++++++-------- + net/ipx/Kconfig | 1 - + net/ipx/af_ipx.c | 52 +++++++----------- + net/x25/Kconfig | 1 - + net/x25/af_x25.c | 58 ++++++-------------- + net/x25/x25_out.c | 7 ++- + 49 files changed, 218 insertions(+), 387 deletions(-) + delete mode 100644 include/trace/events/bkl.h +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/mpage.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/xen/interface/xen.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 880ce2e] Merge remote-tracking branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +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. +$ rm -rf ../rebase-tmp diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..70cfc41d47e0 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,45 @@ +Importing i2c based on 2.6.38-rc6-git4 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 86e2fe9ff3f3eebca2066bcfc2d993f61af787f5 +HEAD is now at 86e2fe9 Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-boardinfo-fix-typo-in-comment.patch +i2c-instantiating-devices-fix-typo.patch +i2c-adapter-nr-not-id.patch +i2c-upgrading-clients-fixes.patch +i2c-delete-linux-i2c-id-h.patch +i2c-01-core-export-i2c_for_each_dev.patch +i2c-02-dev-use-bus-notifier.patch +i2c-03-deprecate-attach-detach_adapter.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 97b85bb...5b6a580 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.38-rc6-git4 +$ cd ../quilt-tmp +$ git reset --hard 86e2fe9ff3f3eebca2066bcfc2d993f61af787f5 +HEAD is now at 86e2fe9 Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-w83795-document-pin-mapping.patch +hwmon-sht15-spelling-fix.patch +hwmon-lis3lv02d-01-rework-dependencies.patch +hwmon-lis3lv02d-02-move-hp_accel.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:427: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +hwmon-lis3lv02d-03-move-to-misc.patch +hwmon-lis3lv02d-04-fix-hp_accel-driver-name.patch +hwmon-lm75-01-add-support-for-lm75a.patch +hwmon-lm75-02-speed-up-detection.patch +hwmon-add-support-for-texas-instruments-ads1015.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + c25a0d5...67b4c6c master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.38-rc5 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.38-rc6-93-gef32428 +Unchanged quilt series rr +Importing device-mapper based on v2.6.38-rc4-213-g055d219 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..203c9fc14823 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110303 |