From: Stephen Rothwell Date: Tue, 26 Jul 2011 05:35:10 +0000 (+1000) Subject: Add linux-next specific files for 20110726 X-Git-Tag: next-20110726^0 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af3027b76189fb8fe4dccf10302c98addc46629e;p=karo-tx-linux.git Add linux-next specific files for 20110726 Signed-off-by: Stephen Rothwell --- diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..8299e11ebbf4 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,201 @@ +Name SHA1 +---- ---- +origin 750e06992d49666a7589aac555eb3bb68e4dbb88 +fixes b0af8dfdd67699e25083478c63eedef2e72ebd85 +kbuild-current 8fc62e59425389a6d48429b9d146223122743435 +arm-current 6d6be43d4dfdb167ef72f4aa665c1607db799be4 +m68k-current 659e6ed55ff8d617c895c10288644e3e6107834e +powerpc-merge 770e1ac5f29003fca18af4e67eb5a05ddb5b1491 +52xx-and-virtex-current c49f8789f532ae39019135ca038e9bc0d15aaa4a +sparc-current 1ef48593bd6a508984d1270a1075532628bfd9c8 +scsi-rc-fixes bfe159a51203c15d23cb3158fffdc25ec4b4dda1 +net-current 750e06992d49666a7589aac555eb3bb68e4dbb88 +sound-current 76531d4166fb620375ff3c1ac24753265216d579 +pci-current f483d3923dc3a6394c483e28ccb3fe700bdf399e +wireless-current 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe +driver-core.current fe0d42203cb5616eeff68b14576a0f7e2dd56625 +tty.current fe0d42203cb5616eeff68b14576a0f7e2dd56625 +usb.current ca5c485f55d326d9a23e4badd05890148aa53f74 +staging.current fe0d42203cb5616eeff68b14576a0f7e2dd56625 +cpufreq-current 92e03c41a415e8e9e8009a1f5bbb9036f3bfb2f4 +input-current cca8edfd2ec2a34d9f50f593bc753bb11e1bc1f5 +md-current 4274215d24633df7302069e51426659d4759c5ed +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current acdca31dba86c4f426460aa000d13930a00549b7 +ide-curent 3307d0d83b7bf636dc6dd2aa4a584d0f52cc185b +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 9ab3a15d95809a5d4feecda58b3749c53590e1b2 +rmobile-current 4d4d6fbb7c3125f17a4864215191e54b975cfb4f +fbdev-current b63d10130e68aa6480cc1b2483d7c5ce57a05481 +devicetree-current 35d2045f6a73b57287df8c1f226bb0113d9339f1 +spi-current 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc +arm 2ebac5007d89bda49729177d1cf5baf54ba89c6d +arm-lpae 5287a6293d19fa8d7d504c59a1143cada747f09a +arm-soc 529dad2831ac0813f0b0f81eff1a3b804616a704 +at91 c5efefac659870744f6e203e28abd095ac0f590b +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +i.MX d8353101eadb262d5a93ef02cc96ae3188520dfb +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm f2ba30560a71b39b4ad3230f5deb96fefaaa6417 +omap 07ad6ab3d79ede41cd8a69499e81df7b405635d2 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p c471b2bd4969eb618aa30f15cfd9672f431a5207 +tegra 681e6edc25a452e26e263386caaa4afb02b5f131 +ux500-core 77f3714170b9cc3fcddf8ddb1b5c226dc1dffaf3 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin 10617340ce1491da7654d408d0d635ba98ef8350 +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +ia64 5e150d95ba4518f86540504340316b9586d3a80e +m68k d980fd80ea9b084ffab1818f429437c33e32ff46 +m68knommu 7b902764c7cedd78ab8475522b6f32f2f9996815 +microblaze c9d761b7c4b658a937a941aea2781f511a0ff3ec +mips c8e58856f2f288bfe076ad9205d9a10623498c96 +openrisc 19f9d392365113f74286b1721c7c032c12cf5abd +parisc d9ba5fe76d604514444b1ea0a19f38c6196a46e3 +powerpc 50d2a4223bb875d1e3a7ee97d40dd03bf31ce1b7 +4xx a8e616b9a41212655042f59c969f30bb7de1ec73 +52xx-and-virtex c1395f4cf4a1944236f0f28cdf718c4aacc88f2d +galak f1f4ee01c0d3dce0e3aa7d04e4332677db7af478 +s390 73b7d40ff1bcd44b4245c2714b88cf872fe44685 +sh 536628d0983f1c6a7ccece28ded635661aa30319 +rmobile b79b3e05b1229d5b2fc2af71dc29701642577eba +sparc 1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c +tile 93ea927eb15b736fa4a431f789b1097318129d2a +unicore32 aa5eb56cf1bacc45ba31404b5dc8f3464c0d0289 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph b71622e7f92a491da4f48b63c7bf8016a883b7cd +cifs 14cae3243b555afda69a57778069ddca65532c06 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a842dd9dd9d0df0abb97452244b0bb60a147157 +ext3 2b76aa074e9de718b31ba48699e99191b7697bf2 +ext4 b7ca1e8ec53259359db5313f923a0a20fa04bdb6 +fatfs 1adffbae22332bb558c2a29de19d9aca391869f6 +fuse d24339059d640f108c08ba99ef30e3bafa10f8e4 +gfs2 b6844e8f64920cdee620157252169ba63afb0c89 +hfsplus 6596528e391ad978a6a120142cba97a1d7324cb6 +jfs 3c2c22628599006047781946b317a16d9ff3883d +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs ed1e6211a0a134ff23592c6f057af982ad5dab52 +nfsd 0c12eaffdf09466f36a9ffe970dda8f4aeb6efc0 +nilfs2 3a36199114de0e60984534776732e0a7a220e29e +ocfs2 730e663bd82c1a10a85ff00728d34152a5a67ec8 +omfs 31be83aeaee22fa165862ad449c7131ceaf1cf91 +squashfs cc6d3497141adedb71de8ddce62bf4cd4817832d +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs c9ffb05ca5b5098d6ea468c909dd384d90da7d54 +ubifs cc8f9b99ed9b728e4dd154337a4332cda9e6d38b +xfs 55fb25d5b39320242b41af894921f5cef0c7e293 +vfs 750e06992d49666a7589aac555eb3bb68e4dbb88 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci 7b87c9df5602efd6c7edeb291bbd104d49a6babf +of-pci ef3b4f8cc20e80c767e47b848fb7512770ab80d7 +hid 0b60ccf68ad91734ba600c3183aa446ba7f5e817 +i2c 7566200a249968ee1bbc7bfa1cb044e1d571b6ce +bjdooks-i2c e263aa5daa575cb5b878caea3a60188b5004f2f0 +jdelvare-hwmon f91127acf8f024edc4777c8fba406e47068ba4af +hwmon-staging ebda42c41cb81f1b9bdb60bac49985477be4baf3 +kernel-doc f9ca78778da438e22c36b3aa89a725d8f5c003bf +docs 2f3e4af471e38e0658e701973238ae4b5e50fcd6 +v4l-dvb 632c56fb2efb3cc586e8948c1dab986cb763ed41 +kbuild 45e58651ef54b955043a20bcd24945403fea4315 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 56a210526adb2854d5b7c398a40260720390ee05 +libata 3b5ec274daae9165e0fe101e85e13060e5d78dae +infiniband 4460207561290c3be7e6c7538f22690028170c1d +acpi 4f0c129e0629a1c837c7fcdbd53a65afe6bbd60e +idle-test 10d669174448b08386874603d4c360b2097919fb +powertools e4c0d0e22ce5cf84b3993b5af6c2dac08d52f06b +cpupowerutils 9cd581865c6ad25348b6b6d61859a1773c1728bf +ieee1394 9a00c24ae7cb08dcd46edf1327a47871e8466444 +ubi 01dc9cc314ad1009f5b7356399b386015fdb0400 +dlm 10d1459fafbb02a18e7bc8f2c384a9e973560b00 +swiotlb 25b84fa6892ba6517f292a6254bed39de77da1b5 +ibft f1b1e067b999aa141229a2a524b7be080f999795 +scsi 87045b033a62777337ae4aa62834876da09b5fb5 +iscsi-target 0ec9e4f72b97c22bafe357b2d2c9d28bbef780ce +slave-dma bf89d7131dfb33e7d61deb811867e4a89b6676d3 +async_tx 49514c79f4be85b5432dce60bb03f26de3671894 +net 431bf99d26157d56689e5de65bd27ce9f077fc3f +wireless 9dfbb8c1ab1a9240e2ae8ad61a53ce6cef34a135 +bluetooth 8518eaa5481f14b43f0fbe732db4afda9eb6875b +mtd 3f303103b884ca577908d3e5c0650ad12e40c586 +l2-mtd 15ed1532476fc9da804d53340dffbdf5f92dc5b9 +crypto acdca31dba86c4f426460aa000d13930a00549b7 +sound 689afc9aac87cb56b44fab0e8b0e6cecabe9c494 +sound-asoc a0c27ab2421c47dc7c53f797fffcc0d17cdb122c +cpufreq 133de1211982bd2ba9ab401f7a73d25d052ccd61 +rr 7bbfe23bdf3f6638167678701e5df931a32a5f39 +input 3c6b50141ef9f0a8844bf1357b80c0cdf518bf05 +input-mt a6360dd37e1a144ed11e6548371bade559a1e4df +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block ecf758ade4505266ce08c906deb803202ab13dd9 +device-mapper 2a7abc043d39fb6eeac22db4f738ff53d3814042 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 4ef7e71444b48cc89152cbc499ed94dde50515ee +battery f8c63918c9a3004bd052fa4af08aa1cefbcd79ac +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 2fa4f68bdfcd677a0ee27bf065067e912cc14dab +kgdb 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +slab c2fedb1adfcdfff1454ee4bd2399270f2a7166e0 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 742eba7e00d38aaeb9bf9279eb26b9677e8e942b +mfd e9bea82c60d77d145ea370f710fd82407846f951 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 964f664520a4c6a247e2c9ff8b4481631cf746df +fbdev fa514fbc57419505d0e9423dbb8742f2775f882e +viafb 936a3f770b8de7042d793272f008ef1bb08522e9 +omap_dss2 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f +voltage 54abd335fda86d305845f9e62b4bc0997386eb66 +security-testing 29412f0f6a19e34336368f13eab848091c343952 +selinux ded509880f6a0213b09f8ae7bef84acb16eaccbf +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 6d746ffce0c223a1122529ab5f596248f7d53aa5 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu f0f52a9463839c52a63c05d6e7d4a330d94a9794 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial df2e301fee3c2c2a87592151397ad7699bb14c37 +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 7ae033cc0dfce68d8e0c83aca60837cf2bf0d2e6 +apm 51414d41084496aaefd06d7f19eb8206e8bfac2d +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree a642285014df03b8f320399d515bf3b779af07ac +spi 22a85e4cd51b49ec99703ddfdff8686d5442a093 +gpio 591567a5ea25852f20b7ef2953f6f72020121199 +tip ef8855f0fda979066dd18dbc7097de320cc5c739 +rcu 7f70893173b056df691b2ee7546bb44fd9abae6a +kvm 3f68b0318bbbd61bf08478ab99a149f0d9e5156e +oprofile a406ab6d77ea86ba7c713276f30ed7058ca64e31 +ptrace eac1b5e57d7abc836e78fd3fbcf77dbeed01edc9 +xen 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +xen-two 03bd802fe81e3e8f7b2b2b27882fc429c78bf820 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 +percpu 688d3be815b1563b1484ce67702249a4a7a6314e +workqueues 9c5a2ba70251ecaab18c7a83e38b3c620223476c +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 cf98853cbd4878db2d0bee5f5e8911ed0d5d1ca9 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c2f5631aceb700224d0cfe0465cee18df564a29e +namespace 7e05c935c50ab5c9ee488c411252076825ec2919 +regmap 1946166a1493913a7d6cb1cae393fab9259ef0ff +driver-core 21d541aa19e90752232bf6c43002f019f204f988 +tty def90f4239f094f3846c108c1c41a4cd55c33e8e +usb e04f5f7e423018bcec84c11af2058cdce87816f3 +staging e1703b329f7c7ea82ea181dc4c50020f25061a2c +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +tmem 4cc79b3c0519fa50270c72be2ce480c59669eba8 +writeback bcff25fc8aa47a13faff8b4b992589813f7b450a +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 +akpm 99830b405a299122a6c2f78faacb5665ee842718 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..81c32d77f1cc --- /dev/null +++ b/Next/Trees @@ -0,0 +1,203 @@ +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.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.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.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 +arm-lpae git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm.git#for-next +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git#for-next +at91 git git://github.com/at91linux/linux-2.6-at91.git#at91-next +davinci git git://gitorious.org/linux-davinci/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 +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +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 +openrisc git git://openrisc.net/jonas/linux#for-upstream +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.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#dev +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 +of-pci git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#of-pci +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://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/ +docs git git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git#docs-move +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.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 +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +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 +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 +iscsi-target git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +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.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 +l2-mtd git git://git.infradead.org/users/dedekind/l2-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 +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +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 +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/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 +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +ptrace git git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc.git#ptrace +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +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 +namespace git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +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 +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback.git#next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://userweb.kernel.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c3dc920fa4ac --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8062 @@ +$ date +Tue Jul 26 11:14:26 EST 2011 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b6844e8 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm +Merging origin/master +$ git merge origin/master +Updating b6844e8..750e069 +Fast-forward + .mailmap | 3 +- + Documentation/DocBook/v4l/io.xml | 2 +- + Documentation/RCU/NMI-RCU.txt | 4 +- + Documentation/arm/Samsung-S3C24XX/Overview.txt | 7 +- + Documentation/block/queue-sysfs.txt | 10 +- + Documentation/blockdev/README.DAC960 | 2 +- + Documentation/blockdev/ramdisk.txt | 8 +- + Documentation/cpu-freq/cpu-drivers.txt | 2 +- + Documentation/feature-removal-schedule.txt | 20 +- + Documentation/filesystems/Locking | 4 +- + Documentation/filesystems/nfs/nfsroot.txt | 2 +- + Documentation/filesystems/porting | 7 +- + Documentation/filesystems/vfs.txt | 2 +- + Documentation/hwmon/it87 | 3 +- + Documentation/hwmon/lm78 | 3 +- + Documentation/hwmon/sch5636 | 31 + + Documentation/i2o/ioctl | 2 +- + Documentation/isdn/README.HiSax | 2 +- + Documentation/kbuild/makefiles.txt | 38 +- + Documentation/magic-number.txt | 2 +- + Documentation/mca.txt | 4 +- + Documentation/scheduler/sched-arch.txt | 2 +- + Documentation/scsi/BusLogic.txt | 2 +- + Documentation/serial/computone.txt | 2 +- + Documentation/zh_CN/magic-number.txt | 2 +- + MAINTAINERS | 23 +- + arch/alpha/include/asm/floppy.h | 2 +- + arch/arm/Kconfig | 24 +- + arch/arm/Makefile | 4 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/configs/cm_x300_defconfig | 18 +- + arch/arm/configs/loki_defconfig | 120 -- + arch/arm/configs/mx51_defconfig | 3 +- + arch/arm/configs/mxs_defconfig | 2 +- + arch/arm/include/asm/hardware/scoop.h | 1 - + arch/arm/mach-at91/at91sam9261_devices.c | 2 +- + arch/arm/mach-at91/board-snapper9260.c | 2 +- + arch/arm/mach-bcmring/dma.c | 2 +- + arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 17 +- + arch/arm/mach-davinci/clock.c | 38 + + arch/arm/mach-davinci/clock.h | 2 + + arch/arm/mach-davinci/dm646x.c | 4 +- + arch/arm/mach-davinci/include/mach/dm646x.h | 2 - + arch/arm/mach-davinci/include/mach/psc.h | 148 ++-- + arch/arm/mach-dove/common.c | 2 - + arch/arm/mach-ep93xx/simone.c | 4 +- + arch/arm/mach-ep93xx/snappercl15.c | 4 +- + arch/arm/mach-exynos4/Kconfig | 4 + + arch/arm/mach-exynos4/Makefile | 1 - + arch/arm/mach-exynos4/clock.c | 177 +-- + arch/arm/mach-exynos4/include/mach/clkdev.h | 7 + + arch/arm/mach-exynos4/mach-smdkc210.c | 16 + + arch/arm/mach-exynos4/mach-smdkv310.c | 16 + + arch/arm/mach-imx/Kconfig | 5 + + arch/arm/mach-imx/dma-v1.c | 25 +- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 23 +- + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 15 +- + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 13 +- + arch/arm/mach-imx/mach-apf9328.c | 7 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- + arch/arm/mach-imx/mach-mx27_3ds.c | 44 +- + arch/arm/mach-imx/mach-mx31_3ds.c | 10 +- + arch/arm/mach-imx/mach-mx31moboard.c | 14 +- + arch/arm/mach-imx/mach-mx35_3ds.c | 2 +- + arch/arm/mach-imx/mach-scb9328.c | 17 +- + arch/arm/mach-imx/mx31lite-db.c | 15 +- + arch/arm/mach-integrator/include/mach/bits.h | 61 - + arch/arm/mach-loki/Kconfig | 13 - + arch/arm/mach-loki/Makefile | 3 - + arch/arm/mach-loki/Makefile.boot | 3 - + arch/arm/mach-loki/addr-map.c | 122 -- + arch/arm/mach-loki/common.c | 162 --- + arch/arm/mach-loki/common.h | 37 - + arch/arm/mach-loki/include/mach/bridge-regs.h | 28 - + arch/arm/mach-loki/include/mach/debug-macro.S | 19 - + arch/arm/mach-loki/include/mach/entry-macro.S | 30 - + arch/arm/mach-loki/include/mach/hardware.h | 15 - + arch/arm/mach-loki/include/mach/io.h | 26 - + arch/arm/mach-loki/include/mach/irqs.h | 58 - + arch/arm/mach-loki/include/mach/loki.h | 83 -- + arch/arm/mach-loki/include/mach/memory.h | 10 - + arch/arm/mach-loki/include/mach/system.h | 36 - + arch/arm/mach-loki/include/mach/timex.h | 11 - + arch/arm/mach-loki/include/mach/uncompress.h | 47 - + arch/arm/mach-loki/include/mach/vmalloc.h | 5 - + arch/arm/mach-loki/irq.c | 22 - + arch/arm/mach-loki/lb88rc8480-setup.c | 99 -- + arch/arm/mach-lpc32xx/include/mach/vmalloc.h | 2 +- + arch/arm/mach-msm/platsmp.c | 11 +- + arch/arm/mach-mv78xx0/pcie.c | 8 +- + arch/arm/mach-mx5/Kconfig | 4 + + arch/arm/mach-mx5/board-cpuimx51.c | 12 +- + arch/arm/mach-mx5/board-mx51_3ds.c | 3 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 34 +- + arch/arm/mach-mx5/board-mx51_efikamx.c | 15 +- + arch/arm/mach-mx5/board-mx51_efikasb.c | 16 +- + arch/arm/mach-mx5/clock-mx51-mx53.c | 4 +- + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 24 +- + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 19 +- + arch/arm/mach-mxs/Kconfig | 1 + + arch/arm/mach-mxs/devices/platform-mxsfb.c | 1 + + arch/arm/mach-mxs/include/mach/dma.h | 2 + + arch/arm/mach-mxs/mach-tx28.c | 13 +- + arch/arm/mach-nuc93x/include/mach/vmalloc.h | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 4 +- + arch/arm/mach-omap1/board-fsample.c | 4 +- + arch/arm/mach-omap1/board-generic.c | 4 +- + arch/arm/mach-omap1/board-h2.c | 4 +- + arch/arm/mach-omap1/board-h3.c | 4 +- + arch/arm/mach-omap1/board-htcherald.c | 4 +- + arch/arm/mach-omap1/board-innovator.c | 4 +- + arch/arm/mach-omap1/board-nokia770.c | 4 +- + arch/arm/mach-omap1/board-osk.c | 4 +- + arch/arm/mach-omap1/board-palmte.c | 4 +- + arch/arm/mach-omap1/board-palmtt.c | 4 +- + arch/arm/mach-omap1/board-palmz71.c | 4 +- + arch/arm/mach-omap1/board-perseus2.c | 4 +- + arch/arm/mach-omap1/board-sx1.c | 4 +- + arch/arm/mach-omap1/board-voiceblue.c | 4 +- + arch/arm/mach-omap1/irq.c | 2 +- + arch/arm/mach-omap1/mcbsp.c | 4 +- + arch/arm/mach-omap1/time.c | 6 +- + arch/arm/mach-omap1/timer32k.c | 4 - + arch/arm/mach-omap2/Makefile | 20 +- + arch/arm/mach-omap2/board-2430sdp.c | 4 +- + arch/arm/mach-omap2/board-3430sdp.c | 93 +-- + arch/arm/mach-omap2/board-3630sdp.c | 4 +- + arch/arm/mach-omap2/board-4430sdp.c | 156 +--- + arch/arm/mach-omap2/board-am3517crane.c | 4 +- + arch/arm/mach-omap2/board-am3517evm.c | 4 +- + arch/arm/mach-omap2/board-apollon.c | 4 +- + arch/arm/mach-omap2/board-cm-t35.c | 81 +- + arch/arm/mach-omap2/board-cm-t3517.c | 5 +- + arch/arm/mach-omap2/board-devkit8000.c | 64 +- + arch/arm/mach-omap2/board-flash.c | 4 - + arch/arm/mach-omap2/board-generic.c | 4 +- + arch/arm/mach-omap2/board-h4.c | 4 +- + arch/arm/mach-omap2/board-igep0020.c | 79 +- + arch/arm/mach-omap2/board-ldp.c | 29 +- + arch/arm/mach-omap2/board-n8x0.c | 12 +- + arch/arm/mach-omap2/board-omap3beagle.c | 89 +-- + arch/arm/mach-omap2/board-omap3evm.c | 111 +-- + arch/arm/mach-omap2/board-omap3logic.c | 19 +- + arch/arm/mach-omap2/board-omap3pandora.c | 119 +-- + arch/arm/mach-omap2/board-omap3stalker.c | 99 +-- + arch/arm/mach-omap2/board-omap3touchbook.c | 97 +- + arch/arm/mach-omap2/board-omap4panda.c | 161 +--- + arch/arm/mach-omap2/board-overo.c | 83 +- + arch/arm/mach-omap2/board-rm680.c | 12 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 67 +- + arch/arm/mach-omap2/board-rx51.c | 4 +- + arch/arm/mach-omap2/board-ti8168evm.c | 9 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 128 +-- + arch/arm/mach-omap2/board-zoom.c | 8 +- + arch/arm/mach-omap2/clock44xx.h | 7 - + arch/arm/mach-omap2/clock44xx_data.c | 237 ++--- + arch/arm/mach-omap2/clockdomains44xx_data.c | 124 +- + arch/arm/mach-omap2/cm-regbits-44xx.h | 623 ++++------ + arch/arm/mach-omap2/cm1_44xx.h | 64 +- + arch/arm/mach-omap2/cm2_44xx.h | 73 +- + arch/arm/mach-omap2/common-board-devices.c | 27 +- + arch/arm/mach-omap2/common-board-devices.h | 26 +- + arch/arm/mach-omap2/gpmc-nand.c | 10 +- + arch/arm/mach-omap2/io.c | 17 +- + arch/arm/mach-omap2/irq.c | 32 +- + arch/arm/mach-omap2/omap4-common.c | 10 +- + arch/arm/mach-omap2/omap_hwmod.c | 223 +++- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 832 ++----------- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 910 ++------------ + .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 173 +++ + .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 322 +++++ + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 130 ++ + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 150 +++ + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 654 ++-------- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 472 ++++---- + arch/arm/mach-omap2/omap_hwmod_common_data.c | 20 - + arch/arm/mach-omap2/omap_hwmod_common_data.h | 93 ++- + arch/arm/mach-omap2/pm-debug.c | 372 +------ + arch/arm/mach-omap2/pm.h | 16 - + arch/arm/mach-omap2/pm24xx.c | 6 +- + arch/arm/mach-omap2/pm34xx.c | 6 - + arch/arm/mach-omap2/powerdomains44xx_data.c | 18 +- + arch/arm/mach-omap2/prcm_mpu44xx.h | 69 +- + arch/arm/mach-omap2/prm44xx.h | 34 +- + arch/arm/mach-omap2/smartreflex.c | 38 +- + arch/arm/mach-omap2/timer-gp.c | 266 ---- + arch/arm/mach-omap2/timer-gp.h | 16 - + arch/arm/mach-omap2/timer.c | 342 +++++ + arch/arm/mach-omap2/twl-common.c | 304 +++++ + arch/arm/mach-omap2/twl-common.h | 59 + + arch/arm/mach-orion5x/mpp.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 58 +- + arch/arm/mach-pxa/hx4700.c | 70 +- + arch/arm/mach-pxa/include/mach/corgi.h | 2 +- + arch/arm/mach-pxa/include/mach/magician.h | 3 +- + arch/arm/mach-pxa/include/mach/pxa27x-udc.h | 4 +- + arch/arm/mach-pxa/magician.c | 57 +- + arch/arm/mach-pxa/mioa701.c | 70 +- + arch/arm/mach-pxa/saarb.c | 2 +- + arch/arm/mach-s3c2400/Kconfig | 7 - + arch/arm/mach-s3c2400/Makefile | 15 - + arch/arm/mach-s3c2400/gpio.c | 42 - + arch/arm/mach-s3c2400/include/mach/map.h | 66 - + arch/arm/mach-s3c2410/h1940-bluetooth.c | 1 - + arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 6 - + arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 241 ---- + arch/arm/mach-s3c2410/include/mach/regs-mem.h | 28 - + arch/arm/mach-s3c2412/Kconfig | 2 +- + arch/arm/mach-s3c2412/clock.c | 36 +- + arch/arm/mach-s3c2416/clock.c | 10 +- + arch/arm/mach-s3c2440/clock.c | 3 - + arch/arm/mach-s3c2443/clock.c | 16 +- + arch/arm/mach-s3c24a0/include/mach/debug-macro.S | 27 - + arch/arm/mach-s3c24a0/include/mach/io.h | 18 - + arch/arm/mach-s3c24a0/include/mach/irqs.h | 117 -- + arch/arm/mach-s3c24a0/include/mach/map.h | 86 -- + arch/arm/mach-s3c24a0/include/mach/memory.h | 21 - + arch/arm/mach-s3c24a0/include/mach/regs-clock.h | 88 -- + arch/arm/mach-s3c24a0/include/mach/regs-irq.h | 25 - + arch/arm/mach-s3c24a0/include/mach/system.h | 25 - + arch/arm/mach-s3c24a0/include/mach/tick.h | 15 - + arch/arm/mach-s3c24a0/include/mach/timex.h | 18 - + arch/arm/mach-s3c24a0/include/mach/vmalloc.h | 17 - + arch/arm/mach-s3c64xx/Kconfig | 1 + + arch/arm/mach-s3c64xx/Makefile | 4 - + arch/arm/mach-s3c64xx/clock.c | 86 +- + arch/arm/mach-s3c64xx/dev-onenand1.c | 10 +- + arch/arm/mach-s3c64xx/include/mach/clkdev.h | 7 + + arch/arm/mach-s3c64xx/include/mach/regs-fb.h | 21 - + arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 2 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 43 +- + arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 1 - + arch/arm/mach-s5p64x0/Kconfig | 2 + + arch/arm/mach-s5p64x0/clock-s5p6440.c | 74 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 68 +- + arch/arm/mach-s5p64x0/include/mach/clkdev.h | 7 + + arch/arm/mach-s5p64x0/mach-smdk6440.c | 54 +- + arch/arm/mach-s5p64x0/mach-smdk6450.c | 54 +- + arch/arm/mach-s5pc100/Kconfig | 1 + + arch/arm/mach-s5pc100/clock.c | 200 +--- + arch/arm/mach-s5pc100/include/mach/clkdev.h | 7 + + arch/arm/mach-s5pc100/include/mach/regs-fb.h | 105 -- + arch/arm/mach-s5pc100/mach-smdkc100.c | 57 +- + arch/arm/mach-s5pc100/setup-fb-24bpp.c | 1 - + arch/arm/mach-s5pv210/Kconfig | 1 + + arch/arm/mach-s5pv210/Makefile | 1 - + arch/arm/mach-s5pv210/clock.c | 167 +-- + arch/arm/mach-s5pv210/include/mach/clkdev.h | 7 + + arch/arm/mach-s5pv210/include/mach/regs-fb.h | 21 - + arch/arm/mach-s5pv210/mach-aquila.c | 2 +- + arch/arm/mach-s5pv210/mach-goni.c | 2 +- + arch/arm/mach-s5pv210/mach-smdkv210.c | 56 +- + arch/arm/mach-s5pv210/setup-fb-24bpp.c | 1 - + arch/arm/mach-shmobile/board-ap4evb.c | 2 +- + arch/arm/mach-tegra/board-seaboard.c | 2 +- + arch/arm/mach-tegra/board-trimslice-pinmux.c | 2 +- + arch/arm/mach-u300/core.c | 2 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- + arch/arm/plat-mxc/avic.c | 12 +- + arch/arm/plat-mxc/devices/platform-imx-dma.c | 14 +- + arch/arm/plat-mxc/devices/platform-imx-ssi.c | 2 +- + arch/arm/plat-mxc/include/mach/debug-macro.S | 10 +- + arch/arm/plat-mxc/include/mach/hardware.h | 28 +- + arch/arm/plat-mxc/include/mach/iomux-mx25.h | 2 +- + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 128 +- + arch/arm/plat-mxc/include/mach/iomux-v1.h | 4 - + arch/arm/plat-mxc/include/mach/iomux-v3.h | 2 +- + arch/arm/plat-mxc/include/mach/iomux.h | 26 - + arch/arm/plat-mxc/include/mach/mx53.h | 26 +- + arch/arm/plat-mxc/include/mach/mxc.h | 8 +- + arch/arm/plat-mxc/include/mach/timex.h | 13 +- + arch/arm/plat-mxc/iomux-v1.c | 34 +- + arch/arm/plat-mxc/pwm.c | 8 +- + arch/arm/plat-mxc/tzic.c | 4 +- + arch/arm/plat-omap/Kconfig | 3 - + arch/arm/plat-omap/counter_32k.c | 123 +-- + arch/arm/plat-omap/dmtimer.c | 209 +--- + arch/arm/plat-omap/include/plat/clock.h | 2 +- + arch/arm/plat-omap/include/plat/common.h | 6 +- + arch/arm/plat-omap/include/plat/dmtimer.h | 251 ++++- + arch/arm/plat-omap/include/plat/irqs.h | 6 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 74 +-- + arch/arm/plat-omap/include/plat/nand.h | 6 +- + arch/arm/plat-omap/include/plat/omap-pm.h | 8 - + arch/arm/plat-omap/include/plat/omap_hwmod.h | 20 +- + arch/arm/plat-omap/mcbsp.c | 599 +--------- + arch/arm/plat-omap/omap_device.c | 15 +- + arch/arm/plat-s3c24xx/Kconfig | 2 +- + arch/arm/plat-s3c24xx/clock-dclk.c | 4 - + arch/arm/plat-s3c24xx/cpu.c | 15 - + arch/arm/plat-s3c24xx/devs.c | 38 +- + arch/arm/plat-s3c24xx/include/mach/clkdev.h | 7 + + arch/arm/plat-s3c24xx/include/plat/regs-iis.h | 9 - + arch/arm/plat-s3c24xx/include/plat/regs-spi.h | 1 - + arch/arm/plat-s3c24xx/include/plat/s3c2400.h | 31 - + arch/arm/plat-s3c24xx/s3c2410-clock.c | 21 +- + arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +- + arch/arm/plat-s5p/clock.c | 35 + + arch/arm/plat-s5p/include/plat/s5p-clock.h | 5 + + arch/arm/plat-s5p/s5p-time.c | 29 +- + arch/arm/plat-s5p/sysmmu.c | 6 +- + arch/arm/plat-samsung/Kconfig | 6 + + arch/arm/plat-samsung/Makefile | 1 + + arch/arm/plat-samsung/clock.c | 98 +-- + arch/arm/plat-samsung/dev-backlight.c | 149 +++ + arch/arm/plat-samsung/dev-fb.c | 14 +- + arch/arm/plat-samsung/dev-hwmon.c | 14 +- + arch/arm/plat-samsung/dev-i2c0.c | 14 +- + arch/arm/plat-samsung/dev-i2c1.c | 24 +- + arch/arm/plat-samsung/dev-i2c2.c | 24 +- + arch/arm/plat-samsung/dev-i2c3.c | 24 +- + arch/arm/plat-samsung/dev-i2c4.c | 24 +- + arch/arm/plat-samsung/dev-i2c5.c | 24 +- + arch/arm/plat-samsung/dev-i2c6.c | 24 +- + arch/arm/plat-samsung/dev-i2c7.c | 24 +- + arch/arm/plat-samsung/dev-nand.c | 9 +- + arch/arm/plat-samsung/dev-ts.c | 14 +- + arch/arm/plat-samsung/dev-usb.c | 9 +- + arch/arm/plat-samsung/include/plat/backlight.h | 26 + + arch/arm/plat-samsung/include/plat/clock.h | 3 + + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 2 +- + arch/arm/plat-samsung/include/plat/iic.h | 2 + + arch/arm/plat-samsung/include/plat/regs-serial.h | 8 - + arch/arm/plat-samsung/pm-check.c | 2 +- + arch/arm/plat-samsung/pwm-clock.c | 10 + + arch/arm/plat-samsung/time.c | 2 + + arch/avr32/kernel/setup.c | 10 +- + arch/avr32/mach-at32ap/extint.c | 2 +- + arch/avr32/mach-at32ap/hsmc.c | 2 +- + arch/avr32/mach-at32ap/intc.c | 2 +- + arch/avr32/mach-at32ap/pio.c | 2 +- + arch/h8300/kernel/setup.c | 2 +- + arch/ia64/include/asm/sn/tioce.h | 2 +- + arch/microblaze/pci/pci-common.c | 2 +- + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/include/asm/floppy.h | 2 +- + arch/mips/include/asm/mach-jz4740/gpio.h | 5 +- + arch/mips/lantiq/devices.c | 2 - + arch/mips/lantiq/xway/devices.c | 2 - + arch/mips/pci/pci-rc32434.c | 2 +- + arch/mips/pci/pci-vr41xx.c | 2 +- + arch/mips/powertv/asic/asic_devices.c | 10 +- + arch/parisc/include/asm/dma-mapping.h | 2 +- + arch/parisc/math-emu/decode_exc.c | 2 +- + arch/powerpc/include/asm/elf.h | 4 +- + arch/powerpc/include/asm/macio.h | 2 +- + arch/powerpc/include/asm/smu.h | 2 +- + arch/powerpc/kernel/machine_kexec.c | 4 +- + arch/powerpc/kernel/pci-common.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 8 +- + arch/powerpc/platforms/83xx/km83xx.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +- + arch/powerpc/platforms/83xx/usb.c | 2 +- + arch/powerpc/platforms/85xx/sbc8560.c | 2 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 2 +- + arch/powerpc/platforms/cell/celleb_scc_epci.c | 8 +- + arch/powerpc/platforms/cell/celleb_scc_pciex.c | 2 +- + arch/powerpc/platforms/cell/spu_manage.c | 2 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 2 +- + arch/powerpc/platforms/powermac/nvram.c | 4 +- + arch/powerpc/platforms/powermac/pci.c | 6 +- + arch/powerpc/platforms/powermac/time.c | 2 +- + arch/powerpc/platforms/pseries/smp.c | 1 - + arch/powerpc/sysdev/axonram.c | 2 +- + arch/powerpc/sysdev/cpm1.c | 2 +- + arch/powerpc/sysdev/cpm_common.c | 2 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/fsl_msi.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 12 +- + arch/powerpc/sysdev/fsl_rio.c | 2 +- + arch/powerpc/sysdev/ipic.c | 2 +- + arch/powerpc/sysdev/mmio_nvram.c | 2 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- + arch/powerpc/sysdev/mv64x60_udbg.c | 4 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 16 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +- + arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- + arch/powerpc/sysdev/xics/icp-native.c | 2 +- + arch/s390/oprofile/init.c | 2 - + arch/sh/boards/mach-ap325rxa/setup.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 4 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 4 +- + arch/sh/kernel/io_trapped.c | 8 +- + arch/sh/kernel/machine_kexec.c | 2 +- + arch/sparc/include/asm/elf_64.h | 2 +- + arch/sparc/kernel/ioport.c | 12 +- + arch/sparc/kernel/pci.c | 6 +- + arch/tile/kernel/setup.c | 3 +- + arch/um/sys-i386/signal.c | 2 +- + arch/x86/Kconfig | 4 +- + arch/x86/kernel/i387.c | 2 +- + arch/x86/kernel/pci-calgary_64.c | 2 +- + arch/x86/kernel/probe_roms.c | 2 +- + arch/x86/kvm/mmu.c | 1 - + arch/xtensa/include/asm/uaccess.h | 3 +- + arch/xtensa/variants/s6000/include/variant/dmac.h | 2 +- + block/blk-core.c | 11 +- + block/blk-ioc.c | 40 +- + block/blk-lib.c | 5 +- + block/blk-softirq.c | 11 +- + block/blk-sysfs.c | 13 +- + block/blk-throttle.c | 8 +- + block/bsg.c | 18 +- + block/cfq-iosched.c | 152 ++-- + block/compat_ioctl.c | 14 - + block/deadline-iosched.c | 4 +- + block/elevator.c | 7 +- + block/genhd.c | 28 +- + crypto/Kconfig | 2 +- + drivers/acpi/ac.c | 2 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/sbs.c | 2 +- + drivers/ata/Kconfig | 1 + + drivers/ata/acard-ahci.c | 27 +- + drivers/ata/ahci.c | 122 +-- + drivers/ata/ahci.h | 1 + + drivers/ata/ata_generic.c | 5 +- + drivers/ata/ata_piix.c | 44 +- + drivers/ata/libahci.c | 152 ++- + drivers/ata/libata-acpi.c | 66 +- + drivers/ata/libata-core.c | 400 ++++--- + drivers/ata/libata-eh.c | 154 ++-- + drivers/ata/libata-pmp.c | 123 +- + drivers/ata/libata-scsi.c | 22 +- + drivers/ata/libata-sff.c | 53 +- + drivers/ata/pata_acpi.c | 8 +- + drivers/ata/pata_ali.c | 8 +- + drivers/ata/pata_amd.c | 8 +- + drivers/ata/pata_artop.c | 5 +- + drivers/ata/pata_atp867x.c | 13 +- + drivers/ata/pata_bf54x.c | 4 +- + drivers/ata/pata_cs5520.c | 3 +- + drivers/ata/pata_efar.c | 5 +- + drivers/ata/pata_hpt3x3.c | 4 +- + drivers/ata/pata_icside.c | 4 +- + drivers/ata/pata_it8213.c | 5 +- + drivers/ata/pata_it821x.c | 16 +- + drivers/ata/pata_ixp4xx_cf.c | 4 +- + drivers/ata/pata_legacy.c | 2 +- + drivers/ata/pata_macio.c | 10 +- + drivers/ata/pata_mpiix.c | 4 +- + drivers/ata/pata_netcell.c | 5 +- + drivers/ata/pata_ns87410.c | 2 +- + drivers/ata/pata_ns87415.c | 5 +- + drivers/ata/pata_octeon_cf.c | 8 +- + drivers/ata/pata_oldpiix.c | 5 +- + drivers/ata/pata_opti.c | 4 +- + drivers/ata/pata_optidma.c | 4 +- + drivers/ata/pata_pcmcia.c | 5 +- + drivers/ata/pata_pdc2027x.c | 6 +- + drivers/ata/pata_platform.c | 2 +- + drivers/ata/pata_radisys.c | 5 +- + drivers/ata/pata_rdc.c | 5 +- + drivers/ata/pata_rz1000.c | 4 +- + drivers/ata/pata_samsung_cf.c | 2 +- + drivers/ata/pata_scc.c | 8 +- + drivers/ata/pata_sch.c | 5 +- + drivers/ata/pata_sil680.c | 4 +- + drivers/ata/pata_sis.c | 5 +- + drivers/ata/pata_sl82c105.c | 6 +- + drivers/ata/pata_triflex.c | 4 +- + drivers/ata/pata_via.c | 8 +- + drivers/ata/pdc_adma.c | 10 +- + drivers/ata/sata_dwc_460ex.c | 21 +- + drivers/ata/sata_fsl.c | 43 +- + drivers/ata/sata_inic162x.c | 31 +- + drivers/ata/sata_mv.c | 94 +- + drivers/ata/sata_nv.c | 79 +- + drivers/ata/sata_promise.c | 6 +- + drivers/ata/sata_qstor.c | 13 +- + drivers/ata/sata_sil.c | 21 +- + drivers/ata/sata_sil24.c | 43 +- + drivers/ata/sata_sis.c | 26 +- + drivers/ata/sata_svw.c | 4 +- + drivers/ata/sata_sx4.c | 4 +- + drivers/ata/sata_uli.c | 4 +- + drivers/ata/sata_via.c | 42 +- + drivers/ata/sata_vsc.c | 9 +- + drivers/base/devtmpfs.c | 3 +- + drivers/bcma/core.c | 72 ++ + drivers/bcma/driver_chipcommon.c | 16 +- + drivers/bcma/driver_chipcommon_pmu.c | 2 +- + drivers/bcma/driver_pci.c | 4 +- + drivers/bcma/sprom.c | 14 +- + drivers/block/cciss.h | 2 +- + drivers/block/xen-blkback/blkback.c | 37 +- + drivers/char/bsr.c | 2 +- + drivers/char/hw_random/core.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/cpufreq/Kconfig | 5 + + drivers/cpufreq/Kconfig.arm | 32 + + drivers/cpufreq/Makefile | 8 +- + drivers/cpufreq/acpi-cpufreq.c | 2 +- + .../cpufreq/exynos4210-cpufreq.c | 9 +- + .../cpufreq.c => drivers/cpufreq/s3c64xx-cpufreq.c | 11 +- + .../cpufreq.c => drivers/cpufreq/s5pv210-cpufreq.c | 210 +++- + drivers/crypto/caam/ctrl.c | 26 +- + drivers/dma/imx-dma.c | 3 +- + drivers/dma/mv_xor.c | 5 +- + drivers/edac/cell_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 12 +- + drivers/gpio/gpio-ab8500.c | 1 - + drivers/gpio/gpio-bt8xx.c | 2 +- + drivers/gpio/gpio-ep93xx.c | 2 +- + drivers/gpio/gpio-u300.c | 8 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 1 - + drivers/gpu/drm/sis/sis_drv.h | 4 +- + drivers/hwmon/Kconfig | 21 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/gl520sm.c | 2 +- + drivers/hwmon/hwmon-vid.c | 42 +- + drivers/hwmon/it87.c | 29 + + drivers/hwmon/lm78.c | 305 +++-- + drivers/hwmon/max1111.c | 27 +- + drivers/hwmon/sch5627.c | 334 +----- + drivers/hwmon/sch5636.c | 539 ++++++++ + drivers/hwmon/sch56xx-common.c | 340 +++++ + drivers/hwmon/sch56xx-common.h | 24 + + drivers/hwmon/sht15.c | 2 +- + drivers/hwmon/via-cputemp.c | 44 +- + drivers/i2c/Kconfig | 2 +- + drivers/i2c/busses/i2c-ali1535.c | 61 +- + drivers/i2c/busses/i2c-cpm.c | 7 +- + drivers/i2c/busses/i2c-highlander.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 4 +- + drivers/i2c/busses/i2c-pxa.c | 7 +- + drivers/i2c/busses/i2c-s6000.c | 5 +- + drivers/i2c/i2c-core.c | 5 + + drivers/ide/palm_bk3710.c | 2 +- + drivers/ide/tx4939ide.c | 4 +- + drivers/input/serio/libps2.c | 2 +- + drivers/input/serio/sa1111ps2.c | 6 +- + drivers/isdn/i4l/isdn_bsdcomp.c | 2 +- + drivers/media/rc/ite-cir.c | 1 - + drivers/media/video/davinci/vpif.c | 2 +- + drivers/media/video/m5mols/m5mols_capture.c | 1 - + drivers/media/video/omap/omap_vout.c | 2 +- + drivers/media/video/omap24xxcam.c | 5 +- + drivers/media/video/videobuf2-memops.c | 1 - + drivers/message/i2o/iop.c | 8 +- + drivers/mfd/tc6387xb.c | 2 +- + drivers/misc/atmel-ssc.c | 2 +- + drivers/misc/atmel_pwm.c | 2 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mmc/host/mxcmmc.c | 8 +- + drivers/mmc/host/vub300.c | 4 +- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/maps/bfin-async-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 11 +- + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + drivers/mtd/mtdchar.c | 2 +- + drivers/mtd/nand/atmel_nand.c | 4 +- + drivers/mtd/nand/bcm_umi_nand.c | 2 +- + drivers/mtd/nand/mpc5121_nfc.c | 2 +- + drivers/net/b44.c | 2 +- + drivers/net/bcm63xx_enet.c | 8 +- + drivers/net/bna/bfa_cee.c | 65 +- + drivers/net/bna/bfa_cee.h | 3 +- + drivers/net/bna/{bfa_sm.h => bfa_cs.h} | 78 +- + drivers/net/bna/bfa_defs.h | 5 +- + drivers/net/bna/bfa_defs_mfg_comm.h | 20 +- + drivers/net/bna/bfa_defs_status.h | 134 +- + drivers/net/bna/bfa_ioc.c | 157 ++- + drivers/net/bna/bfa_ioc.h | 51 +- + drivers/net/bna/bfa_wc.h | 69 - + drivers/net/bna/bfi.h | 20 +- + drivers/net/bna/bna.h | 18 +- + drivers/net/bna/bna_ctrl.c | 45 +- + drivers/net/bna/bna_hw.h | 92 +- + drivers/net/bna/bna_txrx.c | 44 +- + drivers/net/bna/bna_types.h | 58 +- + drivers/net/bna/bnad.c | 65 +- + drivers/net/bna/bnad.h | 27 +- + drivers/net/bna/bnad_ethtool.c | 2 +- + drivers/net/bna/cna.h | 2 +- + drivers/net/bnx2x/bnx2x_dcb.c | 39 +- + drivers/net/bnx2x/bnx2x_main.c | 134 ++- + drivers/net/bsd_comp.c | 2 +- + drivers/net/can/c_can/c_can.c | 1 - + drivers/net/can/c_can/c_can_platform.c | 1 - + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/davinci_emac.c | 6 +- + drivers/net/eexpress.c | 2 +- + drivers/net/ethoc.c | 2 +- + drivers/net/fec_mpc52xx.c | 7 +- + drivers/net/fs_enet/mii-bitbang.c | 4 +- + drivers/net/fs_enet/mii-fec.c | 2 +- + drivers/net/gianfar_ptp.c | 2 +- + drivers/net/ibm_newemac/core.c | 2 +- + drivers/net/igb/igb_main.c | 1 - + drivers/net/irda/toim3232-sir.c | 2 +- + drivers/net/macb.c | 2 +- + drivers/net/mv643xx_eth.c | 2 +- + drivers/net/natsemi.c | 4 +- + drivers/net/pxa168_eth.c | 2 +- + drivers/net/qlge/qlge_main.c | 1 - + drivers/net/r8169.c | 9 +- + drivers/net/s2io.h | 4 +- + drivers/net/sb1250-mac.c | 2 +- + drivers/net/sungem.c | 3 +- + drivers/net/via-velocity.c | 1 - + drivers/net/wan/lmc/lmc_var.h | 2 +- + drivers/net/wan/sbni.c | 5 +- + drivers/net/wireless/ath/ath5k/ahb.c | 45 +- + drivers/net/wireless/ath/ath5k/ani.c | 84 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 272 ++++- + drivers/net/wireless/ath/ath5k/attach.c | 31 +- + drivers/net/wireless/ath/ath5k/base.c | 1138 ++++++++--------- + drivers/net/wireless/ath/ath5k/base.h | 205 +--- + drivers/net/wireless/ath/ath5k/caps.c | 45 - + drivers/net/wireless/ath/ath5k/debug.c | 218 ++-- + drivers/net/wireless/ath/ath5k/debug.h | 21 +- + drivers/net/wireless/ath/ath5k/desc.c | 10 +- + drivers/net/wireless/ath/ath5k/dma.c | 12 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/initvals.c | 2 +- + drivers/net/wireless/ath/ath5k/led.c | 68 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 257 ++-- + drivers/net/wireless/ath/ath5k/pci.c | 38 +- + drivers/net/wireless/ath/ath5k/pcu.c | 24 +- + drivers/net/wireless/ath/ath5k/phy.c | 41 +- + drivers/net/wireless/ath/ath5k/qcu.c | 9 +- + drivers/net/wireless/ath/ath5k/reset.c | 44 +- + drivers/net/wireless/ath/ath5k/rfkill.c | 65 +- + drivers/net/wireless/ath/ath5k/sysfs.c | 32 +- + drivers/net/wireless/ath/ath5k/trace.h | 12 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 12 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 8 +- + drivers/net/wireless/ath/ath9k/debug.c | 22 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 12 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 12 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 12 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 9 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 7 +- + drivers/net/wireless/ath/ath9k/hw.c | 22 + + drivers/net/wireless/ath/ath9k/init.c | 25 +- + drivers/net/wireless/ath/ath9k/recv.c | 53 +- + drivers/net/wireless/ath/ath9k/reg.h | 23 - + drivers/net/wireless/ath/ath9k/xmit.c | 4 + + drivers/net/wireless/ath/carl9170/carl9170.h | 10 +- + drivers/net/wireless/ath/carl9170/cmd.h | 4 +- + drivers/net/wireless/ath/carl9170/debug.c | 2 +- + drivers/net/wireless/ath/carl9170/fwdesc.h | 3 + + drivers/net/wireless/ath/carl9170/hw.h | 41 +- + drivers/net/wireless/ath/carl9170/led.c | 2 +- + drivers/net/wireless/ath/carl9170/mac.c | 129 -- + drivers/net/wireless/ath/carl9170/main.c | 2 +- + drivers/net/wireless/ath/carl9170/phy.c | 6 +- + drivers/net/wireless/ath/carl9170/tx.c | 290 ++++- + drivers/net/wireless/ath/key.c | 7 +- + drivers/net/wireless/b43/b43.h | 7 + + drivers/net/wireless/b43/bus.c | 27 +- + drivers/net/wireless/b43/debugfs.c | 2 +- + drivers/net/wireless/b43/dma.c | 29 +- + drivers/net/wireless/b43/dma.h | 4 + + drivers/net/wireless/b43/leds.c | 2 +- + drivers/net/wireless/b43/lo.c | 2 +- + drivers/net/wireless/b43/main.c | 108 ++- + drivers/net/wireless/b43/main.h | 2 +- + drivers/net/wireless/b43/pcmcia.c | 2 +- + drivers/net/wireless/b43/phy_a.c | 2 +- + drivers/net/wireless/b43/phy_common.c | 2 +- + drivers/net/wireless/b43/phy_g.c | 2 +- + drivers/net/wireless/b43/phy_ht.c | 21 +- + drivers/net/wireless/b43/phy_lp.c | 2 +- + drivers/net/wireless/b43/phy_n.c | 6 +- + drivers/net/wireless/b43/pio.c | 2 +- + drivers/net/wireless/b43/radio_2055.c | 2 +- + drivers/net/wireless/b43/radio_2059.c | 9 + + drivers/net/wireless/b43/rfkill.c | 2 +- + drivers/net/wireless/b43/sdio.c | 2 +- + drivers/net/wireless/b43/sysfs.c | 2 +- + drivers/net/wireless/b43/tables.c | 2 +- + drivers/net/wireless/b43/tables_lpphy.c | 2 +- + drivers/net/wireless/b43/tables_nphy.c | 2 +- + drivers/net/wireless/b43/wa.c | 2 +- + drivers/net/wireless/b43/xmit.c | 2 +- + drivers/net/wireless/b43legacy/b43legacy.h | 2 + + drivers/net/wireless/b43legacy/debugfs.c | 2 +- + drivers/net/wireless/b43legacy/dma.c | 9 +- + drivers/net/wireless/b43legacy/ilt.c | 2 +- + drivers/net/wireless/b43legacy/leds.c | 2 +- + drivers/net/wireless/b43legacy/main.c | 2 +- + drivers/net/wireless/b43legacy/main.h | 2 +- + drivers/net/wireless/b43legacy/phy.c | 2 +- + drivers/net/wireless/b43legacy/phy.h | 2 +- + drivers/net/wireless/b43legacy/pio.c | 2 +- + drivers/net/wireless/b43legacy/radio.c | 2 +- + drivers/net/wireless/b43legacy/radio.h | 2 +- + drivers/net/wireless/b43legacy/rfkill.c | 2 +- + drivers/net/wireless/b43legacy/sysfs.c | 2 +- + drivers/net/wireless/b43legacy/xmit.c | 2 +- + drivers/net/wireless/iwlegacy/iwl-commands.h | 4 +- + drivers/net/wireless/iwlwifi/Makefile | 8 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 46 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 22 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 58 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 65 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 210 ---- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 306 ----- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 504 +------- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 115 ++- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 380 +++---- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 411 +------ + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 179 +--- + drivers/net/wireless/iwlwifi/iwl-agn.c | 1240 ++++++++++--------- + drivers/net/wireless/iwlwifi/iwl-agn.h | 65 +- + .../net/wireless/iwlwifi/{iwl-pci.h => iwl-bus.h} | 70 + + drivers/net/wireless/iwlwifi/iwl-commands.h | 184 +++- + drivers/net/wireless/iwlwifi/iwl-core.c | 28 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 64 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/iwlwifi/iwl-debug.h | 10 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 87 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 197 +-- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 271 ---- + drivers/net/wireless/iwlwifi/iwl-io.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-pci.c | 101 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 82 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 212 +--- + drivers/net/wireless/iwlwifi/iwl-scan.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-sv-open.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h | 82 ++ + drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c | 979 +++++++++++++++ + .../iwlwifi/{iwl-tx.c => iwl-trans-tx-pcie.c} | 484 +++++++- + drivers/net/wireless/iwlwifi/iwl-trans.c | 643 +++++++++- + drivers/net/wireless/iwlwifi/iwl-trans.h | 154 ++- + drivers/net/wireless/libertas/dev.h | 2 - + drivers/net/wireless/libertas/main.c | 2 +- + drivers/net/wireless/libertas/mesh.c | 1320 +++++++++----------- + drivers/net/wireless/libertas/mesh.h | 31 - + drivers/net/wireless/libertas/tx.c | 2 +- + drivers/net/wireless/mwifiex/debugfs.c | 33 +- + drivers/net/wireless/mwifiex/ioctl.h | 1 + + drivers/net/wireless/mwifiex/main.h | 1 + + drivers/net/wireless/mwifiex/sdio.c | 5 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 14 + + drivers/net/wireless/mwifiex/wmm.c | 2 + + drivers/net/wireless/mwl8k.c | 6 +- + drivers/net/wireless/orinoco/airport.c | 9 +- + drivers/net/wireless/orinoco/cfg.c | 6 +- + drivers/net/wireless/orinoco/fw.c | 7 +- + drivers/net/wireless/orinoco/fw.h | 2 +- + drivers/net/wireless/orinoco/hermes.c | 40 +- + drivers/net/wireless/orinoco/hermes.h | 37 +- + drivers/net/wireless/orinoco/hermes_dld.c | 8 +- + drivers/net/wireless/orinoco/hermes_dld.h | 12 +- + drivers/net/wireless/orinoco/hw.c | 48 +- + drivers/net/wireless/orinoco/hw.h | 2 +- + drivers/net/wireless/orinoco/main.c | 46 +- + drivers/net/wireless/orinoco/mic.c | 8 +- + drivers/net/wireless/orinoco/orinoco.h | 16 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 6 +- + drivers/net/wireless/orinoco/orinoco_nortel.c | 3 +- + drivers/net/wireless/orinoco/orinoco_pci.c | 4 +- + drivers/net/wireless/orinoco/orinoco_plx.c | 6 +- + drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 23 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 10 +- + drivers/net/wireless/orinoco/wext.c | 14 +- + drivers/net/wireless/rtlwifi/base.c | 20 +- + drivers/net/wireless/rtlwifi/cam.c | 8 +- + drivers/net/wireless/rtlwifi/core.c | 6 +- + drivers/net/wireless/rtlwifi/debug.h | 5 - + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 69 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 11 +- + drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 8 +- + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 12 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 6 +- + drivers/net/wireless/rtlwifi/usb.c | 12 +- + drivers/parport/parport_ax88796.c | 2 +- + drivers/pci/hotplug/shpchp_sysfs.c | 21 +- + drivers/pci/pcie/aspm.c | 2 +- + drivers/pcmcia/at91_cf.c | 7 +- + drivers/pcmcia/electra_cf.c | 4 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 3 - + drivers/pcmcia/pxa2xx_trizeps4.c | 4 - + drivers/pcmcia/rsrc_iodyn.c | 6 +- + drivers/pcmcia/rsrc_nonstatic.c | 6 +- + drivers/platform/x86/asus-wmi.c | 2 +- + drivers/pnp/pnpacpi/rsparser.c | 10 +- + drivers/pnp/pnpbios/rsparser.c | 12 +- + drivers/power/ds2782_battery.c | 4 +- + drivers/rtc/rtc-at32ap700x.c | 2 +- + drivers/rtc/rtc-cmos.c | 6 +- + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-ds1742.c | 2 +- + drivers/rtc/rtc-m48t35.c | 2 +- + drivers/rtc/rtc-m48t59.c | 2 +- + drivers/rtc/rtc-mrst.c | 5 +- + drivers/rtc/rtc-puv3.c | 5 +- + drivers/rtc/rtc-s3c.c | 5 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +- + drivers/scsi/lpfc/lpfc_hw.h | 8 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 +- + drivers/ssb/b43_pci_bridge.c | 2 +- + drivers/ssb/driver_chipcommon.c | 2 +- + drivers/ssb/driver_chipcommon_pmu.c | 2 +- + drivers/ssb/driver_extif.c | 2 +- + drivers/ssb/driver_gige.c | 2 +- + drivers/ssb/driver_mipscore.c | 2 +- + drivers/ssb/driver_pcicore.c | 2 +- + drivers/ssb/embedded.c | 2 +- + drivers/ssb/main.c | 7 +- + drivers/ssb/pci.c | 2 +- + drivers/ssb/pcihost_wrapper.c | 2 +- + drivers/ssb/pcmcia.c | 2 +- + drivers/ssb/scan.c | 2 +- + drivers/ssb/sdio.c | 2 +- + drivers/ssb/sprom.c | 2 +- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 1 - + drivers/staging/bcm/headers.h | 7 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 - + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 1 - + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +- + drivers/staging/gma500/psb_intel_display.c | 2 +- + drivers/staging/hv/hv_mouse.c | 1 - + drivers/staging/hv/tools/hv_kvp_daemon.c | 1 - + drivers/staging/nvec/nvec.c | 1 - + drivers/staging/rtl8187se/r8180_core.c | 2 +- + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192e/r8192E_core.c | 6 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 6 +- + drivers/staging/rtl8712/drv_types.h | 1 - + drivers/staging/rtl8712/osdep_service.h | 1 - + drivers/staging/sep/sep_driver.c | 1 - + drivers/staging/usbip/userspace/src/utils.h | 1 - + drivers/target/tcm_fc/tfc_cmd.c | 1 - + drivers/target/tcm_fc/tfc_conf.c | 1 - + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 2 - + drivers/tty/serial/8250_pci.c | 2 +- + drivers/tty/serial/Kconfig | 15 - + drivers/tty/serial/Makefile | 2 - + drivers/tty/serial/bfin_5xx.c | 5 +- + drivers/tty/serial/imx.c | 5 +- + drivers/tty/serial/m32r_sio.c | 2 +- + drivers/tty/serial/omap-serial.c | 6 +- + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/s3c2400.c | 105 -- + drivers/tty/serial/s3c2410.c | 2 - + drivers/tty/serial/s3c2412.c | 2 - + drivers/tty/serial/s3c2440.c | 2 - + drivers/tty/serial/s3c24a0.c | 117 -- + drivers/tty/serial/s3c6400.c | 2 - + drivers/tty/serial/s5pv210.c | 7 - + drivers/tty/serial/samsung.c | 9 +- + drivers/tty/serial/samsung.h | 19 - + drivers/tty/serial/sunsu.c | 2 +- + drivers/tty/serial/vt8500_serial.c | 3 +- + drivers/uio/uio_pdrv.c | 2 +- + drivers/uio/uio_pdrv_genirq.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/fsl_udc_core.c | 6 +- + drivers/usb/gadget/pxa27x_udc.h | 4 +- + drivers/usb/host/ehci-ath79.c | 2 +- + drivers/usb/host/ehci-cns3xxx.c | 2 +- + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/ehci-grlib.c | 2 +- + drivers/usb/host/ehci-ixp4xx.c | 2 +- + drivers/usb/host/ehci-octeon.c | 2 +- + drivers/usb/host/ehci-pmcmsp.c | 10 +- + drivers/usb/host/ehci-ppc-of.c | 2 +- + drivers/usb/host/ehci-w90x900.c | 2 +- + drivers/usb/host/ehci-xilinx-of.c | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/ohci-ath79.c | 4 +- + drivers/usb/host/ohci-cns3xxx.c | 2 +- + drivers/usb/host/ohci-da8xx.c | 2 +- + drivers/usb/host/ohci-octeon.c | 2 +- + drivers/usb/host/ohci-ppc-of.c | 2 +- + drivers/usb/host/ohci-ppc-soc.c | 2 +- + drivers/usb/host/ohci-sa1111.c | 2 +- + drivers/usb/host/ohci-sm501.c | 11 +- + drivers/usb/host/ohci-ssb.c | 2 +- + drivers/usb/host/ohci-tmio.c | 6 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/uhci-grlib.c | 2 +- + drivers/usb/host/whci/init.c | 2 +- + drivers/usb/misc/ftdi-elan.c | 28 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/otg/isp1301_omap.c | 4 +- + drivers/usb/otg/otg_fsm.c | 1 - + drivers/usb/otg/twl4030-usb.c | 2 +- + drivers/uwb/uwbd.c | 2 +- + drivers/uwb/whc-rc.c | 2 +- + drivers/video/atmel_lcdfb.c | 4 +- + drivers/video/aty/atyfb_base.c | 7 +- + drivers/video/au1100fb.c | 2 +- + drivers/video/cobalt_lcdfb.c | 2 +- + drivers/video/controlfb.c | 4 +- + drivers/video/ep93xx-fb.c | 4 +- + drivers/video/i810/i810.h | 2 +- + drivers/video/mb862xx/mb862xxfbdrv.c | 4 +- + drivers/video/msm/mdp.c | 3 +- + drivers/video/msm/msm_fb.c | 7 +- + drivers/video/nuc900fb.c | 2 +- + drivers/video/platinumfb.c | 5 +- + drivers/video/pxa168fb.c | 2 +- + drivers/video/udlfb.c | 1 - + drivers/video/via/viafbdev.c | 4 +- + fs/9p/acl.c | 68 +- + fs/9p/acl.h | 10 +- + fs/9p/vfs_inode_dotl.c | 13 +- + fs/anon_inodes.c | 2 +- + fs/block_dev.c | 23 +- + fs/btrfs/acl.c | 63 +- + fs/btrfs/ctree.h | 4 +- + fs/btrfs/inode.c | 10 +- + fs/cifs/dir.c | 2 +- + fs/compat_ioctl.c | 5 + + fs/ecryptfs/keystore.c | 2 +- + fs/ext2/acl.c | 63 +- + fs/ext2/acl.h | 4 +- + fs/ext2/file.c | 2 +- + fs/ext2/namei.c | 4 +- + fs/ext3/acl.c | 94 +- + fs/ext3/acl.h | 4 +- + fs/ext3/file.c | 2 +- + fs/ext3/namei.c | 4 +- + fs/ext4/acl.c | 95 +- + fs/ext4/acl.h | 4 +- + fs/ext4/file.c | 2 +- + fs/ext4/namei.c | 4 +- + fs/generic_acl.c | 62 +- + fs/gfs2/acl.c | 75 +- + fs/gfs2/acl.h | 2 +- + fs/gfs2/inode.c | 6 +- + fs/hugetlbfs/inode.c | 1 + + fs/jffs2/acl.c | 49 +- + fs/jffs2/acl.h | 6 +- + fs/jffs2/dir.c | 2 +- + fs/jffs2/file.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/readinode.c | 2 +- + fs/jffs2/symlink.c | 2 +- + fs/jfs/acl.c | 75 +- + fs/jfs/file.c | 2 +- + fs/jfs/jfs_acl.h | 2 +- + fs/jfs/namei.c | 2 +- + fs/namei.c | 54 +- + fs/namespace.c | 21 +- + fs/nfs/idmap.c | 7 +- + fs/nfs/nfs3acl.c | 10 +- + fs/ocfs2/acl.c | 77 +- + fs/ocfs2/acl.h | 2 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/move_extents.c | 1 - + fs/ocfs2/namei.c | 2 +- + fs/partitions/check.c | 12 +- + fs/pipe.c | 2 +- + fs/posix_acl.c | 48 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/inode.c | 5 + + fs/reiserfs/journal.c | 13 - + fs/reiserfs/namei.c | 6 +- + fs/reiserfs/xattr.c | 27 - + fs/reiserfs/xattr_acl.c | 71 +- + fs/super.c | 4 - + fs/xfs/linux-2.6/xfs_acl.c | 80 +- + fs/xfs/linux-2.6/xfs_file.c | 5 +- + fs/xfs/linux-2.6/xfs_iops.c | 14 +- + fs/xfs/linux-2.6/xfs_trace.h | 2 +- + fs/xfs/xfs_acl.h | 2 - + fs/xfs/xfs_dir2_node.c | 2 +- + include/asm-generic/iomap.h | 8 + + include/linux/bcma/bcma.h | 21 + + include/linux/bcma/bcma_driver_chipcommon.h | 13 +- + include/linux/bcma/bcma_regs.h | 27 +- + include/linux/blkdev.h | 27 +- + include/linux/ceph/libceph.h | 2 +- + include/linux/cgroup.h | 1 - + include/linux/cred.h | 1 - + include/linux/dio.h | 2 +- + include/linux/elevator.h | 2 +- + include/linux/fd.h | 22 + + include/linux/fdtable.h | 1 - + include/linux/fs.h | 8 +- + include/linux/generic_acl.h | 1 - + include/linux/genhd.h | 2 +- + include/linux/hw_random.h | 2 +- + include/linux/ieee80211.h | 37 + + include/linux/init_task.h | 1 - + include/linux/iocontext.h | 14 +- + include/linux/libata.h | 68 +- + include/linux/mfd/tps65910.h | 2 +- + include/linux/nl80211.h | 35 +- + include/linux/pnp.h | 2 +- + include/linux/posix_acl.h | 5 +- + include/linux/reiserfs_acl.h | 6 +- + include/linux/reiserfs_xattr.h | 2 - + include/linux/rtnetlink.h | 3 +- + include/linux/sched.h | 1 - + include/linux/ssb/ssb.h | 2 + + include/linux/ssb/ssb_driver_chipcommon.h | 2 +- + include/linux/stop_machine.h | 2 +- + include/linux/zorro.h | 2 +- + include/net/cfg80211.h | 33 +- + include/net/mac80211.h | 60 + + include/net/sock.h | 3 +- + include/scsi/osd_initiator.h | 2 +- + include/scsi/scsi.h | 2 +- + include/sound/soundfont.h | 2 +- + kernel/cgroup.c | 8 +- + kernel/exit.c | 2 - + kernel/fork.c | 1 - + kernel/kexec.c | 2 +- + kernel/pid.c | 1 - + kernel/power/Kconfig | 4 +- + kernel/rcutorture.c | 2 - + kernel/sched.c | 1 - + lib/vsprintf.c | 3 +- + mm/Kconfig | 2 +- + mm/backing-dev.c | 2 +- + mm/shmem.c | 6 - + mm/slub.c | 2 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_netlink.c | 2 + + net/bridge/br_private.h | 1 + + net/bridge/br_private_stp.h | 3 +- + net/bridge/br_stp.c | 31 +- + net/bridge/br_stp_bpdu.c | 15 +- + net/bridge/br_stp_if.c | 3 + + net/bridge/br_stp_timer.c | 1 + + net/bridge/netfilter/ebt_ulog.c | 1 - + net/core/link_watch.c | 2 +- + net/ipv4/gre.c | 21 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/route.c | 2 +- + net/mac80211/agg-rx.c | 10 +- + net/mac80211/cfg.c | 4 + + net/mac80211/driver-ops.h | 31 + + net/mac80211/driver-trace.h | 43 + + net/mac80211/ieee80211_i.h | 7 +- + net/mac80211/key.c | 2 +- + net/mac80211/mesh_hwmp.c | 20 +- + net/mac80211/mlme.c | 30 +- + net/mac80211/pm.c | 3 + + net/mac80211/scan.c | 6 +- + net/mac80211/sta_info.c | 4 - + net/mac80211/tkip.c | 11 + + net/mac80211/util.c | 71 +- + net/mac80211/work.c | 28 +- + net/netlabel/netlabel_domainhash.c | 3 +- + net/netlabel/netlabel_unlabeled.c | 3 +- + net/wireless/core.c | 7 +- + net/wireless/core.h | 4 + + net/wireless/nl80211.c | 109 ++- + net/wireless/scan.c | 4 + + net/wireless/util.c | 38 + + scripts/bootgraph.pl | 2 +- + scripts/docproc.c | 17 +- + scripts/gcc-goto.sh | 2 +- + security/keys/keyring.c | 1 - + security/selinux/selinuxfs.c | 1 + + sound/aoa/soundbus/i2sbus/core.c | 9 +- + sound/atmel/abdac.c | 2 +- + sound/atmel/ac97c.c | 2 +- + sound/core/info.c | 2 +- + sound/pci/ice1712/ice1712.c | 2 +- + sound/ppc/pmac.c | 9 +- + sound/soc/ep93xx/ep93xx-i2s.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/ep93xx/snappercl15.c | 4 +- + sound/soc/fsl/mpc5200_dma.c | 2 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 4 +- + sound/soc/omap/ams-delta.c | 2 +- + 1095 files changed, 16652 insertions(+), 20489 deletions(-) + mode change 100755 => 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt + create mode 100644 Documentation/hwmon/sch5636 + delete mode 100644 arch/arm/configs/loki_defconfig + create mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-integrator/include/mach/bits.h + delete mode 100644 arch/arm/mach-loki/Kconfig + delete mode 100644 arch/arm/mach-loki/Makefile + delete mode 100644 arch/arm/mach-loki/Makefile.boot + delete mode 100644 arch/arm/mach-loki/addr-map.c + delete mode 100644 arch/arm/mach-loki/common.c + delete mode 100644 arch/arm/mach-loki/common.h + delete mode 100644 arch/arm/mach-loki/include/mach/bridge-regs.h + delete mode 100644 arch/arm/mach-loki/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-loki/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-loki/include/mach/hardware.h + delete mode 100644 arch/arm/mach-loki/include/mach/io.h + delete mode 100644 arch/arm/mach-loki/include/mach/irqs.h + delete mode 100644 arch/arm/mach-loki/include/mach/loki.h + delete mode 100644 arch/arm/mach-loki/include/mach/memory.h + delete mode 100644 arch/arm/mach-loki/include/mach/system.h + delete mode 100644 arch/arm/mach-loki/include/mach/timex.h + delete mode 100644 arch/arm/mach-loki/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-loki/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-loki/irq.c + delete mode 100644 arch/arm/mach-loki/lb88rc8480-setup.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c + delete mode 100644 arch/arm/mach-omap2/timer-gp.c + delete mode 100644 arch/arm/mach-omap2/timer-gp.h + create mode 100644 arch/arm/mach-omap2/timer.c + create mode 100644 arch/arm/mach-omap2/twl-common.c + create mode 100644 arch/arm/mach-omap2/twl-common.h + delete mode 100644 arch/arm/mach-s3c2400/Kconfig + delete mode 100644 arch/arm/mach-s3c2400/Makefile + delete mode 100644 arch/arm/mach-s3c2400/gpio.c + delete mode 100644 arch/arm/mach-s3c2400/include/mach/map.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/io.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/irqs.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/map.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/memory.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/regs-irq.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/system.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/tick.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/timex.h + delete mode 100644 arch/arm/mach-s3c24a0/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-fb.h + create mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h + create mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-fb.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-fb.h + delete mode 100644 arch/arm/plat-mxc/include/mach/iomux.h + create mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2400.h + create mode 100644 arch/arm/plat-samsung/dev-backlight.c + create mode 100644 arch/arm/plat-samsung/include/plat/backlight.h + create mode 100644 drivers/cpufreq/Kconfig.arm + rename arch/arm/mach-exynos4/cpufreq.c => drivers/cpufreq/exynos4210-cpufreq.c (98%) + rename arch/arm/mach-s3c64xx/cpufreq.c => drivers/cpufreq/s3c64xx-cpufreq.c (98%) + rename arch/arm/mach-s5pv210/cpufreq.c => drivers/cpufreq/s5pv210-cpufreq.c (73%) + create mode 100644 drivers/hwmon/sch5636.c + create mode 100644 drivers/hwmon/sch56xx-common.c + create mode 100644 drivers/hwmon/sch56xx-common.h + rename drivers/net/bna/{bfa_sm.h => bfa_cs.h} (60%) + delete mode 100644 drivers/net/bna/bfa_wc.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.c + rename drivers/net/wireless/iwlwifi/{iwl-pci.h => iwl-bus.h} (61%) + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-hcmd.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c + rename drivers/net/wireless/iwlwifi/{iwl-tx.c => iwl-trans-tx-pcie.c} (53%) + delete mode 100644 drivers/tty/serial/s3c2400.c + delete mode 100644 drivers/tty/serial/s3c24a0.c +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 +Already up-to-date. +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 +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging 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 +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/keyboard/sh_keysc.c | 2 +- + 1 files changed, 1 insertions(+), 1 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 +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Auto-merging drivers/video/msm/mdp.c +Auto-merging drivers/video/udlfb.c +Merge made by recursive. + drivers/video/carminefb.c | 6 +++--- + drivers/video/msm/mdp.c | 4 +++- + drivers/video/s3c2410fb.c | 1 - + drivers/video/udlfb.c | 21 +++++++++++++++------ + 4 files changed, 21 insertions(+), 11 deletions(-) +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Merge made by recursive. +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next +$ git merge arm/for-next +Merge made by recursive. + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 23 +++++++++++++---------- + arch/arm/include/asm/tlb.h | 1 + + 3 files changed, 15 insertions(+), 11 deletions(-) +Merging arm-lpae/for-next +$ git merge arm-lpae/for-next +Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution. +Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution. +Resolved 'arch/arm/include/asm/proc-fns.h' using previous resolution. +Resolved 'arch/arm/include/asm/tlb.h' using previous resolution. +Resolved 'arch/arm/mm/context.c' using previous resolution. +Resolved 'arch/arm/mm/proc-v7.S' using previous resolution. +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging arch/arm/include/asm/memory.h +Auto-merging arch/arm/include/asm/pgalloc.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h +Auto-merging arch/arm/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h +Auto-merging arch/arm/include/asm/proc-fns.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/proc-fns.h +Auto-merging arch/arm/include/asm/setup.h +Auto-merging arch/arm/include/asm/tlb.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h +Auto-merging arch/arm/include/asm/tlbflush.h +Auto-merging arch/arm/kernel/head.S +Auto-merging arch/arm/kernel/module.c +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/sleep.S +Auto-merging arch/arm/mm/alignment.c +Auto-merging arch/arm/mm/context.c +CONFLICT (content): Merge conflict in arch/arm/mm/context.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/mm/mm.h +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/proc-macros.S +Auto-merging arch/arm/mm/proc-v7.S +CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fa9550d] Merge remote-tracking branch 'arm-lpae/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 2 +- + arch/arm/boot/compressed/head.S | 1 + + arch/arm/include/asm/assembler.h | 11 + + arch/arm/include/asm/memory.h | 4 +- + arch/arm/include/asm/page.h | 44 +--- + arch/arm/include/asm/pgalloc.h | 28 ++- + arch/arm/include/asm/pgtable-2level-hwdef.h | 93 ++++++ + arch/arm/include/asm/pgtable-2level-types.h | 69 +++++ + arch/arm/include/asm/pgtable-2level.h | 143 +++++++++ + arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++ + arch/arm/include/asm/pgtable-3level-types.h | 71 +++++ + arch/arm/include/asm/pgtable-3level.h | 107 +++++++ + arch/arm/include/asm/pgtable-hwdef.h | 81 +----- + arch/arm/include/asm/pgtable.h | 211 +++++--------- + arch/arm/include/asm/proc-fns.h | 21 ++ + arch/arm/include/asm/setup.h | 8 + + arch/arm/include/asm/tlb.h | 11 +- + arch/arm/include/asm/tlbflush.h | 4 +- + arch/arm/include/asm/types.h | 11 +- + arch/arm/kernel/head.S | 119 ++++++--- + arch/arm/kernel/module.c | 2 +- + arch/arm/kernel/setup.c | 10 + + arch/arm/kernel/sleep.S | 2 + + arch/arm/mm/Kconfig | 13 + + arch/arm/mm/Makefile | 4 + + arch/arm/mm/alignment.c | 8 +- + arch/arm/mm/context.c | 19 +- + arch/arm/mm/dma-mapping.c | 6 +- + arch/arm/mm/fault.c | 87 ++++++ + arch/arm/mm/idmap.c | 36 +++- + arch/arm/mm/ioremap.c | 17 +- + arch/arm/mm/mm.h | 4 +- + arch/arm/mm/mmu.c | 51 +++- + arch/arm/mm/pgd.c | 51 +++- + arch/arm/mm/proc-macros.S | 5 +- + arch/arm/mm/proc-v7.S | 10 +- + arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++ + 37 files changed, 1521 insertions(+), 347 deletions(-) + create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h + create mode 100644 arch/arm/include/asm/pgtable-2level-types.h + create mode 100644 arch/arm/include/asm/pgtable-2level.h + create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h + create mode 100644 arch/arm/include/asm/pgtable-3level-types.h + create mode 100644 arch/arm/include/asm/pgtable-3level.h + create mode 100644 arch/arm/mm/proc-v7lpae.S +Merging arm-soc/for-next +$ git merge arm-soc/for-next +Resolved 'arch/arm/mach-exynos4/pm.c' using previous resolution. +Resolved 'arch/microblaze/include/asm/pci-bridge.h' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/common/gic.c +Auto-merging arch/arm/kernel/irq.c +Removing arch/arm/mach-at91/include/mach/clkdev.h +Removing arch/arm/mach-bcmring/include/mach/clkdev.h +Removing arch/arm/mach-cns3xxx/include/mach/hardware.h +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Removing arch/arm/mach-davinci/include/mach/clkdev.h +Removing arch/arm/mach-ep93xx/include/mach/clkdev.h +Auto-merging arch/arm/mach-exynos4/Makefile +Removing arch/arm/mach-exynos4/localtimer.c +Auto-merging arch/arm/mach-exynos4/platsmp.c +Auto-merging arch/arm/mach-exynos4/pm.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/pm.c +Removing arch/arm/mach-exynos4/time.c +Auto-merging arch/arm/mach-ixp4xx/common-pci.c +Removing arch/arm/mach-lpc32xx/include/mach/clkdev.h +Removing arch/arm/mach-mmp/include/mach/clkdev.h +Removing arch/arm/mach-msm/include/mach/clkdev.h +Auto-merging arch/arm/mach-mv78xx0/pcie.c +Auto-merging arch/arm/mach-mx5/clock-mx51-mx53.c +Removing arch/arm/mach-mxs/include/mach/clkdev.h +Removing arch/arm/mach-nomadik/include/mach/clkdev.h +Removing arch/arm/mach-nuc93x/include/mach/clkdev.h +Removing arch/arm/mach-omap1/include/mach/clkdev.h +Removing arch/arm/mach-omap2/include/mach/clkdev.h +Removing arch/arm/mach-pnx4008/include/mach/clkdev.h +Auto-merging arch/arm/mach-pxa/cm-x2xx.c +Removing arch/arm/mach-pxa/include/mach/clkdev.h +Removing arch/arm/mach-pxa/include/mach/regs-intc.h +Auto-merging arch/arm/mach-pxa/palmz72.c +Auto-merging arch/arm/mach-pxa/pxa3xx.c +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/zeus.c +Auto-merging arch/arm/mach-s3c64xx/Makefile +Removing arch/arm/mach-spear3xx/include/mach/clkdev.h +Removing arch/arm/mach-spear6xx/include/mach/clkdev.h +Auto-merging arch/arm/mach-tegra/board-seaboard.c +Auto-merging arch/arm/mach-tegra/board-trimslice-pinmux.c +Removing arch/arm/mach-tegra/include/mach/barriers.h +Auto-merging arch/arm/mach-tegra/platsmp.c +Auto-merging arch/arm/mach-ux500/board-mop500-regulators.c +Auto-merging arch/arm/mach-ux500/clock.c +Removing arch/arm/mach-ux500/include/mach/clkdev.h +Removing arch/arm/mach-w90x900/include/mach/clkdev.h +Auto-merging arch/arm/mach-zynq/common.h +Auto-merging arch/arm/mach-zynq/include/mach/system.h +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/mm/proc-xsc3.S +Removing arch/arm/plat-mxc/include/mach/clkdev.h +Auto-merging arch/arm/plat-omap/clock.c +Removing arch/arm/plat-omap/include/plat/clkdev.h +Auto-merging arch/arm/plat-omap/omap_device.c +Auto-merging arch/arm/plat-samsung/irq-uart.c +Auto-merging arch/arm/plat-samsung/pm.c +Removing arch/arm/plat-spear/include/plat/clkdev.h +Removing arch/arm/plat-tcc/include/mach/clkdev.h +Auto-merging arch/microblaze/include/asm/pci-bridge.h +CONFLICT (content): Merge conflict in arch/microblaze/include/asm/pci-bridge.h +Auto-merging arch/powerpc/include/asm/pci-bridge.h +Auto-merging arch/powerpc/include/asm/pci.h +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/kernel/pci_32.c +Auto-merging arch/powerpc/platforms/52xx/mpc52xx_pci.c +Auto-merging arch/powerpc/platforms/chrp/pci.c +Auto-merging arch/powerpc/platforms/powermac/pci.c +Auto-merging arch/powerpc/sysdev/fsl_pci.c +Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c +Removing drivers/mfd/twl4030-codec.c +Auto-merging include/linux/mfd/twl4030-audio.h +Auto-merging sound/soc/codecs/Kconfig +Auto-merging sound/soc/codecs/twl6040.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 74159c5] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/sirf.txt | 3 + + Documentation/devicetree/bindings/arm/xilinx.txt | 7 + + MAINTAINERS | 6 + + arch/arm/Kconfig | 40 +- + arch/arm/Makefile | 3 + + arch/arm/boot/dts/prima2-cb.dts | 416 +++++++++++ + arch/arm/boot/dts/zynq-ep107.dts | 52 ++ + arch/arm/common/gic.c | 6 - + arch/arm/configs/mxs_defconfig | 2 + + arch/arm/configs/u8500_defconfig | 32 +- + arch/arm/include/asm/clkdev.h | 5 + + arch/arm/include/asm/hardware/gic.h | 6 + + arch/arm/include/asm/irq.h | 1 + + arch/arm/include/asm/pci.h | 12 +- + arch/arm/include/asm/vga.h | 5 +- + arch/arm/kernel/irq.c | 19 +- + arch/arm/lib/ecard.S | 1 - + arch/arm/lib/io-readsw-armv3.S | 1 - + arch/arm/lib/io-writesw-armv3.S | 1 - + arch/arm/mach-at91/include/mach/clkdev.h | 7 - + arch/arm/mach-bcmring/include/mach/clkdev.h | 7 - + arch/arm/mach-bcmring/include/mach/hardware.h | 2 - + arch/arm/mach-cns3xxx/cns3420vb.c | 3 +- + arch/arm/mach-cns3xxx/core.c | 43 ++ + arch/arm/mach-cns3xxx/core.h | 6 + + arch/arm/mach-cns3xxx/include/mach/hardware.h | 22 - + arch/arm/mach-cns3xxx/pcie.c | 3 + + arch/arm/mach-davinci/board-da850-evm.c | 7 + + arch/arm/mach-davinci/clock.c | 8 +- + arch/arm/mach-davinci/clock.h | 1 + + arch/arm/mach-davinci/da850.c | 10 + + arch/arm/mach-davinci/devices-da8xx.c | 126 ++++ + arch/arm/mach-davinci/include/mach/clkdev.h | 15 - + arch/arm/mach-davinci/include/mach/da8xx.h | 2 + + arch/arm/mach-davinci/include/mach/psc.h | 3 +- + arch/arm/mach-davinci/psc.c | 14 +- + arch/arm/mach-dove/include/mach/hardware.h | 7 - + arch/arm/mach-dove/pcie.c | 3 + + arch/arm/mach-ep93xx/include/mach/clkdev.h | 11 - + arch/arm/mach-ep93xx/include/mach/hardware.h | 2 - + arch/arm/mach-exynos4/Kconfig | 30 +- + arch/arm/mach-exynos4/Makefile | 11 +- + arch/arm/mach-exynos4/clock.c | 61 ++ + arch/arm/mach-exynos4/cpu.c | 39 +- + arch/arm/mach-exynos4/dev-audio.c | 2 + + arch/arm/mach-exynos4/dev-dwmci.c | 82 ++ + arch/arm/mach-exynos4/hotplug.c | 13 +- + arch/arm/mach-exynos4/include/mach/dwmci.h | 20 + + arch/arm/mach-exynos4/include/mach/entry-macro.S | 11 +- + arch/arm/mach-exynos4/include/mach/irqs.h | 196 +++--- + arch/arm/mach-exynos4/include/mach/map.h | 19 +- + arch/arm/mach-exynos4/include/mach/pm-core.h | 10 + + arch/arm/mach-exynos4/include/mach/pmu.h | 25 + + arch/arm/mach-exynos4/include/mach/regs-audss.h | 18 + + arch/arm/mach-exynos4/include/mach/regs-clock.h | 12 + + arch/arm/mach-exynos4/include/mach/regs-pmu.h | 1 + + arch/arm/mach-exynos4/localtimer.c | 26 - + arch/arm/mach-exynos4/mach-nuri.c | 753 +++++++++++++++++++- + arch/arm/mach-exynos4/mach-smdkc210.c | 70 ++ + arch/arm/mach-exynos4/mach-smdkv310.c | 3 + + arch/arm/mach-exynos4/mach-universal_c210.c | 121 +++ + arch/arm/mach-exynos4/mct.c | 2 +- + arch/arm/mach-exynos4/platsmp.c | 57 ++- + arch/arm/mach-exynos4/pm.c | 273 +++++--- + arch/arm/mach-exynos4/pmu.c | 175 +++++ + arch/arm/mach-exynos4/setup-fimd0.c | 43 ++ + arch/arm/mach-exynos4/time.c | 301 -------- + arch/arm/mach-footbridge/dc21285.c | 3 + + arch/arm/mach-footbridge/include/mach/hardware.h | 5 - + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/mach-mx27_3ds.c | 93 +++- + arch/arm/mach-imx/mm-imx21.c | 3 + + arch/arm/mach-imx/mm-imx25.c | 25 + + arch/arm/mach-imx/mm-imx27.c | 3 + + arch/arm/mach-imx/mm-imx31.c | 27 + + arch/arm/mach-imx/mm-imx35.c | 47 ++ + arch/arm/mach-integrator/include/mach/hardware.h | 7 - + arch/arm/mach-integrator/pci_v3.c | 5 + + arch/arm/mach-iop13xx/include/mach/hardware.h | 7 - + arch/arm/mach-iop13xx/pci.c | 5 +- + arch/arm/mach-iop32x/include/mach/hardware.h | 3 - + arch/arm/mach-iop33x/include/mach/hardware.h | 3 - + arch/arm/mach-ixp2000/include/mach/hardware.h | 8 - + arch/arm/mach-ixp2000/pci.c | 5 + + arch/arm/mach-ixp23xx/include/mach/hardware.h | 4 - + arch/arm/mach-ixp23xx/pci.c | 5 + + arch/arm/mach-ixp4xx/common-pci.c | 5 + + arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 - + arch/arm/mach-kirkwood/include/mach/hardware.h | 7 - + arch/arm/mach-kirkwood/pcie.c | 3 + + arch/arm/mach-ks8695/include/mach/hardware.h | 9 - + arch/arm/mach-ks8695/pci.c | 3 + + arch/arm/mach-lpc32xx/clock.c | 2 +- + arch/arm/mach-lpc32xx/common.c | 42 ++ + arch/arm/mach-lpc32xx/common.h | 2 + + arch/arm/mach-lpc32xx/include/mach/clkdev.h | 25 - + arch/arm/mach-mmp/Kconfig | 7 + + arch/arm/mach-mmp/Makefile | 1 + + arch/arm/mach-mmp/clock.c | 15 + + arch/arm/mach-mmp/clock.h | 1 + + arch/arm/mach-mmp/gplugd.c | 189 +++++ + arch/arm/mach-mmp/include/mach/clkdev.h | 7 - + arch/arm/mach-mmp/include/mach/mfp-gplugd.h | 52 ++ + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 19 + + arch/arm/mach-mmp/include/mach/pxa168.h | 8 + + arch/arm/mach-mmp/include/mach/regs-apmu.h | 1 + + arch/arm/mach-mmp/pxa168.c | 6 + + arch/arm/mach-mmp/ttc_dkb.c | 31 +- + arch/arm/mach-msm/include/mach/clkdev.h | 19 - + arch/arm/mach-mv78xx0/include/mach/hardware.h | 7 - + arch/arm/mach-mv78xx0/pcie.c | 3 + + arch/arm/mach-mx5/Kconfig | 14 + + arch/arm/mach-mx5/Makefile | 2 + + arch/arm/mach-mx5/board-mx51_babbage.c | 22 +- + arch/arm/mach-mx5/board-mx53_ard.c | 254 +++++++ + arch/arm/mach-mx5/board-mx53_evk.c | 17 + + arch/arm/mach-mx5/board-mx53_loco.c | 35 +- + arch/arm/mach-mx5/clock-mx51-mx53.c | 18 + + arch/arm/mach-mx5/crm_regs.h | 2 + + arch/arm/mach-mx5/devices-imx53.h | 8 + + arch/arm/mach-mx5/mm.c | 44 ++ + arch/arm/mach-mx5/pm-imx5.c | 73 ++ + arch/arm/mach-mxs/Kconfig | 2 + + arch/arm/mach-mxs/include/mach/clkdev.h | 7 - + arch/arm/mach-mxs/mach-mx28evk.c | 21 + + arch/arm/mach-mxs/mach-tx28.c | 6 + + arch/arm/mach-nomadik/include/mach/clkdev.h | 7 - + arch/arm/mach-nuc93x/include/mach/clkdev.h | 7 - + arch/arm/mach-omap1/include/mach/clkdev.h | 5 - + arch/arm/mach-omap2/Kconfig | 6 +- + arch/arm/mach-omap2/board-4430sdp.c | 203 +++++- + arch/arm/mach-omap2/board-cm-t35.c | 95 ++- + arch/arm/mach-omap2/board-omap3beagle.c | 78 ++- + arch/arm/mach-omap2/board-overo.c | 1 - + arch/arm/mach-omap2/board-rx51-peripherals.c | 141 ++++- + arch/arm/mach-omap2/board-zoom-debugboard.c | 9 + + arch/arm/mach-omap2/board-zoom-peripherals.c | 10 +- + arch/arm/mach-omap2/clock.c | 28 +- + arch/arm/mach-omap2/clock.h | 3 + + arch/arm/mach-omap2/clock2420_data.c | 22 +- + arch/arm/mach-omap2/clock2430_data.c | 32 +- + arch/arm/mach-omap2/clock3xxx_data.c | 44 +- + arch/arm/mach-omap2/clock44xx_data.c | 263 ++++++-- + arch/arm/mach-omap2/clockdomain.c | 210 +++++- + arch/arm/mach-omap2/clockdomain.h | 11 + + arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 6 +- + arch/arm/mach-omap2/clockdomain44xx.c | 13 +- + arch/arm/mach-omap2/clockdomains44xx_data.c | 2 +- + arch/arm/mach-omap2/cm-regbits-44xx.h | 36 + + arch/arm/mach-omap2/cm44xx.h | 8 +- + arch/arm/mach-omap2/cminst44xx.c | 150 ++++- + arch/arm/mach-omap2/cminst44xx.h | 10 +- + arch/arm/mach-omap2/devices.c | 3 +- + arch/arm/mach-omap2/hsmmc.c | 7 +- + arch/arm/mach-omap2/i2c.c | 68 ++ + arch/arm/mach-omap2/id.c | 53 ++- + arch/arm/mach-omap2/include/mach/clkdev.h | 5 - + arch/arm/mach-omap2/iommu2.c | 4 +- + arch/arm/mach-omap2/omap-iommu.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 261 ++++++- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 9 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 7 + + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 18 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 491 ++++++++++--- + arch/arm/mach-omap2/pm.c | 6 +- + arch/arm/mach-omap2/powerdomains44xx_data.c | 9 +- + arch/arm/mach-omap2/prcm.c | 2 +- + arch/arm/mach-omap2/prm-regbits-44xx.h | 8 + + arch/arm/mach-omap2/prm44xx.c | 145 +---- + arch/arm/mach-omap2/prm44xx.h | 10 - + arch/arm/mach-omap2/prminst44xx.c | 112 +++- + arch/arm/mach-omap2/prminst44xx.h | 12 +- + arch/arm/mach-omap2/twl-common.c | 10 +- + arch/arm/mach-orion5x/include/mach/hardware.h | 7 - + arch/arm/mach-orion5x/pci.c | 2 + + arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 - + arch/arm/mach-prima2/Makefile | 7 + + arch/arm/mach-prima2/Makefile.boot | 3 + + arch/arm/mach-prima2/clock.c | 509 +++++++++++++ + arch/arm/mach-prima2/common.h | 26 + + arch/arm/mach-prima2/include/mach/clkdev.h | 15 + + arch/arm/mach-prima2/include/mach/debug-macro.S | 29 + + arch/arm/mach-prima2/include/mach/entry-macro.S | 29 + + arch/arm/mach-prima2/include/mach/hardware.h | 15 + + arch/arm/mach-prima2/include/mach/io.h | 16 + + arch/arm/mach-prima2/include/mach/irqs.h | 17 + + arch/arm/mach-prima2/include/mach/map.h | 16 + + arch/arm/mach-prima2/include/mach/memory.h | 21 + + arch/arm/mach-prima2/include/mach/system.h | 29 + + arch/arm/mach-prima2/include/mach/timex.h | 14 + + arch/arm/mach-prima2/include/mach/uart.h | 23 + + arch/arm/mach-prima2/include/mach/uncompress.h | 40 + + arch/arm/mach-prima2/include/mach/vmalloc.h | 16 + + arch/arm/mach-prima2/irq.c | 71 ++ + arch/arm/mach-prima2/l2x0.c | 59 ++ + arch/arm/mach-prima2/lluart.c | 25 + + arch/arm/mach-prima2/prima2.c | 41 + + arch/arm/mach-prima2/rstc.c | 69 ++ + arch/arm/mach-prima2/timer.c | 217 ++++++ + arch/arm/mach-pxa/balloon3.c | 1 + + arch/arm/mach-pxa/capc7117.c | 1 + + arch/arm/mach-pxa/clock.c | 15 + + arch/arm/mach-pxa/clock.h | 1 + + arch/arm/mach-pxa/cm-x2xx-pci.c | 3 + + arch/arm/mach-pxa/cm-x2xx.c | 5 +- + arch/arm/mach-pxa/cm-x300.c | 1 + + arch/arm/mach-pxa/colibri-pxa270.c | 2 + + arch/arm/mach-pxa/colibri-pxa300.c | 1 + + arch/arm/mach-pxa/colibri-pxa320.c | 4 +- + arch/arm/mach-pxa/corgi.c | 3 + + arch/arm/mach-pxa/csb726.c | 4 +- + arch/arm/mach-pxa/em-x270.c | 2 + + arch/arm/mach-pxa/eseries.c | 6 + + arch/arm/mach-pxa/ezx.c | 6 + + arch/arm/mach-pxa/generic.h | 13 - + arch/arm/mach-pxa/gumstix.c | 1 + + arch/arm/mach-pxa/h5000.c | 2 + + arch/arm/mach-pxa/himalaya.c | 4 +- + arch/arm/mach-pxa/hx4700.c | 1 + + arch/arm/mach-pxa/icontrol.c | 1 + + arch/arm/mach-pxa/idp.c | 1 + + arch/arm/mach-pxa/include/mach/clkdev.h | 7 - + arch/arm/mach-pxa/include/mach/hardware.h | 3 - + arch/arm/mach-pxa/include/mach/irqs.h | 12 + + arch/arm/mach-pxa/include/mach/pxa25x.h | 9 + + arch/arm/mach-pxa/include/mach/pxa27x.h | 5 + + arch/arm/mach-pxa/include/mach/pxa300.h | 3 +- + arch/arm/mach-pxa/include/mach/pxa320.h | 3 +- + arch/arm/mach-pxa/include/mach/pxa3xx.h | 14 + + arch/arm/mach-pxa/include/mach/pxa930.h | 3 +- + arch/arm/mach-pxa/include/mach/regs-intc.h | 30 - + arch/arm/mach-pxa/irq.c | 36 +- + arch/arm/mach-pxa/littleton.c | 1 + + arch/arm/mach-pxa/lpd270.c | 1 + + arch/arm/mach-pxa/lubbock.c | 1 + + arch/arm/mach-pxa/magician.c | 1 + + arch/arm/mach-pxa/mainstone.c | 1 + + arch/arm/mach-pxa/mioa701.c | 1 + + arch/arm/mach-pxa/mp900.c | 1 + + arch/arm/mach-pxa/palmld.c | 1 + + arch/arm/mach-pxa/palmt5.c | 1 + + arch/arm/mach-pxa/palmtc.c | 4 +- + arch/arm/mach-pxa/palmte2.c | 3 +- + arch/arm/mach-pxa/palmtreo.c | 2 + + arch/arm/mach-pxa/palmtx.c | 1 + + arch/arm/mach-pxa/palmz72.c | 1 + + arch/arm/mach-pxa/pcm027.c | 1 + + arch/arm/mach-pxa/poodle.c | 1 + + arch/arm/mach-pxa/pxa3xx.c | 5 +- + arch/arm/mach-pxa/pxa95x.c | 1 - + arch/arm/mach-pxa/raumfeld.c | 8 +- + arch/arm/mach-pxa/saar.c | 1 + + arch/arm/mach-pxa/saarb.c | 1 + + arch/arm/mach-pxa/spitz.c | 3 + + arch/arm/mach-pxa/stargate2.c | 2 + + arch/arm/mach-pxa/tavorevb.c | 1 + + arch/arm/mach-pxa/tavorevb3.c | 1 + + arch/arm/mach-pxa/tosa.c | 1 + + arch/arm/mach-pxa/trizeps4.c | 2 + + arch/arm/mach-pxa/viper.c | 1 + + arch/arm/mach-pxa/vpac270.c | 1 + + arch/arm/mach-pxa/xcep.c | 4 +- + arch/arm/mach-pxa/z2.c | 18 + + arch/arm/mach-pxa/zeus.c | 4 +- + arch/arm/mach-pxa/zylonite.c | 3 +- + arch/arm/mach-s3c2410/include/mach/pm-core.h | 3 + + arch/arm/mach-s3c64xx/Kconfig | 23 + + arch/arm/mach-s3c64xx/Makefile | 1 + + arch/arm/mach-s3c64xx/include/mach/irqs.h | 5 +- + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 19 +- + arch/arm/mach-s3c64xx/irq.c | 12 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 774 ++++++++++++++++++++ + arch/arm/mach-s5p64x0/Makefile | 2 +- + arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 + + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 10 + + arch/arm/mach-s5p64x0/irq-eint.c | 152 ++++ + arch/arm/mach-s5pv210/Kconfig | 1 + + arch/arm/mach-s5pv210/clock.c | 7 + + arch/arm/mach-s5pv210/cpu.c | 2 +- + arch/arm/mach-s5pv210/dev-audio.c | 2 + + arch/arm/mach-s5pv210/include/mach/map.h | 3 + + arch/arm/mach-s5pv210/include/mach/pm-core.h | 3 + + arch/arm/mach-s5pv210/include/mach/regs-audss.h | 18 + + arch/arm/mach-s5pv210/mach-goni.c | 10 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 1 + + arch/arm/mach-sa1100/include/mach/hardware.h | 8 - + arch/arm/mach-sa1100/pci-nanoengine.c | 3 + + arch/arm/mach-shark/include/mach/hardware.h | 6 - + arch/arm/mach-shark/pci.c | 12 +- + arch/arm/mach-spear3xx/include/mach/clkdev.h | 19 - + arch/arm/mach-spear6xx/include/mach/clkdev.h | 19 - + arch/arm/mach-tegra/board-harmony.c | 22 - + arch/arm/mach-tegra/board-paz00-pinmux.c | 10 +- + arch/arm/mach-tegra/board-paz00.c | 31 +- + arch/arm/mach-tegra/board-paz00.h | 10 +- + arch/arm/mach-tegra/board-seaboard.c | 26 +- + arch/arm/mach-tegra/board-trimslice-pinmux.c | 7 +- + arch/arm/mach-tegra/board-trimslice.c | 56 ++ + arch/arm/mach-tegra/board-trimslice.h | 3 + + arch/arm/mach-tegra/devices.c | 53 ++- + arch/arm/mach-tegra/include/mach/barriers.h | 30 - + arch/arm/mach-tegra/include/mach/system.h | 1 - + arch/arm/mach-tegra/io.c | 1 - + arch/arm/mach-tegra/pcie.c | 2 + + arch/arm/mach-tegra/platsmp.c | 3 +- + arch/arm/mach-tegra/tegra2_clocks.c | 4 +- + arch/arm/mach-u300/spi.c | 4 +- + arch/arm/mach-u300/timer.c | 33 +- + arch/arm/mach-ux500/Kconfig | 15 +- + arch/arm/mach-ux500/board-mop500-pins.c | 43 ++ + arch/arm/mach-ux500/board-mop500-regulators.c | 9 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 61 ++- + arch/arm/mach-ux500/board-mop500-uib.c | 2 +- + arch/arm/mach-ux500/board-mop500.c | 154 ++++- + arch/arm/mach-ux500/board-mop500.h | 5 + + arch/arm/mach-ux500/clock.c | 48 ++ + arch/arm/mach-ux500/cpu-db5500.c | 1 + + arch/arm/mach-ux500/include/mach/clkdev.h | 7 - + arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- + arch/arm/mach-ux500/usb.c | 1 + + arch/arm/mach-versatile/include/mach/hardware.h | 6 - + arch/arm/mach-versatile/pci.c | 3 + + arch/arm/mach-w90x900/include/mach/clkdev.h | 7 - + arch/arm/mach-zynq/Makefile | 6 + + arch/arm/mach-zynq/Makefile.boot | 3 + + arch/arm/mach-zynq/common.c | 118 +++ + .../include/mach/hardware.h => mach-zynq/common.h} | 20 +- + arch/arm/mach-zynq/include/mach/clkdev.h | 32 + + arch/arm/mach-zynq/include/mach/debug-macro.S | 36 + + arch/arm/mach-zynq/include/mach/entry-macro.S | 30 + + arch/arm/mach-zynq/include/mach/hardware.h | 18 + + arch/arm/mach-zynq/include/mach/io.h | 33 + + arch/arm/mach-zynq/include/mach/irqs.h | 21 + + arch/arm/mach-zynq/include/mach/memory.h | 22 + + .../clkdev.h => mach-zynq/include/mach/system.h} | 22 +- + arch/arm/mach-zynq/include/mach/timex.h | 23 + + arch/arm/mach-zynq/include/mach/uart.h | 25 + + arch/arm/mach-zynq/include/mach/uncompress.h | 51 ++ + arch/arm/mach-zynq/include/mach/vmalloc.h | 20 + + arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++ + arch/arm/mach-zynq/timer.c | 298 ++++++++ + arch/arm/mm/Kconfig | 3 +- + arch/arm/mm/iomap.c | 12 + + arch/arm/mm/proc-xsc3.S | 1 - + arch/arm/plat-iop/pci.c | 3 + + arch/arm/plat-mxc/devices.c | 16 +- + arch/arm/plat-mxc/devices/platform-imx-dma.c | 204 +----- + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 3 +- + arch/arm/plat-mxc/devices/platform-imx-keypad.c | 5 + + arch/arm/plat-mxc/devices/platform-imx-ssi.c | 10 + + arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 + + arch/arm/plat-mxc/include/mach/clkdev.h | 7 - + arch/arm/plat-mxc/include/mach/devices-common.h | 6 + + arch/arm/plat-mxc/include/mach/mx53.h | 28 +- + arch/arm/plat-mxc/include/mach/sdma.h | 6 +- + arch/arm/plat-mxc/include/mach/uncompress.h | 1 + + arch/arm/plat-mxc/irq-common.c | 13 +- + arch/arm/plat-mxc/tzic.c | 97 +-- + arch/arm/plat-omap/clock.c | 39 + + arch/arm/plat-omap/dmtimer.c | 4 +- + arch/arm/plat-omap/include/plat/clkdev.h | 13 - + arch/arm/plat-omap/include/plat/clkdev_omap.h | 1 + + arch/arm/plat-omap/include/plat/clock.h | 2 + + arch/arm/plat-omap/include/plat/cpu.h | 35 +- + arch/arm/plat-omap/include/plat/i2c.h | 6 +- + arch/arm/plat-omap/include/plat/irqs.h | 12 +- + arch/arm/plat-omap/include/plat/omap4-keypad.h | 3 +- + arch/arm/plat-omap/include/plat/omap_hwmod.h | 15 +- + arch/arm/plat-omap/include/plat/uncompress.h | 1 + + arch/arm/plat-omap/iovmm.c | 6 +- + arch/arm/plat-omap/mcbsp.c | 27 + + arch/arm/plat-omap/omap_device.c | 85 ++- + arch/arm/plat-s5p/Kconfig | 11 + + arch/arm/plat-s5p/Makefile | 3 +- + arch/arm/plat-s5p/dev-fimd0.c | 67 ++ + arch/arm/plat-s5p/dev-mfc.c | 123 +++ + arch/arm/plat-s5p/include/plat/map-s5p.h | 5 +- + arch/arm/plat-s5p/include/plat/mfc.h | 27 + + arch/arm/plat-samsung/adc.c | 84 ++- + arch/arm/plat-samsung/dev-asocdma.c | 10 + + arch/arm/plat-samsung/include/plat/audio.h | 1 + + arch/arm/plat-samsung/include/plat/devs.h | 6 + + arch/arm/plat-samsung/include/plat/fb-core.h | 15 + + arch/arm/plat-samsung/include/plat/fb.h | 15 + + arch/arm/plat-samsung/include/plat/regs-adc.h | 1 + + arch/arm/plat-samsung/irq-uart.c | 7 + + arch/arm/plat-samsung/pm.c | 2 + + arch/arm/plat-spear/include/plat/clkdev.h | 20 - + arch/arm/plat-tcc/include/mach/clkdev.h | 7 - + arch/microblaze/include/asm/pci-bridge.h | 64 +-- + arch/powerpc/include/asm/pci-bridge.h | 50 +-- + arch/powerpc/include/asm/pci.h | 2 +- + arch/powerpc/kernel/pci-common.c | 22 +- + arch/powerpc/kernel/pci_32.c | 2 +- + arch/powerpc/kernel/pci_64.c | 4 +- + arch/powerpc/kernel/rtas_pci.c | 2 +- + arch/powerpc/platforms/40x/ep405.c | 2 +- + arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +- + arch/powerpc/platforms/40x/walnut.c | 2 +- + arch/powerpc/platforms/44x/canyonlands.c | 2 +- + arch/powerpc/platforms/44x/ebony.c | 2 +- + arch/powerpc/platforms/44x/ppc44x_simple.c | 2 +- + arch/powerpc/platforms/44x/sam440ep.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +- + arch/powerpc/platforms/82xx/pq2.c | 2 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/powerpc/platforms/powermac/pci.c | 6 +- + arch/powerpc/sysdev/fsl_pci.c | 4 +- + arch/powerpc/sysdev/grackle.c | 2 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 2 +- + drivers/clk/Kconfig | 3 + + drivers/dma/imx-sdma.c | 6 +- + drivers/input/misc/Kconfig | 13 +- + drivers/input/misc/Makefile | 1 + + drivers/input/misc/twl4030-vibra.c | 12 +- + drivers/input/misc/twl6040-vibra.c | 423 +++++++++++ + drivers/mfd/Kconfig | 8 +- + drivers/mfd/Makefile | 3 +- + drivers/mfd/twl-core.c | 13 +- + drivers/mfd/twl4030-audio.c | 277 +++++++ + drivers/mfd/twl4030-codec.c | 277 ------- + drivers/mfd/twl6040-core.c | 620 ++++++++++++++++ + drivers/mfd/twl6040-irq.c | 191 +++++ + include/asm-generic/pci-bridge.h | 62 ++ + include/linux/i2c-omap.h | 27 + + include/linux/i2c/twl.h | 25 +- + .../linux/mfd/{twl4030-codec.h => twl4030-audio.h} | 16 +- + include/linux/mfd/twl6040.h | 228 ++++++ + sound/soc/codecs/Kconfig | 3 +- + sound/soc/codecs/twl4030.c | 22 +- + sound/soc/codecs/twl6040.c | 733 +++++++++---------- + sound/soc/codecs/twl6040.h | 119 +--- + sound/soc/omap/sdp3430.c | 2 +- + sound/soc/omap/sdp4430.c | 52 +-- + sound/soc/omap/zoom2.c | 2 +- + 435 files changed, 12592 insertions(+), 3194 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sirf.txt + create mode 100644 Documentation/devicetree/bindings/arm/xilinx.txt + create mode 100644 arch/arm/boot/dts/prima2-cb.dts + create mode 100644 arch/arm/boot/dts/zynq-ep107.dts + delete mode 100644 arch/arm/mach-at91/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-bcmring/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-davinci/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-ep93xx/include/mach/clkdev.h + create mode 100644 arch/arm/mach-exynos4/dev-dwmci.c + create mode 100644 arch/arm/mach-exynos4/include/mach/dwmci.h + create mode 100644 arch/arm/mach-exynos4/include/mach/pmu.h + create mode 100644 arch/arm/mach-exynos4/include/mach/regs-audss.h + delete mode 100644 arch/arm/mach-exynos4/localtimer.c + create mode 100644 arch/arm/mach-exynos4/pmu.c + create mode 100644 arch/arm/mach-exynos4/setup-fimd0.c + delete mode 100644 arch/arm/mach-exynos4/time.c + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/clkdev.h + create mode 100644 arch/arm/mach-mmp/gplugd.c + delete mode 100644 arch/arm/mach-mmp/include/mach/clkdev.h + create mode 100644 arch/arm/mach-mmp/include/mach/mfp-gplugd.h + delete mode 100644 arch/arm/mach-msm/include/mach/clkdev.h + create mode 100644 arch/arm/mach-mx5/board-mx53_ard.c + create mode 100644 arch/arm/mach-mx5/pm-imx5.c + delete mode 100644 arch/arm/mach-mxs/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-nuc93x/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-omap1/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-omap2/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h + create mode 100644 arch/arm/mach-prima2/Makefile + create mode 100644 arch/arm/mach-prima2/Makefile.boot + create mode 100644 arch/arm/mach-prima2/clock.c + create mode 100644 arch/arm/mach-prima2/common.h + create mode 100644 arch/arm/mach-prima2/include/mach/clkdev.h + create mode 100644 arch/arm/mach-prima2/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-prima2/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-prima2/include/mach/hardware.h + create mode 100644 arch/arm/mach-prima2/include/mach/io.h + create mode 100644 arch/arm/mach-prima2/include/mach/irqs.h + create mode 100644 arch/arm/mach-prima2/include/mach/map.h + create mode 100644 arch/arm/mach-prima2/include/mach/memory.h + create mode 100644 arch/arm/mach-prima2/include/mach/system.h + create mode 100644 arch/arm/mach-prima2/include/mach/timex.h + create mode 100644 arch/arm/mach-prima2/include/mach/uart.h + create mode 100644 arch/arm/mach-prima2/include/mach/uncompress.h + create mode 100644 arch/arm/mach-prima2/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-prima2/irq.c + create mode 100644 arch/arm/mach-prima2/l2x0.c + create mode 100644 arch/arm/mach-prima2/lluart.c + create mode 100644 arch/arm/mach-prima2/prima2.c + create mode 100644 arch/arm/mach-prima2/rstc.c + create mode 100644 arch/arm/mach-prima2/timer.c + delete mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa3xx.h + delete mode 100644 arch/arm/mach-pxa/include/mach/regs-intc.h + create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410.c + create mode 100644 arch/arm/mach-s5p64x0/irq-eint.c + create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-audss.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-tegra/include/mach/barriers.h + delete mode 100644 arch/arm/mach-ux500/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/clkdev.h + create mode 100644 arch/arm/mach-zynq/Makefile + create mode 100644 arch/arm/mach-zynq/Makefile.boot + create mode 100644 arch/arm/mach-zynq/board_dt.c + create mode 100644 arch/arm/mach-zynq/common.c + rename arch/arm/{mach-tegra/include/mach/hardware.h => mach-zynq/common.h} (58%) + create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h + create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h + create mode 100644 arch/arm/mach-zynq/include/mach/io.h + create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h + create mode 100644 arch/arm/mach-zynq/include/mach/memory.h + rename arch/arm/{mach-tegra/include/mach/clkdev.h => mach-zynq/include/mach/system.h} (61%) + create mode 100644 arch/arm/mach-zynq/include/mach/timex.h + create mode 100644 arch/arm/mach-zynq/include/mach/uart.h + create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h + create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h + create mode 100644 arch/arm/mach-zynq/timer.c + delete mode 100644 arch/arm/plat-mxc/include/mach/clkdev.h + delete mode 100644 arch/arm/plat-omap/include/plat/clkdev.h + create mode 100644 arch/arm/plat-s5p/dev-fimd0.c + create mode 100644 arch/arm/plat-s5p/dev-mfc.c + create mode 100644 arch/arm/plat-s5p/include/plat/mfc.h + delete mode 100644 arch/arm/plat-spear/include/plat/clkdev.h + delete mode 100644 arch/arm/plat-tcc/include/mach/clkdev.h + create mode 100644 drivers/input/misc/twl6040-vibra.c + create mode 100644 drivers/mfd/twl4030-audio.c + delete mode 100644 drivers/mfd/twl4030-codec.c + create mode 100644 drivers/mfd/twl6040-core.c + create mode 100644 drivers/mfd/twl6040-irq.c + create mode 100644 include/asm-generic/pci-bridge.h + rename include/linux/mfd/{twl4030-codec.h => twl4030-audio.h} (96%) + create mode 100644 include/linux/mfd/twl6040.h +Merging at91/at91-next +$ git merge at91/at91-next +Already up-to-date. +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-imx/mach-mx27_3ds.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mm-imx1.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mm-imx21.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mm-imx25.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mm-imx27.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mm-imx31.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mm-imx35.c' using previous resolution. +Resolved 'arch/arm/mach-mx5/mm.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/mm-imx1.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx1.c +Auto-merging arch/arm/mach-imx/mm-imx21.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx21.c +Auto-merging arch/arm/mach-imx/mm-imx25.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx25.c +Auto-merging arch/arm/mach-imx/mm-imx27.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx27.c +Auto-merging arch/arm/mach-imx/mm-imx31.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx31.c +Auto-merging arch/arm/mach-imx/mm-imx35.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx35.c +Auto-merging arch/arm/mach-mx5/mm.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 83f2170] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Auto-merging arch/arm/mach-msm/Makefile +Auto-merging arch/arm/mach-msm/acpuclock-arm11.c +Merge made by recursive. + arch/arm/mach-msm/Makefile | 5 +- + arch/arm/mach-msm/acpuclock-arm11.c | 2 +- + arch/arm/mach-msm/board-halibut.c | 1 + + arch/arm/mach-msm/board-mahimahi.c | 1 + + arch/arm/mach-msm/board-msm7x30.c | 1 + + arch/arm/mach-msm/board-msm8960.c | 18 + + arch/arm/mach-msm/board-msm8x60.c | 9 +- + arch/arm/mach-msm/board-qsd8x50.c | 1 + + arch/arm/mach-msm/board-trout.c | 1 + + arch/arm/mach-msm/clock-dummy.c | 81 +++++ + arch/arm/mach-msm/clock.h | 11 + + arch/arm/mach-msm/devices-msm7x00.c | 21 ++- + arch/arm/mach-msm/devices-msm7x30.c | 21 ++- + arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++ + arch/arm/mach-msm/devices-msm8x60.c | 56 ++++ + arch/arm/mach-msm/devices-qsd8x50.c | 21 ++- + arch/arm/mach-msm/devices.h | 8 + + arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++----- + arch/arm/mach-msm/include/mach/dma.h | 84 +++--- + arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 + + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 + + arch/arm/mach-msm/io.c | 3 - + 25 files changed, 808 insertions(+), 133 deletions(-) + create mode 100644 arch/arm/mach-msm/clock-dummy.c + create mode 100644 arch/arm/mach-msm/devices-msm8x60.c +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next +$ git merge s5p/for-next +Resolved 'arch/arm/mach-exynos4/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-exynos4/mach-smdkc210.c' using previous resolution. +Auto-merging arch/arm/mach-exynos4/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig +Auto-merging arch/arm/mach-exynos4/Makefile +Auto-merging arch/arm/mach-exynos4/mach-smdkc210.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-smdkc210.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fc8a90f] Merge remote-tracking branch 's5p/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/exynos4_defconfig | 1 + + arch/arm/mach-exynos4/Kconfig | 10 +++ + arch/arm/mach-exynos4/Makefile | 1 + + arch/arm/mach-exynos4/mach-origen.c | 108 +++++++++++++++++++++++++++++++++++ + 4 files changed, 120 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-exynos4/mach-origen.c +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Merge made by recursive. +Merging xilinx/arm-next +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Merge made by recursive. + Documentation/cris/README | 62 +++++++++++++++--------------- + arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 - + arch/cris/include/arch-v32/arch/cache.h | 2 +- + drivers/net/cris/eth_v10.c | 1 - + 5 files changed, 34 insertions(+), 39 deletions(-) +Merging ia64/test +$ git merge ia64/test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/ia64/Kconfig +Auto-merging include/linux/efi.h +Merge made by recursive. + Documentation/ABI/testing/pstore | 6 + + Documentation/kernel-parameters.txt | 2 + + arch/ia64/Kconfig | 4 + + arch/ia64/include/asm/gpio.h | 55 ++++++++ + drivers/acpi/apei/erst.c | 20 ++- + drivers/firmware/efivars.c | 243 +++++++++++++++++++++++++++++++++-- + fs/pstore/inode.c | 12 +- + fs/pstore/internal.h | 2 +- + fs/pstore/platform.c | 30 +++- + include/linux/efi.h | 6 + + include/linux/pstore.h | 9 +- + 11 files changed, 355 insertions(+), 34 deletions(-) + create mode 100644 arch/ia64/include/asm/gpio.h +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging arch/sparc/kernel/ioport.c +Merge made by recursive. + arch/m68k/Kconfig.mmu | 6 - + arch/m68k/amiga/chipram.c | 136 ++++----- + arch/m68k/atari/stram.c | 354 +++++------------------- + arch/m68k/include/asm/atari_stram.h | 3 +- + arch/m68k/include/asm/atarihw.h | 4 +- + arch/m68k/kernel/setup_mm.c | 2 + + arch/m68k/math-emu/fp_log.c | 3 - + arch/m68k/math-emu/multi_arith.h | 530 ----------------------------------- + arch/m68k/mm/init_mm.c | 5 - + arch/sparc/kernel/ioport.c | 32 +-- + include/linux/ioport.h | 1 + + kernel/resource.c | 21 ++ + 12 files changed, 166 insertions(+), 931 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/bitops_mm.h +Removing arch/m68k/include/asm/bitops_no.h +Removing arch/m68k/include/asm/hardirq_mm.h +Removing arch/m68k/include/asm/hardirq_no.h +Removing arch/m68k/include/asm/system_mm.h +Removing arch/m68k/include/asm/system_no.h +Removing arch/m68k/kernel/module_mm.c +Removing arch/m68k/kernel/module_no.c +Removing arch/m68k/platform/5206e/Makefile +Removing arch/m68k/platform/5206e/config.c +Removing arch/m68k/platform/5206e/gpio.c +Merge made by recursive. + arch/m68k/Kconfig | 4 + + arch/m68k/Kconfig.nommu | 3 + + arch/m68k/Makefile_no | 2 +- + arch/m68k/include/asm/atomic.h | 6 +- + arch/m68k/include/asm/bitops.h | 531 ++++++++++++++++++++++++++++++- + arch/m68k/include/asm/bitops_mm.h | 501 ----------------------------- + arch/m68k/include/asm/bitops_no.h | 333 ------------------- + arch/m68k/include/asm/entry_no.h | 12 +- + arch/m68k/include/asm/hardirq.h | 35 ++- + arch/m68k/include/asm/hardirq_mm.h | 16 - + arch/m68k/include/asm/hardirq_no.h | 19 -- + arch/m68k/include/asm/irq.h | 11 +- + arch/m68k/include/asm/machdep.h | 1 - + arch/m68k/include/asm/module.h | 31 +- + arch/m68k/include/asm/signal.h | 15 +- + arch/m68k/include/asm/system.h | 194 +++++++++++- + arch/m68k/include/asm/system_mm.h | 193 ----------- + arch/m68k/include/asm/system_no.h | 153 --------- + arch/m68k/include/asm/traps.h | 1 - + arch/m68k/kernel/irq.c | 10 + + arch/m68k/kernel/module.c | 130 ++++++++- + arch/m68k/kernel/module_mm.c | 128 -------- + arch/m68k/kernel/module_no.c | 92 ------ + arch/m68k/kernel/traps_no.c | 4 - + arch/m68k/mm/init_no.c | 11 +- + arch/m68k/platform/5206/config.c | 6 + + arch/m68k/platform/5206e/Makefile | 18 - + arch/m68k/platform/5206e/config.c | 127 -------- + arch/m68k/platform/5206e/gpio.c | 49 --- + arch/m68k/platform/5272/intc.c | 2 - + arch/m68k/platform/68328/entry.S | 15 +- + arch/m68k/platform/68328/ints.c | 10 +- + arch/m68k/platform/68360/entry.S | 15 +- + arch/m68k/platform/68360/ints.c | 11 +- + arch/m68k/platform/coldfire/entry.S | 24 +- + arch/m68k/platform/coldfire/intc-2.c | 2 - + arch/m68k/platform/coldfire/intc-simr.c | 2 - + arch/m68k/platform/coldfire/intc.c | 1 - + arch/m68k/platform/coldfire/vectors.c | 10 +- + 39 files changed, 979 insertions(+), 1749 deletions(-) + delete mode 100644 arch/m68k/include/asm/bitops_mm.h + delete mode 100644 arch/m68k/include/asm/bitops_no.h + delete mode 100644 arch/m68k/include/asm/hardirq_mm.h + delete mode 100644 arch/m68k/include/asm/hardirq_no.h + delete mode 100644 arch/m68k/include/asm/system_mm.h + delete mode 100644 arch/m68k/include/asm/system_no.h + delete mode 100644 arch/m68k/kernel/module_mm.c + delete mode 100644 arch/m68k/kernel/module_no.c + delete mode 100644 arch/m68k/platform/5206e/Makefile + delete mode 100644 arch/m68k/platform/5206e/config.c + delete mode 100644 arch/m68k/platform/5206e/gpio.c +Merging microblaze/next +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/prom.h +CONFLICT (delete/modify): arch/microblaze/pci/pci_32.c deleted in HEAD and modified in microblaze/next. Version microblaze/next of arch/microblaze/pci/pci_32.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/microblaze/pci/pci_32.c +arch/microblaze/pci/pci_32.c: needs merge +rm 'arch/microblaze/pci/pci_32.c' +$ git commit -v -a +[master 47b7f17] Merge remote-tracking branch 'microblaze/next' +$ git diff -M --stat --summary HEAD^.. + arch/microblaze/include/asm/cpuinfo.h | 1 + + arch/microblaze/include/asm/irqflags.h | 20 +++--- + arch/microblaze/include/asm/processor.h | 3 - + arch/microblaze/include/asm/prom.h | 8 ++- + arch/microblaze/include/asm/pvr.h | 5 +- + arch/microblaze/include/asm/setup.h | 1 + + arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 1 + + arch/microblaze/kernel/cpu/cpuinfo-static.c | 1 + + arch/microblaze/kernel/cpu/cpuinfo.c | 4 + + arch/microblaze/kernel/cpu/mb.c | 9 ++- + arch/microblaze/kernel/early_printk.c | 68 ++++++++++-------- + arch/microblaze/kernel/hw_exception_handler.S | 56 +++++++------- + arch/microblaze/kernel/process.c | 1 - + arch/microblaze/kernel/prom.c | 97 +++++++++++-------------- + arch/microblaze/kernel/setup.c | 5 ++ + 15 files changed, 148 insertions(+), 132 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging MAINTAINERS +Auto-merging arch/mips/kernel/perf_event.c +Auto-merging arch/mips/kernel/process.c +Merge made by recursive. + MAINTAINERS | 3 +- + arch/mips/Kbuild.platforms | 1 + + arch/mips/Makefile | 12 -- + arch/mips/ar7/clock.c | 2 +- + arch/mips/ar7/platform.c | 2 +- + arch/mips/ar7/prom.c | 2 +- + arch/mips/include/asm/fixmap.h | 10 +- + arch/mips/include/asm/gt64120.h | 2 - + arch/mips/include/asm/irq.h | 1 - + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 - + arch/mips/include/asm/mach-bcm63xx/spaces.h | 17 ++ + arch/mips/include/asm/mach-generic/dma-coherence.h | 1 - + arch/mips/include/asm/mach-generic/spaces.h | 4 + + arch/mips/include/asm/mach-ip27/dma-coherence.h | 1 - + arch/mips/include/asm/mach-jazz/dma-coherence.h | 1 - + .../mips/include/asm/mach-loongson/dma-coherence.h | 1 - + .../include/asm/mach-malta/cpu-feature-overrides.h | 2 + + .../asm/mach-mipssim/cpu-feature-overrides.h | 2 + + .../asm/mach-powertv/cpu-feature-overrides.h | 59 ++++++ + arch/mips/include/asm/mach-powertv/dma-coherence.h | 1 - + arch/mips/include/asm/mach-tx39xx/spaces.h | 17 ++ + arch/mips/include/asm/mach-tx49xx/spaces.h | 17 ++ + arch/mips/include/asm/pgtable.h | 1 + + arch/mips/include/asm/smp-ops.h | 43 ++++- + arch/mips/include/asm/smtc.h | 1 + + arch/mips/include/asm/unistd.h | 21 ++- + arch/mips/kernel/cpu-probe.c | 1 - + arch/mips/kernel/irq_cpu.c | 14 +- + arch/mips/kernel/perf_event.c | 2 - + arch/mips/kernel/process.c | 1 - + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mips/lantiq/clk.c | 13 ++ + arch/mips/loongson/lemote-2f/ec_kb3310b.c | 2 - + arch/mips/mipssim/sim_setup.c | 18 +- + arch/mips/mm/c-r4k.c | 4 + + arch/mips/mm/dma-default.c | 114 +++++++----- + arch/mips/mm/init.c | 8 +- + arch/mips/mm/mmap.c | 193 +++++++++++++++++--- + arch/mips/mm/pgtable-32.c | 2 +- + arch/mips/mm/pgtable-64.c | 2 +- + arch/mips/mti-malta/malta-init.c | 14 +- + arch/mips/mti-malta/malta-smtc.c | 2 +- + arch/mips/netlogic/Platform | 11 + + arch/mips/netlogic/xlr/irq.c | 2 +- + arch/mips/netlogic/xlr/smp.c | 13 +- + arch/mips/nxp/pnx8550/common/setup.c | 2 - + arch/mips/pci/ops-nile4.c | 1 - + arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 +- + arch/mips/pnx8550/common/setup.c | 2 - + arch/mips/rb532/devices.c | 24 +-- + arch/mips/sibyte/sb1250/irq.c | 8 + + 54 files changed, 501 insertions(+), 189 deletions(-) + create mode 100644 arch/mips/include/asm/mach-bcm63xx/spaces.h + create mode 100644 arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-tx39xx/spaces.h + create mode 100644 arch/mips/include/asm/mach-tx49xx/spaces.h + create mode 100644 arch/mips/netlogic/Platform +Merging openrisc/for-upstream +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next +$ git merge parisc/for-next +Merge made by recursive. + arch/parisc/include/asm/futex.h | 66 +++++++++++++++++++++++++++++++++++--- + 1 files changed, 60 insertions(+), 6 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'drivers/Kconfig' using previous resolution. +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'drivers/cpufreq/Kconfig' using previous resolution. +Resolved 'drivers/cpufreq/Makefile' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/include/asm/paca.h +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/kernel/head_fsl_booke.S +Auto-merging arch/powerpc/kernel/mpc7450-pmu.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/kernel/pci_32.c +Auto-merging arch/powerpc/kernel/perf_event.c +Auto-merging arch/powerpc/kernel/power4-pmu.c +Auto-merging arch/powerpc/kernel/power5+-pmu.c +Auto-merging arch/powerpc/kernel/power5-pmu.c +Auto-merging arch/powerpc/kernel/power6-pmu.c +Auto-merging arch/powerpc/kernel/power7-pmu.c +Auto-merging arch/powerpc/kernel/ppc970-pmu.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging arch/powerpc/platforms/pseries/smp.c +Auto-merging arch/powerpc/sysdev/fsl_pci.c +Auto-merging arch/powerpc/sysdev/ppc4xx_pci.c +Auto-merging drivers/Kconfig +CONFLICT (content): Merge conflict in drivers/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/cpufreq/Kconfig +CONFLICT (content): Merge conflict in drivers/cpufreq/Kconfig +Auto-merging drivers/cpufreq/Makefile +CONFLICT (content): Merge conflict in drivers/cpufreq/Makefile +Auto-merging drivers/of/platform.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e0566a3] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/kernel-parameters.txt | 5 + + MAINTAINERS | 3 +- + arch/powerpc/Kconfig | 3 +- + arch/powerpc/Kconfig.debug | 15 + + arch/powerpc/Makefile | 2 +- + arch/powerpc/boot/dts/canyonlands.dts | 5 + + arch/powerpc/boot/dts/glacier.dts | 8 +- + arch/powerpc/boot/dts/mpc8568mds.dts | 2 + + arch/powerpc/boot/dts/p1010rdb.dts | 280 ++++++ + arch/powerpc/boot/dts/p1010si.dtsi | 376 ++++++++ + arch/powerpc/boot/dts/p1022ds.dts | 2 - + arch/powerpc/boot/dts/p1023rds.dts | 546 ++++++++++++ + arch/powerpc/boot/dts/p2040rdb.dts | 166 ++++ + arch/powerpc/boot/dts/p2040si.dtsi | 623 +++++++++++++ + arch/powerpc/boot/dts/p3041ds.dts | 214 +++++ + arch/powerpc/boot/dts/p3041si.dtsi | 660 ++++++++++++++ + arch/powerpc/boot/dts/p4080ds.dts | 533 +----------- + arch/powerpc/boot/dts/p4080si.dtsi | 661 ++++++++++++++ + arch/powerpc/boot/dts/p5020ds.dts | 215 +++++ + arch/powerpc/boot/dts/p5020si.dtsi | 652 ++++++++++++++ + arch/powerpc/boot/dts/sequoia.dts | 12 + + arch/powerpc/boot/dts/socrates.dts | 2 + + arch/powerpc/boot/dts/taishan.dts | 4 +- + arch/powerpc/boot/dts/tqm8540.dts | 42 + + arch/powerpc/boot/dts/tqm8548-bigflash.dts | 2 + + arch/powerpc/boot/dts/tqm8548.dts | 2 + + arch/powerpc/boot/dts/tqm8560.dts | 2 + + arch/powerpc/boot/dts/xpedite5200.dts | 2 + + arch/powerpc/boot/dts/xpedite5200_xmon.dts | 2 + + arch/powerpc/boot/treeboot-iss4xx.c | 23 +- + arch/powerpc/configs/44x/iss476-smp_defconfig | 6 +- + arch/powerpc/configs/85xx/p1023rds_defconfig | 173 ++++ + arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 5 + + arch/powerpc/configs/corenet32_smp_defconfig | 187 ++++ + ...e55xx_smp_defconfig => corenet64_smp_defconfig} | 0 + arch/powerpc/configs/mpc85xx_defconfig | 12 +- + arch/powerpc/configs/mpc85xx_smp_defconfig | 10 +- + arch/powerpc/configs/ppc64_defconfig | 16 +- + arch/powerpc/configs/pseries_defconfig | 3 + + arch/powerpc/include/asm/dbell.h | 2 +- + arch/powerpc/include/asm/ehv_pic.h | 40 + + arch/powerpc/include/asm/epapr_hcalls.h | 502 +++++++++++ + arch/powerpc/include/asm/exception-64e.h | 52 +- + arch/powerpc/include/asm/fsl_hcalls.h | 655 ++++++++++++++ + arch/powerpc/include/asm/hvsi.h | 94 ++ + arch/powerpc/include/asm/irq.h | 2 + + arch/powerpc/include/asm/jump_label.h | 47 + + arch/powerpc/include/asm/mmu.h | 12 +- + arch/powerpc/include/asm/pSeries_reconfig.h | 2 +- + arch/powerpc/include/asm/paca.h | 7 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 3 +- + arch/powerpc/include/asm/processor.h | 5 + + arch/powerpc/include/asm/reg.h | 4 +- + arch/powerpc/include/asm/setup.h | 4 + + arch/powerpc/include/asm/smp.h | 3 +- + arch/powerpc/include/asm/udbg.h | 1 + + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/asm-offsets.c | 3 + + arch/powerpc/kernel/crash.c | 6 +- + arch/powerpc/kernel/dma.c | 4 +- + arch/powerpc/kernel/exceptions-64e.S | 22 +- + arch/powerpc/kernel/head_44x.S | 42 +- + arch/powerpc/kernel/head_64.S | 2 +- + arch/powerpc/kernel/head_booke.h | 42 +- + arch/powerpc/kernel/head_fsl_booke.S | 49 +- + arch/powerpc/kernel/idle_e500.S | 12 + + arch/powerpc/kernel/irq.c | 50 +- + arch/powerpc/kernel/jump_label.c | 23 + + arch/powerpc/kernel/misc_64.S | 4 +- + arch/powerpc/kernel/mpc7450-pmu.c | 2 +- + arch/powerpc/kernel/pci-common.c | 18 + + arch/powerpc/kernel/pci_32.c | 19 - + arch/powerpc/kernel/perf_event.c | 2 +- + arch/powerpc/kernel/power4-pmu.c | 2 +- + arch/powerpc/kernel/power5+-pmu.c | 2 +- + arch/powerpc/kernel/power5-pmu.c | 2 +- + arch/powerpc/kernel/power6-pmu.c | 2 +- + arch/powerpc/kernel/power7-pmu.c | 2 +- + arch/powerpc/kernel/ppc970-pmu.c | 2 +- + arch/powerpc/kernel/process.c | 4 +- + arch/powerpc/kernel/prom.c | 16 +- + arch/powerpc/kernel/setup-common.c | 27 +- + arch/powerpc/kernel/setup_32.c | 4 +- + arch/powerpc/kernel/setup_64.c | 6 +- + arch/powerpc/kernel/smp.c | 30 +- + arch/powerpc/kernel/udbg.c | 5 + + arch/powerpc/mm/44x_mmu.c | 13 +- + arch/powerpc/mm/init_32.c | 32 - + arch/powerpc/mm/init_64.c | 16 - + arch/powerpc/mm/mem.c | 35 +- + arch/powerpc/mm/tlb_hash32.c | 4 + + arch/powerpc/mm/tlb_low_64e.S | 206 +++++ + arch/powerpc/mm/tlb_nohash.c | 64 +- + arch/powerpc/platforms/85xx/Kconfig | 31 + + arch/powerpc/platforms/85xx/Makefile | 3 + + arch/powerpc/platforms/85xx/corenet_ds.c | 41 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 122 +++ + arch/powerpc/platforms/85xx/p1022_ds.c | 18 +- + arch/powerpc/platforms/85xx/p1023_rds.c | 162 ++++ + arch/powerpc/platforms/85xx/p2040_rdb.c | 88 ++ + arch/powerpc/platforms/85xx/p3041_ds.c | 28 +- + arch/powerpc/platforms/85xx/p4080_ds.c | 38 +- + arch/powerpc/platforms/85xx/p5020_ds.c | 32 +- + arch/powerpc/platforms/85xx/smp.c | 30 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 107 +-- + arch/powerpc/platforms/Kconfig | 6 +- + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/platforms/iseries/smp.c | 2 +- + arch/powerpc/platforms/maple/setup.c | 41 +- + arch/powerpc/platforms/powermac/setup.c | 3 - + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 10 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 10 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 16 +- + arch/powerpc/platforms/pseries/hvconsole.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 191 ---- + arch/powerpc/platforms/pseries/pseries.h | 3 +- + arch/powerpc/platforms/pseries/reconfig.c | 28 +- + arch/powerpc/platforms/pseries/setup.c | 5 +- + arch/powerpc/platforms/pseries/smp.c | 2 +- + arch/powerpc/platforms/wsp/smp.c | 2 +- + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/ehv_pic.c | 302 +++++++ + arch/powerpc/sysdev/fsl_pci.c | 83 +-- + arch/powerpc/sysdev/fsl_soc.c | 27 + + arch/powerpc/sysdev/fsl_soc.h | 3 + + arch/powerpc/sysdev/mpic.c | 38 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 147 ++-- + drivers/Kconfig | 2 + + drivers/Makefile | 3 + + drivers/base/platform.c | 21 + + drivers/cpufreq/Kconfig | 5 + + drivers/cpufreq/Kconfig.powerpc | 7 + + drivers/cpufreq/Makefile | 5 + + drivers/cpufreq/maple-cpufreq.c | 309 +++++++ + drivers/of/platform.c | 4 +- + drivers/tty/hvc/Kconfig | 5 + + drivers/tty/hvc/Makefile | 3 +- + drivers/tty/hvc/hvc_console.c | 70 ++- + drivers/tty/hvc/hvc_console.h | 4 + + drivers/tty/hvc/hvc_vio.c | 408 ++++++++- + drivers/tty/hvc/hvsi.c | 129 +-- + drivers/tty/hvc/hvsi_lib.c | 426 +++++++++ + drivers/virt/Kconfig | 32 + + drivers/virt/Makefile | 5 + + drivers/virt/fsl_hypervisor.c | 937 ++++++++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/fsl_hypervisor.h | 241 +++++ + include/linux/platform_device.h | 1 + + 150 files changed, 10493 insertions(+), 1438 deletions(-) + create mode 100644 arch/powerpc/boot/dts/p1010rdb.dts + create mode 100644 arch/powerpc/boot/dts/p1010si.dtsi + create mode 100644 arch/powerpc/boot/dts/p1023rds.dts + create mode 100644 arch/powerpc/boot/dts/p2040rdb.dts + create mode 100644 arch/powerpc/boot/dts/p2040si.dtsi + create mode 100644 arch/powerpc/boot/dts/p3041ds.dts + create mode 100644 arch/powerpc/boot/dts/p3041si.dtsi + create mode 100644 arch/powerpc/boot/dts/p4080si.dtsi + create mode 100644 arch/powerpc/boot/dts/p5020ds.dts + create mode 100644 arch/powerpc/boot/dts/p5020si.dtsi + create mode 100644 arch/powerpc/configs/85xx/p1023rds_defconfig + create mode 100644 arch/powerpc/configs/corenet32_smp_defconfig + rename arch/powerpc/configs/{e55xx_smp_defconfig => corenet64_smp_defconfig} (100%) + create mode 100644 arch/powerpc/include/asm/ehv_pic.h + create mode 100644 arch/powerpc/include/asm/epapr_hcalls.h + create mode 100644 arch/powerpc/include/asm/fsl_hcalls.h + create mode 100644 arch/powerpc/include/asm/hvsi.h + create mode 100644 arch/powerpc/include/asm/jump_label.h + create mode 100644 arch/powerpc/kernel/jump_label.c + create mode 100644 arch/powerpc/platforms/85xx/p1010rdb.c + create mode 100644 arch/powerpc/platforms/85xx/p1023_rds.c + create mode 100644 arch/powerpc/platforms/85xx/p2040_rdb.c + create mode 100644 arch/powerpc/sysdev/ehv_pic.c + create mode 100644 drivers/cpufreq/Kconfig.powerpc + create mode 100644 drivers/cpufreq/maple-cpufreq.c + create mode 100644 drivers/tty/hvc/hvsi_lib.c + create mode 100644 drivers/virt/Kconfig + create mode 100644 drivers/virt/Makefile + create mode 100644 drivers/virt/fsl_hypervisor.c + create mode 100644 include/linux/fsl_hypervisor.h +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Merge made by recursive. + arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++ + arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + + 3 files changed, 249 insertions(+), 8 deletions(-) + create mode 100644 arch/powerpc/boot/dts/charon.dts +Merging galak/next +$ git merge galak/next +Merge made by recursive. + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 3 ++- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 5 +++-- + drivers/virt/fsl_hypervisor.c | 1 + + 3 files changed, 6 insertions(+), 3 deletions(-) +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/sh-latest +$ git merge sh/sh-latest +Auto-merging arch/arm/mach-shmobile/clock-sh7372.c +Auto-merging drivers/sh/clk/core.c +Auto-merging drivers/tty/serial/Kconfig +Merge made by recursive. + arch/arm/mach-shmobile/clock-sh7367.c | 3 - + arch/arm/mach-shmobile/clock-sh7372.c | 4 - + arch/arm/mach-shmobile/clock-sh7377.c | 3 - + arch/arm/mach-shmobile/clock-sh73a0.c | 4 - + arch/sh/Makefile | 1 + + arch/sh/boards/board-apsh4a3a.c | 2 +- + arch/sh/boards/board-apsh4ad0a.c | 2 +- + arch/sh/boards/board-sh7785lcr.c | 2 +- + arch/sh/boards/board-urquell.c | 2 +- + arch/sh/boards/mach-highlander/setup.c | 2 - + arch/sh/boards/mach-sdk7786/setup.c | 2 +- + arch/sh/include/cpu-sh3/cpu/serial.h | 10 + + arch/sh/include/cpu-sh4a/cpu/serial.h | 7 + + arch/sh/kernel/cpu/clock-cpg.c | 2 - + arch/sh/kernel/cpu/sh3/Makefile | 18 +- + arch/sh/kernel/cpu/sh3/serial-sh770x.c | 33 ++ + arch/sh/kernel/cpu/sh3/serial-sh7710.c | 20 + + arch/sh/kernel/cpu/sh3/serial-sh7720.c | 37 ++ + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 5 + + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 9 + + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 5 + + arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 - + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 4 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 4 + + arch/sh/kernel/cpu/sh4a/Makefile | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 33 +- + arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 25 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 46 +-- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 4 +- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 84 +--- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 36 +-- + arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 2 - + arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 2 - + arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 79 +--- + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 115 +---- + arch/sh/kernel/cpu/sh4a/clock-shx3.c | 67 +--- + arch/sh/kernel/cpu/sh4a/serial-sh7722.c | 23 + + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 1 + + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 + + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 9 + + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 9 + + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 3 + + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 3 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 8 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 8 +- + drivers/dma/shdma.c | 88 +++- + drivers/dma/shdma.h | 4 + + drivers/sh/clk/core.c | 29 ++- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/sh-sci.c | 757 +++++++++++++++++++------------ + drivers/tty/serial/sh-sci.h | 434 +------------------ + include/linux/serial_sci.h | 75 +++ + include/linux/sh_clk.h | 4 + + include/linux/sh_dma.h | 8 + + 54 files changed, 962 insertions(+), 1188 deletions(-) + create mode 100644 arch/sh/include/cpu-sh3/cpu/serial.h + create mode 100644 arch/sh/include/cpu-sh4a/cpu/serial.h + create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh770x.c + create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7710.c + create mode 100644 arch/sh/kernel/cpu/sh3/serial-sh7720.c + create mode 100644 arch/sh/kernel/cpu/sh4a/serial-sh7722.c +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Auto-merging arch/arm/mach-shmobile/clock-sh7372.c +Merge made by recursive. + arch/arm/mach-shmobile/board-ag5evm.c | 3 ++- + arch/arm/mach-shmobile/clock-sh7372.c | 8 ++++---- + arch/arm/mach-shmobile/setup-sh7372.c | 30 +++++++++++++++--------------- + 3 files changed, 21 insertions(+), 20 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Auto-merging Documentation/ioctl/ioctl-number.txt +Removing arch/tile/include/asm/bug.h +Removing arch/tile/include/asm/bugs.h +Removing arch/tile/include/asm/cputime.h +Removing arch/tile/include/asm/device.h +Removing arch/tile/include/asm/div64.h +Removing arch/tile/include/asm/emergency-restart.h +Removing arch/tile/include/asm/errno.h +Removing arch/tile/include/asm/fb.h +Removing arch/tile/include/asm/fcntl.h +Removing arch/tile/include/asm/ioctl.h +Removing arch/tile/include/asm/ioctls.h +Removing arch/tile/include/asm/ipc.h +Removing arch/tile/include/asm/ipcbuf.h +Removing arch/tile/include/asm/irq_regs.h +Removing arch/tile/include/asm/kdebug.h +Removing arch/tile/include/asm/local.h +Removing arch/tile/include/asm/module.h +Removing arch/tile/include/asm/msgbuf.h +Removing arch/tile/include/asm/mutex.h +Removing arch/tile/include/asm/param.h +Removing arch/tile/include/asm/parport.h +Removing arch/tile/include/asm/poll.h +Removing arch/tile/include/asm/posix_types.h +Removing arch/tile/include/asm/resource.h +Removing arch/tile/include/asm/scatterlist.h +Removing arch/tile/include/asm/sembuf.h +Removing arch/tile/include/asm/serial.h +Removing arch/tile/include/asm/shmbuf.h +Removing arch/tile/include/asm/shmparam.h +Removing arch/tile/include/asm/socket.h +Removing arch/tile/include/asm/sockios.h +Removing arch/tile/include/asm/statfs.h +Removing arch/tile/include/asm/termbits.h +Removing arch/tile/include/asm/termios.h +Removing arch/tile/include/asm/types.h +Removing arch/tile/include/asm/ucontext.h +Removing arch/tile/include/asm/xor.h +Merge made by recursive. + Documentation/ioctl/ioctl-number.txt | 1 + + arch/tile/include/asm/Kbuild | 38 +++ + arch/tile/include/asm/bug.h | 1 - + arch/tile/include/asm/bugs.h | 1 - + arch/tile/include/asm/cputime.h | 1 - + arch/tile/include/asm/device.h | 1 - + arch/tile/include/asm/div64.h | 1 - + arch/tile/include/asm/emergency-restart.h | 1 - + arch/tile/include/asm/errno.h | 1 - + arch/tile/include/asm/fb.h | 1 - + arch/tile/include/asm/fcntl.h | 1 - + arch/tile/include/asm/ioctl.h | 1 - + arch/tile/include/asm/ioctls.h | 1 - + arch/tile/include/asm/ipc.h | 1 - + arch/tile/include/asm/ipcbuf.h | 1 - + arch/tile/include/asm/irq_regs.h | 1 - + arch/tile/include/asm/kdebug.h | 1 - + arch/tile/include/asm/local.h | 1 - + arch/tile/include/asm/module.h | 1 - + arch/tile/include/asm/msgbuf.h | 1 - + arch/tile/include/asm/mutex.h | 1 - + arch/tile/include/asm/param.h | 1 - + arch/tile/include/asm/parport.h | 1 - + arch/tile/include/asm/poll.h | 1 - + arch/tile/include/asm/posix_types.h | 1 - + arch/tile/include/asm/resource.h | 1 - + arch/tile/include/asm/scatterlist.h | 1 - + arch/tile/include/asm/sembuf.h | 1 - + arch/tile/include/asm/serial.h | 1 - + arch/tile/include/asm/shmbuf.h | 1 - + arch/tile/include/asm/shmparam.h | 1 - + arch/tile/include/asm/socket.h | 1 - + arch/tile/include/asm/sockios.h | 1 - + arch/tile/include/asm/statfs.h | 1 - + arch/tile/include/asm/termbits.h | 1 - + arch/tile/include/asm/termios.h | 1 - + arch/tile/include/asm/types.h | 1 - + arch/tile/include/asm/ucontext.h | 1 - + arch/tile/include/asm/xor.h | 1 - + arch/tile/include/hv/drv_srom_intf.h | 41 +++ + arch/tile/kernel/time.c | 5 +- + drivers/char/Kconfig | 11 + + drivers/char/Makefile | 2 + + drivers/char/tile-srom.c | 481 +++++++++++++++++++++++++++++ + 44 files changed, 575 insertions(+), 41 deletions(-) + delete mode 100644 arch/tile/include/asm/bug.h + delete mode 100644 arch/tile/include/asm/bugs.h + delete mode 100644 arch/tile/include/asm/cputime.h + delete mode 100644 arch/tile/include/asm/device.h + delete mode 100644 arch/tile/include/asm/div64.h + delete mode 100644 arch/tile/include/asm/emergency-restart.h + delete mode 100644 arch/tile/include/asm/errno.h + delete mode 100644 arch/tile/include/asm/fb.h + delete mode 100644 arch/tile/include/asm/fcntl.h + delete mode 100644 arch/tile/include/asm/ioctl.h + delete mode 100644 arch/tile/include/asm/ioctls.h + delete mode 100644 arch/tile/include/asm/ipc.h + delete mode 100644 arch/tile/include/asm/ipcbuf.h + delete mode 100644 arch/tile/include/asm/irq_regs.h + delete mode 100644 arch/tile/include/asm/kdebug.h + delete mode 100644 arch/tile/include/asm/local.h + delete mode 100644 arch/tile/include/asm/module.h + delete mode 100644 arch/tile/include/asm/msgbuf.h + delete mode 100644 arch/tile/include/asm/mutex.h + delete mode 100644 arch/tile/include/asm/param.h + delete mode 100644 arch/tile/include/asm/parport.h + delete mode 100644 arch/tile/include/asm/poll.h + delete mode 100644 arch/tile/include/asm/posix_types.h + delete mode 100644 arch/tile/include/asm/resource.h + delete mode 100644 arch/tile/include/asm/scatterlist.h + delete mode 100644 arch/tile/include/asm/sembuf.h + delete mode 100644 arch/tile/include/asm/serial.h + delete mode 100644 arch/tile/include/asm/shmbuf.h + delete mode 100644 arch/tile/include/asm/shmparam.h + delete mode 100644 arch/tile/include/asm/socket.h + delete mode 100644 arch/tile/include/asm/sockios.h + delete mode 100644 arch/tile/include/asm/statfs.h + delete mode 100644 arch/tile/include/asm/termbits.h + delete mode 100644 arch/tile/include/asm/termios.h + delete mode 100644 arch/tile/include/asm/types.h + delete mode 100644 arch/tile/include/asm/ucontext.h + delete mode 100644 arch/tile/include/asm/xor.h + create mode 100644 arch/tile/include/hv/drv_srom_intf.h + create mode 100644 drivers/char/tile-srom.c +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Merge made by recursive. + arch/unicore32/include/asm/bitops.h | 12 ++++++------ + arch/unicore32/kernel/ksyms.c | 4 ++-- + arch/unicore32/lib/findbit.S | 14 ++++++++------ + 3 files changed, 16 insertions(+), 14 deletions(-) +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/boot/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 fd27fb4] 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 +Resolved 'fs/ceph/export.c' using previous resolution. +Auto-merging fs/ceph/export.c +CONFLICT (content): Merge conflict in fs/ceph/export.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ad8d0cf] Merge remote-tracking branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/master +$ git merge cifs/master +Auto-merging fs/cifs/dir.c +Auto-merging fs/cifs/readdir.c +Merge made by recursive. + fs/cifs/cifsencrypt.c | 110 ++++++++++--- + fs/cifs/cifsglob.h | 2 +- + fs/cifs/dir.c | 5 - + fs/cifs/link.c | 8 +- + fs/cifs/readdir.c | 427 +++++++++++++++++++++---------------------------- + fs/cifs/smbencrypt.c | 8 +- + 6 files changed, 286 insertions(+), 274 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. +Merging ext3/for_next +$ git merge ext3/for_next +Resolved 'fs/ext3/fsync.c' using previous resolution. +Auto-merging fs/ext3/file.c +Auto-merging fs/ext3/fsync.c +CONFLICT (content): Merge conflict in fs/ext3/fsync.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext3/namei.c +Auto-merging fs/ext3/super.c +Auto-merging include/linux/ext3_fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3000dfc] Merge remote-tracking branch 'ext3/for_next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ext3.txt | 13 +- + Documentation/filesystems/ext4.txt | 23 +- + fs/ext2/xattr.c | 10 +- + fs/ext3/balloc.c | 38 +- + fs/ext3/file.c | 1 - + fs/ext3/fsync.c | 15 +- + fs/ext3/ialloc.c | 4 + + fs/ext3/inode.c | 193 ++++++--- + fs/ext3/ioctl.c | 4 +- + fs/ext3/namei.c | 7 +- + fs/ext3/super.c | 13 + + fs/ext3/xattr.c | 12 +- + fs/jbd/checkpoint.c | 37 +- + fs/jbd/commit.c | 57 ++- + fs/jbd/journal.c | 99 ++--- + fs/jbd/transaction.c | 83 ++-- + include/linux/ext2_fs.h | 1 + + include/linux/ext3_fs.h | 7 +- + include/linux/jbd.h | 1 - + include/linux/quota.h | 8 - + include/trace/events/ext3.h | 864 ++++++++++++++++++++++++++++++++++++ + include/trace/events/jbd.h | 203 +++++++++ + 22 files changed, 1421 insertions(+), 272 deletions(-) + create mode 100644 include/trace/events/ext3.h + create mode 100644 include/trace/events/jbd.h +Merging ext4/dev +$ git merge ext4/dev +Resolved 'fs/ext4/inode.c' using previous resolution. +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +CONFLICT (content): Merge conflict in fs/ext4/inode.c +Auto-merging fs/ext4/namei.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c6f61cd] Merge remote-tracking branch 'ext4/dev' +$ git diff -M --stat --summary HEAD^.. + fs/ext4/Makefile | 2 +- + fs/ext4/balloc.c | 48 ++ + fs/ext4/block_validity.c | 21 + + fs/ext4/ext4.h | 41 ++- + fs/ext4/extents.c | 118 ++-- + fs/ext4/indirect.c | 1484 ++++++++++++++++++++++++++++++++++++++++ + fs/ext4/inode.c | 1567 +------------------------------------------ + fs/ext4/mballoc.c | 87 ++- + fs/ext4/mballoc.h | 1 - + fs/ext4/namei.c | 21 +- + fs/ext4/page-io.c | 6 +- + fs/ext4/super.c | 23 +- + fs/ext4/truncate.h | 43 ++ + fs/jbd2/checkpoint.c | 5 +- + fs/jbd2/journal.c | 67 -- + include/linux/jbd2.h | 6 - + include/trace/events/ext4.h | 71 ++ + include/trace/events/jbd2.h | 36 +- + 18 files changed, 1877 insertions(+), 1770 deletions(-) + create mode 100644 fs/ext4/indirect.c + create mode 100644 fs/ext4/truncate.h +$ git am -3 ../patches/0001-vfs-ext4-merge-fixup-for-moved-function.patch +Applying: vfs/ext4: merge fixup for moved function +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ext4/indirect.c +$ git add . +$ git commit -v -a --amend +[master d21acb7] Merge remote-tracking branch 'ext4/dev' +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Auto-merging fs/jfs/namei.c +Merge made by recursive. + fs/jfs/jfs_dmap.c | 5 +---- + fs/jfs/jfs_txnmgr.c | 6 ++---- + fs/jfs/namei.c | 3 +-- + 3 files changed, 4 insertions(+), 10 deletions(-) +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 e67ff07] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/lockd/clntproc.c | 9 +- + fs/nfs/Kconfig | 1 + + fs/nfs/callback_proc.c | 57 +++-- + fs/nfs/client.c | 7 +- + fs/nfs/delegation.c | 16 +- + fs/nfs/internal.h | 13 ++ + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs4_fs.h | 5 + + fs/nfs/nfs4filelayout.c | 80 ++++++- + fs/nfs/nfs4filelayout.h | 17 ++- + fs/nfs/nfs4filelayoutdev.c | 452 +++++++++++++++++++++++++++++---------- + fs/nfs/nfs4proc.c | 215 ++++++++++++++++++- + fs/nfs/nfs4state.c | 9 +- + fs/nfs/nfs4xdr.c | 247 +++++++++++++++++++++- + fs/nfs/objlayout/objio_osd.c | 20 ++- + fs/nfs/pagelist.c | 69 +++++- + fs/nfs/pnfs.c | 221 ++++++++++++++++--- + fs/nfs/pnfs.h | 74 +++---- + fs/nfs/pnfs_dev.c | 64 +++--- + fs/nfs/read.c | 166 ++++++++------ + fs/nfs/unlink.c | 37 +++- + fs/nfs/write.c | 156 ++++++++------ + include/linux/nfs4.h | 3 + + include/linux/nfs_fs_sb.h | 5 +- + include/linux/nfs_page.h | 17 +- + include/linux/nfs_xdr.h | 34 +++- + include/linux/pnfs_osd_xdr.h | 31 +--- + include/linux/sunrpc/bc_xprt.h | 6 +- + include/linux/sunrpc/sched.h | 4 + + include/linux/sunrpc/svc.h | 4 +- + include/linux/sunrpc/xprt.h | 34 ++-- + net/sunrpc/Kconfig | 4 + + net/sunrpc/Makefile | 2 +- + net/sunrpc/backchannel_rqst.c | 7 +- + net/sunrpc/bc_svc.c | 3 - + net/sunrpc/clnt.c | 15 +- + net/sunrpc/sched.c | 38 +++- + net/sunrpc/svc.c | 6 +- + net/sunrpc/svcsock.c | 14 +- + net/sunrpc/xdr.c | 2 +- + net/sunrpc/xprt.c | 257 +++++++++++++++-------- + net/sunrpc/xprtrdma/transport.c | 6 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- + net/sunrpc/xprtsock.c | 57 ++++- + 44 files changed, 1856 insertions(+), 632 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Recorded preimage for 'Documentation/feature-removal-schedule.txt' +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging Documentation/filesystems/Locking +Auto-merging fs/fuse/file.c +Removing fs/nfsctl.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/sunrpc/svc.h +Auto-merging net/sunrpc/svcsock.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +[master 708d585] Merge remote-tracking branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 10 - + Documentation/filesystems/Locking | 24 +- + Documentation/filesystems/nfs/nfs41-server.txt | 33 +-- + arch/tile/configs/tilegx_defconfig | 1 - + fs/Makefile | 1 - + fs/compat.c | 246 -------------- + fs/dlm/plock.c | 10 +- + fs/fuse/file.c | 2 +- + fs/lockd/svclock.c | 8 +- + fs/locks.c | 75 ++--- + fs/nfsctl.c | 100 ------ + fs/nfsd/Kconfig | 12 - + fs/nfsd/cache.h | 2 +- + fs/nfsd/export.c | 418 ------------------------ + fs/nfsd/lockd.c | 2 - + fs/nfsd/nfs4proc.c | 58 +++- + fs/nfsd/nfs4state.c | 265 +++++++++++++--- + fs/nfsd/nfs4xdr.c | 144 ++++++++- + fs/nfsd/nfscache.c | 3 +- + fs/nfsd/nfsctl.c | 343 ------------------- + fs/nfsd/nfssvc.c | 33 +- + fs/nfsd/state.h | 1 + + fs/nfsd/xdr4.h | 30 ++- + include/linux/compat.h | 9 - + include/linux/fs.h | 12 +- + include/linux/nfsd/export.h | 2 - + include/linux/sunrpc/cache.h | 9 - + include/linux/sunrpc/svc.h | 1 + + net/sunrpc/auth_gss/gss_krb5_mech.c | 7 + + net/sunrpc/auth_gss/gss_mech_switch.c | 32 ++- + net/sunrpc/svc_xprt.c | 11 +- + net/sunrpc/svcauth_unix.c | 79 +----- + net/sunrpc/svcsock.c | 2 + + 33 files changed, 559 insertions(+), 1426 deletions(-) + delete mode 100644 fs/nfsctl.c +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/move_extents.c +Auto-merging fs/ocfs2/super.c +Merge made by recursive. + fs/ocfs2/dlmglue.c | 21 +++++++++++++++------ + fs/ocfs2/ioctl.c | 8 ++++---- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/ocfs2.h | 4 ++-- + fs/ocfs2/super.c | 3 ++- + 5 files changed, 24 insertions(+), 14 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Merge made by recursive. + Documentation/filesystems/squashfs.txt | 4 +++- + fs/squashfs/Kconfig | 14 +++++++++++++- + fs/squashfs/Makefile | 3 ++- + fs/squashfs/decompressor.c | 6 ++++++ + fs/squashfs/decompressor.h | 4 ++++ + fs/squashfs/squashfs.h | 3 --- + 6 files changed, 28 insertions(+), 6 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +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 arch/alpha/kernel/sys_ruffian.c +Auto-merging arch/arm/common/it8152.c +Auto-merging arch/arm/mach-cns3xxx/pcie.c +Auto-merging arch/arm/mach-dove/pcie.c +Auto-merging arch/arm/mach-iop13xx/pci.c +Auto-merging arch/arm/mach-ixp4xx/goramo_mlr.c +Auto-merging arch/arm/mach-kirkwood/pcie.c +Auto-merging arch/arm/mach-mv78xx0/pcie.c +Auto-merging arch/arm/mach-orion5x/pci.c +Auto-merging arch/arm/mach-pxa/cm-x2xx-pci.c +Auto-merging arch/arm/mach-sa1100/pci-nanoengine.c +Auto-merging arch/arm/mach-shark/pci.c +Auto-merging arch/arm/mach-tegra/pcie.c +Auto-merging arch/arm/mach-versatile/pci.c +Auto-merging arch/x86/Kconfig +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/pci.h +Merge made by recursive. + arch/alpha/kernel/sys_alcor.c | 2 +- + arch/alpha/kernel/sys_cabriolet.c | 6 +- + arch/alpha/kernel/sys_dp264.c | 8 +- + arch/alpha/kernel/sys_eb64p.c | 2 +- + arch/alpha/kernel/sys_eiger.c | 2 +- + arch/alpha/kernel/sys_marvel.c | 2 +- + arch/alpha/kernel/sys_miata.c | 2 +- + arch/alpha/kernel/sys_mikasa.c | 2 +- + arch/alpha/kernel/sys_nautilus.c | 2 +- + arch/alpha/kernel/sys_noritake.c | 2 +- + arch/alpha/kernel/sys_rawhide.c | 2 +- + arch/alpha/kernel/sys_ruffian.c | 2 +- + arch/alpha/kernel/sys_rx164.c | 2 +- + arch/alpha/kernel/sys_sable.c | 4 +- + arch/alpha/kernel/sys_sio.c | 4 +- + arch/alpha/kernel/sys_sx164.c | 2 +- + arch/alpha/kernel/sys_takara.c | 4 +- + arch/alpha/kernel/sys_titan.c | 2 +- + arch/alpha/kernel/sys_wildfire.c | 2 +- + arch/arm/common/it8152.c | 2 +- + arch/arm/include/asm/hardware/it8152.h | 2 +- + arch/arm/include/asm/mach/pci.h | 4 +- + arch/arm/kernel/bios32.c | 2 +- + arch/arm/mach-cns3xxx/pcie.c | 2 +- + arch/arm/mach-dove/pcie.c | 2 +- + arch/arm/mach-footbridge/cats-pci.c | 2 +- + arch/arm/mach-footbridge/ebsa285-pci.c | 2 +- + arch/arm/mach-footbridge/netwinder-pci.c | 2 +- + arch/arm/mach-footbridge/personal-pci.c | 3 +- + arch/arm/mach-integrator/pci.c | 2 +- + arch/arm/mach-iop13xx/iq81340mc.c | 2 +- + arch/arm/mach-iop13xx/pci.c | 2 +- + arch/arm/mach-iop32x/em7210.c | 2 +- + arch/arm/mach-iop32x/glantank.c | 2 +- + arch/arm/mach-iop32x/iq31244.c | 4 +- + arch/arm/mach-iop32x/iq80321.c | 2 +- + arch/arm/mach-iop32x/n2100.c | 2 +- + arch/arm/mach-iop33x/iq80331.c | 2 +- + arch/arm/mach-iop33x/iq80332.c | 2 +- + arch/arm/mach-ixp2000/enp2611.c | 3 +- + arch/arm/mach-ixp2000/ixdp2400.c | 3 +- + arch/arm/mach-ixp2000/ixdp2800.c | 3 +- + arch/arm/mach-ixp2000/ixdp2x01.c | 3 +- + arch/arm/mach-ixp23xx/ixdp2351.c | 2 +- + arch/arm/mach-ixp23xx/roadrunner.c | 3 +- + arch/arm/mach-ixp4xx/avila-pci.c | 2 +- + arch/arm/mach-ixp4xx/coyote-pci.c | 2 +- + arch/arm/mach-ixp4xx/dsmg600-pci.c | 2 +- + arch/arm/mach-ixp4xx/fsg-pci.c | 2 +- + arch/arm/mach-ixp4xx/gateway7001-pci.c | 3 +- + arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +- + arch/arm/mach-ixp4xx/gtwx5715-pci.c | 2 +- + arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 +- + arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 +- + arch/arm/mach-ixp4xx/nas100d-pci.c | 2 +- + arch/arm/mach-ixp4xx/nslu2-pci.c | 2 +- + arch/arm/mach-ixp4xx/vulcan-pci.c | 2 +- + arch/arm/mach-ixp4xx/wg302v2-pci.c | 2 +- + arch/arm/mach-kirkwood/pcie.c | 3 +- + arch/arm/mach-ks8695/board-dsm320.c | 2 +- + arch/arm/mach-ks8695/board-micrel.c | 2 +- + arch/arm/mach-ks8695/include/mach/devices.h | 2 +- + arch/arm/mach-mv78xx0/pcie.c | 3 +- + arch/arm/mach-orion5x/common.h | 2 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 3 +- + arch/arm/mach-orion5x/dns323-setup.c | 4 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 +- + arch/arm/mach-orion5x/mss2-setup.c | 2 +- + arch/arm/mach-orion5x/pci.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- + arch/arm/mach-orion5x/ts209-setup.c | 3 +- + arch/arm/mach-orion5x/ts409-setup.c | 3 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 3 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +- + arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +- + arch/arm/mach-sa1100/pci-nanoengine.c | 3 +- + arch/arm/mach-shark/pci.c | 2 +- + arch/arm/mach-tegra/pcie.c | 2 +- + arch/arm/mach-versatile/pci.c | 2 +- + arch/sh/drivers/pci/fixups-cayman.c | 2 +- + arch/sh/drivers/pci/fixups-dreamcast.c | 2 +- + arch/sh/drivers/pci/fixups-landisk.c | 2 +- + arch/sh/drivers/pci/fixups-r7780rp.c | 2 +- + arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +- + arch/sh/drivers/pci/fixups-sdk7780.c | 2 +- + arch/sh/drivers/pci/fixups-se7751.c | 2 +- + arch/sh/drivers/pci/fixups-sh03.c | 2 +- + arch/sh/drivers/pci/fixups-snapgear.c | 2 +- + arch/sh/drivers/pci/fixups-titan.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/sh/include/asm/pci.h | 2 +- + arch/sparc/include/asm/leon_pci.h | 2 +- + arch/sparc/kernel/leon_pci_grpci2.c | 2 +- + arch/tile/kernel/pci.c | 2 +- + arch/unicore32/kernel/pci.c | 2 +- + arch/x86/Kconfig | 2 +- + arch/x86/pci/acpi.c | 7 +- + arch/x86/pci/ce4100.c | 2 + + arch/x86/pci/common.c | 14 ++-- + arch/x86/pci/direct.c | 6 +- + arch/x86/pci/numaq_32.c | 2 + + arch/x86/pci/olpc.c | 4 + + arch/x86/pci/pcbios.c | 2 + + arch/x86/pci/visws.c | 2 +- + drivers/pci/hotplug/acpi_pcihp.c | 6 +- + drivers/pci/hotplug/cpqphp_core.c | 17 ++--- + drivers/pci/hotplug/pciehp_ctrl.c | 3 + + drivers/pci/hotplug/pciehp_hpc.c | 11 +--- + drivers/pci/pci.c | 11 ++- + drivers/pci/pcie/aer/aerdrv_core.c | 76 ++++++++++++++++++-- + drivers/pci/pcie/aer/aerdrv_errprint.c | 3 +- + drivers/pci/probe.c | 89 +++++++++++------------- + drivers/pci/setup-bus.c | 3 - + drivers/pci/setup-irq.c | 4 +- + drivers/pci/setup-res.c | 3 +- + include/linux/aer.h | 3 + + include/linux/pci.h | 6 +- + 120 files changed, 295 insertions(+), 216 deletions(-) +Merging of-pci/of-pci +$ git merge of-pci/of-pci +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date! +Merge made by recursive. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Merge made by recursive. + drivers/i2c/busses/i2c-eg20t.c | 41 ++++++++++++++++++++------------------- + drivers/i2c/busses/i2c-tegra.c | 17 +++++++++++++++- + 2 files changed, 37 insertions(+), 21 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/pmbus/adm1275.c +Auto-merging drivers/hwmon/pmbus/max16064.c +Auto-merging drivers/hwmon/pmbus/max34440.c +Auto-merging drivers/hwmon/pmbus/max8688.c +Auto-merging drivers/hwmon/pmbus/pmbus.c +Auto-merging drivers/hwmon/pmbus/pmbus.h +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Merge made by recursive. + Documentation/hwmon/adm1275 | 8 +- + Documentation/hwmon/coretemp | 7 + + Documentation/hwmon/lm25066 | 90 +++++ + Documentation/hwmon/lm90 | 9 +- + Documentation/hwmon/lm95245 | 33 ++ + Documentation/hwmon/max16064 | 4 + + Documentation/hwmon/max1668 | 60 +++ + Documentation/hwmon/max34440 | 6 + + Documentation/hwmon/max8688 | 6 + + Documentation/hwmon/ntc_thermistor | 93 +++++ + Documentation/hwmon/pmbus | 17 + + Documentation/hwmon/sysfs-interface | 46 +++ + MAINTAINERS | 18 + + drivers/hwmon/Kconfig | 127 ++----- + drivers/hwmon/Makefile | 13 +- + drivers/hwmon/coretemp.c | 177 +++++++--- + drivers/hwmon/lm90.c | 39 ++- + drivers/hwmon/lm95241.c | 31 +- + drivers/hwmon/lm95245.c | 543 ++++++++++++++++++++++++++ + drivers/hwmon/max1668.c | 502 ++++++++++++++++++++++++ + drivers/hwmon/ntc_thermistor.c | 453 +++++++++++++++++++++ + drivers/hwmon/pmbus/Kconfig | 101 +++++ + drivers/hwmon/pmbus/Makefile | 13 + + drivers/hwmon/{ => pmbus}/adm1275.c | 66 +++- + drivers/hwmon/pmbus/lm25066.c | 340 ++++++++++++++++ + drivers/hwmon/{ => pmbus}/max16064.c | 57 +++- + drivers/hwmon/{ => pmbus}/max34440.c | 81 ++++- + drivers/hwmon/{ => pmbus}/max8688.c | 69 +++- + drivers/hwmon/{ => pmbus}/pmbus.c | 43 ++- + drivers/hwmon/{ => pmbus}/pmbus.h | 48 +++- + drivers/hwmon/{ => pmbus}/pmbus_core.c | 351 +++++++++++++---- + drivers/hwmon/{ => pmbus}/ucd9000.c | 0 + drivers/hwmon/{ => pmbus}/ucd9200.c | 0 + include/linux/platform_data/ntc_thermistor.h | 53 +++ + 34 files changed, 3238 insertions(+), 266 deletions(-) + create mode 100644 Documentation/hwmon/lm25066 + create mode 100644 Documentation/hwmon/lm95245 + create mode 100644 Documentation/hwmon/max1668 + create mode 100644 Documentation/hwmon/ntc_thermistor + create mode 100644 drivers/hwmon/lm95245.c + create mode 100644 drivers/hwmon/max1668.c + create mode 100644 drivers/hwmon/ntc_thermistor.c + create mode 100644 drivers/hwmon/pmbus/Kconfig + create mode 100644 drivers/hwmon/pmbus/Makefile + rename drivers/hwmon/{ => pmbus}/adm1275.c (67%) + create mode 100644 drivers/hwmon/pmbus/lm25066.c + rename drivers/hwmon/{ => pmbus}/max16064.c (66%) + rename drivers/hwmon/{ => pmbus}/max34440.c (76%) + rename drivers/hwmon/{ => pmbus}/max8688.c (72%) + rename drivers/hwmon/{ => pmbus}/pmbus.c (88%) + rename drivers/hwmon/{ => pmbus}/pmbus.h (79%) + rename drivers/hwmon/{ => pmbus}/pmbus_core.c (84%) + rename drivers/hwmon/{ => pmbus}/ucd9000.c (100%) + rename drivers/hwmon/{ => pmbus}/ucd9200.c (100%) + create mode 100644 include/linux/platform_data/ntc_thermistor.h +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merging Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/SubmittingPatches | 2 +- + Documentation/kernel-docs.txt | 11 ------- + Documentation/kernel-parameters.txt | 52 +++++++++++++++++++++------------- + 3 files changed, 33 insertions(+), 32 deletions(-) +Merging docs/docs-move +$ git merge docs/docs-move +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Removing Documentation/DocBook/dvb/dvbproperty.xml +Removing Documentation/DocBook/dvb/dvbstb.png +Removing Documentation/DocBook/dvb/frontend.h.xml +Removing Documentation/DocBook/media-entities.tmpl +Removing Documentation/DocBook/media-indices.tmpl +Auto-merging Documentation/DocBook/media/dvb/audio.xml +Auto-merging Documentation/DocBook/media/dvb/ca.xml +Auto-merging Documentation/DocBook/media/dvb/demux.xml +Auto-merging Documentation/DocBook/media/dvb/dvbapi.xml +Auto-merging Documentation/DocBook/media/dvb/frontend.xml +Auto-merging Documentation/DocBook/media/dvb/intro.xml +Auto-merging Documentation/DocBook/media/dvb/net.xml +Auto-merging Documentation/DocBook/media/dvb/video.xml +Auto-merging Documentation/DocBook/media/v4l/common.xml +Auto-merging Documentation/DocBook/media/v4l/compat.xml +Auto-merging Documentation/DocBook/media/v4l/controls.xml +Auto-merging Documentation/DocBook/media/v4l/lirc_device_interface.xml +Auto-merging Documentation/DocBook/media/v4l/media-func-ioctl.xml +Auto-merging Documentation/DocBook/media/v4l/media-ioc-device-info.xml +Auto-merging Documentation/DocBook/media/v4l/media-ioc-enum-links.xml +Auto-merging Documentation/DocBook/media/v4l/media-ioc-setup-link.xml +Auto-merging Documentation/DocBook/media/v4l/pixfmt.xml +Auto-merging Documentation/DocBook/media/v4l/subdev-formats.xml +Auto-merging Documentation/DocBook/media/v4l/v4l2.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-cropcap.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-dqevent.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-enumaudio.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-enumaudioout.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-audio.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-audioout.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-crop.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-enc-index.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-fmt.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-input.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-output.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-parm.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-priority.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-std.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-log-status.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-overlay.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-qbuf.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-querycap.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-queryctrl.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-querystd.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-reqbufs.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-streamon.xml +Auto-merging Documentation/DocBook/media/v4l/vidioc-subdev-g-fmt.xml +Auto-merging Documentation/DocBook/media_api.tmpl +Removing Documentation/DocBook/v4l/bayer.pdf +Removing Documentation/DocBook/v4l/bayer.png +Removing Documentation/DocBook/v4l/crop.gif +Removing Documentation/DocBook/v4l/dev-event.xml +Removing Documentation/DocBook/v4l/fieldseq_bt.gif +Removing Documentation/DocBook/v4l/fieldseq_tb.gif +Removing Documentation/DocBook/v4l/func-ioctl.xml +Removing Documentation/DocBook/v4l/nv12mt.gif +Removing Documentation/DocBook/v4l/nv12mt_example.gif +Removing Documentation/DocBook/v4l/pipeline.png +Removing Documentation/DocBook/v4l/vbi_525.gif +Removing Documentation/DocBook/v4l/vbi_625.gif +Removing Documentation/DocBook/v4l/vbi_hsync.gif +Removing Documentation/DocBook/v4l/videodev2.h.xml +Removing Documentation/DocBook/v4l/vidioc-subscribe-event.xml +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging drivers/media/rc/ite-cir.c +Removing drivers/media/video/cafe_ccic-regs.h +Removing drivers/media/video/cafe_ccic.c +Auto-merging drivers/media/video/m5mols/m5mols_capture.c +Auto-merging drivers/media/video/omap24xxcam.c +Removing drivers/media/video/pwc/pwc-ioctl.h +Removing drivers/media/video/pwc/pwc-uncompress.h +Auto-merging drivers/media/video/videobuf2-memops.c +Auto-merging kernel/compat.c +Merge made by recursive. + Documentation/DocBook/.gitignore | 5 +- + Documentation/DocBook/Makefile | 31 +- + Documentation/DocBook/dvb/dvbproperty.xml | 590 -- + Documentation/DocBook/dvb/dvbstb.png | Bin 22655 -> 0 bytes + Documentation/DocBook/dvb/frontend.h.xml | 428 -- + Documentation/DocBook/media-entities.tmpl | 464 -- + Documentation/DocBook/media-indices.tmpl | 89 - + Documentation/DocBook/media/Makefile | 386 ++ + Documentation/DocBook/media/bayer.png.b64 | 171 + + Documentation/DocBook/media/crop.gif.b64 | 105 + + Documentation/DocBook/{ => media}/dvb/.gitignore | 0 + Documentation/DocBook/{ => media}/dvb/audio.xml | 488 +-- + Documentation/DocBook/{ => media}/dvb/ca.xml | 112 +- + Documentation/DocBook/{ => media}/dvb/demux.xml | 327 +- + Documentation/DocBook/{ => media}/dvb/dvbapi.xml | 20 + + Documentation/DocBook/media/dvb/dvbproperty.xml | 859 +++ + Documentation/DocBook/{ => media}/dvb/dvbstb.pdf | Bin 1881 -> 1881 bytes + Documentation/DocBook/{ => media}/dvb/examples.xml | 0 + Documentation/DocBook/{ => media}/dvb/frontend.xml | 776 +-- + Documentation/DocBook/{ => media}/dvb/intro.xml | 23 +- + Documentation/DocBook/{ => media}/dvb/kdapi.xml | 0 + Documentation/DocBook/{ => media}/dvb/net.xml | 17 + + Documentation/DocBook/{ => media}/dvb/video.xml | 638 +-- + Documentation/DocBook/media/dvbstb.png.b64 | 398 ++ + Documentation/DocBook/media/fieldseq_bt.gif.b64 | 447 ++ + Documentation/DocBook/media/fieldseq_tb.gif.b64 | 445 ++ + Documentation/DocBook/media/nv12mt.gif.b64 | 37 + + Documentation/DocBook/media/nv12mt_example.gif.b64 | 121 + + Documentation/DocBook/media/pipeline.png.b64 | 213 + + Documentation/DocBook/{ => media}/v4l/.gitignore | 0 + Documentation/DocBook/{ => media}/v4l/biblio.xml | 0 + .../DocBook/{ => media}/v4l/capture.c.xml | 0 + Documentation/DocBook/{ => media}/v4l/common.xml | 10 +- + Documentation/DocBook/{ => media}/v4l/compat.xml | 30 +- + Documentation/DocBook/{ => media}/v4l/controls.xml | 1517 +++++- + Documentation/DocBook/{ => media}/v4l/crop.pdf | Bin 5846 -> 5846 bytes + .../DocBook/{ => media}/v4l/dev-capture.xml | 0 + .../DocBook/{ => media}/v4l/dev-codec.xml | 0 + .../DocBook/{ => media}/v4l/dev-effect.xml | 0 + Documentation/DocBook/media/v4l/dev-event.xml | 51 + + Documentation/DocBook/{ => media}/v4l/dev-osd.xml | 0 + .../DocBook/{ => media}/v4l/dev-output.xml | 0 + .../DocBook/{ => media}/v4l/dev-overlay.xml | 0 + .../DocBook/{ => media}/v4l/dev-radio.xml | 0 + .../DocBook/{ => media}/v4l/dev-raw-vbi.xml | 0 + Documentation/DocBook/{ => media}/v4l/dev-rds.xml | 0 + .../DocBook/{ => media}/v4l/dev-sliced-vbi.xml | 0 + .../DocBook/{ => media}/v4l/dev-subdev.xml | 0 + .../DocBook/{ => media}/v4l/dev-teletext.xml | 0 + Documentation/DocBook/{ => media}/v4l/driver.xml | 0 + .../DocBook/{ => media}/v4l/fdl-appendix.xml | 0 + .../DocBook/{ => media}/v4l/fieldseq_bt.pdf | Bin 9185 -> 9185 bytes + .../DocBook/{ => media}/v4l/fieldseq_tb.pdf | Bin 9173 -> 9173 bytes + .../DocBook/{ => media}/v4l/func-close.xml | 0 + Documentation/DocBook/media/v4l/func-ioctl.xml | 79 + + .../DocBook/{ => media}/v4l/func-mmap.xml | 0 + .../DocBook/{ => media}/v4l/func-munmap.xml | 0 + .../DocBook/{ => media}/v4l/func-open.xml | 0 + .../DocBook/{ => media}/v4l/func-poll.xml | 0 + .../DocBook/{ => media}/v4l/func-read.xml | 0 + .../DocBook/{ => media}/v4l/func-select.xml | 0 + .../DocBook/{ => media}/v4l/func-write.xml | 0 + Documentation/DocBook/media/v4l/gen-errors.xml | 78 + + Documentation/DocBook/{ => media}/v4l/io.xml | 0 + .../DocBook/{ => media}/v4l/keytable.c.xml | 0 + Documentation/DocBook/{ => media}/v4l/libv4l.xml | 0 + .../{ => media}/v4l/lirc_device_interface.xml | 4 +- + .../DocBook/{ => media}/v4l/media-controller.xml | 0 + .../DocBook/{ => media}/v4l/media-func-close.xml | 0 + .../DocBook/{ => media}/v4l/media-func-ioctl.xml | 47 +- + .../DocBook/{ => media}/v4l/media-func-open.xml | 0 + .../{ => media}/v4l/media-ioc-device-info.xml | 3 +- + .../{ => media}/v4l/media-ioc-enum-entities.xml | 0 + .../{ => media}/v4l/media-ioc-enum-links.xml | 2 +- + .../{ => media}/v4l/media-ioc-setup-link.xml | 9 - + Documentation/DocBook/{ => media}/v4l/pipeline.pdf | Bin 20276 -> 20276 bytes + .../DocBook/{ => media}/v4l/pixfmt-grey.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-m420.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv12.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv12m.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv12mt.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-nv16.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sbggr16.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sbggr8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-srggb10.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-srggb12.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-srggb8.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-uyvy.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-vyuy.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y10.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y10b.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y12.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y16.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-y41p.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv410.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv411p.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv420.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv420m.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuv422p.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yuyv.xml | 0 + .../DocBook/{ => media}/v4l/pixfmt-yvyu.xml | 0 + Documentation/DocBook/{ => media}/v4l/pixfmt.xml | 60 +- + .../DocBook/{ => media}/v4l/planar-apis.xml | 0 + .../DocBook/{ => media}/v4l/remote_controllers.xml | 0 + .../DocBook/{ => media}/v4l/subdev-formats.xml | 5 +- + Documentation/DocBook/{ => media}/v4l/v4l2.xml | 13 +- + .../DocBook/{ => media}/v4l/v4l2grab.c.xml | 0 + Documentation/DocBook/{ => media}/v4l/vbi_525.pdf | Bin 3395 -> 3395 bytes + Documentation/DocBook/{ => media}/v4l/vbi_625.pdf | Bin 3683 -> 3683 bytes + .../DocBook/{ => media}/v4l/vbi_hsync.pdf | Bin 7405 -> 7405 bytes + .../DocBook/{ => media}/v4l/vidioc-cropcap.xml | 13 +- + .../{ => media}/v4l/vidioc-dbg-g-chip-ident.xml | 11 +- + .../{ => media}/v4l/vidioc-dbg-g-register.xml | 17 - + .../DocBook/{ => media}/v4l/vidioc-dqevent.xml | 27 +- + .../DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml | 11 +- + .../{ => media}/v4l/vidioc-enum-dv-presets.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enum-fmt.xml | 0 + .../{ => media}/v4l/vidioc-enum-frameintervals.xml | 11 - + .../{ => media}/v4l/vidioc-enum-framesizes.xml | 11 - + .../DocBook/{ => media}/v4l/vidioc-enumaudio.xml | 12 +- + .../{ => media}/v4l/vidioc-enumaudioout.xml | 12 +- + .../DocBook/{ => media}/v4l/vidioc-enuminput.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enumoutput.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-enumstd.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-audio.xml | 18 +- + .../DocBook/{ => media}/v4l/vidioc-g-audioout.xml | 18 +- + .../DocBook/{ => media}/v4l/vidioc-g-crop.xml | 17 - + .../DocBook/{ => media}/v4l/vidioc-g-ctrl.xml | 7 + + .../DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml | 12 +- + .../{ => media}/v4l/vidioc-g-dv-timings.xml | 11 +- + .../DocBook/{ => media}/v4l/vidioc-g-enc-index.xml | 17 - + .../DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml | 14 + + .../DocBook/{ => media}/v4l/vidioc-g-fbuf.xml | 19 +- + .../DocBook/{ => media}/v4l/vidioc-g-fmt.xml | 20 +- + .../DocBook/{ => media}/v4l/vidioc-g-frequency.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-input.xml | 19 +- + .../DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml | 17 - + .../DocBook/{ => media}/v4l/vidioc-g-modulator.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-g-output.xml | 18 +- + .../DocBook/{ => media}/v4l/vidioc-g-parm.xml | 17 - + .../DocBook/{ => media}/v4l/vidioc-g-priority.xml | 3 +- + .../{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml | 11 +- + .../DocBook/{ => media}/v4l/vidioc-g-std.xml | 9 +- + .../DocBook/{ => media}/v4l/vidioc-g-tuner.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-log-status.xml | 17 - + .../DocBook/{ => media}/v4l/vidioc-overlay.xml | 11 +- + .../DocBook/{ => media}/v4l/vidioc-qbuf.xml | 17 - + .../{ => media}/v4l/vidioc-query-dv-preset.xml | 22 - + .../DocBook/{ => media}/v4l/vidioc-querybuf.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-querycap.xml | 34 +- + .../DocBook/{ => media}/v4l/vidioc-queryctrl.xml | 12 +- + .../DocBook/{ => media}/v4l/vidioc-querystd.xml | 23 - + .../DocBook/{ => media}/v4l/vidioc-reqbufs.xml | 16 - + .../{ => media}/v4l/vidioc-s-hw-freq-seek.xml | 0 + .../DocBook/{ => media}/v4l/vidioc-streamon.xml | 14 +- + .../v4l/vidioc-subdev-enum-frame-interval.xml | 0 + .../v4l/vidioc-subdev-enum-frame-size.xml | 0 + .../v4l/vidioc-subdev-enum-mbus-code.xml | 0 + .../{ => media}/v4l/vidioc-subdev-g-crop.xml | 0 + .../{ => media}/v4l/vidioc-subdev-g-fmt.xml | 3 + + .../v4l/vidioc-subdev-g-frame-interval.xml | 0 + .../DocBook/media/v4l/vidioc-subscribe-event.xml | 297 + + Documentation/DocBook/media/vbi_525.gif.b64 | 84 + + Documentation/DocBook/media/vbi_625.gif.b64 | 90 + + Documentation/DocBook/media/vbi_hsync.gif.b64 | 43 + + .../DocBook/{media.tmpl => media_api.tmpl} | 8 +- + Documentation/DocBook/v4l/bayer.pdf | Bin 12116 -> 0 bytes + Documentation/DocBook/v4l/bayer.png | Bin 9725 -> 0 bytes + Documentation/DocBook/v4l/crop.gif | Bin 5967 -> 0 bytes + Documentation/DocBook/v4l/dev-event.xml | 31 - + Documentation/DocBook/v4l/fieldseq_bt.gif | Bin 25430 -> 0 bytes + Documentation/DocBook/v4l/fieldseq_tb.gif | Bin 25323 -> 0 bytes + Documentation/DocBook/v4l/func-ioctl.xml | 145 - + Documentation/DocBook/v4l/nv12mt.gif | Bin 2108 -> 0 bytes + Documentation/DocBook/v4l/nv12mt_example.gif | Bin 6858 -> 0 bytes + Documentation/DocBook/v4l/pipeline.png | Bin 12130 -> 0 bytes + Documentation/DocBook/v4l/vbi_525.gif | Bin 4741 -> 0 bytes + Documentation/DocBook/v4l/vbi_625.gif | Bin 5095 -> 0 bytes + Documentation/DocBook/v4l/vbi_hsync.gif | Bin 2400 -> 0 bytes + Documentation/DocBook/v4l/videodev2.h.xml | 1946 ------ + .../DocBook/v4l/vidioc-subscribe-event.xml | 133 - + Documentation/dvb/get_dvb_firmware | 33 +- + Documentation/feature-removal-schedule.txt | 57 + + Documentation/media-framework.txt | 2 +- + Documentation/video4linux/API.html | 2 +- + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.cx88 | 1 + + Documentation/video4linux/CARDLIST.em28xx | 2 + + Documentation/video4linux/CARDLIST.saa7134 | 4 + + Documentation/video4linux/CARDLIST.tuner | 2 + + Documentation/video4linux/CARDLIST.usbvision | 2 + + Documentation/video4linux/README.davinci-vpbe | 93 + + Documentation/video4linux/v4l2-controls.txt | 69 +- + Documentation/video4linux/v4l2-framework.txt | 59 +- + drivers/media/Kconfig | 14 +- + drivers/media/common/tuners/Kconfig | 10 + + drivers/media/common/tuners/Makefile | 1 + + drivers/media/common/tuners/tuner-types.c | 4 + + drivers/media/common/tuners/xc4000.c | 1691 +++++ + drivers/media/common/tuners/xc4000.h | 67 + + drivers/media/dvb/Kconfig | 4 + + drivers/media/dvb/Makefile | 3 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +- + drivers/media/dvb/ddbridge/Kconfig | 18 + + drivers/media/dvb/ddbridge/Makefile | 14 + + drivers/media/dvb/ddbridge/ddbridge-core.c | 1719 ++++++ + drivers/media/dvb/ddbridge/ddbridge-regs.h | 151 + + drivers/media/dvb/ddbridge/ddbridge.h | 187 + + drivers/media/dvb/dvb-core/Makefile | 4 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 5 +- + drivers/media/dvb/dvb-core/dvb_net.h | 21 +- + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/dvb-usb/af9015.c | 135 +- + drivers/media/dvb/dvb-usb/af9015.h | 1 - + drivers/media/dvb/dvb-usb/anysee.c | 69 +- + drivers/media/dvb/dvb-usb/anysee.h | 16 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 188 + + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- + drivers/media/dvb/dvb-usb/gp8psk.h | 3 - + drivers/media/dvb/dvb-usb/technisat-usb2.c | 4 +- + drivers/media/dvb/dvb-usb/vp7045.h | 3 - + drivers/media/dvb/firewire/firedtv-avc.c | 2 +- + drivers/media/dvb/firewire/firedtv-ci.c | 34 +- + drivers/media/dvb/frontends/Kconfig | 21 + + drivers/media/dvb/frontends/Makefile | 3 + + drivers/media/dvb/frontends/cx24113.c | 20 +- + drivers/media/dvb/frontends/cx24116.c | 6 +- + drivers/media/dvb/frontends/cxd2820r.h | 4 +- + drivers/media/dvb/frontends/cxd2820r_core.c | 22 +- + drivers/media/dvb/frontends/cxd2820r_priv.h | 4 +- + drivers/media/dvb/frontends/dib7000p.c | 5 + + drivers/media/dvb/frontends/drxd_hard.c | 9 +- + drivers/media/dvb/frontends/drxk.h | 47 + + drivers/media/dvb/frontends/drxk_hard.c | 6476 ++++++++++++++++++++ + drivers/media/dvb/frontends/drxk_hard.h | 348 ++ + drivers/media/dvb/frontends/drxk_map.h | 449 ++ + drivers/media/dvb/frontends/itd1000.c | 25 +- + drivers/media/dvb/frontends/nxt6000.c | 2 +- + drivers/media/dvb/frontends/s5h1420.c | 12 +- + drivers/media/dvb/frontends/tda18271c2dd.c | 1233 ++++ + drivers/media/dvb/frontends/tda18271c2dd.h | 16 + + drivers/media/dvb/frontends/tda18271c2dd_maps.h | 814 +++ + drivers/media/dvb/ngene/Kconfig | 2 + + drivers/media/dvb/ngene/ngene-cards.c | 182 +- + drivers/media/dvb/ngene/ngene-core.c | 26 +- + drivers/media/dvb/ngene/ngene-dvb.c | 46 +- + drivers/media/dvb/ngene/ngene.h | 7 +- + drivers/media/dvb/siano/smscoreapi.c | 2 +- + drivers/media/dvb/siano/smscoreapi.h | 1 - + drivers/media/radio/dsbr100.c | 7 +- + drivers/media/radio/radio-aimslab.c | 5 +- + drivers/media/radio/radio-aztech.c | 5 +- + drivers/media/radio/radio-cadet.c | 5 +- + drivers/media/radio/radio-gemtek.c | 7 +- + drivers/media/radio/radio-maxiradio.c | 10 +- + drivers/media/radio/radio-mr800.c | 6 +- + drivers/media/radio/radio-rtrack2.c | 5 +- + drivers/media/radio/radio-sf16fmi.c | 5 +- + drivers/media/radio/radio-sf16fmr2.c | 531 +-- + drivers/media/radio/radio-tea5764.c | 8 +- + drivers/media/radio/radio-terratec.c | 5 +- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-trust.c | 5 +- + drivers/media/radio/radio-typhoon.c | 9 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/radio-zoltrix.c | 5 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 4 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 6 +- + drivers/media/radio/si470x/radio-si470x.h | 1 - + drivers/media/radio/wl128x/fmdrv.h | 5 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 3 +- + drivers/media/rc/Kconfig | 11 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/ene_ir.c | 4 +- + drivers/media/rc/ene_ir.h | 2 +- + drivers/media/rc/ir-lirc-codec.c | 15 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 448 ++ + drivers/media/rc/ir-raw.c | 1 + + drivers/media/rc/ite-cir.c | 5 +- + drivers/media/rc/keymaps/rc-rc6-mce.c | 3 +- + drivers/media/rc/mceusb.c | 10 +- + drivers/media/rc/nuvoton-cir.c | 12 +- + drivers/media/rc/rc-core-priv.h | 18 + + drivers/media/rc/rc-loopback.c | 13 +- + drivers/media/rc/rc-main.c | 4 +- + drivers/media/rc/redrat3.c | 63 +- + drivers/media/rc/winbond-cir.c | 28 +- + drivers/media/video/Kconfig | 28 +- + drivers/media/video/Makefile | 5 +- + drivers/media/video/adp1653.c | 491 ++ + drivers/media/video/arv.c | 5 +- + drivers/media/video/atmel-isi.c | 1048 ++++ + drivers/media/video/au0828/au0828-core.c | 1 + + drivers/media/video/au0828/au0828-video.c | 5 - + drivers/media/video/bt8xx/bttv-driver.c | 14 +- + drivers/media/video/bt8xx/bttvp.h | 3 - + drivers/media/video/bw-qcam.c | 4 +- + drivers/media/video/c-qcam.c | 4 +- + drivers/media/video/cafe_ccic-regs.h | 166 - + drivers/media/video/cafe_ccic.c | 2267 ------- + drivers/media/video/cpia2/cpia2.h | 5 - + drivers/media/video/cpia2/cpia2_v4l.c | 12 +- + drivers/media/video/cx18/cx18-alsa-main.c | 1 + + drivers/media/video/cx18/cx18-driver.h | 1 - + drivers/media/video/cx18/cx18-ioctl.c | 1 - + drivers/media/video/cx18/cx18-version.h | 8 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 4 + + drivers/media/video/cx231xx/cx231xx-cards.c | 77 + + drivers/media/video/cx231xx/cx231xx-core.c | 4 + + drivers/media/video/cx231xx/cx231xx-video.c | 14 +- + drivers/media/video/cx231xx/cx231xx.h | 3 +- + drivers/media/video/cx23885/altera-ci.c | 1 - + drivers/media/video/cx23885/cx23885-417.c | 1 - + drivers/media/video/cx23885/cx23885-cards.c | 49 +- + drivers/media/video/cx23885/cx23885-core.c | 13 +- + drivers/media/video/cx23885/cx23885-dvb.c | 21 + + drivers/media/video/cx23885/cx23885-input.c | 6 + + drivers/media/video/cx23885/cx23885-video.c | 1 - + drivers/media/video/cx23885/cx23885.h | 4 +- + drivers/media/video/cx88/cx88-alsa.c | 19 +- + drivers/media/video/cx88/cx88-blackbird.c | 20 +- + drivers/media/video/cx88/cx88-cards.c | 150 +- + drivers/media/video/cx88/cx88-dvb.c | 77 +- + drivers/media/video/cx88/cx88-input.c | 4 + + drivers/media/video/cx88/cx88-mpeg.c | 11 +- + drivers/media/video/cx88/cx88-video.c | 21 +- + drivers/media/video/cx88/cx88.h | 6 +- + drivers/media/video/davinci/Kconfig | 23 + + drivers/media/video/davinci/Makefile | 2 + + drivers/media/video/davinci/vpbe.c | 864 +++ + drivers/media/video/davinci/vpbe_display.c | 1860 ++++++ + drivers/media/video/davinci/vpbe_osd.c | 1231 ++++ + drivers/media/video/davinci/vpbe_osd_regs.h | 364 ++ + drivers/media/video/davinci/vpbe_venc.c | 566 ++ + drivers/media/video/davinci/vpbe_venc_regs.h | 177 + + drivers/media/video/davinci/vpif_capture.c | 9 +- + drivers/media/video/davinci/vpif_capture.h | 7 +- + drivers/media/video/davinci/vpif_display.c | 9 +- + drivers/media/video/davinci/vpif_display.h | 8 +- + drivers/media/video/em28xx/Kconfig | 12 +- + drivers/media/video/em28xx/Makefile | 6 +- + drivers/media/video/em28xx/em28xx-audio.c | 251 +- + drivers/media/video/em28xx/em28xx-cards.c | 155 +- + drivers/media/video/em28xx/em28xx-core.c | 45 +- + drivers/media/video/em28xx/em28xx-dvb.c | 113 +- + drivers/media/video/em28xx/em28xx-i2c.c | 17 +- + drivers/media/video/em28xx/em28xx-input.c | 1 + + drivers/media/video/em28xx/em28xx-reg.h | 1 + + drivers/media/video/em28xx/em28xx-video.c | 14 +- + drivers/media/video/em28xx/em28xx.h | 24 +- + drivers/media/video/et61x251/et61x251.h | 1 - + drivers/media/video/et61x251/et61x251_core.c | 16 +- + drivers/media/video/fsl-viu.c | 10 +- + drivers/media/video/gspca/Kconfig | 10 + + drivers/media/video/gspca/Makefile | 2 + + drivers/media/video/gspca/gl860/gl860.h | 1 - + drivers/media/video/gspca/gspca.c | 23 +- + drivers/media/video/gspca/ov519.c | 115 +- + drivers/media/video/gspca/se401.c | 774 +++ + drivers/media/video/gspca/se401.h | 90 + + drivers/media/video/gspca/sunplus.c | 3 - + drivers/media/video/gspca/t613.c | 2 +- + drivers/media/video/hdpvr/hdpvr-core.c | 1 + + drivers/media/video/hdpvr/hdpvr-video.c | 2 - + drivers/media/video/hdpvr/hdpvr.h | 6 - + drivers/media/video/ivtv/ivtv-driver.h | 1 - + drivers/media/video/ivtv/ivtv-fileops.c | 19 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 5 +- + drivers/media/video/ivtv/ivtv-version.h | 7 +- + drivers/media/video/m5mols/m5mols_capture.c | 1 - + drivers/media/video/m5mols/m5mols_core.c | 1 - + drivers/media/video/marvell-ccic/Kconfig | 23 + + drivers/media/video/marvell-ccic/Makefile | 6 + + drivers/media/video/marvell-ccic/cafe-driver.c | 654 ++ + drivers/media/video/marvell-ccic/mcam-core.c | 1843 ++++++ + drivers/media/video/marvell-ccic/mcam-core.h | 323 + + drivers/media/video/marvell-ccic/mmp-driver.c | 340 + + drivers/media/video/mem2mem_testdev.c | 4 +- + drivers/media/video/mt9m111.c | 218 +- + drivers/media/video/mt9v011.c | 85 +- + drivers/media/video/mx1_camera.c | 5 +- + drivers/media/video/mx2_camera.c | 20 +- + drivers/media/video/mx3_camera.c | 15 +- + drivers/media/video/omap1_camera.c | 5 +- + drivers/media/video/omap24xxcam.c | 5 +- + drivers/media/video/omap3isp/isp.c | 1 + + drivers/media/video/omap3isp/ispccdc.c | 3 +- + drivers/media/video/omap3isp/ispstat.c | 3 +- + drivers/media/video/omap3isp/ispvideo.c | 1 - + drivers/media/video/omap3isp/ispvideo.h | 3 +- + drivers/media/video/ov7670.c | 3 +- + drivers/media/video/ov9740.c | 543 +- + drivers/media/video/pms.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-main.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 9 +- + drivers/media/video/pwc/Kconfig | 1 + + drivers/media/video/pwc/pwc-ctrl.c | 803 +-- + drivers/media/video/pwc/pwc-dec1.c | 28 +- + drivers/media/video/pwc/pwc-dec1.h | 8 +- + drivers/media/video/pwc/pwc-dec23.c | 22 - + drivers/media/video/pwc/pwc-dec23.h | 10 - + drivers/media/video/pwc/pwc-if.c | 1259 ++--- + drivers/media/video/pwc/pwc-ioctl.h | 323 - + drivers/media/video/pwc/pwc-kiara.c | 1 - + drivers/media/video/pwc/pwc-misc.c | 4 - + drivers/media/video/pwc/pwc-uncompress.c | 17 +- + drivers/media/video/pwc/pwc-uncompress.h | 40 - + drivers/media/video/pwc/pwc-v4l.c | 1257 +++-- + drivers/media/video/pwc/pwc.h | 409 +- + drivers/media/video/pxa_camera.c | 30 +- + drivers/media/video/s2255drv.c | 35 +- + drivers/media/video/s5p-fimc/fimc-capture.c | 2 - + drivers/media/video/s5p-fimc/fimc-core.c | 3 +- + drivers/media/video/saa7115.c | 4 +- + drivers/media/video/saa7134/saa7134-cards.c | 13 +- + drivers/media/video/saa7134/saa7134-core.c | 12 +- + drivers/media/video/saa7134/saa7134-dvb.c | 25 + + drivers/media/video/saa7134/saa7134-empress.c | 1 - + drivers/media/video/saa7134/saa7134-video.c | 2 - + drivers/media/video/saa7134/saa7134.h | 3 +- + drivers/media/video/saa7164/saa7164-encoder.c | 6 +- + drivers/media/video/saa7164/saa7164-vbi.c | 6 +- + drivers/media/video/saa7164/saa7164.h | 1 - + drivers/media/video/sh_mobile_ceu_camera.c | 8 +- + drivers/media/video/sh_vou.c | 3 +- + drivers/media/video/sn9c102/sn9c102.h | 1 - + drivers/media/video/sn9c102/sn9c102_core.c | 16 +- + drivers/media/video/soc_camera.c | 17 +- + drivers/media/video/sr030pc30.c | 7 +- + drivers/media/video/tda7432.c | 5 +- + drivers/media/video/timblogiw.c | 1 - + drivers/media/video/tlg2300/pd-common.h | 1 - + drivers/media/video/tlg2300/pd-main.c | 1 + + drivers/media/video/tlg2300/pd-radio.c | 2 - + drivers/media/video/tuner-core.c | 18 + + drivers/media/video/tw9910.c | 11 - + drivers/media/video/usbvision/usbvision-video.c | 12 +- + drivers/media/video/uvc/uvc_driver.c | 3 +- + drivers/media/video/uvc/uvc_v4l2.c | 4 +- + drivers/media/video/uvc/uvcvideo.h | 3 +- + drivers/media/video/v4l2-common.c | 3 + + drivers/media/video/v4l2-compat-ioctl32.c | 37 + + drivers/media/video/v4l2-ctrls.c | 826 ++- + drivers/media/video/v4l2-device.c | 1 + + drivers/media/video/v4l2-event.c | 282 +- + drivers/media/video/v4l2-fh.c | 23 +- + drivers/media/video/v4l2-ioctl.c | 50 +- + drivers/media/video/v4l2-subdev.c | 31 +- + drivers/media/video/videobuf-dma-sg.c | 5 +- + drivers/media/video/videobuf2-dma-sg.c | 8 +- + drivers/media/video/videobuf2-memops.c | 6 +- + drivers/media/video/vino.c | 5 +- + drivers/media/video/vivi.c | 91 +- + drivers/media/video/w9966.c | 4 +- + drivers/media/video/zoran/zoran.h | 4 - + drivers/media/video/zoran/zoran_card.c | 7 +- + drivers/media/video/zoran/zoran_driver.c | 3 - + drivers/media/video/zr364xx.c | 6 +- + drivers/mfd/timberdale.c | 8 +- + drivers/staging/cxd2099/Kconfig | 11 +- + drivers/staging/cxd2099/cxd2099.c | 311 +- + drivers/staging/cxd2099/cxd2099.h | 18 +- + drivers/staging/tm6000/tm6000-alsa.c | 16 +- + drivers/usb/gadget/uvc_v4l2.c | 22 +- + include/linux/dvb/audio.h | 2 +- + include/linux/videodev2.h | 254 +- + include/media/adp1653.h | 126 + + include/media/atmel-isi.h | 119 + + include/media/davinci/vpbe.h | 184 + + include/media/davinci/vpbe_display.h | 147 + + include/media/davinci/vpbe_osd.h | 394 ++ + include/media/davinci/vpbe_types.h | 91 + + include/media/davinci/vpbe_venc.h | 45 + + include/media/mmp-camera.h | 9 + + {drivers/media/video => include/media}/ov7670.h | 0 + include/media/rc-core.h | 2 +- + include/media/rc-map.h | 3 +- + include/media/soc_camera.h | 15 +- + include/media/timb_radio.h | 9 +- + include/media/tuner.h | 2 + + include/media/v4l2-chip-ident.h | 3 +- + include/media/v4l2-ctrls.h | 72 +- + include/media/v4l2-event.h | 84 +- + include/media/v4l2-fh.h | 13 +- + include/media/v4l2-subdev.h | 2 - + include/sound/tea575x-tuner.h | 8 +- + kernel/compat.c | 1 + + sound/i2c/other/tea575x-tuner.c | 143 +- + sound/pci/Kconfig | 4 +- + 494 files changed, 37865 insertions(+), 13808 deletions(-) + delete mode 100644 Documentation/DocBook/dvb/dvbproperty.xml + delete mode 100644 Documentation/DocBook/dvb/dvbstb.png + delete mode 100644 Documentation/DocBook/dvb/frontend.h.xml + delete mode 100644 Documentation/DocBook/media-entities.tmpl + delete mode 100644 Documentation/DocBook/media-indices.tmpl + create mode 100644 Documentation/DocBook/media/Makefile + create mode 100644 Documentation/DocBook/media/bayer.png.b64 + create mode 100644 Documentation/DocBook/media/crop.gif.b64 + rename Documentation/DocBook/{ => media}/dvb/.gitignore (100%) + rename Documentation/DocBook/{ => media}/dvb/audio.xml (79%) + rename Documentation/DocBook/{ => media}/dvb/ca.xml (67%) + rename Documentation/DocBook/{ => media}/dvb/demux.xml (84%) + rename Documentation/DocBook/{ => media}/dvb/dvbapi.xml (85%) + create mode 100644 Documentation/DocBook/media/dvb/dvbproperty.xml + rename Documentation/DocBook/{ => media}/dvb/dvbstb.pdf (100%) + rename Documentation/DocBook/{ => media}/dvb/examples.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/frontend.xml (75%) + rename Documentation/DocBook/{ => media}/dvb/intro.xml (92%) + rename Documentation/DocBook/{ => media}/dvb/kdapi.xml (100%) + rename Documentation/DocBook/{ => media}/dvb/net.xml (57%) + rename Documentation/DocBook/{ => media}/dvb/video.xml (81%) + create mode 100644 Documentation/DocBook/media/dvbstb.png.b64 + create mode 100644 Documentation/DocBook/media/fieldseq_bt.gif.b64 + create mode 100644 Documentation/DocBook/media/fieldseq_tb.gif.b64 + create mode 100644 Documentation/DocBook/media/nv12mt.gif.b64 + create mode 100644 Documentation/DocBook/media/nv12mt_example.gif.b64 + create mode 100644 Documentation/DocBook/media/pipeline.png.b64 + rename Documentation/DocBook/{ => media}/v4l/.gitignore (100%) + rename Documentation/DocBook/{ => media}/v4l/biblio.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/capture.c.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/common.xml (99%) + rename Documentation/DocBook/{ => media}/v4l/compat.xml (99%) + rename Documentation/DocBook/{ => media}/v4l/controls.xml (62%) + rename Documentation/DocBook/{ => media}/v4l/crop.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-capture.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-codec.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-effect.xml (100%) + create mode 100644 Documentation/DocBook/media/v4l/dev-event.xml + rename Documentation/DocBook/{ => media}/v4l/dev-osd.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-output.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-overlay.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-radio.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-raw-vbi.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-rds.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-sliced-vbi.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-subdev.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/dev-teletext.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/driver.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/fdl-appendix.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/func-close.xml (100%) + create mode 100644 Documentation/DocBook/media/v4l/func-ioctl.xml + rename Documentation/DocBook/{ => media}/v4l/func-mmap.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-munmap.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-open.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-poll.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-read.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-select.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/func-write.xml (100%) + create mode 100644 Documentation/DocBook/media/v4l/gen-errors.xml + rename Documentation/DocBook/{ => media}/v4l/io.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/keytable.c.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/libv4l.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/lirc_device_interface.xml (99%) + rename Documentation/DocBook/{ => media}/v4l/media-controller.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-func-close.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-func-ioctl.xml (59%) + rename Documentation/DocBook/{ => media}/v4l/media-func-open.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-device-info.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-entities.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-links.xml (98%) + rename Documentation/DocBook/{ => media}/v4l/media-ioc-setup-link.xml (87%) + rename Documentation/DocBook/{ => media}/v4l/pipeline.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-grey.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-m420.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12m.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12mt.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv16.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr16.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb10.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb12.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb8.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-uyvy.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-vyuy.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10b.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y12.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y16.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-y41p.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv410.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv411p.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420m.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv422p.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuyv.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt-yvyu.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/pixfmt.xml (94%) + rename Documentation/DocBook/{ => media}/v4l/planar-apis.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/remote_controllers.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/subdev-formats.xml (99%) + rename Documentation/DocBook/{ => media}/v4l/v4l2.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/v4l2grab.c.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_525.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_625.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.pdf (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-cropcap.xml (95%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-chip-ident.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-register.xml (94%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-dqevent.xml (84%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml (96%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-dv-presets.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-fmt.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-frameintervals.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-framesizes.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudio.xml (89%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudioout.xml (90%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enuminput.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumoutput.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-enumstd.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audio.xml (93%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audioout.xml (92%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-crop.xml (93%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ctrl.xml (94%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml (96%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-timings.xml (98%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-enc-index.xml (95%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml (95%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fbuf.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fmt.xml (93%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-frequency.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-input.xml (85%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml (93%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-modulator.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-output.xml (87%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-parm.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-priority.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-std.xml (90%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-g-tuner.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-log-status.xml (80%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-overlay.xml (90%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-qbuf.xml (95%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-query-dv-preset.xml (79%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-querybuf.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-querycap.xml (93%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-queryctrl.xml (97%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-querystd.xml (78%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-reqbufs.xml (92%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-s-hw-freq-seek.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-streamon.xml (92%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-interval.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-size.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-mbus-code.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-crop.xml (100%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-fmt.xml (99%) + rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-frame-interval.xml (100%) + create mode 100644 Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml + create mode 100644 Documentation/DocBook/media/vbi_525.gif.b64 + create mode 100644 Documentation/DocBook/media/vbi_625.gif.b64 + create mode 100644 Documentation/DocBook/media/vbi_hsync.gif.b64 + rename Documentation/DocBook/{media.tmpl => media_api.tmpl} (89%) + delete mode 100644 Documentation/DocBook/v4l/bayer.pdf + delete mode 100644 Documentation/DocBook/v4l/bayer.png + delete mode 100644 Documentation/DocBook/v4l/crop.gif + delete mode 100644 Documentation/DocBook/v4l/dev-event.xml + delete mode 100644 Documentation/DocBook/v4l/fieldseq_bt.gif + delete mode 100644 Documentation/DocBook/v4l/fieldseq_tb.gif + delete mode 100644 Documentation/DocBook/v4l/func-ioctl.xml + delete mode 100644 Documentation/DocBook/v4l/nv12mt.gif + delete mode 100644 Documentation/DocBook/v4l/nv12mt_example.gif + delete mode 100644 Documentation/DocBook/v4l/pipeline.png + delete mode 100644 Documentation/DocBook/v4l/vbi_525.gif + delete mode 100644 Documentation/DocBook/v4l/vbi_625.gif + delete mode 100644 Documentation/DocBook/v4l/vbi_hsync.gif + delete mode 100644 Documentation/DocBook/v4l/videodev2.h.xml + delete mode 100644 Documentation/DocBook/v4l/vidioc-subscribe-event.xml + mode change 100644 => 100755 Documentation/dvb/get_dvb_firmware + create mode 100644 Documentation/video4linux/README.davinci-vpbe + create mode 100644 drivers/media/common/tuners/xc4000.c + create mode 100644 drivers/media/common/tuners/xc4000.h + create mode 100644 drivers/media/dvb/ddbridge/Kconfig + create mode 100644 drivers/media/dvb/ddbridge/Makefile + create mode 100644 drivers/media/dvb/ddbridge/ddbridge-core.c + create mode 100644 drivers/media/dvb/ddbridge/ddbridge-regs.h + create mode 100644 drivers/media/dvb/ddbridge/ddbridge.h + create mode 100644 drivers/media/dvb/frontends/drxk.h + create mode 100644 drivers/media/dvb/frontends/drxk_hard.c + create mode 100644 drivers/media/dvb/frontends/drxk_hard.h + create mode 100644 drivers/media/dvb/frontends/drxk_map.h + create mode 100644 drivers/media/dvb/frontends/tda18271c2dd.c + create mode 100644 drivers/media/dvb/frontends/tda18271c2dd.h + create mode 100644 drivers/media/dvb/frontends/tda18271c2dd_maps.h + create mode 100644 drivers/media/rc/ir-mce_kbd-decoder.c + create mode 100644 drivers/media/video/adp1653.c + create mode 100644 drivers/media/video/atmel-isi.c + delete mode 100644 drivers/media/video/cafe_ccic-regs.h + delete mode 100644 drivers/media/video/cafe_ccic.c + create mode 100644 drivers/media/video/davinci/vpbe.c + create mode 100644 drivers/media/video/davinci/vpbe_display.c + create mode 100644 drivers/media/video/davinci/vpbe_osd.c + create mode 100644 drivers/media/video/davinci/vpbe_osd_regs.h + create mode 100644 drivers/media/video/davinci/vpbe_venc.c + create mode 100644 drivers/media/video/davinci/vpbe_venc_regs.h + create mode 100644 drivers/media/video/gspca/se401.c + create mode 100644 drivers/media/video/gspca/se401.h + create mode 100644 drivers/media/video/marvell-ccic/Kconfig + create mode 100644 drivers/media/video/marvell-ccic/Makefile + create mode 100644 drivers/media/video/marvell-ccic/cafe-driver.c + create mode 100644 drivers/media/video/marvell-ccic/mcam-core.c + create mode 100644 drivers/media/video/marvell-ccic/mcam-core.h + create mode 100644 drivers/media/video/marvell-ccic/mmp-driver.c + delete mode 100644 drivers/media/video/pwc/pwc-ioctl.h + delete mode 100644 drivers/media/video/pwc/pwc-uncompress.h + create mode 100644 include/media/adp1653.h + create mode 100644 include/media/atmel-isi.h + create mode 100644 include/media/davinci/vpbe.h + create mode 100644 include/media/davinci/vpbe_display.h + create mode 100644 include/media/davinci/vpbe_osd.h + create mode 100644 include/media/davinci/vpbe_types.h + create mode 100644 include/media/davinci/vpbe_venc.h + create mode 100644 include/media/mmp-camera.h + rename {drivers/media/video => include/media}/ov7670.h (100%) +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging scripts/genksyms/keywords.hash.c_shipped +Auto-merging scripts/genksyms/lex.lex.c_shipped +Auto-merging scripts/genksyms/parse.tab.c_shipped +Auto-merging scripts/genksyms/parse.tab.h_shipped +Removing scripts/kconfig/kconfig_load.c +Auto-merging scripts/kconfig/zconf.lex.c_shipped +Merge made by recursive. + .gitignore | 5 + + kernel/Makefile | 5 +- + scripts/Kbuild.include | 4 + + scripts/Makefile.lib | 40 +++- + scripts/Makefile.modpost | 2 +- + scripts/dtc/Makefile | 28 +-- + scripts/dtc/dtc-lexer.lex.c_shipped | 59 +--- + scripts/dtc/dtc-parser.tab.c_shipped | 116 +------ + scripts/dtc/dtc-parser.tab.h_shipped | 11 +- + scripts/genksyms/.gitignore | 7 +- + scripts/genksyms/Makefile | 48 +--- + scripts/genksyms/genksyms.c | 2 +- + scripts/genksyms/keywords.gperf | 3 + + ...{keywords.c_shipped => keywords.hash.c_shipped} | 96 +++--- + scripts/genksyms/lex.l | 4 +- + .../genksyms/{lex.c_shipped => lex.lex.c_shipped} | 359 +------------------- + .../{parse.c_shipped => parse.tab.c_shipped} | 198 +---------- + .../{parse.h_shipped => parse.tab.h_shipped} | 7 +- + scripts/headers_install.pl | 1 + + scripts/kconfig/.gitignore | 2 +- + scripts/kconfig/Makefile | 57 +--- + scripts/kconfig/conf.c | 48 +++- + scripts/kconfig/confdata.c | 340 +++++++++++++------ + scripts/kconfig/expr.c | 13 +- + scripts/kconfig/expr.h | 3 - + scripts/kconfig/gconf.c | 38 +-- + scripts/kconfig/kconfig_load.c | 35 -- + scripts/kconfig/kxgettext.c | 1 - + scripts/kconfig/lkc.h | 18 +- + scripts/kconfig/lkc_proto.h | 1 + + scripts/kconfig/mconf.c | 2 +- + scripts/kconfig/menu.c | 5 +- + scripts/kconfig/nconf.c | 30 +-- + scripts/kconfig/qconf.cc | 17 +- + scripts/kconfig/qconf.h | 2 +- + scripts/kconfig/symbol.c | 47 +++- + scripts/kconfig/util.c | 2 + + scripts/kconfig/zconf.gperf | 2 +- + scripts/kconfig/zconf.hash.c_shipped | 273 +++++++++------- + scripts/kconfig/zconf.l | 9 +- + .../{lex.zconf.c_shipped => zconf.lex.c_shipped} | 27 +-- + scripts/kconfig/zconf.tab.c_shipped | 69 ++-- + scripts/kconfig/zconf.y | 19 +- + scripts/mkmakefile | 9 +- + scripts/package/Makefile | 8 +- + 45 files changed, 760 insertions(+), 1312 deletions(-) + rename scripts/genksyms/{keywords.c_shipped => keywords.hash.c_shipped} (94%) + rename scripts/genksyms/{lex.c_shipped => lex.lex.c_shipped} (89%) + rename scripts/genksyms/{parse.c_shipped => parse.tab.c_shipped} (92%) + rename scripts/genksyms/{parse.h_shipped => parse.tab.h_shipped} (96%) + delete mode 100644 scripts/kconfig/kconfig_load.c + rename scripts/kconfig/{lex.zconf.c_shipped => zconf.lex.c_shipped} (98%) +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 +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Resolved 'arch/ia64/Kconfig' using previous resolution. +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/alpha/Kconfig +Auto-merging arch/ia64/Kconfig +CONFLICT (content): Merge conflict in arch/ia64/Kconfig +Auto-merging arch/m68k/Kconfig +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging drivers/acpi/apei/erst.c +Auto-merging drivers/acpi/battery.c +Auto-merging drivers/acpi/sbs.c +Auto-merging drivers/ata/libata-acpi.c +Auto-merging drivers/cpufreq/acpi-cpufreq.c +Auto-merging include/linux/mm.h +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 112c6a6] Merge remote-tracking branch 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 5 + + arch/Kconfig | 3 + + arch/alpha/Kconfig | 1 + + arch/avr32/Kconfig | 1 + + arch/frv/Kconfig | 1 + + arch/ia64/Kconfig | 1 + + 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 + + drivers/acpi/acpica/acglobal.h | 6 + + drivers/acpi/acpica/aclocal.h | 1 + + drivers/acpi/acpica/acpredef.h | 1 + + drivers/acpi/acpica/nspredef.c | 19 +- + drivers/acpi/acpica/nsrepair2.c | 15 ++ + drivers/acpi/acpica/tbinstal.c | 27 ++- + drivers/acpi/apei/Kconfig | 11 +- + drivers/acpi/apei/apei-base.c | 35 +++- + drivers/acpi/apei/apei-internal.h | 15 ++- + drivers/acpi/apei/einj.c | 4 +- + drivers/acpi/apei/erst-dbg.c | 6 +- + drivers/acpi/apei/erst.c | 12 +- + drivers/acpi/apei/ghes.c | 430 ++++++++++++++++++++++++++++++++--- + drivers/acpi/apei/hest.c | 17 +- + drivers/acpi/battery.c | 82 ++++--- + drivers/acpi/bus.c | 14 +- + drivers/acpi/dock.c | 4 +- + drivers/acpi/ec_sys.c | 2 +- + drivers/acpi/fan.c | 2 +- + drivers/acpi/osl.c | 15 ++ + drivers/acpi/pci_irq.c | 58 +++++ + drivers/acpi/pci_root.c | 3 +- + drivers/acpi/processor_thermal.c | 2 +- + drivers/acpi/sbs.c | 13 +- + drivers/acpi/sysfs.c | 4 +- + drivers/acpi/thermal.c | 2 +- + drivers/acpi/video.c | 2 +- + drivers/ata/libata-acpi.c | 4 +- + drivers/cpufreq/acpi-cpufreq.c | 201 +---------------- + drivers/pci/hotplug/acpiphp_glue.c | 2 +- + include/acpi/acpi_drivers.h | 2 +- + include/acpi/acpixf.h | 3 +- + include/acpi/apei.h | 5 + + include/acpi/processor.h | 2 +- + include/linux/acpi.h | 2 + + include/linux/bitmap.h | 1 + + include/linux/genalloc.h | 34 +++- + include/linux/llist.h | 126 ++++++++++ + include/linux/mm.h | 1 + + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/bitmap.c | 2 - + lib/genalloc.c | 300 ++++++++++++++++++++----- + lib/llist.c | 129 +++++++++++ + mm/memory-failure.c | 92 ++++++++ + 59 files changed, 1354 insertions(+), 379 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 +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 + + arch/x86/platform/mrst/Makefile | 1 + + arch/x86/platform/mrst/pmu.c | 814 +++++++++++++++++++++++++++++++++++++++ + arch/x86/platform/mrst/pmu.h | 234 +++++++++++ + 4 files changed, 1055 insertions(+), 0 deletions(-) + create mode 100644 arch/x86/platform/mrst/pmu.c + create mode 100644 arch/x86/platform/mrst/pmu.h +Merging powertools/tools-test +$ git merge powertools/tools-test +Merge made by recursive. + .../x86_energy_perf_policy.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) +Merging cpupowerutils/master +$ git merge cpupowerutils/master +Auto-merging CREDITS +Auto-merging MAINTAINERS +Merge made by recursive. + CREDITS | 17 +- + MAINTAINERS | 6 + + tools/power/cpupower/.gitignore | 22 + + tools/power/cpupower/Makefile | 279 ++++++ + tools/power/cpupower/README | 49 + + tools/power/cpupower/ToDo | 11 + + tools/power/cpupower/bench/Makefile | 29 + + tools/power/cpupower/bench/README-BENCH | 124 +++ + tools/power/cpupower/bench/benchmark.c | 194 ++++ + tools/power/cpupower/bench/benchmark.h | 29 + + tools/power/cpupower/bench/config.h | 36 + + tools/power/cpupower/bench/cpufreq-bench_plot.sh | 104 +++ + tools/power/cpupower/bench/cpufreq-bench_script.sh | 101 ++ + tools/power/cpupower/bench/example.cfg | 11 + + tools/power/cpupower/bench/main.c | 202 ++++ + tools/power/cpupower/bench/parse.c | 225 +++++ + tools/power/cpupower/bench/parse.h | 53 ++ + tools/power/cpupower/bench/system.c | 191 ++++ + tools/power/cpupower/bench/system.h | 29 + + tools/power/cpupower/debug/i386/Makefile | 20 + + tools/power/cpupower/debug/i386/centrino-decode.c | 113 +++ + tools/power/cpupower/debug/i386/dump_psb.c | 196 ++++ + tools/power/cpupower/debug/i386/intel_gsic.c | 78 ++ + .../power/cpupower/debug/i386/powernow-k8-decode.c | 96 ++ + tools/power/cpupower/debug/kernel/Makefile | 23 + + .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 113 +++ + tools/power/cpupower/debug/x86_64/Makefile | 14 + + .../power/cpupower/debug/x86_64/centrino-decode.c | 1 + + .../cpupower/debug/x86_64/powernow-k8-decode.c | 1 + + tools/power/cpupower/lib/cpufreq.c | 208 +++++ + tools/power/cpupower/lib/cpufreq.h | 223 +++++ + tools/power/cpupower/lib/sysfs.c | 672 ++++++++++++++ + tools/power/cpupower/lib/sysfs.h | 31 + + tools/power/cpupower/man/cpupower-frequency-info.1 | 76 ++ + tools/power/cpupower/man/cpupower-frequency-set.1 | 54 ++ + tools/power/cpupower/man/cpupower-info.1 | 19 + + tools/power/cpupower/man/cpupower-monitor.1 | 179 ++++ + tools/power/cpupower/man/cpupower-set.1 | 103 +++ + tools/power/cpupower/man/cpupower.1 | 72 ++ + tools/power/cpupower/po/cs.po | 944 +++++++++++++++++++ + tools/power/cpupower/po/de.po | 961 ++++++++++++++++++++ + tools/power/cpupower/po/fr.po | 947 +++++++++++++++++++ + tools/power/cpupower/po/it.po | 961 ++++++++++++++++++++ + tools/power/cpupower/po/pt.po | 957 +++++++++++++++++++ + tools/power/cpupower/utils/builtin.h | 18 + + tools/power/cpupower/utils/cpufreq-info.c | 678 ++++++++++++++ + tools/power/cpupower/utils/cpufreq-set.c | 358 ++++++++ + tools/power/cpupower/utils/cpuidle-info.c | 244 +++++ + tools/power/cpupower/utils/cpupower-info.c | 153 ++++ + tools/power/cpupower/utils/cpupower-set.c | 153 ++++ + tools/power/cpupower/utils/cpupower.c | 203 ++++ + tools/power/cpupower/utils/helpers/amd.c | 137 +++ + tools/power/cpupower/utils/helpers/bitmask.c | 292 ++++++ + tools/power/cpupower/utils/helpers/bitmask.h | 33 + + tools/power/cpupower/utils/helpers/cpuid.c | 143 +++ + tools/power/cpupower/utils/helpers/helpers.h | 180 ++++ + tools/power/cpupower/utils/helpers/misc.c | 35 + + tools/power/cpupower/utils/helpers/msr.c | 122 +++ + tools/power/cpupower/utils/helpers/pci.c | 44 + + tools/power/cpupower/utils/helpers/sysfs.c | 358 ++++++++ + tools/power/cpupower/utils/helpers/sysfs.h | 28 + + tools/power/cpupower/utils/helpers/topology.c | 108 +++ + .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 338 +++++++ + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 196 ++++ + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 448 +++++++++ + .../cpupower/utils/idle_monitor/cpupower-monitor.h | 68 ++ + .../cpupower/utils/idle_monitor/idle_monitors.def | 7 + + .../cpupower/utils/idle_monitor/idle_monitors.h | 18 + + .../cpupower/utils/idle_monitor/mperf_monitor.c | 255 ++++++ + tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 216 +++++ + tools/power/cpupower/utils/idle_monitor/snb_idle.c | 190 ++++ + tools/power/cpupower/utils/version-gen.sh | 35 + + 72 files changed, 13831 insertions(+), 1 deletions(-) + create mode 100644 tools/power/cpupower/.gitignore + create mode 100644 tools/power/cpupower/Makefile + create mode 100644 tools/power/cpupower/README + create mode 100644 tools/power/cpupower/ToDo + create mode 100644 tools/power/cpupower/bench/Makefile + create mode 100644 tools/power/cpupower/bench/README-BENCH + create mode 100644 tools/power/cpupower/bench/benchmark.c + create mode 100644 tools/power/cpupower/bench/benchmark.h + create mode 100644 tools/power/cpupower/bench/config.h + create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh + create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh + create mode 100644 tools/power/cpupower/bench/example.cfg + create mode 100644 tools/power/cpupower/bench/main.c + create mode 100644 tools/power/cpupower/bench/parse.c + create mode 100644 tools/power/cpupower/bench/parse.h + create mode 100644 tools/power/cpupower/bench/system.c + create mode 100644 tools/power/cpupower/bench/system.h + create mode 100644 tools/power/cpupower/debug/i386/Makefile + create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c + create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c + create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c + create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c + create mode 100644 tools/power/cpupower/debug/kernel/Makefile + create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c + create mode 100644 tools/power/cpupower/debug/x86_64/Makefile + create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c + create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c + create mode 100644 tools/power/cpupower/lib/cpufreq.c + create mode 100644 tools/power/cpupower/lib/cpufreq.h + create mode 100644 tools/power/cpupower/lib/sysfs.c + create mode 100644 tools/power/cpupower/lib/sysfs.h + create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1 + create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1 + create mode 100644 tools/power/cpupower/man/cpupower-info.1 + create mode 100644 tools/power/cpupower/man/cpupower-monitor.1 + create mode 100644 tools/power/cpupower/man/cpupower-set.1 + create mode 100644 tools/power/cpupower/man/cpupower.1 + create mode 100644 tools/power/cpupower/po/cs.po + create mode 100644 tools/power/cpupower/po/de.po + create mode 100644 tools/power/cpupower/po/fr.po + create mode 100644 tools/power/cpupower/po/it.po + create mode 100644 tools/power/cpupower/po/pt.po + create mode 100644 tools/power/cpupower/utils/builtin.h + create mode 100644 tools/power/cpupower/utils/cpufreq-info.c + create mode 100644 tools/power/cpupower/utils/cpufreq-set.c + create mode 100644 tools/power/cpupower/utils/cpuidle-info.c + create mode 100644 tools/power/cpupower/utils/cpupower-info.c + create mode 100644 tools/power/cpupower/utils/cpupower-set.c + create mode 100644 tools/power/cpupower/utils/cpupower.c + create mode 100644 tools/power/cpupower/utils/helpers/amd.c + create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c + create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h + create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c + create mode 100644 tools/power/cpupower/utils/helpers/helpers.h + create mode 100644 tools/power/cpupower/utils/helpers/misc.c + create mode 100644 tools/power/cpupower/utils/helpers/msr.c + create mode 100644 tools/power/cpupower/utils/helpers/pci.c + create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c + create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h + create mode 100644 tools/power/cpupower/utils/helpers/topology.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h + create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def + create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h + create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c + create mode 100755 tools/power/cpupower/utils/version-gen.sh +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Merge made by recursive. +Merging ibft/master +$ git merge ibft/master +Merge made by recursive. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging iscsi-target/for-next +$ git merge iscsi-target/for-next +Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c +Auto-merging drivers/scsi/bnx2i/bnx2i_iscsi.c +Auto-merging drivers/scsi/libiscsi.c +Auto-merging include/scsi/iscsi_proto.h +Merge made by recursive. + drivers/infiniband/ulp/iser/iser_initiator.c | 2 +- + drivers/scsi/be2iscsi/be_main.h | 4 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 8 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/libiscsi.c | 22 +- + drivers/target/Kconfig | 1 + + drivers/target/Makefile | 2 +- + drivers/target/iscsi/Kconfig | 8 + + drivers/target/iscsi/Makefile | 20 + + drivers/target/iscsi/iscsi_target.c | 4559 +++++++++++++++++++++ + drivers/target/iscsi/iscsi_target.h | 42 + + drivers/target/iscsi/iscsi_target_auth.c | 490 +++ + drivers/target/iscsi/iscsi_target_auth.h | 31 + + drivers/target/iscsi/iscsi_target_configfs.c | 1882 +++++++++ + drivers/target/iscsi/iscsi_target_configfs.h | 7 + + drivers/target/iscsi/iscsi_target_core.h | 859 ++++ + drivers/target/iscsi/iscsi_target_datain_values.c | 531 +++ + drivers/target/iscsi/iscsi_target_datain_values.h | 12 + + drivers/target/iscsi/iscsi_target_device.c | 87 + + drivers/target/iscsi/iscsi_target_device.h | 9 + + drivers/target/iscsi/iscsi_target_erl0.c | 1004 +++++ + drivers/target/iscsi/iscsi_target_erl0.h | 15 + + drivers/target/iscsi/iscsi_target_erl1.c | 1299 ++++++ + drivers/target/iscsi/iscsi_target_erl1.h | 26 + + drivers/target/iscsi/iscsi_target_erl2.c | 474 +++ + drivers/target/iscsi/iscsi_target_erl2.h | 18 + + drivers/target/iscsi/iscsi_target_login.c | 1232 ++++++ + drivers/target/iscsi/iscsi_target_login.h | 12 + + drivers/target/iscsi/iscsi_target_nego.c | 1067 +++++ + drivers/target/iscsi/iscsi_target_nego.h | 17 + + drivers/target/iscsi/iscsi_target_nodeattrib.c | 263 ++ + drivers/target/iscsi/iscsi_target_nodeattrib.h | 14 + + drivers/target/iscsi/iscsi_target_parameters.c | 1905 +++++++++ + drivers/target/iscsi/iscsi_target_parameters.h | 269 ++ + drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 664 +++ + drivers/target/iscsi/iscsi_target_seq_pdu_list.h | 86 + + drivers/target/iscsi/iscsi_target_stat.c | 950 +++++ + drivers/target/iscsi/iscsi_target_stat.h | 64 + + drivers/target/iscsi/iscsi_target_tmr.c | 849 ++++ + drivers/target/iscsi/iscsi_target_tmr.h | 14 + + drivers/target/iscsi/iscsi_target_tpg.c | 759 ++++ + drivers/target/iscsi/iscsi_target_tpg.h | 41 + + drivers/target/iscsi/iscsi_target_tq.c | 551 +++ + drivers/target/iscsi/iscsi_target_tq.h | 88 + + drivers/target/iscsi/iscsi_target_util.c | 1819 ++++++++ + drivers/target/iscsi/iscsi_target_util.h | 60 + + include/scsi/iscsi_proto.h | 60 +- + 47 files changed, 22162 insertions(+), 36 deletions(-) + create mode 100644 drivers/target/iscsi/Kconfig + create mode 100644 drivers/target/iscsi/Makefile + create mode 100644 drivers/target/iscsi/iscsi_target.c + create mode 100644 drivers/target/iscsi/iscsi_target.h + create mode 100644 drivers/target/iscsi/iscsi_target_auth.c + create mode 100644 drivers/target/iscsi/iscsi_target_auth.h + create mode 100644 drivers/target/iscsi/iscsi_target_configfs.c + create mode 100644 drivers/target/iscsi/iscsi_target_configfs.h + create mode 100644 drivers/target/iscsi/iscsi_target_core.h + create mode 100644 drivers/target/iscsi/iscsi_target_datain_values.c + create mode 100644 drivers/target/iscsi/iscsi_target_datain_values.h + create mode 100644 drivers/target/iscsi/iscsi_target_device.c + create mode 100644 drivers/target/iscsi/iscsi_target_device.h + create mode 100644 drivers/target/iscsi/iscsi_target_erl0.c + create mode 100644 drivers/target/iscsi/iscsi_target_erl0.h + create mode 100644 drivers/target/iscsi/iscsi_target_erl1.c + create mode 100644 drivers/target/iscsi/iscsi_target_erl1.h + create mode 100644 drivers/target/iscsi/iscsi_target_erl2.c + create mode 100644 drivers/target/iscsi/iscsi_target_erl2.h + create mode 100644 drivers/target/iscsi/iscsi_target_login.c + create mode 100644 drivers/target/iscsi/iscsi_target_login.h + create mode 100644 drivers/target/iscsi/iscsi_target_nego.c + create mode 100644 drivers/target/iscsi/iscsi_target_nego.h + create mode 100644 drivers/target/iscsi/iscsi_target_nodeattrib.c + create mode 100644 drivers/target/iscsi/iscsi_target_nodeattrib.h + create mode 100644 drivers/target/iscsi/iscsi_target_parameters.c + create mode 100644 drivers/target/iscsi/iscsi_target_parameters.h + create mode 100644 drivers/target/iscsi/iscsi_target_seq_pdu_list.c + create mode 100644 drivers/target/iscsi/iscsi_target_seq_pdu_list.h + create mode 100644 drivers/target/iscsi/iscsi_target_stat.c + create mode 100644 drivers/target/iscsi/iscsi_target_stat.h + create mode 100644 drivers/target/iscsi/iscsi_target_tmr.c + create mode 100644 drivers/target/iscsi/iscsi_target_tmr.h + create mode 100644 drivers/target/iscsi/iscsi_target_tpg.c + create mode 100644 drivers/target/iscsi/iscsi_target_tpg.h + create mode 100644 drivers/target/iscsi/iscsi_target_tq.c + create mode 100644 drivers/target/iscsi/iscsi_target_tq.h + create mode 100644 drivers/target/iscsi/iscsi_target_util.c + create mode 100644 drivers/target/iscsi/iscsi_target_util.h +Merging slave-dma/next +$ git merge slave-dma/next +Resolved 'drivers/dma/mv_xor.c' using previous resolution. +Auto-merging drivers/dma/coh901318.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/imx-sdma.c +Auto-merging drivers/dma/ipu/ipu_idmac.c +Auto-merging drivers/dma/mv_xor.c +CONFLICT (content): Merge conflict in drivers/dma/mv_xor.c +Auto-merging drivers/dma/ste_dma40.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 60c93c4] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + drivers/dma/TODO | 1 - + drivers/dma/amba-pl08x.c | 246 ++++++++++++++++++++------------------- + drivers/dma/at_hdmac.c | 4 +- + drivers/dma/coh901318.c | 19 ++- + drivers/dma/dmaengine.c | 4 +- + drivers/dma/ep93xx_dma.c | 2 +- + drivers/dma/imx-sdma.c | 4 +- + drivers/dma/intel_mid_dma.c | 2 - + drivers/dma/ipu/ipu_idmac.c | 6 +- + drivers/dma/mv_xor.c | 3 +- + drivers/dma/mxs-dma.c | 13 ++- + drivers/dma/pch_dma.c | 127 +++++++++++++++----- + drivers/dma/pl330.c | 64 ++++++----- + drivers/dma/ste_dma40.c | 270 +++++++++++++++++++++++++------------------ + drivers/dma/ste_dma40_ll.h | 3 - + include/linux/amba/pl08x.h | 9 +- + 16 files changed, 448 insertions(+), 329 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + drivers/dma/ioat/dma_v3.c | 8 ++++---- + drivers/dma/ioat/pci.c | 11 +++++++++++ + include/linux/pci_ids.h | 10 ++++++++++ + 3 files changed, 25 insertions(+), 4 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/b43/main.c +Merge made by recursive. + drivers/net/wireless/b43/Kconfig | 2 +- + drivers/net/wireless/b43/bus.c | 2 ++ + drivers/net/wireless/b43/main.c | 5 +++-- + drivers/nfc/pn533.c | 2 +- + net/wireless/reg.c | 7 ++++--- + 5 files changed, 11 insertions(+), 7 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + drivers/bluetooth/ath3k.c | 1 + + drivers/bluetooth/btusb.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master +$ git merge l2-mtd/master +Resolved 'drivers/mtd/maps/pxa2xx-flash.c' using previous resolution. +Auto-merging arch/arm/mach-at91/board-cap9adk.c +Auto-merging arch/arm/mach-at91/board-sam9260ek.c +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-sam9263ek.c +Auto-merging arch/arm/mach-at91/board-sam9g20ek.c +Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c +Auto-merging arch/arm/mach-at91/board-snapper9260.c +Auto-merging arch/arm/mach-davinci/board-da830-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging arch/arm/mach-davinci/board-dm355-evm.c +Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c +Auto-merging arch/arm/mach-davinci/board-dm365-evm.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/mach-davinci/board-mityomapl138.c +Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c +Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Auto-merging arch/arm/mach-pxa/littleton.c +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/zylonite.c +Auto-merging drivers/mtd/devices/sst25l.c +Auto-merging drivers/mtd/maps/bfin-async-flash.c +Removing drivers/mtd/maps/ceiva.c +Removing drivers/mtd/maps/edb7312.c +Auto-merging drivers/mtd/maps/ixp2000.c +Auto-merging drivers/mtd/maps/pxa2xx-flash.c +CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c +Auto-merging drivers/mtd/mtdchar.c +Auto-merging drivers/mtd/nand/atmel_nand.c +Auto-merging drivers/mtd/nand/bcm_umi_nand.c +Removing drivers/mtd/nand/edb7312.c +Auto-merging drivers/mtd/nand/fsl_elbc_nand.c +Auto-merging drivers/mtd/nand/mpc5121_nfc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e00c9ee] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/mtdnand.tmpl | 5 +- + .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 + + arch/arm/mach-at91/board-afeb-9260v1.c | 9 +- + arch/arm/mach-at91/board-cam60.c | 9 +- + arch/arm/mach-at91/board-cap9adk.c | 9 +- + arch/arm/mach-at91/board-kb9202.c | 9 +- + arch/arm/mach-at91/board-neocore926.c | 9 +- + arch/arm/mach-at91/board-qil-a9260.c | 9 +- + arch/arm/mach-at91/board-rm9200dk.c | 9 +- + arch/arm/mach-at91/board-sam9-l9260.c | 9 +- + arch/arm/mach-at91/board-sam9260ek.c | 9 +- + arch/arm/mach-at91/board-sam9261ek.c | 9 +- + arch/arm/mach-at91/board-sam9263ek.c | 9 +- + arch/arm/mach-at91/board-sam9g20ek.c | 9 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +- + arch/arm/mach-at91/board-sam9rlek.c | 9 +- + arch/arm/mach-at91/board-snapper9260.c | 10 +- + arch/arm/mach-at91/board-usb-a9260.c | 9 +- + arch/arm/mach-at91/board-usb-a9263.c | 9 +- + arch/arm/mach-at91/board-yl-9200.c | 9 +- + arch/arm/mach-at91/include/mach/board.h | 3 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-mityomapl138.c | 3 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +- + arch/arm/mach-davinci/include/mach/nand.h | 4 +- + arch/arm/mach-ep93xx/ts72xx.c | 23 +- + arch/arm/mach-mmp/aspenite.c | 5 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 5 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +- + arch/arm/mach-pxa/littleton.c | 5 +- + arch/arm/mach-pxa/mxm8x10.c | 9 +- + arch/arm/mach-pxa/raumfeld.c | 5 +- + arch/arm/mach-pxa/zylonite.c | 5 +- + arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +- + arch/avr32/boards/atngw100/setup.c | 8 +- + arch/avr32/boards/atstk1000/atstk1002.c | 9 +- + arch/avr32/mach-at32ap/include/mach/board.h | 3 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- + drivers/mtd/Kconfig | 16 +- + drivers/mtd/Makefile | 2 +- + drivers/mtd/afs.c | 4 +- + drivers/mtd/ar7part.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 31 +- + drivers/mtd/chips/fwh_lock.h | 3 +- + drivers/mtd/chips/jedec_probe.c | 34 +- + drivers/mtd/cmdlinepart.c | 7 +- + drivers/mtd/devices/doc2000.c | 13 +- + drivers/mtd/devices/doc2001.c | 7 +- + drivers/mtd/devices/doc2001plus.c | 7 +- + drivers/mtd/devices/docecc.c | 2 +- + drivers/mtd/devices/lart.c | 18 +- + drivers/mtd/devices/m25p80.c | 84 +-- + drivers/mtd/devices/mtd_dataflash.c | 91 +- + drivers/mtd/devices/sst25l.c | 42 +- + drivers/mtd/ftl.c | 40 +- + drivers/mtd/inftlcore.c | 59 +- + drivers/mtd/inftlmount.c | 116 +-- + drivers/mtd/maps/Kconfig | 22 - + drivers/mtd/maps/Makefile | 2 - + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 341 ------- + drivers/mtd/maps/dc21285.c | 9 +- + drivers/mtd/maps/edb7312.c | 134 --- + drivers/mtd/maps/gpio-addr-flash.c | 16 +- + drivers/mtd/maps/h720x-flash.c | 23 +- + drivers/mtd/maps/impa7.c | 28 +- + drivers/mtd/maps/intel_vr_nor.c | 7 +- + drivers/mtd/maps/ixp2000.c | 11 +- + drivers/mtd/maps/ixp4xx.c | 29 +- + drivers/mtd/maps/lantiq-flash.c | 17 +- + drivers/mtd/maps/latch-addr-flash.c | 24 +- + drivers/mtd/maps/pcmciamtd.c | 124 +-- + drivers/mtd/maps/physmap.c | 38 +- + drivers/mtd/maps/physmap_of.c | 80 +-- + drivers/mtd/maps/plat-ram.c | 23 +- + drivers/mtd/maps/pxa2xx-flash.c | 22 +- + drivers/mtd/maps/rbtx4939-flash.c | 24 +- + drivers/mtd/maps/sa1100-flash.c | 30 +- + drivers/mtd/maps/solutionengine.c | 30 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +- + drivers/mtd/mtdblock.c | 18 +- + drivers/mtd/mtdchar.c | 37 +- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/mtdcore.c | 69 +- + drivers/mtd/mtdcore.h | 3 + + drivers/mtd/mtdpart.c | 52 +- + drivers/mtd/mtdsuper.c | 20 +- + drivers/mtd/mtdswap.c | 5 +- + drivers/mtd/nand/Kconfig | 14 +- + drivers/mtd/nand/Makefile | 1 - + drivers/mtd/nand/atmel_nand.c | 74 +-- + drivers/mtd/nand/au1550nd.c | 29 +- + drivers/mtd/nand/autcpu12.c | 4 +- + drivers/mtd/nand/bcm_umi_nand.c | 24 +- + drivers/mtd/nand/cafe_nand.c | 18 +- + drivers/mtd/nand/cmx270_nand.c | 23 +- + drivers/mtd/nand/cs553x_nand.c | 15 +- + drivers/mtd/nand/davinci_nand.c | 39 +- + drivers/mtd/nand/denali.c | 6 +- + drivers/mtd/nand/diskonchip.c | 6 +- + drivers/mtd/nand/edb7312.c | 203 ---- + drivers/mtd/nand/fsl_elbc_nand.c | 56 +- + drivers/mtd/nand/fsl_upm.c | 16 +- + drivers/mtd/nand/fsmc_nand.c | 77 +-- + drivers/mtd/nand/h1910.c | 19 +- + drivers/mtd/nand/jz4740_nand.c | 18 +- + drivers/mtd/nand/mpc5121_nfc.c | 22 +- + drivers/mtd/nand/mxc_nand.c | 33 +- + drivers/mtd/nand/nand_base.c | 996 ++++++++++---------- + drivers/mtd/nand/nand_bbt.c | 516 +++++------ + drivers/mtd/nand/nand_bch.c | 4 +- + drivers/mtd/nand/nand_ecc.c | 10 +- + drivers/mtd/nand/nandsim.c | 4 +- + drivers/mtd/nand/ndfc.c | 22 +- + drivers/mtd/nand/nomadik_nand.c | 1 + + drivers/mtd/nand/nuc900_nand.c | 1 + + drivers/mtd/nand/omap2.c | 22 +- + drivers/mtd/nand/orion_nand.c | 16 +- + drivers/mtd/nand/pasemi_nand.c | 3 +- + drivers/mtd/nand/plat_nand.c | 24 +- + drivers/mtd/nand/ppchameleonevb.c | 47 +- + drivers/mtd/nand/pxa3xx_nand.c | 471 ++++++---- + drivers/mtd/nand/rtc_from4.c | 5 +- + drivers/mtd/nand/s3c2410.c | 27 +- + drivers/mtd/nand/sharpsl.c | 13 +- + drivers/mtd/nand/socrates_nand.c | 28 +- + drivers/mtd/nand/tmio_nand.c | 17 +- + drivers/mtd/nand/txx9ndfmc.c | 8 +- + drivers/mtd/nftlcore.c | 27 +- + drivers/mtd/nftlmount.c | 26 +- + drivers/mtd/ofpart.c | 112 +++- + drivers/mtd/onenand/generic.c | 14 +- + drivers/mtd/onenand/omap2.c | 16 +- + drivers/mtd/onenand/onenand_base.c | 62 +- + drivers/mtd/onenand/onenand_bbt.c | 6 +- + drivers/mtd/onenand/samsung.c | 13 +- + drivers/mtd/redboot.c | 13 +- + drivers/mtd/sm_ftl.c | 18 +- + drivers/mtd/ssfdc.c | 44 +- + drivers/mtd/tests/mtd_readtest.c | 3 +- + fs/jffs2/scan.c | 4 +- + fs/jffs2/wbuf.c | 3 +- + include/linux/mtd/bbm.h | 39 +- + include/linux/mtd/mtd.h | 38 +- + include/linux/mtd/nand.h | 76 +- + include/linux/mtd/onenand.h | 4 + + include/linux/mtd/partitions.h | 46 +- + include/linux/mtd/physmap.h | 17 - + 156 files changed, 2072 insertions(+), 3624 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt + delete mode 100644 drivers/mtd/maps/ceiva.c + delete mode 100644 drivers/mtd/maps/edb7312.c + delete mode 100644 drivers/mtd/nand/edb7312.c +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + include/sound/pcm.h | 12 ++++++ + include/sound/soc-dapm.h | 6 +++ + sound/core/pcm_lib.c | 13 ++++--- + sound/pci/asihpi/asihpi.c | 21 ----------- + sound/pci/hda/patch_realtek.c | 5 ++- + sound/pci/hda/patch_sigmatel.c | 51 +++++++++++++++++++++++++++- + sound/soc/codecs/sgtl5000.c | 70 +++++++++++++++++-------------------- + sound/soc/codecs/wm8962.c | 6 ++-- + sound/soc/davinci/davinci-vcif.c | 9 +++-- + sound/soc/samsung/i2s.c | 7 ++++ + sound/soc/soc-core.c | 5 ++- + sound/soc/soc-dapm.c | 30 ++++++++++++++++ + 12 files changed, 160 insertions(+), 75 deletions(-) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Already up-to-date. +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +CONFLICT (delete/modify): arch/m68k/kernel/module_mm.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/m68k/kernel/module_mm.c left in tree. +CONFLICT (delete/modify): arch/m68k/kernel/module_no.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/m68k/kernel/module_no.c left in tree. +Auto-merging arch/x86/lguest/i386_head.S +CONFLICT (content): Merge conflict in arch/x86/lguest/i386_head.S +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c +arch/m68k/kernel/module_mm.c: needs merge +arch/m68k/kernel/module_no.c: needs merge +arch/x86/lguest/i386_head.S: needs merge +rm 'arch/m68k/kernel/module_mm.c' +rm 'arch/m68k/kernel/module_no.c' +$ git commit -v -a +Recorded resolution for 'arch/x86/lguest/i386_head.S'. +[master cd82794] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. +Merging input/next +$ git merge input/next +Auto-merging drivers/input/keyboard/pmic8xxx-keypad.c +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/misc/Makefile +Merge made by recursive. + .../devicetree/bindings/gpio/gpio_keys.txt | 36 + + drivers/input/joystick/xpad.c | 31 +- + drivers/input/keyboard/adp5588-keys.c | 1 - + drivers/input/keyboard/adp5589-keys.c | 1 - + drivers/input/keyboard/atkbd.c | 4 +- + drivers/input/keyboard/gpio_keys.c | 166 ++++- + drivers/input/keyboard/lm8323.c | 23 +- + drivers/input/keyboard/mpr121_touchkey.c | 16 +- + drivers/input/keyboard/pmic8xxx-keypad.c | 8 +- + drivers/input/keyboard/qt1070.c | 2 - + drivers/input/keyboard/tegra-kbc.c | 2 +- + drivers/input/keyboard/tnetv107x-keypad.c | 2 +- + drivers/input/misc/Kconfig | 38 ++ + drivers/input/misc/Makefile | 4 +- + drivers/input/misc/bfin_rotary.c | 1 - + drivers/input/misc/kxtj9.c | 671 ++++++++++++++++++++ + drivers/input/misc/mma8450.c | 256 ++++++++ + drivers/input/misc/mpu3050.c | 376 +++++++++++ + drivers/input/misc/xen-kbdfront.c | 2 +- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/mouse/lifebook.c | 4 +- + drivers/input/mouse/pxa930_trkball.c | 1 - + drivers/input/mouse/sentelic.c | 1 - + drivers/input/mouse/synaptics.c | 107 ++-- + drivers/input/mouse/synaptics.h | 18 +- + drivers/input/serio/at32psif.c | 2 +- + drivers/input/serio/hp_sdc.c | 2 +- + drivers/input/tablet/aiptek.c | 1 - + drivers/input/tablet/wacom_wac.c | 68 ++- + drivers/input/touchscreen/ads7846.c | 15 +- + drivers/input/touchscreen/atmel-wm97xx.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 190 +++--- + drivers/input/touchscreen/cy8ctmg110_ts.c | 8 +- + drivers/input/touchscreen/intel-mid-touch.c | 15 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 6 +- + drivers/input/touchscreen/tnetv107x-ts.c | 2 +- + drivers/input/touchscreen/wm9705.c | 25 +- + drivers/input/touchscreen/wm9712.c | 27 +- + drivers/input/touchscreen/wm9713.c | 25 +- + drivers/input/touchscreen/zylonite-wm97xx.c | 6 +- + include/linux/input.h | 6 +- + include/linux/input/kxtj9.h | 70 ++ + include/linux/wm97xx.h | 13 +- + 43 files changed, 1942 insertions(+), 316 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio_keys.txt + create mode 100644 drivers/input/misc/kxtj9.c + create mode 100644 drivers/input/misc/mma8450.c + create mode 100644 drivers/input/misc/mpu3050.c + create mode 100644 include/linux/input/kxtj9.h +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 +Already up-to-date! +Merge made by recursive. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + Documentation/device-mapper/dm-crypt.txt | 21 +- + Documentation/device-mapper/dm-flakey.txt | 50 +- + Documentation/device-mapper/dm-raid.txt | 138 +- + Documentation/device-mapper/persistent-data.txt | 84 + + Documentation/device-mapper/thin-provisioning.txt | 274 +++ + drivers/md/Kconfig | 14 +- + drivers/md/Makefile | 3 + + drivers/md/dm-crypt.c | 56 +- + drivers/md/dm-flakey.c | 270 +++- + drivers/md/dm-io.c | 29 +- + drivers/md/dm-ioctl.c | 89 +- + drivers/md/dm-kcopyd.c | 73 +- + drivers/md/dm-log-userspace-base.c | 3 +- + drivers/md/dm-log.c | 12 +- + drivers/md/dm-mpath.c | 147 +- + drivers/md/dm-raid.c | 621 +++++- + drivers/md/dm-snap-persistent.c | 9 +- + drivers/md/dm-snap.c | 84 +- + drivers/md/dm-table.c | 134 +- + drivers/md/dm-thin-metadata.c | 1345 ++++++++++++ + drivers/md/dm-thin-metadata.h | 172 ++ + drivers/md/dm-thin.c | 2252 ++++++++++++++++++++ + drivers/md/dm.c | 65 +- + drivers/md/dm.h | 2 + + drivers/md/persistent-data/Kconfig | 7 + + drivers/md/persistent-data/Makefile | 9 + + drivers/md/persistent-data/dm-block-manager.c | 925 ++++++++ + drivers/md/persistent-data/dm-block-manager.h | 129 ++ + drivers/md/persistent-data/dm-btree-internal.h | 124 ++ + drivers/md/persistent-data/dm-btree-remove.c | 547 +++++ + drivers/md/persistent-data/dm-btree-spine.c | 199 ++ + drivers/md/persistent-data/dm-btree.c | 795 +++++++ + drivers/md/persistent-data/dm-btree.h | 140 ++ + drivers/md/persistent-data/dm-space-map-common.h | 94 + + drivers/md/persistent-data/dm-space-map-disk.c | 632 ++++++ + drivers/md/persistent-data/dm-space-map-disk.h | 25 + + drivers/md/persistent-data/dm-space-map-metadata.c | 882 ++++++++ + drivers/md/persistent-data/dm-space-map-metadata.h | 33 + + drivers/md/persistent-data/dm-space-map.h | 119 + + .../md/persistent-data/dm-transaction-manager.c | 411 ++++ + .../md/persistent-data/dm-transaction-manager.h | 131 ++ + include/linux/device-mapper.h | 61 +- + include/linux/dm-ioctl.h | 4 +- + include/linux/dm-kcopyd.h | 19 + + 44 files changed, 10866 insertions(+), 367 deletions(-) + create mode 100644 Documentation/device-mapper/persistent-data.txt + create mode 100644 Documentation/device-mapper/thin-provisioning.txt + create mode 100644 drivers/md/dm-thin-metadata.c + create mode 100644 drivers/md/dm-thin-metadata.h + create mode 100644 drivers/md/dm-thin.c + create mode 100644 drivers/md/persistent-data/Kconfig + create mode 100644 drivers/md/persistent-data/Makefile + create mode 100644 drivers/md/persistent-data/dm-block-manager.c + create mode 100644 drivers/md/persistent-data/dm-block-manager.h + create mode 100644 drivers/md/persistent-data/dm-btree-internal.h + create mode 100644 drivers/md/persistent-data/dm-btree-remove.c + create mode 100644 drivers/md/persistent-data/dm-btree-spine.c + create mode 100644 drivers/md/persistent-data/dm-btree.c + create mode 100644 drivers/md/persistent-data/dm-btree.h + create mode 100644 drivers/md/persistent-data/dm-space-map-common.h + create mode 100644 drivers/md/persistent-data/dm-space-map-disk.c + create mode 100644 drivers/md/persistent-data/dm-space-map-disk.h + create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.c + create mode 100644 drivers/md/persistent-data/dm-space-map-metadata.h + create mode 100644 drivers/md/persistent-data/dm-space-map.h + create mode 100644 drivers/md/persistent-data/dm-transaction-manager.c + create mode 100644 drivers/md/persistent-data/dm-transaction-manager.h +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Auto-merging drivers/power/Kconfig +Auto-merging drivers/power/Makefile +Merge made by recursive. + drivers/mfd/max8998.c | 2 + + drivers/power/Kconfig | 14 ++ + drivers/power/Makefile | 2 + + drivers/power/apm_power.c | 8 +- + drivers/power/bq20z75.c | 103 ++++++++++++++-- + drivers/power/gpio-charger.c | 2 +- + drivers/power/max17042_battery.c | 175 +++++++++++++++---------- + drivers/power/max8903_charger.c | 16 ++-- + drivers/power/max8997_charger.c | 206 ++++++++++++++++++++++++++++++ + drivers/power/max8998_charger.c | 218 ++++++++++++++++++++++++++++++++ + drivers/power/s3c_adc_battery.c | 2 +- + drivers/power/twl4030_charger.c | 10 +- + drivers/power/wm831x_backup.c | 12 ++- + drivers/power/wm831x_power.c | 26 ++++- + include/linux/mfd/max8997.h | 7 +- + include/linux/mfd/max8998.h | 12 ++ + include/linux/power/bq20z75.h | 3 + + include/linux/power/max17042_battery.h | 91 +++++++++++++ + 18 files changed, 806 insertions(+), 103 deletions(-) + create mode 100644 drivers/power/max8997_charger.c + create mode 100644 drivers/power/max8998_charger.c +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 0373f68] 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 +Merge made by recursive. + drivers/mmc/core/host.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Auto-merging mm/slub.c +Merge made by recursive. + include/linux/mm_types.h | 89 ++++-- + include/linux/page-flags.h | 5 - + include/linux/slub_def.h | 3 + + mm/slub.c | 764 +++++++++++++++++++++++++++++--------------- + tools/slub/slabinfo.c | 59 +++-- + 5 files changed, 616 insertions(+), 304 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merging drivers/md/md.c +Merge made by recursive. + drivers/md/bitmap.c | 137 ++---- + drivers/md/bitmap.h | 5 - + drivers/md/md.c | 915 +++++++++++++++++++++++++++++++---- + drivers/md/md.h | 111 ++++- + drivers/md/raid1.c | 969 ++++++++++++++++++++++++++++--------- + drivers/md/raid1.h | 26 +- + drivers/md/raid10.c | 1183 ++++++++++++++++++++++++++++++++++----------- + drivers/md/raid10.h | 21 + + drivers/md/raid5.c | 994 +++++++++++++++----------------------- + drivers/md/raid5.h | 66 ++-- + include/linux/raid/md_p.h | 14 +- + 11 files changed, 3098 insertions(+), 1343 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'drivers/gpio/Makefile' using previous resolution. +Resolved 'drivers/mfd/Makefile' using previous resolution. +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +CONFLICT (content): Merge conflict in drivers/gpio/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Auto-merging drivers/mfd/tps65911-comparator.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/regulator/Kconfig +Auto-merging include/linux/mfd/tps65910.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a3c5c9e] Merge remote-tracking branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpio/Kconfig | 6 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-tps65912.c | 156 +++++++ + drivers/mfd/Kconfig | 50 ++- + drivers/mfd/Makefile | 8 +- + drivers/mfd/aat2870-core.c | 535 +++++++++++++++++++++ + drivers/mfd/ab3550-core.c | 41 +-- + drivers/mfd/ab8500-core.c | 231 +++++++--- + drivers/mfd/ab8500-debugfs.c | 41 +-- + drivers/mfd/jz4740-adc.c | 90 ++--- + drivers/mfd/lpc_sch.c | 49 ++- + drivers/mfd/max8997-irq.c | 2 - + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/stmpe.h | 1 + + drivers/mfd/tps65910.c | 7 +- + drivers/mfd/tps65911-comparator.c | 2 + + drivers/mfd/tps65912-core.c | 177 +++++++ + drivers/mfd/tps65912-i2c.c | 139 ++++++ + drivers/mfd/tps65912-irq.c | 224 +++++++++ + drivers/mfd/tps65912-spi.c | 142 ++++++ + drivers/mfd/twl-core.c | 2 + + drivers/mfd/wm831x-auxadc.c | 299 ++++++++++++ + drivers/mfd/wm831x-core.c | 259 +++-------- + drivers/mfd/wm831x-irq.c | 47 ++- + drivers/mfd/wm8350-irq.c | 18 +- + drivers/mfd/wm8994-core.c | 33 +- + drivers/regulator/Kconfig | 13 + + drivers/regulator/Makefile | 2 + + drivers/regulator/aat2870-regulator.c | 232 +++++++++ + drivers/regulator/tps65912-regulator.c | 800 ++++++++++++++++++++++++++++++++ + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/aat2870_bl.c | 246 ++++++++++ + include/linux/mfd/aat2870.h | 181 +++++++ + include/linux/mfd/ab8500.h | 8 +- + include/linux/mfd/stmpe.h | 3 + + include/linux/mfd/tps65910.h | 1 + + include/linux/mfd/tps65912.h | 327 +++++++++++++ + include/linux/mfd/wm831x/core.h | 119 +++++- + include/linux/mfd/wm831x/pdata.h | 3 + + 40 files changed, 4088 insertions(+), 417 deletions(-) + create mode 100644 drivers/gpio/gpio-tps65912.c + create mode 100644 drivers/mfd/aat2870-core.c + create mode 100644 drivers/mfd/tps65912-core.c + create mode 100644 drivers/mfd/tps65912-i2c.c + create mode 100644 drivers/mfd/tps65912-irq.c + create mode 100644 drivers/mfd/tps65912-spi.c + create mode 100644 drivers/mfd/wm831x-auxadc.c + create mode 100644 drivers/regulator/aat2870-regulator.c + create mode 100644 drivers/regulator/tps65912-regulator.c + create mode 100644 drivers/video/backlight/aat2870_bl.c + create mode 100644 include/linux/mfd/aat2870.h + create mode 100644 include/linux/mfd/tps65912.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/acpi/video.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/nouveau/nv50_graph.c +Auto-merging drivers/gpu/drm/radeon/evergreen.c +Auto-merging drivers/gpu/drm/radeon/radeon_reg.h +Auto-merging drivers/gpu/drm/radeon/rs600.c +Merge made by recursive. + Documentation/fb/modedb.txt | 21 +- + drivers/acpi/video.c | 7 +- + drivers/cpufreq/cpufreq.c | 20 + + drivers/gpu/drm/drm_crtc_helper.c | 5 + + drivers/gpu/drm/drm_edid.c | 4 +- + drivers/gpu/drm/drm_gem.c | 47 ++- + drivers/gpu/drm/drm_modes.c | 87 ++- + drivers/gpu/drm/drm_platform.c | 5 +- + drivers/gpu/drm/i915/i915_debugfs.c | 41 ++- + drivers/gpu/drm/i915/i915_dma.c | 4 +- + drivers/gpu/drm/i915/i915_drv.c | 69 ++- + drivers/gpu/drm/i915/i915_drv.h | 46 +- + drivers/gpu/drm/i915/i915_gem.c | 191 ++++++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 39 +- + drivers/gpu/drm/i915/i915_irq.c | 13 +- + drivers/gpu/drm/i915/i915_reg.h | 6 +- + drivers/gpu/drm/i915/i915_suspend.c | 8 +- + drivers/gpu/drm/i915/intel_bios.c | 142 +++-- + drivers/gpu/drm/i915/intel_display.c | 699 ++++++++++++++++------ + drivers/gpu/drm/i915/intel_dp.c | 17 +- + drivers/gpu/drm/i915/intel_drv.h | 9 + + drivers/gpu/drm/i915/intel_hdmi.c | 8 +- + drivers/gpu/drm/i915/intel_opregion.c | 15 +- + drivers/gpu/drm/i915/intel_overlay.c | 6 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +- + drivers/gpu/drm/i915/intel_tv.c | 46 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 50 ++- + drivers/gpu/drm/nouveau/nouveau_bo.c | 232 ++++---- + drivers/gpu/drm/nouveau/nouveau_channel.c | 167 +++--- + drivers/gpu/drm/nouveau/nouveau_connector.c | 34 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 23 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 78 ++- + drivers/gpu/drm/nouveau/nouveau_fb.h | 1 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 31 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 148 ++++-- + drivers/gpu/drm/nouveau/nouveau_irq.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 119 +--- + drivers/gpu/drm/nouveau/nouveau_mm.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_mm.h | 1 + + drivers/gpu/drm/nouveau/nouveau_notifier.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_object.c | 98 +++- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 114 +++- + drivers/gpu/drm/nouveau/nouveau_temp.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_vm.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_vm.h | 2 + + drivers/gpu/drm/nouveau/nv04_crtc.c | 2 +- + drivers/gpu/drm/nouveau/nv04_graph.c | 22 +- + drivers/gpu/drm/nouveau/nv04_instmem.c | 28 +- + drivers/gpu/drm/nouveau/nv10_graph.c | 15 +- + drivers/gpu/drm/nouveau/nv20_graph.c | 13 +- + drivers/gpu/drm/nouveau/nv40_graph.c | 112 +--- + drivers/gpu/drm/nouveau/nv40_mpeg.c | 2 +- + drivers/gpu/drm/nouveau/nv50_crtc.c | 10 +- + drivers/gpu/drm/nouveau/nv50_display.c | 6 +- + drivers/gpu/drm/nouveau/nv50_evo.c | 10 +- + drivers/gpu/drm/nouveau/nv50_fbcon.c | 10 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 9 +- + drivers/gpu/drm/nouveau/nv50_instmem.c | 8 +- + drivers/gpu/drm/nouveau/nv50_mpeg.c | 2 +- + drivers/gpu/drm/nouveau/nv50_sor.c | 2 + + drivers/gpu/drm/nouveau/nv50_vm.c | 2 +- + drivers/gpu/drm/nouveau/nv50_vram.c | 41 +- + drivers/gpu/drm/nouveau/nv84_crypt.c | 2 +- + drivers/gpu/drm/nouveau/nva3_copy.c | 2 +- + drivers/gpu/drm/nouveau/nvc0_copy.c | 8 +- + drivers/gpu/drm/nouveau/nvc0_fb.c | 68 +++- + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 14 +- + drivers/gpu/drm/nouveau/nvc0_fifo.c | 4 +- + drivers/gpu/drm/nouveau/nvc0_graph.c | 270 ++++++--- + drivers/gpu/drm/nouveau/nvc0_graph.fuc | 400 +++++++++++++ + drivers/gpu/drm/nouveau/nvc0_graph.h | 24 +- + drivers/gpu/drm/nouveau/nvc0_grctx.c | 239 +++----- + drivers/gpu/drm/nouveau/nvc0_grgpc.fuc | 474 +++++++++++++++ + drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h | 483 +++++++++++++++ + drivers/gpu/drm/nouveau/nvc0_grhub.fuc | 808 ++++++++++++++++++++++++++ + drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h | 838 +++++++++++++++++++++++++++ + drivers/gpu/drm/nouveau/nvc0_instmem.c | 14 +- + drivers/gpu/drm/nouveau/nvc0_vm.c | 6 +- + drivers/gpu/drm/nouveau/nvc0_vram.c | 14 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 5 +- + drivers/gpu/drm/radeon/evergreen.c | 7 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 57 ++- + drivers/gpu/drm/radeon/evergreend.h | 2 + + drivers/gpu/drm/radeon/ni.c | 1 + + drivers/gpu/drm/radeon/r600.c | 15 +- + drivers/gpu/drm/radeon/r600_cp.c | 23 +- + drivers/gpu/drm/radeon/r600_cs.c | 9 + + drivers/gpu/drm/radeon/radeon.h | 25 +- + drivers/gpu/drm/radeon/radeon_asic.c | 14 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 4 +- + drivers/gpu/drm/radeon/radeon_combios.c | 3 +- + drivers/gpu/drm/radeon/radeon_cp.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 42 +-- + drivers/gpu/drm/radeon/radeon_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_kms.c | 15 +- + drivers/gpu/drm/radeon/radeon_reg.h | 2 +- + drivers/gpu/drm/radeon/reg_srcs/cayman | 2 + + drivers/gpu/drm/radeon/reg_srcs/evergreen | 3 + + drivers/gpu/drm/radeon/reg_srcs/r600 | 1 + + drivers/gpu/drm/radeon/rs600.c | 2 +- + drivers/gpu/drm/radeon/rv770.c | 1 + + drivers/gpu/drm/ttm/ttm_page_alloc.c | 16 +- + include/acpi/video.h | 2 + + include/drm/drmP.h | 11 +- + include/drm/radeon_drm.h | 1 + + include/drm/ttm/ttm_bo_api.h | 3 - + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/drm/ttm/ttm_memory.h | 2 +- + include/drm/ttm/ttm_object.h | 4 +- + include/drm/ttm/ttm_page_alloc.h | 2 +- + include/linux/cpufreq.h | 5 + + 114 files changed, 5572 insertions(+), 1436 deletions(-) + create mode 100644 drivers/gpu/drm/nouveau/nvc0_graph.fuc + create mode 100644 drivers/gpu/drm/nouveau/nvc0_grgpc.fuc + create mode 100644 drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h + create mode 100644 drivers/gpu/drm/nouveau/nvc0_grhub.fuc + create mode 100644 drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h +Merging fbdev/master +$ git merge fbdev/master +Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c +Auto-merging arch/powerpc/platforms/86xx/mpc8610_hpcd.c +Auto-merging arch/powerpc/sysdev/fsl_soc.h +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/video/controlfb.c +Auto-merging drivers/video/fb_defio.c +Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c +Auto-merging drivers/video/platinumfb.c +Auto-merging drivers/video/via/viafbdev.c +Merge made by recursive. + arch/powerpc/platforms/512x/mpc512x_shared.c | 22 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 47 +-- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 55 ++-- + arch/powerpc/sysdev/fsl_soc.h | 25 +- + drivers/staging/xgifb/XGI_main_26.c | 22 +- + drivers/video/68328fb.c | 4 +- + drivers/video/Kconfig | 16 +- + drivers/video/Makefile | 1 + + drivers/video/acornfb.c | 5 +- + drivers/video/arkfb.c | 9 +- + drivers/video/atmel_lcdfb.c | 15 +- + drivers/video/aty/radeon_base.c | 10 +- + drivers/video/au1200fb.c | 297 ++++++-------- + drivers/video/backlight/adp8860_bl.c | 1 - + drivers/video/backlight/adp8870_bl.c | 1 - + drivers/video/controlfb.c | 2 +- + drivers/video/da8xx-fb.c | 155 +++++++- + drivers/video/fb-puv3.c | 4 +- + drivers/video/fb_defio.c | 3 +- + drivers/video/fsl-diu-fb.c | 74 +++- + drivers/video/g364fb.c | 5 +- + drivers/video/grvga.c | 579 ++++++++++++++++++++++++++ + drivers/video/gxt4500.c | 4 +- + drivers/video/hgafb.c | 4 +- + drivers/video/imsttfb.c | 2 +- + drivers/video/intelfb/intelfbhw.c | 6 +- + drivers/video/mb862xx/mb862xxfbdrv.c | 2 +- + drivers/video/mx3fb.c | 6 +- + drivers/video/neofb.c | 4 +- + drivers/video/platinumfb.c | 2 +- + drivers/video/pm2fb.c | 6 +- + drivers/video/pm3fb.c | 6 +- + drivers/video/pxa3xx-gcu.c | 2 - + drivers/video/s3c-fb.c | 2 +- + drivers/video/s3fb.c | 9 +- + drivers/video/savage/savagefb_driver.c | 16 +- + drivers/video/sis/sis_main.c | 30 +- + drivers/video/skeletonfb.c | 2 +- + drivers/video/sm501fb.c | 6 +- + drivers/video/tridentfb.c | 4 +- + drivers/video/valkyriefb.c | 2 +- + drivers/video/vfb.c | 4 +- + drivers/video/vga16fb.c | 2 +- + drivers/video/via/via_modesetting.h | 5 + + drivers/video/via/viafbdev.c | 16 +- + drivers/video/vt8500lcdfb.c | 4 +- + drivers/video/vt8623fb.c | 9 +- + drivers/video/xilinxfb.c | 1 - + 48 files changed, 1110 insertions(+), 398 deletions(-) + create mode 100644 drivers/video/grvga.c +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 190 ++++++++++++++++++------------- + drivers/regulator/dummy.c | 32 +++++- + drivers/regulator/tps65910-regulator.c | 63 +++++++++-- + drivers/regulator/twl-regulator.c | 66 +++++------ + drivers/regulator/wm8994-regulator.c | 4 +- + include/linux/regulator/consumer.h | 3 + + include/linux/regulator/driver.h | 4 +- + 7 files changed, 224 insertions(+), 138 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Resolved 'security/tomoyo/realpath.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging fs/ecryptfs/keystore.c +Auto-merging kernel/cgroup.c +Auto-merging security/apparmor/domain.c +Auto-merging security/tomoyo/realpath.c +CONFLICT (content): Merge conflict in security/tomoyo/realpath.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4912e1e] Merge remote-tracking branch 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys-ecryptfs.txt | 68 + + Documentation/security/keys-trusted-encrypted.txt | 52 +- + MAINTAINERS | 2 +- + drivers/char/tpm/tpm.c | 102 +- + drivers/char/tpm/tpm.h | 7 + + drivers/char/tpm/tpm_nsc.c | 14 +- + drivers/char/tpm/tpm_tis.c | 182 ++- + fs/ecryptfs/ecryptfs_kernel.h | 150 +-- + fs/ecryptfs/keystore.c | 13 +- + include/keys/encrypted-type.h | 13 +- + include/linux/ecryptfs.h | 113 ++ + kernel/cgroup.c | 5 + + security/apparmor/domain.c | 2 +- + security/apparmor/lsm.c | 2 +- + security/keys/Makefile | 2 +- + security/keys/ecryptfs_format.c | 81 + + security/keys/ecryptfs_format.h | 30 + + security/keys/encrypted.c | 251 +++- + security/keys/request_key_auth.c | 2 + + security/tomoyo/Kconfig | 61 + + security/tomoyo/Makefile | 49 +- + security/tomoyo/audit.c | 456 +++++ + security/tomoyo/common.c | 1967 +++++++++++++-------- + security/tomoyo/common.h | 1197 +++++++------ + security/tomoyo/condition.c | 1035 +++++++++++ + security/tomoyo/domain.c | 630 +++++--- + security/tomoyo/file.c | 954 ++++------ + security/tomoyo/gc.c | 551 +++++- + security/tomoyo/group.c | 61 +- + security/tomoyo/load_policy.c | 80 +- + security/tomoyo/memory.c | 173 +-- + security/tomoyo/mount.c | 176 +-- + security/tomoyo/realpath.c | 226 ++- + security/tomoyo/securityfs_if.c | 22 +- + security/tomoyo/tomoyo.c | 238 +++- + security/tomoyo/util.c | 363 +++-- + 36 files changed, 6487 insertions(+), 2843 deletions(-) + create mode 100644 Documentation/security/keys-ecryptfs.txt + create mode 100644 include/linux/ecryptfs.h + create mode 100644 security/keys/ecryptfs_format.c + create mode 100644 security/keys/ecryptfs_format.h + create mode 100644 security/tomoyo/audit.c + create mode 100644 security/tomoyo/condition.c +Merging selinux/master +$ git merge selinux/master +Already up-to-date. +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 +Auto-merging drivers/watchdog/at91sam9_wdt.h +Merge made by recursive. + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 14 + + .../devicetree/bindings/watchdog/samsung-wdt.txt | 11 + + Documentation/watchdog/00-INDEX | 2 + + Documentation/watchdog/watchdog-kernel-api.txt | 162 ++++++++ + drivers/watchdog/Kconfig | 36 ++- + drivers/watchdog/Makefile | 8 + + drivers/watchdog/at91sam9_wdt.c | 21 +- + .../at91_wdt.h => drivers/watchdog/at91sam9_wdt.h | 2 +- + drivers/watchdog/dw_wdt.c | 376 +++++++++++++++++ + drivers/watchdog/iTCO_wdt.c | 412 +++++++------------ + drivers/watchdog/imx2_wdt.c | 6 + + drivers/watchdog/it8712f_wdt.c | 63 ++- + drivers/watchdog/it87_wdt.c | 168 ++++---- + drivers/watchdog/mpcore_wdt.c | 23 + + drivers/watchdog/mtx-1_wdt.c | 4 +- + drivers/watchdog/of_xilinx_wdt.c | 433 ++++++++++++++++++++ + drivers/watchdog/pc87413_wdt.c | 96 +++-- + drivers/watchdog/s3c2410_wdt.c | 10 + + drivers/watchdog/sch311x_wdt.c | 5 - + drivers/watchdog/sp805_wdt.c | 5 +- + drivers/watchdog/watchdog_core.c | 111 +++++ + drivers/watchdog/watchdog_dev.c | 395 ++++++++++++++++++ + drivers/watchdog/watchdog_dev.h | 33 ++ + include/linux/watchdog.h | 78 ++++ + 24 files changed, 2029 insertions(+), 445 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt + create mode 100644 Documentation/watchdog/watchdog-kernel-api.txt + rename arch/arm/mach-at91/include/mach/at91_wdt.h => drivers/watchdog/at91sam9_wdt.h (96%) + create mode 100644 drivers/watchdog/dw_wdt.c + create mode 100644 drivers/watchdog/of_xilinx_wdt.c + create mode 100644 drivers/watchdog/watchdog_core.c + create mode 100644 drivers/watchdog/watchdog_dev.c + create mode 100644 drivers/watchdog/watchdog_dev.h +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Already up-to-date. +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging apm/for-next +$ git merge apm/for-next +Already up-to-date. +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 fs/notify/mark.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 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 +Already up-to-date. +Merging spi/spi/next +$ git merge spi/spi/next +Already up-to-date. +Merging gpio/gpio/next +$ git merge gpio/gpio/next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Already up-to-date! +Merge made by recursive. +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging ptrace/ptrace +$ git merge ptrace/ptrace +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/xen/mmu.c +Merge made by recursive. + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/include/asm/x86_init.h | 12 --- + arch/x86/kernel/x86_init.c | 4 - + arch/x86/mm/init.c | 147 +++++++++++++++++++++++++--------- + arch/x86/xen/mmu.c | 15 ---- + drivers/block/xen-blkfront.c | 18 +++-- + drivers/xen/grant-table.c | 2 +- + drivers/xen/xen-selfballoon.c | 4 +- + 8 files changed, 122 insertions(+), 81 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +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 'Documentation/feature-removal-schedule.txt' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/dell-laptop.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging include/linux/input.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 20918f2] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-platform-ideapad-laptop | 17 ++ + Documentation/feature-removal-schedule.txt | 13 + + drivers/platform/x86/Kconfig | 8 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 12 +- + drivers/platform/x86/acerhdf.c | 1 + + drivers/platform/x86/asus-laptop.c | 9 +- + drivers/platform/x86/asus-nb-wmi.c | 27 ++- + drivers/platform/x86/asus-wmi.c | 239 +++++++++++++++++--- + drivers/platform/x86/asus-wmi.h | 7 + + drivers/platform/x86/dell-laptop.c | 1 - + drivers/platform/x86/eeepc-wmi.c | 27 +++ + drivers/platform/x86/ideapad-laptop.c | 192 ++++++++++++++-- + drivers/platform/x86/intel_menlow.c | 2 + + drivers/platform/x86/intel_mid_thermal.c | 26 ++- + drivers/platform/x86/intel_rar_register.c | 4 +- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + drivers/platform/x86/msi-laptop.c | 10 + + drivers/platform/x86/msi-wmi.c | 1 + + drivers/platform/x86/samsung-laptop.c | 10 + + drivers/platform/x86/samsung-q10.c | 196 ++++++++++++++++ + drivers/platform/x86/thinkpad_acpi.c | 11 +- + include/linux/input.h | 2 + + 23 files changed, 745 insertions(+), 73 deletions(-) + create mode 100644 drivers/platform/x86/samsung-q10.c +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Auto-merging fs/proc/proc_sysctl.c +Merge made by recursive. + fs/proc/proc_sysctl.c | 14 ++------------ + 1 files changed, 2 insertions(+), 12 deletions(-) +Merging namespace/master +$ git merge namespace/master +Merge made by recursive. + fs/proc/inode.c | 6 +- + fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 142 insertions(+), 24 deletions(-) +Merging regmap/for-next +$ git merge regmap/for-next +Merge made by recursive. + drivers/base/regmap/regmap.c | 2 +- + include/linux/regmap.h | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletions(-) +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/Kconfig +Auto-merging drivers/misc/pti.c +Auto-merging drivers/uio/uio_pdrv_genirq.c +Merge made by recursive. + Documentation/driver-model/device.txt | 2 +- + Documentation/driver-model/overview.txt | 52 ++++-- + Documentation/filesystems/debugfs.txt | 4 +- + Documentation/ja_JP/SubmittingPatches | 258 +++++++++++++++++++++++++------ + Documentation/zh_CN/email-clients.txt | 210 +++++++++++++------------- + drivers/base/Kconfig | 64 ++++---- + drivers/firmware/google/gsmi.c | 19 ++- + drivers/misc/pti.c | 6 +- + drivers/uio/uio_pdrv_genirq.c | 43 +++++ + 9 files changed, 448 insertions(+), 210 deletions(-) +Merging tty/tty-next +$ git merge tty/tty-next +Auto-merging drivers/misc/pti.c +Auto-merging drivers/tty/n_gsm.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/tty/serial/8250.c +Auto-merging drivers/tty/serial/8250_pci.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/pch_uart.c +Auto-merging drivers/tty/serial/s5pv210.c +Auto-merging drivers/tty/serial/samsung.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + drivers/misc/Makefile | 2 +- + drivers/misc/pch_phub.c | 4 +- + drivers/misc/pti.c | 99 ++++++---- + drivers/parport/parport_pc.c | 54 ----- + drivers/parport/parport_serial.c | 229 ++++++++++++++++++++-- + drivers/tty/moxa.c | 5 +- + drivers/tty/mxser.c | 4 +- + drivers/tty/n_gsm.c | 401 +++++++++++++++++++++++++++++++++++--- + drivers/tty/n_tty.c | 2 +- + drivers/tty/serial/8250.c | 4 +- + drivers/tty/serial/8250_pci.c | 183 +++++++++++++++++- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/pch_uart.c | 11 +- + drivers/tty/serial/s5pv210.c | 4 + + drivers/tty/serial/samsung.c | 27 ++-- + drivers/tty/tty_io.c | 4 +- + include/linux/gsmmux.h | 11 + + include/linux/pci_ids.h | 4 + + include/linux/pti.h | 3 +- + include/linux/tty.h | 37 ++-- + 20 files changed, 903 insertions(+), 187 deletions(-) +Merging usb/usb-next +$ git merge usb/usb-next +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/usb/gadget/atmel_usba_udc.c +Auto-merging drivers/usb/gadget/f_phonet.c +Auto-merging drivers/usb/gadget/fsl_udc_core.c +Auto-merging drivers/usb/gadget/printer.c +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging drivers/usb/host/r8a66597-hcd.c +Auto-merging drivers/usb/host/xhci-mem.c +Auto-merging drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/musb/musb_gadget.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b075a9f] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-module | 23 + + Documentation/feature-removal-schedule.txt | 7 + + Documentation/kernel-parameters.txt | 5 + + Documentation/usb/ehci.txt | 2 + + Documentation/usb/gadget_hid.txt | 6 +- + arch/arm/mach-omap2/usb-musb.c | 10 - + drivers/usb/atm/ueagle-atm.c | 38 +- + drivers/usb/atm/usbatm.c | 4 +- + drivers/usb/class/usblp.c | 7 +- + drivers/usb/core/hcd.c | 17 +- + drivers/usb/gadget/Kconfig | 313 +--- + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/amd5536udc.c | 18 +- + drivers/usb/gadget/at91_udc.c | 20 +- + drivers/usb/gadget/atmel_usba_udc.c | 26 +- + drivers/usb/gadget/audio.c | 1 + + drivers/usb/gadget/cdc2.c | 1 + + drivers/usb/gadget/ci13xxx_msm.c | 1 + + drivers/usb/gadget/ci13xxx_udc.c | 62 +- + drivers/usb/gadget/composite.c | 363 ++++- + drivers/usb/gadget/config.c | 25 - + drivers/usb/gadget/dbgp.c | 10 +- + drivers/usb/gadget/dummy_hcd.c | 1160 ++++++++---- + drivers/usb/gadget/epautoconf.c | 132 ++- + drivers/usb/gadget/ether.c | 1 + + drivers/usb/gadget/f_acm.c | 50 +- + drivers/usb/gadget/f_audio.c | 5 +- + drivers/usb/gadget/f_ecm.c | 152 ++- + drivers/usb/gadget/f_eem.c | 90 +- + drivers/usb/gadget/f_fs.c | 3 +- + drivers/usb/gadget/f_hid.c | 22 +- + drivers/usb/gadget/f_loopback.c | 72 +- + drivers/usb/gadget/f_mass_storage.c | 33 +- + drivers/usb/gadget/f_ncm.c | 58 +- + drivers/usb/gadget/f_obex.c | 32 +- + drivers/usb/gadget/f_phonet.c | 17 +- + drivers/usb/gadget/f_rndis.c | 151 ++- + drivers/usb/gadget/f_serial.c | 32 +- + drivers/usb/gadget/f_sourcesink.c | 71 +- + drivers/usb/gadget/f_subset.c | 95 +- + drivers/usb/gadget/f_uvc.c | 8 +- + drivers/usb/gadget/file_storage.c | 15 +- + drivers/usb/gadget/fsl_qe_udc.c | 20 +- + drivers/usb/gadget/fsl_udc_core.c | 20 +- + drivers/usb/gadget/fusb300_udc.c | 111 +- + drivers/usb/gadget/g_ffs.c | 1 + + drivers/usb/gadget/gadget_chips.h | 178 +-- + drivers/usb/gadget/gmidi.c | 9 +- + drivers/usb/gadget/goku_udc.c | 19 +- + drivers/usb/gadget/hid.c | 1 + + drivers/usb/gadget/imx_udc.c | 20 +- + drivers/usb/gadget/inode.c | 11 +- + drivers/usb/gadget/langwell_udc.c | 32 +- + drivers/usb/gadget/m66592-udc.c | 62 +- + drivers/usb/gadget/m66592-udc.h | 40 +- + drivers/usb/gadget/mass_storage.c | 1 + + drivers/usb/gadget/multi.c | 1 + + drivers/usb/gadget/mv_udc_core.c | 21 +- + drivers/usb/gadget/ncm.c | 1 + + drivers/usb/gadget/net2272.c | 2752 ++++++++++++++++++++++++++++ + drivers/usb/gadget/net2272.h | 601 ++++++ + drivers/usb/gadget/net2280.c | 74 +- + drivers/usb/gadget/nokia.c | 1 + + drivers/usb/gadget/omap_udc.c | 22 +- + drivers/usb/gadget/pch_udc.c | 16 +- + drivers/usb/gadget/printer.c | 40 +- + drivers/usb/gadget/pxa25x_udc.c | 19 +- + drivers/usb/gadget/pxa27x_udc.c | 23 +- + drivers/usb/gadget/r8a66597-udc.c | 71 +- + drivers/usb/gadget/r8a66597-udc.h | 2 +- + drivers/usb/gadget/s3c-hsotg.c | 19 +- + drivers/usb/gadget/s3c-hsudc.c | 17 +- + drivers/usb/gadget/s3c2410_udc.c | 60 +- + drivers/usb/gadget/serial.c | 1 + + drivers/usb/gadget/storage_common.c | 2 +- + drivers/usb/gadget/u_ether.c | 24 +- + drivers/usb/gadget/u_ether.h | 4 - + drivers/usb/gadget/u_serial.c | 4 +- + drivers/usb/gadget/u_serial.h | 2 - + drivers/usb/gadget/udc-core.c | 484 +++++ + drivers/usb/gadget/webcam.c | 1 + + drivers/usb/gadget/zero.c | 1 + + drivers/usb/host/ehci-hcd.c | 21 +- + drivers/usb/host/ehci-hub.c | 78 +- + drivers/usb/host/ehci-msm.c | 20 +- + drivers/usb/host/ehci-q.c | 85 +- + drivers/usb/host/ehci-s5p.c | 95 + + drivers/usb/host/ehci-sched.c | 17 +- + drivers/usb/host/ehci-sysfs.c | 190 ++ + drivers/usb/host/ehci.h | 6 +- + drivers/usb/host/ohci-sh.c | 2 +- + drivers/usb/host/pci-quirks.c | 56 +- + drivers/usb/host/r8a66597-hcd.c | 6 +- + drivers/usb/host/r8a66597.h | 38 +- + drivers/usb/host/xhci-dbg.c | 22 +- + drivers/usb/host/xhci-mem.c | 26 +- + drivers/usb/host/xhci-ring.c | 42 +- + drivers/usb/host/xhci.c | 10 +- + drivers/usb/host/xhci.h | 7 + + drivers/usb/mon/mon_text.c | 9 +- + drivers/usb/musb/Kconfig | 75 +- + drivers/usb/musb/Makefile | 4 +- + drivers/usb/musb/am35x.c | 4 - + drivers/usb/musb/blackfin.h | 2 +- + drivers/usb/musb/da8xx.c | 12 +- + drivers/usb/musb/davinci.c | 5 - + drivers/usb/musb/musb_core.c | 133 +- + drivers/usb/musb/musb_core.h | 70 +- + drivers/usb/musb/musb_gadget.c | 102 +- + drivers/usb/musb/musb_gadget_ep0.c | 4 - + drivers/usb/musb/musb_host.h | 4 - + drivers/usb/musb/musb_virthub.c | 6 - + drivers/usb/musb/omap2430.c | 15 +- + drivers/usb/musb/tusb6010.c | 26 +- + drivers/usb/otg/twl6030-usb.c | 30 +- + drivers/usb/renesas_usbhs/Kconfig | 13 +- + drivers/usb/renesas_usbhs/Makefile | 2 +- + drivers/usb/renesas_usbhs/common.c | 34 +- + drivers/usb/renesas_usbhs/common.h | 44 + + drivers/usb/renesas_usbhs/fifo.c | 1015 ++++++++++ + drivers/usb/renesas_usbhs/fifo.h | 104 ++ + drivers/usb/renesas_usbhs/mod_gadget.c | 840 +++------- + drivers/usb/renesas_usbhs/pipe.c | 298 +--- + drivers/usb/renesas_usbhs/pipe.h | 47 +- + drivers/usb/serial/pl2303.c | 27 +- + drivers/usb/serial/pl2303.h | 4 + + drivers/usb/storage/Kconfig | 4 + + drivers/usb/storage/realtek_cr.c | 490 +++++- + drivers/usb/wusbcore/cbaf.c | 4 +- + drivers/usb/wusbcore/wa-xfer.c | 7 +- + include/linux/usb/composite.h | 32 +- + include/linux/usb/gadget.h | 88 +- + include/linux/usb/m66592.h | 2 + + include/linux/usb/r8a66597.h | 8 +- + include/linux/usb/renesas_usbhs.h | 17 + + 135 files changed, 9084 insertions(+), 3166 deletions(-) + create mode 100644 drivers/usb/gadget/net2272.c + create mode 100644 drivers/usb/gadget/net2272.h + create mode 100644 drivers/usb/gadget/udc-core.c + create mode 100644 drivers/usb/host/ehci-sysfs.c + create mode 100644 drivers/usb/renesas_usbhs/fifo.c + create mode 100644 drivers/usb/renesas_usbhs/fifo.h +Merging staging/staging-next +$ git merge staging/staging-next +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging MAINTAINERS +Auto-merging drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +Auto-merging drivers/staging/bcm/headers.h +CONFLICT (content): Merge conflict in drivers/staging/bcm/headers.h +Removing drivers/staging/brcm80211/brcmfmac/README +Removing drivers/staging/brcm80211/brcmfmac/aiutils.c +Removing drivers/staging/brcm80211/brcmfmac/bcmcdc.h +Removing drivers/staging/brcm80211/brcmfmac/bcmsdbus.h +Removing drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +Removing drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h +Removing drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +Removing drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c +Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c +Removing drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c +Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +Removing drivers/staging/brcm80211/brcmfmac/dhdioctl.h +Removing drivers/staging/brcm80211/brcmfmac/dngl_stats.h +Removing drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h +Removing drivers/staging/brcm80211/brcmfmac/hndrte_cons.h +Removing drivers/staging/brcm80211/brcmfmac/msgtrace.h +Removing drivers/staging/brcm80211/brcmfmac/sdioh.h +Removing drivers/staging/brcm80211/brcmfmac/sdiovar.h +Auto-merging drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +CONFLICT (delete/modify): drivers/staging/brcm80211/brcmfmac/wl_iw.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/brcm80211/brcmfmac/wl_iw.c left in tree. +Removing drivers/staging/brcm80211/brcmfmac/wl_iw.h +Auto-merging drivers/staging/brcm80211/brcmsmac/alloc.c +Auto-merging drivers/staging/brcm80211/brcmsmac/alloc.h +Auto-merging drivers/staging/brcm80211/brcmsmac/ampdu.c +Auto-merging drivers/staging/brcm80211/brcmsmac/ampdu.h +Auto-merging drivers/staging/brcm80211/brcmsmac/antsel.c +Auto-merging drivers/staging/brcm80211/brcmsmac/antsel.h +Removing drivers/staging/brcm80211/brcmsmac/bcmotp.c +Removing drivers/staging/brcm80211/brcmsmac/bcmsrom.c +Auto-merging drivers/staging/brcm80211/brcmsmac/bmac.c +Auto-merging drivers/staging/brcm80211/brcmsmac/channel.c +Auto-merging drivers/staging/brcm80211/brcmsmac/channel.h +Auto-merging drivers/staging/brcm80211/brcmsmac/dma.c +Auto-merging drivers/staging/brcm80211/brcmsmac/dma.h +Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.c +Auto-merging drivers/staging/brcm80211/brcmsmac/mac80211_if.h +Auto-merging drivers/staging/brcm80211/brcmsmac/main.c +Auto-merging drivers/staging/brcm80211/brcmsmac/main.h +Removing drivers/staging/brcm80211/brcmsmac/nvram.c +Auto-merging drivers/staging/brcm80211/brcmsmac/otp.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_int.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_n.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h +Removing drivers/staging/brcm80211/brcmsmac/phy/phy_version.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phyreg_n.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.h +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h +Removing drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h +Auto-merging drivers/staging/brcm80211/brcmsmac/pmu.h +Auto-merging drivers/staging/brcm80211/brcmsmac/pub.h +Auto-merging drivers/staging/brcm80211/brcmsmac/rate.c +Auto-merging drivers/staging/brcm80211/brcmsmac/rate.h +Auto-merging drivers/staging/brcm80211/brcmsmac/scb.h +Auto-merging drivers/staging/brcm80211/brcmsmac/srom.c +Auto-merging drivers/staging/brcm80211/brcmsmac/srom.h +Auto-merging drivers/staging/brcm80211/brcmsmac/stf.c +Auto-merging drivers/staging/brcm80211/brcmsmac/ucode_loader.c +Auto-merging drivers/staging/brcm80211/brcmsmac/ucode_loader.h +Removing drivers/staging/brcm80211/brcmsmac/wl_dbg.h +Removing drivers/staging/brcm80211/brcmsmac/wl_export.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_bmac.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_cfg.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_key.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +Removing drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h +Removing drivers/staging/brcm80211/brcmsmac/wlc_pmu.c +Removing drivers/staging/brcm80211/brcmsmac/wlc_stf.h +Auto-merging drivers/staging/brcm80211/brcmutil/Makefile +Auto-merging drivers/staging/brcm80211/brcmutil/utils.c +Auto-merging drivers/staging/brcm80211/brcmutil/wifi.c +Removing drivers/staging/brcm80211/include/aidmp.h +Removing drivers/staging/brcm80211/include/bcmdefs.h +Removing drivers/staging/brcm80211/include/bcmdevs.h +Removing drivers/staging/brcm80211/include/bcmnvram.h +Removing drivers/staging/brcm80211/include/bcmsdh.h +Removing drivers/staging/brcm80211/include/bcmsdpcm.h +Removing drivers/staging/brcm80211/include/bcmsrom_fmt.h +Removing drivers/staging/brcm80211/include/bcmutils.h +Auto-merging drivers/staging/brcm80211/include/brcmu_wifi.h +Removing drivers/staging/brcm80211/include/hndsoc.h +Removing drivers/staging/brcm80211/include/nicpci.h +Removing drivers/staging/brcm80211/include/pci_core.h +Removing drivers/staging/brcm80211/include/pcicfg.h +Removing drivers/staging/brcm80211/include/pcie_core.h +Removing drivers/staging/brcm80211/include/proto/802.11.h +Removing drivers/staging/brcm80211/include/proto/bcmeth.h +Removing drivers/staging/brcm80211/include/proto/bcmevent.h +Removing drivers/staging/brcm80211/include/sbchipc.h +Removing drivers/staging/brcm80211/include/sbconfig.h +Removing drivers/staging/brcm80211/include/sbhnddma.h +Removing drivers/staging/brcm80211/include/sbsdio.h +Removing drivers/staging/brcm80211/include/sbsdpcmdev.h +Removing drivers/staging/brcm80211/include/sdio.h +Removing drivers/staging/brcm80211/include/wlioctl.h +Removing drivers/staging/cs5535_gpio/Kconfig +Removing drivers/staging/cs5535_gpio/Makefile +Removing drivers/staging/cs5535_gpio/TODO +Removing drivers/staging/cs5535_gpio/cs5535_gpio.c +Auto-merging drivers/staging/cxd2099/cxd2099.c +Removing drivers/staging/easycap/easycap_sound_oss.c +Auto-merging drivers/staging/et131x/et131x_netdev.c +CONFLICT (content): Merge conflict in drivers/staging/et131x/et131x_netdev.c +Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000.conf +Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h +Removing drivers/staging/generic_serial/Kconfig +Removing drivers/staging/generic_serial/Makefile +Removing drivers/staging/generic_serial/TODO +Removing drivers/staging/generic_serial/generic_serial.c +Removing drivers/staging/generic_serial/rio/Makefile +Removing drivers/staging/generic_serial/rio/board.h +Removing drivers/staging/generic_serial/rio/cirrus.h +Removing drivers/staging/generic_serial/rio/cmdblk.h +Removing drivers/staging/generic_serial/rio/cmdpkt.h +Removing drivers/staging/generic_serial/rio/daemon.h +Removing drivers/staging/generic_serial/rio/errors.h +Removing drivers/staging/generic_serial/rio/func.h +Removing drivers/staging/generic_serial/rio/host.h +Removing drivers/staging/generic_serial/rio/link.h +Removing drivers/staging/generic_serial/rio/linux_compat.h +Removing drivers/staging/generic_serial/rio/map.h +Removing drivers/staging/generic_serial/rio/param.h +Removing drivers/staging/generic_serial/rio/parmmap.h +Removing drivers/staging/generic_serial/rio/pci.h +Removing drivers/staging/generic_serial/rio/phb.h +Removing drivers/staging/generic_serial/rio/pkt.h +Removing drivers/staging/generic_serial/rio/port.h +Removing drivers/staging/generic_serial/rio/protsts.h +Removing drivers/staging/generic_serial/rio/rio.h +Removing drivers/staging/generic_serial/rio/rio_linux.c +Removing drivers/staging/generic_serial/rio/rio_linux.h +Removing drivers/staging/generic_serial/rio/rioboard.h +Removing drivers/staging/generic_serial/rio/rioboot.c +Removing drivers/staging/generic_serial/rio/riocmd.c +Removing drivers/staging/generic_serial/rio/rioctrl.c +Removing drivers/staging/generic_serial/rio/riodrvr.h +Removing drivers/staging/generic_serial/rio/rioinfo.h +Removing drivers/staging/generic_serial/rio/rioinit.c +Removing drivers/staging/generic_serial/rio/riointr.c +Removing drivers/staging/generic_serial/rio/rioioctl.h +Removing drivers/staging/generic_serial/rio/rioparam.c +Removing drivers/staging/generic_serial/rio/rioroute.c +Removing drivers/staging/generic_serial/rio/riospace.h +Removing drivers/staging/generic_serial/rio/riotable.c +Removing drivers/staging/generic_serial/rio/riotty.c +Removing drivers/staging/generic_serial/rio/route.h +Removing drivers/staging/generic_serial/rio/rup.h +Removing drivers/staging/generic_serial/rio/unixrup.h +Removing drivers/staging/generic_serial/ser_a2232.c +Removing drivers/staging/generic_serial/ser_a2232.h +Removing drivers/staging/generic_serial/ser_a2232fw.ax +Removing drivers/staging/generic_serial/ser_a2232fw.h +Removing drivers/staging/generic_serial/sx.c +Removing drivers/staging/generic_serial/sx.h +Removing drivers/staging/generic_serial/sxboards.h +Removing drivers/staging/generic_serial/sxwindow.h +Removing drivers/staging/generic_serial/vme_scc.c +Auto-merging drivers/staging/gma500/accel_2d.c +Auto-merging drivers/staging/gma500/framebuffer.c +Auto-merging drivers/staging/gma500/framebuffer.h +Auto-merging drivers/staging/gma500/gem.c +Auto-merging drivers/staging/gma500/gtt.c +Auto-merging drivers/staging/gma500/gtt.h +Auto-merging drivers/staging/gma500/intel_bios.c +Auto-merging drivers/staging/gma500/intel_opregion.c +Auto-merging drivers/staging/gma500/power.c +Auto-merging drivers/staging/gma500/power.h +Removing drivers/staging/gma500/psb_bl.c +Auto-merging drivers/staging/gma500/psb_intel_display.c +Auto-merging drivers/staging/hv/hv_mouse.c +Removing drivers/staging/keucr/ms.c +Removing drivers/staging/keucr/ms.h +Removing drivers/staging/keucr/msscsi.c +Auto-merging drivers/staging/lirc/lirc_zilog.c +Removing drivers/staging/msm/Kconfig +Removing drivers/staging/msm/Makefile +Removing drivers/staging/msm/TODO +Removing drivers/staging/msm/ebi2_l2f.c +Removing drivers/staging/msm/ebi2_lcd.c +Removing drivers/staging/msm/ebi2_tmd20.c +Removing drivers/staging/msm/hdmi_sii9022.c +Removing drivers/staging/msm/lcdc.c +Removing drivers/staging/msm/lcdc_external.c +Removing drivers/staging/msm/lcdc_gordon.c +Removing drivers/staging/msm/lcdc_panel.c +Removing drivers/staging/msm/lcdc_prism.c +Removing drivers/staging/msm/lcdc_sharp_wvga_pt.c +Removing drivers/staging/msm/lcdc_st15.c +Removing drivers/staging/msm/lcdc_toshiba_wvga_pt.c +Removing drivers/staging/msm/logo.c +Removing drivers/staging/msm/mddi.c +Removing drivers/staging/msm/mddi_ext.c +Removing drivers/staging/msm/mddi_ext_lcd.c +Removing drivers/staging/msm/mddi_prism.c +Removing drivers/staging/msm/mddi_sharp.c +Removing drivers/staging/msm/mddi_toshiba.c +Removing drivers/staging/msm/mddi_toshiba.h +Removing drivers/staging/msm/mddi_toshiba_vga.c +Removing drivers/staging/msm/mddi_toshiba_wvga_pt.c +Removing drivers/staging/msm/mddihost.c +Removing drivers/staging/msm/mddihost.h +Removing drivers/staging/msm/mddihost_e.c +Removing drivers/staging/msm/mddihosti.c +Removing drivers/staging/msm/mddihosti.h +Removing drivers/staging/msm/mdp.c +Removing drivers/staging/msm/mdp.h +Removing drivers/staging/msm/mdp4.h +Removing drivers/staging/msm/mdp4_debugfs.c +Removing drivers/staging/msm/mdp4_overlay.c +Removing drivers/staging/msm/mdp4_overlay_lcdc.c +Removing drivers/staging/msm/mdp4_overlay_mddi.c +Removing drivers/staging/msm/mdp4_util.c +Removing drivers/staging/msm/mdp_cursor.c +Removing drivers/staging/msm/mdp_dma.c +Removing drivers/staging/msm/mdp_dma_lcdc.c +Removing drivers/staging/msm/mdp_dma_s.c +Removing drivers/staging/msm/mdp_dma_tv.c +Removing drivers/staging/msm/mdp_hw_init.c +Removing drivers/staging/msm/mdp_ppp.c +Removing drivers/staging/msm/mdp_ppp_dq.c +Removing drivers/staging/msm/mdp_ppp_dq.h +Removing drivers/staging/msm/mdp_ppp_v20.c +Removing drivers/staging/msm/mdp_ppp_v31.c +Removing drivers/staging/msm/mdp_vsync.c +Removing drivers/staging/msm/memory.c +Removing drivers/staging/msm/memory_ll.h +Removing drivers/staging/msm/msm_fb.c +Removing drivers/staging/msm/msm_fb.h +Removing drivers/staging/msm/msm_fb_bl.c +Removing drivers/staging/msm/msm_fb_def.h +Removing drivers/staging/msm/msm_fb_panel.c +Removing drivers/staging/msm/msm_fb_panel.h +Removing drivers/staging/msm/msm_mdp.h +Removing drivers/staging/msm/staging-devices.c +Removing drivers/staging/msm/tv_ntsc.c +Removing drivers/staging/msm/tv_pal.c +Removing drivers/staging/msm/tvenc.c +Removing drivers/staging/msm/tvenc.h +Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211.h +Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +Auto-merging drivers/staging/rtl8192e/ieee80211/ieee80211.h +Auto-merging drivers/staging/rtl8192e/ieee80211/ieee80211_module.c +Auto-merging drivers/staging/rtl8192e/r8192E.h +CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/r8192E.h +Auto-merging drivers/staging/rtl8192e/r8192E_core.c +Auto-merging drivers/staging/rtl8192u/ieee80211/ieee80211.h +Auto-merging drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +Auto-merging drivers/staging/rtl8192u/r8192U_core.c +Auto-merging drivers/staging/rtl8712/osdep_service.h +Auto-merging drivers/staging/sep/sep_driver.c +Auto-merging drivers/staging/tm6000/tm6000-alsa.c +CONFLICT (content): Merge conflict in drivers/staging/tm6000/tm6000-alsa.c +Removing drivers/staging/tty/Kconfig +Removing drivers/staging/tty/Makefile +Removing drivers/staging/tty/TODO +Removing drivers/staging/tty/cd1865.h +Removing drivers/staging/tty/digi1.h +Removing drivers/staging/tty/digiFep1.h +Removing drivers/staging/tty/digiPCI.h +Removing drivers/staging/tty/epca.c +Removing drivers/staging/tty/epca.h +Removing drivers/staging/tty/epcaconfig.h +Removing drivers/staging/tty/ip2/Makefile +Removing drivers/staging/tty/ip2/i2cmd.c +Removing drivers/staging/tty/ip2/i2cmd.h +Removing drivers/staging/tty/ip2/i2ellis.c +Removing drivers/staging/tty/ip2/i2ellis.h +Removing drivers/staging/tty/ip2/i2hw.h +Removing drivers/staging/tty/ip2/i2lib.c +Removing drivers/staging/tty/ip2/i2lib.h +Removing drivers/staging/tty/ip2/i2pack.h +Removing drivers/staging/tty/ip2/ip2.h +Removing drivers/staging/tty/ip2/ip2ioctl.h +Removing drivers/staging/tty/ip2/ip2main.c +Removing drivers/staging/tty/ip2/ip2trace.h +Removing drivers/staging/tty/ip2/ip2types.h +Removing drivers/staging/tty/istallion.c +Removing drivers/staging/tty/riscom8.c +Removing drivers/staging/tty/riscom8.h +Removing drivers/staging/tty/riscom8_reg.h +Removing drivers/staging/tty/serial167.c +Removing drivers/staging/tty/specialix.c +Removing drivers/staging/tty/specialix_io8.h +Removing drivers/staging/tty/stallion.c +Removing drivers/staging/usbip/userspace/libsrc/stub_driver.c +Removing drivers/staging/usbip/userspace/libsrc/stub_driver.h +Removing drivers/staging/usbip/userspace/libsrc/usbip.h +Removing drivers/staging/usbip/userspace/src/bind-driver.c +Auto-merging drivers/staging/usbip/userspace/src/utils.h +CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h +Removing drivers/staging/usbip/userspace/usb.ids +Removing drivers/staging/westbridge/Kconfig +Removing drivers/staging/westbridge/TODO +Removing drivers/staging/westbridge/astoria/Kconfig +Removing drivers/staging/westbridge/astoria/Makefile +Removing drivers/staging/westbridge/astoria/api/Makefile +Removing drivers/staging/westbridge/astoria/api/src/cyasdma.c +Removing drivers/staging/westbridge/astoria/api/src/cyasintr.c +Removing drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c +Removing drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c +Removing drivers/staging/westbridge/astoria/api/src/cyasmisc.c +Removing drivers/staging/westbridge/astoria/api/src/cyasmtp.c +Removing drivers/staging/westbridge/astoria/api/src/cyasstorage.c +Removing drivers/staging/westbridge/astoria/api/src/cyasusb.c +Removing drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c +Removing drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/cyashaldef.h +Removing drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h +Removing drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h +Removing drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasomapdev_kernel.h +Removing drivers/staging/westbridge/astoria/block/Kconfig +Removing drivers/staging/westbridge/astoria/block/Makefile +Removing drivers/staging/westbridge/astoria/block/cyasblkdev_block.c +Removing drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c +Removing drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h +Removing drivers/staging/westbridge/astoria/device/Kconfig +Removing drivers/staging/westbridge/astoria/device/Makefile +Removing drivers/staging/westbridge/astoria/device/cyasdevice.c +Removing drivers/staging/westbridge/astoria/gadget/Kconfig +Removing drivers/staging/westbridge/astoria/gadget/Makefile +Removing drivers/staging/westbridge/astoria/gadget/cyasgadget.c +Removing drivers/staging/westbridge/astoria/gadget/cyasgadget.h +Removing drivers/staging/westbridge/astoria/gadget/cyasgadget_ioctl.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyanerr.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmedia.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmisc.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyanregs.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyansdkversion.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyanstorage.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyantioch.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyantypes.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyanusb.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_end.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_start.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyascast.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyashalcb.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslep2pep.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslowlevel.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmedia.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc_dep.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmtp.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasregs.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage_dep.h +Removing drivers/staging/westbridge/astoriResolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Resolved 'drivers/staging/bcm/headers.h' using previous resolution. +Resolved 'drivers/staging/brcm80211/brcmfmac/dhd_linux.c' using previous resolution. +Resolved 'drivers/staging/brcm80211/brcmfmac/dhd_sdio.c' using previous resolution. +Resolved 'drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h' using previous resolution. +Resolved 'drivers/staging/et131x/et131x_netdev.c' using previous resolution. +Resolved 'drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c' using previous resolution. +Resolved 'drivers/staging/tm6000/tm6000-alsa.c' using previous resolution. +Resolved 'drivers/staging/usbip/userspace/src/utils.h' using previous resolution. +a/include/linux/westbridge/cyastoria.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyastsdkversion.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyastypes.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h +Removing drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb_dep.h +Auto-merging drivers/staging/wlags49_h2/wl_internal.h +Auto-merging drivers/staging/xgifb/XGI_main_26.c +Auto-merging drivers/usb/storage/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/brcm80211/brcmfmac/wl_iw.c +Documentation/feature-removal-schedule.txt: needs merge +drivers/staging/bcm/headers.h: needs merge +drivers/staging/brcm80211/brcmfmac/dhd_linux.c: needs merge +drivers/staging/brcm80211/brcmfmac/dhd_sdio.c: needs merge +drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h: needs merge +drivers/staging/brcm80211/brcmfmac/wl_iw.c: needs merge +drivers/staging/et131x/et131x_netdev.c: needs merge +drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c: needs merge +drivers/staging/rtl8192e/r8192E.h: needs merge +drivers/staging/tm6000/tm6000-alsa.c: needs merge +drivers/staging/usbip/userspace/src/utils.h: needs merge +rm 'drivers/staging/brcm80211/brcmfmac/wl_iw.c' +$ git commit -v -a +Recorded resolution for 'drivers/staging/rtl8192e/r8192E.h'. +[master daf8d7e] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 14 - + MAINTAINERS | 149 +- + arch/arm/mach-ux500/board-mop500-u8500uib.c | 24 +- + drivers/staging/Kconfig | 10 - + drivers/staging/Makefile | 5 - + drivers/staging/altera-stapl/Kconfig | 2 - + drivers/staging/altera-stapl/Makefile | 2 +- + drivers/staging/altera-stapl/altera.c | 33 +- + drivers/staging/ath6kl/TODO | 2 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 56 +- + drivers/staging/ath6kl/os/linux/cfg80211.c | 211 +- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 19 +- + drivers/staging/ath6kl/os/linux/include/cfg80211.h | 11 + + .../staging/ath6kl/os/linux/include/config_linux.h | 2 - + .../ath6kl/os/linux/include/ieee80211_ioctl.h | 2 - + .../staging/ath6kl/os/linux/include/osapi_linux.h | 1 - + drivers/staging/ath6kl/wmi/wmi.c | 6 +- + drivers/staging/bcm/Debug.h | 2 +- + drivers/staging/bcm/InterfaceRx.c | 4 +- + drivers/staging/bcm/Macros.h | 4 +- + drivers/staging/bcm/Misc.c | 10 +- + drivers/staging/bcm/PHSModule.c | 24 +- + drivers/staging/bcm/PHSModule.h | 2 +- + drivers/staging/bcm/headers.h | 1 - + drivers/staging/bcm/sort.c | 77 +- + drivers/staging/brcm80211/Makefile | 4 +- + drivers/staging/brcm80211/README | 65 +- + drivers/staging/brcm80211/TODO | 12 +- + drivers/staging/brcm80211/brcmfmac/Makefile | 27 +- + drivers/staging/brcm80211/brcmfmac/README | 2 - + drivers/staging/brcm80211/brcmfmac/aiutils.c | 1 - + drivers/staging/brcm80211/brcmfmac/bcmcdc.h | 98 - + drivers/staging/brcm80211/brcmfmac/bcmchip.h | 9 +- + drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 113 - + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 631 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 386 - + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 925 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h | 134 - + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 235 - + drivers/staging/brcm80211/brcmfmac/dhd.h | 970 ++- + drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 76 +- + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 348 +- + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 1606 +-- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 158 - + drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 105 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2236 +--- + .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 25 - + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 63 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 4745 ++++---- + drivers/staging/brcm80211/brcmfmac/dhdioctl.h | 100 - + drivers/staging/brcm80211/brcmfmac/dngl_stats.h | 32 - + .../staging/brcm80211/brcmfmac/hndrte_armtrap.h | 75 - + drivers/staging/brcm80211/brcmfmac/hndrte_cons.h | 62 - + drivers/staging/brcm80211/brcmfmac/msgtrace.h | 61 - + drivers/staging/brcm80211/brcmfmac/sdio_host.h | 347 + + drivers/staging/brcm80211/brcmfmac/sdioh.h | 63 - + drivers/staging/brcm80211/brcmfmac/sdiovar.h | 38 - + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2480 ++-- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 207 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 3689 ------ + drivers/staging/brcm80211/brcmfmac/wl_iw.h | 142 - + drivers/staging/brcm80211/brcmsmac/Makefile | 45 +- + drivers/staging/brcm80211/brcmsmac/aiutils.c | 717 +- + drivers/staging/brcm80211/brcmsmac/aiutils.h | 230 +- + .../brcm80211/brcmsmac/{wlc_alloc.c => alloc.c} | 153 +- + .../brcm80211/brcmsmac/{wlc_alloc.h => alloc.h} | 5 +- + .../brcm80211/brcmsmac/{wlc_ampdu.c => ampdu.c} | 410 +- + .../brcm80211/brcmsmac/{wlc_types.h => ampdu.h} | 31 +- + .../brcm80211/brcmsmac/{wlc_antsel.c => antsel.c} | 113 +- + .../brcm80211/brcmsmac/{wlc_antsel.h => antsel.h} | 16 +- + drivers/staging/brcm80211/brcmsmac/bcmotp.c | 936 -- + drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 714 -- + .../brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} | 1112 +- + drivers/staging/brcm80211/brcmsmac/bmac.h | 174 + + .../brcmsmac/{wlc_channel.c => channel.c} | 594 +- + .../brcmsmac/{wlc_channel.h => channel.h} | 82 +- + drivers/staging/brcm80211/brcmsmac/d11.h | 160 +- + .../staging/brcm80211/brcmsmac/{hnddma.c => dma.c} | 563 +- + .../brcm80211/{include/hnddma.h => brcmsmac/dma.h} | 146 +- + .../brcmsmac/{wl_mac80211.c => mac80211_if.c} | 822 +- + .../brcmsmac/{wl_mac80211.h => mac80211_if.h} | 75 +- + .../brcm80211/brcmsmac/{wlc_main.c => main.c} | 4289 +++----- + .../brcm80211/brcmsmac/{wlc_main.h => main.h} | 794 +- + drivers/staging/brcm80211/brcmsmac/nicpci.c | 672 +- + drivers/staging/brcm80211/brcmsmac/nicpci.h | 85 + + drivers/staging/brcm80211/brcmsmac/nvram.c | 215 - + drivers/staging/brcm80211/brcmsmac/otp.c | 544 + + .../brcm80211/{include/bcmotp.h => brcmsmac/otp.h} | 13 +- + .../brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} | 718 +- + drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 294 + + .../brcmsmac/phy/{wlc_phy_int.h => phy_int.h} | 467 +- + .../brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} | 584 +- + .../brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} | 12 +- + .../brcmsmac/phy/{wlc_phy_n.c => phy_n.c} | 1031 +- + .../brcmsmac/phy/{wlc_phy_qmath.c => phy_qmath.c} | 4 +- + .../brcmsmac/phy/{wlc_phy_qmath.h => phy_qmath.h} | 8 +- + .../brcmsmac/phy/{wlc_phy_radio.h => phy_radio.h} | 6 +- + .../staging/brcm80211/brcmsmac/phy/phy_version.h | 36 - + .../brcmsmac/phy/{wlc_phyreg_n.h => phyreg_n.h} | 14 +- + .../phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} | 53 +- + .../phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} | 35 +- + .../brcmsmac/phy/{wlc_phytbl_n.c => phytbl_n.c} | 53 +- + .../brcmsmac/phy/{wlc_phytbl_n.h => phytbl_n.h} | 21 +- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h | 256 - + drivers/staging/brcm80211/brcmsmac/phy_shim.c | 218 + + drivers/staging/brcm80211/brcmsmac/phy_shim.h | 164 + + drivers/staging/brcm80211/brcmsmac/pmu.c | 474 + + .../brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} | 44 +- + .../brcm80211/brcmsmac/{wlc_pub.h => pub.h} | 427 +- + .../brcm80211/brcmsmac/{wlc_rate.c => rate.c} | 207 +- + .../brcm80211/brcmsmac/{wlc_rate.h => rate.h} | 116 +- + .../brcm80211/brcmsmac/{wlc_scb.h => scb.h} | 31 +- + .../brcm80211/brcmsmac/{bcmsrom_tbl.h => srom.c} | 890 ++- + .../{include/bcmsrom.h => brcmsmac/srom.h} | 12 +- + .../brcm80211/brcmsmac/{wlc_stf.c => stf.c} | 204 +- + drivers/staging/brcm80211/brcmsmac/stf.h | 42 + + drivers/staging/brcm80211/brcmsmac/types.h | 398 + + .../brcmsmac/{wl_ucode_loader.c => ucode_loader.c} | 80 +- + .../brcmsmac/{wl_ucode.h => ucode_loader.h} | 15 +- + drivers/staging/brcm80211/brcmsmac/wl_dbg.h | 92 - + drivers/staging/brcm80211/brcmsmac/wl_export.h | 47 - + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h | 29 - + drivers/staging/brcm80211/brcmsmac/wlc_bmac.h | 178 - + drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 135 - + drivers/staging/brcm80211/brcmsmac/wlc_cfg.h | 280 - + drivers/staging/brcm80211/brcmsmac/wlc_key.h | 140 - + drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 243 - + drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h | 112 - + drivers/staging/brcm80211/brcmsmac/wlc_pmu.c | 1929 --- + drivers/staging/brcm80211/brcmsmac/wlc_stf.h | 38 - + .../staging/brcm80211/{util => brcmutil}/Makefile | 6 +- + .../{util/bcmutils.c => brcmutil/utils.c} | 153 +- + .../brcm80211/{util/bcmwifi.c => brcmutil/wifi.c} | 20 +- + drivers/staging/brcm80211/include/aidmp.h | 374 - + drivers/staging/brcm80211/include/bcmdefs.h | 150 - + drivers/staging/brcm80211/include/bcmdevs.h | 124 - + drivers/staging/brcm80211/include/bcmnvram.h | 153 - + drivers/staging/brcm80211/include/bcmsdh.h | 205 - + drivers/staging/brcm80211/include/bcmsdpcm.h | 208 - + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 367 - + drivers/staging/brcm80211/include/bcmutils.h | 500 - + drivers/staging/brcm80211/include/brcm_hw_ids.h | 59 + + drivers/staging/brcm80211/include/brcmu_utils.h | 301 + + .../brcm80211/include/{bcmwifi.h => brcmu_wifi.h} | 126 +- + drivers/staging/brcm80211/include/chipcommon.h | 281 + + drivers/staging/brcm80211/include/defs.h | 112 + + drivers/staging/brcm80211/include/hndsoc.h | 199 - + drivers/staging/brcm80211/include/nicpci.h | 79 - + drivers/staging/brcm80211/include/pci_core.h | 122 - + drivers/staging/brcm80211/include/pcicfg.h | 50 - + drivers/staging/brcm80211/include/pcie_core.h | 299 - + drivers/staging/brcm80211/include/proto/802.11.h | 200 - + drivers/staging/brcm80211/include/proto/bcmeth.h | 44 - + drivers/staging/brcm80211/include/proto/bcmevent.h | 207 - + drivers/staging/brcm80211/include/sbchipc.h | 1588 --- + drivers/staging/brcm80211/include/sbconfig.h | 272 - + drivers/staging/brcm80211/include/sbhnddma.h | 315 - + drivers/staging/brcm80211/include/sbsdio.h | 152 - + drivers/staging/brcm80211/include/sbsdpcmdev.h | 281 - + drivers/staging/brcm80211/include/sdio.h | 552 - + drivers/staging/brcm80211/include/soc.h | 95 + + drivers/staging/brcm80211/include/wlioctl.h | 1365 -- + drivers/staging/comedi/Kconfig | 10 + + drivers/staging/comedi/comedi.h | 6 +- + drivers/staging/comedi/comedi_fops.c | 18 +- + drivers/staging/comedi/comedidev.h | 3 - + drivers/staging/comedi/drivers.c | 4 + + drivers/staging/comedi/drivers/Makefile | 1 + + .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 1 + + drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- + drivers/staging/comedi/drivers/das1800.c | 28 +- + drivers/staging/comedi/drivers/dt282x.c | 1 + + drivers/staging/comedi/drivers/dyna_pci10xx.c | 462 + + drivers/staging/comedi/drivers/ni_at_a2150.c | 1 + + drivers/staging/comedi/drivers/ni_daq_700.c | 10 +- + drivers/staging/comedi/drivers/ni_labpc.c | 37 +- + drivers/staging/comedi/drivers/pcl812.c | 1 + + drivers/staging/comedi/drivers/pcl816.c | 1 + + drivers/staging/comedi/drivers/pcl818.c | 1 + + drivers/staging/comedi/drivers/rtd520.c | 22 +- + drivers/staging/comedi/drivers/serial2002.c | 45 +- + drivers/staging/comedi/drivers/unioxx5.c | 46 +- + drivers/staging/comedi/drivers/usbdux.c | 7 +- + drivers/staging/cs5535_gpio/Kconfig | 11 - + drivers/staging/cs5535_gpio/Makefile | 1 - + drivers/staging/cs5535_gpio/TODO | 6 - + drivers/staging/cs5535_gpio/cs5535_gpio.c | 260 - + drivers/staging/cxd2099/cxd2099.c | 1 - + drivers/staging/cxt1e1/sbecom_inline_linux.h | 1 - + drivers/staging/dt3155v4l/Kconfig | 10 +- + drivers/staging/dt3155v4l/dt3155v4l.c | 486 +- + drivers/staging/dt3155v4l/dt3155v4l.h | 22 +- + drivers/staging/easycap/Kconfig | 32 +- + drivers/staging/easycap/Makefile | 4 +- + drivers/staging/easycap/README | 28 +- + drivers/staging/easycap/easycap.h | 46 - + drivers/staging/easycap/easycap_ioctl.c | 17 +- + drivers/staging/easycap/easycap_main.c | 156 +- + drivers/staging/easycap/easycap_settings.c | 2 +- + drivers/staging/easycap/easycap_sound.c | 35 - + drivers/staging/easycap/easycap_sound_oss.c | 954 -- + drivers/staging/echo/echo.c | 11 +- + drivers/staging/et131x/et1310_address_map.h | 323 +- + drivers/staging/et131x/et1310_mac.c | 265 +- + drivers/staging/et131x/et1310_phy.c | 33 +- + drivers/staging/et131x/et1310_phy.h | 169 +- + drivers/staging/et131x/et1310_pm.c | 4 +- + drivers/staging/et131x/et1310_rx.c | 214 +- + drivers/staging/et131x/et1310_tx.c | 12 +- + drivers/staging/et131x/et131x.h | 4 +- + drivers/staging/et131x/et131x_adapter.h | 21 +- + drivers/staging/et131x/et131x_defs.h | 1 - + drivers/staging/et131x/et131x_initpci.c | 34 +- + drivers/staging/et131x/et131x_isr.c | 20 +- + drivers/staging/et131x/et131x_netdev.c | 139 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000.conf | 14 - + drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 480 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 190 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | 66 - + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 561 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 224 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 26 +- + drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 32 - + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 413 +- + drivers/staging/ft1000/ft1000.h | 252 + + drivers/staging/generic_serial/Kconfig | 45 - + drivers/staging/generic_serial/Makefile | 6 - + drivers/staging/generic_serial/TODO | 6 - + drivers/staging/generic_serial/generic_serial.c | 844 -- + drivers/staging/generic_serial/rio/Makefile | 12 - + drivers/staging/generic_serial/rio/board.h | 132 - + drivers/staging/generic_serial/rio/cirrus.h | 210 - + drivers/staging/generic_serial/rio/cmdblk.h | 53 - + drivers/staging/generic_serial/rio/cmdpkt.h | 177 - + drivers/staging/generic_serial/rio/daemon.h | 307 - + drivers/staging/generic_serial/rio/errors.h | 98 - + drivers/staging/generic_serial/rio/func.h | 143 - + drivers/staging/generic_serial/rio/host.h | 123 - + drivers/staging/generic_serial/rio/link.h | 96 - + drivers/staging/generic_serial/rio/linux_compat.h | 77 - + drivers/staging/generic_serial/rio/map.h | 98 - + drivers/staging/generic_serial/rio/param.h | 55 - + drivers/staging/generic_serial/rio/parmmap.h | 81 - + drivers/staging/generic_serial/rio/pci.h | 72 - + drivers/staging/generic_serial/rio/phb.h | 142 - + drivers/staging/generic_serial/rio/pkt.h | 77 - + drivers/staging/generic_serial/rio/port.h | 179 - + drivers/staging/generic_serial/rio/protsts.h | 110 - + drivers/staging/generic_serial/rio/rio.h | 208 - + drivers/staging/generic_serial/rio/rio_linux.c | 1204 -- + drivers/staging/generic_serial/rio/rio_linux.h | 197 - + drivers/staging/generic_serial/rio/rioboard.h | 275 - + drivers/staging/generic_serial/rio/rioboot.c | 1113 -- + drivers/staging/generic_serial/rio/riocmd.c | 939 -- + drivers/staging/generic_serial/rio/rioctrl.c | 1504 --- + drivers/staging/generic_serial/rio/riodrvr.h | 138 - + drivers/staging/generic_serial/rio/rioinfo.h | 92 - + drivers/staging/generic_serial/rio/rioinit.c | 421 - + drivers/staging/generic_serial/rio/riointr.c | 645 - + drivers/staging/generic_serial/rio/rioioctl.h | 57 - + drivers/staging/generic_serial/rio/rioparam.c | 663 - + drivers/staging/generic_serial/rio/rioroute.c | 1039 -- + drivers/staging/generic_serial/rio/riospace.h | 154 - + drivers/staging/generic_serial/rio/riotable.c | 941 -- + drivers/staging/generic_serial/rio/riotty.c | 654 - + drivers/staging/generic_serial/rio/route.h | 101 - + drivers/staging/generic_serial/rio/rup.h | 69 - + drivers/staging/generic_serial/rio/unixrup.h | 51 - + drivers/staging/generic_serial/ser_a2232.c | 831 -- + drivers/staging/generic_serial/ser_a2232.h | 202 - + drivers/staging/generic_serial/ser_a2232fw.ax | 529 - + drivers/staging/generic_serial/ser_a2232fw.h | 306 - + drivers/staging/generic_serial/sx.c | 2894 ----- + drivers/staging/generic_serial/sx.h | 201 - + drivers/staging/generic_serial/sxboards.h | 206 - + drivers/staging/generic_serial/sxwindow.h | 393 - + drivers/staging/generic_serial/vme_scc.c | 1145 -- + drivers/staging/gma500/Kconfig | 27 +- + drivers/staging/gma500/Makefile | 48 +- + drivers/staging/gma500/TODO | 29 +- + drivers/staging/gma500/{psb_2d.c => accel_2d.c} | 298 +- + drivers/staging/gma500/backlight.c | 49 + + drivers/staging/gma500/cdv_device.c | 351 + + drivers/staging/gma500/cdv_device.h | 36 + + drivers/staging/gma500/cdv_intel_crt.c | 326 + + drivers/staging/gma500/cdv_intel_display.c | 1508 +++ + drivers/staging/gma500/cdv_intel_hdmi.c | 376 + + drivers/staging/gma500/cdv_intel_lvds.c | 721 ++ + drivers/staging/gma500/displays/hdmi.h | 33 + + drivers/staging/gma500/displays/pyr_cmd.h | 34 + + drivers/staging/gma500/displays/pyr_vid.h | 34 + + drivers/staging/gma500/displays/tmd_cmd.h | 34 + + drivers/staging/gma500/displays/tmd_vid.h | 34 + + drivers/staging/gma500/displays/tpo_cmd.h | 35 + + drivers/staging/gma500/displays/tpo_vid.h | 33 + + drivers/staging/gma500/{psb_fb.c => framebuffer.c} | 530 +- + drivers/staging/gma500/{psb_fb.h => framebuffer.h} | 11 +- + drivers/staging/gma500/{psb_gem.c => gem.c} | 165 +- + drivers/staging/gma500/gem_glue.c | 110 + + drivers/staging/gma500/gem_glue.h | 4 + + drivers/staging/gma500/{psb_gtt.c => gtt.c} | 247 +- + drivers/staging/gma500/{psb_gtt.h => gtt.h} | 14 +- + .../gma500/{psb_intel_bios.c => intel_bios.c} | 25 +- + .../gma500/{psb_intel_bios.h => intel_bios.h} | 0 + .../gma500/{psb_intel_i2c.c => intel_i2c.c} | 0 + .../{psb_intel_opregion.c => intel_opregion.c} | 28 +- + drivers/staging/gma500/mdfld_device.c | 714 ++ + drivers/staging/gma500/mdfld_dsi_dbi.c | 760 ++ + drivers/staging/gma500/mdfld_dsi_dbi.h | 176 + + drivers/staging/gma500/mdfld_dsi_dbi_dpu.c | 778 ++ + drivers/staging/gma500/mdfld_dsi_dbi_dpu.h | 154 + + drivers/staging/gma500/mdfld_dsi_dpi.c | 800 ++ + drivers/staging/gma500/mdfld_dsi_dpi.h | 78 + + drivers/staging/gma500/mdfld_dsi_output.c | 1011 ++ + drivers/staging/gma500/mdfld_dsi_output.h | 138 + + drivers/staging/gma500/mdfld_dsi_pkg_sender.c | 1484 +++ + drivers/staging/gma500/mdfld_dsi_pkg_sender.h | 184 + + drivers/staging/gma500/mdfld_intel_display.c | 1402 +++ + drivers/staging/gma500/mdfld_msic.h | 31 + + drivers/staging/gma500/mdfld_output.c | 170 + + drivers/staging/gma500/mdfld_output.h | 41 + + drivers/staging/gma500/mdfld_pyr_cmd.c | 558 + + drivers/staging/gma500/mdfld_tmd_vid.c | 206 + + drivers/staging/gma500/mdfld_tpo_cmd.c | 509 + + drivers/staging/gma500/mdfld_tpo_vid.c | 140 + + drivers/staging/gma500/medfield.h | 270 + + drivers/staging/gma500/mid_bios.c | 269 + + drivers/staging/gma500/mid_bios.h | 21 + + drivers/staging/gma500/{psb_mmu.c => mmu.c} | 0 + drivers/staging/gma500/mrst.h | 73 +- + drivers/staging/gma500/mrst_crtc.c | 31 +- + drivers/staging/gma500/mrst_device.c | 634 + + drivers/staging/gma500/mrst_hdmi.c | 852 ++ + drivers/staging/gma500/mrst_hdmi_i2c.c | 327 + + drivers/staging/gma500/mrst_lvds.c | 92 +- + .../staging/gma500/{psb_powermgmt.c => power.c} | 237 +- + .../staging/gma500/{psb_powermgmt.h => power.h} | 6 +- + drivers/staging/gma500/psb_bl.c | 227 - + drivers/staging/gma500/psb_device.c | 353 + + drivers/staging/gma500/psb_drm.h | 152 +- + drivers/staging/gma500/psb_drv.c | 456 +- + drivers/staging/gma500/psb_drv.h | 494 +- + drivers/staging/gma500/psb_intel_display.c | 171 +- + drivers/staging/gma500/psb_intel_display.h | 3 + + drivers/staging/gma500/psb_intel_drv.h | 24 +- + drivers/staging/gma500/psb_intel_lvds.c | 148 +- + drivers/staging/gma500/psb_intel_reg.h | 1144 +- + drivers/staging/gma500/psb_intel_sdvo.c | 35 +- + drivers/staging/gma500/psb_intel_sdvo_regs.h | 14 +- + drivers/staging/gma500/psb_irq.c | 99 +- + drivers/staging/gma500/psb_irq.h | 8 +- + drivers/staging/gma500/psb_lid.c | 6 +- + drivers/staging/gma500/psb_reg.h | 842 +- + drivers/staging/hv/blkvsc_drv.c | 42 +- + drivers/staging/hv/channel.c | 113 +- + drivers/staging/hv/channel_mgmt.c | 8 +- + drivers/staging/hv/connection.c | 52 +- + drivers/staging/hv/hv.c | 4 +- + drivers/staging/hv/hv_mouse.c | 1 - + drivers/staging/hv/hv_timesource.c | 1 - + drivers/staging/hv/hyperv.h | 86 +- + drivers/staging/hv/hyperv_net.h | 14 +- + drivers/staging/hv/hyperv_vmbus.h | 2 - + drivers/staging/hv/netvsc.c | 173 +- + drivers/staging/hv/netvsc_drv.c | 60 +- + drivers/staging/hv/ring_buffer.c | 6 +- + drivers/staging/hv/rndis_filter.c | 59 +- + drivers/staging/hv/storvsc.c | 8 +- + drivers/staging/hv/storvsc_drv.c | 88 +- + drivers/staging/hv/vmbus_drv.c | 136 +- + .../staging/iio/Documentation/sysfs-bus-iio-light | 8 + + drivers/staging/iio/accel/adis16201.h | 12 +- + drivers/staging/iio/accel/adis16201_core.c | 133 +- + drivers/staging/iio/accel/adis16201_ring.c | 8 +- + drivers/staging/iio/accel/adis16201_trigger.c | 11 +- + drivers/staging/iio/accel/adis16203.h | 12 +- + drivers/staging/iio/accel/adis16203_core.c | 85 +- + drivers/staging/iio/accel/adis16203_ring.c | 8 +- + drivers/staging/iio/accel/adis16203_trigger.c | 17 +- + drivers/staging/iio/accel/adis16204.h | 12 +- + drivers/staging/iio/accel/adis16204_core.c | 84 +- + drivers/staging/iio/accel/adis16204_ring.c | 8 +- + drivers/staging/iio/accel/adis16204_trigger.c | 11 +- + drivers/staging/iio/accel/adis16209.h | 12 +- + drivers/staging/iio/accel/adis16209_core.c | 82 +- + drivers/staging/iio/accel/adis16209_ring.c | 8 +- + drivers/staging/iio/accel/adis16209_trigger.c | 17 +- + drivers/staging/iio/accel/adis16220.h | 14 +- + drivers/staging/iio/accel/adis16220_core.c | 105 +- + drivers/staging/iio/accel/adis16240.h | 14 +- + drivers/staging/iio/accel/adis16240_core.c | 82 +- + drivers/staging/iio/accel/adis16240_ring.c | 8 +- + drivers/staging/iio/accel/adis16240_trigger.c | 17 +- + drivers/staging/iio/accel/kxsd9.c | 102 +- + drivers/staging/iio/accel/lis3l02dq_core.c | 2 +- + drivers/staging/iio/accel/sca3000.h | 1 - + drivers/staging/iio/accel/sca3000_core.c | 100 +- + drivers/staging/iio/accel/sca3000_ring.c | 14 +- + drivers/staging/iio/adc/Kconfig | 14 + + drivers/staging/iio/adc/Makefile | 1 + + drivers/staging/iio/adc/ad7150.c | 91 +- + drivers/staging/iio/adc/ad7152.c | 73 +- + drivers/staging/iio/adc/ad7291.c | 86 +- + drivers/staging/iio/adc/ad7314.c | 48 +- + drivers/staging/iio/adc/ad7476.h | 5 +- + drivers/staging/iio/adc/ad7476_core.c | 84 +- + drivers/staging/iio/adc/ad7476_ring.c | 10 +- + drivers/staging/iio/adc/ad7745.c | 79 +- + drivers/staging/iio/adc/ad7793.c | 987 ++ + drivers/staging/iio/adc/ad7793.h | 107 + + drivers/staging/iio/adc/ad7816.c | 74 +- + drivers/staging/iio/adc/ad7887_core.c | 3 +- + drivers/staging/iio/adc/ad7887_ring.c | 6 +- + drivers/staging/iio/adc/ad799x_core.c | 13 +- + drivers/staging/iio/adc/ad799x_ring.c | 4 +- + drivers/staging/iio/adc/adt7310.c | 94 +- + drivers/staging/iio/adc/adt7410.c | 86 +- + drivers/staging/iio/adc/adt75.c | 123 +- + drivers/staging/iio/adc/max1363_core.c | 20 +- + drivers/staging/iio/addac/adt7316.c | 224 +- + drivers/staging/iio/dac/Kconfig | 11 + + drivers/staging/iio/dac/Makefile | 1 + + drivers/staging/iio/dac/ad5446.c | 82 +- + drivers/staging/iio/dac/ad5446.h | 2 - + drivers/staging/iio/dac/ad5504.c | 89 +- + drivers/staging/iio/dac/ad5504.h | 2 - + drivers/staging/iio/dac/ad5624r.h | 1 - + drivers/staging/iio/dac/ad5624r_spi.c | 84 +- + drivers/staging/iio/dac/ad5686.c | 497 + + drivers/staging/iio/dac/ad5791.c | 112 +- + drivers/staging/iio/dac/ad5791.h | 2 - + drivers/staging/iio/dac/max517.c | 40 +- + drivers/staging/iio/dds/ad5930.c | 37 +- + drivers/staging/iio/dds/ad9832.c | 69 +- + drivers/staging/iio/dds/ad9832.h | 2 - + drivers/staging/iio/dds/ad9834.c | 81 +- + drivers/staging/iio/dds/ad9834.h | 2 - + drivers/staging/iio/dds/ad9850.c | 37 +- + drivers/staging/iio/dds/ad9852.c | 38 +- + drivers/staging/iio/dds/ad9910.c | 36 +- + drivers/staging/iio/dds/ad9951.c | 36 +- + drivers/staging/iio/gyro/adis16060_core.c | 59 +- + drivers/staging/iio/gyro/adis16080_core.c | 48 +- + drivers/staging/iio/gyro/adis16130_core.c | 50 +- + drivers/staging/iio/gyro/adis16260.h | 18 +- + drivers/staging/iio/gyro/adis16260_core.c | 100 +- + drivers/staging/iio/gyro/adis16260_ring.c | 9 +- + drivers/staging/iio/gyro/adis16260_trigger.c | 15 +- + drivers/staging/iio/gyro/adxrs450.h | 13 +- + drivers/staging/iio/gyro/adxrs450_core.c | 71 +- + drivers/staging/iio/iio.h | 16 + + drivers/staging/iio/imu/adis16400.h | 3 + + drivers/staging/iio/imu/adis16400_core.c | 50 +- + drivers/staging/iio/industrialio-core.c | 47 +- + drivers/staging/iio/industrialio-trigger.c | 20 +- + drivers/staging/iio/kfifo_buf.c | 2 - + drivers/staging/iio/light/Kconfig | 2 +- + drivers/staging/iio/light/isl29018.c | 197 +- + drivers/staging/iio/light/tsl2563.c | 125 +- + drivers/staging/iio/magnetometer/ak8975.c | 91 +- + drivers/staging/iio/magnetometer/hmc5843.c | 50 +- + drivers/staging/iio/meter/ade7753.c | 83 +- + drivers/staging/iio/meter/ade7753.h | 10 +- + drivers/staging/iio/meter/ade7754.c | 80 +- + drivers/staging/iio/meter/ade7754.h | 12 +- + drivers/staging/iio/meter/ade7759.c | 80 +- + drivers/staging/iio/meter/ade7759.h | 12 +- + drivers/staging/iio/meter/ade7854-i2c.c | 39 +- + drivers/staging/iio/meter/ade7854-spi.c | 40 +- + drivers/staging/iio/meter/ade7854.c | 76 +- + drivers/staging/iio/meter/ade7854.h | 36 +- + drivers/staging/iio/resolver/Kconfig | 27 - + drivers/staging/iio/resolver/ad2s120x.c | 196 +- + drivers/staging/iio/resolver/ad2s1210.c | 856 +- + drivers/staging/iio/resolver/ad2s1210.h | 17 + + drivers/staging/iio/resolver/ad2s90.c | 48 +- + drivers/staging/iio/trigger.h | 52 +- + drivers/staging/iio/trigger/iio-trig-gpio.c | 2 +- + drivers/staging/intel_sst/intel_sst.c | 5 +- + .../staging/intel_sst/intel_sst_app_interface.c | 4 +- + drivers/staging/intel_sst/intel_sst_common.h | 2 + + .../staging/intel_sst/intel_sst_drv_interface.c | 10 + + drivers/staging/intel_sst/intelmid_v2_control.c | 2 +- + drivers/staging/keucr/Kconfig | 6 +- + drivers/staging/keucr/Makefile | 2 - + drivers/staging/keucr/init.c | 71 +- + drivers/staging/keucr/init.h | 773 -- + drivers/staging/keucr/ms.c | 1034 -- + drivers/staging/keucr/ms.h | 401 - + drivers/staging/keucr/msscsi.c | 344 - + drivers/staging/keucr/transport.c | 4 +- + drivers/staging/keucr/transport.h | 46 - + drivers/staging/keucr/usb.c | 5 +- + drivers/staging/keucr/usb.h | 3 +- + drivers/staging/lirc/lirc_bt829.c | 4 +- + drivers/staging/lirc/lirc_parallel.c | 6 +- + drivers/staging/lirc/lirc_ttusbir.c | 1 - + drivers/staging/lirc/lirc_zilog.c | 2 - + drivers/staging/mei/init.c | 149 +- + drivers/staging/mei/interface.c | 9 +- + drivers/staging/mei/interrupt.c | 47 +- + drivers/staging/mei/iorw.c | 32 +- + drivers/staging/mei/main.c | 39 +- + drivers/staging/mei/mei_dev.h | 123 +- + drivers/staging/mei/wd.c | 18 +- + drivers/staging/msm/Kconfig | 124 - + drivers/staging/msm/Makefile | 88 - + drivers/staging/msm/TODO | 3 - + drivers/staging/msm/ebi2_l2f.c | 569 - + drivers/staging/msm/ebi2_lcd.c | 250 - + drivers/staging/msm/ebi2_tmd20.c | 1122 -- + drivers/staging/msm/hdmi_sii9022.c | 248 - + drivers/staging/msm/lcdc.c | 239 - + drivers/staging/msm/lcdc_external.c | 54 - + drivers/staging/msm/lcdc_gordon.c | 446 - + drivers/staging/msm/lcdc_panel.c | 88 - + drivers/staging/msm/lcdc_prism.c | 64 - + drivers/staging/msm/lcdc_sharp_wvga_pt.c | 290 - + drivers/staging/msm/lcdc_st15.c | 237 - + drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 374 - + drivers/staging/msm/logo.c | 98 - + drivers/staging/msm/mddi.c | 375 - + drivers/staging/msm/mddi_ext.c | 320 - + drivers/staging/msm/mddi_ext_lcd.c | 91 - + drivers/staging/msm/mddi_prism.c | 114 - + drivers/staging/msm/mddi_sharp.c | 892 -- + drivers/staging/msm/mddi_toshiba.c | 1741 --- + drivers/staging/msm/mddi_toshiba.h | 36 - + drivers/staging/msm/mddi_toshiba_vga.c | 136 - + drivers/staging/msm/mddi_toshiba_wvga_pt.c | 64 - + drivers/staging/msm/mddihost.c | 377 - + drivers/staging/msm/mddihost.h | 207 - + drivers/staging/msm/mddihost_e.c | 63 - + drivers/staging/msm/mddihosti.c | 2239 ---- + drivers/staging/msm/mddihosti.h | 531 - + drivers/staging/msm/mdp.c | 1113 -- + drivers/staging/msm/mdp.h | 679 - + drivers/staging/msm/mdp4.h | 336 - + drivers/staging/msm/mdp4_debugfs.c | 175 - + drivers/staging/msm/mdp4_overlay.c | 1259 -- + drivers/staging/msm/mdp4_overlay_lcdc.c | 313 - + drivers/staging/msm/mdp4_overlay_mddi.c | 254 - + drivers/staging/msm/mdp4_util.c | 1686 --- + drivers/staging/msm/mdp_cursor.c | 104 - + drivers/staging/msm/mdp_dma.c | 561 - + drivers/staging/msm/mdp_dma_lcdc.c | 379 - + drivers/staging/msm/mdp_dma_s.c | 139 - + drivers/staging/msm/mdp_dma_tv.c | 142 - + drivers/staging/msm/mdp_hw_init.c | 720 -- + drivers/staging/msm/mdp_ppp.c | 1502 --- + drivers/staging/msm/mdp_ppp_dq.c | 347 - + drivers/staging/msm/mdp_ppp_dq.h | 69 - + drivers/staging/msm/mdp_ppp_v20.c | 2486 ---- + drivers/staging/msm/mdp_ppp_v31.c | 828 -- + drivers/staging/msm/mdp_vsync.c | 389 - + drivers/staging/msm/memory.c | 214 - + drivers/staging/msm/memory_ll.h | 61 - + drivers/staging/msm/msm_fb.c | 2354 ---- + drivers/staging/msm/msm_fb.h | 158 - + drivers/staging/msm/msm_fb_bl.c | 79 - + drivers/staging/msm/msm_fb_def.h | 181 - + drivers/staging/msm/msm_fb_panel.c | 136 - + drivers/staging/msm/msm_fb_panel.h | 129 - + drivers/staging/msm/msm_mdp.h | 245 - + drivers/staging/msm/staging-devices.c | 312 - + drivers/staging/msm/tv_ntsc.c | 163 - + drivers/staging/msm/tv_pal.c | 213 - + drivers/staging/msm/tvenc.c | 296 - + drivers/staging/msm/tvenc.h | 101 - + drivers/staging/octeon/ethernet-mdio.c | 27 +- + drivers/staging/octeon/ethernet-rgmii.c | 33 +- + drivers/staging/octeon/ethernet-rx.c | 24 +- + drivers/staging/octeon/ethernet-sgmii.c | 14 +- + drivers/staging/octeon/ethernet-tx.c | 11 +- + drivers/staging/octeon/ethernet-util.h | 4 - + drivers/staging/octeon/ethernet-xaui.c | 22 +- + drivers/staging/panel/panel.c | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 - + .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 1 - + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 1 - + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 1 - + .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 1 - + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 1 - + .../rtl8187se/ieee80211/ieee80211_softmac.c | 8 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192e/dot11d.h | 23 +- + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 - + .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 1 - + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 1 - + .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 1 - + .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 1 - + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 1 - + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 1 - + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 3 +- + drivers/staging/rtl8192e/r8192E.h | 1 - + drivers/staging/rtl8192e/r8192E_core.c | 6 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 1 - + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 1 - + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 1 - + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 1 - + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 1 - + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 1 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 1 - + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 7 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192u/r8192U.h | 1 - + drivers/staging/rtl8192u/r8192U_core.c | 4 - + drivers/staging/rtl8712/ieee80211.h | 31 +- + drivers/staging/rtl8712/osdep_service.h | 6 +- + drivers/staging/rtl8712/rtl8712_hal.h | 2 +- + drivers/staging/rtl8712/wifi.h | 7 +- + drivers/staging/rts_pstor/ms.c | 3 +- + drivers/staging/rts_pstor/rtsx.h | 1 - + drivers/staging/rts_pstor/rtsx_chip.c | 6 +- + drivers/staging/rts_pstor/sd.c | 64 +- + drivers/staging/rts_pstor/sd.h | 5 + + drivers/staging/sep/sep_driver.c | 6 +- + drivers/staging/sep/sep_driver_config.h | 2 +- + drivers/staging/speakup/main.c | 1 - + drivers/staging/speakup/speakup.h | 1 - + drivers/staging/speakup/speakup_soft.c | 9 +- + drivers/staging/spectra/lld_nand.c | 18 +- + drivers/staging/ste_rmi4/Makefile | 1 + + .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c | 32 + + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 43 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 2 - + .../tidspbridge/include/dspbridge/host_os.h | 1 - + drivers/staging/tm6000/tm6000-alsa.c | 4 +- + drivers/staging/tm6000/tm6000-cards.c | 7 +- + drivers/staging/tm6000/tm6000-dvb.c | 10 +- + drivers/staging/tm6000/tm6000-i2c.c | 2 +- + drivers/staging/tm6000/tm6000-input.c | 3 +- + drivers/staging/tm6000/tm6000-video.c | 43 +- + drivers/staging/tm6000/tm6000.h | 3 +- + drivers/staging/tty/Kconfig | 87 - + drivers/staging/tty/Makefile | 7 - + drivers/staging/tty/TODO | 6 - + drivers/staging/tty/cd1865.h | 263 - + drivers/staging/tty/digi1.h | 100 - + drivers/staging/tty/digiFep1.h | 136 - + drivers/staging/tty/digiPCI.h | 42 - + drivers/staging/tty/epca.c | 2784 ----- + drivers/staging/tty/epca.h | 158 - + drivers/staging/tty/epcaconfig.h | 7 - + drivers/staging/tty/ip2/Makefile | 8 - + drivers/staging/tty/ip2/i2cmd.c | 210 - + drivers/staging/tty/ip2/i2cmd.h | 630 - + drivers/staging/tty/ip2/i2ellis.c | 1403 --- + drivers/staging/tty/ip2/i2ellis.h | 566 - + drivers/staging/tty/ip2/i2hw.h | 652 - + drivers/staging/tty/ip2/i2lib.c | 2214 ---- + drivers/staging/tty/ip2/i2lib.h | 351 - + drivers/staging/tty/ip2/i2pack.h | 364 - + drivers/staging/tty/ip2/ip2.h | 107 - + drivers/staging/tty/ip2/ip2ioctl.h | 35 - + drivers/staging/tty/ip2/ip2main.c | 3234 ----- + drivers/staging/tty/ip2/ip2trace.h | 42 - + drivers/staging/tty/ip2/ip2types.h | 57 - + drivers/staging/tty/istallion.c | 4507 ------- + drivers/staging/tty/riscom8.c | 1560 --- + drivers/staging/tty/riscom8.h | 91 - + drivers/staging/tty/riscom8_reg.h | 254 - + drivers/staging/tty/serial167.c | 2489 ---- + drivers/staging/tty/specialix.c | 2368 ---- + drivers/staging/tty/specialix_io8.h | 140 - + drivers/staging/tty/stallion.c | 4651 ------- + drivers/staging/usbip/README | 1 + + drivers/staging/usbip/stub.h | 4 +- + drivers/staging/usbip/stub_dev.c | 55 +- + drivers/staging/usbip/stub_main.c | 193 +- + drivers/staging/usbip/stub_rx.c | 6 +- + drivers/staging/usbip/stub_tx.c | 15 +- + drivers/staging/usbip/usbip_common.c | 35 +- + drivers/staging/usbip/usbip_common.h | 238 +- + drivers/staging/usbip/userspace/AUTHORS | 1 + + drivers/staging/usbip/userspace/Makefile.am | 9 +- + drivers/staging/usbip/userspace/README | 298 +- + drivers/staging/usbip/userspace/cleanup.sh | 10 +- + drivers/staging/usbip/userspace/configure.ac | 26 +- + drivers/staging/usbip/userspace/libsrc/Makefile.am | 8 +- + .../staging/usbip/userspace/libsrc/stub_driver.c | 391 - + .../staging/usbip/userspace/libsrc/stub_driver.h | 36 - + drivers/staging/usbip/userspace/libsrc/usbip.h | 19 - + .../staging/usbip/userspace/libsrc/usbip_common.c | 28 +- + .../staging/usbip/userspace/libsrc/usbip_common.h | 138 +- + .../usbip/userspace/libsrc/usbip_host_driver.c | 401 + + .../usbip/userspace/libsrc/usbip_host_driver.h | 48 + + .../staging/usbip/userspace/libsrc/vhci_driver.c | 167 +- + .../staging/usbip/userspace/libsrc/vhci_driver.h | 32 +- + drivers/staging/usbip/userspace/src/Makefile.am | 17 +- + drivers/staging/usbip/userspace/src/bind-driver.c | 643 - + drivers/staging/usbip/userspace/src/usbip.c | 817 +- + drivers/staging/usbip/userspace/src/usbip.h | 39 + + drivers/staging/usbip/userspace/src/usbip_attach.c | 228 + + drivers/staging/usbip/userspace/src/usbip_bind.c | 277 + + drivers/staging/usbip/userspace/src/usbip_detach.c | 103 + + drivers/staging/usbip/userspace/src/usbip_list.c | 303 + + .../staging/usbip/userspace/src/usbip_network.c | 198 +- + .../staging/usbip/userspace/src/usbip_network.h | 94 +- + drivers/staging/usbip/userspace/src/usbip_unbind.c | 186 + + drivers/staging/usbip/userspace/src/usbipd.c | 705 +- + drivers/staging/usbip/userspace/src/utils.c | 283 +- + drivers/staging/usbip/userspace/src/utils.h | 55 +- + drivers/staging/usbip/userspace/usb.ids |13209 -------------------- + drivers/staging/usbip/vhci.h | 11 +- + drivers/staging/usbip/vhci_hcd.c | 59 +- + drivers/staging/usbip/vhci_rx.c | 2 - + drivers/staging/usbip/vhci_sysfs.c | 6 +- + drivers/staging/vme/boards/vme_vmivme7805.c | 4 +- + drivers/staging/vme/bridges/vme_ca91cx42.c | 19 +- + drivers/staging/vme/bridges/vme_tsi148.c | 2 +- + drivers/staging/vme/devices/vme_user.c | 53 +- + drivers/staging/vme/devices/vme_user.h | 6 + + drivers/staging/vme/vme.h | 2 +- + drivers/staging/westbridge/Kconfig | 53 - + drivers/staging/westbridge/TODO | 7 - + drivers/staging/westbridge/astoria/Kconfig | 9 - + drivers/staging/westbridge/astoria/Makefile | 11 - + drivers/staging/westbridge/astoria/api/Makefile | 14 - + .../staging/westbridge/astoria/api/src/cyasdma.c | 1107 -- + .../staging/westbridge/astoria/api/src/cyasintr.c | 143 - + .../westbridge/astoria/api/src/cyaslep2pep.c | 358 - + .../westbridge/astoria/api/src/cyaslowlevel.c | 1264 -- + .../staging/westbridge/astoria/api/src/cyasmisc.c | 3488 ------ + .../staging/westbridge/astoria/api/src/cyasmtp.c | 1136 -- + .../westbridge/astoria/api/src/cyasstorage.c | 4125 ------ + .../staging/westbridge/astoria/api/src/cyasusb.c | 3740 ------ + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 2441 ---- + .../plat-omap/include/mach/westbridge/cyashaldef.h | 55 - + .../cyashalomap_kernel.h | 319 - + .../westbridge-omap3-pnand-hal/cyasmemmap.h | 558 - + .../cyasomapdev_kernel.h | 72 - + drivers/staging/westbridge/astoria/block/Kconfig | 9 - + drivers/staging/westbridge/astoria/block/Makefile | 11 - + .../westbridge/astoria/block/cyasblkdev_block.c | 1631 --- + .../westbridge/astoria/block/cyasblkdev_queue.c | 417 - + .../westbridge/astoria/block/cyasblkdev_queue.h | 64 - + drivers/staging/westbridge/astoria/device/Kconfig | 9 - + drivers/staging/westbridge/astoria/device/Makefile | 23 - + .../staging/westbridge/astoria/device/cyasdevice.c | 409 - + drivers/staging/westbridge/astoria/gadget/Kconfig | 9 - + drivers/staging/westbridge/astoria/gadget/Makefile | 11 - + .../staging/westbridge/astoria/gadget/cyasgadget.c | 2177 ---- + .../staging/westbridge/astoria/gadget/cyasgadget.h | 193 - + .../westbridge/astoria/gadget/cyasgadget_ioctl.h | 99 - + .../astoria/include/linux/westbridge/cyanerr.h | 418 - + .../astoria/include/linux/westbridge/cyanmedia.h | 59 - + .../astoria/include/linux/westbridge/cyanmisc.h | 614 - + .../astoria/include/linux/westbridge/cyanregs.h | 180 - + .../include/linux/westbridge/cyansdkversion.h | 30 - + .../astoria/include/linux/westbridge/cyanstorage.h | 419 - + .../astoria/include/linux/westbridge/cyantioch.h | 35 - + .../astoria/include/linux/westbridge/cyantypes.h | 31 - + .../astoria/include/linux/westbridge/cyanusb.h | 619 - + .../include/linux/westbridge/cyas_cplus_end.h | 11 - + .../include/linux/westbridge/cyas_cplus_start.h | 11 - + .../astoria/include/linux/westbridge/cyascast.h | 35 - + .../astoria/include/linux/westbridge/cyasdevice.h | 1057 -- + .../astoria/include/linux/westbridge/cyasdma.h | 375 - + .../astoria/include/linux/westbridge/cyaserr.h | 1094 -- + .../astoria/include/linux/westbridge/cyashal.h | 108 - + .../astoria/include/linux/westbridge/cyashalcb.h | 44 - + .../astoria/include/linux/westbridge/cyashaldoc.h | 800 -- + .../astoria/include/linux/westbridge/cyasintr.h | 104 - + .../astoria/include/linux/westbridge/cyaslep2pep.h | 36 - + .../include/linux/westbridge/cyaslowlevel.h | 366 - + .../astoria/include/linux/westbridge/cyasmedia.h | 54 - + .../astoria/include/linux/westbridge/cyasmisc.h | 1549 --- + .../include/linux/westbridge/cyasmisc_dep.h | 53 - + .../astoria/include/linux/westbridge/cyasmtp.h | 646 - + .../include/linux/westbridge/cyasprotocol.h | 3838 ------ + .../astoria/include/linux/westbridge/cyasregs.h | 201 - + .../astoria/include/linux/westbridge/cyasstorage.h | 2759 ---- + .../include/linux/westbridge/cyasstorage_dep.h | 309 - + .../astoria/include/linux/westbridge/cyastoria.h | 36 - + .../include/linux/westbridge/cyastsdkversion.h | 30 - + .../astoria/include/linux/westbridge/cyastypes.h | 71 - + .../astoria/include/linux/westbridge/cyasusb.h | 1862 --- + .../astoria/include/linux/westbridge/cyasusb_dep.h | 224 - + drivers/staging/winbond/phy_calibration.c | 462 +- + drivers/staging/wlags49_h2/wl_internal.h | 1 - + drivers/staging/wlags49_h2/wl_version.h | 1 - + drivers/staging/wlan-ng/prism2fw.c | 4 +- + drivers/staging/wlan-ng/prism2sta.c | 1 - + drivers/staging/xgifb/XGI_main_26.c | 1 - + drivers/staging/xgifb/vb_ext.c | 1 - + drivers/staging/xgifb/vb_init.c | 1 - + drivers/staging/xgifb/vb_setmode.c | 1 - + drivers/staging/zcache/tmem.c | 100 +- + drivers/staging/zcache/tmem.h | 23 +- + drivers/staging/zcache/zcache.c | 517 +- + drivers/staging/zram/zram_drv.c | 457 +- + drivers/staging/zram/zram_drv.h | 9 +- + drivers/usb/storage/Kconfig | 4 +- + drivers/usb/storage/ene_ub6250.c | 2003 +++- + 797 files changed, 49663 insertions(+), 188040 deletions(-) + delete mode 100644 drivers/staging/brcm80211/brcmfmac/README + delete mode 100644 drivers/staging/brcm80211/brcmfmac/aiutils.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmcdc.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdbus.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhdioctl.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dngl_stats.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_cons.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/msgtrace.h + create mode 100644 drivers/staging/brcm80211/brcmfmac/sdio_host.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/sdioh.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/sdiovar.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/wl_iw.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/wl_iw.h + rename drivers/staging/brcm80211/brcmsmac/{wlc_alloc.c => alloc.c} (51%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_alloc.h => alloc.h} (83%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_ampdu.c => ampdu.c} (77%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_types.h => ampdu.h} (56%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_antsel.c => antsel.c} (73%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_antsel.h => antsel.h} (67%) + delete mode 100644 drivers/staging/brcm80211/brcmsmac/bcmotp.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/bcmsrom.c + rename drivers/staging/brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} (73%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/bmac.h + rename drivers/staging/brcm80211/brcmsmac/{wlc_channel.c => channel.c} (69%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_channel.h => channel.h} (57%) + rename drivers/staging/brcm80211/brcmsmac/{hnddma.c => dma.c} (70%) + rename drivers/staging/brcm80211/{include/hnddma.h => brcmsmac/dma.h} (61%) + rename drivers/staging/brcm80211/brcmsmac/{wl_mac80211.c => mac80211_if.c} (67%) + rename drivers/staging/brcm80211/brcmsmac/{wl_mac80211.h => mac80211_if.h} (50%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_main.c => main.c} (56%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_main.h => main.h} (52%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/nicpci.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/nvram.c + create mode 100644 drivers/staging/brcm80211/brcmsmac/otp.c + rename drivers/staging/brcm80211/{include/bcmotp.h => brcmsmac/otp.h} (85%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} (78%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_int.h => phy_int.h} (66%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} (89%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} (94%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_n.c => phy_n.c} (97%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.c => phy_qmath.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.h => phy_qmath.h} (91%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_radio.h => phy_radio.h} (99%) + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/phy_version.h + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phyreg_n.h => phyreg_n.h} (96%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} (96%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} (50%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.c => phytbl_n.c} (99%) + rename drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.h => phytbl_n.h} (67%) + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h + create mode 100644 drivers/staging/brcm80211/brcmsmac/phy_shim.c + create mode 100644 drivers/staging/brcm80211/brcmsmac/phy_shim.h + create mode 100644 drivers/staging/brcm80211/brcmsmac/pmu.c + rename drivers/staging/brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} (53%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_pub.h => pub.h} (58%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_rate.c => rate.c} (76%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_rate.h => rate.h} (70%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_scb.h => scb.h} (84%) + rename drivers/staging/brcm80211/brcmsmac/{bcmsrom_tbl.h => srom.c} (54%) + rename drivers/staging/brcm80211/{include/bcmsrom.h => brcmsmac/srom.h} (82%) + rename drivers/staging/brcm80211/brcmsmac/{wlc_stf.c => stf.c} (70%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/stf.h + create mode 100644 drivers/staging/brcm80211/brcmsmac/types.h + rename drivers/staging/brcm80211/brcmsmac/{wl_ucode_loader.c => ucode_loader.c} (50%) + rename drivers/staging/brcm80211/brcmsmac/{wl_ucode.h => ucode_loader.h} (78%) + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_dbg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_export.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bmac.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_cfg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_key.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_pmu.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_stf.h + rename drivers/staging/brcm80211/{util => brcmutil}/Makefile (94%) + rename drivers/staging/brcm80211/{util/bcmutils.c => brcmutil/utils.c} (82%) + rename drivers/staging/brcm80211/{util/bcmwifi.c => brcmutil/wifi.c} (91%) + delete mode 100644 drivers/staging/brcm80211/include/aidmp.h + delete mode 100644 drivers/staging/brcm80211/include/bcmdefs.h + delete mode 100644 drivers/staging/brcm80211/include/bcmdevs.h + delete mode 100644 drivers/staging/brcm80211/include/bcmnvram.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsdh.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsdpcm.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsrom_fmt.h + delete mode 100644 drivers/staging/brcm80211/include/bcmutils.h + create mode 100644 drivers/staging/brcm80211/include/brcm_hw_ids.h + create mode 100644 drivers/staging/brcm80211/include/brcmu_utils.h + rename drivers/staging/brcm80211/include/{bcmwifi.h => brcmu_wifi.h} (65%) + create mode 100644 drivers/staging/brcm80211/include/chipcommon.h + create mode 100644 drivers/staging/brcm80211/include/defs.h + delete mode 100644 drivers/staging/brcm80211/include/hndsoc.h + delete mode 100644 drivers/staging/brcm80211/include/nicpci.h + delete mode 100644 drivers/staging/brcm80211/include/pci_core.h + delete mode 100644 drivers/staging/brcm80211/include/pcicfg.h + delete mode 100644 drivers/staging/brcm80211/include/pcie_core.h + delete mode 100644 drivers/staging/brcm80211/include/proto/802.11.h + delete mode 100644 drivers/staging/brcm80211/include/proto/bcmeth.h + delete mode 100644 drivers/staging/brcm80211/include/proto/bcmevent.h + delete mode 100644 drivers/staging/brcm80211/include/sbchipc.h + delete mode 100644 drivers/staging/brcm80211/include/sbconfig.h + delete mode 100644 drivers/staging/brcm80211/include/sbhnddma.h + delete mode 100644 drivers/staging/brcm80211/include/sbsdio.h + delete mode 100644 drivers/staging/brcm80211/include/sbsdpcmdev.h + delete mode 100644 drivers/staging/brcm80211/include/sdio.h + create mode 100644 drivers/staging/brcm80211/include/soc.h + delete mode 100644 drivers/staging/brcm80211/include/wlioctl.h + create mode 100644 drivers/staging/comedi/drivers/dyna_pci10xx.c + delete mode 100644 drivers/staging/cs5535_gpio/Kconfig + delete mode 100644 drivers/staging/cs5535_gpio/Makefile + delete mode 100644 drivers/staging/cs5535_gpio/TODO + delete mode 100644 drivers/staging/cs5535_gpio/cs5535_gpio.c + delete mode 100644 drivers/staging/easycap/easycap_sound_oss.c + delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.conf + delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h + create mode 100644 drivers/staging/ft1000/ft1000.h + delete mode 100644 drivers/staging/generic_serial/Kconfig + delete mode 100644 drivers/staging/generic_serial/Makefile + delete mode 100644 drivers/staging/generic_serial/TODO + delete mode 100644 drivers/staging/generic_serial/generic_serial.c + delete mode 100644 drivers/staging/generic_serial/rio/Makefile + delete mode 100644 drivers/staging/generic_serial/rio/board.h + delete mode 100644 drivers/staging/generic_serial/rio/cirrus.h + delete mode 100644 drivers/staging/generic_serial/rio/cmdblk.h + delete mode 100644 drivers/staging/generic_serial/rio/cmdpkt.h + delete mode 100644 drivers/staging/generic_serial/rio/daemon.h + delete mode 100644 drivers/staging/generic_serial/rio/errors.h + delete mode 100644 drivers/staging/generic_serial/rio/func.h + delete mode 100644 drivers/staging/generic_serial/rio/host.h + delete mode 100644 drivers/staging/generic_serial/rio/link.h + delete mode 100644 drivers/staging/generic_serial/rio/linux_compat.h + delete mode 100644 drivers/staging/generic_serial/rio/map.h + delete mode 100644 drivers/staging/generic_serial/rio/param.h + delete mode 100644 drivers/staging/generic_serial/rio/parmmap.h + delete mode 100644 drivers/staging/generic_serial/rio/pci.h + delete mode 100644 drivers/staging/generic_serial/rio/phb.h + delete mode 100644 drivers/staging/generic_serial/rio/pkt.h + delete mode 100644 drivers/staging/generic_serial/rio/port.h + delete mode 100644 drivers/staging/generic_serial/rio/protsts.h + delete mode 100644 drivers/staging/generic_serial/rio/rio.h + delete mode 100644 drivers/staging/generic_serial/rio/rio_linux.c + delete mode 100644 drivers/staging/generic_serial/rio/rio_linux.h + delete mode 100644 drivers/staging/generic_serial/rio/rioboard.h + delete mode 100644 drivers/staging/generic_serial/rio/rioboot.c + delete mode 100644 drivers/staging/generic_serial/rio/riocmd.c + delete mode 100644 drivers/staging/generic_serial/rio/rioctrl.c + delete mode 100644 drivers/staging/generic_serial/rio/riodrvr.h + delete mode 100644 drivers/staging/generic_serial/rio/rioinfo.h + delete mode 100644 drivers/staging/generic_serial/rio/rioinit.c + delete mode 100644 drivers/staging/generic_serial/rio/riointr.c + delete mode 100644 drivers/staging/generic_serial/rio/rioioctl.h + delete mode 100644 drivers/staging/generic_serial/rio/rioparam.c + delete mode 100644 drivers/staging/generic_serial/rio/rioroute.c + delete mode 100644 drivers/staging/generic_serial/rio/riospace.h + delete mode 100644 drivers/staging/generic_serial/rio/riotable.c + delete mode 100644 drivers/staging/generic_serial/rio/riotty.c + delete mode 100644 drivers/staging/generic_serial/rio/route.h + delete mode 100644 drivers/staging/generic_serial/rio/rup.h + delete mode 100644 drivers/staging/generic_serial/rio/unixrup.h + delete mode 100644 drivers/staging/generic_serial/ser_a2232.c + delete mode 100644 drivers/staging/generic_serial/ser_a2232.h + delete mode 100644 drivers/staging/generic_serial/ser_a2232fw.ax + delete mode 100644 drivers/staging/generic_serial/ser_a2232fw.h + delete mode 100644 drivers/staging/generic_serial/sx.c + delete mode 100644 drivers/staging/generic_serial/sx.h + delete mode 100644 drivers/staging/generic_serial/sxboards.h + delete mode 100644 drivers/staging/generic_serial/sxwindow.h + delete mode 100644 drivers/staging/generic_serial/vme_scc.c + rename drivers/staging/gma500/{psb_2d.c => accel_2d.c} (61%) + create mode 100644 drivers/staging/gma500/backlight.c + create mode 100644 drivers/staging/gma500/cdv_device.c + create mode 100644 drivers/staging/gma500/cdv_device.h + create mode 100644 drivers/staging/gma500/cdv_intel_crt.c + create mode 100644 drivers/staging/gma500/cdv_intel_display.c + create mode 100644 drivers/staging/gma500/cdv_intel_hdmi.c + create mode 100644 drivers/staging/gma500/cdv_intel_lvds.c + create mode 100644 drivers/staging/gma500/displays/hdmi.h + create mode 100644 drivers/staging/gma500/displays/pyr_cmd.h + create mode 100644 drivers/staging/gma500/displays/pyr_vid.h + create mode 100644 drivers/staging/gma500/displays/tmd_cmd.h + create mode 100644 drivers/staging/gma500/displays/tmd_vid.h + create mode 100644 drivers/staging/gma500/displays/tpo_cmd.h + create mode 100644 drivers/staging/gma500/displays/tpo_vid.h + rename drivers/staging/gma500/{psb_fb.c => framebuffer.c} (67%) + rename drivers/staging/gma500/{psb_fb.h => framebuffer.h} (86%) + rename drivers/staging/gma500/{psb_gem.c => gem.c} (69%) + create mode 100644 drivers/staging/gma500/gem_glue.c + create mode 100644 drivers/staging/gma500/gem_glue.h + rename drivers/staging/gma500/{psb_gtt.c => gtt.c} (69%) + rename drivers/staging/gma500/{psb_gtt.h => gtt.h} (85%) + rename drivers/staging/gma500/{psb_intel_bios.c => intel_bios.c} (95%) + rename drivers/staging/gma500/{psb_intel_bios.h => intel_bios.h} (100%) + rename drivers/staging/gma500/{psb_intel_i2c.c => intel_i2c.c} (100%) + rename drivers/staging/gma500/{psb_intel_opregion.c => intel_opregion.c} (79%) + create mode 100644 drivers/staging/gma500/mdfld_device.c + create mode 100644 drivers/staging/gma500/mdfld_dsi_dbi.c + create mode 100644 drivers/staging/gma500/mdfld_dsi_dbi.h + create mode 100644 drivers/staging/gma500/mdfld_dsi_dbi_dpu.c + create mode 100644 drivers/staging/gma500/mdfld_dsi_dbi_dpu.h + create mode 100644 drivers/staging/gma500/mdfld_dsi_dpi.c + create mode 100644 drivers/staging/gma500/mdfld_dsi_dpi.h + create mode 100644 drivers/staging/gma500/mdfld_dsi_output.c + create mode 100644 drivers/staging/gma500/mdfld_dsi_output.h + create mode 100644 drivers/staging/gma500/mdfld_dsi_pkg_sender.c + create mode 100644 drivers/staging/gma500/mdfld_dsi_pkg_sender.h + create mode 100644 drivers/staging/gma500/mdfld_intel_display.c + create mode 100644 drivers/staging/gma500/mdfld_msic.h + create mode 100644 drivers/staging/gma500/mdfld_output.c + create mode 100644 drivers/staging/gma500/mdfld_output.h + create mode 100644 drivers/staging/gma500/mdfld_pyr_cmd.c + create mode 100644 drivers/staging/gma500/mdfld_tmd_vid.c + create mode 100644 drivers/staging/gma500/mdfld_tpo_cmd.c + create mode 100644 drivers/staging/gma500/mdfld_tpo_vid.c + create mode 100644 drivers/staging/gma500/medfield.h + create mode 100644 drivers/staging/gma500/mid_bios.c + create mode 100644 drivers/staging/gma500/mid_bios.h + rename drivers/staging/gma500/{psb_mmu.c => mmu.c} (100%) + create mode 100644 drivers/staging/gma500/mrst_device.c + create mode 100644 drivers/staging/gma500/mrst_hdmi.c + create mode 100644 drivers/staging/gma500/mrst_hdmi_i2c.c + rename drivers/staging/gma500/{psb_powermgmt.c => power.c} (59%) + rename drivers/staging/gma500/{psb_powermgmt.h => power.h} (94%) + delete mode 100644 drivers/staging/gma500/psb_bl.c + create mode 100644 drivers/staging/gma500/psb_device.c + create mode 100644 drivers/staging/iio/adc/ad7793.c + create mode 100644 drivers/staging/iio/adc/ad7793.h + create mode 100644 drivers/staging/iio/dac/ad5686.c + create mode 100644 drivers/staging/iio/resolver/ad2s1210.h + delete mode 100644 drivers/staging/keucr/ms.c + delete mode 100644 drivers/staging/keucr/ms.h + delete mode 100644 drivers/staging/keucr/msscsi.c + delete mode 100644 drivers/staging/msm/Kconfig + delete mode 100644 drivers/staging/msm/Makefile + delete mode 100644 drivers/staging/msm/TODO + delete mode 100644 drivers/staging/msm/ebi2_l2f.c + delete mode 100644 drivers/staging/msm/ebi2_lcd.c + delete mode 100644 drivers/staging/msm/ebi2_tmd20.c + delete mode 100644 drivers/staging/msm/hdmi_sii9022.c + delete mode 100644 drivers/staging/msm/lcdc.c + delete mode 100644 drivers/staging/msm/lcdc_external.c + delete mode 100644 drivers/staging/msm/lcdc_gordon.c + delete mode 100644 drivers/staging/msm/lcdc_panel.c + delete mode 100644 drivers/staging/msm/lcdc_prism.c + delete mode 100644 drivers/staging/msm/lcdc_sharp_wvga_pt.c + delete mode 100644 drivers/staging/msm/lcdc_st15.c + delete mode 100644 drivers/staging/msm/lcdc_toshiba_wvga_pt.c + delete mode 100644 drivers/staging/msm/logo.c + delete mode 100644 drivers/staging/msm/mddi.c + delete mode 100644 drivers/staging/msm/mddi_ext.c + delete mode 100644 drivers/staging/msm/mddi_ext_lcd.c + delete mode 100644 drivers/staging/msm/mddi_prism.c + delete mode 100644 drivers/staging/msm/mddi_sharp.c + delete mode 100644 drivers/staging/msm/mddi_toshiba.c + delete mode 100644 drivers/staging/msm/mddi_toshiba.h + delete mode 100644 drivers/staging/msm/mddi_toshiba_vga.c + delete mode 100644 drivers/staging/msm/mddi_toshiba_wvga_pt.c + delete mode 100644 drivers/staging/msm/mddihost.c + delete mode 100644 drivers/staging/msm/mddihost.h + delete mode 100644 drivers/staging/msm/mddihost_e.c + delete mode 100644 drivers/staging/msm/mddihosti.c + delete mode 100644 drivers/staging/msm/mddihosti.h + delete mode 100644 drivers/staging/msm/mdp.c + delete mode 100644 drivers/staging/msm/mdp.h + delete mode 100644 drivers/staging/msm/mdp4.h + delete mode 100644 drivers/staging/msm/mdp4_debugfs.c + delete mode 100644 drivers/staging/msm/mdp4_overlay.c + delete mode 100644 drivers/staging/msm/mdp4_overlay_lcdc.c + delete mode 100644 drivers/staging/msm/mdp4_overlay_mddi.c + delete mode 100644 drivers/staging/msm/mdp4_util.c + delete mode 100644 drivers/staging/msm/mdp_cursor.c + delete mode 100644 drivers/staging/msm/mdp_dma.c + delete mode 100644 drivers/staging/msm/mdp_dma_lcdc.c + delete mode 100644 drivers/staging/msm/mdp_dma_s.c + delete mode 100644 drivers/staging/msm/mdp_dma_tv.c + delete mode 100644 drivers/staging/msm/mdp_hw_init.c + delete mode 100644 drivers/staging/msm/mdp_ppp.c + delete mode 100644 drivers/staging/msm/mdp_ppp_dq.c + delete mode 100644 drivers/staging/msm/mdp_ppp_dq.h + delete mode 100644 drivers/staging/msm/mdp_ppp_v20.c + delete mode 100644 drivers/staging/msm/mdp_ppp_v31.c + delete mode 100644 drivers/staging/msm/mdp_vsync.c + delete mode 100644 drivers/staging/msm/memory.c + delete mode 100644 drivers/staging/msm/memory_ll.h + delete mode 100644 drivers/staging/msm/msm_fb.c + delete mode 100644 drivers/staging/msm/msm_fb.h + delete mode 100644 drivers/staging/msm/msm_fb_bl.c + delete mode 100644 drivers/staging/msm/msm_fb_def.h + delete mode 100644 drivers/staging/msm/msm_fb_panel.c + delete mode 100644 drivers/staging/msm/msm_fb_panel.h + delete mode 100644 drivers/staging/msm/msm_mdp.h + delete mode 100644 drivers/staging/msm/staging-devices.c + delete mode 100644 drivers/staging/msm/tv_ntsc.c + delete mode 100644 drivers/staging/msm/tv_pal.c + delete mode 100644 drivers/staging/msm/tvenc.c + delete mode 100644 drivers/staging/msm/tvenc.h + create mode 100644 drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c + delete mode 100644 drivers/staging/tty/Kconfig + delete mode 100644 drivers/staging/tty/Makefile + delete mode 100644 drivers/staging/tty/TODO + delete mode 100644 drivers/staging/tty/cd1865.h + delete mode 100644 drivers/staging/tty/digi1.h + delete mode 100644 drivers/staging/tty/digiFep1.h + delete mode 100644 drivers/staging/tty/digiPCI.h + delete mode 100644 drivers/staging/tty/epca.c + delete mode 100644 drivers/staging/tty/epca.h + delete mode 100644 drivers/staging/tty/epcaconfig.h + delete mode 100644 drivers/staging/tty/ip2/Makefile + delete mode 100644 drivers/staging/tty/ip2/i2cmd.c + delete mode 100644 drivers/staging/tty/ip2/i2cmd.h + delete mode 100644 drivers/staging/tty/ip2/i2ellis.c + delete mode 100644 drivers/staging/tty/ip2/i2ellis.h + delete mode 100644 drivers/staging/tty/ip2/i2hw.h + delete mode 100644 drivers/staging/tty/ip2/i2lib.c + delete mode 100644 drivers/staging/tty/ip2/i2lib.h + delete mode 100644 drivers/staging/tty/ip2/i2pack.h + delete mode 100644 drivers/staging/tty/ip2/ip2.h + delete mode 100644 drivers/staging/tty/ip2/ip2ioctl.h + delete mode 100644 drivers/staging/tty/ip2/ip2main.c + delete mode 100644 drivers/staging/tty/ip2/ip2trace.h + delete mode 100644 drivers/staging/tty/ip2/ip2types.h + delete mode 100644 drivers/staging/tty/istallion.c + delete mode 100644 drivers/staging/tty/riscom8.c + delete mode 100644 drivers/staging/tty/riscom8.h + delete mode 100644 drivers/staging/tty/riscom8_reg.h + delete mode 100644 drivers/staging/tty/serial167.c + delete mode 100644 drivers/staging/tty/specialix.c + delete mode 100644 drivers/staging/tty/specialix_io8.h + delete mode 100644 drivers/staging/tty/stallion.c + delete mode 100644 drivers/staging/usbip/userspace/libsrc/stub_driver.c + delete mode 100644 drivers/staging/usbip/userspace/libsrc/stub_driver.h + delete mode 100644 drivers/staging/usbip/userspace/libsrc/usbip.h + create mode 100644 drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c + create mode 100644 drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h + delete mode 100644 drivers/staging/usbip/userspace/src/bind-driver.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip.h + create mode 100644 drivers/staging/usbip/userspace/src/usbip_attach.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_bind.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_detach.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_list.c + create mode 100644 drivers/staging/usbip/userspace/src/usbip_unbind.c + delete mode 100644 drivers/staging/usbip/userspace/usb.ids + delete mode 100644 drivers/staging/westbridge/Kconfig + delete mode 100644 drivers/staging/westbridge/TODO + delete mode 100644 drivers/staging/westbridge/astoria/Kconfig + delete mode 100644 drivers/staging/westbridge/astoria/Makefile + delete mode 100644 drivers/staging/westbridge/astoria/api/Makefile + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyasdma.c + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyasintr.c + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmisc.c + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmtp.c + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyasstorage.c + delete mode 100644 drivers/staging/westbridge/astoria/api/src/cyasusb.c + delete mode 100644 drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c + delete mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/cyashaldef.h + delete mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h + delete mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h + delete mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasomapdev_kernel.h + delete mode 100644 drivers/staging/westbridge/astoria/block/Kconfig + delete mode 100644 drivers/staging/westbridge/astoria/block/Makefile + delete mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_block.c + delete mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c + delete mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h + delete mode 100644 drivers/staging/westbridge/astoria/device/Kconfig + delete mode 100644 drivers/staging/westbridge/astoria/device/Makefile + delete mode 100644 drivers/staging/westbridge/astoria/device/cyasdevice.c + delete mode 100644 drivers/staging/westbridge/astoria/gadget/Kconfig + delete mode 100644 drivers/staging/westbridge/astoria/gadget/Makefile + delete mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.c + delete mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.h + delete mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget_ioctl.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanerr.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmedia.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmisc.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanregs.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyansdkversion.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanstorage.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantioch.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantypes.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanusb.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_end.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_start.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyascast.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashalcb.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslep2pep.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslowlevel.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmedia.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc_dep.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmtp.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasregs.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage_dep.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastoria.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastsdkversion.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastypes.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h + delete mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb_dep.h +$ git am -3 ../patches/0001-gma500-udelay-20000-it-too-long-again.patch +Applying: gma500: udelay(20000) it too long again +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/gma500/mrst_hdmi.c +$ git add . +$ git commit -v -a --amend +[master bd7dbb4] Merge remote-tracking branch 'staging/staging-next' +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging tmem/linux-next +$ git merge tmem/linux-next +Auto-merging include/linux/swap.h +Auto-merging mm/Kconfig +Auto-merging mm/swapfile.c +Merge made by recursive. + .../ABI/testing/sysfs-kernel-mm-frontswap | 16 + + Documentation/vm/frontswap.txt | 210 ++++++++++++ + include/linux/frontswap.h | 92 ++++++ + include/linux/swap.h | 2 + + include/linux/swapfile.h | 13 + + mm/Kconfig | 17 + + mm/Makefile | 1 + + mm/frontswap.c | 335 ++++++++++++++++++++ + mm/page_io.c | 12 + + mm/swapfile.c | 65 +++- + 10 files changed, 751 insertions(+), 12 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap + create mode 100644 Documentation/vm/frontswap.txt + create mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/swapfile.h + create mode 100644 mm/frontswap.c +Merging writeback/next +$ git merge writeback/next +Resolved 'fs/fs-writeback.c' using previous resolution. +Resolved 'mm/filemap.c' using previous resolution. +Auto-merging fs/block_dev.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/fs-writeback.c +CONFLICT (content): Merge conflict in fs/fs-writeback.c +Auto-merging fs/inode.c +Auto-merging fs/nfs/write.c +Auto-merging include/trace/events/ext4.h +Auto-merging mm/backing-dev.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging mm/rmap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f58905a] Merge remote-tracking branch 'writeback/next' +$ git diff -M --stat --summary HEAD^.. + fs/block_dev.c | 16 +- + fs/btrfs/extent_io.c | 2 - + fs/ext4/inode.c | 4 +- + fs/fs-writeback.c | 373 +++++++++++++++++++++----------------- + fs/inode.c | 5 +- + fs/nfs/write.c | 3 +- + include/linux/backing-dev.h | 8 + + include/linux/writeback.h | 55 +++++-- + include/trace/events/btrfs.h | 6 +- + include/trace/events/ext4.h | 6 +- + include/trace/events/writeback.h | 183 +++++++++++++++++-- + mm/backing-dev.c | 82 ++++++--- + mm/filemap.c | 6 +- + mm/page-writeback.c | 280 +++++++++++++++++++++++++---- + mm/rmap.c | 4 +- + 15 files changed, 747 insertions(+), 286 deletions(-) +Merging arm-dt/devicetree/arm-next +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm +From ../next + * [new branch] quilt/akpm -> akpm +$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base +From ../next + * [new branch] quilt/akpm-base -> akpm-base +$ git checkout akpm +Switched to branch 'akpm' +$ git rebase --onto master akpm-base +First, rewinding head to replay your work on top of it... +Applying: During allocator-intensive workloads, kswapd will be woken frequently +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: During allocator-intensive workloads, kswapd will be woken frequently +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Failed to merge in the changes. +Patch failed at 0002 During allocator-intensive workloads, kswapd will be woken frequently + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To restore the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --skip +HEAD is now at f58905a Merge remote-tracking branch 'writeback/next' +Applying: When deciding if kswapd is sleeping prematurely, the classzone is taken +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: During allocator-intensive workloads, kswapd will be woken frequently +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: __tlb_remove_page() switches to a new batch page, but still checks space +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: Now, in mem_cgroup_hierarchical_reclaim(), mem_cgroup_local_usage() is +Using index info to reconstruct a base tree... +:99: space before tab in indent. + * Check rest of nodes. +:100: space before tab in indent. + */ +:105: trailing whitespace. + return true; +warning: 3 lines add whitespace errors. +Falling back to patching base and 3-way merge... +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Failed to merge in the changes. +Patch failed at 0006 Now, in mem_cgroup_hierarchical_reclaim(), mem_cgroup_local_usage() is + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To restore the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --skip +HEAD is now at f58905a Merge remote-tracking branch 'writeback/next' +Applying: ERROR: code indent should use tabs where possible +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: fix kerneldoc layout +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: memcg-fix-reclaimable-lru-check-in-memcg.patch +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: commit 889976dbcb12 ("memcg: reclaim memory from nodes in round-robin +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Failed to merge in the changes. +Patch failed at 0010 commit 889976dbcb12 ("memcg: reclaim memory from nodes in round-robin + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To restore the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --skip +HEAD is now at f58905a Merge remote-tracking branch 'writeback/next' +Applying: attempt to repair code layout +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: Currently we are keeping faulted page locked throughout whole __do_fault +Applying: fix code layout +Applying: This fixes a regression in 3.0 reported by Paul Parsons regarding the +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging drivers/w1/masters/ds1wm.c +CONFLICT (content): Merge conflict in drivers/w1/masters/ds1wm.c +Failed to merge in the changes. +Patch failed at 0014 This fixes a regression in 3.0 reported by Paul Parsons regarding the + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To restore the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --skip +HEAD is now at 0b7addc fix code layout +Applying: ERROR: Invalid UTF-8, patch and commit message should be encoded in UTF-8 +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: remap_pfn_range() means map physical address pfn< +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: This driver handles the variants pca9530-pca9533, so it chose the name +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: Signed-off-by: Bjorn Helgaas +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: Prevent an arbitrary kernel read. Check the user pointer with access_ok() +Applying: s/EIO/EFAULT/ +Applying: The often-NULL data arg to read_cache_page() and read_mapping_page() +Applying: Correct comment on truncate_inode_pages*() in linux/mm.h; and remove +Applying: Use consistent variable names in truncate_pagecache(), truncate_setsize(), +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging mm/truncate.c +CONFLICT (content): Merge conflict in mm/truncate.c +Failed to merge in the changes. +Patch failed at 0024 Use consistent variable names in truncate_pagecache(), truncate_setsize(), + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To restore the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --continue +Applying: Use consistent variable names in truncate_pagecache(), truncate_setsize(), +Applying: Make the pagevec_lookup loops in truncate_inode_pages_range(), +Applying: truncate_inode_pages_range()'s final loop has a nice pincer property, +Applying: 2.6.36's 7e496299d4d2 ("tmpfs: make tmpfs scalable with percpu_counter for +Applying: If dmi_get_system_info() returns NULL, pch_phub_probe() will dereferencea +Applying: Vito said: +Applying: I came across a memory leak during a cyclic cpu-online-offline test. +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: kernel/fork.c:267: error: implicit declaration of function +Applying: WARNING: line over 80 characters +Applying: arch/cris/arch-v10/drivers/sync_serial.c:628: error: 'ret' undeclared (first use in this function) +Applying: arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_serial_ioctl' +Applying: arch/cris/arch-v10/kernel/irq.c:239: error: implicit declaration of function 'kgdb_init' +Applying: This reverts my commit a3d77411e8b2ad ("dell-laptop: Toggle the +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: There's a code path in pmcraid that can be reached via device ioctl that +Applying: The out_msi_disable label should be before cleanup_nomem to additionally +Applying: The parameter's origin type is long. On an i386 architecture, it can +Applying: kernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t' +Applying: It's about time to revert 16d752397301b9 ("thermal: Create +Applying: We'll soon need to reuse it. +Applying: THERMAL_HWMON is implemented inside the thermal_sys driver and has no +Applying: b552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of +Applying: Linux supports some optional features, but it should notify the BIOS about +Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error: +Applying: This makes the iris driver use the platform API, so it is properly exposed +Applying: - remove commented-out code +Applying: There was one code block that I commented to be able to test the patch dnd +Applying: With a non-constant 8-bit argument, a call to udelay() generates a warning: +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging arch/x86/include/asm/delay.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/delay.h +Failed to merge in the changes. +Patch failed at 0050 With a non-constant 8-bit argument, a call to udelay() generates a warning: + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To restore the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --skip +HEAD is now at b1d5d6a There was one code block that I commented to be able to test the patch dnd +Applying: On x86_32 casting the unsigned int result of get_random_int() to long may +Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new +Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic +Applying: In response to new device tree code in the kernel, OLPC will start using +Applying: Move these definitions into the relevant header file. This was requested +Applying: Based on earlier review comments, we'll no longer try to stick all of our +Applying: Add code needed for basic suspend/resume of the XO-1 laptop. Based on +Applying: The System Control Interrupt is used in the OLPC XO-1 to control various +Applying: Update the EC SCI masks with recent additions. +Applying: The EC in the OLPC XO-1 delivers GPE events to provide various +Applying: Configure the XO-1's lid switch GPIO to trigger an SCI interrupt, and +Applying: EC events indicate change in AC power connectivity, battery state of +Applying: Add a driver to configure the XO-1 RTC via CS5536 MSRs, to be used as a +Applying: Add a driver for the ACPI-based EC event interface found on the OLPC +Applying: Don't allow everybody to use a modem. +Applying: The address limit is already set in flush_old_exec() so this +Applying: A call to va_copy() should always be followed by a call to va_end() in the +Applying: Don't dereference em if it's NULL or an error pointer. +Applying: The buffer 'sc.cpu_mask' is a kernel buffer. If bitmap_parse is used +Applying: The address limit is already set in flush_old_exec() so this +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: fb_set_suspend() must be called with the console semaphore held, which +Applying: When 1280x1024@75Hz mode is set, console palette is not set properly - +Applying: Unless I'm very much missing something these tests are intended to check +Applying: The address limit is already set in flush_old_exec() so this +Applying: When IKCONFIG is built-in, make oldconfig will cause the kernel to be +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: The address limit is already set in flush_old_exec() so this +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: The address limit is already set in flush_old_exec() via set_fs(USER_DS) +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: The address limit is already set in flush_old_exec() so this +Applying: Mike McLagan hasn't contributed in many years and his email bounces. +Applying: Addresses https://bugzilla.kernel.org/show_bug.cgi?id=38862 +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging drivers/net/skge.c +CONFLICT (content): Merge conflict in drivers/net/skge.c +Failed to merge in the changes. +Patch failed at 0080 Addresses https://bugzilla.kernel.org/show_bug.cgi?id=38862 + +When you have resolved this problem run "git rebase --continue". +If you would prefer to skip this patch, instead run "git rebase --skip". +To restore the original branch and stop rebasing run "git rebase --abort". + +$ git rebase --skip +HEAD is now at 23b7ec4 Mike McLagan hasn't contributed in many years and his email bounces. +Applying: - Fix checking of wrong return value for backlight_device_register() +Applying: Add the ams369fg06 amoled panel driver. The ams369fg06 amoled panel (480 +Applying: backlight: make some varibales static +Applying: unregister backlight device when unloading the module +Applying: Fix section mismatch warning by adding the correct annotation __devinit +Applying: It's only used in ams369fg06.c, no need for it to be in the global namespace. +Applying: Since commit a19a6ee "backlight: Allow properties to be passed at +Applying: backlight_device_register() returns ERR_PTR() on error. +Applying: 1. current implementation tests wrong value for setting aat2870_bl->max_current. +Applying: i386 allmodconfig: +Applying: Not all systems expose a firmware or platform mechanism for changing the +Applying: The Apple MBP model 6.2 (and maybe other recent MBPs) uses an Apple +Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for +Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned, +Applying: The address limit is already set in flush_old_exec() so those calls to +Applying: When do pci remove/rescan on system that have more iommus, got +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merging drivers/iommu/dmar.c +Auto-merging drivers/iommu/intel-iommu.c +Applying: The current implementation of dmi_name_in_vendors() is an invitation to +Applying: When hot-plugging a root bridge, we always prevent assigning a bus number +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: fix comment layout +Applying: Aside of the usual motivation for constification, this function has a +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: The address limit is already set in flush_old_exec() so those calls to +Applying: For headers that get exported to userland and make use of u32 style +Applying: Fix sparse warnings of right shift bigger than source value size: +Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() : +Applying: brd_make_request() always returns 0, which doesn't make much sense. +Applying: Remove the (unsigned long long) cast in diskstats_show() and adjusts the +Applying: Fix the loopback device to emit a uevent on auto release. The loopback +Applying: The address limit is already set in flush_old_exec() so this assignment of +Applying: x86_64 allmodconfig: +Applying: x86_64 allmodconfig: +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Applying: alpha allmodconfig: +Applying: alpha allmodconfig: +Applying: alpha allmodconfig: +Applying: Cc: Greg KH +Applying: Use the nice enumerated constant. +Applying: There is no need to define VM_{STACK,DATA}_DEFAULT_FLAGS as variable. +Applying: The address limit is already set in flush_old_exec() so this +Applying: Both sys-i386 and sys-x86_64 support now ndelay(). The delay functions +Applying: When UML is compiled with _FORTIFY_SOURCE we have to export all _chk() +Applying: To make netconsole usable on UML, its ethernet driver needs netpoll +Applying: commit 0954828fcbf3bd13d593499b16b901a4e801b0b9 ("kconfig: replace +Applying: We presently define all kinds of notifiers in notifier.h. This is not +Applying: It is not necessary to share the same notifier.h. +Applying: It is not necessary to share the same notifier.h. +Applying: With this patch applied, make allyesconfig succeeds on ppc64. +Applying: It is not necessary to share the same notifier.h. +Applying: Cc: David Miller +Applying: It is not necessary to share the same notifier.h. +Applying: If CONFIG_IKCONFIG=m but CONFIG_IKCONFIG_PROC=n we get a module that has +Applying: For each CPU, do the calibration delay only once. For subsequent calls, +Applying: make cpu_loops_per_jiffy static +Applying: Cc: Andrew Worsley +Applying: prevent ARM build breakage :) +Applying: fix things up after upstream rmk changes +Applying: MPC5200B contains a limited version of RTC from MPC5121. Add support for +Applying: Add support for clock gating. Power consumption can be reduced by setting +Applying: Add support for PMIC8xxx based RTC. PMIC8xxx is Qualcomm's power +Applying: cosmetic tweaks +Applying: Signed-off-by: Anirudh Ghayal +Applying: We forget to save the return value of the call to +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm +From ../rebase-tmp + + 0c68923...99830b4 akpm -> akpm (forced update) +$ rm -rf ../rebase-tmp +Merging akpm +$ git merge --no-ff akpm +Removing arch/um/sys-x86_64/mem.c +Removing arch/x86/platform/olpc/olpc-xo1.c +Removing drivers/leds/leds-alix2.c +Merge made by recursive. + .../devicetree/bindings/rtc/olpc-xo1-rtc.txt | 5 + + Documentation/feature-removal-schedule.txt | 9 - + MAINTAINERS | 3 +- + arch/arm/include/asm/processor.h | 1 - + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/cris/arch-v10/drivers/sync_serial.c | 6 +- + arch/cris/arch-v10/kernel/irq.c | 3 + + arch/cris/include/asm/thread_info.h | 6 +- + arch/ia64/include/asm/processor.h | 1 - + arch/parisc/include/asm/processor.h | 2 - + arch/parisc/kernel/process.c | 1 - + arch/powerpc/kernel/rtas.c | 1 + + arch/powerpc/kernel/rtas_flash.c | 1 + + arch/s390/include/asm/processor.h | 2 - + arch/sparc/kernel/process_32.c | 3 +- + arch/sparc/kernel/process_64.c | 3 - + arch/um/Kconfig.x86 | 2 + + arch/um/drivers/net_kern.c | 12 + + arch/um/include/asm/delay.h | 10 +- + arch/um/kernel/exec.c | 1 - + arch/um/os-Linux/user_syms.c | 5 + + arch/um/sys-i386/delay.c | 59 ++- + arch/um/sys-x86_64/Makefile | 2 +- + arch/um/sys-x86_64/delay.c | 54 ++- + arch/um/sys-x86_64/mem.c | 16 - + arch/um/sys-x86_64/shared/sysdep/vm-flags.h | 26 +- + arch/unicore32/include/asm/processor.h | 1 - + arch/x86/Kconfig | 53 ++- + arch/x86/include/asm/olpc.h | 51 ++- + arch/x86/kernel/e820.c | 59 +-- + arch/x86/mm/mmap.c | 4 +- + arch/x86/platform/Makefile | 1 + + arch/x86/platform/geode/Makefile | 1 + + arch/x86/platform/geode/alix.c | 141 +++++ + arch/x86/platform/iris/iris.c | 67 ++- + arch/x86/platform/olpc/Makefile | 5 +- + arch/x86/platform/olpc/olpc-xo1-pm.c | 215 +++++++ + arch/x86/platform/olpc/olpc-xo1-rtc.c | 82 +++ + arch/x86/platform/olpc/olpc-xo1-sci.c | 614 +++++++++++++++++++ + arch/x86/platform/olpc/olpc-xo1.c | 146 ----- + arch/x86/platform/olpc/olpc-xo15-sci.c | 168 +++++ + arch/x86/platform/olpc/olpc.c | 95 +++ + arch/x86/platform/olpc/olpc_dt.c | 103 ++++ + arch/x86/platform/olpc/xo1-wakeup.S | 124 ++++ + arch/xtensa/kernel/ptrace.c | 3 + + block/genhd.c | 8 +- + drivers/acpi/osl.c | 8 +- + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_nl.c | 4 +- + drivers/block/loop.c | 2 +- + drivers/bluetooth/btusb.c | 3 + + drivers/firmware/dmi_scan.c | 6 +- + drivers/gpu/drm/i915/i915_drv.h | 4 + + drivers/gpu/drm/i915/intel_dp.c | 7 + + drivers/gpu/drm/i915/intel_drv.h | 3 +- + drivers/gpu/drm/i915/intel_lvds.c | 5 + + drivers/gpu/drm/i915/intel_opregion.c | 1 - + drivers/gpu/drm/i915/intel_panel.c | 72 +++- + drivers/iommu/dmar.c | 7 +- + drivers/iommu/intel-iommu.c | 177 ++++++- + drivers/leds/Kconfig | 8 - + drivers/leds/Makefile | 1 - + drivers/leds/leds-alix2.c | 239 -------- + drivers/misc/pch_phub.c | 5 +- + drivers/mmc/core/core.c | 1 + + drivers/pci/probe.c | 8 +- + drivers/platform/x86/acerhdf.c | 1 + + drivers/rtc/Kconfig | 14 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-mpc5121.c | 81 +++- + drivers/rtc/rtc-pm8xxx.c | 550 +++++++++++++++++ + drivers/rtc/rtc-s3c.c | 27 +- + drivers/rtc/rtc-twl.c | 2 +- + drivers/scsi/aacraid/commctrl.c | 1 + + drivers/scsi/ipr.c | 12 +- + drivers/scsi/megaraid.c | 8 +- + drivers/scsi/pmcraid.c | 3 + + drivers/staging/dt3155v4l/dt3155v4l.c | 1 + + drivers/staging/solo6x10/core.c | 1 + + drivers/staging/solo6x10/enc.c | 1 + + drivers/staging/solo6x10/g723.c | 1 + + drivers/staging/solo6x10/p2m.c | 1 + + drivers/staging/speakup/devsynth.c | 5 +- + drivers/thermal/Kconfig | 8 +- + drivers/thermal/thermal_sys.c | 142 ++++- + drivers/video/backlight/Kconfig | 10 +- + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/aat2870_bl.c | 8 +- + drivers/video/backlight/ams369fg06.c | 646 ++++++++++++++++++++ + drivers/video/backlight/ld9040.c | 17 +- + drivers/video/backlight/s6e63m0.c | 11 +- + drivers/video/cyber2000fb.c | 3 + + drivers/video/fbmem.c | 24 +- + fs/btrfs/inode.c | 3 +- + fs/ext4/ext4.h | 7 +- + fs/ext4/ialloc.c | 4 +- + fs/ocfs2/ocfs2.h | 47 ++ + fs/ocfs2/quota_local.c | 10 +- + include/linux/acpi.h | 1 - + include/linux/cpu.h | 33 + + include/linux/cs5535.h | 60 ++ + include/linux/dmar.h | 5 + + include/linux/jiffies.h | 2 +- + include/linux/mfd/aat2870.h | 2 +- + include/linux/mfd/pm8xxx/rtc.h | 25 + + include/linux/mm.h | 3 +- + include/linux/netdevice.h | 36 +- + include/linux/notifier.h | 82 +--- + include/linux/pagemap.h | 12 +- + include/linux/reboot.h | 5 + + include/linux/suspend.h | 8 + + include/linux/thermal.h | 22 - + include/linux/vt.h | 7 + + include/scsi/scsi_netlink.h | 2 +- + init/calibrate.c | 11 +- + kernel/audit.c | 5 +- + kernel/configs.c | 4 +- + kernel/irq/generic-chip.c | 4 +- + kernel/notifier.c | 31 - + kernel/sys.c | 32 +- + kernel/time.c | 2 +- + mm/backing-dev.c | 1 + + mm/filemap.c | 14 +- + mm/memory.c | 56 +- + mm/shmem.c | 14 +- + mm/slab.c | 2 +- + mm/truncate.c | 143 ++--- + net/rds/page.c | 1 + + 128 files changed, 4063 insertions(+), 953 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt + delete mode 100644 arch/um/sys-x86_64/mem.c + create mode 100644 arch/x86/platform/geode/Makefile + create mode 100644 arch/x86/platform/geode/alix.c + create mode 100644 arch/x86/platform/olpc/olpc-xo1-pm.c + create mode 100644 arch/x86/platform/olpc/olpc-xo1-rtc.c + create mode 100644 arch/x86/platform/olpc/olpc-xo1-sci.c + delete mode 100644 arch/x86/platform/olpc/olpc-xo1.c + create mode 100644 arch/x86/platform/olpc/olpc-xo15-sci.c + create mode 100644 arch/x86/platform/olpc/xo1-wakeup.S + delete mode 100644 drivers/leds/leds-alix2.c + create mode 100644 drivers/rtc/rtc-pm8xxx.c + create mode 100644 drivers/video/backlight/ams369fg06.c + create mode 100644 include/linux/mfd/pm8xxx/rtc.h +$ git am -3 ../patches/vfs-linus-fix.diff +Applying: vfs pile 1.5 diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..4b6180bbf120 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,145 @@ +Importing i2c based on 3.0-git4 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard b6844e8f64920cdee620157252169ba63afb0c89 +HEAD is now at b6844e8 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm +$ git am ../quilt/i2c/i2c-ali1535-fix-style-issues.patch +Applying: i2c-ali1535: Fix style issues +$ git am ../quilt/i2c/i2c-allow-i2c_add_numbered_adapter-to-assign-a-bus-id.patch +Applying: i2c: Allow i2c_add_numbered_adapter() to assign a bus id +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + ffaa79e...7566200 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 3.0-git4 +$ cd ../quilt-tmp +$ git reset --hard b6844e8f64920cdee620157252169ba63afb0c89 +HEAD is now at b6844e8 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm +$ git am ../quilt/jdelvare-hwmon/hwmon-factor-out-common-sch56xx-code.patch +Applying: hwmon: (sch5627) Factor out some code shared with sch5636 driver +$ git am ../quilt/jdelvare-hwmon/hwmon-new-driver-sch5636.patch +Applying: hwmon: New driver sch5636 +$ git am ../quilt/jdelvare-hwmon/hwmon-vid-add-VIA-C7-D-support.patch +Applying: hwmon-vid: Add support for VIA family 6 model D CPU +$ git am ../quilt/jdelvare-hwmon/hwmon-via-cputemp-add-cpu-vid.patch +Applying: hwmon: (via-cputemp) Add VID reporting support +$ git am ../quilt/jdelvare-hwmon/hwmon-it87-chassis-intrusion-support.patch +Applying: hwmon: (it87) Add chassis intrusion detection support +$ git am ../quilt/jdelvare-hwmon/hwmon-max1111-improve-memory-usage.patch +Applying: hwmon: (max1111) Avoid extra memory allocations +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + c76bb63...f91127a master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 3.0 +$ cd ../quilt-tmp +$ git reset --hard 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe +HEAD is now at 02f8c6a Linux 3.0 +$ git am ../quilt/kernel-doc/docum-submitpatch-spello.patch +Applying: Fixed a spelling error. +$ git am ../quilt/kernel-doc/docum-kerneldocs-remove-lsd.patch +Applying: Dropping LSD (Linux Source Driver) since it hasn't been available +$ git am ../quilt/kernel-doc/docum-arm-user-debug.patch +Applying: Usually kernel parameters are documented in kernel-parameters.txt +$ git am ../quilt/kernel-doc/docum-add-arch-flags.patch +Applying: General cleanups to kernel-parameters.txt: +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/kernel-doc +From ../quilt-tmp + + 35f736c...05fe2ec master -> quilt/kernel-doc (forced update) +Importing rr based on v3.0-rc3-55-gada9c93 +Unchanged quilt series rr +Importing device-mapper based on v3.0 +$ cd ../quilt-tmp +$ git reset --hard 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe +HEAD is now at 02f8c6a Linux 3.0 +$ git am ../quilt/device-mapper/dm-snapshot-flush-disk-cache-when-merging.patch +Applying: This patch makes dm-snapshot flush disk cache when writing metadata for +$ git am ../quilt/device-mapper/dm-mpath-fix-potential-NULL-pointer-in-feature-arg-processing.patch +Applying: Avoid dereferencing a NULL pointer if the number of feature arguments +$ git am ../quilt/device-mapper/dm-io-flush-cpu-cache-with-vmapped-io.patch +Applying: For normal kernel pages, CPU cache is synchronized by the dma layer. +$ git am ../quilt/device-mapper/dm-table-fix-discard-support.patch +Applying: Remove 'discards_supported' from the dm_table structure. The same +$ git am ../quilt/device-mapper/dm-log-clean-up-bit-little-endian-bitops.patch +Applying: Using __test_and_{set,clear}_bit_le() with ignoring its return value +$ git am ../quilt/device-mapper/dm-log-userspace-use-list_move.patch +Applying: Replace list_del() followed by list_add() with list_move(). +$ git am ../quilt/device-mapper/dm-use-vzalloc.patch +Applying: Use vzalloc() instead of vmalloc()+memset(). +$ git am ../quilt/device-mapper/dm-kcopyd-remove-offset-field-from-job-structure.patch +Applying: The offset field in struct kcopyd_job is always zero so remove it. +$ git am ../quilt/device-mapper/dm-kcopyd-remove-nr_pages-field-from-job-structure.patch +Applying: The nr_pages field in struct kcopyd_job is only used temporarily in +$ git am ../quilt/device-mapper/dm-snapshot-remove-unused-definitions.patch +Applying: Remove a couple of unused #defines. +$ git am ../quilt/device-mapper/dm-snapshot-style-cleanups.patch +Applying: Coding style cleanups. +$ git am ../quilt/device-mapper/dm-raid-cleanup-parameter-handling.patch +Applying: Re-order the parameters so they are handled consistently in the same order +$ git am ../quilt/device-mapper/dm-kcopyd-add-dm_kcopyd_zero-to-zero-an-area.patch +Applying: This patch introduces dm_kcopyd_zero() to make it easy to use +$ git am ../quilt/device-mapper/dm-ignore-merge_bvec-for-snapshots-when-safe.patch +Applying: Add a new flag DMF_MERGE_IS_OPTIONAL to struct mapped_device to indicate +$ git am ../quilt/device-mapper/dm-snap-skip-reading-origin-when-overwriting-complete-chunk.patch +Applying: If we write a full chunk in the snapshot, skip reading the origin device +$ git am ../quilt/device-mapper/dm-table-share-target-argument-parsing-functions.patch +Applying: Move multipath target argument parsing code into dm-table so other +$ git am ../quilt/device-mapper/dm-flakey-use-dm_target_offset-and-support-discards.patch +Applying: Use dm_target_offset() and support discards. +$ git am ../quilt/device-mapper/dm-flakey-support-feature-args.patch +Applying: Add the ability to specify arbitrary feature flags when creating a +$ git am ../quilt/device-mapper/dm-flakey-add-drop_writes.patch +Applying: Add 'drop_writes' option to drop writes silently while the +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:11: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +$ git am ../quilt/device-mapper/dm-flakey-add-corrupt_bio_byte-feature.patch +Applying: Add corrupt_bio_byte feature to simulate corruption by overwriting a byte at a +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:12: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +$ git am ../quilt/device-mapper/dm-ioctl-fill-in-device-parameters-in-more-ioctls.patch +Applying: Move parameter filling from find_device to __find_device_hash_cell. +$ git am ../quilt/device-mapper/dm-ioctl-introduce-__get_dev_cell.patch +Applying: Move logic to find device based on major/minor number to a separate +$ git am ../quilt/device-mapper/dm-ioctl-forbid-multiple-device-specifiers.patch +Applying: Exactly one of name, uuid or device must be specified when referencing +$ git am ../quilt/device-mapper/dm-raid-improve-table-parameters-documentation.patch +Applying: Add more information about some dm-raid table parameters and clarify how +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:123: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +$ git am ../quilt/device-mapper/dm-raid-add-region_size-parameter.patch +Applying: Allow the user to specify the region_size. +$ git am ../quilt/device-mapper/dm-raid-add-write_mostly-parameter.patch +Applying: Add the write_mostly parameter to RAID1 dm-raid tables. +$ git am ../quilt/device-mapper/dm-raid-support-metadata-devices.patch +Applying: Add the ability to parse and use metadata devices to dm-raid. Although +$ git am ../quilt/device-mapper/dm-raid-add-md-raid1-support.patch +Applying: Support the MD RAID1 personality through dm-raid. +$ git am ../quilt/device-mapper/dm-raid-tidy-includes.patch +Applying: A dm target only needs to use include/linux dm headers. +$ git am ../quilt/device-mapper/dm-crypt-optionally-support-discard-requests.patch +Applying: Add optional parameter field to dmcrypt table and support +$ git am ../quilt/device-mapper/dm-table-clean-dm_get_device-and-move-exports.patch +Applying: There is no need for __table_get_device to be factored out. +$ git am ../quilt/device-mapper/dm-table-add-singleton-feature.patch +Applying: Introduce the concept of a singleton table which contains exactly one target. +$ git am ../quilt/device-mapper/dm-table-add-always-writeable-feature.patch +Applying: Add a target feature flag to indicate that a target does not work in +$ git am ../quilt/device-mapper/dm-ioctl-prevent-empty-message.patch +Applying: Detect invalid empty messages in core dm instead of requiring every target to +$ git am ../quilt/device-mapper/dm-export-dm-get-md.patch +Applying: Export dm_get_md() for the new thin provisioning target to use. +$ git am ../quilt/device-mapper/dm-add-persistent-data-library.patch +Applying: The persistent-data library offers a re-usable framework for the storage +$ git am ../quilt/device-mapper/dm-add-thin-provisioning-target.patch +Applying: Initial EXPERIMENTAL implementation of device-mapper thin provisioning +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:238: space before tab in indent. + Create a new snapshot of another thinly-provisioned device. +warning: 1 line adds whitespace errors. +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + 747b52d...9cea4c3 master -> quilt/device-mapper (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d483a3684f87 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110726