From 7b4eeb14ae3a4d3157b4268b50bcab2605af0e8d Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 25 May 2011 13:34:39 +1000 Subject: Add linux-next specific files for 20110525 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 192 +++ Next/Trees | 194 +++ Next/merge.log | 4475 +++++++++++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 48 + localversion-next | 1 + 5 files changed, 4910 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 Next/quilt-import.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..00ce2007d55c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,192 @@ +Name SHA1 +---- ---- +origin 4a7df24ddc7097cd789a7527187826552ea0765e +fixes caebc160ce3f76761cc62ad96ef6d6f30f54e3dd +kbuild-current b7bd182176960fdd139486cadb9962b39f8a2b50 +arm-current d762f4383100c2a87b1a3f2d678cd3b5425655b4 +m68k-current 659e6ed55ff8d617c895c10288644e3e6107834e +powerpc-merge 208b3a4c196e733b9cec006dc132cfc149b2810a +52xx-and-virtex-current dd9c1549edef02290edced639f67b54a25abbe0e +sparc-current 2da7fbefc23a3b3efc4acfdc7e13e5835f94d31a +scsi-rc-fixes c055f5b2614b4f758ae6cc86733f31fa4c2c5844 +net-current 6b3678354647a653e669746c05765f05d2b90239 +sound-current f686c74cc3e78349d16d46fc72807354574b1516 +pci-current e667898dc8420f6cf9aaa21c73f001084158c0be +wireless-current 2ae1b8b35faba31a59b153cbad07f9c15de99740 +driver-core.current d762f4383100c2a87b1a3f2d678cd3b5425655b4 +tty.current d762f4383100c2a87b1a3f2d678cd3b5425655b4 +usb.current d762f4383100c2a87b1a3f2d678cd3b5425655b4 +staging.current d762f4383100c2a87b1a3f2d678cd3b5425655b4 +cpufreq-current 5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4 +input-current b73077eb03f510a84b102fb97640e595a958403c +md-current b098636cf04c89db4036fedc778da0acc666ad1a +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 4427b1b4ec111622071ec872c94594e05635c6e9 +ide-curent db210f824c2f155703edf03bc2137da1bd76e27d +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current a375b15164dd9264f724ad941825e52c90145151 +rmobile-current a7f800131f35925299860a95259453c9bc0c272f +fbdev-current d762f4383100c2a87b1a3f2d678cd3b5425655b4 +devicetree-current b1608d69cb804e414d0887140ba08a9398e4e638 +spi-current 8faa7cf828bca1745a4ed599876567f5afc47544 +arm d7bebaddfc88590bc5defd4378f1b3c45ce22305 +at91 bad3db778f4ea5b41690400ce5bfff262a1d9775 +davinci 1a717c00501f02200fa003755e54f9fcbd2f865b +i.MX caebc160ce3f76761cc62ad96ef6d6f30f54e3dd +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm f2ba30560a71b39b4ad3230f5deb96fefaaa6417 +omap 9b28b11e2a648f07c8481b9666ccf1c088e1ab74 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p bd6356bdafc853201168f718f0059fbe11191461 +tegra 84abf6084704673ae80a2105bf63ece5eee3edd5 +ux500-core f0e733f32e56ded9309a8b8da3a77d47beb3cbdd +xilinx ad9ee85b535913c1a69a82645f52e5b113bd50e3 +blackfin dd14f2ddd8859eaf6cd4444e7526c37264992090 +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +ia64 30f7276cb35a22743d709a460ae3639aad50366a +m68k 659e6ed55ff8d617c895c10288644e3e6107834e +m68knommu 2b30d1b456f93ff668ec1027f19837d286f82180 +microblaze a1b49cb7e2a7961ec3aa8b64860bf480d4ec9077 +mips ba3fb1d04060a599fb486c051f99712d78a91e59 +parisc 54a6067ece30c11c8b340b94ecc5a01bb0bd9317 +powerpc 3d07f0e83d4323d2cd45cc583f7cf1957aca3cac +4xx 65f47f1339dfcffcd5837a307172fb41aa39e479 +52xx-and-virtex 3c4ad4eeb45d396189f051603f9c326f64fef707 +galak 9824986b6207600b7af7d53fb039655a2378c52a +s390 5bd418784a2764a8d9de177a5462bfc008fd334a +sh 4e2b1084b0fb79c963b73586815e1ef034dc2b57 +rmobile cac6f98dfca51ec2dc906064ba0bf8be4f820ba0 +sparc f400bdb1d6de4344980cf39041497b288090dd33 +tile 45e9683e87b69328175df3a9e42039b9892ca47e +unicore32 5ab8a4a9bcbc3e425e7b5ab147f231a23dd57547 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph b71622e7f92a491da4f48b63c7bf8016a883b7cd +cifs 3c1105df699188a70f5c17dc0795affea388bca7 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a842dd9dd9d0df0abb97452244b0bb60a147157 +ext3 c2b67735e5d3a419e90047b3f4179e54a39637bc +ext4 8ac22b5d4144653e45bd0c18b0aff436b1d299ed +fatfs f68e542f3478147986a9c8958942ec649dc06201 +fuse d24339059d640f108c08ba99ef30e3bafa10f8e4 +gfs2 26b06a6958df0f12f1a654db8598433eb89cc024 +hfsplus 99943814ce60e4cd0165f19781abbfcc826f8d87 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 557eed603159b4e007c57d97fad1333ecebd3c2e +nfsd 6ce2357f1e73e0da8ebeace6ec829f48a646bb8c +nilfs2 5fc7b14177b1a1c2f2511aed62a4ca870d0332e7 +ocfs2 98ba073c606fba7a48a8e0d36e3b02105d31c768 +omfs 31be83aeaee22fa165862ad449c7131ceaf1cf91 +squashfs 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs c0f09a6027a8501b1d35ffda66a17d216afdc145 +ubifs 56e46742e846e4de167dde0e1e1071ace1c882a5 +xfs bf59170a66bc3eaf3ee513aa6ce9774aa2ab5188 +vfs 0f60f240d522772467c7d2cebedb910748c78ed4 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci 9251bac97d47fdaea406ea0595c2d0aa50022f12 +hid d762f4383100c2a87b1a3f2d678cd3b5425655b4 +i2c 2ea38bec4fe6a8a4c3e297b30067ae0643ca6060 +bjdooks-i2c 5bdfdfeed5eed599a3ddc455f7c254a209ceae8d +jdelvare-hwmon b0806167654043cf140f2b2c3e4a52c59ad511f7 +hwmon-staging 083078cd112f52923c9f3669dae7652e23d4caa0 +kernel-doc 82ffd43ddd593f7d3f3411473ce20bec155a1933 +docs 2f3e4af471e38e0658e701973238ae4b5e50fcd6 +v4l-dvb 38b92610d72f1aa9534db85d79f3e917782d383a +kbuild 5f9fefcaf757c3da2ba95f42cc18692b1e5c1b8c +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 8a745f1f39b7a20047a362b67ce9151c07d14440 +infiniband 18e71a6b5d20e699b74bcf4ca116e6b6fd27a301 +acpi 6447f55da90b77faec1697d499ed7986bb4f6de6 +idle-test 78fca1b95837a44983608302e89c7258981be9b3 +powertools a829eb4d7e08b316e2d48880ecab3630497f300f +cpupowerutils 9cd581865c6ad25348b6b6d61859a1773c1728bf +ieee1394 15a6271b2d2ee936b459e708a4a26860cc96452d +ubi ab50ff684707031ed4bad2fdd313208ae392e5bb +dlm 901025d2f3194b4868980c8ba80df4cc0aa1282c +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 140363500ddadad0c09cb512cc0c96a4d3efa053 +scsi fad4dab5e44e10acf6b0235e469cb8e773b58e31 +async_tx 3ea205c449d2b5996d0256aa8b2894f7aea228a2 +net 557eed603159b4e007c57d97fad1333ecebd3c2e +wireless daf8cf608d57a0b9f22276036e420cc82cf6ab4f +bluetooth 017b029211c18128e2c2284714d019c8f9e522a4 +mtd 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +crypto 4427b1b4ec111622071ec872c94594e05635c6e9 +sound e9aec6ba8b79deb7b1cc484d3260238628833d35 +sound-asoc 92505299a131b47992d318f2875d5629ac870d87 +cpufreq 1a8e1463a49aaa452da1cefe184a00d4df47f1ef +cpufreq-move bb0a56ecc4ba2a3db1b6ea6949c309886e3447d3 +rr 8089824bc5127a432e60287e662469b81576001b +input 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 +input-mt a6360dd37e1a144ed11e6548371bade559a1e4df +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 4426d25605a24f4fc262a2a0a30036292c847fa2 +device-mapper 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 4ef7e71444b48cc89152cbc499ed94dde50515ee +battery 906649de0eacde7a643b5a0750de6207441ad54f +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 28b0e23830b2432f0d4f7976e9071e3de4e1090d +kgdb 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +slab 3e0c2ab67e48f77c2da0a5c826aac397792a214e +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md b098636cf04c89db4036fedc778da0acc666ad1a +mfd 482241dd43f519aa7103c9034d85418682f7dc61 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm fb0b760605d1f3bb7afc83ffd7a770f92bb62fca +fbdev af1ce6b2fad7d572aef040d61a935da28a861853 +viafb 8aa4d96fe3e4cda9a6469b22b3f017ed30996b10 +omap_dss2 b295d6e593e02168fdafc5db11464b6d51cf239d +voltage db89120c3b5f78fdc67fe26534907e794f8f2d87 +security-testing 12a5a2621b1ee14d32beca35304d7c6076a58815 +selinux 7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 4feddecea87e2885b96011f9ede0648f88a51fe2 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 6a87c5ec6463af0f7fa1023cd63663135f5435a4 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd a49fb4c3d035ab516507b31ec3bd49263caee14d +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial d762f4383100c2a87b1a3f2d678cd3b5425655b4 +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 22ca7d88056aa29ca35f44aae1c28f2397163894 +apm d762f4383100c2a87b1a3f2d678cd3b5425655b4 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree f38278bd2a9ba6ba5f468018ccd6eda16592ea63 +spi 43c640157d4366a3ea9ba01f903ea892f46376ee +tip dc53d48f01360d0fd9dc85dadbe089fbe47950e0 +rcu c7a3786030bcd45105d8d1832777d9c8f5a183c2 +kvm 95de6ce677d657a6cebbf9f3e194d91fe5687003 +oprofile b76a06e08d94b2a63e47837dfe46bbbf0a3af6c2 +ptrace bd715d9a4f13f87bad5526c2cd41370949473b16 +xen 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf +xen-two 773f8cfb740d7f7274ea822bc5982cc1315c6ec4 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 +percpu e1e7bfd5048a848cc03164b5893865a573dd0014 +workqueues 9c5a2ba70251ecaab18c7a83e38b3c620223476c +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 62a2f1cc0e91adf12cc5ca84492bf7d5b117adb2 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +namespace 823b7fe56b38319db1a1e2ea78e673072022cc47 +driver-core d762f4383100c2a87b1a3f2d678cd3b5425655b4 +tty d762f4383100c2a87b1a3f2d678cd3b5425655b4 +usb d762f4383100c2a87b1a3f2d678cd3b5425655b4 +staging d762f4383100c2a87b1a3f2d678cd3b5425655b4 +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +cleancache e046b9640996aa07d240865d97527ed3ea26289d +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..dc878fba28df --- /dev/null +++ b/Next/Trees @@ -0,0 +1,194 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-linus +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#for-next +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 +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#powerpc/next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-latest +rmobile git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git#unicore32 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#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 +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +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-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +powertools git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#tools-test +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 +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +cpufreq-move git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#move-drivers +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 +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 +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +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 diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..9435ca22e93f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4475 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ea2b50e Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating ea2b50e..4a7df24 +Fast-forward + .gitignore | 1 + + Documentation/ABI/testing/sysfs-bus-pci | 9 + + Documentation/DocBook/.gitignore | 1 + + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/dvb/dvbapi.xml | 8 + + Documentation/DocBook/dvb/dvbproperty.xml | 405 +++- + Documentation/DocBook/dvb/frontend.h.xml | 20 +- + Documentation/DocBook/media-entities.tmpl | 2 + + Documentation/DocBook/v4l/pixfmt-m420.xml | 147 + + Documentation/DocBook/v4l/pixfmt-y10b.xml | 43 + + Documentation/DocBook/v4l/pixfmt.xml | 2 + + Documentation/DocBook/v4l/subdev-formats.xml | 46 + + Documentation/DocBook/v4l/videodev2.h.xml | 4 + + Documentation/HOWTO | 2 +- + Documentation/SubmittingPatches | 9 +- + Documentation/dontdiff | 58 +- + Documentation/feature-removal-schedule.txt | 23 + + Documentation/filesystems/ubifs.txt | 26 +- + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/writing-clients | 2 +- + Documentation/input/elantech.txt | 123 +- + Documentation/input/rotary-encoder.txt | 13 + + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/kbuild/kbuild.txt | 13 + + Documentation/kbuild/makefiles.txt | 53 + + Documentation/sysctl/fs.txt | 7 - + Documentation/vgaarbiter.txt | 20 +- + Documentation/video4linux/CARDLIST.em28xx | 2 +- + Documentation/video4linux/Zoran | 1 - + Documentation/video4linux/gspca.txt | 1 + + Documentation/video4linux/uvcvideo.txt | 239 ++ + MAINTAINERS | 7 +- + Makefile | 50 +- + arch/alpha/kernel/vmlinux.lds.S | 2 +- + arch/arm/Kconfig | 89 +- + arch/arm/Makefile | 7 +- + arch/arm/boot/compressed/Makefile | 17 +- + arch/arm/boot/compressed/decompress.c | 4 +- + arch/arm/boot/compressed/head.S | 46 +- + arch/arm/boot/compressed/misc.c | 24 +- + arch/arm/common/gic.c | 84 +- + arch/arm/common/sa1111.c | 8 - + arch/arm/common/timer-sp.c | 82 +- + arch/arm/configs/dove_defconfig | 12 +- + arch/arm/configs/mx1_defconfig | 1 + + arch/arm/configs/mx51_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 129 + + arch/arm/configs/ns9xxx_defconfig | 56 - + arch/arm/configs/realview-smp_defconfig | 2 +- + arch/arm/configs/realview_defconfig | 2 +- + arch/arm/configs/spear310_defconfig | 52 - + arch/arm/configs/spear320_defconfig | 52 - + .../{spear300_defconfig => spear3xx_defconfig} | 4 +- + .../{spear600_defconfig => spear6xx_defconfig} | 2 +- + arch/arm/configs/stmp378x_defconfig | 128 - + arch/arm/configs/stmp37xx_defconfig | 108 - + arch/arm/configs/versatile_defconfig | 2 +- + arch/arm/include/asm/dma.h | 4 +- + arch/arm/include/asm/elf.h | 1 + + arch/arm/include/asm/futex.h | 137 +- + arch/arm/include/asm/hardware/timer-sp.h | 4 +- + arch/arm/include/asm/memory.h | 10 +- + arch/arm/include/asm/ptrace.h | 6 + + arch/arm/include/asm/sizes.h | 42 +- + arch/arm/include/asm/smp.h | 6 +- + arch/arm/include/asm/spinlock.h | 2 + + arch/arm/kernel/perf_event.c | 5 - + arch/arm/kernel/ptrace.c | 348 ++- + arch/arm/kernel/setup.c | 13 +- + arch/arm/kernel/smp.c | 7 + + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/arm/mach-bcmring/arch.c | 1 + + arch/arm/mach-bcmring/core.c | 227 +-- + arch/arm/mach-bcmring/core.h | 1 + + arch/arm/mach-davinci/include/mach/memory.h | 18 +- + arch/arm/mach-davinci/include/mach/uncompress.h | 5 +- + arch/arm/mach-davinci/irq.c | 93 +- + arch/arm/mach-dove/common.c | 616 +---- + arch/arm/mach-dove/mpp.c | 134 +- + arch/arm/mach-dove/mpp.h | 362 ++-- + arch/arm/mach-ep93xx/gpio.c | 24 - + arch/arm/mach-exynos4/include/mach/smp.h | 19 - + arch/arm/mach-exynos4/irq-combiner.c | 6 +- + arch/arm/mach-exynos4/platsmp.c | 5 +- + arch/arm/mach-gemini/include/mach/uncompress.h | 2 +- + arch/arm/mach-h720x/include/mach/memory.h | 3 +- + arch/arm/mach-imx/Kconfig | 286 ++ + arch/arm/mach-imx/Makefile | 38 +- + arch/arm/mach-imx/Makefile.boot | 4 + + arch/arm/mach-imx/cache-l2x0.c | 56 + + arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c | 3 +- + arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c | 1 - + arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} | 38 +- + arch/arm/mach-imx/cpu-imx35.c | 44 + + .../crm_regs.h => mach-imx/crmregs-imx31.h} | 0 + arch/arm/mach-imx/devices-imx1.h | 8 +- + arch/arm/mach-imx/devices-imx21.h | 22 +- + arch/arm/mach-imx/devices-imx25.h | 35 +- + arch/arm/mach-imx/devices-imx27.h | 30 +- + arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h | 36 +- + arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h | 37 +- + arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c | 1 - + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 - + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 17 +- + .../eukrea_mbimxsd35-baseboard.c} | 29 +- + arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c | 0 + arch/arm/mach-imx/mach-apf9328.c | 144 + + .../arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c | 29 +- + arch/arm/{mach-mx3 => mach-imx}/mach-bug.c | 1 - + arch/arm/mach-imx/mach-cpuimx27.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c | 2 - + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 - + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 14 +- + .../arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c | 1 - + arch/arm/mach-imx/mach-mx1ads.c | 1 - + arch/arm/mach-imx/mach-mx21ads.c | 1 - + arch/arm/mach-imx/mach-mx25_3ds.c | 13 +- + arch/arm/mach-imx/mach-mx27ads.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c | 50 +- + arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c | 75 +- + arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c | 1 - + arch/arm/mach-imx/mach-mxt_td60.c | 1 - + arch/arm/mach-imx/mach-pca100.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c | 65 +- + arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c | 17 +- + arch/arm/mach-imx/mach-pcm038.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c | 17 +- + arch/arm/{mach-mx3 => mach-imx}/mach-qong.c | 15 +- + arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c | 25 +- + arch/arm/mach-imx/mm-imx31.c | 66 + + arch/arm/mach-imx/mm-imx35.c | 63 + + arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c | 13 +- + arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c | 3 +- + .../{mach-mx3 => mach-imx}/mx31moboard-devboard.c | 1 - + .../{mach-mx3 => mach-imx}/mx31moboard-marxbot.c | 2 - + .../{mach-mx3 => mach-imx}/mx31moboard-smartbot.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/pcm037.h | 0 + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/integrator_ap.c | 34 +- + arch/arm/mach-integrator/integrator_cp.c | 24 +- + arch/arm/mach-iop32x/include/mach/uncompress.h | 2 +- + arch/arm/mach-iop33x/include/mach/uncompress.h | 2 +- + arch/arm/mach-ixp4xx/common-pci.c | 23 - + arch/arm/mach-ixp4xx/common.c | 16 +- + arch/arm/mach-ixp4xx/include/mach/memory.h | 12 +- + arch/arm/mach-ixp4xx/include/mach/uncompress.h | 2 +- + arch/arm/mach-kirkwood/common.c | 601 +---- + arch/arm/mach-kirkwood/include/mach/irqs.h | 1 + + arch/arm/mach-kirkwood/mpp.c | 58 +- + arch/arm/mach-kirkwood/mpp.h | 6 - + arch/arm/mach-loki/common.c | 190 +-- + arch/arm/mach-lpc32xx/timer.c | 17 +- + arch/arm/mach-mmp/include/mach/uncompress.h | 2 +- + arch/arm/mach-msm/gpio-v2.c | 10 +- + arch/arm/mach-msm/include/mach/smp.h | 23 - + arch/arm/mach-msm/platsmp.c | 4 +- + arch/arm/mach-mv78xx0/common.c | 570 +---- + arch/arm/mach-mv78xx0/mpp.c | 58 +- + arch/arm/mach-mv78xx0/mpp.h | 6 - + arch/arm/mach-mx3/Kconfig | 257 -- + arch/arm/mach-mx3/Makefile | 26 - + arch/arm/mach-mx3/Makefile.boot | 3 - + arch/arm/mach-mx3/devices.c | 115 - + arch/arm/mach-mx3/devices.h | 4 - + arch/arm/mach-mx3/mm.c | 141 - + arch/arm/mach-mx5/Kconfig | 58 +- + arch/arm/mach-mx5/board-cpuimx51.c | 2 - + arch/arm/mach-mx5/board-cpuimx51sd.c | 2 - + arch/arm/mach-mx5/board-mx50_rdp.c | 1 - + arch/arm/mach-mx5/board-mx51_babbage.c | 18 +- + arch/arm/mach-mx5/board-mx51_efikamx.c | 5 +- + arch/arm/mach-mx5/board-mx51_efikasb.c | 5 +- + arch/arm/mach-mx5/board-mx53_evk.c | 2 - + arch/arm/mach-mx5/board-mx53_loco.c | 2 - + arch/arm/mach-mx5/board-mx53_smd.c | 30 +- + arch/arm/mach-mx5/clock-mx51-mx53.c | 1 + + arch/arm/mach-mx5/cpu.c | 23 + + arch/arm/mach-mx5/devices-imx50.h | 6 +- + arch/arm/mach-mx5/devices-imx51.h | 25 +- + arch/arm/mach-mx5/devices-imx53.h | 13 +- + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 2 - + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 16 +- + arch/arm/mach-mx5/mx51_efika.c | 3 - + arch/arm/mach-mxc91231/Kconfig | 11 - + arch/arm/mach-mxc91231/Makefile | 2 - + arch/arm/mach-mxc91231/Makefile.boot | 3 - + arch/arm/mach-mxc91231/clock.c | 640 ----- + arch/arm/mach-mxc91231/crm_regs.h | 394 --- + arch/arm/mach-mxc91231/devices.c | 251 -- + arch/arm/mach-mxc91231/devices.h | 13 - + arch/arm/mach-mxc91231/iomux.c | 177 -- + arch/arm/mach-mxc91231/magx-zn5.c | 62 - + arch/arm/mach-mxc91231/mm.c | 62 - + arch/arm/mach-mxc91231/system.c | 51 - + arch/arm/mach-mxs/Kconfig | 12 +- + arch/arm/mach-mxs/Makefile | 1 + + arch/arm/mach-mxs/clock-mx23.c | 2 + + arch/arm/mach-mxs/devices-mx28.h | 2 +- + arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 5 +- + arch/arm/mach-mxs/include/mach/devices-common.h | 5 +- + arch/arm/mach-mxs/include/mach/mx23.h | 2 +- + arch/arm/mach-mxs/include/mach/uncompress.h | 2 +- + arch/arm/mach-mxs/mach-mx23evk.c | 2 +- + arch/arm/mach-mxs/mach-mx28evk.c | 4 +- + arch/arm/mach-mxs/mach-stmp378x_devb.c | 120 + + arch/arm/mach-mxs/timer.c | 20 +- + arch/arm/mach-netx/time.c | 16 +- + arch/arm/mach-ns9xxx/Kconfig | 40 - + arch/arm/mach-ns9xxx/Makefile | 12 - + arch/arm/mach-ns9xxx/Makefile.boot | 2 - + arch/arm/mach-ns9xxx/board-a9m9750dev.c | 156 - + arch/arm/mach-ns9xxx/board-a9m9750dev.h | 15 - + arch/arm/mach-ns9xxx/board-jscc9p9360.c | 17 - + arch/arm/mach-ns9xxx/board-jscc9p9360.h | 13 - + arch/arm/mach-ns9xxx/clock.c | 215 -- + arch/arm/mach-ns9xxx/clock.h | 35 - + arch/arm/mach-ns9xxx/generic.c | 19 - + arch/arm/mach-ns9xxx/generic.h | 16 - + arch/arm/mach-ns9xxx/gpio-ns9360.c | 118 - + arch/arm/mach-ns9xxx/gpio-ns9360.h | 13 - + arch/arm/mach-ns9xxx/gpio.c | 147 - + arch/arm/mach-ns9xxx/include/mach/board.h | 40 - + arch/arm/mach-ns9xxx/include/mach/debug-macro.S | 21 - + arch/arm/mach-ns9xxx/include/mach/entry-macro.S | 28 - + arch/arm/mach-ns9xxx/include/mach/gpio.h | 47 - + arch/arm/mach-ns9xxx/include/mach/hardware.h | 77 - + arch/arm/mach-ns9xxx/include/mach/io.h | 20 - + arch/arm/mach-ns9xxx/include/mach/irqs.h | 86 - + arch/arm/mach-ns9xxx/include/mach/memory.h | 24 - + arch/arm/mach-ns9xxx/include/mach/module.h | 55 - + .../mach-ns9xxx/include/mach/processor-ns9360.h | 32 - + arch/arm/mach-ns9xxx/include/mach/processor.h | 42 - + arch/arm/mach-ns9xxx/include/mach/regs-bbu.h | 45 - + .../include/mach/regs-board-a9m9750dev.h | 24 - + arch/arm/mach-ns9xxx/include/mach/regs-mem.h | 135 - + .../arm/mach-ns9xxx/include/mach/regs-sys-common.h | 31 - + .../arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h | 148 - + arch/arm/mach-ns9xxx/include/mach/system.h | 35 - + arch/arm/mach-ns9xxx/include/mach/timex.h | 20 - + arch/arm/mach-ns9xxx/include/mach/uncompress.h | 164 -- + arch/arm/mach-ns9xxx/include/mach/vmalloc.h | 16 - + arch/arm/mach-ns9xxx/irq.c | 74 - + arch/arm/mach-ns9xxx/mach-cc9p9360dev.c | 43 - + arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 31 - + arch/arm/mach-ns9xxx/plat-serial8250.c | 70 - + arch/arm/mach-ns9xxx/processor-ns9360.c | 53 - + arch/arm/mach-ns9xxx/time-ns9360.c | 181 -- + arch/arm/mach-nuc93x/include/mach/uncompress.h | 2 +- + arch/arm/mach-omap1/flash.c | 2 +- + arch/arm/mach-omap1/time.c | 69 +- + arch/arm/mach-omap2/include/mach/omap4-common.h | 7 + + arch/arm/mach-omap2/irq.c | 97 +- + arch/arm/mach-omap2/omap-smp.c | 5 +- + arch/arm/mach-orion5x/common.c | 478 +--- + arch/arm/mach-orion5x/d2net-setup.c | 44 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 44 +- + arch/arm/mach-orion5x/dns323-setup.c | 132 +- + arch/arm/mach-orion5x/edmini_v2-setup.c | 44 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 44 +- + arch/arm/mach-orion5x/ls-chl-setup.c | 44 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 44 +- + arch/arm/mach-orion5x/lsmini-setup.c | 44 +- + arch/arm/mach-orion5x/mpp.c | 150 +- + arch/arm/mach-orion5x/mpp.h | 191 +- + arch/arm/mach-orion5x/mss2-setup.c | 44 +- + arch/arm/mach-orion5x/mv2120-setup.c | 44 +- + arch/arm/mach-orion5x/net2big-setup.c | 44 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 44 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 44 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 44 +- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 - + arch/arm/mach-orion5x/terastation_pro2-setup.c | 44 +- + arch/arm/mach-orion5x/ts209-setup.c | 44 +- + arch/arm/mach-orion5x/ts409-setup.c | 44 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 44 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 44 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 44 +- + arch/arm/mach-pxa/cm-x2xx-pci.c | 27 - + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/include/mach/memory.h | 10 +- + arch/arm/mach-pxa/include/mach/uncompress.h | 6 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/time.c | 17 +- + arch/arm/mach-realview/core.c | 63 +- + arch/arm/mach-realview/include/mach/memory.h | 9 +- + arch/arm/mach-realview/include/mach/smp.h | 14 - + arch/arm/mach-realview/platsmp.c | 3 + + arch/arm/mach-rpc/include/mach/uncompress.h | 12 +- + arch/arm/mach-s3c2410/nor-simtec.c | 2 +- + arch/arm/mach-s3c64xx/irq.c | 7 +- + arch/arm/mach-s5p64x0/include/mach/uncompress.h | 6 +- + arch/arm/mach-sa1100/include/mach/memory.h | 12 +- + arch/arm/mach-sa1100/time.c | 24 +- + arch/arm/mach-shark/include/mach/memory.h | 20 +- + arch/arm/mach-shmobile/include/mach/smp.h | 16 - + arch/arm/mach-shmobile/platsmp.c | 3 + + arch/arm/mach-spear3xx/Kconfig | 30 +- + arch/arm/mach-spear3xx/Kconfig300 | 17 - + arch/arm/mach-spear3xx/Kconfig310 | 17 - + arch/arm/mach-spear3xx/Kconfig320 | 17 - + arch/arm/mach-spear3xx/clock.c | 74 +- + arch/arm/mach-spear3xx/include/mach/generic.h | 205 +- + arch/arm/mach-spear3xx/include/mach/irqs.h | 206 +- + arch/arm/mach-spear3xx/include/mach/spear300.h | 26 +- + arch/arm/mach-spear3xx/include/mach/spear310.h | 44 +- + arch/arm/mach-spear3xx/include/mach/spear320.h | 48 +- + arch/arm/mach-spear3xx/spear300.c | 163 +- + arch/arm/mach-spear3xx/spear300_evb.c | 32 +- + arch/arm/mach-spear3xx/spear310.c | 149 +- + arch/arm/mach-spear3xx/spear310_evb.c | 45 +- + arch/arm/mach-spear3xx/spear320.c | 251 +- + arch/arm/mach-spear3xx/spear320_evb.c | 40 +- + arch/arm/mach-spear3xx/spear3xx.c | 132 +- + arch/arm/mach-spear6xx/Kconfig | 15 +- + arch/arm/mach-spear6xx/Kconfig600 | 17 - + arch/arm/mach-spear6xx/clock.c | 4 +- + arch/arm/mach-spear6xx/include/mach/generic.h | 2 +- + arch/arm/mach-spear6xx/spear6xx.c | 2 +- + arch/arm/mach-stmp378x/Makefile | 2 - + arch/arm/mach-stmp378x/Makefile.boot | 3 - + arch/arm/mach-stmp378x/include/mach/entry-macro.S | 35 - + arch/arm/mach-stmp378x/include/mach/irqs.h | 95 - + arch/arm/mach-stmp378x/include/mach/pins.h | 151 - + arch/arm/mach-stmp378x/include/mach/regs-apbh.h | 101 - + arch/arm/mach-stmp378x/include/mach/regs-apbx.h | 119 - + arch/arm/mach-stmp378x/include/mach/regs-audioin.h | 63 - + .../arm/mach-stmp378x/include/mach/regs-audioout.h | 104 - + arch/arm/mach-stmp378x/include/mach/regs-bch.h | 56 - + arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h | 88 - + arch/arm/mach-stmp378x/include/mach/regs-dcp.h | 87 - + arch/arm/mach-stmp378x/include/mach/regs-digctl.h | 38 - + arch/arm/mach-stmp378x/include/mach/regs-dram.h | 27 - + arch/arm/mach-stmp378x/include/mach/regs-dri.h | 45 - + arch/arm/mach-stmp378x/include/mach/regs-ecc8.h | 39 - + arch/arm/mach-stmp378x/include/mach/regs-emi.h | 25 - + arch/arm/mach-stmp378x/include/mach/regs-gpmi.h | 78 - + arch/arm/mach-stmp378x/include/mach/regs-i2c.h | 55 - + arch/arm/mach-stmp378x/include/mach/regs-icoll.h | 45 - + arch/arm/mach-stmp378x/include/mach/regs-ir.h | 23 - + arch/arm/mach-stmp378x/include/mach/regs-lcdif.h | 195 -- + arch/arm/mach-stmp378x/include/mach/regs-lradc.h | 99 - + arch/arm/mach-stmp378x/include/mach/regs-ocotp.h | 40 - + arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h | 90 - + arch/arm/mach-stmp378x/include/mach/regs-power.h | 63 - + arch/arm/mach-stmp378x/include/mach/regs-pwm.h | 53 - + arch/arm/mach-stmp378x/include/mach/regs-pxp.h | 140 - + arch/arm/mach-stmp378x/include/mach/regs-rtc.h | 59 - + arch/arm/mach-stmp378x/include/mach/regs-saif.h | 21 - + arch/arm/mach-stmp378x/include/mach/regs-spdif.h | 49 - + arch/arm/mach-stmp378x/include/mach/regs-ssp.h | 102 - + arch/arm/mach-stmp378x/include/mach/regs-sydma.h | 23 - + arch/arm/mach-stmp378x/include/mach/regs-timrot.h | 68 - + arch/arm/mach-stmp378x/include/mach/regs-tvenc.h | 67 - + arch/arm/mach-stmp378x/include/mach/regs-uartapp.h | 87 - + arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h | 268 -- + arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h | 40 - + arch/arm/mach-stmp378x/include/mach/regs-usbphy.h | 37 - + arch/arm/mach-stmp378x/stmp378x.c | 299 -- + arch/arm/mach-stmp378x/stmp378x.h | 25 - + arch/arm/mach-stmp378x/stmp378x_devb.c | 332 --- + arch/arm/mach-stmp37xx/Makefile | 2 - + arch/arm/mach-stmp37xx/Makefile.boot | 3 - + arch/arm/mach-stmp37xx/include/mach/entry-macro.S | 37 - + arch/arm/mach-stmp37xx/include/mach/irqs.h | 99 - + arch/arm/mach-stmp37xx/include/mach/pins.h | 147 - + arch/arm/mach-stmp37xx/include/mach/regs-apbh.h | 97 - + arch/arm/mach-stmp37xx/include/mach/regs-apbx.h | 113 - + arch/arm/mach-stmp37xx/include/mach/regs-audioin.h | 61 - + .../arm/mach-stmp37xx/include/mach/regs-audioout.h | 111 - + arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h | 72 - + arch/arm/mach-stmp37xx/include/mach/regs-digctl.h | 24 - + arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h | 37 - + arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h | 63 - + arch/arm/mach-stmp37xx/include/mach/regs-i2c.h | 55 - + arch/arm/mach-stmp37xx/include/mach/regs-icoll.h | 43 - + arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h | 89 - + arch/arm/mach-stmp37xx/include/mach/regs-lradc.h | 97 - + arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h | 88 - + arch/arm/mach-stmp37xx/include/mach/regs-power.h | 56 - + arch/arm/mach-stmp37xx/include/mach/regs-pwm.h | 51 - + arch/arm/mach-stmp37xx/include/mach/regs-rtc.h | 57 - + arch/arm/mach-stmp37xx/include/mach/regs-ssp.h | 101 - + arch/arm/mach-stmp37xx/include/mach/regs-timrot.h | 49 - + arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h | 85 - + arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h | 268 -- + arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h | 22 - + arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h | 22 - + arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h | 37 - + arch/arm/mach-stmp37xx/stmp37xx.c | 219 -- + arch/arm/mach-stmp37xx/stmp37xx.h | 24 - + arch/arm/mach-stmp37xx/stmp37xx_devb.c | 99 - + arch/arm/mach-tcc8k/time.c | 16 +- + arch/arm/mach-tegra/Makefile | 2 +- + arch/arm/mach-tegra/gpio.c | 9 +- + arch/arm/mach-tegra/include/mach/kbc.h | 4 +- + arch/arm/mach-tegra/include/mach/legacy_irq.h | 35 - + arch/arm/mach-tegra/include/mach/smp.h | 14 - + arch/arm/mach-tegra/irq.c | 174 +- + arch/arm/mach-tegra/legacy_irq.c | 215 -- + arch/arm/mach-tegra/platsmp.c | 3 + + arch/arm/mach-tegra/timer.c | 16 +- + arch/arm/mach-u300/timer.c | 18 +- + arch/arm/mach-ux500/board-mop500.c | 14 +- + arch/arm/mach-ux500/include/mach/smp.h | 24 - + arch/arm/mach-ux500/include/mach/uncompress.h | 2 +- + arch/arm/mach-ux500/platsmp.c | 8 +- + arch/arm/mach-versatile/core.c | 44 +- + arch/arm/mach-vexpress/ct-ca9x4.c | 19 +- + arch/arm/mach-vexpress/include/mach/smp.h | 13 - + arch/arm/mach-vexpress/v2m.c | 39 +- + arch/arm/mach-w90x900/include/mach/uncompress.h | 2 +- + arch/arm/mach-w90x900/time.c | 17 +- + arch/arm/mm/flush.c | 7 +- + arch/arm/mm/init.c | 23 +- + arch/arm/mm/proc-v6.S | 34 - + arch/arm/plat-mxc/Kconfig | 28 +- + arch/arm/plat-mxc/devices/Kconfig | 7 +- + arch/arm/plat-mxc/devices/Makefile | 2 + + arch/arm/plat-mxc/devices/platform-ipu-core.c | 129 + + arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 40 + + arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +- + arch/arm/plat-mxc/epit.c | 18 +- + arch/arm/plat-mxc/include/mach/common.h | 8 +- + arch/arm/plat-mxc/include/mach/debug-macro.S | 7 - + arch/arm/plat-mxc/include/mach/devices-common.h | 27 + + arch/arm/plat-mxc/include/mach/hardware.h | 17 +- + arch/arm/plat-mxc/include/mach/io.h | 23 +- + arch/arm/plat-mxc/include/mach/iomux-mx25.h | 3 + + arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 283 -- + arch/arm/plat-mxc/include/mach/irqs.h | 2 - + arch/arm/plat-mxc/include/mach/memory.h | 3 - + arch/arm/plat-mxc/include/mach/mx27.h | 4 +- + arch/arm/plat-mxc/include/mach/mx53.h | 13 - + arch/arm/plat-mxc/include/mach/mxc.h | 22 +- + arch/arm/plat-mxc/include/mach/mxc91231.h | 256 -- + arch/arm/plat-mxc/include/mach/system.h | 6 - + arch/arm/plat-mxc/include/mach/timex.h | 2 - + arch/arm/plat-mxc/include/mach/uncompress.h | 2 +- + arch/arm/plat-mxc/system.c | 6 - + arch/arm/plat-mxc/time.c | 40 +- + arch/arm/plat-nomadik/Kconfig | 1 + + arch/arm/plat-nomadik/gpio.c | 12 +- + arch/arm/plat-nomadik/include/plat/i2c.h | 8 +- + arch/arm/plat-nomadik/timer.c | 31 +- + arch/arm/plat-omap/Kconfig | 2 + + arch/arm/plat-omap/gpio.c | 7 +- + arch/arm/plat-omap/include/plat/flash.h | 2 +- + arch/arm/plat-omap/include/plat/smp.h | 36 - + arch/arm/plat-omap/include/plat/uncompress.h | 4 +- + arch/arm/plat-orion/Makefile | 2 +- + arch/arm/plat-orion/common.c | 957 +++++++ + arch/arm/plat-orion/gpio.c | 112 +- + arch/arm/plat-orion/include/plat/common.h | 117 + + arch/arm/plat-orion/include/plat/gpio.h | 1 - + arch/arm/plat-orion/include/plat/mpp.h | 34 + + arch/arm/plat-orion/irq.c | 49 +- + arch/arm/plat-orion/mpp.c | 78 + + arch/arm/plat-orion/time.c | 21 +- + arch/arm/plat-s5p/irq-gpioint.c | 116 +- + arch/arm/plat-s5p/irq.c | 6 +- + arch/arm/plat-s5p/s5p-time.c | 58 +- + arch/arm/plat-samsung/Kconfig | 1 + + arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 2 +- + arch/arm/plat-samsung/include/plat/uncompress.h | 4 +- + arch/arm/plat-samsung/irq-uart.c | 83 +- + arch/arm/plat-samsung/irq-vic-timer.c | 69 +- + arch/arm/plat-spear/clock.c | 5 + + arch/arm/plat-spear/include/plat/clock.h | 1 + + arch/arm/plat-spear/time.c | 16 +- + arch/arm/plat-stmp3xxx/Kconfig | 37 - + arch/arm/plat-stmp3xxx/Makefile | 5 - + arch/arm/plat-stmp3xxx/clock.c | 1134 -------- + arch/arm/plat-stmp3xxx/clock.h | 61 - + arch/arm/plat-stmp3xxx/core.c | 128 - + arch/arm/plat-stmp3xxx/devices.c | 389 --- + arch/arm/plat-stmp3xxx/dma.c | 464 --- + arch/arm/plat-stmp3xxx/include/mach/clkdev.h | 18 - + arch/arm/plat-stmp3xxx/include/mach/cputype.h | 33 - + arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 39 - + arch/arm/plat-stmp3xxx/include/mach/dma.h | 153 - + arch/arm/plat-stmp3xxx/include/mach/gpio.h | 28 - + arch/arm/plat-stmp3xxx/include/mach/gpmi.h | 12 - + arch/arm/plat-stmp3xxx/include/mach/hardware.h | 32 - + arch/arm/plat-stmp3xxx/include/mach/io.h | 25 - + arch/arm/plat-stmp3xxx/include/mach/memory.h | 22 - + arch/arm/plat-stmp3xxx/include/mach/mmc.h | 14 - + arch/arm/plat-stmp3xxx/include/mach/pinmux.h | 157 - + arch/arm/plat-stmp3xxx/include/mach/pins.h | 30 - + arch/arm/plat-stmp3xxx/include/mach/platform.h | 68 - + arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h | 54 - + arch/arm/plat-stmp3xxx/include/mach/system.h | 49 - + arch/arm/plat-stmp3xxx/include/mach/timex.h | 20 - + arch/arm/plat-stmp3xxx/include/mach/uncompress.h | 53 - + arch/arm/plat-stmp3xxx/include/mach/vmalloc.h | 12 - + arch/arm/plat-stmp3xxx/irq.c | 50 - + arch/arm/plat-stmp3xxx/pinmux.c | 550 ---- + arch/arm/plat-stmp3xxx/timer.c | 186 -- + arch/arm/plat-versatile/platsmp.c | 3 +- + arch/arm/tools/mach-types | 142 +- + arch/blackfin/kernel/vmlinux.lds.S | 2 +- + arch/cris/kernel/vmlinux.lds.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 2 +- + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/bitops_no.h | 18 +- + arch/m68k/include/asm/io_no.h | 8 +- + arch/m68k/kernel/asm-offsets.c | 106 +- + arch/m68k/kernel/asm-offsets_mm.c | 100 - + arch/m68k/kernel/asm-offsets_no.c | 76 - + arch/m68k/kernel/entry_no.S | 1 - + arch/m68k/kernel/irq.c | 28 - + arch/m68k/kernel/m68k_ksyms.c | 36 +- + arch/m68k/kernel/m68k_ksyms_mm.c | 16 - + arch/m68k/kernel/m68k_ksyms_no.c | 78 - + arch/m68k/kernel/process_no.c | 2 + + arch/m68k/kernel/sys_m68k.c | 581 ++++- + arch/m68k/kernel/sys_m68k_mm.c | 546 ---- + arch/m68k/kernel/sys_m68k_no.c | 94 - + arch/m68k/kernel/syscalltable.S | 1 - + arch/m68k/lib/Makefile | 13 +- + arch/m68k/lib/Makefile_mm | 6 - + arch/m68k/lib/Makefile_no | 7 - + arch/m68k/lib/checksum.c | 5 - + arch/m68k/lib/checksum_no.c | 3 + + arch/m68k/lib/memcpy.c | 128 +- + arch/m68k/lib/memmove.c | 2 - + arch/m68k/lib/memset.c | 114 +- + arch/m68k/lib/muldi3.c | 99 +- + arch/m68k/lib/muldi3_mm.c | 63 - + arch/m68k/lib/muldi3_no.c | 86 - + arch/m68k/lib/string.c | 223 -- + arch/m68k/mm/Makefile | 14 +- + arch/m68k/mm/Makefile_mm | 8 - + arch/m68k/mm/Makefile_no | 5 - + arch/m68k/mm/init_no.c | 51 +- + arch/m68k/mm/kmap.c | 368 +++- + arch/m68k/mm/kmap_mm.c | 367 --- + arch/m68k/mm/kmap_no.c | 45 - + arch/m68k/platform/68328/entry.S | 7 +- + arch/m68k/platform/68360/entry.S | 7 +- + arch/m68k/platform/coldfire/dma.c | 3 + + arch/m68k/platform/coldfire/entry.S | 11 +- + arch/m68k/platform/coldfire/head.S | 1 - + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mn10300/kernel/vmlinux.lds.S | 2 +- + arch/parisc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/s390/Kconfig | 11 - + arch/s390/appldata/appldata_base.c | 2 - + arch/s390/include/asm/cmpxchg.h | 1 - + arch/s390/include/asm/elf.h | 12 - + arch/s390/include/asm/hugetlb.h | 17 +- + arch/s390/include/asm/irq.h | 1 + + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/mmu.h | 9 +- + arch/s390/include/asm/mmu_context.h | 6 +- + arch/s390/include/asm/page.h | 60 +- + arch/s390/include/asm/percpu.h | 68 + + arch/s390/include/asm/pgalloc.h | 57 +- + arch/s390/include/asm/pgtable.h | 609 ++-- + arch/s390/include/asm/processor.h | 1 + + arch/s390/include/asm/tlbflush.h | 13 +- + arch/s390/include/asm/unistd.h | 1 + + arch/s390/kernel/asm-offsets.c | 4 +- + arch/s390/kernel/entry.S | 1 + + arch/s390/kernel/entry64.S | 1 + + arch/s390/kernel/irq.c | 1 + + arch/s390/kernel/process.c | 19 +- + arch/s390/kernel/setup.c | 31 +- + arch/s390/kernel/smp.c | 30 +- + arch/s390/kernel/time.c | 4 +- + arch/s390/kernel/topology.c | 16 +- + arch/s390/kernel/vdso32/Makefile | 3 + + arch/s390/kernel/vdso64/Makefile | 3 + + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/s390/mm/extmem.c | 6 +- + arch/s390/mm/fault.c | 187 +- + arch/s390/mm/hugetlbpage.c | 10 - + arch/s390/mm/init.c | 3 +- + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgtable.c | 68 +- + arch/s390/mm/vmem.c | 14 +- + arch/s390/oprofile/hwsampler.c | 21 +- + arch/sh/Kconfig | 1 + + arch/sh/boards/mach-ecovec24/setup.c | 18 +- + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/configs/sh7757lcr_defconfig | 2 +- + arch/sh/drivers/pci/fixups-se7751.c | 2 +- + arch/sh/include/asm/stacktrace.h | 3 - + arch/sh/include/asm/unistd_32.h | 3 +- + arch/sh/include/asm/unistd_64.h | 3 +- + arch/sh/kernel/cpu/Makefile | 4 +- + arch/sh/kernel/cpu/shmobile/pm_runtime.c | 6 +- + arch/sh/kernel/dumpstack.c | 15 - + arch/sh/kernel/module.c | 2 + + arch/sh/kernel/perf_callchain.c | 12 - + arch/sh/kernel/stacktrace.c | 13 - + arch/sh/kernel/syscalls_32.S | 1 + + arch/sh/kernel/syscalls_64.S | 1 + + arch/sh/kernel/vmlinux.lds.S | 2 +- + arch/sh/oprofile/backtrace.c | 13 - + arch/sparc/kernel/vmlinux.lds.S | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 +- + arch/um/Kconfig.x86 | 4 +- + arch/um/include/asm/common.lds.S | 2 +- + arch/x86/include/asm/linkage.h | 5 - + arch/x86/include/asm/pci.h | 2 - + arch/x86/include/asm/percpu.h | 7 +- + arch/x86/kernel/apic/io_apic.c | 4 +- + arch/x86/kernel/pci-dma.c | 64 - + arch/x86/kernel/ptrace.c | 4 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/x86/pci/direct.c | 17 +- + arch/x86/pci/irq.c | 4 +- + arch/x86/pci/mmconfig-shared.c | 10 + + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + drivers/acpi/pci_root.c | 14 +- + drivers/ata/pata_pcmcia.c | 2 +- + drivers/bluetooth/bluecard_cs.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 2 +- + drivers/bluetooth/btuart_cs.c | 2 +- + drivers/bluetooth/dtl1_cs.c | 2 +- + drivers/char/agp/intel-agp.c | 3 + + drivers/char/agp/intel-agp.h | 8 + + drivers/char/agp/intel-gtt.c | 10 + + drivers/char/agp/uninorth-agp.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/clocksource/Kconfig | 3 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/mmio.c | 73 + + drivers/clocksource/sh_cmt.c | 31 +- + drivers/clocksource/sh_tmu.c | 31 +- + drivers/crypto/Kconfig | 2 + + drivers/dma/shdma.c | 188 +- + drivers/dma/shdma.h | 1 + + drivers/gpu/drm/drm_edid.c | 61 +- + drivers/gpu/drm/drm_fb_helper.c | 207 +-- + drivers/gpu/drm/drm_irq.c | 9 +- + drivers/gpu/drm/drm_modes.c | 156 + + drivers/gpu/drm/drm_stub.c | 21 + + drivers/gpu/drm/i915/i915_debugfs.c | 131 +- + drivers/gpu/drm/i915/i915_dma.c | 60 +- + drivers/gpu/drm/i915/i915_drv.c | 68 +- + drivers/gpu/drm/i915/i915_drv.h | 113 +- + drivers/gpu/drm/i915/i915_gem.c | 36 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 35 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 311 ++- + drivers/gpu/drm/i915/i915_reg.h | 35 +- + drivers/gpu/drm/i915/i915_suspend.c | 3 +- + drivers/gpu/drm/i915/intel_bios.c | 6 +- + drivers/gpu/drm/i915/intel_crt.c | 24 +- + drivers/gpu/drm/i915/intel_display.c | 2379 +++++++++------- + drivers/gpu/drm/i915/intel_drv.h | 19 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 88 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 35 +- + drivers/gpu/drm/i915/intel_sdvo.c | 10 +- + drivers/gpu/drm/i915/intel_tv.c | 13 +- + drivers/gpu/drm/nouveau/Kconfig | 2 + + drivers/gpu/drm/nouveau/Makefile | 2 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 108 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_bios.h | 1 + + drivers/gpu/drm/nouveau/nouveau_channel.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 25 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 208 +- + drivers/gpu/drm/nouveau/nouveau_grctx.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 66 +- + drivers/gpu/drm/nouveau/nouveau_object.c | 118 +- + drivers/gpu/drm/nouveau/nouveau_perf.c | 92 +- + drivers/gpu/drm/nouveau/nouveau_pm.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_reg.h | 14 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 212 +- + drivers/gpu/drm/nouveau/nouveau_vm.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_volt.c | 10 +- + drivers/gpu/drm/nouveau/nv04_crtc.c | 9 +- + drivers/gpu/drm/nouveau/nv04_graph.c | 383 ++-- + drivers/gpu/drm/nouveau/nv04_instmem.c | 3 + + drivers/gpu/drm/nouveau/nv10_graph.c | 212 +- + drivers/gpu/drm/nouveau/nv20_graph.c | 510 ++-- + drivers/gpu/drm/nouveau/nv40_fifo.c | 2 + + drivers/gpu/drm/nouveau/nv40_graph.c | 323 ++- + drivers/gpu/drm/nouveau/nv40_mpeg.c | 311 ++ + drivers/gpu/drm/nouveau/nv50_calc.c | 68 +- + drivers/gpu/drm/nouveau/nv50_crtc.c | 13 +- + drivers/gpu/drm/nouveau/nv50_display.c | 18 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 442 ++-- + drivers/gpu/drm/nouveau/nv50_grctx.c | 10 +- + drivers/gpu/drm/nouveau/nv50_mpeg.c | 256 ++ + drivers/gpu/drm/nouveau/nv50_pm.c | 15 + + drivers/gpu/drm/nouveau/nv50_vm.c | 12 +- + drivers/gpu/drm/nouveau/nv84_crypt.c | 135 +- + drivers/gpu/drm/nouveau/nva3_copy.c | 226 ++ + drivers/gpu/drm/nouveau/nva3_copy.fuc | 870 ++++++ + drivers/gpu/drm/nouveau/nva3_copy.fuc.h | 534 ++++ + drivers/gpu/drm/nouveau/nva3_pm.c | 169 +- + drivers/gpu/drm/nouveau/nvc0_copy.c | 243 ++ + drivers/gpu/drm/nouveau/nvc0_copy.fuc.h | 527 ++++ + drivers/gpu/drm/nouveau/nvc0_fifo.c | 142 +- + drivers/gpu/drm/nouveau/nvc0_graph.c | 600 ++-- + drivers/gpu/drm/nouveau/nvc0_graph.h | 29 +- + drivers/gpu/drm/nouveau/nvc0_grctx.c | 20 +- + drivers/gpu/drm/radeon/atom.c | 4 +- + drivers/gpu/drm/radeon/atombios.h | 22 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 132 +- + drivers/gpu/drm/radeon/atombios_dp.c | 1046 ++++--- + drivers/gpu/drm/radeon/evergreen.c | 14 +- + drivers/gpu/drm/radeon/evergreend.h | 2 + + drivers/gpu/drm/radeon/ni.c | 8 +- + drivers/gpu/drm/radeon/nid.h | 4 +- + drivers/gpu/drm/radeon/radeon_asic.c | 4 + + drivers/gpu/drm/radeon/radeon_combios.c | 117 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 607 +++-- + drivers/gpu/drm/radeon/radeon_device.c | 3 + + drivers/gpu/drm/radeon/radeon_display.c | 10 +- + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 252 ++- + drivers/gpu/drm/radeon/radeon_i2c.c | 2 + + drivers/gpu/drm/radeon/radeon_mode.h | 19 +- + drivers/gpu/vga/vga_switcheroo.c | 6 - + drivers/gpu/vga/vgaarb.c | 113 +- + drivers/hwmon/coretemp.c | 20 +- + drivers/i2c/busses/Kconfig | 12 +- + drivers/i2c/busses/i2c-eg20t.c | 2 + + drivers/i2c/busses/i2c-i801.c | 60 +- + drivers/i2c/busses/i2c-nomadik.c | 276 ++- + drivers/i2c/busses/i2c-parport-light.c | 10 +- + drivers/i2c/busses/i2c-parport.c | 30 +- + drivers/i2c/busses/i2c-parport.h | 74 +- + drivers/i2c/busses/i2c-sh_mobile.c | 20 +- + drivers/i2c/busses/i2c-tegra.c | 39 +- + drivers/ide/ide-cs.c | 2 +- + drivers/input/evdev.c | 19 +- + drivers/input/input-polldev.c | 56 +- + drivers/input/input.c | 1 - + drivers/input/joydev.c | 1 - + drivers/input/keyboard/Kconfig | 22 + + drivers/input/keyboard/Makefile | 2 + + drivers/input/keyboard/adp5589-keys.c | 771 +++++ + drivers/input/keyboard/gpio_keys.c | 11 +- + drivers/input/keyboard/mpr121_touchkey.c | 339 +++ + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/keyboard/qt1070.c | 1 + + drivers/input/keyboard/sh_keysc.c | 53 +- + drivers/input/keyboard/tegra-kbc.c | 60 +- + drivers/input/misc/ad714x.c | 129 +- + drivers/input/misc/ati_remote2.c | 9 +- + drivers/input/misc/rotary_encoder.c | 119 +- + drivers/input/misc/twl4030-pwrbutton.c | 2 +- + drivers/input/mouse/elantech.c | 72 +- + drivers/input/mouse/elantech.h | 6 + + drivers/input/mousedev.c | 1 - + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ads7846.c | 26 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 92 +- + drivers/input/touchscreen/atmel_tsadcc.c | 2 +- + drivers/input/touchscreen/h3600_ts_input.c | 8 +- + drivers/input/touchscreen/max11801_ts.c | 272 ++ + drivers/input/touchscreen/tsc2007.c | 26 +- + drivers/isdn/hardware/avm/avm_cs.c | 2 +- + drivers/isdn/hisax/avma1_cs.c | 2 +- + drivers/isdn/hisax/elsa_cs.c | 2 +- + drivers/isdn/hisax/sedlbauer_cs.c | 2 +- + drivers/isdn/hisax/teles_cs.c | 2 +- + drivers/media/common/saa7146_core.c | 7 +- + drivers/media/common/tuners/Kconfig | 8 + + drivers/media/common/tuners/Makefile | 1 + + drivers/media/common/tuners/mxl5005s.c | 2 + + drivers/media/common/tuners/tda18212.c | 265 ++ + drivers/media/common/tuners/tda18212.h | 48 + + drivers/media/common/tuners/tda18212_priv.h | 44 + + drivers/media/common/tuners/tda18271-fe.c | 4 + + drivers/media/common/tuners/xc5000.c | 32 +- + drivers/media/dvb/b2c2/flexcop-pci.c | 4 +- + drivers/media/dvb/bt8xx/bt878.c | 2 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 117 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 365 ++-- + drivers/media/dvb/dvb-core/dvb_frontend.h | 3 + + drivers/media/dvb/dvb-usb/Kconfig | 5 + + drivers/media/dvb/dvb-usb/a800.c | 17 +- + drivers/media/dvb/dvb-usb/anysee.c | 620 ++++- + drivers/media/dvb/dvb-usb/anysee.h | 23 +- + drivers/media/dvb/dvb-usb/au6610.c | 22 +- + drivers/media/dvb/dvb-usb/ce6230.c | 11 +- + drivers/media/dvb/dvb-usb/dib0700.h | 5 +- + drivers/media/dvb/dvb-usb/dib0700_core.c | 220 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 8 +- + drivers/media/dvb/dvb-usb/dibusb-common.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 31 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/dw2102.c | 10 +- + drivers/media/dvb/dvb-usb/ec168.c | 18 +- + drivers/media/dvb/dvb-usb/friio.c | 23 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 165 +- + drivers/media/dvb/dvb-usb/lmedm04.h | 5 +- + drivers/media/dvb/dvb-usb/m920x.c | 49 +- + drivers/media/dvb/dvb-usb/nova-t-usb2.c | 2 +- + drivers/media/dvb/dvb-usb/opera1.c | 33 +- + drivers/media/dvb/dvb-usb/vp702x-fe.c | 80 +- + drivers/media/dvb/dvb-usb/vp702x.c | 213 ++- + drivers/media/dvb/dvb-usb/vp702x.h | 7 + + drivers/media/dvb/dvb-usb/vp7045.c | 47 +- + drivers/media/dvb/frontends/Kconfig | 19 +- + drivers/media/dvb/frontends/Makefile | 6 +- + drivers/media/dvb/frontends/bsbe1-d01a.h | 146 + + drivers/media/dvb/frontends/bsru6.h | 2 +- + drivers/media/dvb/frontends/cx24116.c | 21 +- + drivers/media/dvb/frontends/cx24116.h | 3 + + drivers/media/dvb/frontends/cxd2820r.h | 118 + + drivers/media/dvb/frontends/cxd2820r_c.c | 338 +++ + drivers/media/dvb/frontends/cxd2820r_core.c | 915 ++++++ + drivers/media/dvb/frontends/cxd2820r_priv.h | 166 ++ + drivers/media/dvb/frontends/cxd2820r_t.c | 449 +++ + drivers/media/dvb/frontends/cxd2820r_t2.c | 423 +++ + drivers/media/dvb/frontends/dib0070.c | 40 +- + drivers/media/dvb/frontends/dib0090.c | 71 +- + drivers/media/dvb/frontends/dib7000m.c | 49 +- + drivers/media/dvb/frontends/dib7000p.c | 74 +- + drivers/media/dvb/frontends/dib8000.c | 126 +- + drivers/media/dvb/frontends/dib9000.c | 176 +- + drivers/media/dvb/frontends/dibx000_common.c | 109 +- + drivers/media/dvb/frontends/dibx000_common.h | 5 + + drivers/media/dvb/frontends/drx397xD.c | 1511 ---------- + drivers/media/dvb/frontends/drx397xD.h | 130 - + drivers/media/dvb/frontends/drx397xD_fw.h | 40 - + drivers/media/dvb/frontends/drxd.h | 61 + + drivers/media/dvb/frontends/drxd_firm.c | 929 ++++++ + drivers/media/dvb/frontends/drxd_firm.h | 115 + + drivers/media/dvb/frontends/drxd_hard.c | 3001 ++++++++++++++++++++ + drivers/media/dvb/frontends/drxd_map_firm.h | 1013 +++++++ + drivers/media/dvb/frontends/eds1547.h | 2 +- + drivers/media/dvb/frontends/ix2505v.c | 10 +- + drivers/media/dvb/frontends/stv0288.c | 2 +- + drivers/media/dvb/frontends/stv0299.c | 10 +- + drivers/media/dvb/frontends/z0194a.h | 2 +- + drivers/media/dvb/mantis/hopper_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_pci.c | 5 +- + drivers/media/dvb/mantis/mantis_vp1033.c | 2 +- + drivers/media/dvb/pt1/pt1.c | 5 +- + drivers/media/dvb/siano/smsusb.c | 3 +- + drivers/media/dvb/ttpci/Kconfig | 2 + + drivers/media/dvb/ttpci/budget-ci.c | 21 + + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 60 +- + drivers/media/radio/si470x/radio-si470x-common.c | 60 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 63 +- + drivers/media/radio/si470x/radio-si470x.h | 4 +- + drivers/media/radio/wl128x/fmdrv.h | 2 - + drivers/media/rc/Kconfig | 11 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/imon.c | 36 +- + drivers/media/rc/ite-cir.c | 60 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 2 +- + drivers/media/rc/keymaps/rc-imon-mce.c | 2 +- + drivers/media/rc/keymaps/rc-imon-pad.c | 6 +- + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 2 +- + drivers/media/rc/keymaps/rc-rc6-mce.c | 4 +- + drivers/media/rc/keymaps/rc-tivo.c | 98 + + drivers/media/rc/keymaps/rc-winfast.c | 4 +- + drivers/media/rc/mceusb.c | 34 +- + drivers/media/rc/nuvoton-cir.c | 75 +- + drivers/media/rc/nuvoton-cir.h | 17 +- + drivers/media/rc/rc-loopback.c | 6 + + drivers/media/rc/rc-main.c | 54 +- + drivers/media/rc/redrat3.c | 1344 +++++++++ + drivers/media/rc/winbond-cir.c | 447 +++- + drivers/media/video/Kconfig | 149 +- + drivers/media/video/Makefile | 2 + + drivers/media/video/bt8xx/bttv-driver.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 2 +- + drivers/media/video/cx18/Kconfig | 4 + + drivers/media/video/cx18/cx18-cards.c | 18 +- + drivers/media/video/cx18/cx18-cards.h | 2 +- + drivers/media/video/cx18/cx18-driver.c | 27 +- + drivers/media/video/cx18/cx18-driver.h | 25 + + drivers/media/video/cx18/cx18-fileops.c | 70 + + drivers/media/video/cx18/cx18-fileops.h | 2 + + drivers/media/video/cx18/cx18-ioctl.c | 144 +- + drivers/media/video/cx18/cx18-mailbox.c | 58 + + drivers/media/video/cx18/cx18-streams.c | 177 ++- + drivers/media/video/cx18/cx18-version.h | 2 +- + drivers/media/video/cx18/cx23418.h | 6 + + drivers/media/video/cx231xx/cx231xx-cards.c | 67 + + drivers/media/video/cx231xx/cx231xx-dvb.c | 1 + + drivers/media/video/cx231xx/cx231xx.h | 2 + + drivers/media/video/cx23885/cx23885-cards.c | 1 + + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx88/cx88-blackbird.c | 41 +- + drivers/media/video/cx88/cx88-dvb.c | 2 + + drivers/media/video/cx88/cx88-mpeg.c | 42 +- + drivers/media/video/cx88/cx88-video.c | 7 +- + drivers/media/video/cx88/cx88.h | 11 +- + drivers/media/video/em28xx/Kconfig | 2 + + drivers/media/video/em28xx/em28xx-cards.c | 49 +- + drivers/media/video/em28xx/em28xx-core.c | 9 +- + drivers/media/video/em28xx/em28xx-dvb.c | 160 +- + drivers/media/video/em28xx/em28xx-i2c.c | 2 +- + drivers/media/video/em28xx/em28xx-reg.h | 1 + + drivers/media/video/em28xx/em28xx.h | 3 +- + drivers/media/video/fsl-viu.c | 56 +- + drivers/media/video/gspca/Kconfig | 9 + + drivers/media/video/gspca/Makefile | 2 + + drivers/media/video/gspca/cpia1.c | 6 +- + drivers/media/video/gspca/gl860/gl860.c | 15 +- + drivers/media/video/gspca/gspca.c | 4 +- + drivers/media/video/gspca/gspca.h | 6 +- + drivers/media/video/gspca/jeilinj.c | 581 +++-- + drivers/media/video/gspca/kinect.c | 429 +++ + drivers/media/video/gspca/spca508.c | 5 +- + drivers/media/video/gspca/stk014.c | 15 +- + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 2 + + drivers/media/video/gspca/sunplus.c | 99 +- + drivers/media/video/gspca/t613.c | 17 +- + drivers/media/video/gspca/zc3xx.c | 47 +- + drivers/media/video/ivtv/ivtv-driver.c | 4 +- + drivers/media/video/mt9m111.c | 14 +- + drivers/media/video/mt9v022.c | 2 +- + drivers/media/video/mt9v032.c | 773 +++++ + drivers/media/video/mx3_camera.c | 60 +- + drivers/media/video/omap1_camera.c | 43 +- + drivers/media/video/pvrusb2/pvrusb2-std.c | 10 +- + drivers/media/video/pwc/pwc-if.c | 2 +- + drivers/media/video/pwc/pwc-v4l.c | 23 +- + drivers/media/video/pxa_camera.c | 8 +- + drivers/media/video/s2255drv.c | 27 +- + drivers/media/video/s5p-fimc/Makefile | 6 +- + drivers/media/video/s5p-fimc/mipi-csis.c | 724 +++++ + drivers/media/video/s5p-fimc/mipi-csis.h | 22 + + drivers/media/video/saa7134/saa7134-cards.c | 125 + + drivers/media/video/saa7134/saa7134-core.c | 2 +- + drivers/media/video/saa7134/saa7134-dvb.c | 34 + + drivers/media/video/saa7134/saa7134-input.c | 8 + + drivers/media/video/saa7134/saa7134.h | 3 + + drivers/media/video/saa7164/saa7164-core.c | 2 +- + drivers/media/video/sh_mobile_ceu_camera.c | 148 +- + drivers/media/video/soc_camera.c | 29 +- + drivers/media/video/soc_mediabus.c | 265 ++- + drivers/media/video/tveeprom.c | 32 +- + drivers/media/video/usbvision/usbvision-cards.c | 33 +- + drivers/media/video/usbvision/usbvision-cards.h | 2 + + drivers/media/video/usbvision/usbvision-core.c | 165 +- + drivers/media/video/usbvision/usbvision-i2c.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 3 +- + drivers/media/video/usbvision/usbvision.h | 6 + + drivers/media/video/uvc/uvc_ctrl.c | 367 ++- + drivers/media/video/uvc/uvc_driver.c | 28 + + drivers/media/video/uvc/uvc_queue.c | 34 +- + drivers/media/video/uvc/uvc_v4l2.c | 68 +- + drivers/media/video/uvc/uvcvideo.h | 64 +- + drivers/media/video/v4l2-dev.c | 18 + + drivers/media/video/via-camera.c | 1 + + drivers/media/video/zoran/zoran_card.c | 10 +- + drivers/mmc/host/mmci.c | 6 +- + drivers/mmc/host/mmci.h | 41 +- + drivers/mmc/host/sdricoh_cs.c | 2 +- + drivers/mtd/Kconfig | 3 +- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/integrator-flash.c | 309 -- + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/mtd/maps/physmap.c | 28 +- + drivers/mtd/maps/pismo.c | 40 +- + drivers/mtd/ubi/cdev.c | 14 +- + drivers/mtd/ubi/debug.c | 21 +- + drivers/mtd/ubi/debug.h | 161 +- + drivers/mtd/ubi/io.c | 6 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 6 +- + drivers/mtd/ubi/ubi.h | 4 +- + drivers/mtd/ubi/wl.c | 3 +- + drivers/net/can/softing/softing_cs.c | 2 +- + drivers/net/e1000e/netdev.c | 2 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/3c589_cs.c | 2 +- + drivers/net/pcmcia/axnet_cs.c | 2 +- + drivers/net/pcmcia/com20020_cs.c | 2 +- + drivers/net/pcmcia/fmvj18x_cs.c | 2 +- + drivers/net/pcmcia/ibmtr_cs.c | 2 +- + drivers/net/pcmcia/nmclan_cs.c | 2 +- + drivers/net/pcmcia/pcnet_cs.c | 2 +- + drivers/net/pcmcia/smc91c92_cs.c | 2 +- + drivers/net/pcmcia/xirc2ps_cs.c | 2 +- + drivers/net/wireless/airo_cs.c | 2 +- + drivers/net/wireless/atmel_cs.c | 4 +- + drivers/net/wireless/b43/pcmcia.c | 2 +- + drivers/net/wireless/hostap/hostap_cs.c | 2 +- + drivers/net/wireless/libertas/if_cs.c | 2 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 2 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 2 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/parport/parport_cs.c | 2 +- + drivers/pci/access.c | 18 +- + drivers/pci/bus.c | 6 - + drivers/pci/hotplug/acpiphp_glue.c | 7 + + drivers/pci/hotplug/pcihp_slot.c | 45 + + drivers/pci/pci-sysfs.c | 62 + + drivers/pci/pci.c | 444 +++- + drivers/pci/pci.h | 3 +- + drivers/pci/pcie/aer/aer_inject.c | 2 +- + drivers/pci/pcie/aer/aerdrv.h | 9 - + drivers/pci/pcie/aspm.c | 21 +- + drivers/pci/probe.c | 43 +- + drivers/pci/quirks.c | 21 +- + drivers/pci/remove.c | 2 - + drivers/pci/setup-bus.c | 125 +- + drivers/pcmcia/ds.c | 6 +- + drivers/pcmcia/sa1100_generic.c | 2 +- + drivers/platform/x86/Kconfig | 7 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/mxm-wmi.c | 111 + + drivers/s390/block/dasd_alias.c | 4 - + drivers/s390/block/dasd_eckd.c | 11 +- + drivers/s390/char/Kconfig | 12 - + drivers/s390/char/Makefile | 3 +- + drivers/s390/char/monwriter.c | 4 +- + drivers/s390/char/raw3270.c | 2 - + drivers/s390/char/sclp.h | 24 + + drivers/s390/char/sclp_config.c | 14 +- + drivers/s390/char/sclp_ocf.c | 145 + + drivers/s390/char/sclp_sdias.c | 3 - + drivers/s390/char/sclp_tty.c | 122 +- + drivers/s390/char/tape_3590.c | 11 +- + drivers/s390/char/tape_block.c | 444 --- + drivers/s390/char/tape_std.c | 3 +- + drivers/s390/cio/chsc.c | 35 +- + drivers/s390/cio/device_fsm.c | 8 +- + drivers/s390/cio/device_ops.c | 3 - + drivers/s390/cio/qdio_main.c | 2 +- + drivers/s390/crypto/ap_bus.c | 8 +- + drivers/scsi/pcmcia/aha152x_stub.c | 2 +- + drivers/scsi/pcmcia/fdomain_stub.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/pcmcia/qlogic_stub.c | 2 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 2 +- + drivers/sh/clk/cpg.c | 2 +- + drivers/sh/intc/virq.c | 5 + + drivers/spi/coldfire_qspi.c | 1 + + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/das08_cs.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 2 +- + drivers/staging/lirc/lirc_sasem.c | 13 +- + drivers/staging/tm6000/CARDLIST | 16 + + drivers/staging/tm6000/tm6000-alsa.c | 3 - + drivers/staging/tm6000/tm6000-cards.c | 381 +++- + drivers/staging/tm6000/tm6000-core.c | 109 +- + drivers/staging/tm6000/tm6000-i2c.c | 33 +- + drivers/staging/tm6000/tm6000-stds.c | 923 ++----- + drivers/staging/tm6000/tm6000-usb-isoc.h | 2 +- + drivers/staging/tm6000/tm6000-video.c | 212 +- + drivers/staging/tm6000/tm6000.h | 46 +- + drivers/staging/wlags49_h2/wl_cs.c | 2 +- + drivers/telephony/ixj_pcmcia.c | 2 +- + drivers/tty/ipwireless/main.c | 2 +- + drivers/tty/serial/serial_cs.c | 2 +- + drivers/tty/serial/sh-sci.c | 16 +- + drivers/tty/serial/sh-sci.h | 16 +- + drivers/usb/host/sl811_cs.c | 2 +- + drivers/video/Kconfig | 5 +- + drivers/video/imxfb.c | 28 +- + fs/binfmt_flat.c | 8 + + fs/dlm/config.c | 9 +- + fs/dlm/config.h | 1 + + fs/dlm/dlm_internal.h | 3 + + fs/dlm/lock.c | 182 +- + fs/dlm/lock.h | 1 + + fs/dlm/lockspace.c | 6 +- + fs/dlm/plock.c | 65 +- + fs/dlm/user.c | 1 - + fs/ext2/super.c | 3 +- + fs/ext3/namei.c | 80 +- + fs/fat/cache.c | 7 + + fs/fat/dir.c | 32 +- + fs/fat/fat.h | 15 +- + fs/fat/fatent.c | 4 +- + fs/fat/inode.c | 74 +- + fs/fat/misc.c | 44 +- + fs/fat/namei_msdos.c | 4 +- + fs/fat/namei_vfat.c | 4 +- + fs/jbd/commit.c | 15 +- + fs/jbd/journal.c | 16 +- + fs/jbd/transaction.c | 3 +- + fs/jbd2/commit.c | 6 - + fs/ubifs/budget.c | 104 +- + fs/ubifs/commit.c | 2 +- + fs/ubifs/debug.c | 167 +- + fs/ubifs/debug.h | 178 +- + fs/ubifs/dir.c | 4 +- + fs/ubifs/file.c | 28 +- + fs/ubifs/find.c | 10 +- + fs/ubifs/gc.c | 71 +- + fs/ubifs/io.c | 33 +- + fs/ubifs/journal.c | 29 +- + fs/ubifs/log.c | 28 +- + fs/ubifs/lprops.c | 115 +- + fs/ubifs/lpt_commit.c | 55 +- + fs/ubifs/master.c | 8 +- + fs/ubifs/misc.h | 17 + + fs/ubifs/orphan.c | 3 +- + fs/ubifs/recovery.c | 354 ++-- + fs/ubifs/replay.c | 468 ++-- + fs/ubifs/sb.c | 153 +- + fs/ubifs/super.c | 46 +- + fs/ubifs/tnc.c | 10 +- + fs/ubifs/tnc_commit.c | 18 +- + fs/ubifs/ubifs-media.h | 30 +- + fs/ubifs/ubifs.h | 86 +- + fs/ubifs/xattr.c | 8 +- + fs/xfs/linux-2.6/xfs_buf.c | 22 +- + fs/xfs/linux-2.6/xfs_buf.h | 1 + + fs/xfs/linux-2.6/xfs_ioctl32.c | 3 +- + fs/xfs/linux-2.6/xfs_ioctl32.h | 1 + + fs/xfs/linux-2.6/xfs_linux.h | 1 + + fs/xfs/linux-2.6/xfs_message.c | 20 +- + fs/xfs/linux-2.6/xfs_message.h | 7 +- + fs/xfs/linux-2.6/xfs_super.c | 4 - + fs/xfs/linux-2.6/xfs_sync.c | 10 + + fs/xfs/linux-2.6/xfs_trace.h | 76 +- + fs/xfs/xfs_ag.h | 1 - + fs/xfs/xfs_alloc.c | 844 ++++-- + fs/xfs/xfs_alloc.h | 15 +- + fs/xfs/xfs_alloc_btree.c | 13 +- + fs/xfs/xfs_dfrag.c | 6 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_inode_item.c | 1 - + fs/xfs/xfs_log.c | 15 +- + fs/xfs/xfs_log.h | 2 - + fs/xfs/xfs_log_cil.c | 5 +- + fs/xfs/xfs_log_priv.h | 2 + + fs/xfs/xfs_log_recover.c | 75 +- + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_trans.c | 6 +- + fs/xfs/xfs_types.h | 2 - + include/asm-generic/pgtable.h | 12 +- + include/asm-generic/vmlinux.lds.h | 61 +- + include/drm/drmP.h | 49 +- + include/drm/drm_crtc.h | 6 +- + include/drm/drm_dp_helper.h | 5 + + include/drm/drm_edid.h | 25 +- + include/drm/drm_fb_helper.h | 16 +- + include/linux/Kbuild | 1 + + include/linux/capability.h | 5 - + include/linux/clocksource.h | 8 + + include/linux/dlm_plock.h | 6 +- + include/linux/dvb/frontend.h | 20 +- + include/linux/dvb/version.h | 2 +- + include/linux/elf.h | 1 + + include/linux/gpio_keys.h | 8 +- + include/linux/i2c/i2c-sh_mobile.h | 10 + + include/linux/i2c/mpr121_touchkey.h | 20 + + include/linux/i2c/tsc2007.h | 7 + + include/linux/init_task.h | 7 - + include/linux/input/ad714x.h | 3 +- + include/linux/input/adp5589.h | 213 ++ + include/linux/key.h | 13 + + include/linux/kmod.h | 3 + + include/linux/kvm_host.h | 1 + + include/linux/linkage.h | 4 - + include/linux/lsm_audit.h | 11 +- + include/linux/mtd/physmap.h | 4 +- + include/linux/mtd/ubi.h | 4 +- + include/linux/mxm-wmi.h | 33 + + include/linux/page-flags.h | 2 +- + include/linux/pci-aspm.h | 1 + + include/linux/pci.h | 56 +- + include/linux/pci_ids.h | 2 + + include/linux/pci_regs.h | 17 + + include/linux/rotary_encoder.h | 1 + + include/linux/spi/ads7846.h | 3 +- + include/linux/uvcvideo.h | 69 + + include/linux/v4l2-mediabus.h | 3 + + include/linux/videodev2.h | 4 + + include/media/mt9v032.h | 12 + + include/media/rc-core.h | 7 +- + include/media/rc-map.h | 1 + + include/media/soc_camera.h | 15 +- + include/media/soc_camera_platform.h | 50 + + include/media/soc_mediabus.h | 25 +- + include/media/v4l2-dev.h | 2 + + include/mtd/ubi-user.h | 40 +- + include/pcmcia/ds.h | 2 +- + init/Kconfig | 30 +- + kernel/capability.c | 4 - + kernel/cred.c | 6 +- + kernel/kmod.c | 100 + + kernel/profile.c | 6 +- + kernel/sysctl.c | 6 + + kernel/watchdog.c | 2 +- + kernel/workqueue.c | 4 +- + lib/flex_array.c | 26 +- + mm/percpu.c | 6 +- + mm/rmap.c | 11 +- + net/dns_resolver/dns_key.c | 10 +- + scripts/.gitignore | 1 + + scripts/Kbuild.include | 12 + + scripts/Makefile | 7 +- + scripts/Makefile.asm-generic | 23 + + scripts/Makefile.build | 74 +- + scripts/Makefile.headersinst | 10 +- + scripts/Makefile.lib | 2 +- + scripts/basic/.gitignore | 2 - + scripts/basic/Makefile | 3 +- + scripts/{basic => }/docproc.c | 0 + scripts/gen_initramfs_list.sh | 27 +- + scripts/kallsyms.c | 2 + + scripts/mkcompile_h | 30 +- + security/Kconfig | 1 + + security/commoncap.c | 13 +- + security/keys/internal.h | 4 +- + security/keys/keyctl.c | 6 + + security/keys/keyring.c | 37 +- + security/keys/proc.c | 2 +- + security/keys/process_keys.c | 12 +- + security/keys/request_key.c | 3 +- + security/keys/request_key_auth.c | 3 +- + security/keys/user_defined.c | 4 +- + security/lsm_audit.c | 59 +- + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 92 +- + security/selinux/include/security.h | 9 +- + security/selinux/netnode.c | 1 + + security/selinux/selinuxfs.c | 28 +- + security/selinux/ss/policydb.c | 244 ++- + security/selinux/ss/policydb.h | 12 +- + security/selinux/ss/services.c | 72 +- + security/smack/smack.h | 11 +- + security/smack/smack_lsm.c | 48 +- + security/tomoyo/common.c | 17 +- + security/tomoyo/file.c | 1 - + security/tomoyo/memory.c | 1 + + security/tomoyo/mount.c | 1 + + security/tomoyo/util.c | 2 +- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +- + sound/pcmcia/vx/vxpocket.c | 2 +- + tools/perf/util/event.c | 2 +- + usr/gen_init_cpio.c | 53 +- + virt/kvm/assigned-dev.c | 18 +- + 1252 files changed, 43407 insertions(+), 37781 deletions(-) + create mode 100644 Documentation/DocBook/v4l/pixfmt-m420.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-y10b.xml + create mode 100644 Documentation/video4linux/uvcvideo.txt + create mode 100644 arch/arm/configs/mxs_defconfig + delete mode 100644 arch/arm/configs/ns9xxx_defconfig + delete mode 100644 arch/arm/configs/spear310_defconfig + delete mode 100644 arch/arm/configs/spear320_defconfig + rename arch/arm/configs/{spear300_defconfig => spear3xx_defconfig} (93%) + rename arch/arm/configs/{spear600_defconfig => spear6xx_defconfig} (97%) + delete mode 100644 arch/arm/configs/stmp378x_defconfig + delete mode 100644 arch/arm/configs/stmp37xx_defconfig + delete mode 100644 arch/arm/mach-exynos4/include/mach/smp.h + create mode 100644 arch/arm/mach-imx/cache-l2x0.c + rename arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c (99%) + rename arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} (72%) + create mode 100644 arch/arm/mach-imx/cpu-imx35.c + rename arch/arm/{mach-mx3/crm_regs.h => mach-imx/crmregs-imx31.h} (100%) + rename arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h (67%) + rename arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h (69%) + rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c (99%) + rename arch/arm/{mach-mx3/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd35-baseboard.c} (92%) + rename arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c (100%) + create mode 100644 arch/arm/mach-imx/mach-apf9328.c + rename arch/arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c (95%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-bug.c (98%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c (96%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c (92%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c (94%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c (92%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c (97%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-qong.c (95%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c (94%) + create mode 100644 arch/arm/mach-imx/mm-imx31.c + create mode 100644 arch/arm/mach-imx/mm-imx35.c + rename arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c (95%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c (98%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-devboard.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-marxbot.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-smartbot.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/pcm037.h (100%) + delete mode 100644 arch/arm/mach-msm/include/mach/smp.h + delete mode 100644 arch/arm/mach-mx3/Kconfig + delete mode 100644 arch/arm/mach-mx3/Makefile + delete mode 100644 arch/arm/mach-mx3/Makefile.boot + delete mode 100644 arch/arm/mach-mx3/devices.c + delete mode 100644 arch/arm/mach-mx3/devices.h + delete mode 100644 arch/arm/mach-mx3/mm.c + delete mode 100644 arch/arm/mach-mxc91231/Kconfig + delete mode 100644 arch/arm/mach-mxc91231/Makefile + delete mode 100644 arch/arm/mach-mxc91231/Makefile.boot + delete mode 100644 arch/arm/mach-mxc91231/clock.c + delete mode 100644 arch/arm/mach-mxc91231/crm_regs.h + delete mode 100644 arch/arm/mach-mxc91231/devices.c + delete mode 100644 arch/arm/mach-mxc91231/devices.h + delete mode 100644 arch/arm/mach-mxc91231/iomux.c + delete mode 100644 arch/arm/mach-mxc91231/magx-zn5.c + delete mode 100644 arch/arm/mach-mxc91231/mm.c + delete mode 100644 arch/arm/mach-mxc91231/system.c + create mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c + delete mode 100644 arch/arm/mach-ns9xxx/Kconfig + delete mode 100644 arch/arm/mach-ns9xxx/Makefile + delete mode 100644 arch/arm/mach-ns9xxx/Makefile.boot + delete mode 100644 arch/arm/mach-ns9xxx/board-a9m9750dev.c + delete mode 100644 arch/arm/mach-ns9xxx/board-a9m9750dev.h + delete mode 100644 arch/arm/mach-ns9xxx/board-jscc9p9360.c + delete mode 100644 arch/arm/mach-ns9xxx/board-jscc9p9360.h + delete mode 100644 arch/arm/mach-ns9xxx/clock.c + delete mode 100644 arch/arm/mach-ns9xxx/clock.h + delete mode 100644 arch/arm/mach-ns9xxx/generic.c + delete mode 100644 arch/arm/mach-ns9xxx/generic.h + delete mode 100644 arch/arm/mach-ns9xxx/gpio-ns9360.c + delete mode 100644 arch/arm/mach-ns9xxx/gpio-ns9360.h + delete mode 100644 arch/arm/mach-ns9xxx/gpio.c + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/board.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/gpio.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/io.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/memory.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/module.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/processor.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-bbu.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-mem.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/system.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/timex.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ns9xxx/irq.c + delete mode 100644 arch/arm/mach-ns9xxx/mach-cc9p9360dev.c + delete mode 100644 arch/arm/mach-ns9xxx/mach-cc9p9360js.c + delete mode 100644 arch/arm/mach-ns9xxx/plat-serial8250.c + delete mode 100644 arch/arm/mach-ns9xxx/processor-ns9360.c + delete mode 100644 arch/arm/mach-ns9xxx/time-ns9360.c + delete mode 100644 arch/arm/mach-realview/include/mach/smp.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/smp.h + delete mode 100644 arch/arm/mach-spear3xx/Kconfig300 + delete mode 100644 arch/arm/mach-spear3xx/Kconfig310 + delete mode 100644 arch/arm/mach-spear3xx/Kconfig320 + delete mode 100644 arch/arm/mach-spear6xx/Kconfig600 + delete mode 100644 arch/arm/mach-stmp378x/Makefile + delete mode 100644 arch/arm/mach-stmp378x/Makefile.boot + delete mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioin.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioout.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-bch.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dcp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-digctl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dram.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dri.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-emi.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-i2c.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ir.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lradc.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pwm.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pxp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-rtc.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-saif.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-spdif.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ssp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-sydma.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h + delete mode 100644 arch/arm/mach-stmp378x/stmp378x.c + delete mode 100644 arch/arm/mach-stmp378x/stmp378x.h + delete mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c + delete mode 100644 arch/arm/mach-stmp37xx/Makefile + delete mode 100644 arch/arm/mach-stmp37xx/Makefile.boot + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioout.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h + delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c + delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h + delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c + delete mode 100644 arch/arm/mach-tegra/include/mach/legacy_irq.h + delete mode 100644 arch/arm/mach-tegra/include/mach/smp.h + delete mode 100644 arch/arm/mach-tegra/legacy_irq.c + delete mode 100644 arch/arm/mach-ux500/include/mach/smp.h + delete mode 100644 arch/arm/mach-vexpress/include/mach/smp.h + create mode 100644 arch/arm/plat-mxc/devices/platform-ipu-core.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rtc.c + delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h + delete mode 100644 arch/arm/plat-mxc/include/mach/mxc91231.h + delete mode 100644 arch/arm/plat-omap/include/plat/smp.h + create mode 100644 arch/arm/plat-orion/common.c + create mode 100644 arch/arm/plat-orion/include/plat/common.h + create mode 100644 arch/arm/plat-orion/include/plat/mpp.h + create mode 100644 arch/arm/plat-orion/mpp.c + delete mode 100644 arch/arm/plat-stmp3xxx/Kconfig + delete mode 100644 arch/arm/plat-stmp3xxx/Makefile + delete mode 100644 arch/arm/plat-stmp3xxx/clock.c + delete mode 100644 arch/arm/plat-stmp3xxx/clock.h + delete mode 100644 arch/arm/plat-stmp3xxx/core.c + delete mode 100644 arch/arm/plat-stmp3xxx/devices.c + delete mode 100644 arch/arm/plat-stmp3xxx/dma.c + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpmi.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/mmc.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h + delete mode 100644 arch/arm/plat-stmp3xxx/irq.c + delete mode 100644 arch/arm/plat-stmp3xxx/pinmux.c + delete mode 100644 arch/arm/plat-stmp3xxx/timer.c + delete mode 100644 arch/m68k/kernel/asm-offsets_mm.c + delete mode 100644 arch/m68k/kernel/asm-offsets_no.c + delete mode 100644 arch/m68k/kernel/m68k_ksyms_mm.c + delete mode 100644 arch/m68k/kernel/m68k_ksyms_no.c + delete mode 100644 arch/m68k/kernel/sys_m68k_mm.c + delete mode 100644 arch/m68k/kernel/sys_m68k_no.c + delete mode 100644 arch/m68k/lib/Makefile_mm + delete mode 100644 arch/m68k/lib/Makefile_no + delete mode 100644 arch/m68k/lib/checksum.c + delete mode 100644 arch/m68k/lib/muldi3_mm.c + delete mode 100644 arch/m68k/lib/muldi3_no.c + delete mode 100644 arch/m68k/mm/Makefile_mm + delete mode 100644 arch/m68k/mm/Makefile_no + delete mode 100644 arch/m68k/mm/kmap_mm.c + delete mode 100644 arch/m68k/mm/kmap_no.c + create mode 100644 drivers/clocksource/mmio.c + create mode 100644 drivers/gpu/drm/nouveau/nv40_mpeg.c + create mode 100644 drivers/gpu/drm/nouveau/nv50_mpeg.c + create mode 100644 drivers/gpu/drm/nouveau/nva3_copy.c + create mode 100644 drivers/gpu/drm/nouveau/nva3_copy.fuc + create mode 100644 drivers/gpu/drm/nouveau/nva3_copy.fuc.h + create mode 100644 drivers/gpu/drm/nouveau/nvc0_copy.c + create mode 100644 drivers/gpu/drm/nouveau/nvc0_copy.fuc.h + create mode 100644 drivers/input/keyboard/adp5589-keys.c + create mode 100644 drivers/input/keyboard/mpr121_touchkey.c + create mode 100644 drivers/input/touchscreen/max11801_ts.c + create mode 100644 drivers/media/common/tuners/tda18212.c + create mode 100644 drivers/media/common/tuners/tda18212.h + create mode 100644 drivers/media/common/tuners/tda18212_priv.h + create mode 100644 drivers/media/dvb/frontends/bsbe1-d01a.h + create mode 100644 drivers/media/dvb/frontends/cxd2820r.h + create mode 100644 drivers/media/dvb/frontends/cxd2820r_c.c + create mode 100644 drivers/media/dvb/frontends/cxd2820r_core.c + create mode 100644 drivers/media/dvb/frontends/cxd2820r_priv.h + create mode 100644 drivers/media/dvb/frontends/cxd2820r_t.c + create mode 100644 drivers/media/dvb/frontends/cxd2820r_t2.c + delete mode 100644 drivers/media/dvb/frontends/drx397xD.c + delete mode 100644 drivers/media/dvb/frontends/drx397xD.h + delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h + create mode 100644 drivers/media/dvb/frontends/drxd.h + create mode 100644 drivers/media/dvb/frontends/drxd_firm.c + create mode 100644 drivers/media/dvb/frontends/drxd_firm.h + create mode 100644 drivers/media/dvb/frontends/drxd_hard.c + create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h + create mode 100644 drivers/media/rc/keymaps/rc-tivo.c + create mode 100644 drivers/media/rc/redrat3.c + create mode 100644 drivers/media/video/gspca/kinect.c + create mode 100644 drivers/media/video/mt9v032.c + create mode 100644 drivers/media/video/s5p-fimc/mipi-csis.c + create mode 100644 drivers/media/video/s5p-fimc/mipi-csis.h + delete mode 100644 drivers/mtd/maps/integrator-flash.c + create mode 100644 drivers/platform/x86/mxm-wmi.c + create mode 100644 drivers/s390/char/sclp_ocf.c + delete mode 100644 drivers/s390/char/tape_block.c + create mode 100644 drivers/staging/tm6000/CARDLIST + create mode 100644 include/linux/i2c/i2c-sh_mobile.h + create mode 100644 include/linux/i2c/mpr121_touchkey.h + create mode 100644 include/linux/input/adp5589.h + create mode 100644 include/linux/mxm-wmi.h + create mode 100644 include/linux/uvcvideo.h + create mode 100644 include/media/mt9v032.h + create mode 100644 scripts/Makefile.asm-generic + rename scripts/{basic => }/docproc.c (100%) +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 +Resolved 'arch/sparc/include/asm/smp_32.h' using previous resolution. +Resolved 'arch/sparc/kernel/smp_32.c' using previous resolution. +Auto-merging arch/sparc/include/asm/smp_32.h +CONFLICT (content): Merge conflict in arch/sparc/include/asm/smp_32.h +Auto-merging arch/sparc/kernel/smp_32.c +CONFLICT (content): Merge conflict in arch/sparc/kernel/smp_32.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bc19628] Merge remote-tracking branch 'sparc-current/master' +$ git diff -M --stat --summary HEAD^.. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/benet/be_cmds.c | 3 +- + drivers/net/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ehea/ehea_main.c | 2 +- + drivers/net/irda/bfin_sir.c | 59 ++++++++++++++++----------------- + drivers/net/irda/bfin_sir.h | 63 ++--------------------------------- + drivers/net/usb/cdc_ncm.c | 73 ++++++++++++++--------------------------- + include/asm-generic/bug.h | 37 +++++++++++++++++++++ + include/net/dst.h | 2 + + net/802/psnap.c | 1 - + net/atm/proc.c | 4 +- + net/bridge/br_netfilter.c | 6 +++- + net/can/bcm.c | 6 ++-- + net/core/dev.c | 5 ++- + net/core/dst.c | 2 +- + net/core/filter.c | 4 ++- + net/ipv4/igmp.c | 10 +++--- + net/ipv4/ping.c | 3 -- + net/ipv4/raw.c | 2 +- + net/ipv4/tcp_ipv4.c | 6 ++-- + net/ipv4/udp.c | 2 +- + net/ipv6/raw.c | 2 +- + net/ipv6/tcp_ipv6.c | 6 ++-- + net/ipv6/udp.c | 2 +- + net/ipv6/xfrm6_tunnel.c | 2 +- + net/key/af_key.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/packet/af_packet.c | 2 +- + net/phonet/socket.c | 2 +- + net/sched/sch_sfq.c | 8 +++- + net/sctp/proc.c | 4 +- + net/unix/af_unix.c | 2 +- + 31 files changed, 148 insertions(+), 178 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Auto-merging drivers/pci/probe.c +Merge made by recursive. + drivers/pci/probe.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +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 +Already up-to-date. +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 +Merge made by recursive. + arch/arm/mach-shmobile/clock-sh7372.c | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +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 at91/at91-next +$ git merge at91/at91-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/configs/at91sam9261_defconfig +Auto-merging arch/arm/configs/at91sam9263_defconfig +Removing arch/arm/configs/neocore926_defconfig +Removing arch/arm/configs/usb-a9263_defconfig +Auto-merging arch/arm/mach-at91/at91cap9_devices.c +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c +Auto-merging drivers/tty/serial/atmel_serial.c +Merge made by recursive. + arch/arm/Kconfig | 2 + + ...91sam9261ek_defconfig => at91sam9261_defconfig} | 85 ++++++++++++++-- + ...91sam9263ek_defconfig => at91sam9263_defconfig} | 84 ++++++++++++++-- + arch/arm/configs/neocore926_defconfig | 104 ------------------- + arch/arm/configs/usb-a9263_defconfig | 106 -------------------- + arch/arm/mach-at91/Kconfig | 19 ---- + arch/arm/mach-at91/at572d940hf.c | 69 +++++++++++++- + arch/arm/mach-at91/at572d940hf_devices.c | 26 +++-- + arch/arm/mach-at91/at91cap9.c | 63 ++++++++++++- + arch/arm/mach-at91/at91cap9_devices.c | 32 +++--- + arch/arm/mach-at91/at91rm9200.c | 55 ++++++++++- + arch/arm/mach-at91/at91rm9200_devices.c | 32 +++--- + arch/arm/mach-at91/at91sam9260.c | 60 +++++++++++- + arch/arm/mach-at91/at91sam9260_devices.c | 35 +++---- + arch/arm/mach-at91/at91sam9261.c | 61 +++++++++++- + arch/arm/mach-at91/at91sam9261_devices.c | 30 +++--- + arch/arm/mach-at91/at91sam9263.c | 59 +++++++++++- + arch/arm/mach-at91/at91sam9263_devices.c | 28 +++--- + arch/arm/mach-at91/at91sam9g45.c | 89 +++++++++++++---- + arch/arm/mach-at91/at91sam9g45_devices.c | 35 +++---- + arch/arm/mach-at91/at91sam9rl.c | 56 ++++++++++- + arch/arm/mach-at91/at91sam9rl_devices.c | 31 +++--- + arch/arm/mach-at91/at91x40.c | 5 - + arch/arm/mach-at91/board-1arm.c | 6 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 6 +- + arch/arm/mach-at91/board-at572d940hf_ek.c | 13 +-- + arch/arm/mach-at91/board-cam60.c | 6 +- + arch/arm/mach-at91/board-cap9adk.c | 13 +-- + arch/arm/mach-at91/board-carmeva.c | 6 +- + arch/arm/mach-at91/board-cpu9krea.c | 6 +- + arch/arm/mach-at91/board-cpuat91.c | 6 +- + arch/arm/mach-at91/board-csb337.c | 6 +- + arch/arm/mach-at91/board-csb637.c | 6 +- + arch/arm/mach-at91/board-eb01.c | 4 +- + arch/arm/mach-at91/board-eb9200.c | 6 +- + arch/arm/mach-at91/board-ecbat91.c | 6 +- + arch/arm/mach-at91/board-eco920.c | 25 +---- + arch/arm/mach-at91/board-flexibity.c | 6 +- + arch/arm/mach-at91/board-foxg20.c | 6 +- + arch/arm/mach-at91/board-gsia18s.c | 8 +- + arch/arm/mach-at91/board-kafa.c | 6 +- + arch/arm/mach-at91/board-kb9202.c | 6 +- + arch/arm/mach-at91/board-neocore926.c | 6 +- + arch/arm/mach-at91/board-pcontrol-g20.c | 8 +- + arch/arm/mach-at91/board-picotux200.c | 6 +- + arch/arm/mach-at91/board-qil-a9260.c | 6 +- + arch/arm/mach-at91/board-rm9200dk.c | 6 +- + arch/arm/mach-at91/board-rm9200ek.c | 6 +- + arch/arm/mach-at91/board-sam9-l9260.c | 6 +- + arch/arm/mach-at91/board-sam9260ek.c | 13 +-- + arch/arm/mach-at91/board-sam9261ek.c | 13 +-- + arch/arm/mach-at91/board-sam9263ek.c | 13 +-- + arch/arm/mach-at91/board-sam9g20ek.c | 17 ++-- + arch/arm/mach-at91/board-sam9m10g45ek.c | 13 +-- + arch/arm/mach-at91/board-sam9rlek.c | 6 +- + arch/arm/mach-at91/board-snapper9260.c | 6 +- + arch/arm/mach-at91/board-stamp9g20.c | 18 ++-- + arch/arm/mach-at91/board-usb-a9260.c | 6 +- + arch/arm/mach-at91/board-usb-a9263.c | 6 +- + arch/arm/mach-at91/board-yl-9200.c | 6 +- + arch/arm/mach-at91/clock.c | 54 +++------- + arch/arm/mach-at91/clock.h | 19 +++- + arch/arm/mach-at91/generic.h | 23 ++++- + arch/arm/mach-at91/include/mach/at572d940hf.h | 2 - + arch/arm/mach-at91/include/mach/at91cap9.h | 4 - + arch/arm/mach-at91/include/mach/at91rm9200.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9260.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9261.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9263.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9g45.h | 4 - + arch/arm/mach-at91/include/mach/at91sam9rl.h | 2 - + arch/arm/mach-at91/include/mach/at91x40.h | 2 - + arch/arm/mach-at91/include/mach/board.h | 1 + + arch/arm/mach-at91/include/mach/clkdev.h | 7 ++ + arch/arm/mach-at91/include/mach/hardware.h | 13 +-- + arch/arm/mach-at91/include/mach/memory.h | 2 - + arch/arm/mach-at91/include/mach/stamp9g20.h | 2 +- + arch/arm/mach-at91/include/mach/system_rev.h | 25 +++++ + arch/avr32/mach-at32ap/at32ap700x.c | 4 +- + arch/avr32/mach-at32ap/include/mach/board.h | 1 + + drivers/tty/serial/atmel_serial.c | 2 +- + 81 files changed, 984 insertions(+), 665 deletions(-) + rename arch/arm/configs/{at91sam9261ek_defconfig => at91sam9261_defconfig} (53%) + rename arch/arm/configs/{at91sam9263ek_defconfig => at91sam9263_defconfig} (57%) + delete mode 100644 arch/arm/configs/neocore926_defconfig + delete mode 100644 arch/arm/configs/usb-a9263_defconfig + create mode 100644 arch/arm/mach-at91/include/mach/clkdev.h + create mode 100644 arch/arm/mach-at91/include/mach/system_rev.h +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Merge made by recursive. + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/devices-da8xx.c | 16 +++++++++------- + arch/arm/mach-davinci/devices.c | 3 +++ + arch/arm/mach-davinci/include/mach/da8xx.h | 4 ---- + arch/arm/mach-davinci/include/mach/hardware.h | 3 --- + 5 files changed, 13 insertions(+), 15 deletions(-) +Merging i.MX/for-next +$ git merge i.MX/for-next +Already up-to-date. +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/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 +Auto-merging arch/arm/mach-omap2/Makefile +Removing arch/arm/mach-omap2/board-igep0030.c +Auto-merging arch/arm/plat-omap/include/plat/uncompress.h +Removing drivers/video/omap/lcd_omap2evm.c +Removing sound/soc/omap/omap2evm.c +Merge made by recursive. + arch/arm/configs/omap2plus_defconfig | 83 +---- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/Makefile | 4 +- + arch/arm/mach-omap2/board-2430sdp.c | 27 +-- + arch/arm/mach-omap2/board-3430sdp.c | 151 ++------- + arch/arm/mach-omap2/board-4430sdp.c | 114 ++----- + arch/arm/mach-omap2/board-am3517crane.c | 10 +- + arch/arm/mach-omap2/board-am3517evm.c | 56 +-- + arch/arm/mach-omap2/board-apollon.c | 29 +- + arch/arm/mach-omap2/board-cm-t35.c | 236 ++---------- + arch/arm/mach-omap2/board-cm-t3517.c | 9 +- + arch/arm/mach-omap2/board-devkit8000.c | 131 +------ + arch/arm/mach-omap2/board-igep0020.c | 449 +++++++++++----------- + arch/arm/mach-omap2/board-igep0030.c | 458 ----------------------- + arch/arm/mach-omap2/board-ldp.c | 138 +------- + arch/arm/mach-omap2/board-n8x0.c | 28 +- + arch/arm/mach-omap2/board-omap3beagle.c | 194 +++------- + arch/arm/mach-omap2/board-omap3evm.c | 242 +++---------- + arch/arm/mach-omap2/board-omap3logic.c | 14 +- + arch/arm/mach-omap2/board-omap3pandora.c | 90 +---- + arch/arm/mach-omap2/board-omap3stalker.c | 133 +------ + arch/arm/mach-omap2/board-omap3touchbook.c | 121 +------ + arch/arm/mach-omap2/board-omap4panda.c | 79 ++--- + arch/arm/mach-omap2/board-overo.c | 265 +++----------- + arch/arm/mach-omap2/board-rm680.c | 21 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 42 +-- + arch/arm/mach-omap2/board-rx51-video.c | 5 +- + arch/arm/mach-omap2/board-rx51.c | 18 +- + arch/arm/mach-omap2/board-zoom-debugboard.c | 65 +--- + arch/arm/mach-omap2/board-zoom-display.c | 31 +-- + arch/arm/mach-omap2/board-zoom-peripherals.c | 29 +-- + arch/arm/mach-omap2/common-board-devices.c | 163 ++++++++ + arch/arm/mach-omap2/common-board-devices.h | 35 ++ + arch/arm/mach-omap2/cpuidle34xx.c | 436 +++++++-------------- + arch/arm/mach-omap2/gpmc-smc91x.c | 11 +- + arch/arm/mach-omap2/gpmc-smsc911x.c | 44 +-- + arch/arm/mach-omap2/omap_l3_noc.c | 51 ++-- + arch/arm/mach-omap2/omap_l3_smx.c | 42 +-- + arch/arm/mach-omap2/omap_phy_internal.c | 9 +- + arch/arm/mach-omap2/pm.h | 17 +- + arch/arm/mach-omap2/pm34xx.c | 14 - + arch/arm/mach-omap2/pm44xx.c | 2 - + arch/arm/mach-omap2/smartreflex.c | 23 +- + arch/arm/mach-omap2/usb-musb.c | 22 +- + arch/arm/mach-omap2/usb-tusb6010.c | 3 +- + arch/arm/mach-omap2/voltage.c | 1 - + arch/arm/plat-omap/include/plat/gpmc-smsc911x.h | 4 +- + arch/arm/plat-omap/include/plat/uncompress.h | 1 - + arch/arm/plat-omap/include/plat/usb.h | 2 +- + drivers/video/omap/Makefile | 1 - + drivers/video/omap/lcd_omap2evm.c | 192 ---------- + sound/soc/omap/Kconfig | 8 - + sound/soc/omap/Makefile | 1 - + sound/soc/omap/omap2evm.c | 139 ------- + 54 files changed, 1110 insertions(+), 3384 deletions(-) + delete mode 100644 arch/arm/mach-omap2/board-igep0030.c + create mode 100644 arch/arm/mach-omap2/common-board-devices.c + create mode 100644 arch/arm/mach-omap2/common-board-devices.h + delete mode 100644 drivers/video/omap/lcd_omap2evm.c + delete mode 100644 sound/soc/omap/omap2evm.c +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/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-exynos4/mach-nuri.c' using previous resolution. +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Removing arch/arm/configs/s5p6442_defconfig +Auto-merging arch/arm/mach-exynos4/Kconfig +Auto-merging arch/arm/mach-exynos4/Makefile +Auto-merging arch/arm/mach-exynos4/mach-nuri.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h +Removing arch/arm/mach-s5p6442/Kconfig +Removing arch/arm/mach-s5p6442/Makefile +Removing arch/arm/mach-s5p6442/Makefile.boot +Removing arch/arm/mach-s5p6442/clock.c +Removing arch/arm/mach-s5p6442/cpu.c +Removing arch/arm/mach-s5p6442/dev-audio.c +Removing arch/arm/mach-s5p6442/dev-spi.c +Removing arch/arm/mach-s5p6442/dma.c +Removing arch/arm/mach-s5p6442/include/mach/debug-macro.S +Removing arch/arm/mach-s5p6442/include/mach/dma.h +Removing arch/arm/mach-s5p6442/include/mach/entry-macro.S +Removing arch/arm/mach-s5p6442/include/mach/gpio.h +Removing arch/arm/mach-s5p6442/include/mach/hardware.h +Removing arch/arm/mach-s5p6442/include/mach/io.h +Removing arch/arm/mach-s5p6442/include/mach/irqs.h +Removing arch/arm/mach-s5p6442/include/mach/map.h +Removing arch/arm/mach-s5p6442/include/mach/memory.h +Removing arch/arm/mach-s5p6442/include/mach/pwm-clock.h +Removing arch/arm/mach-s5p6442/include/mach/regs-clock.h +Removing arch/arm/mach-s5p6442/include/mach/regs-irq.h +Removing arch/arm/mach-s5p6442/include/mach/spi-clocks.h +Removing arch/arm/mach-s5p6442/include/mach/system.h +Removing arch/arm/mach-s5p6442/include/mach/tick.h +Removing arch/arm/mach-s5p6442/include/mach/timex.h +Removing arch/arm/mach-s5p6442/include/mach/uncompress.h +Removing arch/arm/mach-s5p6442/include/mach/vmalloc.h +Removing arch/arm/mach-s5p6442/init.c +Removing arch/arm/mach-s5p6442/mach-smdk6442.c +Removing arch/arm/mach-s5p6442/setup-i2c0.c +Auto-merging arch/arm/plat-s5p/Kconfig +Removing arch/arm/plat-s5p/include/plat/s5p6442.h +Auto-merging arch/arm/plat-samsung/include/plat/cpu.h +Auto-merging arch/arm/plat-samsung/include/plat/devs.h +Auto-merging sound/soc/samsung/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ea41a96] Merge remote-tracking branch 's5p/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/Samsung/Overview.txt | 2 - + arch/arm/Kconfig | 16 +- + arch/arm/Makefile | 1 - + arch/arm/common/Kconfig | 2 +- + arch/arm/configs/exynos4_defconfig | 2 + + arch/arm/configs/s5p6442_defconfig | 65 ---- + arch/arm/mach-exynos4/Kconfig | 2 + + arch/arm/mach-exynos4/Makefile | 1 + + arch/arm/mach-exynos4/cpuidle.c | 86 +++++ + arch/arm/mach-exynos4/mach-nuri.c | 89 +++++ + arch/arm/mach-s3c64xx/dev-spi.c | 20 +- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h | 48 --- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h | 60 --- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h | 53 --- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h | 49 --- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h | 44 --- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h | 71 ---- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h | 42 --- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h | 74 ---- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h | 40 -- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h | 36 -- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h | 54 --- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h | 70 ---- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h | 69 ---- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h | 46 --- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - + arch/arm/mach-s3c64xx/pm.c | 34 +- + arch/arm/mach-s3c64xx/setup-i2c0.c | 7 +- + arch/arm/mach-s3c64xx/setup-i2c1.c | 7 +- + arch/arm/mach-s3c64xx/sleep.S | 8 +- + arch/arm/mach-s5p6442/Kconfig | 25 -- + arch/arm/mach-s5p6442/Makefile | 24 -- + arch/arm/mach-s5p6442/Makefile.boot | 2 - + arch/arm/mach-s5p6442/clock.c | 420 ---------------------- + arch/arm/mach-s5p6442/cpu.c | 143 -------- + arch/arm/mach-s5p6442/dev-audio.c | 217 ----------- + arch/arm/mach-s5p6442/dev-spi.c | 121 ------- + arch/arm/mach-s5p6442/dma.c | 105 ------ + arch/arm/mach-s5p6442/include/mach/debug-macro.S | 35 -- + arch/arm/mach-s5p6442/include/mach/dma.h | 26 -- + arch/arm/mach-s5p6442/include/mach/entry-macro.S | 48 --- + arch/arm/mach-s5p6442/include/mach/gpio.h | 123 ------- + arch/arm/mach-s5p6442/include/mach/hardware.h | 18 - + arch/arm/mach-s5p6442/include/mach/io.h | 17 - + arch/arm/mach-s5p6442/include/mach/irqs.h | 87 ----- + arch/arm/mach-s5p6442/include/mach/map.h | 76 ---- + arch/arm/mach-s5p6442/include/mach/memory.h | 19 - + arch/arm/mach-s5p6442/include/mach/pwm-clock.h | 70 ---- + arch/arm/mach-s5p6442/include/mach/regs-clock.h | 104 ------ + arch/arm/mach-s5p6442/include/mach/regs-irq.h | 19 - + arch/arm/mach-s5p6442/include/mach/spi-clocks.h | 17 - + arch/arm/mach-s5p6442/include/mach/system.h | 23 -- + arch/arm/mach-s5p6442/include/mach/tick.h | 26 -- + arch/arm/mach-s5p6442/include/mach/timex.h | 24 -- + arch/arm/mach-s5p6442/include/mach/uncompress.h | 24 -- + arch/arm/mach-s5p6442/include/mach/vmalloc.h | 17 - + arch/arm/mach-s5p6442/init.c | 44 --- + arch/arm/mach-s5p6442/mach-smdk6442.c | 102 ------ + arch/arm/mach-s5p6442/setup-i2c0.c | 28 -- + arch/arm/plat-s5p/Kconfig | 2 +- + arch/arm/plat-s5p/cpu.c | 10 - + arch/arm/plat-s5p/include/plat/s5p6442.h | 33 -- + arch/arm/plat-samsung/include/plat/cpu.h | 1 - + arch/arm/plat-samsung/include/plat/debug-macro.S | 2 +- + arch/arm/plat-samsung/include/plat/devs.h | 6 - + arch/arm/plat-samsung/include/plat/regs-serial.h | 2 +- + arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 1 - + sound/soc/samsung/Kconfig | 4 +- + sound/soc/samsung/smdk_wm8580.c | 2 +- + 69 files changed, 226 insertions(+), 2940 deletions(-) + delete mode 100644 arch/arm/configs/s5p6442_defconfig + create mode 100644 arch/arm/mach-exynos4/cpuidle.c + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h + delete mode 100644 arch/arm/mach-s5p6442/Kconfig + delete mode 100644 arch/arm/mach-s5p6442/Makefile + delete mode 100644 arch/arm/mach-s5p6442/Makefile.boot + delete mode 100644 arch/arm/mach-s5p6442/clock.c + delete mode 100644 arch/arm/mach-s5p6442/cpu.c + delete mode 100644 arch/arm/mach-s5p6442/dev-audio.c + delete mode 100644 arch/arm/mach-s5p6442/dev-spi.c + delete mode 100644 arch/arm/mach-s5p6442/dma.c + delete mode 100644 arch/arm/mach-s5p6442/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-s5p6442/include/mach/dma.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-s5p6442/include/mach/gpio.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/hardware.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/io.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/irqs.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/map.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/memory.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/pwm-clock.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/regs-irq.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/spi-clocks.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/system.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/tick.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/timex.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-s5p6442/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-s5p6442/init.c + delete mode 100644 arch/arm/mach-s5p6442/mach-smdk6442.c + delete mode 100644 arch/arm/mach-s5p6442/setup-i2c0.c + delete mode 100644 arch/arm/plat-s5p/include/plat/s5p6442.h +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Removing arch/arm/mach-ux500/cpufreq.c +Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h +Removing arch/arm/mach-ux500/include/mach/prcmu.h +Removing arch/arm/mach-ux500/prcmu.c +Auto-merging drivers/mfd/db5500-prcmu-regs.h +Merge made by recursive. + arch/arm/mach-ux500/Kconfig | 2 + + arch/arm/mach-ux500/Makefile | 4 +- + arch/arm/mach-ux500/cpu-db5500.c | 2 + + arch/arm/mach-ux500/cpu-db8500.c | 7 + + arch/arm/mach-ux500/cpu.c | 7 +- + arch/arm/mach-ux500/cpufreq.c | 211 --- + arch/arm/mach-ux500/include/mach/db5500-regs.h | 20 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 37 +- + arch/arm/mach-ux500/include/mach/hardware.h | 1 + + arch/arm/mach-ux500/include/mach/id.h | 20 + + .../mach-ux500/include/mach/irqs-board-mop500.h | 5 + + .../arm/mach-ux500/include/mach/irqs-board-u5500.h | 21 + + arch/arm/mach-ux500/include/mach/irqs-db5500.h | 27 + + arch/arm/mach-ux500/include/mach/irqs-db8500.h | 54 + + arch/arm/mach-ux500/include/mach/irqs.h | 46 +- + arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 - + arch/arm/mach-ux500/include/mach/prcmu.h | 28 - + arch/arm/mach-ux500/prcmu.c | 394 ---- + drivers/cpufreq/Makefile | 2 + + drivers/cpufreq/db8500-cpufreq.c | 169 ++ + drivers/mfd/Kconfig | 22 +- + drivers/mfd/Makefile | 5 +- + drivers/mfd/ab8500-i2c.c | 3 +- + .../mfd/db5500-prcmu-regs.h | 27 +- + drivers/mfd/db5500-prcmu.c | 448 +++++ + drivers/mfd/db8500-prcmu-regs.h | 166 ++ + drivers/mfd/db8500-prcmu.c | 1890 ++++++++++++++++++++ + include/linux/mfd/db5500-prcmu.h | 45 + + include/linux/mfd/db8500-prcmu.h | 978 ++++++++++ + 29 files changed, 3964 insertions(+), 707 deletions(-) + delete mode 100644 arch/arm/mach-ux500/cpufreq.c + create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h + delete mode 100644 arch/arm/mach-ux500/prcmu.c + create mode 100644 drivers/cpufreq/db8500-cpufreq.c + rename arch/arm/mach-ux500/include/mach/prcmu-regs.h => drivers/mfd/db5500-prcmu-regs.h (80%) + create mode 100644 drivers/mfd/db5500-prcmu.c + create mode 100644 drivers/mfd/db8500-prcmu-regs.h + create mode 100644 drivers/mfd/db8500-prcmu.c + create mode 100644 include/linux/mfd/db5500-prcmu.h + create mode 100644 include/linux/mfd/db8500-prcmu.h +Merging xilinx/arm-next +$ git merge xilinx/arm-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/mm/init.c +Auto-merging arch/powerpc/kernel/prom.c +Merge made by recursive. + Documentation/arm/Booting | 33 ++- + Documentation/devicetree/bindings/arm/xilinx.txt | 7 + + Documentation/devicetree/booting-without-of.txt | 48 ++++- + arch/arm/Kconfig | 21 ++ + arch/arm/Makefile | 2 + + arch/arm/boot/dts/zynq-ep107.dts | 52 ++++ + arch/arm/include/asm/mach/arch.h | 9 + + arch/arm/include/asm/prom.h | 37 +++ + arch/arm/include/asm/setup.h | 4 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/devtree.c | 145 +++++++++++ + arch/arm/kernel/head-common.S | 24 ++- + arch/arm/kernel/head.S | 8 +- + arch/arm/kernel/setup.c | 90 +++++--- + arch/arm/mach-zynq/Makefile | 6 + + arch/arm/mach-zynq/Makefile.boot | 3 + + arch/arm/mach-zynq/board_dt.c | 37 +++ + arch/arm/mach-zynq/common.c | 102 ++++++++ + arch/arm/mach-zynq/common.h | 29 ++ + 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 ++ + arch/arm/mach-zynq/include/mach/system.h | 28 ++ + 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 | 2 +- + arch/arm/mm/init.c | 11 + + arch/microblaze/kernel/prom.c | 2 +- + arch/mips/include/asm/prom.h | 3 - + arch/mips/kernel/prom.c | 3 +- + arch/powerpc/kernel/prom.c | 2 +- + drivers/of/fdt.c | 8 +- + 40 files changed, 1313 insertions(+), 61 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/xilinx.txt + create mode 100644 arch/arm/boot/dts/zynq-ep107.dts + create mode 100644 arch/arm/include/asm/prom.h + create mode 100644 arch/arm/kernel/devtree.c + 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 + create mode 100644 arch/arm/mach-zynq/common.h + 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 + create mode 100644 arch/arm/mach-zynq/include/mach/system.h + 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 +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/Kconfig | 2 + + arch/blackfin/Kconfig.debug | 2 +- + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 12 +- + arch/blackfin/configs/BF527-EZKIT_defconfig | 14 +- + arch/blackfin/configs/BF533-STAMP_defconfig | 2 - + arch/blackfin/configs/BF537-STAMP_defconfig | 2 - + arch/blackfin/include/asm/bfin-global.h | 10 - + arch/blackfin/include/asm/bfin_pfmon.h | 44 + + arch/blackfin/include/asm/bfin_sport.h | 4 + + arch/blackfin/include/asm/cacheflush.h | 23 +- + arch/blackfin/include/asm/cpu.h | 3 - + arch/blackfin/include/asm/def_LPBlackfin.h | 12 +- + arch/blackfin/include/asm/irq_handler.h | 25 + + arch/blackfin/include/asm/kgdb.h | 6 +- + arch/blackfin/include/asm/perf_event.h | 1 + + arch/blackfin/include/asm/ptrace.h | 2 - + arch/blackfin/include/mach-common/irq.h | 57 + + arch/blackfin/kernel/Makefile | 3 + + arch/blackfin/kernel/bfin_dma_5xx.c | 5 + + arch/blackfin/kernel/bfin_gpio.c | 34 +- + arch/blackfin/kernel/bfin_ksyms.c | 1 + + arch/blackfin/kernel/debug-mmrs.c | 1860 +++++++++++++++++++++ + arch/blackfin/kernel/ipipe.c | 1 + + arch/blackfin/kernel/irqchip.c | 1 + + arch/blackfin/kernel/nmi.c | 8 +- + arch/blackfin/kernel/perf_event.c | 498 ++++++ + arch/blackfin/kernel/process.c | 6 +- + arch/blackfin/kernel/reboot.c | 65 +- + arch/blackfin/kernel/setup.c | 54 +- + arch/blackfin/mach-bf518/include/mach/anomaly.h | 4 +- + arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 16 +- + arch/blackfin/mach-bf518/include/mach/defBF512.h | 8 +- + arch/blackfin/mach-bf518/include/mach/irq.h | 262 ++-- + arch/blackfin/mach-bf527/boards/ezkit.c | 74 +- + arch/blackfin/mach-bf527/include/mach/anomaly.h | 8 +- + arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 16 +- + arch/blackfin/mach-bf527/include/mach/defBF522.h | 8 +- + arch/blackfin/mach-bf527/include/mach/irq.h | 266 ++-- + arch/blackfin/mach-bf533/boards/stamp.c | 38 + + arch/blackfin/mach-bf533/include/mach/anomaly.h | 11 +- + arch/blackfin/mach-bf533/include/mach/irq.h | 168 +-- + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 22 + + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 34 + + arch/blackfin/mach-bf537/boards/stamp.c | 127 ++- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 22 + + arch/blackfin/mach-bf537/include/mach/anomaly.h | 10 +- + arch/blackfin/mach-bf537/include/mach/irq.h | 365 ++--- + arch/blackfin/mach-bf537/ints-priority.c | 163 ++ + arch/blackfin/mach-bf538/include/mach/anomaly.h | 9 +- + arch/blackfin/mach-bf538/include/mach/irq.h | 89 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 116 ++- + arch/blackfin/mach-bf548/include/mach/anomaly.h | 8 +- + arch/blackfin/mach-bf548/include/mach/irq.h | 89 +- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 22 + + arch/blackfin/mach-bf561/boards/ezkit.c | 31 +- + arch/blackfin/mach-bf561/include/mach/anomaly.h | 15 +- + arch/blackfin/mach-bf561/include/mach/irq.h | 505 ++---- + arch/blackfin/mach-bf561/smp.c | 17 +- + arch/blackfin/mach-common/dpmc.c | 7 +- + arch/blackfin/mach-common/ints-priority.c | 476 ++---- + arch/blackfin/mach-common/smp.c | 28 +- + arch/blackfin/mm/sram-alloc.c | 43 +- + 62 files changed, 4180 insertions(+), 1654 deletions(-) + create mode 100644 arch/blackfin/include/asm/bfin_pfmon.h + create mode 100644 arch/blackfin/include/asm/perf_event.h + create mode 100644 arch/blackfin/include/mach-common/irq.h + create mode 100644 arch/blackfin/kernel/debug-mmrs.c + create mode 100644 arch/blackfin/kernel/perf_event.c +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 +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Recorded preimage for 'arch/m68k/kernel/m68k_ksyms.c' +Auto-merging arch/m68k/Kconfig +Removing arch/m68k/include/asm/bitops_mm.h +CONFLICT (delete/modify): arch/m68k/include/asm/bitops_no.h deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/include/asm/bitops_no.h left in tree. +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 +Auto-merging arch/m68k/kernel/m68k_ksyms.c +CONFLICT (content): Merge conflict in arch/m68k/kernel/m68k_ksyms.c +Removing arch/m68k/kernel/module_mm.c +Removing arch/m68k/kernel/module_no.c +Auto-merging arch/m68k/platform/68328/entry.S +Auto-merging arch/m68k/platform/68360/entry.S +Auto-merging arch/m68k/platform/coldfire/entry.S +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/m68k/include/asm/bitops_no.h +arch/m68k/include/asm/bitops_no.h: needs merge +arch/m68k/kernel/m68k_ksyms.c: needs merge +rm 'arch/m68k/include/asm/bitops_no.h' +$ git commit -v -a +Recorded resolution for 'arch/m68k/kernel/m68k_ksyms.c'. +[master 9dd4f6a] Merge remote-tracking branch 'm68knommu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/m68k/Kconfig | 4 + + arch/m68k/include/asm/bitops.h | 511 ++++++++++++++++++++++++++++++++++- + arch/m68k/include/asm/bitops_mm.h | 493 --------------------------------- + arch/m68k/include/asm/bitops_no.h | 329 ---------------------- + 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 | 9 - + arch/m68k/include/asm/module.h | 31 +-- + 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/kernel/m68k_ksyms.c | 3 +- + arch/m68k/kernel/module.c | 157 +++++++++++- + arch/m68k/kernel/module_mm.c | 155 ----------- + arch/m68k/kernel/module_no.c | 126 --------- + arch/m68k/platform/68328/entry.S | 13 +- + arch/m68k/platform/68360/entry.S | 13 +- + arch/m68k/platform/coldfire/entry.S | 24 +- + 20 files changed, 934 insertions(+), 1556 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 +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/kernel/cpu-probe.c +Auto-merging arch/mips/mm/c-r4k.c +Merge made by recursive. + arch/mips/include/asm/fixmap.h | 10 +-- + arch/mips/include/asm/irq.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/kernel/cpu-probe.c | 1 - + arch/mips/kernel/irq_cpu.c | 14 +-- + arch/mips/kernel/perf_event.c | 2 - + arch/mips/loongson/lemote-2f/ec_kb3310b.c | 2 - + arch/mips/mm/c-r4k.c | 4 + + arch/mips/mm/dma-default.c | 114 ++++++++++++-------- + arch/mips/mm/init.c | 8 +- + arch/mips/mm/pgtable-32.c | 2 +- + arch/mips/mm/pgtable-64.c | 2 +- + arch/mips/nxp/pnx8550/common/setup.c | 2 - + arch/mips/pnx8550/common/setup.c | 2 - + 25 files changed, 203 insertions(+), 84 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 +Merging parisc/for-next +$ git merge parisc/for-next +Already up-to-date! +Merge made by recursive. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/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/include/asm/fsl_lbc.h | 2 ++ + arch/powerpc/sysdev/fsl_lbc.c | 9 +++++++-- + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/sh-latest +$ git merge sh/sh-latest +Merge made by recursive. + arch/sh/Kconfig | 2 +- + arch/sh/boards/mach-ap325rxa/setup.c | 32 +++++++++++++------------------- + arch/sh/boards/mach-ecovec24/setup.c | 3 +++ + arch/sh/kernel/process_32.c | 1 + + 4 files changed, 18 insertions(+), 20 deletions(-) +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Merge made by recursive. + .mailmap | 1 + + arch/arm/mach-shmobile/board-ag5evm.c | 105 +++++++++ + arch/arm/mach-shmobile/board-ap4evb.c | 29 ++- + arch/arm/mach-shmobile/board-mackerel.c | 80 ++++--- + arch/arm/mach-shmobile/clock-sh7372.c | 16 ++- + arch/arm/mach-shmobile/clock-sh73a0.c | 16 ++- + arch/arm/mach-shmobile/headsmp.S | 2 +- + .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 3 +- + .../mach-shmobile/include/mach/head-mackerel.txt | 3 +- + arch/arm/mach-shmobile/intc-sh7372.c | 46 ++-- + arch/arm/mach-shmobile/setup-sh7367.c | 223 ++++++++++++++++++ + arch/arm/mach-shmobile/setup-sh7372.c | 217 ++++++++++++++++++ + arch/arm/mach-shmobile/setup-sh7377.c | 239 +++++++++++++++++++- + arch/arm/mach-shmobile/smp-sh73a0.c | 9 +- + 14 files changed, 905 insertions(+), 84 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Auto-merging Makefile +Auto-merging arch/tile/include/asm/vga.h +Auto-merging drivers/net/tile/tilepro.c +Auto-merging drivers/rtc/Kconfig +Auto-merging kernel/compat.c +Auto-merging kernel/sysctl.c +Merge made by recursive. + Makefile | 5 + + arch/tile/Kconfig | 8 + + arch/tile/configs/tile_defconfig | 1092 ++++++++++++ + arch/tile/configs/tilegx_defconfig | 1833 ++++++++++++++++++++ + arch/tile/include/arch/chip_tilegx.h | 258 +++ + arch/tile/include/arch/icache.h | 11 +- + arch/tile/include/arch/interrupts_64.h | 276 +++ + arch/tile/include/arch/spr_def.h | 13 +- + arch/tile/include/arch/spr_def_64.h | 173 ++ + arch/tile/include/asm/atomic.h | 49 +- + arch/tile/include/asm/atomic_32.h | 10 - + arch/tile/include/asm/atomic_64.h | 156 ++ + arch/tile/include/asm/backtrace.h | 82 +- + arch/tile/include/asm/bitops.h | 1 + + arch/tile/include/asm/bitops_32.h | 1 - + arch/tile/include/asm/bitops_64.h | 105 ++ + arch/tile/include/asm/cacheflush.h | 18 +- + arch/tile/include/asm/compat.h | 4 +- + arch/tile/include/asm/dma-mapping.h | 3 +- + arch/tile/include/asm/fb.h | 1 + + arch/tile/include/asm/io.h | 18 + + arch/tile/include/asm/irq.h | 2 + + arch/tile/include/asm/mmu_context.h | 4 +- + arch/tile/include/asm/opcode-tile_32.h | 7 + + arch/tile/include/asm/opcode-tile_64.h | 1500 +++++++---------- + arch/tile/include/asm/opcode_constants_64.h | 1043 +++++++----- + arch/tile/include/asm/page.h | 18 +- + arch/tile/include/asm/parport.h | 1 + + arch/tile/include/asm/pci.h | 3 +- + arch/tile/include/asm/pgtable_64.h | 175 ++ + arch/tile/include/asm/processor.h | 9 +- + arch/tile/include/asm/serial.h | 1 + + arch/tile/include/asm/signal.h | 4 + + arch/tile/include/asm/spinlock_64.h | 161 ++ + arch/tile/include/asm/stat.h | 2 +- + arch/tile/include/asm/swab.h | 6 - + arch/tile/include/asm/thread_info.h | 5 +- + arch/tile/include/asm/topology.h | 75 +- + arch/tile/include/asm/traps.h | 4 + + arch/tile/include/asm/unistd.h | 2 +- + arch/tile/include/{hv/pagesize.h => asm/vga.h} | 35 +- + arch/tile/include/hv/hypervisor.h | 12 +- + arch/tile/kernel/backtrace.c | 103 +- + arch/tile/kernel/compat.c | 13 +- + arch/tile/kernel/compat_signal.c | 4 +- + arch/tile/kernel/futex_64.S | 55 + + arch/tile/kernel/hardwall.c | 6 +- + arch/tile/kernel/head_64.S | 269 +++ + arch/tile/kernel/intvec_32.S | 175 +-- + arch/tile/kernel/intvec_64.S | 1231 +++++++++++++ + arch/tile/kernel/module.c | 8 +- + arch/tile/kernel/pci-dma.c | 2 +- + arch/tile/kernel/pci.c | 206 ++- + arch/tile/kernel/process.c | 52 +- + arch/tile/kernel/regs_64.S | 145 ++ + arch/tile/kernel/setup.c | 6 + + arch/tile/kernel/signal.c | 128 ++- + arch/tile/kernel/single_step.c | 12 + + arch/tile/kernel/stack.c | 14 +- + arch/tile/kernel/sys.c | 9 - + arch/tile/kernel/tile-desc_32.c | 11 +- + arch/tile/kernel/tile-desc_64.c | 2200 ++++++++++++++++++++++++ + arch/tile/kernel/time.c | 2 + + arch/tile/kernel/tlb.c | 12 +- + arch/tile/kernel/traps.c | 1 + + arch/tile/lib/atomic_asm_32.S | 2 +- + arch/tile/lib/cacheflush.c | 18 + + arch/tile/lib/memchr_64.c | 71 + + arch/tile/lib/memcpy_64.c | 220 +++ + arch/tile/lib/memcpy_user_64.c | 86 + + arch/tile/lib/memset_64.c | 145 ++ + arch/tile/lib/spinlock_64.c | 104 ++ + arch/tile/lib/strchr_64.c | 67 + + arch/tile/lib/strlen_64.c | 38 + + arch/tile/lib/usercopy_64.S | 196 +++ + arch/tile/mm/fault.c | 30 +- + arch/tile/mm/migrate_64.S | 187 ++ + drivers/input/input-compat.h | 2 +- + drivers/net/tile/tilepro.c | 8 +- + drivers/rtc/Kconfig | 7 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-tile.c | 162 ++ + include/asm-generic/audit_change_attr.h | 4 + + include/asm-generic/audit_dir_write.h | 14 + + include/asm-generic/audit_read.h | 5 + + include/asm-generic/audit_write.h | 2 + + include/asm-generic/unistd.h | 221 ++-- + include/linux/compat.h | 236 +++- + kernel/compat.c | 8 + + kernel/sysctl.c | 2 +- + lib/audit.c | 2 + + 91 files changed, 11725 insertions(+), 1963 deletions(-) + create mode 100644 arch/tile/configs/tilegx_defconfig + create mode 100644 arch/tile/include/arch/chip_tilegx.h + create mode 100644 arch/tile/include/arch/interrupts_64.h + create mode 100644 arch/tile/include/arch/spr_def_64.h + create mode 100644 arch/tile/include/asm/atomic_64.h + create mode 100644 arch/tile/include/asm/bitops_64.h + create mode 100644 arch/tile/include/asm/fb.h + create mode 100644 arch/tile/include/asm/parport.h + create mode 100644 arch/tile/include/asm/pgtable_64.h + create mode 100644 arch/tile/include/asm/serial.h + create mode 100644 arch/tile/include/asm/spinlock_64.h + rename arch/tile/include/{hv/pagesize.h => asm/vga.h} (52%) + create mode 100644 arch/tile/kernel/futex_64.S + create mode 100644 arch/tile/kernel/head_64.S + create mode 100644 arch/tile/kernel/intvec_64.S + create mode 100644 arch/tile/kernel/regs_64.S + create mode 100644 arch/tile/kernel/tile-desc_64.c + create mode 100644 arch/tile/lib/memchr_64.c + create mode 100644 arch/tile/lib/memcpy_64.c + create mode 100644 arch/tile/lib/memcpy_user_64.c + create mode 100644 arch/tile/lib/memset_64.c + create mode 100644 arch/tile/lib/spinlock_64.c + create mode 100644 arch/tile/lib/strchr_64.c + create mode 100644 arch/tile/lib/strlen_64.c + create mode 100644 arch/tile/lib/usercopy_64.S + create mode 100644 arch/tile/mm/migrate_64.S + create mode 100644 drivers/rtc/rtc-tile.c +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Resolved 'drivers/net/Kconfig' using previous resolution. +Resolved 'drivers/rtc/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/net/Kconfig +CONFLICT (content): Merge conflict in drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging drivers/rtc/Kconfig +CONFLICT (content): Merge conflict in drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 902384c] Merge remote-tracking branch 'unicore32/unicore32' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 + + arch/unicore32/Kconfig | 4 - + arch/unicore32/boot/compressed/Makefile | 2 +- + arch/unicore32/configs/debug_defconfig | 8 +- + arch/unicore32/kernel/Makefile | 1 - + drivers/net/Kconfig | 5 + + drivers/net/Makefile | 1 + + drivers/net/mac-puv3.c | 2068 ++++++++++++++++++++ + drivers/rtc/Kconfig | 9 + + drivers/rtc/Makefile | 1 + + .../kernel/rtc.c => drivers/rtc/rtc-puv3.c | 0 + 11 files changed, 2091 insertions(+), 10 deletions(-) + create mode 100644 drivers/net/mac-puv3.c + rename arch/unicore32/kernel/rtc.c => drivers/rtc/rtc-puv3.c (100%) +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 43fa19e] 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 +Merge made by recursive. + drivers/block/rbd.c | 15 ++++++-- + fs/ceph/addr.c | 5 +-- + fs/ceph/caps.c | 3 +- + fs/ceph/dir.c | 7 ++-- + fs/ceph/export.c | 25 +++++++++++-- + fs/ceph/mds_client.c | 6 ++- + include/linux/ceph/ceph_fs.h | 1 + + net/ceph/messenger.c | 82 ++++++++++++++++++++++++++++++++---------- + net/ceph/osd_client.c | 19 +++++++++- + net/ceph/osdmap.c | 13 +++++-- + 10 files changed, 136 insertions(+), 40 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/Kconfig | 20 ----- + fs/cifs/cifsfs.c | 88 +++++++++++++------- + fs/cifs/cifsglob.h | 6 +- + fs/cifs/cifsproto.h | 18 +++- + fs/cifs/cifssmb.c | 6 +- + fs/cifs/connect.c | 217 ++++++++++++++++++++++++++++++-------------------- + fs/cifs/netmisc.c | 2 +- + fs/cifs/transport.c | 196 ++++++++++++++-------------------------------- + 8 files changed, 266 insertions(+), 287 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. + fs/ecryptfs/inode.c | 2 ++ + fs/ecryptfs/keystore.c | 46 +++++++++++++++++++++------------------------- + 2 files changed, 23 insertions(+), 25 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev +$ git merge ext4/dev +Auto-merging fs/jbd2/commit.c +Merge made by recursive. + Documentation/filesystems/ext4.txt | 4 - + fs/ext4/Makefile | 3 +- + fs/ext4/balloc.c | 146 +---- + fs/ext4/ext4.h | 127 +++- + fs/ext4/ext4_jbd2.c | 14 - + fs/ext4/ext4_jbd2.h | 5 - + fs/ext4/extents.c | 1326 ++++++++++++++++++++++-------------- + fs/ext4/fsync.c | 25 +- + fs/ext4/inode.c | 110 +++- + fs/ext4/mballoc.c | 459 +++++++------ + fs/ext4/mballoc.h | 6 - + fs/ext4/migrate.c | 2 +- + fs/ext4/mmp.c | 351 ++++++++++ + fs/ext4/move_extent.c | 3 +- + fs/ext4/namei.c | 82 ++- + fs/ext4/page-io.c | 39 +- + fs/ext4/super.c | 204 ++++-- + fs/ext4/xattr.c | 4 +- + fs/jbd2/commit.c | 22 +- + fs/jbd2/journal.c | 58 ++- + fs/jbd2/transaction.c | 20 +- + include/linux/jbd2.h | 8 +- + 22 files changed, 1961 insertions(+), 1057 deletions(-) + create mode 100644 fs/ext4/mmp.c +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 +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cad58db] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/nfs4.h +Merge made by recursive. + fs/nfsd/export.c | 6 - + fs/nfsd/nfs3proc.c | 2 +- + fs/nfsd/nfs4proc.c | 73 ++++++++- + fs/nfsd/nfs4state.c | 38 ++++- + fs/nfsd/nfs4xdr.c | 9 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/vfs.c | 33 +++-- + fs/nfsd/vfs.h | 6 +- + include/linux/nfs4.h | 8 +- + include/linux/sunrpc/svcsock.h | 1 + + net/sunrpc/svcsock.c | 336 ++++++++++++++++++++++------------------ + 11 files changed, 319 insertions(+), 195 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging Documentation/ABI/removed/o2cb +Merge made by recursive. + Documentation/ABI/{obsolete => removed}/o2cb | 9 +- + Documentation/feature-removal-schedule.txt | 10 -- + Documentation/filesystems/ocfs2.txt | 8 +- + fs/ocfs2/alloc.c | 166 ++++++++++++++++++++++++++ + fs/ocfs2/alloc.h | 1 + + fs/ocfs2/cluster/sys.c | 9 -- + fs/ocfs2/dlm/dlmcommon.h | 12 ++ + fs/ocfs2/dlm/dlmmaster.c | 135 ++++++++------------- + fs/ocfs2/dlmfs/dlmfs.c | 2 +- + fs/ocfs2/ioctl.c | 24 ++++ + fs/ocfs2/ocfs2_trace.h | 25 ++++ + fs/ocfs2/super.c | 2 +- + 12 files changed, 292 insertions(+), 111 deletions(-) + rename Documentation/ABI/{obsolete => removed}/o2cb (65%) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Auto-merging net/9p/client.c +Auto-merging net/9p/trans_fd.c +Merge made by recursive. + fs/9p/Kconfig | 5 ++--- + fs/9p/vfs_inode_dotl.c | 11 ++++++----- + include/net/9p/9p.h | 13 ++++++------- + include/net/9p/client.h | 2 +- + include/net/9p/transport.h | 3 ++- + net/9p/Kconfig | 8 ++++---- + net/9p/client.c | 30 +++++++++++++++++------------- + net/9p/mod.c | 4 ++-- + net/9p/trans_fd.c | 7 ++++--- + net/9p/util.c | 2 +- + 10 files changed, 45 insertions(+), 40 deletions(-) +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 +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwmon/emc6w201 | 42 ++ + Documentation/hwmon/f71882fg | 4 + + Documentation/hwmon/fam15h_power | 37 ++ + Documentation/hwmon/k10temp | 3 +- + Documentation/hwmon/max6650 | 21 +- + MAINTAINERS | 7 + + arch/x86/Kconfig | 1 + + drivers/acpi/Kconfig | 11 - + drivers/acpi/Makefile | 1 - + drivers/char/i8k.c | 166 ++++++- + drivers/hwmon/Kconfig | 42 ++- + drivers/hwmon/Makefile | 3 + + drivers/hwmon/abituguru.c | 3 - + drivers/hwmon/abituguru3.c | 13 - + .../power_meter.c => hwmon/acpi_power_meter.c} | 0 + drivers/hwmon/adcxx.c | 16 +- + drivers/hwmon/emc6w201.c | 539 ++++++++++++++++++++ + drivers/hwmon/f71882fg.c | 115 ++++- + drivers/hwmon/fam15h_power.c | 229 +++++++++ + drivers/hwmon/ibmaem.c | 10 +- + drivers/hwmon/it87.c | 31 +- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/k10temp.c | 11 +- + drivers/hwmon/k8temp.c | 8 +- + drivers/hwmon/lm70.c | 10 +- + drivers/hwmon/max6650.c | 78 +-- + drivers/hwmon/sch5627.c | 46 ++- + drivers/hwmon/ultra45_env.c | 4 +- + include/linux/i2c.h | 2 +- + 29 files changed, 1305 insertions(+), 150 deletions(-) + create mode 100644 Documentation/hwmon/emc6w201 + create mode 100644 Documentation/hwmon/fam15h_power + rename drivers/{acpi/power_meter.c => hwmon/acpi_power_meter.c} (100%) + create mode 100644 drivers/hwmon/emc6w201.c + create mode 100644 drivers/hwmon/fam15h_power.c +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Recorded preimage for 'drivers/hwmon/coretemp.c' +Auto-merging drivers/hwmon/coretemp.c +CONFLICT (content): Merge conflict in drivers/hwmon/coretemp.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/hwmon/coretemp.c'. +[master 3db2a80] Merge remote-tracking branch 'hwmon-staging/hwmon-next' +$ git diff -M --stat --summary HEAD^.. + drivers/hwmon/coretemp.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. +Merging docs/docs-move +$ git merge docs/docs-move +Auto-merging Documentation/security/credentials.txt +Auto-merging Documentation/security/keys-request-key.txt +Auto-merging Documentation/security/keys.txt +Auto-merging MAINTAINERS +Auto-merging include/linux/key.h +Auto-merging kernel/cred.c +Auto-merging security/keys/request_key.c +Auto-merging security/keys/request_key_auth.c +Merge made by recursive. + Documentation/00-INDEX | 6 ++---- + Documentation/filesystems/nfs/idmapper.txt | 4 ++-- + Documentation/networking/dns_resolver.txt | 4 ++-- + Documentation/security/00-INDEX | 18 ++++++++++++++++++ + Documentation/{ => security}/SELinux.txt | 0 + Documentation/{ => security}/Smack.txt | 0 + Documentation/{ => security}/apparmor.txt | 0 + Documentation/{ => security}/credentials.txt | 2 +- + Documentation/{ => security}/keys-request-key.txt | 4 ++-- + .../{ => security}/keys-trusted-encrypted.txt | 0 + Documentation/{ => security}/keys.txt | 4 ++-- + Documentation/{ => security}/tomoyo.txt | 0 + MAINTAINERS | 6 +++--- + include/linux/cred.h | 2 +- + include/linux/key.h | 2 +- + kernel/cred.c | 2 +- + scripts/selinux/README | 2 +- + security/apparmor/match.c | 2 +- + security/apparmor/policy_unpack.c | 4 ++-- + security/keys/encrypted.c | 2 +- + security/keys/request_key.c | 2 +- + security/keys/request_key_auth.c | 2 +- + security/keys/trusted.c | 2 +- + 23 files changed, 43 insertions(+), 27 deletions(-) + create mode 100644 Documentation/security/00-INDEX + rename Documentation/{ => security}/SELinux.txt (100%) + rename Documentation/{ => security}/Smack.txt (100%) + rename Documentation/{ => security}/apparmor.txt (100%) + rename Documentation/{ => security}/credentials.txt (99%) + rename Documentation/{ => security}/keys-request-key.txt (98%) + rename Documentation/{ => security}/keys-trusted-encrypted.txt (100%) + rename Documentation/{ => security}/keys.txt (99%) + rename Documentation/{ => security}/tomoyo.txt (100%) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + Documentation/DocBook/dvb/dvbproperty.xml | 5 +- + Documentation/DocBook/v4l/subdev-formats.xml | 10 +- + drivers/media/dvb/dm1105/dm1105.c | 272 ++++++- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +- + drivers/media/video/Kconfig | 4 +- + drivers/media/video/Makefile | 1 + + drivers/media/video/m5mols/Kconfig | 5 + + drivers/media/video/m5mols/Makefile | 3 + + drivers/media/video/m5mols/m5mols.h | 296 ++++++++ + drivers/media/video/m5mols/m5mols_capture.c | 191 +++++ + drivers/media/video/m5mols/m5mols_controls.c | 299 ++++++++ + drivers/media/video/m5mols/m5mols_core.c | 1004 ++++++++++++++++++++++++++ + drivers/media/video/m5mols/m5mols_reg.h | 399 ++++++++++ + include/media/m5mols.h | 35 + + 15 files changed, 2483 insertions(+), 45 deletions(-) + create mode 100644 drivers/media/video/m5mols/Kconfig + create mode 100644 drivers/media/video/m5mols/Makefile + create mode 100644 drivers/media/video/m5mols/m5mols.h + create mode 100644 drivers/media/video/m5mols/m5mols_capture.c + create mode 100644 drivers/media/video/m5mols/m5mols_controls.c + create mode 100644 drivers/media/video/m5mols/m5mols_core.c + create mode 100644 drivers/media/video/m5mols/m5mols_reg.h + create mode 100644 include/media/m5mols.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/edac/cpc925_edac.c +Auto-merging drivers/edac/i5000_edac.c +Auto-merging drivers/edac/i5400_edac.c +Auto-merging drivers/edac/i7300_edac.c +Auto-merging drivers/edac/i7core_edac.c +Auto-merging drivers/edac/ppc4xx_edac.c +Auto-merging drivers/edac/r82600_edac.c +Auto-merging drivers/media/video/cx231xx/cx231xx-avcore.c +Auto-merging drivers/scsi/in2000.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/pmcraid.h +Auto-merging drivers/scsi/wd33c93.c +Auto-merging drivers/tty/cyclades.c +Auto-merging drivers/tty/nozomi.c +Merge made by recursive. + CREDITS | 4 ++ + Documentation/kbuild/kconfig-language.txt | 32 ++++++++++++++++- + Documentation/kbuild/kconfig.txt | 5 --- + MAINTAINERS | 5 +-- + Makefile | 9 +++-- + drivers/edac/amd76x_edac.c | 2 +- + drivers/edac/amd8111_edac.c | 2 +- + drivers/edac/amd8131_edac.c | 2 +- + drivers/edac/cpc925_edac.c | 2 +- + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/e7xxx_edac.c | 2 +- + drivers/edac/edac_module.c | 2 +- + drivers/edac/i5000_edac.c | 2 +- + drivers/edac/i5400_edac.c | 2 +- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/edac/i82860_edac.c | 2 +- + drivers/edac/i82875p_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 2 +- + drivers/edac/mpc85xx_edac.h | 2 +- + drivers/edac/mv64x60_edac.h | 2 +- + drivers/edac/ppc4xx_edac.c | 2 +- + drivers/edac/r82600_edac.c | 2 +- + drivers/media/radio/radio-maxiradio.c | 3 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 2 +- + drivers/scsi/aacraid/linit.c | 3 +- + drivers/scsi/in2000.c | 2 +- + drivers/scsi/pmcraid.c | 9 ++--- + drivers/scsi/pmcraid.h | 1 - + drivers/scsi/wd33c93.c | 7 ++-- + drivers/staging/generic_serial/rio/rioinit.c | 2 +- + drivers/tty/cyclades.c | 3 +- + drivers/tty/nozomi.c | 3 +- + scripts/checkversion.pl | 1 + + scripts/export_report.pl | 26 ++++++++++--- + scripts/kconfig/Makefile | 38 ++++++++++++-------- + scripts/kconfig/confdata.c | 49 +++++++++++++++++--------- + scripts/kconfig/expr.h | 4 -- + scripts/kconfig/gconf.c | 12 ++++-- + scripts/kconfig/lex.zconf.c_shipped | 33 ++++++++++------- + scripts/kconfig/nconf.c | 14 ++++---- + scripts/kconfig/zconf.l | 33 ++++++++++------- + scripts/package/Makefile | 4 +- + scripts/package/mkspec | 19 +++++++++- + scripts/patch-kernel | 2 +- + 45 files changed, 225 insertions(+), 136 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merging drivers/infiniband/hw/cxgb3/iwch_cm.c +Auto-merging net/9p/trans_rdma.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Merge made by recursive. + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/Makefile | 2 +- + drivers/infiniband/core/cm.c | 8 + + drivers/infiniband/core/cma.c | 308 +++++++++++++++++---------- + drivers/infiniband/core/device.c | 25 ++- + drivers/infiniband/core/mad.c | 7 + + drivers/infiniband/core/netlink.c | 190 +++++++++++++++++ + drivers/infiniband/core/ucma.c | 35 +++- + drivers/infiniband/core/user_mad.c | 7 + + drivers/infiniband/core/uverbs_main.c | 8 + + drivers/infiniband/hw/cxgb3/iwch_cm.c | 26 ++- + drivers/infiniband/hw/cxgb3/iwch_provider.h | 2 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 6 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 18 +-- + drivers/infiniband/hw/nes/nes.c | 4 +- + drivers/infiniband/hw/qib/Kconfig | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 4 +- + include/linux/netlink.h | 1 + + include/rdma/Kbuild | 5 + + include/rdma/ib_user_cm.h | 1 + + include/rdma/rdma_cm.h | 19 ++- + include/rdma/rdma_netlink.h | 92 ++++++++ + net/9p/trans_rdma.c | 3 +- + net/rds/ib.c | 2 +- + net/rds/ib_cm.c | 2 +- + net/rds/iw.c | 2 +- + net/rds/iw_cm.c | 2 +- + net/rds/rdma_transport.c | 3 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +- + net/sunrpc/xprtrdma/verbs.c | 2 +- + 31 files changed, 633 insertions(+), 159 deletions(-) + create mode 100644 drivers/infiniband/core/netlink.c + create mode 100644 include/rdma/rdma_netlink.h +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +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! +Merge made by recursive. +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 +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/scsi/ChangeLog.megaraid_sas | 14 +++ + MAINTAINERS | 11 ++ + drivers/scsi/aic94xx/aic94xx_init.c | 2 +- + drivers/scsi/bfa/bfa_ioc.c | 4 +- + drivers/scsi/bfa/bfa_ioc.h | 1 + + drivers/scsi/bfa/bfa_ioc_cb.c | 11 ++ + drivers/scsi/bfa/bfa_ioc_ct.c | 26 +++++ + drivers/scsi/bnx2i/bnx2i.h | 16 ++- + drivers/scsi/bnx2i/bnx2i_hwi.c | 27 +++--- + drivers/scsi/bnx2i/bnx2i_init.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 13 ++- + drivers/scsi/fcoe/fcoe.c | 58 ++++++++++++ + drivers/scsi/fcoe/fcoe.h | 10 ++ + drivers/scsi/fcoe/fcoe_ctlr.c | 133 ++++++++++++++++++--------- + drivers/scsi/fcoe/fcoe_transport.c | 40 -------- + drivers/scsi/ipr.c | 12 +- + drivers/scsi/libfc/fc_disc.c | 1 + + drivers/scsi/libfc/fc_exch.c | 2 + + drivers/scsi/libfc/fc_fcp.c | 16 +-- + drivers/scsi/libfc/fc_libfc.h | 1 + + drivers/scsi/libsas/sas_ata.c | 20 ++++- + drivers/scsi/megaraid/megaraid_sas.h | 10 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 93 ++++++++++--------- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 83 +++++++++++------ + drivers/scsi/mpt2sas/mpt2sas_base.h | 4 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 102 ++++++++++++++------- + drivers/scsi/osst.c | 6 +- + drivers/scsi/qla4xxx/Makefile | 2 +- + drivers/scsi/qla4xxx/ql4_attr.c | 69 ++++++++++++++ + drivers/scsi/qla4xxx/ql4_def.h | 11 ++- + drivers/scsi/qla4xxx/ql4_fw.h | 23 +++++ + drivers/scsi/qla4xxx/ql4_glbl.h | 3 +- + drivers/scsi/qla4xxx/ql4_init.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 22 +++-- + drivers/scsi/qla4xxx/ql4_mbx.c | 77 +++++++++------- + drivers/scsi/qla4xxx/ql4_nx.c | 19 ++++- + drivers/scsi/qla4xxx/ql4_os.c | 68 +++++++------- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + drivers/scsi/scsi_error.c | 87 ++++++++++++++---- + drivers/scsi/scsi_trace.c | 4 + + drivers/scsi/sd.c | 82 +++++++++++++---- + drivers/scsi/ultrastor.c | 2 +- + drivers/target/loopback/tcm_loop.c | 25 +---- + drivers/target/target_core_configfs.c | 4 - + drivers/target/target_core_device.c | 29 ++----- + drivers/target/target_core_pscsi.c | 4 +- + drivers/target/target_core_tmr.c | 7 +- + drivers/target/target_core_transport.c | 68 +++++++++----- + drivers/target/tcm_fc/tfc_cmd.c | 20 ++++- + drivers/target/tcm_fc/tfc_conf.c | 8 -- + include/scsi/scsi_tcq.h | 1 + + include/target/target_core_base.h | 1 + + include/target/target_core_fabric_ops.h | 1 - + include/target/target_core_transport.h | 1 + + 54 files changed, 920 insertions(+), 440 deletions(-) + create mode 100644 drivers/scsi/qla4xxx/ql4_attr.c +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Resolved 'drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c' using previous resolution. +Auto-merging drivers/net/wireless/airo.c +Auto-merging drivers/net/wireless/ath/ath9k/ar5008_phy.c +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +Auto-merging drivers/net/wireless/ath/ath9k/htc_hst.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/pci.c +Auto-merging drivers/net/wireless/ath/ath9k/rc.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/ath/carl9170/carl9170.h +Auto-merging drivers/net/wireless/ath/hw.c +Auto-merging drivers/net/wireless/b43/b43.h +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-calib.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/staging/ath6kl/os/linux/cfg80211.c +Auto-merging drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +Auto-merging drivers/staging/wlan-ng/cfg80211.c +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/mesh_pathtbl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 10959e3] Merge remote-tracking branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bcma/host_pci.c | 1 + + drivers/net/wireless/airo.c | 33 +-- + drivers/net/wireless/ath/ath9k/ahb.c | 2 +- + drivers/net/wireless/ath/ath9k/ani.c | 2 +- + drivers/net/wireless/ath/ath9k/ani.h | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.h | 2 +- + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 16 + + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +- + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 2 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 5 +- + drivers/net/wireless/ath/ath9k/beacon.c | 48 ++- + drivers/net/wireless/ath/ath9k/btcoex.c | 2 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 2 +- + drivers/net/wireless/ath/ath9k/calib.c | 2 +- + drivers/net/wireless/ath/ath9k/calib.h | 2 +- + drivers/net/wireless/ath/ath9k/common.c | 2 +- + drivers/net/wireless/ath/ath9k/common.h | 2 +- + drivers/net/wireless/ath/ath9k/debug.c | 10 +- + drivers/net/wireless/ath/ath9k/debug.h | 2 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 +- + drivers/net/wireless/ath/ath9k/gpio.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 4 +- + drivers/net/wireless/ath/ath9k/htc.h | 25 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 9 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 79 +++-- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_hst.h | 2 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/mac.c | 2 +- + drivers/net/wireless/ath/ath9k/mac.h | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 42 +++- + drivers/net/wireless/ath/ath9k/pci.c | 2 +- + drivers/net/wireless/ath/ath9k/phy.h | 2 +- + drivers/net/wireless/ath/ath9k/rc.c | 2 +- + drivers/net/wireless/ath/ath9k/rc.h | 2 +- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/ath9k/reg.h | 2 +- + drivers/net/wireless/ath/ath9k/wmi.c | 2 +- + drivers/net/wireless/ath/ath9k/wmi.h | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 4 + + drivers/net/wireless/ath/carl9170/fw.c | 19 +- + drivers/net/wireless/ath/carl9170/main.c | 10 +- + drivers/net/wireless/ath/hw.c | 10 +- + drivers/net/wireless/b43/b43.h | 24 +- + drivers/net/wireless/b43/dma.c | 37 +- + drivers/net/wireless/b43/leds.c | 4 +- + drivers/net/wireless/b43/lo.c | 4 +- + drivers/net/wireless/b43/main.c | 194 ++++++----- + drivers/net/wireless/b43/phy_a.c | 16 +- + drivers/net/wireless/b43/phy_common.c | 8 +- + drivers/net/wireless/b43/phy_g.c | 48 ++-- + drivers/net/wireless/b43/phy_lp.c | 22 +- + drivers/net/wireless/b43/phy_n.c | 24 +- + drivers/net/wireless/b43/pio.c | 30 +- + drivers/net/wireless/b43/rfkill.c | 6 +- + drivers/net/wireless/b43/sdio.c | 4 +- + drivers/net/wireless/b43/sysfs.c | 4 +- + drivers/net/wireless/b43/tables_lpphy.c | 4 +- + drivers/net/wireless/b43/wa.c | 4 +- + drivers/net/wireless/b43/xmit.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 86 +++-- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 250 +++----------- + drivers/net/wireless/iwlwifi/iwl-agn.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 10 - + drivers/net/wireless/iwlwifi/iwl-dev.h | 66 +++-- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 58 +++- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-sv-open.c | 177 ++++++++++- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 34 ++ + drivers/net/wireless/iwlwifi/iwl-tx.c | 364 ++++++++++++++------ + drivers/net/wireless/iwmc3200wifi/rx.c | 4 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 4 + + drivers/net/wireless/mwifiex/main.h | 9 +- + drivers/net/wireless/mwifiex/txrx.c | 4 +- + drivers/net/wireless/mwifiex/wmm.c | 59 +++- + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/rndis_wlan.c | 3 +- + drivers/net/wireless/rtlwifi/ps.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 69 ++++ + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 + + drivers/staging/ath6kl/os/linux/cfg80211.c | 2 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 3 +- + drivers/staging/wlan-ng/cfg80211.c | 2 +- + fs/proc/generic.c | 1 + + include/linux/rfkill-gpio.h | 43 +++ + include/net/cfg80211.h | 8 +- + net/mac80211/iface.c | 4 +- + net/mac80211/main.c | 22 +- + net/mac80211/mesh.h | 7 +- + net/mac80211/mesh_pathtbl.c | 204 +++++++---- + net/mac80211/scan.c | 5 + + net/rfkill/Kconfig | 9 + + net/rfkill/Makefile | 1 + + net/rfkill/rfkill-gpio.c | 227 ++++++++++++ + net/wireless/core.h | 5 +- + net/wireless/nl80211.c | 12 +- + net/wireless/sme.c | 19 +- + net/wireless/util.c | 2 +- + 142 files changed, 1819 insertions(+), 976 deletions(-) + create mode 100644 include/linux/rfkill-gpio.h + create mode 100644 net/rfkill/rfkill-gpio.c +Merging bluetooth/master +$ git merge bluetooth/master +Resolved 'net/bluetooth/l2cap_core.c' using previous resolution. +Auto-merging net/bluetooth/l2cap_core.c +CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 944a7b9] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + net/bluetooth/l2cap_core.c | 8 +------- + net/bluetooth/rfcomm/sock.c | 3 --- + 2 files changed, 1 insertions(+), 10 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_conexant.c | 41 +++++++++++++++++++++++++-------------- + 1 files changed, 26 insertions(+), 15 deletions(-) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + sound/soc/pxa/raumfeld.c | 92 +++++++++++++++++++++++++++++----------------- + sound/soc/soc-core.c | 8 ++-- + 2 files changed, 62 insertions(+), 38 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging cpufreq-move/move-drivers +$ git merge cpufreq-move/move-drivers +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/x86/lguest/boot.c +Auto-merging drivers/net/virtio_net.c +Merge made by recursive. + arch/x86/lguest/boot.c | 1 + + drivers/block/virtio_blk.c | 91 ++++++++++++++++++++++--- + drivers/char/virtio_console.c | 5 -- + drivers/net/virtio_net.c | 2 +- + drivers/vhost/net.c | 12 ++-- + drivers/vhost/test.c | 6 +- + drivers/vhost/vhost.c | 138 +++++++++++++++++++++++++++++---------- + drivers/vhost/vhost.h | 21 ++++-- + drivers/virtio/virtio_balloon.c | 21 ++---- + drivers/virtio/virtio_ring.c | 53 ++++++++++++++- + include/linux/virtio.h | 9 +++ + include/linux/virtio_9p.h | 25 +++++++- + include/linux/virtio_balloon.h | 25 +++++++- + include/linux/virtio_blk.h | 25 +++++++- + include/linux/virtio_config.h | 25 +++++++- + include/linux/virtio_console.h | 26 +++++++- + include/linux/virtio_ids.h | 24 +++++++- + include/linux/virtio_net.h | 25 +++++++- + include/linux/virtio_pci.h | 23 +++++++ + include/linux/virtio_ring.h | 52 ++++++++++++++- + tools/virtio/virtio_test.c | 19 +++++- + 21 files changed, 536 insertions(+), 92 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging fs/block_dev.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-block | 64 +++ + Documentation/blockdev/cciss.txt | 15 + + block/blk-cgroup.c | 200 +++++++-- + block/blk-cgroup.h | 40 ++- + block/blk-core.c | 32 +-- + block/blk-exec.c | 2 +- + block/blk-flush.c | 16 +- + block/blk-ioc.c | 3 + + block/blk-lib.c | 82 +--- + block/blk-settings.c | 9 +- + block/blk-sysfs.c | 3 +- + block/blk-throttle.c | 313 ++++++++++--- + block/blk.h | 23 +- + block/cfq-iosched.c | 232 +++++++--- + block/elevator.c | 11 +- + drivers/ata/libata-scsi.c | 13 +- + drivers/block/Kconfig | 21 + + drivers/block/Makefile | 1 + + drivers/block/cciss.c | 571 ++++++++++++++++++----- + drivers/block/cciss.h | 11 +- + drivers/block/cciss_cmd.h | 11 + + drivers/block/cciss_scsi.c | 41 +- + drivers/block/cciss_scsi.h | 4 - + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 6 +- + drivers/block/drbd/drbd_int.h | 19 +- + drivers/block/drbd/drbd_main.c | 37 ++- + drivers/block/drbd/drbd_nl.c | 127 ++++-- + drivers/block/drbd/drbd_receiver.c | 68 ++-- + drivers/block/drbd/drbd_req.c | 20 +- + drivers/block/drbd/drbd_req.h | 5 +- + drivers/block/drbd/drbd_worker.c | 98 +++-- + drivers/block/loop.c | 11 +- + drivers/block/paride/pcd.c | 2 + + drivers/block/xen-blkback/Makefile | 3 + + drivers/block/xen-blkback/blkback.c | 824 +++++++++++++++++++++++++++++++++ + drivers/block/xen-blkback/common.h | 233 ++++++++++ + drivers/block/xen-blkback/xenbus.c | 768 ++++++++++++++++++++++++++++++ + drivers/block/xen-blkfront.c | 51 ++- + drivers/cdrom/viocd.c | 4 +- + drivers/ide/ide-cd.c | 3 +- + drivers/scsi/sr.c | 2 +- + fs/block_dev.c | 17 +- + fs/partitions/check.c | 8 +- + fs/splice.c | 33 +- + include/linux/blk_types.h | 2 - + include/linux/blkdev.h | 15 +- + include/linux/drbd.h | 10 +- + include/linux/drbd_tag_magic.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/lru_cache.h | 12 +- + include/xen/interface/io/blkif.h | 13 + + mm/backing-dev.c | 4 +- + 53 files changed, 3477 insertions(+), 642 deletions(-) + create mode 100644 drivers/block/xen-blkback/Makefile + create mode 100644 drivers/block/xen-blkback/blkback.c + create mode 100644 drivers/block/xen-blkback/common.h + create mode 100644 drivers/block/xen-blkback/xenbus.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +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 arch/arm/mach-omap2/board-rx51-peripherals.c +Merge made by recursive. + arch/arm/mach-omap2/board-rx51-peripherals.c | 27 ++- + drivers/power/Kconfig | 9 + + drivers/power/Makefile | 1 + + drivers/power/bq27x00_battery.c | 11 +- + drivers/power/ds2760_battery.c | 6 +- + drivers/power/gpio-charger.c | 15 + + drivers/power/isp1704_charger.c | 22 ++ + drivers/power/max8903_charger.c | 391 ++++++++++++++++++++++++++ + drivers/power/test_power.c | 276 +++++++++++++++++- + drivers/power/z2_battery.c | 20 +- + include/linux/power/isp1704_charger.h | 29 ++ + include/linux/power/max8903_charger.h | 57 ++++ + 12 files changed, 840 insertions(+), 24 deletions(-) + create mode 100644 drivers/power/max8903_charger.c + create mode 100644 include/linux/power/isp1704_charger.h + create mode 100644 include/linux/power/max8903_charger.h +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 231e6f3] 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 +Resolved 'drivers/mmc/host/tmio_mmc_pio.c' using previous resolution. +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging MAINTAINERS +Auto-merging drivers/mmc/card/mmc_test.c +Auto-merging drivers/mmc/core/bus.c +Auto-merging drivers/mmc/core/mmc.c +Auto-merging drivers/mmc/core/mmc_ops.c +Auto-merging drivers/mmc/core/sdio_irq.c +Auto-merging drivers/mmc/host/sdhci-pci.c +Auto-merging drivers/mmc/host/sdhci.c +Auto-merging drivers/mmc/host/tmio_mmc_pio.c +CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc_pio.c +Auto-merging include/linux/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 49ffb03] Merge remote-tracking branch 'mmc/mmc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/mmc/00-INDEX | 2 + + Documentation/mmc/mmc-dev-attrs.txt | 10 + + Documentation/mmc/mmc-dev-parts.txt | 27 + + MAINTAINERS | 7 + + arch/arm/mach-tegra/include/mach/sdhci.h | 1 + + drivers/mmc/card/block.c | 712 ++++++++- + drivers/mmc/card/mmc_test.c | 116 +- + drivers/mmc/card/queue.c | 8 - + drivers/mmc/core/bus.c | 11 +- + drivers/mmc/core/core.c | 111 +- + drivers/mmc/core/core.h | 7 +- + drivers/mmc/core/host.c | 13 +- + drivers/mmc/core/mmc.c | 74 +- + drivers/mmc/core/mmc_ops.c | 80 +- + drivers/mmc/core/mmc_ops.h | 1 - + drivers/mmc/core/quirks.c | 89 +- + drivers/mmc/core/sd.c | 405 +++++- + drivers/mmc/core/sd.h | 2 +- + drivers/mmc/core/sd_ops.c | 51 +- + drivers/mmc/core/sdio.c | 24 +- + drivers/mmc/core/sdio_irq.c | 33 +- + drivers/mmc/core/sdio_ops.c | 18 +- + drivers/mmc/host/Kconfig | 33 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/dw_mmc.c | 6 +- + drivers/mmc/host/sdhci-pci.c | 49 +- + drivers/mmc/host/sdhci-pxa.c | 48 +- + drivers/mmc/host/sdhci-tegra.c | 2 + + drivers/mmc/host/sdhci.c | 857 ++++++++++- + drivers/mmc/host/sdhci.h | 59 +- + drivers/mmc/host/sh_mmcif.c | 126 ++- + drivers/mmc/host/sh_mobile_sdhi.c | 50 +- + drivers/mmc/host/tmio_mmc.c | 32 +- + drivers/mmc/host/tmio_mmc.h | 16 +- + drivers/mmc/host/tmio_mmc_dma.c | 21 +- + drivers/mmc/host/tmio_mmc_pio.c | 184 ++- + drivers/mmc/host/vub300.c | 2506 ++++++++++++++++++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/mfd/tmio.h | 17 + + include/linux/mmc/Kbuild | 1 + + include/linux/mmc/card.h | 189 +++- + include/linux/mmc/core.h | 5 +- + include/linux/mmc/host.h | 50 +- + include/linux/mmc/ioctl.h | 54 + + include/linux/mmc/mmc.h | 18 + + include/linux/mmc/sd.h | 9 +- + include/linux/mmc/sdhci.h | 15 + + include/linux/mmc/sh_mobile_sdhi.h | 4 + + 49 files changed, 5604 insertions(+), 552 deletions(-) + create mode 100644 Documentation/mmc/mmc-dev-parts.txt + mode change 100644 => 100755 drivers/mmc/card/block.c + create mode 100644 drivers/mmc/host/vub300.c + create mode 100644 include/linux/mmc/Kbuild + create mode 100644 include/linux/mmc/ioctl.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/leds/leds-mc13783.c +Auto-merging drivers/media/radio/radio-wl1273.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mmc/host/tmio_mmc.c +Auto-merging drivers/regulator/mc13783-regulator.c +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by recursive. + MAINTAINERS | 2 + + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + drivers/dma/timb_dma.c | 3 +- + drivers/gpio/janz-ttl.c | 3 +- + drivers/gpio/rdc321x-gpio.c | 3 +- + drivers/gpio/timbgpio.c | 6 +- + drivers/i2c/busses/i2c-ocores.c | 3 +- + drivers/i2c/busses/i2c-xiic.c | 3 +- + drivers/input/keyboard/Kconfig | 11 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/pmic8xxx-keypad.c | 799 ++++++++++++++++++++++++++ + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/pmic8xxx-pwrkey.c | 231 ++++++++ + drivers/input/misc/twl4030-vibra.c | 3 +- + drivers/leds/Kconfig | 10 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-88pm860x.c | 7 +- + drivers/leds/leds-asic3.c | 165 ++++++ + drivers/leds/leds-mc13783.c | 7 +- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/video/timblogiw.c | 3 +- + drivers/mfd/88pm860x-core.c | 155 +++--- + drivers/mfd/Kconfig | 84 ++- + drivers/mfd/Makefile | 2 + + drivers/mfd/ab3100-core.c | 6 +- + drivers/mfd/ab3550-core.c | 6 +- + drivers/mfd/ab8500-core.c | 32 +- + drivers/mfd/ab8500-gpadc.c | 34 ++- + drivers/mfd/asic3.c | 83 +++- + drivers/mfd/davinci_voicecodec.c | 6 +- + drivers/mfd/htc-pasic3.c | 5 +- + drivers/mfd/janz-cmodio.c | 3 +- + drivers/mfd/max8925-core.c | 2 +- + drivers/mfd/mc13xxx-core.c | 12 +- + drivers/mfd/mfd-core.c | 7 + + drivers/mfd/omap-usb-host.c | 152 +---- + drivers/mfd/pm8921-core.c | 212 +++++++ + drivers/mfd/pm8xxx-irq.c | 371 ++++++++++++ + drivers/mfd/rdc321x-southbridge.c | 6 +- + drivers/mfd/t7l66xb.c | 6 +- + drivers/mfd/tc6387xb.c | 3 +- + drivers/mfd/tc6393xb.c | 10 +- + drivers/mfd/timberdale.c | 81 ++- + drivers/mfd/tps6105x.c | 3 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/twl-core.c | 252 +++++++-- + drivers/mfd/twl4030-codec.c | 10 +- + drivers/mfd/twl4030-power.c | 6 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/wl1273-core.c | 7 +- + drivers/mfd/wm831x-core.c | 13 +- + drivers/mfd/wm831x-irq.c | 27 +- + drivers/mfd/wm8400-core.c | 3 +- + drivers/mmc/host/tmio_mmc.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/net/can/janz-ican3.c | 3 +- + drivers/net/ks8842.c | 3 +- + drivers/power/max8925_power.c | 10 +- + drivers/regulator/88pm8607.c | 30 +- + drivers/regulator/ab3100.c | 3 +- + drivers/regulator/max8925-regulator.c | 11 +- + drivers/regulator/mc13783-regulator.c | 7 +- + drivers/regulator/mc13892-regulator.c | 7 +- + drivers/regulator/tps6105x-regulator.c | 4 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-88pm860x.c | 427 ++++++++++++++ + drivers/spi/xilinx_spi.c | 3 +- + drivers/video/backlight/88pm860x_bl.c | 7 +- + drivers/video/tmiofb.c | 12 +- + drivers/w1/masters/ds1wm.c | 12 +- + drivers/watchdog/rdc321x_wdt.c | 3 +- + include/linux/i2c/twl.h | 54 ++- + include/linux/input/pmic8xxx-keypad.h | 52 ++ + include/linux/input/pmic8xxx-pwrkey.h | 31 + + include/linux/mfd/88pm860x.h | 6 + + include/linux/mfd/abx500.h | 8 + + include/linux/mfd/asic3.h | 23 +- + include/linux/mfd/core.h | 23 +- + include/linux/mfd/pm8xxx/core.h | 81 +++ + include/linux/mfd/pm8xxx/irq.h | 59 ++ + include/linux/mfd/pm8xxx/pm8921.h | 31 + + include/linux/mfd/twl4030-codec.h | 2 +- + include/linux/mfd/wm831x/core.h | 26 - + include/linux/mfd/wm831x/pdata.h | 4 + + sound/soc/codecs/cq93vc.c | 3 +- + sound/soc/codecs/twl4030.c | 6 +- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm8400.c | 2 +- + sound/soc/davinci/davinci-vcif.c | 2 +- + 92 files changed, 3328 insertions(+), 532 deletions(-) + create mode 100644 drivers/input/keyboard/pmic8xxx-keypad.c + create mode 100644 drivers/input/misc/pmic8xxx-pwrkey.c + create mode 100644 drivers/leds/leds-asic3.c + create mode 100644 drivers/mfd/pm8921-core.c + create mode 100644 drivers/mfd/pm8xxx-irq.c + create mode 100644 drivers/rtc/rtc-88pm860x.c + create mode 100644 include/linux/input/pmic8xxx-keypad.h + create mode 100644 include/linux/input/pmic8xxx-pwrkey.h + create mode 100644 include/linux/mfd/pm8xxx/core.h + create mode 100644 include/linux/mfd/pm8xxx/irq.h + create mode 100644 include/linux/mfd/pm8xxx/pm8921.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/master +$ git merge fbdev/master +Auto-merging arch/arm/mach-omap2/board-3430sdp.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-omap2/board-am3517evm.c +Auto-merging arch/arm/mach-omap2/board-cm-t35.c +Auto-merging arch/arm/mach-omap2/board-devkit8000.c +Auto-merging arch/arm/mach-omap2/board-igep0020.c +Auto-merging arch/arm/mach-omap2/board-omap3beagle.c +Auto-merging arch/arm/mach-omap2/board-omap3evm.c +Auto-merging arch/arm/mach-omap2/board-omap3pandora.c +Auto-merging arch/arm/mach-omap2/board-omap3stalker.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-omap2/board-overo.c +Auto-merging arch/arm/mach-omap2/board-rx51-video.c +Auto-merging arch/arm/mach-omap2/board-zoom-display.c +Auto-merging include/video/omap-panel-generic-dpi.h +Auto-merging include/video/omap-panel-nokia-dsi.h +Auto-merging include/video/omapdss.h +Merge made by recursive. + arch/arm/mach-omap2/board-3430sdp.c | 4 +- + arch/arm/mach-omap2/board-4430sdp.c | 11 +- + arch/arm/mach-omap2/board-am3517evm.c | 4 +- + arch/arm/mach-omap2/board-cm-t35.c | 4 +- + arch/arm/mach-omap2/board-devkit8000.c | 4 +- + arch/arm/mach-omap2/board-igep0020.c | 4 +- + arch/arm/mach-omap2/board-omap3beagle.c | 4 +- + arch/arm/mach-omap2/board-omap3evm.c | 4 +- + arch/arm/mach-omap2/board-omap3pandora.c | 2 +- + arch/arm/mach-omap2/board-omap3stalker.c | 4 +- + arch/arm/mach-omap2/board-omap4panda.c | 4 +- + arch/arm/mach-omap2/board-overo.c | 4 +- + arch/arm/mach-omap2/board-rx51-video.c | 2 +- + arch/arm/mach-omap2/board-zoom-display.c | 2 +- + arch/arm/mach-omap2/display.c | 77 +- + arch/arm/mach-omap2/include/mach/board-zoom.h | 2 +- + drivers/media/video/omap/omap_vout.c | 2 +- + drivers/media/video/omap/omap_voutdef.h | 2 +- + drivers/video/Kconfig | 33 +- + drivers/video/Makefile | 1 + + drivers/video/amifb.c | 27 +- + drivers/video/da8xx-fb.c | 4 +- + drivers/video/efifb.c | 4 +- + drivers/video/omap/dispc.c | 4 +- + drivers/video/omap/omapfb_main.c | 2 +- + drivers/video/omap/rfbi.c | 2 +- + drivers/video/omap2/Makefile | 4 +- + drivers/video/omap2/displays/Kconfig | 9 +- + drivers/video/omap2/displays/panel-acx565akm.c | 2 +- + drivers/video/omap2/displays/panel-generic-dpi.c | 57 +- + .../omap2/displays/panel-lgphilips-lb035q02.c | 2 +- + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 2 +- + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 6 +- + drivers/video/omap2/displays/panel-taal.c | 536 ++++- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 10 +- + drivers/video/omap2/dss/Kconfig | 33 +- + drivers/video/omap2/dss/core.c | 15 +- + drivers/video/omap2/dss/dispc.c | 1552 +++++++------ + drivers/video/omap2/dss/dispc.h | 691 ++++++ + drivers/video/omap2/dss/display.c | 46 +- + drivers/video/omap2/dss/dpi.c | 113 +- + drivers/video/omap2/dss/dsi.c | 2367 +++++++++++++------- + drivers/video/omap2/dss/dss.c | 118 +- + drivers/video/omap2/dss/dss.h | 98 +- + drivers/video/omap2/dss/dss_features.c | 105 +- + drivers/video/omap2/dss/dss_features.h | 39 +- + drivers/video/omap2/dss/hdmi.c | 461 ++++- + drivers/video/omap2/dss/hdmi.h | 222 ++- + drivers/video/omap2/dss/hdmi_omap4_panel.c | 2 +- + drivers/video/omap2/dss/manager.c | 14 +- + drivers/video/omap2/dss/overlay.c | 43 +- + drivers/video/omap2/dss/rfbi.c | 176 +-- + drivers/video/omap2/dss/sdi.c | 2 +- + drivers/video/omap2/dss/venc.c | 23 +- + drivers/video/omap2/omapfb/omapfb-ioctl.c | 14 +- + drivers/video/omap2/omapfb/omapfb-main.c | 231 ++- + drivers/video/omap2/omapfb/omapfb-sysfs.c | 23 +- + drivers/video/omap2/omapfb/omapfb.h | 8 +- + drivers/video/s3c-fb.c | 121 +- + drivers/video/s3c2410fb.c | 8 +- + drivers/video/s3fb.c | 209 ++- + drivers/video/savage/savagefb-i2c.c | 2 + + drivers/video/savage/savagefb.h | 8 +- + drivers/video/savage/savagefb_driver.c | 15 +- + drivers/video/sh7760fb.c | 6 +- + drivers/video/sh_mobile_hdmi.c | 10 +- + drivers/video/sh_mobile_lcdcfb.c | 125 +- + drivers/video/sh_mobile_lcdcfb.h | 1 + + drivers/video/sh_mobile_meram.c | 567 +++++ + drivers/video/sh_mobile_meram.h | 41 + + drivers/video/sm501fb.c | 24 +- + drivers/video/udlfb.c | 20 +- + .../video/omap-panel-generic-dpi.h | 8 +- + .../video/omap-panel-nokia-dsi.h | 14 +- + .../plat/display.h => include/video/omapdss.h | 114 +- + include/video/sh_mobile_lcdc.h | 3 + + include/video/sh_mobile_meram.h | 68 + + 77 files changed, 6345 insertions(+), 2260 deletions(-) + create mode 100644 drivers/video/omap2/dss/dispc.h + create mode 100644 drivers/video/sh_mobile_meram.c + create mode 100644 drivers/video/sh_mobile_meram.h + rename arch/arm/plat-omap/include/plat/panel-generic-dpi.h => include/video/omap-panel-generic-dpi.h (86%) + rename arch/arm/plat-omap/include/plat/nokia-dsi-panel.h => include/video/omap-panel-nokia-dsi.h (65%) + rename arch/arm/plat-omap/include/plat/display.h => include/video/omapdss.h (85%) + create mode 100644 include/video/sh_mobile_meram.h +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 +Resolved 'drivers/mfd/Kconfig' using previous resolution. +Resolved 'drivers/mfd/Makefile' using previous resolution. +Auto-merging drivers/mfd/Kconfig +CONFLICT (content): Merge conflict in drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Auto-merging drivers/regulator/core.c +Auto-merging drivers/regulator/max8998.c +Auto-merging drivers/regulator/mc13892-regulator.c +Auto-merging drivers/regulator/tps6105x-regulator.c +Auto-merging drivers/usb/otg/twl6030-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 173d326] Merge remote-tracking branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/regulator/machine.txt | 4 +- + drivers/gpio/Kconfig | 7 + + drivers/gpio/Makefile | 1 + + drivers/gpio/tps65910-gpio.c | 100 +++ + drivers/mfd/Kconfig | 9 + + drivers/mfd/Makefile | 1 + + drivers/mfd/tps65910-irq.c | 218 ++++++ + drivers/mfd/tps65910.c | 229 +++++++ + drivers/mfd/tps65911-comparator.c | 188 ++++++ + drivers/regulator/Kconfig | 6 + + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 93 ++- + drivers/regulator/max8997.c | 13 +- + drivers/regulator/max8998.c | 22 +- + drivers/regulator/mc13892-regulator.c | 18 +- + drivers/regulator/mc13xxx-regulator-core.c | 2 +- + drivers/regulator/tps6105x-regulator.c | 1 + + drivers/regulator/tps65023-regulator.c | 3 +- + drivers/regulator/tps6507x-regulator.c | 3 +- + drivers/regulator/tps65910-regulator.c | 993 ++++++++++++++++++++++++++++ + drivers/regulator/twl-regulator.c | 564 ++++++++++++++-- + drivers/regulator/wm831x-dcdc.c | 2 - + drivers/regulator/wm8400-regulator.c | 12 +- + drivers/usb/otg/twl6030-usb.c | 10 +- + include/linux/mfd/max8997-private.h | 4 - + include/linux/mfd/tps65910.h | 800 ++++++++++++++++++++++ + include/linux/regulator/machine.h | 7 +- + 27 files changed, 3161 insertions(+), 150 deletions(-) + create mode 100644 drivers/gpio/tps65910-gpio.c + create mode 100644 drivers/mfd/tps65910-irq.c + create mode 100644 drivers/mfd/tps65910.c + create mode 100644 drivers/mfd/tps65911-comparator.c + create mode 100644 drivers/regulator/tps65910-regulator.c + create mode 100644 include/linux/mfd/tps65910.h +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +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 +Merge made by recursive. + drivers/watchdog/iTCO_wdt.c | 407 ++++++++++++++-------------------------- + drivers/watchdog/it8712f_wdt.c | 61 +++++-- + drivers/watchdog/it87_wdt.c | 168 +++++++++-------- + drivers/watchdog/pc87413_wdt.c | 96 +++++----- + 4 files changed, 323 insertions(+), 409 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Recorded preimage for 'arch/x86/kernel/apic/apic.c' +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/include/asm/apic.h +Auto-merging arch/x86/kernel/apic/apic.c +CONFLICT (content): Merge conflict in arch/x86/kernel/apic/apic.c +Auto-merging drivers/pci/intel-iommu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/apic/apic.c'. +[master 06603ab] Merge remote-tracking branch 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 3 ++ + arch/x86/include/asm/apic.h | 2 - + arch/x86/kernel/apic/apic.c | 16 ++++++++++--- + drivers/pci/dmar.c | 36 +++++++++++++++++++++++------ + drivers/pci/intel-iommu.c | 41 +++++++++++++++++++++++++++++----- + include/linux/dma_remapping.h | 1 + + include/linux/dmar.h | 3 ++ + include/linux/intel-iommu.h | 4 +++ + 8 files changed, 86 insertions(+), 20 deletions(-) +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 +Removing arch/frv/include/asm/suspend.h +Removing arch/powerpc/include/asm/suspend.h +Removing arch/s390/include/asm/suspend.h +Auto-merging kernel/pm_qos_params.c +Merge made by recursive. + arch/frv/include/asm/suspend.h | 20 --- + arch/mips/include/asm/suspend.h | 2 - + arch/powerpc/include/asm/suspend.h | 6 - + arch/powerpc/kernel/swsusp.c | 1 - + arch/s390/include/asm/suspend.h | 10 -- + arch/sh/include/asm/suspend.h | 1 - + arch/unicore32/include/asm/suspend.h | 1 - + arch/x86/include/asm/suspend_32.h | 2 - + arch/x86/include/asm/suspend_64.h | 5 - + kernel/pm_qos_params.c | 33 ++++-- + kernel/power/hibernate.c | 220 +++++++++++++++++----------------- + 11 files changed, 134 insertions(+), 167 deletions(-) + delete mode 100644 arch/frv/include/asm/suspend.h + delete mode 100644 arch/powerpc/include/asm/suspend.h + delete mode 100644 arch/s390/include/asm/suspend.h +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 +Merge made by recursive. + arch/powerpc/platforms/52xx/mpc52xx_common.c | 10 ++--- + drivers/of/platform.c | 54 ++++++++++++++++++++++++-- + include/linux/of_platform.h | 3 + + 3 files changed, 57 insertions(+), 10 deletions(-) +Merging spi/spi/next +$ git merge spi/spi/next +Merge made by recursive. + drivers/spi/Kconfig | 4 +- + drivers/spi/amba-pl022.c | 35 +++++--- + drivers/spi/dw_spi.c | 202 +++++++++++++++------------------------------ + drivers/spi/dw_spi.h | 2 - + drivers/spi/spi.c | 4 +- + drivers/spi/spi_nuc900.c | 2 +- + drivers/spi/spi_s3c24xx.c | 2 +- + drivers/spi/spi_sh.c | 2 +- + drivers/spi/spi_tegra.c | 2 +- + include/linux/spi/spi.h | 8 +- + 10 files changed, 100 insertions(+), 163 deletions(-) +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 +Auto-merging kernel/rcutree.c +Merge made by recursive. + Documentation/RCU/trace.txt | 17 ++--- + include/linux/atomic.h | 13 ++++ + include/linux/rcupdate.h | 5 +- + kernel/rcutree.c | 162 +++++++++++++++++-------------------------- + kernel/rcutree.h | 30 ++++---- + kernel/rcutree_plugin.h | 23 +----- + kernel/rcutree_trace.c | 12 ++-- + 7 files changed, 112 insertions(+), 150 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Merge made by recursive. + virt/kvm/kvm_main.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Merge made by recursive. + arch/powerpc/oprofile/op_model_power4.c | 24 ++++++++- + arch/x86/oprofile/op_model_amd.c | 95 +++++++++++++++++------------- + drivers/oprofile/event_buffer.h | 2 +- + drivers/oprofile/oprof.c | 2 +- + 4 files changed, 79 insertions(+), 44 deletions(-) +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 +Already up-to-date! +Merge made by recursive. +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 +Merge made by recursive. +Merging workqueues/for-next +$ git merge workqueues/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging kernel/workqueue.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 ---- + include/linux/workqueue.h | 18 +------ + kernel/workqueue.c | 81 ++++++++++++++++++---------- + 3 files changed, 55 insertions(+), 54 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Resolved 'drivers/platform/x86/Kconfig' using previous resolution. +Resolved 'drivers/platform/x86/Makefile' using previous resolution. +Resolved 'drivers/platform/x86/eeepc-laptop.c' using previous resolution. +Resolved 'drivers/platform/x86/sony-laptop.c' using previous resolution. +Removing Documentation/laptops/acer-wmi.txt +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/Kconfig +CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig +Auto-merging drivers/platform/x86/Makefile +CONFLICT (content): Merge conflict in drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/eeepc-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c +Auto-merging drivers/platform/x86/sony-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/sony-laptop.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 221308a] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/laptops/acer-wmi.txt | 184 --------- + MAINTAINERS | 11 +- + drivers/platform/x86/Kconfig | 11 +- + drivers/platform/x86/Makefile | 3 +- + drivers/platform/x86/acer-wmi.c | 40 +- + drivers/platform/x86/acerhdf.c | 4 +- + drivers/platform/x86/asus-laptop.c | 34 +- + drivers/platform/x86/asus-wmi.c | 22 +- + drivers/platform/x86/asus_acpi.c | 77 ++--- + drivers/platform/x86/compal-laptop.c | 22 +- + drivers/platform/x86/dell-laptop.c | 12 +- + drivers/platform/x86/dell-wmi-aio.c | 3 +- + drivers/platform/x86/dell-wmi.c | 17 +- + drivers/platform/x86/eeepc-laptop.c | 18 +- + drivers/platform/x86/eeepc-wmi.c | 14 +- + drivers/platform/x86/fujitsu-laptop.c | 39 +- + drivers/platform/x86/hdaps.c | 19 +- + drivers/platform/x86/hp-wmi.c | 43 +-- + drivers/platform/x86/ibm_rtl.c | 23 +- + drivers/platform/x86/ideapad-laptop.c | 2 + + drivers/platform/x86/intel_menlow.c | 5 +- + drivers/platform/x86/intel_mid_powerbtn.c | 72 ++-- + drivers/platform/x86/intel_mid_thermal.c | 607 ++++++++++++++--------------- + drivers/platform/x86/intel_oaktrail.c | 396 +++++++++++++++++++ + drivers/platform/x86/intel_pmic_gpio.c | 14 +- + drivers/platform/x86/msi-laptop.c | 9 +- + drivers/platform/x86/msi-wmi.c | 45 +-- + drivers/platform/x86/sony-laptop.c | 104 +++--- + drivers/platform/x86/tc1100-wmi.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 490 ++++++++++-------------- + drivers/platform/x86/topstar-laptop.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 59 ++-- + drivers/platform/x86/toshiba_bluetooth.c | 11 +- + drivers/platform/x86/wmi.c | 10 +- + drivers/platform/x86/xo15-ebook.c | 5 +- + 35 files changed, 1252 insertions(+), 1182 deletions(-) + delete mode 100644 Documentation/laptops/acer-wmi.txt + create mode 100644 drivers/platform/x86/intel_oaktrail.c +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging namespace/master +$ git merge namespace/master +Resolved 'arch/alpha/include/asm/unistd.h' using previous resolution. +Resolved 'arch/alpha/kernel/systbls.S' using previous resolution. +Resolved 'arch/m68k/kernel/entry_mm.S' using previous resolution. +Resolved 'arch/sh/include/asm/unistd_32.h' using previous resolution. +Resolved 'arch/sh/include/asm/unistd_64.h' using previous resolution. +Resolved 'arch/sh/kernel/syscalls_32.S' using previous resolution. +Resolved 'arch/sh/kernel/syscalls_64.S' using previous resolution. +Auto-merging arch/alpha/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/alpha/include/asm/unistd.h +Auto-merging arch/alpha/kernel/systbls.S +CONFLICT (content): Merge conflict in arch/alpha/kernel/systbls.S +Auto-merging arch/m68k/include/asm/unistd.h +Auto-merging arch/m68k/kernel/entry_mm.S +CONFLICT (content): Merge conflict in arch/m68k/kernel/entry_mm.S +Auto-merging arch/m68k/kernel/syscalltable.S +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/mips/kernel/scall64-64.S +Auto-merging arch/mips/kernel/scall64-n32.S +Auto-merging arch/mips/kernel/scall64-o32.S +Auto-merging arch/s390/include/asm/unistd.h +Auto-merging arch/sh/include/asm/unistd_32.h +CONFLICT (content): Merge conflict in arch/sh/include/asm/unistd_32.h +Auto-merging arch/sh/include/asm/unistd_64.h +CONFLICT (content): Merge conflict in arch/sh/include/asm/unistd_64.h +Auto-merging arch/sh/kernel/syscalls_32.S +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls_32.S +Auto-merging arch/sh/kernel/syscalls_64.S +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls_64.S +Auto-merging include/asm-generic/unistd.h +Auto-merging include/linux/proc_fs.h +Auto-merging net/core/net_namespace.c +Auto-merging net/core/rtnetlink.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9a43f18] Merge remote-tracking branch 'namespace/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/unistd.h | 3 +- + arch/alpha/kernel/systbls.S | 1 + + arch/arm/include/asm/unistd.h | 1 + + arch/arm/kernel/calls.S | 1 + + arch/avr32/include/asm/unistd.h | 3 +- + arch/avr32/kernel/syscall_table.S | 1 + + arch/blackfin/include/asm/unistd.h | 3 +- + arch/blackfin/mach-common/entry.S | 1 + + arch/cris/arch-v10/kernel/entry.S | 1 + + arch/cris/arch-v32/kernel/entry.S | 1 + + arch/cris/include/asm/unistd.h | 3 +- + arch/frv/include/asm/unistd.h | 3 +- + arch/frv/kernel/entry.S | 1 + + arch/h8300/include/asm/unistd.h | 3 +- + arch/h8300/kernel/syscalls.S | 1 + + arch/ia64/include/asm/unistd.h | 3 +- + arch/ia64/kernel/entry.S | 1 + + arch/m32r/include/asm/unistd.h | 3 +- + arch/m32r/kernel/syscall_table.S | 1 + + arch/m68k/include/asm/unistd.h | 3 +- + arch/m68k/kernel/syscalltable.S | 1 + + arch/microblaze/include/asm/unistd.h | 3 +- + arch/microblaze/kernel/syscall_table.S | 1 + + arch/mips/include/asm/unistd.h | 15 ++- + 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/mn10300/include/asm/unistd.h | 3 +- + arch/mn10300/kernel/entry.S | 1 + + arch/parisc/include/asm/unistd.h | 4 +- + arch/parisc/kernel/syscall_table.S | 1 + + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 3 +- + arch/s390/include/asm/unistd.h | 3 +- + arch/s390/kernel/syscalls.S | 1 + + arch/sh/include/asm/unistd_32.h | 3 +- + arch/sh/include/asm/unistd_64.h | 3 +- + arch/sh/kernel/syscalls_32.S | 1 + + arch/sh/kernel/syscalls_64.S | 1 + + arch/sparc/include/asm/unistd.h | 3 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + arch/xtensa/include/asm/unistd.h | 4 +- + fs/proc/Makefile | 1 + + fs/proc/base.c | 20 ++-- + fs/proc/inode.c | 7 + + fs/proc/internal.h | 18 +++ + fs/proc/namespaces.c | 198 ++++++++++++++++++++++++++++++++ + include/asm-generic/unistd.h | 4 +- + include/linux/if_link.h | 1 + + include/linux/proc_fs.h | 21 ++++ + include/linux/syscalls.h | 1 + + include/net/net_namespace.h | 1 + + ipc/namespace.c | 37 ++++++ + kernel/nsproxy.c | 42 +++++++ + kernel/utsname.c | 39 ++++++ + net/core/net_namespace.c | 65 +++++++++++ + net/core/rtnetlink.c | 5 +- + 63 files changed, 525 insertions(+), 42 deletions(-) + create mode 100644 fs/proc/namespaces.c +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/super.c +Auto-merging include/linux/fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e525e0a] Merge remote-tracking branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 278 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 122 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 23 ++ + mm/Makefile | 1 + + mm/cleancache.c | 244 +++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 6 + + 21 files changed, 1027 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging arm-dt/devicetree/arm-next +$ git merge arm-dt/devicetree/arm-next +Merge made by recursive. +Merging scsi-post-merge/merge-base:master +$ git revert 95de6ce677d6 +[master 4e69e26] Revert "KVM: add missing void __user * cast to access_ok() call" + 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..747d5fb5010b --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,48 @@ +Importing i2c based on 2.6.39-git9 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard d762f4383100c2a87b1a3f2d678cd3b5425655b4 +HEAD is now at d762f43 Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 +$ git quiltimport --author Jean Delvare --patches ../quilt/i2c +i2c-writing-clients-fix-foo_driver-id_table.patch +i2c-i801-01-add-intel-panther-point-device-id.patch +i2c-i801-02-no-devices-on-idf-channels.patch +i2c-i801-03-check-dmi-vendor-for-apanel.patch +i2c-i801-04-drop-dependencies-on-drivers.patch +i2c-parport-cleanups.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 87826b7...2ea38be master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.39-git9 +$ cd ../quilt-tmp +$ git reset --hard d762f4383100c2a87b1a3f2d678cd3b5425655b4 +HEAD is now at d762f43 Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 +$ git quiltimport --author Jean Delvare --patches ../quilt/jdelvare-hwmon +i8k-avoid-lahf-in-64bit-code.patch +hwmon-use-set_drvdata-helpers.patch +hwmon-k10temp-add-support-for-fam15h-bulldozer.patch +hwmon-add-driver-for-amd-fam15h-power.patch +hwmon-jc42-change-class.patch +hwmon-asc7621-drop-duplicate-dependency.patch +hwmon-f71882fg-01-split-has_beep-in-fan_has_beep-and-temp_has_beep.patch +hwmon-f71882fg-02-add-support-for-F71808A.patch +move-acpi-power-meter-to-hwmon.patch +hwmon-max6650-01-drop-detection.patch +hwmon-max6650-02-properly-support-MAX6650.patch +i8k-01-hwmon-integration.patch +hwmon-sch5627-01-add-sch5627_send_cmd-function.patch +hwmon-sch5627-02-trigger-vbat-measurements.patch +use-request_muxed_region-in-it87-hwmon-drivers.patch +hwmon-abiturugu-depends-on-dmi.patch +hwmon-add-emc6w201-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + a9726c5...b080616 master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.39-rc3-git8 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.39-180-g51509a2 +Unchanged quilt series rr +Importing device-mapper based on v2.6.39 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..84986d8b8033 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110525 -- cgit v1.2.3