From cc03bbf1edc87fd4813546e8a8455b6ea6efc4d2 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 4 Nov 2011 16:13:37 +1100 Subject: [PATCH] Add linux-next specific files for 20111104 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 199 ++ Next/Trees | 201 ++ Next/merge.log | 6995 +++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 24 + localversion-next | 1 + 5 files changed, 7420 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..4216b4a4afd4 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,199 @@ +Name SHA1 +---- ---- +origin d6748066ad0e8b2514545998f8367ebb3906f299 +fixes 956e850afc70a50d084233fd4f11a5c812bae47e +kbuild-current 322a8b034003c0d46d39af85bf24fee27b902f48 +arm-current 1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49 +m68k-current 4b7cecc4fce031dd204e994a59d436c770353bad +powerpc-merge 0c81e4b426a17785ebd4f41d1e14a818706bdc90 +52xx-and-virtex-current c49f8789f532ae39019135ca038e9bc0d15aaa4a +sparc 51ce185af0f71b65c23ed719f72d0241895a61da +scsi-rc-fixes 3ee72ca99288f1de95ec9c570e43f531c8799f06 +net eea49cc9009767dfbafd673ee577854454b52e0d +sound-current 6bcbf64ace40d6833622d85701218a8bb7a4f207 +pci-current c54420d3302d30999060e2669d0800b85e5b5a20 +wireless f956c34e2a665a1c457d0af7db7604b22f5acb19 +driver-core.current 094803e0aab3fe75bbf8202a8f4b5280eaade375 +tty.current 094803e0aab3fe75bbf8202a8f4b5280eaade375 +usb.current 094803e0aab3fe75bbf8202a8f4b5280eaade375 +staging.current 094803e0aab3fe75bbf8202a8f4b5280eaade375 +cpufreq-current 2f84dd70916ccadd25e94d28363182a978f569b6 +input-current 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 +md-current 7fcc7c8acf0fba44d19a713207af7e58267c1179 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 0559dcfbcb270f3dc481e1e5bfcb0e5d0b32bc69 +ide 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 21d41f2b312231536cf981c960c83cc4493c0293 +rmobile-current a408baea3cdd2a7b5ad3d70080dff454b8883f62 +devicetree-current ed5f886d16369fed5a69d96b8e85777c47206de1 +spi-current 940ab88962bc1aff3273a8356d64577a6e386736 +arm 49eaa329b84f08bdc2674fc4f5e3d56fe6d60d66 +arm-lpae cea5cd66be63bb335cd41828563f037422cff2d3 +arm-soc a238f824a15f62389c48d5c1ff456fa3ad9ecbca +at91 bcdbf1668041ab5ff42c0498c06e0ae47c6d9928 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +i.MX 5788f4d617769d5f5b8ffa88d6015f4390229855 +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +omap 322a8b034003c0d46d39af85bf24fee27b902f48 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 495d818b3b4d4409c4c063c7f65540bedfc9862a +tegra 80d0a76f8faa62e68c82bb45d1de0a3ca1f77b10 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin e114599137b490142c3b3557de767b474b5b2610 +c6x 2141355fcd4d2c95132226434d38f1c6ffff4105 +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +hexagon 8e116d15138e0f5bfaea9c76d04751c2149eb746 +ia64 0f6a1c01b855919f6d5a453073f7992a109307ec +m68k 4b7cecc4fce031dd204e994a59d436c770353bad +m68knommu 0ada06b33b95fedca884cc06386843c4ffc22e8c +microblaze 094803e0aab3fe75bbf8202a8f4b5280eaade375 +mips a1e177196fc63f0e9dd45ccd5b912041cf919591 +openrisc b6fd41e29dea9c6753b1843a77e50433e6123bcb +parisc fc99a914318c60cc9fa9c7347529f4e07dec67d8 +powerpc 7680057cc4c7d9caada12767831bfd9738dd7b43 +4xx 9fcd768d0cc88b41ea459e25d2db12d3e25fa9dd +52xx-and-virtex c1395f4cf4a1944236f0f28cdf718c4aacc88f2d +galak 96cc017c5b7ec095ef047d3c1952b6b6bbf98943 +s390 74ea17f67cdf5c9a538db1a650ac497db3b7af10 +sh b9a3acf46afdafc601947136f63e9dd228cd86e8 +rmobile b58c580d996655658975aa8042b43b7d579f3986 +sparc-next 3ee72ca99288f1de95ec9c570e43f531c8799f06 +tile 0124538885485603ac1fbabe3aff570147f7c8a3 +unicore32 10967fd885eab09cfcfbfcabb4a1d5f9855a8aff +xtensa 29aced688a9321e3da04a45ad94407dfe7c903f7 +ceph 339573406737461cfb17bebabf7ba536a302d841 +cifs 9ef5992e442b2b0bf6364bfcc5574e983a983159 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 985ca0e626e195ea08a1a82b8dbeb6719747429a +ext3 ed47a7d00c22b326fc4c97342a73ecd15929732e +ext4 f2a44523b20f323e4aef7c16261d34d6f0a4bf06 +fatfs 710d4403a45c4040a9aa86971d50958f5ae6ed40 +fuse c2183d1e9b3f313dd8ba2b1b0197c8d9fb86a7ae +gfs2 809a4fac7cf7bf0a759f0eb0c389e9aee900297f +hfsplus 6596528e391ad978a6a120142cba97a1d7324cb6 +jfs 1c8007b0769d37aa5fcb343b383b0af89ade2f71 +logfs 51b3089b6a98a53b2f83a9c9c054fcb4a7020522 +nfs 31cbecb4ab538f433145bc5a46f3bea9b9627031 +nfsd fc0d14fe2d6403eb21202fd0c1cf67cd2c85ca67 +nilfs2 93ee7a9340d64f20295aacc3fb6a22b759323280 +ocfs2 c849cc2a8a30f3fdc05636f44d4ddbbc4719076b +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 7657cacf478940b995c2c73fdff981c13cc62c5c +v9fs 14211d026dad4641d4dffd7a4c520bcaa8fd4a65 +ubifs 7606f85a701ed8feeac065e133ff9a51c267aa0d +xfs 9e4c109ac822395e0aae650e4e3c9e4903f6602f +vfs 206b1d09a56dcd2db1052245c4131879c410eaf8 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci 44258a5e69b511f7869f7ce4a5bfee24c5e3c89d +hid 30307c69d59b14723fbf8a524847b302388c702d +i2c 839d8810747bbf39e0a5a7f223b67bffa7945f8d +bjdooks-i2c f8420b7bf6ce1a3c483cbc0a5a48ee82715224a0 +jdelvare-hwmon a1933c5af373c8b8233223fc3f4ef359896d0308 +hwmon-staging c5794cfac09a585945e1632451900594db19393b +kernel-doc b814f0357fbe0ff8ad45a71b8733be5274edb747 +docs c6f211c604d4bd109cc2781a60ab375b04e0d472 +v4l-dvb b3f4e1eba45eda5d1213810ef3bc53e5247df2df +kbuild 57b742f7722aeb63e719b6f92f42d482e025fc68 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +libata a0da19149f589e3e6fd5bab527b3326368ab92bc +infiniband 504255f8d0480cf293962adf4bc3aecac645ae71 +acpi 38c0a0c9ae0d145d72c6865f4aec1107aef81310 +idle-test a0bfa1373859e9d11dc92561a8667588803e42d8 +powertools d30c4b7a87e8b19583d5ef1402d9b38f51e30f44 +cpupowerutils 498ca793d90aef8ad38a852a969c257f62832738 +ieee1394 a572e688cf5d99d2382016c7241ec37b523b0137 +ubi 93ee7a9340d64f20295aacc3fb6a22b759323280 +dlm c3b92c8787367a8bb53d57d9789b558f1295cc96 +swiotlb 25b84fa6892ba6517f292a6254bed39de77da1b5 +ibft f1b1e067b999aa141229a2a524b7be080f999795 +scsi f7c9c6bb14f3104608a3a83cadea10a6943d2804 +target-updates 2235007c4d3245c0eca5e49497aafe5a111c00fb +target-merge e0d85e51564055cf6b527c121f561228308359f5 +slave-dma 4598fc2c94b68740e0269db03c98a1e7ad5af773 +async_tx 21ef4b8b7a7d59a995bf44382de38c95587767d4 +net-next 8b3408f8ee994973869d8ba32c5bf482bc4ddca4 +wireless-next 8b3408f8ee994973869d8ba32c5bf482bc4ddca4 +bluetooth e14f47b1ed15a3c115221797098af4c854b27b86 +mtd 3f303103b884ca577908d3e5c0650ad12e40c586 +l2-mtd 48e546b7f281f251893baa40769581fd15f085fb +crypto ea8bdfcff17599e5d80f93e2ae194fbbab7f8d5e +sound 39c848e863c4a862850b3f42fa645beef0b78838 +sound-asoc 86f14df8ed1ecec5cefe7d002b4d297e298238c2 +cpufreq 5aace5819034c0156adec9f9d3883b3b6d296612 +rr 05478c63ef47817f95f502497fe5144f1c8fc23a +input fb6c721b69d4ac518b9be6de8f44ba87a0c0d235 +input-mt 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 30a4b71b611d75c73ad12e786f8f01b52b73ecba +device-mapper 43672a0784707d795556b1f93925da8b8e797d03 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 74411c04540404a1ff29d254584ef393e150aeda +battery 85b5fbf784810d80aa09646189848c9ebc8a4ba2 +mmc d517455aa4f99c4676b1e23b59e228dc558c6c47 +kgdb 880ba694f6161ce4b8e14fb7be64f3d446dd5ae6 +slab e24daf8131bf9c0d4852d053d7c4d172d6a45e18 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md e0b361ae3676f48dd11ffbb618c10dd3d66bee63 +mfd b958f7a7cbdfbf59ba61de7ebb9c59b0ee3a7967 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 1717c0e23f411147490c7a3312b894f0ea9a5fb1 +fbdev b57287ba497b63a0d87a058631bbddfed9392e9f +viafb 4ce36bbb0497bdd3d6b8682175e5c58745b7acdd +omap_dss2 3e28189038bb831512cf4f8313e1aead97c3e63f +regulator 89efed4489bcd83d0590dc37864be49320eb2f6c +security 59df3166ef293288d164ab3362a717743e62d20c +selinux ded509880f6a0213b09f8ae7bef84acb16eaccbf +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 134edca0995bd71d9d016954c95f17882b8e725e +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 1abb4ba596a91a839f82e0c9c837b777d574e83d +cputime f6116715d1bae43e37207ec9c9a8fa7185e6586c +osd dde406e58cd91b10233c40fa5ea86c1261a4d043 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial 59e52534172d845ebffb0d7e85fc56fb7b857051 +audit def57543418a5f47debae28a0a9dea2effc11692 +pm fb116205921f33aa7ff773733ac098e23f6c5607 +apm 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +edac 4d096ca7e65584dd5845e64c6400f920e694f672 +edac-amd 1f6189ed18cbd99d90bffdbc76c3adc54418b2fd +devicetree ae97159aed6eff68f4ac86472b018985f071fed5 +spi 940ab88962bc1aff3273a8356d64577a6e386736 +gpio d92ef29a6fa971d9e314e412cd9c09757906411a +tip e471db82dae27dc125f6f8f84de2cc1846df48c8 +rcu afe24b122eb6edb5f1cb942570ac8d766105c7fc +kmemleak 614d29dd6053bd87bff4e6bb3577069425b270a1 +kvm a3e06bbe8445f57eb949e6474c5a9b30f24d2057 +oprofile 4167ab90ee6a2c029855db53d1631c84a213f3d1 +xen ec8161f0607c014eb27e65340edcda7edebb545a +xen-two 9d5ae846db8afaf53b1dceb3a595f295cad770b7 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu bc499f9bdc7009a2c7045885960053bdf58f5655 +workqueues 9c5a2ba70251ecaab18c7a83e38b3c620223476c +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 15b956a0b5651bbb1217ec374fdd67291dabb2af +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c2f5631aceb700224d0cfe0465cee18df564a29e +namespace 7e05c935c50ab5c9ee488c411252076825ec2919 +regmap a08448146ddb8d766f9dc3dbaa01dd59e0387bd8 +driver-core 094803e0aab3fe75bbf8202a8f4b5280eaade375 +tty 094803e0aab3fe75bbf8202a8f4b5280eaade375 +usb 094803e0aab3fe75bbf8202a8f4b5280eaade375 +staging 094803e0aab3fe75bbf8202a8f4b5280eaade375 +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +tmem 665c1e6acbfb4c3b1476a299e383e68c54867cca +writeback ea7bf1d69161628c13b2dd4ecdfab20369566d4c +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl ab872c84c2ddfb14b91099e20b699f637449b5de +moduleh 67b84999b1a8b1af5625b1eabe92146c5eb42932 +kvmtool 3b08ed02633d90931d74374edbf595e7c0bd55b7 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm a1b5371b51c219771f4be642b5ae75793a01c380 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e36727feaa18 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,201 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://repo.or.cz/linux-kbuild.git#rc-fixes +arm-current git http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#fixes +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 git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +scsi-rc-fixes git git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.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://github.com/herbertx/crypto.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +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 http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm#for-next +arm-lpae git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#for-next +arm-soc git git://git.linaro.org/people/arnd/arm-soc.git#for-next +at91 git git://github.com/at91linux/linux-2.6-at91.git#at91-next +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +linux-spec git http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next +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://github.com/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git#for-next +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 +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon quilt https://www.codeaurora.org/patches/quic/hlk/linux-next/ +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://github.com/gregungerer/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/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://github.com/ozbenh/linux.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-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-unicore.git#unicore32 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://github.com/NewDreamNetwork/ceph-client.git#for-next +cifs git git://git.samba.org/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.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-3.0-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://github.com/prasad-joshi/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://oss.oracle.com/git/jlbec/linux-2.6.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://github.com/ericvh/linux.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#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://www.xenotime.net/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://linuxtv.org/mchehab/media-next.git#master +kbuild git git://repo.or.cz/linux-kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +libata git git://github.com/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://github.com/lenb/linux.git#acpi +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-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.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/linux-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://bedivere.hansenpartnership.com/git/scsi-misc-2.6.git#master +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://github.com/herbertx/cryptodev.git#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/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 +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://github.com/jwessel/linux-kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.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.infradead.org/users/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://people.freedesktop.org/~airlied/linux.git#drm-next +fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next +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 +regulator git git://opensource.wolfsonmicro.com/regulator.git#for-next +security git git://selinuxproject.org/~jmorris/linux-security#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 +watchdog git git://www.linux-watchdog.org/linux-watchdog.git#linux-next +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 +iommu git git://git.8bytes.org/scm/iommu.git#next +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 +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.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 +edac git git://git.infradead.org/users/mchehab/edac.git#linux_next +edac-amd git git://amd64.org/linux/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +rcu git git://github.com/paulmckrcu/linux#rcu/next +kmemleak git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#kmemleak +kvm git git://github.com/avikivity/kvm.git#kvm-updates/3.2 +oprofile git git://amd64.org/linux/rric.git#for-next +xen git git://github.com/jsgf/linux-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 +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +namespace git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +tmem git git://oss.oracle.com/git/djm/tmem.git#tmem +writeback git git://github.com/fengguang/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.linaro.org/people/triad/linux-pinctrl.git#for-next +moduleh git git://openlinux.windriver.com/people/paulg/linux-next#for-sfr +kvmtool git git://github.com/penberg/linux-kvm.git#master +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://userweb.kernel.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..ddbb9ac58b7d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6995 @@ +$ date +Fri Nov 4 11:39:28 EST 2011 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 43672a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm +Merging origin/master (d674806 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus) +$ git merge origin/master +Updating 43672a0..d674806 +Fast-forward + Documentation/hwspinlock.txt | 74 +- + MAINTAINERS | 14 + + arch/arm/mach-imx/mach-mx27_3ds.c | 3 +- + arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- + arch/arm/mach-imx/mach-mx31lite.c | 3 +- + arch/arm/mach-imx/mach-mx31moboard.c | 15 +- + arch/arm/mach-imx/mach-pcm038.c | 3 +- + arch/arm/mach-mx5/mx51_efika.c | 2 +- + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm/mach-omap2/board-omap3beagle.c | 9 +- + arch/arm/mach-omap2/hwspinlock.c | 9 +- + arch/arm/mach-u300/i2c.c | 51 +- + arch/arm/mach-u300/include/mach/irqs.h | 10 +- + arch/arm/mach-ux500/board-u5500.c | 29 +- + arch/arm/mach-ux500/cpu.c | 2 +- + arch/mips/Kconfig | 5 +- + arch/mips/Makefile | 4 +- + arch/mips/alchemy/Kconfig | 50 +- + arch/mips/alchemy/common/Makefile | 6 +- + arch/mips/alchemy/common/dbdma.c | 203 ++-- + arch/mips/alchemy/common/dma.c | 72 +- + .../alchemy/common/{gpiolib-au1000.c => gpiolib.c} | 35 +- + arch/mips/alchemy/common/pci.c | 104 -- + arch/mips/alchemy/common/platform.c | 370 ++---- + arch/mips/alchemy/common/power.c | 46 - + arch/mips/alchemy/common/setup.c | 6 +- + arch/mips/alchemy/devboards/db1200/platform.c | 153 ++- + arch/mips/alchemy/devboards/db1x00/board_setup.c | 28 +- + arch/mips/alchemy/devboards/db1x00/platform.c | 198 +++- + arch/mips/alchemy/devboards/pb1100/platform.c | 49 +- + arch/mips/alchemy/devboards/pb1200/platform.c | 190 +++- + arch/mips/alchemy/devboards/pb1500/board_setup.c | 33 +- + arch/mips/alchemy/devboards/pb1500/platform.c | 71 +- + arch/mips/alchemy/devboards/pb1550/board_setup.c | 6 - + arch/mips/alchemy/devboards/pb1550/platform.c | 119 ++- + arch/mips/alchemy/gpr/board_setup.c | 12 - + arch/mips/alchemy/gpr/platform.c | 47 + + arch/mips/alchemy/mtx-1/board_setup.c | 40 - + arch/mips/alchemy/mtx-1/platform.c | 62 + + arch/mips/alchemy/xxs1500/board_setup.c | 8 - + arch/mips/alchemy/xxs1500/platform.c | 12 +- + arch/mips/include/asm/cacheflush.h | 24 + + arch/mips/include/asm/cpu.h | 3 + + arch/mips/include/asm/io.h | 12 +- + arch/mips/include/asm/mach-au1x00/au1000.h | 559 +++----- + arch/mips/include/asm/mach-au1x00/au1xxx.h | 43 - + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 114 +- + arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 1 + + arch/mips/include/asm/mach-au1x00/au1xxx_psc.h | 26 - + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 31 +- + arch/mips/include/asm/mach-au1x00/gpio.h | 79 +- + arch/mips/include/asm/mach-db1x00/db1200.h | 2 - + arch/mips/include/asm/mach-db1x00/db1x00.h | 16 +- + arch/mips/include/asm/mach-pb1x00/pb1200.h | 18 +- + arch/mips/include/asm/mach-pb1x00/pb1550.h | 16 +- + arch/mips/include/asm/mipsprom.h | 6 +- + arch/mips/include/asm/mipsregs.h | 8 + + arch/mips/include/asm/prom.h | 6 +- + arch/mips/include/asm/regdef.h | 6 + + arch/mips/jz4740/gpio.c | 140 +-- + arch/mips/jz4740/irq.c | 92 +- + arch/mips/jz4740/irq.h | 6 +- + arch/mips/jz4740/pm.c | 3 - + arch/mips/kernel/Makefile | 5 +- + arch/mips/kernel/cpu-probe.c | 3 + + arch/mips/kernel/perf_event.c | 519 +------- + arch/mips/kernel/perf_event_mipsxx.c | 1265 +++++++++++++----- + arch/mips/kernel/scall32-o32.S | 2 +- + arch/mips/mm/c-octeon.c | 6 + + arch/mips/mm/c-r3k.c | 7 + + arch/mips/mm/c-r4k.c | 35 + + arch/mips/mm/c-tx39.c | 7 + + arch/mips/mm/cache.c | 5 + + arch/mips/mm/tlb-r3k.c | 4 +- + arch/mips/mm/tlb-r4k.c | 4 +- + arch/mips/netlogic/Platform | 5 + + arch/mips/netlogic/xlr/setup.c | 4 +- + arch/mips/netlogic/xlr/smp.c | 6 +- + arch/mips/netlogic/xlr/smpboot.S | 16 +- + arch/mips/pci/Makefile | 3 +- + arch/mips/pci/fixup-au1000.c | 43 - + arch/mips/pci/ops-au1000.c | 308 ----- + arch/mips/pci/pci-alchemy.c | 516 +++++++ + arch/mips/pmc-sierra/msp71xx/msp_setup.c | 1 + + arch/mips/pmc-sierra/yosemite/py-console.c | 12 +- + arch/mips/pnx8550/common/prom.c | 2 +- + arch/mips/sgi-ip27/ip27-irq.c | 4 +- + arch/sh/Kconfig | 17 +- + arch/sh/Makefile | 1 + + arch/sh/boards/board-espt.c | 2 +- + arch/sh/boards/board-secureedge5410.c | 3 +- + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/mach-cayman/irq.c | 2 - + arch/sh/boards/mach-ecovec24/setup.c | 6 +- + arch/sh/boards/mach-hp6xx/hp6xx_apm.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 2 +- + arch/sh/boards/mach-sh7763rdp/setup.c | 2 +- + arch/sh/boot/Makefile | 6 +- + arch/sh/drivers/dma/dma-g2.c | 2 +- + arch/sh/drivers/dma/dma-pvr2.c | 1 - + arch/sh/drivers/dma/dma-sh.c | 4 +- + arch/sh/drivers/dma/dmabrg.c | 6 +- + arch/sh/drivers/pci/pci-sh5.c | 4 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/push-switch.c | 2 +- + arch/sh/include/asm/page.h | 10 + + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 10 +- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 2 +- + arch/sh/kernel/setup.c | 9 +- + arch/sh/kernel/topology.c | 1 + + arch/sh/kernel/vmlinux.lds.S | 2 +- + arch/sh/mm/init.c | 8 +- + arch/x86/include/asm/intel_scu_ipc.h | 22 + + arch/x86/platform/mrst/mrst.c | 176 +++- + drivers/cpufreq/db8500-cpufreq.c | 38 +- + drivers/cpufreq/e_powersaver.c | 135 ++- + drivers/cpufreq/exynos4210-cpufreq.c | 129 ++- + drivers/edac/Kconfig | 2 +- + drivers/gpio/Kconfig | 3 +- + drivers/hid/hid-apple.c | 9 + + drivers/hid/hid-core.c | 7 + + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-multitouch.c | 47 +- + drivers/hid/hid-roccat.c | 18 +- + drivers/hwmon/mc13783-adc.c | 12 +- + drivers/hwspinlock/Kconfig | 27 +- + drivers/hwspinlock/Makefile | 1 + + drivers/hwspinlock/hwspinlock_core.c | 204 ++-- + drivers/hwspinlock/hwspinlock_internal.h | 40 +- + drivers/hwspinlock/omap_hwspinlock.c | 127 +-- + drivers/hwspinlock/u8500_hsem.c | 198 +++ + drivers/i2c/busses/Kconfig | 3 +- + drivers/i2c/busses/i2c-au1550.c | 2 +- + drivers/ide/Kconfig | 6 +- + drivers/ide/au1xxx-ide.c | 46 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/mc13783-pwrbutton.c | 282 ++++ + drivers/input/touchscreen/mc13783_ts.c | 34 +- + drivers/leds/leds-asic3.c | 35 +- + drivers/leds/leds-mc13783.c | 60 +- + drivers/media/radio/Kconfig | 1 - + drivers/mfd/Kconfig | 64 +- + drivers/mfd/Makefile | 4 +- + drivers/mfd/aat2870-core.c | 2 +- + drivers/mfd/ab3100-core.c | 2 +- + drivers/mfd/ab3550-core.c | 1380 ------------------- + drivers/mfd/ab5500-core.c | 1439 ++++++++++++++++++++ + drivers/mfd/ab5500-core.h | 87 ++ + drivers/mfd/ab5500-debugfs.c | 806 +++++++++++ + drivers/mfd/ab5500-debugfs.h | 22 + + drivers/mfd/ab8500-core.c | 33 +- + drivers/mfd/ab8500-gpadc.c | 56 +- + drivers/mfd/asic3.c | 26 +- + drivers/mfd/da903x.c | 2 +- + drivers/mfd/db5500-prcmu.c | 29 +- + drivers/mfd/db8500-prcmu-regs.h | 166 --- + drivers/mfd/db8500-prcmu.c | 629 +++++++-- + .../{db5500-prcmu-regs.h => dbx500-prcmu-regs.h} | 105 ++- + drivers/mfd/intel_msic.c | 502 +++++++ + drivers/mfd/jz4740-adc.c | 2 +- + drivers/mfd/max8997.c | 27 +- + drivers/mfd/mc13xxx-core.c | 116 +- + drivers/mfd/menelaus.c | 2 +- + drivers/mfd/pcf50633-core.c | 114 +-- + drivers/mfd/tc3589x.c | 2 + + drivers/mfd/timberdale.c | 9 +- + drivers/mfd/tps65912-core.c | 6 +- + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl4030-irq.c | 342 ++--- + drivers/mfd/twl4030-madc.c | 22 + + drivers/mfd/twl6030-irq.c | 75 +- + drivers/mfd/wm831x-irq.c | 24 +- + drivers/mfd/wm8994-core.c | 53 + + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/au1xmmc.c | 92 +- + drivers/mmc/host/omap_hsmmc.c | 2 +- + drivers/mtd/maps/lantiq-flash.c | 4 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/au1550nd.c | 6 +- + drivers/net/ethernet/amd/au1000_eth.c | 48 +- + drivers/net/ethernet/amd/au1000_eth.h | 2 +- + drivers/net/irda/Kconfig | 2 +- + drivers/regulator/db8500-prcmu.c | 2 +- + drivers/regulator/mc13783-regulator.c | 6 +- + drivers/sh/intc/chip.c | 9 +- + drivers/sh/intc/userimask.c | 1 + + drivers/sh/pfc.c | 29 +- + drivers/spi/Kconfig | 2 +- + drivers/usb/Kconfig | 1 - + drivers/usb/host/Makefile | 1 + + drivers/usb/host/alchemy-common.c | 337 +++++ + drivers/usb/host/ehci-au1xxx.c | 77 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ohci-au1xxx.c | 110 +-- + drivers/video/Kconfig | 4 +- + include/linux/hwspinlock.h | 46 +- + include/linux/i2c/twl4030-madc.h | 4 + + include/linux/mfd/ab5500/ab5500.h | 140 ++ + include/linux/mfd/ab8500/gpadc.h | 5 +- + include/linux/mfd/abx500.h | 54 +- + include/linux/mfd/db5500-prcmu.h | 102 ++- + include/linux/mfd/db8500-prcmu.h | 368 ++---- + include/linux/mfd/dbx500-prcmu.h | 549 ++++++++ + include/linux/mfd/intel_msic.h | 456 +++++++ + include/linux/mfd/max8997-private.h | 1 - + include/linux/mfd/mc13783.h | 111 -- + include/linux/mfd/mc13xxx.h | 38 +- + include/linux/mfd/pcf50633/core.h | 3 +- + include/linux/mfd/wm831x/core.h | 1 + + include/linux/mfd/wm8994/core.h | 2 + + include/linux/mfd/wm8994/pdata.h | 7 + + include/linux/sh_pfc.h | 12 +- + kernel/events/core.c | 97 +-- + sound/mips/Kconfig | 2 +- + sound/soc/au1x/Kconfig | 2 +- + 216 files changed, 10529 insertions(+), 6298 deletions(-) + rename arch/mips/alchemy/common/{gpiolib-au1000.c => gpiolib.c} (83%) + delete mode 100644 arch/mips/alchemy/common/pci.c + delete mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx.h + delete mode 100644 arch/mips/pci/fixup-au1000.c + delete mode 100644 arch/mips/pci/ops-au1000.c + create mode 100644 arch/mips/pci/pci-alchemy.c + create mode 100644 drivers/hwspinlock/u8500_hsem.c + create mode 100644 drivers/input/misc/mc13783-pwrbutton.c + delete mode 100644 drivers/mfd/ab3550-core.c + create mode 100644 drivers/mfd/ab5500-core.c + create mode 100644 drivers/mfd/ab5500-core.h + create mode 100644 drivers/mfd/ab5500-debugfs.c + create mode 100644 drivers/mfd/ab5500-debugfs.h + delete mode 100644 drivers/mfd/db8500-prcmu-regs.h + rename drivers/mfd/{db5500-prcmu-regs.h => dbx500-prcmu-regs.h} (51%) + create mode 100644 drivers/mfd/intel_msic.c + create mode 100644 drivers/usb/host/alchemy-common.c + create mode 100644 include/linux/mfd/ab5500/ab5500.h + create mode 100644 include/linux/mfd/dbx500-prcmu.h + create mode 100644 include/linux/mfd/intel_msic.h +Merging fixes/master (956e850 Revert "hvc_console: display printk messages on console.") +$ git merge fixes/master +Merge made by the 'recursive' strategy. + drivers/tty/hvc/hvc_console.c | 7 +------ + 1 files changed, 1 insertions(+), 6 deletions(-) +Merging kbuild-current/rc-fixes (322a8b0 Linux 3.1-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (1bf1aac Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers) +$ git merge m68k-current/for-linus +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig | 4 +- + arch/m68k/Kconfig.bus | 9 + + arch/m68k/Kconfig.devices | 31 ++++ + arch/m68k/amiga/amiints.c | 168 ++++++++------------ + arch/m68k/amiga/cia.c | 39 +++-- + arch/m68k/apollo/dn_ints.c | 35 +++-- + arch/m68k/atari/ataints.c | 274 +++---------------------------- + arch/m68k/bvme6000/config.c | 2 +- + arch/m68k/hp300/time.c | 2 +- + arch/m68k/include/asm/hardirq.h | 5 + + arch/m68k/include/asm/irq.h | 69 ++------ + arch/m68k/include/asm/macintosh.h | 2 + + arch/m68k/include/asm/q40ints.h | 3 - + arch/m68k/kernel/Makefile | 9 +- + arch/m68k/kernel/entry_mm.S | 7 +- + arch/m68k/kernel/ints.c | 323 ++++--------------------------------- + arch/m68k/mac/baboon.c | 21 +-- + arch/m68k/mac/iop.c | 10 +- + arch/m68k/mac/macints.c | 24 ++-- + arch/m68k/mac/oss.c | 54 +++---- + arch/m68k/mac/psc.c | 49 +++--- + arch/m68k/mac/via.c | 74 ++++----- + arch/m68k/mvme147/config.c | 5 +- + arch/m68k/mvme16x/config.c | 2 +- + arch/m68k/q40/q40ints.c | 60 ++++---- + arch/m68k/sun3/sun3ints.c | 46 +++--- + drivers/ide/ide-cd.c | 1 - + drivers/ide/ide-floppy.c | 1 - + drivers/ide/ide-tape.c | 1 - + drivers/macintosh/via-macii.c | 2 +- + drivers/macintosh/via-maciisi.c | 4 +- + 31 files changed, 393 insertions(+), 943 deletions(-) +Merging powerpc-merge/merge (0c81e4b powerpc/p1023rds: Fix the error of bank-width of nor flash) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/unistd.h | 4 +++- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 ++-- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging scsi-rc-fixes/master (3ee72ca Merge git://github.com/davem330/net) +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net/master (eea49cc9 af_packet: de-inline some helper functions) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/ipvs-sysctl.txt | 62 ++++++++++++++++++-- + MAINTAINERS | 5 +- + drivers/isdn/hisax/l3dss1.c | 6 +- + drivers/net/bonding/bond_main.c | 37 ++++-------- + drivers/net/bonding/bond_procfs.c | 12 +++- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/apple/Kconfig | 12 ---- + drivers/net/ethernet/apple/Makefile | 1 - + drivers/net/ethernet/cirrus/Kconfig | 14 ++++- + drivers/net/ethernet/cirrus/Makefile | 1 + + drivers/net/ethernet/{apple => cirrus}/mac89x0.c | 0 + drivers/net/ethernet/i825xx/3c505.c | 6 +- + drivers/net/ethernet/realtek/Kconfig | 12 ---- + drivers/net/ethernet/realtek/Makefile | 1 - + drivers/net/ethernet/silan/Kconfig | 33 +++++++++++ + drivers/net/ethernet/silan/Makefile | 5 ++ + drivers/net/ethernet/{realtek => silan}/sc92031.c | 0 + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- + include/linux/netfilter_ipv4/Kbuild | 1 + + include/linux/netfilter_ipv4/nf_nat.h | 58 +++++++++++++++++++ + include/linux/skbuff.h | 4 +- + include/net/ip_vs.h | 11 ++-- + include/net/netfilter/nf_conntrack_tuple.h | 27 +--------- + include/net/netfilter/nf_nat.h | 26 +-------- + include/net/tcp.h | 10 ++- + include/net/udp.h | 12 ++-- + net/8021q/vlan_dev.c | 10 ++- + net/bridge/netfilter/ebt_ulog.c | 7 +- + net/core/neighbour.c | 6 +-- + net/core/skbuff.c | 1 + + net/dccp/ipv4.c | 1 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 - + net/ipv4/netfilter/ipt_ULOG.c | 4 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 22 +------- + net/ipv4/tcp_ipv4.c | 23 ++++--- + net/ipv4/udp.c | 30 ++++++---- + net/ipv4/udplite.c | 13 +++- + net/ipv6/netfilter.c | 13 +++- + net/ipv6/netfilter/nf_conntrack_reasm.c | 7 +- + net/ipv6/tcp_ipv6.c | 12 +++- + net/ipv6/udp.c | 12 +++- + net/ipv6/udplite.c | 13 +++- + net/l2tp/l2tp_core.c | 3 +- + net/netfilter/core.c | 11 ++-- + net/netfilter/ipset/ip_set_core.c | 4 +- + net/netfilter/ipvs/ip_vs_core.c | 20 +++---- + net/netfilter/ipvs/ip_vs_ctl.c | 22 ++----- + net/netfilter/ipvs/ip_vs_dh.c | 5 +- + net/netfilter/ipvs/ip_vs_ftp.c | 5 +- + net/netfilter/ipvs/ip_vs_lblc.c | 9 +-- + net/netfilter/ipvs/ip_vs_lblcr.c | 13 +--- + net/netfilter/ipvs/ip_vs_nfct.c | 2 +- + net/netfilter/ipvs/ip_vs_proto.c | 5 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 14 +--- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 6 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 5 +- + net/netfilter/ipvs/ip_vs_sh.c | 5 +- + net/netfilter/ipvs/ip_vs_wrr.c | 5 +- + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- + net/netfilter/nf_conntrack_core.c | 5 +- + net/netfilter/nfnetlink_log.c | 7 +-- + net/netfilter/xt_IDLETIMER.c | 2 - + net/netfilter/xt_hashlimit.c | 5 +- + net/packet/af_packet.c | 52 +++++++++--------- + net/x25/af_x25.c | 11 +++- + 66 files changed, 406 insertions(+), 349 deletions(-) + rename drivers/net/ethernet/{apple => cirrus}/mac89x0.c (100%) + create mode 100644 drivers/net/ethernet/silan/Kconfig + create mode 100644 drivers/net/ethernet/silan/Makefile + rename drivers/net/ethernet/{realtek => silan}/sc92031.c (100%) + create mode 100644 include/linux/netfilter_ipv4/nf_nat.h +Merging sound-current/for-linus (6bcbf64 Merge branch 'fix/asoc' into for-linus) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/hwdep.c | 9 +++++- + sound/pci/hda/hda_hwdep.c | 2 - + sound/pci/hda/hda_local.h | 4 ++ + sound/pci/hda/patch_hdmi.c | 5 +-- + sound/pci/hda/patch_realtek.c | 23 ++++++++------ + sound/pci/hda/patch_sigmatel.c | 67 +++++++++++++++++++++++---------------- + sound/pci/hda/patch_via.c | 5 --- + sound/pci/intel8x0.c | 29 ++++++++++++++++- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 42 +++++++++++-------------- + sound/soc/codecs/tlv320aic23.c | 1 + + sound/soc/codecs/tlv320aic3x.c | 1 + + sound/soc/codecs/wm5100.c | 12 +++++-- + sound/soc/codecs/wm8711.c | 4 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8962.c | 30 ++++++++++++------ + 17 files changed, 145 insertions(+), 95 deletions(-) +Merging pci-current/for-linus (c54420d PCI: Let PCI_PRI depend on PCI) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/Kconfig | 1 + + drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++----- + include/linux/pci-ats.h | 6 +++--- + include/linux/pci.h | 2 +- + 4 files changed, 29 insertions(+), 9 deletions(-) +Merging wireless/master (f956c34 iwlwifi: don't perform "echo test" when cmd queue stuck) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 4 +- + drivers/bluetooth/bcm203x.c | 12 +++++++- + drivers/bluetooth/bfusb.c | 13 ++++---- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 4 -- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 11 ++++--- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 34 +++++++++++----------- + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 10 +++--- + drivers/net/wireless/ath/ath9k/hw.c | 3 ++ + drivers/net/wireless/ath/carl9170/tx.c | 11 ++++-- + drivers/net/wireless/b43/xmit.c | 1 - + drivers/net/wireless/iwlwifi/iwl-core.c | 10 ------ + drivers/net/wireless/iwlwifi/iwl-pci.c | 8 ++--- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 12 +++++-- + drivers/net/wireless/libertas/cfg.c | 25 +++++++++++----- + drivers/net/wireless/libertas/cfg.h | 1 + + drivers/net/wireless/libertas/main.c | 6 +-- + include/net/bluetooth/rfcomm.h | 1 + + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/mgmt.c | 2 - + net/bluetooth/rfcomm/core.c | 9 ++++- + net/mac80211/cfg.c | 12 ++++---- + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/mlme.c | 18 ++++++++++- + net/mac80211/work.c | 7 ++-- + 24 files changed, 124 insertions(+), 93 deletions(-) +Merging driver-core.current/driver-core-linus (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes (2f84dd7 autofs4: fix debug printk warning uncovered by cleanup) +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus (6ad390a Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (7fcc7c8 md/raid10: Fix bug when activating a hot-spare.) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (0559dcf crypto: algapi - Fix build problem with NET disabled) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/ablkcipher.c | 14 ++++++++++++++ + crypto/aead.c | 14 ++++++++++++++ + crypto/ahash.c | 7 +++++++ + crypto/blkcipher.c | 7 +++++++ + crypto/crypto_user.c | 3 --- + crypto/pcompress.c | 7 +++++++ + crypto/rng.c | 7 +++++++ + crypto/shash.c | 7 +++++++ + 8 files changed, 63 insertions(+), 3 deletions(-) +Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/cy82c693.c | 6 +++--- + drivers/ide/icside.c | 2 +- + drivers/ide/piix.c | 18 ++++++++++-------- + drivers/ide/triflex.c | 16 +++++++++++++++- + 4 files changed, 29 insertions(+), 13 deletions(-) +Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support) +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge (ed5f886 dt: add empty of_alias_get_id() for non-dt builds) +$ git merge devicetree-current/devicetree/merge +Auto-merging include/linux/of.h +Merge made by the 'recursive' strategy. + include/linux/of.h | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) +Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate) +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next (49eaa32 Merge branch 'devel-stable' into for-linus) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. +Merging arm-lpae/for-next (cea5cd6 fixup! ARM: LPAE: Add identity mapping support for the 3-level page table format) +$ git merge arm-lpae/for-next +Recorded preimage for 'arch/arm/include/asm/pgtable.h' +Resolved 'arch/arm/include/asm/page.h' using previous resolution. +Resolved 'arch/arm/include/asm/pgtable-hwdef.h' using previous resolution. +Resolved 'arch/arm/kernel/head.S' using previous resolution. +Resolved 'arch/arm/kernel/sleep.S' using previous resolution. +Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution. +Resolved 'arch/arm/mm/mmu.c' using previous resolution. +Auto-merging arch/arm/mm/mmu.c +CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/ioremap.c +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/mm/dma-mapping.c +CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/context.c +Auto-merging arch/arm/mm/alignment.c +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/kernel/sleep.S +CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/hw_breakpoint.c +Auto-merging arch/arm/kernel/head.S +CONFLICT (content): Merge conflict in arch/arm/kernel/head.S +Auto-merging arch/arm/include/asm/system.h +Auto-merging arch/arm/include/asm/proc-fns.h +Auto-merging arch/arm/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h +Auto-merging arch/arm/include/asm/pgtable-hwdef.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h +Auto-merging arch/arm/include/asm/pgalloc.h +Auto-merging arch/arm/include/asm/page.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/include/asm/pgtable.h'. +[master effc682] Merge remote-tracking branch 'arm-lpae/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 2 +- + arch/arm/boot/compressed/head.S | 1 + + arch/arm/include/asm/assembler.h | 11 + + arch/arm/include/asm/page.h | 4 + + arch/arm/include/asm/pgalloc.h | 26 ++- + arch/arm/include/asm/pgtable-3level-hwdef.h | 82 ++++++ + arch/arm/include/asm/pgtable-3level-types.h | 70 +++++ + arch/arm/include/asm/pgtable-3level.h | 107 +++++++ + arch/arm/include/asm/pgtable-hwdef.h | 4 + + arch/arm/include/asm/pgtable.h | 94 +++++- + arch/arm/include/asm/proc-fns.h | 21 ++ + arch/arm/include/asm/setup.h | 8 + + arch/arm/include/asm/system.h | 8 + + arch/arm/include/asm/tlb.h | 12 +- + arch/arm/kernel/head.S | 45 +++- + arch/arm/kernel/hw_breakpoint.c | 8 +- + arch/arm/kernel/setup.c | 10 + + arch/arm/kernel/sleep.S | 2 + + arch/arm/mm/Kconfig | 13 + + arch/arm/mm/Makefile | 4 + + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/context.c | 19 +- + arch/arm/mm/fault.c | 87 ++++++ + arch/arm/mm/idmap.c | 36 +++- + arch/arm/mm/ioremap.c | 39 ++- + arch/arm/mm/mmu.c | 35 ++- + arch/arm/mm/pgd.c | 51 +++- + arch/arm/mm/proc-macros.S | 5 +- + arch/arm/mm/proc-v7lpae.S | 422 +++++++++++++++++++++++++++ + 29 files changed, 1178 insertions(+), 50 deletions(-) + create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h + create mode 100644 arch/arm/include/asm/pgtable-3level-types.h + create mode 100644 arch/arm/include/asm/pgtable-3level.h + create mode 100644 arch/arm/mm/proc-v7lpae.S +Merging arm-soc/for-next (a238f82 Merge branch 'next/devel2' into for-next) +$ git merge arm-soc/for-next +Removing drivers/gpio/gpio-s5pv210.c +Removing drivers/gpio/gpio-s5pc100.c +Removing drivers/gpio/gpio-plat-samsung.c +Removing drivers/gpio/gpio-exynos4.c +Auto-merging drivers/gpio/Kconfig +Removing arch/arm/plat-samsung/s3c-pl330.c +Auto-merging arch/arm/plat-samsung/include/plat/usb-phy.h +Auto-merging arch/arm/plat-samsung/include/plat/udc.h +Auto-merging arch/arm/plat-samsung/include/plat/system-reset.h +Auto-merging arch/arm/plat-samsung/include/plat/sysmmu.h +Auto-merging arch/arm/plat-samsung/include/plat/s5pv210.h +Auto-merging arch/arm/plat-samsung/include/plat/s5pc100.h +Auto-merging arch/arm/plat-samsung/include/plat/s5p6450.h +Auto-merging arch/arm/plat-samsung/include/plat/s5p6440.h +Auto-merging arch/arm/plat-samsung/include/plat/s5p-time.h +Auto-merging arch/arm/plat-samsung/include/plat/s5p-clock.h +Auto-merging arch/arm/plat-samsung/include/plat/s3c6410.h +Auto-merging arch/arm/plat-samsung/include/plat/s3c6400.h +Auto-merging arch/arm/plat-samsung/include/plat/s3c244x.h +Auto-merging arch/arm/plat-samsung/include/plat/s3c2443.h +Auto-merging arch/arm/plat-samsung/include/plat/s3c2416.h +Auto-merging arch/arm/plat-samsung/include/plat/s3c2412.h +Auto-merging arch/arm/plat-samsung/include/plat/s3c2410.h +Removing arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h +Auto-merging arch/arm/plat-samsung/include/plat/reset.h +Auto-merging arch/arm/plat-samsung/include/plat/regs-udc.h +Auto-merging arch/arm/plat-samsung/include/plat/regs-srom.h +Auto-merging arch/arm/plat-samsung/include/plat/regs-dma.h +Auto-merging arch/arm/plat-samsung/include/plat/pwm-clock.h +Removing arch/arm/plat-samsung/include/plat/pll6553x.h +Auto-merging arch/arm/plat-samsung/include/plat/pll.h +Auto-merging arch/arm/plat-samsung/include/plat/mipi_csis.h +Auto-merging arch/arm/plat-samsung/include/plat/mfc.h +Auto-merging arch/arm/plat-samsung/include/plat/mci.h +Auto-merging arch/arm/plat-samsung/include/plat/irqs.h +Auto-merging arch/arm/plat-samsung/include/plat/irq.h +Auto-merging arch/arm/plat-samsung/include/plat/fiq.h +Auto-merging arch/arm/plat-samsung/include/plat/exynos4.h +Auto-merging arch/arm/plat-samsung/include/plat/ehci.h +Auto-merging arch/arm/plat-samsung/include/plat/dma-pl330.h +Auto-merging arch/arm/plat-samsung/include/plat/cpu-freq-core.h +Auto-merging arch/arm/plat-samsung/include/plat/common-smdk.h +Auto-merging arch/arm/plat-samsung/include/plat/camport.h +Auto-merging arch/arm/plat-samsung/include/plat/audio-simtec.h +Removing arch/arm/plat-samsung/gpio.c +Removing arch/arm/plat-samsung/gpio-config.c +Removing arch/arm/plat-samsung/dev-wdt.c +Removing arch/arm/plat-samsung/dev-usb.c +Removing arch/arm/plat-samsung/dev-usb-hsotg.c +Removing arch/arm/plat-samsung/dev-ts.c +Removing arch/arm/plat-samsung/dev-rtc.c +Removing arch/arm/plat-samsung/dev-pwm.c +Removing arch/arm/plat-samsung/dev-onenand.c +Removing arch/arm/plat-samsung/dev-nand.c +Removing arch/arm/plat-samsung/dev-keypad.c +Removing arch/arm/plat-samsung/dev-ide.c +Removing arch/arm/plat-samsung/dev-i2c7.c +Removing arch/arm/plat-samsung/dev-i2c6.c +Removing arch/arm/plat-samsung/dev-i2c5.c +Removing arch/arm/plat-samsung/dev-i2c4.c +Removing arch/arm/plat-samsung/dev-i2c3.c +Removing arch/arm/plat-samsung/dev-i2c2.c +Removing arch/arm/plat-samsung/dev-i2c1.c +Removing arch/arm/plat-samsung/dev-i2c0.c +Removing arch/arm/plat-samsung/dev-hwmon.c +Removing arch/arm/plat-samsung/dev-hsmmc3.c +Removing arch/arm/plat-samsung/dev-hsmmc2.c +Removing arch/arm/plat-samsung/dev-hsmmc1.c +Removing arch/arm/plat-samsung/dev-hsmmc.c +Removing arch/arm/plat-samsung/dev-fb.c +Removing arch/arm/plat-samsung/dev-asocdma.c +Removing arch/arm/plat-samsung/dev-adc.c +Auto-merging arch/arm/plat-s5p/sleep.S +Removing arch/arm/plat-s5p/dev-pmu.c +Removing arch/arm/plat-s5p/dev-onenand.c +Removing arch/arm/plat-s5p/dev-fimd0.c +Removing arch/arm/plat-s5p/dev-fimc3.c +Removing arch/arm/plat-s5p/dev-fimc2.c +Removing arch/arm/plat-s5p/dev-fimc1.c +Removing arch/arm/plat-s5p/dev-fimc0.c +Removing arch/arm/plat-s5p/dev-ehci.c +Removing arch/arm/plat-s5p/dev-csis1.c +Removing arch/arm/plat-s5p/dev-csis0.c +Removing arch/arm/plat-s3c24xx/include/plat/regResolved 'arch/arm/mach-omap2/Makefile' using previous resolution. +Resolved 'arch/arm/plat-omap/devices.c' using previous resolution. +s-spi.h +Removing arch/arm/plat-s3c24xx/include/plat/regs-iis.h +Removing arch/arm/plat-s3c24xx/include/plat/pll.h +Removing arch/arm/plat-s3c24xx/include/mach/pwm-clock.h +Removing arch/arm/plat-s3c24xx/include/mach/clkdev.h +Removing arch/arm/plat-s3c24xx/gpiolib.c +Removing arch/arm/plat-s3c24xx/gpio.c +Removing arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-omap/devices.c +CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c +Removing arch/arm/mach-s5pv210/sleep.S +Removing arch/arm/mach-s5pv210/include/mach/pwm-clock.h +Removing arch/arm/mach-s5pv210/include/mach/clkdev.h +Removing arch/arm/mach-s5pc100/include/mach/pwm-clock.h +Removing arch/arm/mach-s5pc100/include/mach/clkdev.h +Removing arch/arm/mach-s5p64x0/include/mach/pwm-clock.h +Removing arch/arm/mach-s5p64x0/include/mach/clkdev.h +Removing arch/arm/mach-s3c64xx/include/mach/pwm-clock.h +Removing arch/arm/mach-s3c64xx/include/mach/pll.h +Removing arch/arm/mach-s3c64xx/include/mach/clkdev.h +Removing arch/arm/mach-s3c64xx/gpiolib.c +Removing arch/arm/mach-s3c64xx/dev-onenand1.c +Auto-merging arch/arm/mach-omap2/board-generic.c +Auto-merging arch/arm/mach-omap2/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile +Removing arch/arm/mach-exynos4/include/mach/clkdev.h +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1f5f6f2] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 7 +- + arch/arm/include/asm/hardware/pl080.h | 4 + + arch/arm/mach-exynos4/Kconfig | 48 + + arch/arm/mach-exynos4/Makefile | 2 +- + arch/arm/mach-exynos4/clock.c | 220 ++- + arch/arm/mach-exynos4/cpu.c | 2 + + arch/arm/mach-exynos4/dma.c | 300 ++- + arch/arm/mach-exynos4/include/mach/clkdev.h | 7 - + arch/arm/mach-exynos4/include/mach/dma.h | 4 +- + arch/arm/mach-exynos4/include/mach/irqs.h | 4 + + arch/arm/mach-exynos4/include/mach/map.h | 12 + + arch/arm/mach-exynos4/include/mach/pm-core.h | 8 +- + arch/arm/mach-exynos4/include/mach/pmu.h | 7 + + arch/arm/mach-exynos4/include/mach/regs-pmu.h | 74 +- + arch/arm/mach-exynos4/mach-nuri.c | 192 ++- + arch/arm/mach-exynos4/mach-origen.c | 598 +++++- + arch/arm/mach-exynos4/mach-smdkv310.c | 49 + + arch/arm/mach-exynos4/mach-universal_c210.c | 307 +++- + arch/arm/mach-exynos4/pm.c | 7 + + arch/arm/mach-exynos4/pmu.c | 353 ++-- + arch/arm/mach-exynos4/setup-sdhci.c | 47 - + arch/arm/mach-mmp/Makefile | 2 +- + arch/arm/mach-mmp/brownstone.c | 11 + + arch/arm/mach-mmp/include/mach/mmp2.h | 13 + + arch/arm/mach-mmp/include/mach/sram.h | 35 + + arch/arm/mach-mmp/mmp2.c | 3 + + arch/arm/mach-mmp/sram.c | 168 ++ + arch/arm/mach-omap2/board-generic.c | 4 - + arch/arm/mach-s3c2410/Kconfig | 1 - + arch/arm/mach-s3c2410/include/mach/dma.h | 20 +- + arch/arm/mach-s3c2410/include/mach/fb.h | 75 +- + arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 99 +- + arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 2 +- + arch/arm/mach-s3c2410/include/mach/gpio-track.h | 6 +- + arch/arm/mach-s3c2410/include/mach/irqs.h | 4 +- + arch/arm/mach-s3c2410/include/mach/map.h | 1 + + arch/arm/mach-s3c2410/include/mach/pm-core.h | 2 +- + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 2 + + arch/arm/mach-s3c2410/mach-h1940.c | 6 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 1 + + arch/arm/mach-s3c2410/s3c2410.c | 4 +- + arch/arm/mach-s3c2412/dma.c | 4 +- + arch/arm/mach-s3c2412/gpio.c | 62 + + arch/arm/mach-s3c2416/Kconfig | 1 - + arch/arm/mach-s3c2416/clock.c | 50 +- + arch/arm/mach-s3c2416/s3c2416.c | 7 +- + arch/arm/mach-s3c2416/setup-sdhci.c | 37 - + arch/arm/mach-s3c2440/Kconfig | 2 - + arch/arm/mach-s3c2440/mach-rx1950.c | 1 + + arch/arm/mach-s3c2440/s3c2440.c | 4 +- + arch/arm/mach-s3c2440/s3c2442.c | 4 +- + arch/arm/mach-s3c2443/Kconfig | 1 - + arch/arm/mach-s3c2443/clock.c | 160 +-- + arch/arm/mach-s3c2443/s3c2443.c | 7 +- + arch/arm/mach-s3c64xx/Kconfig | 1 + + arch/arm/mach-s3c64xx/Makefile | 5 +- + arch/arm/mach-s3c64xx/clock.c | 13 +- + arch/arm/mach-s3c64xx/cpu.c | 4 +- + arch/arm/mach-s3c64xx/dev-onenand1.c | 53 - + arch/arm/mach-s3c64xx/dma.c | 12 +- + arch/arm/mach-s3c64xx/gpiolib.c | 290 --- + arch/arm/mach-s3c64xx/include/mach/clkdev.h | 7 - + arch/arm/mach-s3c64xx/include/mach/crag6410.h | 23 + + arch/arm/mach-s3c64xx/include/mach/dma.h | 8 +- + arch/arm/mach-s3c64xx/include/mach/pll.h | 45 - + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 +- + arch/arm/mach-s3c64xx/include/mach/pwm-clock.h | 56 - + arch/arm/mach-s3c64xx/include/mach/regs-sys.h | 3 + + arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 182 ++ + arch/arm/mach-s3c64xx/mach-crag6410.c | 108 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 2 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +- + arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-s3c64xx/pm.c | 4 + + arch/arm/mach-s3c64xx/s3c6400.c | 2 +- + arch/arm/mach-s3c64xx/s3c6410.c | 4 +- + arch/arm/mach-s3c64xx/setup-sdhci.c | 48 - + arch/arm/mach-s5p64x0/Kconfig | 18 +- + arch/arm/mach-s5p64x0/Makefile | 4 +- + arch/arm/mach-s5p64x0/clock-s5p6440.c | 10 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 10 +- + arch/arm/mach-s5p64x0/cpu.c | 3 + + arch/arm/mach-s5p64x0/dma.c | 269 ++- + arch/arm/mach-s5p64x0/include/mach/clkdev.h | 7 - + arch/arm/mach-s5p64x0/include/mach/dma.h | 4 +- + arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 + + arch/arm/mach-s5p64x0/include/mach/map.h | 4 + + arch/arm/mach-s5p64x0/include/mach/pm-core.h | 117 + + arch/arm/mach-s5p64x0/include/mach/pwm-clock.h | 68 - + arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 33 + + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 21 + + arch/arm/mach-s5p64x0/irq-eint.c | 2 + + arch/arm/mach-s5p64x0/irq-pm.c | 92 + + arch/arm/mach-s5p64x0/mach-smdk6440.c | 74 + + arch/arm/mach-s5p64x0/mach-smdk6450.c | 75 + + arch/arm/mach-s5p64x0/pm.c | 204 ++ + arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 + + arch/arm/mach-s5pc100/Kconfig | 2 +- + arch/arm/mach-s5pc100/clock.c | 15 +- + arch/arm/mach-s5pc100/dma.c | 324 ++- + arch/arm/mach-s5pc100/include/mach/clkdev.h | 7 - + arch/arm/mach-s5pc100/include/mach/dma.h | 4 +- + arch/arm/mach-s5pc100/include/mach/pwm-clock.h | 56 - + arch/arm/mach-s5pc100/setup-sdhci.c | 42 - + arch/arm/mach-s5pv210/Kconfig | 6 +- + arch/arm/mach-s5pv210/Makefile | 2 +- + arch/arm/mach-s5pv210/clock.c | 151 +- + arch/arm/mach-s5pv210/cpu.c | 4 + + arch/arm/mach-s5pv210/dma.c | 317 ++- + arch/arm/mach-s5pv210/include/mach/clkdev.h | 7 - + arch/arm/mach-s5pv210/include/mach/dma.h | 4 +- + arch/arm/mach-s5pv210/include/mach/irqs.h | 4 +- + arch/arm/mach-s5pv210/include/mach/map.h | 13 + + arch/arm/mach-s5pv210/include/mach/pm-core.h | 2 +- + arch/arm/mach-s5pv210/include/mach/pwm-clock.h | 70 - + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 3 +- + arch/arm/mach-s5pv210/mach-goni.c | 57 + + arch/arm/mach-s5pv210/setup-sdhci.c | 41 - + arch/arm/mach-s5pv210/sleep.S | 52 - + arch/arm/plat-s3c24xx/Kconfig | 1 - + arch/arm/plat-s3c24xx/Makefile | 4 +- + arch/arm/plat-s3c24xx/dev-uart.c | 100 + + arch/arm/plat-s3c24xx/devs.c | 528 ---- + arch/arm/plat-s3c24xx/dma.c | 10 +- + arch/arm/plat-s3c24xx/gpio.c | 96 - + arch/arm/plat-s3c24xx/gpiolib.c | 229 -- + arch/arm/plat-s3c24xx/include/mach/clkdev.h | 7 - + arch/arm/plat-s3c24xx/include/mach/pwm-clock.h | 55 - + arch/arm/plat-s3c24xx/include/plat/pll.h | 62 - + arch/arm/plat-s3c24xx/include/plat/regs-iis.h | 68 - + arch/arm/plat-s3c24xx/include/plat/regs-spi.h | 81 - + arch/arm/plat-s3c24xx/s3c2443-clock.c | 192 ++- + arch/arm/plat-s5p/Kconfig | 25 +- + arch/arm/plat-s5p/Makefile | 14 +- + arch/arm/plat-s5p/dev-csis0.c | 34 - + arch/arm/plat-s5p/dev-csis1.c | 34 - + arch/arm/plat-s5p/dev-ehci.c | 57 - + arch/arm/plat-s5p/dev-fimc0.c | 43 - + arch/arm/plat-s5p/dev-fimc1.c | 43 - + arch/arm/plat-s5p/dev-fimc2.c | 43 - + arch/arm/plat-s5p/dev-fimc3.c | 43 - + arch/arm/plat-s5p/dev-fimd0.c | 67 - + arch/arm/plat-s5p/dev-mfc.c | 50 - + arch/arm/plat-s5p/dev-onenand.c | 45 - + arch/arm/plat-s5p/dev-pmu.c | 36 - + arch/arm/plat-s5p/irq-gpioint.c | 10 +- + arch/arm/{mach-exynos4 => plat-s5p}/sleep.S | 13 +- + arch/arm/plat-samsung/Kconfig | 36 +- + arch/arm/plat-samsung/Makefile | 37 +- + arch/arm/plat-samsung/adc.c | 43 +- + arch/arm/plat-samsung/dev-adc.c | 46 - + arch/arm/plat-samsung/dev-asocdma.c | 35 - + arch/arm/plat-samsung/dev-fb.c | 63 - + arch/arm/plat-samsung/dev-hsmmc.c | 62 - + arch/arm/plat-samsung/dev-hsmmc1.c | 62 - + arch/arm/plat-samsung/dev-hsmmc2.c | 63 - + arch/arm/plat-samsung/dev-hsmmc3.c | 66 - + arch/arm/plat-samsung/dev-hwmon.c | 32 - + arch/arm/plat-samsung/dev-i2c0.c | 70 - + arch/arm/plat-samsung/dev-i2c1.c | 61 - + arch/arm/plat-samsung/dev-i2c2.c | 62 - + arch/arm/plat-samsung/dev-i2c3.c | 60 - + arch/arm/plat-samsung/dev-i2c4.c | 60 - + arch/arm/plat-samsung/dev-i2c5.c | 60 - + arch/arm/plat-samsung/dev-i2c6.c | 60 - + arch/arm/plat-samsung/dev-i2c7.c | 60 - + arch/arm/plat-samsung/dev-ide.c | 44 - + arch/arm/plat-samsung/dev-keypad.c | 50 - + arch/arm/plat-samsung/dev-nand.c | 125 - + arch/arm/plat-samsung/dev-onenand.c | 43 - + arch/arm/plat-samsung/dev-pwm.c | 53 - + arch/arm/plat-samsung/dev-rtc.c | 43 - + arch/arm/plat-samsung/dev-ts.c | 59 - + arch/arm/plat-samsung/dev-usb-hsotg.c | 48 - + arch/arm/plat-samsung/dev-usb.c | 65 - + arch/arm/plat-samsung/dev-wdt.c | 40 - + arch/arm/plat-samsung/devs.c | 1463 +++++++++++ + arch/arm/plat-samsung/dma-ops.c | 131 + + arch/arm/plat-samsung/gpio-config.c | 431 ---- + arch/arm/plat-samsung/gpio.c | 167 -- + arch/arm/plat-samsung/include/plat/adc-core.h | 2 +- + .../include/plat/audio-simtec.h | 2 +- + .../include/plat/camport.h | 6 +- + .../include/plat/common-smdk.h | 2 +- + .../include/plat/cpu-freq-core.h | 5 +- + arch/arm/plat-samsung/include/plat/cpu.h | 6 +- + arch/arm/plat-samsung/include/plat/devs.h | 151 +- + arch/arm/plat-samsung/include/plat/dma-ops.h | 63 + + .../include/plat/{s3c-dma-pl330.h => dma-pl330.h} | 24 +- + arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 2 +- + arch/arm/plat-samsung/include/plat/dma.h | 10 +- + .../{plat-s5p => plat-samsung}/include/plat/ehci.h | 6 +- + .../include/plat/exynos4.h | 2 +- + arch/arm/plat-samsung/include/plat/fb-s3c2410.h | 72 + + arch/arm/plat-samsung/include/plat/fb.h | 7 + + .../include/plat/fiq.h | 2 +- + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 172 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 34 +- + arch/arm/plat-samsung/include/plat/gpio-core.h | 97 +- + arch/arm/plat-samsung/include/plat/gpio-fns.h | 98 + + arch/arm/plat-samsung/include/plat/iic.h | 1 + + .../include/plat/irq.h | 25 +- + .../{plat-s5p => plat-samsung}/include/plat/irqs.h | 8 +- + .../include/plat/mci.h | 10 +- + .../{plat-s5p => plat-samsung}/include/plat/mfc.h | 6 +- + .../include/plat/mipi_csis.h | 6 +- + .../{plat-s5p => plat-samsung}/include/plat/pll.h | 134 +- + arch/arm/plat-samsung/include/plat/pll6553x.h | 51 - + arch/arm/plat-samsung/include/plat/pm.h | 10 +- + .../mach => plat-samsung/include/plat}/pwm-clock.h | 39 +- + arch/arm/plat-samsung/include/plat/regs-adc.h | 3 + + .../include/plat/regs-dma.h | 112 +- + arch/arm/plat-samsung/include/plat/regs-iis.h | 70 + + arch/arm/plat-samsung/include/plat/regs-spi.h | 48 + + .../include/plat/regs-srom.h | 8 +- + .../include/plat/regs-udc.h | 132 +- + .../include/plat/reset.h | 8 +- + .../plat-samsung/include/plat/s3c-pl330-pdata.h | 32 - + .../include/plat/s3c2410.h | 2 +- + .../include/plat/s3c2412.h | 2 +- + .../include/plat/s3c2416.h | 2 +- + .../include/plat/s3c2443.h | 9 +- + .../include/plat/s3c244x.h | 2 +- + .../mach => plat-samsung/include/plat}/s3c6400.h | 2 +- + .../mach => plat-samsung/include/plat}/s3c6410.h | 2 +- + .../include/plat/s5p-clock.h | 2 +- + .../include/plat/s5p-time.h | 2 +- + .../include/plat/s5p6440.h | 2 +- + .../include/plat/s5p6450.h | 2 +- + .../include/plat/s5pc100.h | 2 +- + .../include/plat/s5pv210.h | 2 +- + arch/arm/plat-samsung/include/plat/sdhci.h | 57 - + .../include/plat/sysmmu.h | 6 +- + .../include/plat/system-reset.h | 2 +- + arch/arm/plat-samsung/include/plat/tv-core.h | 44 + + .../include/plat/udc.h | 4 +- + .../include/plat/usb-phy.h | 6 +- + arch/arm/plat-samsung/platformdata.c | 2 - + arch/arm/plat-samsung/pm-gpio.c | 72 +- + arch/arm/plat-samsung/pm.c | 6 +- + arch/arm/plat-samsung/pwm-clock.c | 13 +- + arch/arm/plat-samsung/s3c-dma-ops.c | 130 + + arch/arm/plat-samsung/s3c-pl330.c | 1244 --------- + drivers/dma/Kconfig | 3 +- + drivers/dma/amba-pl08x.c | 455 ++-- + drivers/dma/at_hdmac.c | 159 +- + drivers/dma/at_hdmac_regs.h | 24 + + drivers/dma/dmatest.c | 23 +- + drivers/dma/imx-sdma.c | 47 +- + drivers/dma/mxs-dma.c | 45 +- + drivers/dma/pl330.c | 229 ++- + drivers/gpio/Kconfig | 16 - + drivers/gpio/Makefile | 6 +- + drivers/gpio/gpio-exynos4.c | 385 --- + drivers/gpio/gpio-plat-samsung.c | 205 -- + drivers/gpio/gpio-s5pc100.c | 354 --- + drivers/gpio/gpio-s5pv210.c | 287 --- + drivers/gpio/gpio-samsung.c | 2712 ++++++++++++++++++++ + drivers/mmc/host/s3cmci.c | 6 +- + drivers/spi/spi-s3c64xx.c | 175 +- + include/linux/amba/pl08x.h | 14 +- + include/linux/amba/pl330.h | 6 +- + include/linux/dmaengine.h | 13 +- + sound/soc/samsung/ac97.c | 10 +- + sound/soc/samsung/dma.c | 148 +- + sound/soc/samsung/dma.h | 4 +- + 272 files changed, 10721 insertions(+), 9650 deletions(-) + delete mode 100644 arch/arm/mach-exynos4/include/mach/clkdev.h + create mode 100644 arch/arm/mach-mmp/include/mach/sram.h + create mode 100644 arch/arm/mach-mmp/sram.c + create mode 100644 arch/arm/mach-s3c2412/gpio.c + delete mode 100644 arch/arm/mach-s3c64xx/dev-onenand1.c + delete mode 100644 arch/arm/mach-s3c64xx/gpiolib.c + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/clkdev.h + create mode 100644 arch/arm/mach-s3c64xx/include/mach/crag6410.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pll.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/pwm-clock.h + create mode 100644 arch/arm/mach-s3c64xx/mach-crag6410-module.c + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/clkdev.h + create mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pwm-clock.h + create mode 100644 arch/arm/mach-s5p64x0/irq-pm.c + create mode 100644 arch/arm/mach-s5p64x0/pm.c + create mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c + delete mode 100644 arch/arm/mach-s5pc100/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/pwm-clock.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/pwm-clock.h + delete mode 100644 arch/arm/mach-s5pv210/sleep.S + create mode 100644 arch/arm/plat-s3c24xx/dev-uart.c + delete mode 100644 arch/arm/plat-s3c24xx/devs.c + delete mode 100644 arch/arm/plat-s3c24xx/gpio.c + delete mode 100644 arch/arm/plat-s3c24xx/gpiolib.c + delete mode 100644 arch/arm/plat-s3c24xx/include/mach/clkdev.h + delete mode 100644 arch/arm/plat-s3c24xx/include/mach/pwm-clock.h + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/pll.h + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-iis.h + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-spi.h + delete mode 100644 arch/arm/plat-s5p/dev-csis0.c + delete mode 100644 arch/arm/plat-s5p/dev-csis1.c + delete mode 100644 arch/arm/plat-s5p/dev-ehci.c + delete mode 100644 arch/arm/plat-s5p/dev-fimc0.c + delete mode 100644 arch/arm/plat-s5p/dev-fimc1.c + delete mode 100644 arch/arm/plat-s5p/dev-fimc2.c + delete mode 100644 arch/arm/plat-s5p/dev-fimc3.c + delete mode 100644 arch/arm/plat-s5p/dev-fimd0.c + delete mode 100644 arch/arm/plat-s5p/dev-onenand.c + delete mode 100644 arch/arm/plat-s5p/dev-pmu.c + rename arch/arm/{mach-exynos4 => plat-s5p}/sleep.S (81%) + delete mode 100644 arch/arm/plat-samsung/dev-adc.c + delete mode 100644 arch/arm/plat-samsung/dev-asocdma.c + delete mode 100644 arch/arm/plat-samsung/dev-fb.c + delete mode 100644 arch/arm/plat-samsung/dev-hsmmc.c + delete mode 100644 arch/arm/plat-samsung/dev-hsmmc1.c + delete mode 100644 arch/arm/plat-samsung/dev-hsmmc2.c + delete mode 100644 arch/arm/plat-samsung/dev-hsmmc3.c + delete mode 100644 arch/arm/plat-samsung/dev-hwmon.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c0.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c1.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c2.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c3.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c4.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c5.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c6.c + delete mode 100644 arch/arm/plat-samsung/dev-i2c7.c + delete mode 100644 arch/arm/plat-samsung/dev-ide.c + delete mode 100644 arch/arm/plat-samsung/dev-keypad.c + delete mode 100644 arch/arm/plat-samsung/dev-nand.c + delete mode 100644 arch/arm/plat-samsung/dev-onenand.c + delete mode 100644 arch/arm/plat-samsung/dev-pwm.c + delete mode 100644 arch/arm/plat-samsung/dev-rtc.c + delete mode 100644 arch/arm/plat-samsung/dev-ts.c + delete mode 100644 arch/arm/plat-samsung/dev-usb-hsotg.c + delete mode 100644 arch/arm/plat-samsung/dev-usb.c + delete mode 100644 arch/arm/plat-samsung/dev-wdt.c + create mode 100644 arch/arm/plat-samsung/devs.c + create mode 100644 arch/arm/plat-samsung/dma-ops.c + delete mode 100644 arch/arm/plat-samsung/gpio-config.c + delete mode 100644 arch/arm/plat-samsung/gpio.c + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/audio-simtec.h (95%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/camport.h (86%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/common-smdk.h (87%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/cpu-freq-core.h (98%) + create mode 100644 arch/arm/plat-samsung/include/plat/dma-ops.h + rename arch/arm/plat-samsung/include/plat/{s3c-dma-pl330.h => dma-pl330.h} (84%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/ehci.h (84%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/exynos4.h (94%) + create mode 100644 arch/arm/plat-samsung/include/plat/fb-s3c2410.h + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/fiq.h (88%) + create mode 100644 arch/arm/plat-samsung/include/plat/gpio-fns.h + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/irq.h (81%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/irqs.h (93%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/mci.h (90%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mfc.h (90%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/mipi_csis.h (90%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/pll.h (57%) + delete mode 100644 arch/arm/plat-samsung/include/plat/pll6553x.h + rename arch/arm/{mach-exynos4/include/mach => plat-samsung/include/plat}/pwm-clock.h (68%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-dma.h (58%) + create mode 100644 arch/arm/plat-samsung/include/plat/regs-iis.h + create mode 100644 arch/arm/plat-samsung/include/plat/regs-spi.h + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/regs-srom.h (89%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-udc.h (51%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/reset.h (66%) + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c-pl330-pdata.h + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2410.h (93%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2412.h (92%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2416.h (92%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2443.h (87%) + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c244x.h (94%) + rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6400.h (94%) + rename arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6410.h (93%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-clock.h (96%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-time.h (94%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6440.h (94%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6450.h (94%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pc100.h (94%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pv210.h (94%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/sysmmu.h (96%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/system-reset.h (92%) + create mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h + rename arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/udc.h (95%) + rename arch/arm/{plat-s5p => plat-samsung}/include/plat/usb-phy.h (83%) + create mode 100644 arch/arm/plat-samsung/s3c-dma-ops.c + delete mode 100644 arch/arm/plat-samsung/s3c-pl330.c + delete mode 100644 drivers/gpio/gpio-exynos4.c + delete mode 100644 drivers/gpio/gpio-plat-samsung.c + delete mode 100644 drivers/gpio/gpio-s5pc100.c + delete mode 100644 drivers/gpio/gpio-s5pv210.c + create mode 100644 drivers/gpio/gpio-samsung.c +$ git am -3 ../patches/0001-arm-soc-merge-fixup-for-fixup-reserve-being-added-to.patch +Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mach-msm/board-msm8x60.c +$ git add . +$ git commit -v -a --amend +[master f65506d] Merge remote-tracking branch 'arm-soc/for-next' +Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator) +$ git merge at91/at91-next +Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution. +Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution. +Resolved 'drivers/ata/pata_at91.c' using previous resolution. +Auto-merging drivers/usb/host/ohci-at91.c +Auto-merging drivers/usb/gadget/at91_udc.c +Auto-merging drivers/mmc/host/at91_mci.c +Auto-merging drivers/ide/at91_ide.c +Auto-merging drivers/ata/pata_at91.c +CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c +Auto-merging arch/arm/mach-at91/include/mach/gpio.h +Auto-merging arch/arm/mach-at91/include/mach/at91sam9g45.h +Auto-merging arch/arm/mach-at91/gpio.c +Auto-merging arch/arm/mach-at91/board-yl-9200.c +Auto-merging arch/arm/mach-at91/board-usb-a926x.c +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c +Auto-merging arch/arm/mach-at91/board-sam9g20ek.c +Auto-merging arch/arm/mach-at91/board-sam9263ek.c +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-sam9260ek.c +Auto-merging arch/arm/mach-at91/board-sam9-l9260.c +Auto-merging arch/arm/mach-at91/board-rm9200ek.c +Auto-merging arch/arm/mach-at91/board-rm9200dk.c +Auto-merging arch/arm/mach-at91/board-qil-a9260.c +Auto-merging arch/arm/mach-at91/board-picotux200.c +Auto-merging arch/arm/mach-at91/board-neocore926.c +Auto-merging arch/arm/mach-at91/board-kb9202.c +Auto-merging arch/arm/mach-at91/board-kafa.c +Auto-merging arch/arm/mach-at91/board-ecbat91.c +Auto-merging arch/arm/mach-at91/board-eb9200.c +Auto-merging arch/arm/mach-at91/board-csb637.c +Auto-merging arch/arm/mach-at91/board-csb337.c +Auto-merging arch/arm/mach-at91/board-cpuat91.c +Auto-merging arch/arm/mach-at91/board-cpu9krea.c +Auto-merging arch/arm/mach-at91/board-carmeva.c +Auto-merging arch/arm/mach-at91/board-cap9adk.c +Auto-merging arch/arm/mach-at91/board-cam60.c +Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c +Auto-merging arch/arm/mach-at91/board-1arm.c +Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Auto-merging arch/arm/mach-at91/at91sam9g45.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c +Auto-merging arch/arm/mach-at91/at91sam9263_devices.c +Auto-merging arch/arm/mach-at91/at91sam9263.c +Auto-merging arch/arm/mach-at91/at91sam9261_devices.c +Auto-merging arch/arm/mach-at91/at91sam9261.c +Auto-merging arch/arm/mach-at91/at91sam9260_devices.c +Auto-merging arch/arm/mach-at91/at91sam9260.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c +Auto-merging arch/arm/mach-at91/at91rm9200_devices.c +Auto-merging arch/arm/mach-at91/at91rm9200.c +Auto-merging arch/arm/mach-at91/at91cap9_devices.c +Auto-merging arch/arm/mach-at91/at91cap9.c +Auto-merging arch/arm/configs/at91sam9rl_defconfig +Auto-merging arch/arm/configs/at91sam9g20_defconfig +Auto-merging arch/arm/configs/at91sam9260_defconfig +Auto-merging arch/arm/configs/at91cap9_defconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e0a1759] Merge remote-tracking branch 'at91/at91-next' +$ git diff -M --stat --summary HEAD^.. + .../{at91cap9adk_defconfig => at91cap9_defconfig} | 5 - + ...91sam9260ek_defconfig => at91sam9260_defconfig} | 14 +- + ...91sam9g20ek_defconfig => at91sam9g20_defconfig} | 19 +- + ...at91sam9rlek_defconfig => at91sam9rl_defconfig} | 5 - + arch/arm/mach-at91/at91cap9.c | 8 +- + arch/arm/mach-at91/at91cap9_devices.c | 20 +- + arch/arm/mach-at91/at91rm9200.c | 8 +- + arch/arm/mach-at91/at91rm9200_devices.c | 22 +- + arch/arm/mach-at91/at91sam9260.c | 6 +- + arch/arm/mach-at91/at91sam9260_devices.c | 26 +- + arch/arm/mach-at91/at91sam9261.c | 6 +- + arch/arm/mach-at91/at91sam9261_devices.c | 14 +- + arch/arm/mach-at91/at91sam9263.c | 10 +- + arch/arm/mach-at91/at91sam9263_devices.c | 26 +- + arch/arm/mach-at91/at91sam9g45.c | 10 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 20 +- + arch/arm/mach-at91/at91sam9rl.c | 8 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 16 +- + arch/arm/mach-at91/board-1arm.c | 1 + + arch/arm/mach-at91/board-afeb-9260v1.c | 7 +- + arch/arm/mach-at91/board-cam60.c | 3 +- + arch/arm/mach-at91/board-cap9adk.c | 14 +- + arch/arm/mach-at91/board-carmeva.c | 6 +- + arch/arm/mach-at91/board-cpu9krea.c | 7 +- + arch/arm/mach-at91/board-cpuat91.c | 4 + + arch/arm/mach-at91/board-csb337.c | 4 +- + arch/arm/mach-at91/board-csb637.c | 1 + + arch/arm/mach-at91/board-eb9200.c | 8 +- + arch/arm/mach-at91/board-ecbat91.c | 4 + + arch/arm/mach-at91/board-eco920.c | 4 + + arch/arm/mach-at91/board-flexibity.c | 4 +- + arch/arm/mach-at91/board-foxg20.c | 6 +- + arch/arm/mach-at91/board-gsia18s.c | 4 +- + arch/arm/mach-at91/board-kafa.c | 1 + + arch/arm/mach-at91/board-kb9202.c | 5 +- + arch/arm/mach-at91/board-neocore926.c | 4 +- + arch/arm/mach-at91/board-pcontrol-g20.c | 1 + + arch/arm/mach-at91/board-picotux200.c | 2 + + arch/arm/mach-at91/board-qil-a9260.c | 11 +- + arch/arm/mach-at91/board-rm9200dk.c | 10 +- + arch/arm/mach-at91/board-rm9200ek.c | 2 + + arch/arm/mach-at91/board-sam9-l9260.c | 7 +- + arch/arm/mach-at91/board-sam9260ek.c | 11 +- + arch/arm/mach-at91/board-sam9261ek.c | 8 +- + arch/arm/mach-at91/board-sam9263ek.c | 7 +- + arch/arm/mach-at91/board-sam9g20ek.c | 8 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 3 + + arch/arm/mach-at91/board-sam9rlek.c | 7 +- + arch/arm/mach-at91/board-snapper9260.c | 5 + + arch/arm/mach-at91/board-stamp9g20.c | 11 +- + arch/arm/mach-at91/board-usb-a926x.c | 5 +- + arch/arm/mach-at91/board-yl-9200.c | 6 +- + arch/arm/mach-at91/generic.h | 2 +- + arch/arm/mach-at91/gpio.c | 62 ++-- + arch/arm/mach-at91/include/mach/at91cap9.h | 9 +- + arch/arm/mach-at91/include/mach/at91rm9200.h | 9 +- + arch/arm/mach-at91/include/mach/at91sam9260.h | 7 +- + arch/arm/mach-at91/include/mach/at91sam9261.h | 7 +- + arch/arm/mach-at91/include/mach/at91sam9263.h | 11 +- + arch/arm/mach-at91/include/mach/at91sam9g45.h | 11 +- + arch/arm/mach-at91/include/mach/at91sam9rl.h | 9 +- + arch/arm/mach-at91/include/mach/gpio.h | 336 ++++++++++---------- + drivers/ata/pata_at91.c | 6 +- + drivers/ide/at91_ide.c | 2 +- + drivers/mmc/host/at91_mci.c | 30 +- + drivers/mtd/nand/atmel_nand.c | 8 +- + drivers/usb/gadget/at91_udc.c | 14 +- + drivers/usb/host/ohci-at91.c | 4 +- + 68 files changed, 530 insertions(+), 431 deletions(-) + rename arch/arm/configs/{at91cap9adk_defconfig => at91cap9_defconfig} (95%) + rename arch/arm/configs/{at91sam9260ek_defconfig => at91sam9260_defconfig} (89%) + rename arch/arm/configs/{at91sam9g20ek_defconfig => at91sam9g20_defconfig} (93%) + rename arch/arm/configs/{at91sam9rlek_defconfig => at91sam9rl_defconfig} (94%) +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master) +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-mx5/clock-mx51-mx53.c' using previous resolution. +Resolved 'arch/arm/mach-mx5/devices-imx53.h' using previous resolution. +Resolved 'arch/arm/mach-mx5/mm.c' using previous resolution. +Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution. +Auto-merging arch/arm/plat-mxc/include/mach/hardware.h +CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h +Auto-merging arch/arm/mach-mxs/clock-mx28.c +Auto-merging arch/arm/mach-mx5/mm.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c +Auto-merging arch/arm/mach-mx5/devices-imx53.h +CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h +Auto-merging arch/arm/mach-mx5/clock-mx51-mx53.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dea27b7] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mxs/clock-mx28.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux) +$ git merge linux-spec/for-next +Already up-to-date. +Merging omap/for-next (322a8b0 Linux 3.1-rc1) +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver) +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next (495d818 ARM: SAMSUNG: Remove SPI bus clocks from platform data) +$ git merge s5p/for-next +Resolved 'arch/arm/mach-exynos4/Kconfig' using previous resolution. +Resolved 'drivers/gpio/Makefile' using previous resolution. +Removing drivers/tty/serial/s5pv210.c +Removing drivers/tty/serial/s3c6400.c +Removing drivers/tty/serial/s3c2440.c +Removing drivers/tty/serial/s3c2412.c +Removing drivers/tty/serial/s3c2410.c +Auto-merging drivers/gpio/Makefile +CONFLICT (content): Merge conflict in drivers/gpio/Makefile +Removing arch/arm/mach-s5pv210/setup-sdhci.c +Removing arch/arm/mach-s5pc100/setup-sdhci.c +Removing arch/arm/mach-s3c64xx/setup-sdhci.c +Removing arch/arm/mach-s3c2416/setup-sdhci.c +Removing arch/arm/mach-exynos4/setup-sdhci.c +Auto-merging arch/arm/mach-exynos4/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1e25d7d] Merge remote-tracking branch 's5p/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/insignal-boards.txt | 8 + + .../devicetree/bindings/arm/samsung-boards.txt | 8 + + .../devicetree/bindings/dma/arm-pl330.txt | 30 + + .../devicetree/bindings/gpio/gpio-samsung.txt | 40 ++ + .../devicetree/bindings/input/samsung-keypad.txt | 88 +++ + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 20 + + .../devicetree/bindings/serial/samsung_uart.txt | 14 + + arch/arm/boot/dts/exynos4210-origen.dts | 137 +++++ + arch/arm/boot/dts/exynos4210-smdkv310.dts | 182 ++++++ + arch/arm/boot/dts/exynos4210.dtsi | 397 ++++++++++++ + arch/arm/mach-exynos4/Kconfig | 24 + + arch/arm/mach-exynos4/Makefile | 6 +- + arch/arm/mach-exynos4/clock.c | 229 +++++--- + arch/arm/mach-exynos4/cpu.c | 33 +- + arch/arm/mach-exynos4/dma.c | 229 ++----- + arch/arm/mach-exynos4/include/mach/entry-macro.S | 1 - + arch/arm/mach-exynos4/include/mach/io.h | 5 + + arch/arm/mach-exynos4/include/mach/irqs.h | 8 +- + arch/arm/mach-exynos4/init.c | 21 +- + arch/arm/mach-exynos4/mach-exynos4-dt.c | 85 +++ + arch/arm/mach-exynos4/setup-sdhci.c | 22 - + arch/arm/mach-s3c2410/mach-bast.c | 22 - + arch/arm/mach-s3c2410/mach-vr1000.c | 24 - + arch/arm/mach-s3c2410/s3c2410.c | 6 + + arch/arm/mach-s3c2412/clock.c | 7 + + arch/arm/mach-s3c2416/Makefile | 1 - + arch/arm/mach-s3c2416/clock.c | 68 ++- + arch/arm/mach-s3c2416/setup-sdhci.c | 24 - + arch/arm/mach-s3c2440/clock.c | 44 ++ + arch/arm/mach-s3c2440/mach-anubis.c | 22 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 22 +- + arch/arm/mach-s3c2440/mach-osiris.c | 24 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 18 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 19 +- + arch/arm/mach-s3c64xx/Makefile | 1 - + arch/arm/mach-s3c64xx/clock.c | 243 +++++--- + arch/arm/mach-s3c64xx/dev-spi.c | 7 - + arch/arm/mach-s3c64xx/setup-sdhci.c | 24 - + arch/arm/mach-s5p64x0/clock-s5p6440.c | 93 ++-- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 81 ++- + arch/arm/mach-s5p64x0/dev-spi.c | 6 - + arch/arm/mach-s5p64x0/dma.c | 227 ++----- + arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 + + arch/arm/mach-s5p64x0/init.c | 31 - + arch/arm/mach-s5pc100/Makefile | 1 - + arch/arm/mach-s5pc100/clock.c | 287 ++++++---- + arch/arm/mach-s5pc100/dev-spi.c | 7 - + arch/arm/mach-s5pc100/dma.c | 247 +++------ + arch/arm/mach-s5pc100/include/mach/irqs.h | 2 + + arch/arm/mach-s5pc100/setup-sdhci.c | 23 - + arch/arm/mach-s5pv210/Makefile | 1 - + arch/arm/mach-s5pv210/clock.c | 324 ++++++---- + arch/arm/mach-s5pv210/dev-spi.c | 6 - + arch/arm/mach-s5pv210/dma.c | 241 +++------ + arch/arm/mach-s5pv210/include/mach/irqs.h | 2 + + arch/arm/mach-s5pv210/init.c | 19 - + arch/arm/mach-s5pv210/setup-sdhci.c | 22 - + arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +- + arch/arm/plat-samsung/dev-backlight.c | 1 + + arch/arm/plat-samsung/dma-ops.c | 15 +- + arch/arm/plat-samsung/include/plat/dma-ops.h | 1 + + arch/arm/plat-samsung/include/plat/dma-pl330.h | 3 +- + arch/arm/plat-samsung/include/plat/irqs.h | 3 +- + arch/arm/plat-samsung/include/plat/regs-serial.h | 45 +- + arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 - + arch/arm/plat-samsung/include/plat/sdhci.h | 31 - + drivers/dma/pl330.c | 99 ++-- + drivers/gpio/gpio-samsung.c | 72 +++ + drivers/input/keyboard/Kconfig | 9 +- + drivers/input/keyboard/samsung-keypad.c | 174 +++++- + drivers/mmc/host/sdhci-s3c.c | 7 +- + drivers/rtc/rtc-s3c.c | 21 +- + drivers/spi/spi-s3c64xx.c | 14 +- + drivers/tty/serial/Kconfig | 45 +-- + drivers/tty/serial/Makefile | 5 - + drivers/tty/serial/s3c2410.c | 115 ---- + drivers/tty/serial/s3c2412.c | 149 ----- + drivers/tty/serial/s3c2440.c | 178 ------ + drivers/tty/serial/s3c6400.c | 149 ----- + drivers/tty/serial/s5pv210.c | 158 ----- + drivers/tty/serial/samsung.c | 639 ++++++++++++-------- + drivers/tty/serial/samsung.h | 32 +- + include/linux/amba/pl330.h | 15 +- + 83 files changed, 3029 insertions(+), 2777 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt + create mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt + create mode 100644 Documentation/devicetree/bindings/input/samsung-keypad.txt + create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt + create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt + create mode 100644 arch/arm/boot/dts/exynos4210-origen.dts + create mode 100644 arch/arm/boot/dts/exynos4210-smdkv310.dts + create mode 100644 arch/arm/boot/dts/exynos4210.dtsi + create mode 100644 arch/arm/mach-exynos4/mach-exynos4-dt.c + delete mode 100644 arch/arm/mach-exynos4/setup-sdhci.c + delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c + delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c + delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c + delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.c + delete mode 100644 drivers/tty/serial/s3c2410.c + delete mode 100644 drivers/tty/serial/s3c2412.c + delete mode 100644 drivers/tty/serial/s3c2440.c + delete mode 100644 drivers/tty/serial/s3c6400.c + delete mode 100644 drivers/tty/serial/s5pv210.c +Merging tegra/for-next (80d0a76 Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus (e114599 Blackfin: add serial TX IRQ in individual platform resource) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/include/asm/bfin_serial.h | 2 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 14 +++++++++++- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 14 +++++++++++- + arch/blackfin/mach-bf527/boards/ad7160eval.c | 14 +++++++++++- + arch/blackfin/mach-bf527/boards/cm_bf527.c | 14 +++++++++++- + arch/blackfin/mach-bf527/boards/ezbrd.c | 14 +++++++++++- + arch/blackfin/mach-bf527/boards/ezkit.c | 14 +++++++++++- + arch/blackfin/mach-bf527/boards/tll6527m.c | 14 +++++++++++- + arch/blackfin/mach-bf533/boards/H8606.c | 7 +++++- + arch/blackfin/mach-bf533/boards/blackstamp.c | 7 +++++- + arch/blackfin/mach-bf533/boards/cm_bf533.c | 7 +++++- + arch/blackfin/mach-bf533/boards/ezkit.c | 7 +++++- + arch/blackfin/mach-bf533/boards/ip0x.c | 7 +++++- + arch/blackfin/mach-bf533/boards/stamp.c | 7 +++++- + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 14 +++++++++++- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 14 +++++++++++- + arch/blackfin/mach-bf537/boards/dnp5370.c | 14 +++++++++++- + arch/blackfin/mach-bf537/boards/minotaur.c | 14 +++++++++++- + arch/blackfin/mach-bf537/boards/pnav10.c | 14 +++++++++++- + arch/blackfin/mach-bf537/boards/stamp.c | 14 +++++++++++- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 14 +++++++++++- + arch/blackfin/mach-bf538/boards/ezkit.c | 21 ++++++++++++++++-- + arch/blackfin/mach-bf548/boards/cm_bf548.c | 28 ++++++++++++++++++++++--- + arch/blackfin/mach-bf548/boards/ezkit.c | 28 ++++++++++++++++++++++--- + arch/blackfin/mach-bf561/boards/acvilon.c | 7 +++++- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 7 +++++- + arch/blackfin/mach-bf561/boards/ezkit.c | 7 +++++- + arch/blackfin/mach-bf561/boards/tepla.c | 7 +++++- + 28 files changed, 296 insertions(+), 49 deletions(-) +Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS) +$ git merge c6x/for-linux-next +Auto-merging include/asm-generic/page.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/c6x/clocks.txt | 40 + + Documentation/devicetree/bindings/c6x/dscr.txt | 127 +++ + Documentation/devicetree/bindings/c6x/emifa.txt | 62 ++ + .../devicetree/bindings/c6x/interrupt.txt | 104 +++ + Documentation/devicetree/bindings/c6x/soc.txt | 28 + + Documentation/devicetree/bindings/c6x/timer64.txt | 26 + + MAINTAINERS | 8 + + arch/c6x/Kconfig | 174 +++++ + arch/c6x/Makefile | 60 ++ + arch/c6x/boot/Makefile | 30 + + arch/c6x/boot/dts/dsk6455.dts | 62 ++ + arch/c6x/boot/dts/evmc6457.dts | 48 ++ + arch/c6x/boot/dts/evmc6472.dts | 73 ++ + arch/c6x/boot/dts/evmc6474.dts | 58 ++ + arch/c6x/boot/dts/tms320c6455.dtsi | 96 +++ + arch/c6x/boot/dts/tms320c6457.dtsi | 68 ++ + arch/c6x/boot/dts/tms320c6472.dtsi | 134 ++++ + arch/c6x/boot/dts/tms320c6474.dtsi | 89 +++ + arch/c6x/boot/linked_dtb.S | 2 + + arch/c6x/configs/dsk6455_defconfig | 44 ++ + arch/c6x/configs/evmc6457_defconfig | 41 + + arch/c6x/configs/evmc6472_defconfig | 42 + + arch/c6x/configs/evmc6474_defconfig | 42 + + arch/c6x/include/asm/Kbuild | 54 ++ + arch/c6x/include/asm/asm-offsets.h | 1 + + arch/c6x/include/asm/bitops.h | 105 +++ + arch/c6x/include/asm/byteorder.h | 12 + + arch/c6x/include/asm/cache.h | 90 +++ + arch/c6x/include/asm/cacheflush.h | 65 ++ + arch/c6x/include/asm/checksum.h | 34 + + arch/c6x/include/asm/clkdev.h | 22 + + arch/c6x/include/asm/clock.h | 148 ++++ + arch/c6x/include/asm/delay.h | 67 ++ + arch/c6x/include/asm/dma-mapping.h | 91 +++ + arch/c6x/include/asm/dscr.h | 34 + + arch/c6x/include/asm/elf.h | 113 +++ + arch/c6x/include/asm/ftrace.h | 6 + + arch/c6x/include/asm/hardirq.h | 20 + + arch/c6x/include/asm/irq.h | 302 ++++++++ + arch/c6x/include/asm/irqflags.h | 72 ++ + arch/c6x/include/asm/linkage.h | 30 + + arch/c6x/include/asm/megamod-pic.h | 9 + + arch/c6x/include/asm/memblock.h | 4 + + arch/c6x/include/asm/mmu.h | 18 + + arch/c6x/include/asm/module.h | 33 + + arch/c6x/include/asm/mutex.h | 6 + + arch/c6x/include/asm/page.h | 11 + + arch/c6x/include/asm/pgtable.h | 81 ++ + arch/c6x/include/asm/processor.h | 132 ++++ + arch/c6x/include/asm/procinfo.h | 28 + + arch/c6x/include/asm/prom.h | 1 + + arch/c6x/include/asm/ptrace.h | 174 +++++ + arch/c6x/include/asm/sections.h | 12 + + arch/c6x/include/asm/setup.h | 32 + + arch/c6x/include/asm/sigcontext.h | 80 ++ + arch/c6x/include/asm/signal.h | 17 + + arch/c6x/include/asm/soc.h | 35 + + arch/c6x/include/asm/string.h | 21 + + arch/c6x/include/asm/swab.h | 54 ++ + arch/c6x/include/asm/syscall.h | 123 +++ + arch/c6x/include/asm/syscalls.h | 55 ++ + arch/c6x/include/asm/system.h | 168 ++++ + arch/c6x/include/asm/thread_info.h | 121 +++ + arch/c6x/include/asm/timer64.h | 6 + + arch/c6x/include/asm/timex.h | 33 + + arch/c6x/include/asm/tlb.h | 8 + + arch/c6x/include/asm/traps.h | 36 + + arch/c6x/include/asm/uaccess.h | 107 +++ + arch/c6x/include/asm/unaligned.h | 170 +++++ + arch/c6x/include/asm/unistd.h | 26 + + arch/c6x/kernel/Makefile | 12 + + arch/c6x/kernel/asm-offsets.c | 123 +++ + arch/c6x/kernel/c6x_ksyms.c | 66 ++ + arch/c6x/kernel/devicetree.c | 53 ++ + arch/c6x/kernel/dma.c | 153 ++++ + arch/c6x/kernel/entry.S | 803 ++++++++++++++++++++ + arch/c6x/kernel/head.S | 84 ++ + arch/c6x/kernel/irq.c | 728 ++++++++++++++++++ + arch/c6x/kernel/module.c | 123 +++ + arch/c6x/kernel/process.c | 263 +++++++ + arch/c6x/kernel/ptrace.c | 187 +++++ + arch/c6x/kernel/setup.c | 498 ++++++++++++ + arch/c6x/kernel/signal.c | 377 +++++++++ + arch/c6x/kernel/soc.c | 91 +++ + arch/c6x/kernel/switch_to.S | 74 ++ + arch/c6x/kernel/sys_c6x.c | 74 ++ + arch/c6x/kernel/time.c | 65 ++ + arch/c6x/kernel/traps.c | 423 ++++++++++ + arch/c6x/kernel/vectors.S | 81 ++ + arch/c6x/kernel/vmlinux.lds.S | 162 ++++ + arch/c6x/lib/Makefile | 7 + + arch/c6x/lib/checksum.c | 36 + + arch/c6x/lib/csum_64plus.S | 419 ++++++++++ + arch/c6x/lib/divi.S | 53 ++ + arch/c6x/lib/divremi.S | 46 ++ + arch/c6x/lib/divremu.S | 87 +++ + arch/c6x/lib/divu.S | 98 +++ + arch/c6x/lib/llshl.S | 37 + + arch/c6x/lib/llshr.S | 38 + + arch/c6x/lib/llshru.S | 38 + + arch/c6x/lib/memcpy_64plus.S | 46 ++ + arch/c6x/lib/mpyll.S | 49 ++ + arch/c6x/lib/negll.S | 31 + + arch/c6x/lib/pop_rts.S | 32 + + arch/c6x/lib/push_rts.S | 31 + + arch/c6x/lib/remi.S | 64 ++ + arch/c6x/lib/remu.S | 82 ++ + arch/c6x/lib/strasgi.S | 89 +++ + arch/c6x/lib/strasgi_64plus.S | 39 + + arch/c6x/mm/Makefile | 5 + + arch/c6x/mm/dma-coherent.c | 143 ++++ + arch/c6x/mm/init.c | 113 +++ + arch/c6x/platforms/Kconfig | 16 + + arch/c6x/platforms/Makefile | 12 + + arch/c6x/platforms/cache.c | 445 +++++++++++ + arch/c6x/platforms/dscr.c | 598 +++++++++++++++ + arch/c6x/platforms/emif.c | 88 +++ + arch/c6x/platforms/megamod-pic.c | 349 +++++++++ + arch/c6x/platforms/platform.c | 17 + + arch/c6x/platforms/pll.c | 444 +++++++++++ + arch/c6x/platforms/plldata.c | 404 ++++++++++ + arch/c6x/platforms/timer64.c | 236 ++++++ + include/asm-generic/io.h | 2 +- + include/asm-generic/page.h | 10 +- + include/asm-generic/uaccess.h | 7 +- + include/linux/elf-em.h | 1 + + 126 files changed, 12972 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt + create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt + create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt + create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt + create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt + create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt + create mode 100644 arch/c6x/Kconfig + create mode 100644 arch/c6x/Makefile + create mode 100644 arch/c6x/boot/Makefile + create mode 100644 arch/c6x/boot/dts/dsk6455.dts + create mode 100644 arch/c6x/boot/dts/evmc6457.dts + create mode 100644 arch/c6x/boot/dts/evmc6472.dts + create mode 100644 arch/c6x/boot/dts/evmc6474.dts + create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi + create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi + create mode 100644 arch/c6x/boot/linked_dtb.S + create mode 100644 arch/c6x/configs/dsk6455_defconfig + create mode 100644 arch/c6x/configs/evmc6457_defconfig + create mode 100644 arch/c6x/configs/evmc6472_defconfig + create mode 100644 arch/c6x/configs/evmc6474_defconfig + create mode 100644 arch/c6x/include/asm/Kbuild + create mode 100644 arch/c6x/include/asm/asm-offsets.h + create mode 100644 arch/c6x/include/asm/bitops.h + create mode 100644 arch/c6x/include/asm/byteorder.h + create mode 100644 arch/c6x/include/asm/cache.h + create mode 100644 arch/c6x/include/asm/cacheflush.h + create mode 100644 arch/c6x/include/asm/checksum.h + create mode 100644 arch/c6x/include/asm/clkdev.h + create mode 100644 arch/c6x/include/asm/clock.h + create mode 100644 arch/c6x/include/asm/delay.h + create mode 100644 arch/c6x/include/asm/dma-mapping.h + create mode 100644 arch/c6x/include/asm/dscr.h + create mode 100644 arch/c6x/include/asm/elf.h + create mode 100644 arch/c6x/include/asm/ftrace.h + create mode 100644 arch/c6x/include/asm/hardirq.h + create mode 100644 arch/c6x/include/asm/irq.h + create mode 100644 arch/c6x/include/asm/irqflags.h + create mode 100644 arch/c6x/include/asm/linkage.h + create mode 100644 arch/c6x/include/asm/megamod-pic.h + create mode 100644 arch/c6x/include/asm/memblock.h + create mode 100644 arch/c6x/include/asm/mmu.h + create mode 100644 arch/c6x/include/asm/module.h + create mode 100644 arch/c6x/include/asm/mutex.h + create mode 100644 arch/c6x/include/asm/page.h + create mode 100644 arch/c6x/include/asm/pgtable.h + create mode 100644 arch/c6x/include/asm/processor.h + create mode 100644 arch/c6x/include/asm/procinfo.h + create mode 100644 arch/c6x/include/asm/prom.h + create mode 100644 arch/c6x/include/asm/ptrace.h + create mode 100644 arch/c6x/include/asm/sections.h + create mode 100644 arch/c6x/include/asm/setup.h + create mode 100644 arch/c6x/include/asm/sigcontext.h + create mode 100644 arch/c6x/include/asm/signal.h + create mode 100644 arch/c6x/include/asm/soc.h + create mode 100644 arch/c6x/include/asm/string.h + create mode 100644 arch/c6x/include/asm/swab.h + create mode 100644 arch/c6x/include/asm/syscall.h + create mode 100644 arch/c6x/include/asm/syscalls.h + create mode 100644 arch/c6x/include/asm/system.h + create mode 100644 arch/c6x/include/asm/thread_info.h + create mode 100644 arch/c6x/include/asm/timer64.h + create mode 100644 arch/c6x/include/asm/timex.h + create mode 100644 arch/c6x/include/asm/tlb.h + create mode 100644 arch/c6x/include/asm/traps.h + create mode 100644 arch/c6x/include/asm/uaccess.h + create mode 100644 arch/c6x/include/asm/unaligned.h + create mode 100644 arch/c6x/include/asm/unistd.h + create mode 100644 arch/c6x/kernel/Makefile + create mode 100644 arch/c6x/kernel/asm-offsets.c + create mode 100644 arch/c6x/kernel/c6x_ksyms.c + create mode 100644 arch/c6x/kernel/devicetree.c + create mode 100644 arch/c6x/kernel/dma.c + create mode 100644 arch/c6x/kernel/entry.S + create mode 100644 arch/c6x/kernel/head.S + create mode 100644 arch/c6x/kernel/irq.c + create mode 100644 arch/c6x/kernel/module.c + create mode 100644 arch/c6x/kernel/process.c + create mode 100644 arch/c6x/kernel/ptrace.c + create mode 100644 arch/c6x/kernel/setup.c + create mode 100644 arch/c6x/kernel/signal.c + create mode 100644 arch/c6x/kernel/soc.c + create mode 100644 arch/c6x/kernel/switch_to.S + create mode 100644 arch/c6x/kernel/sys_c6x.c + create mode 100644 arch/c6x/kernel/time.c + create mode 100644 arch/c6x/kernel/traps.c + create mode 100644 arch/c6x/kernel/vectors.S + create mode 100644 arch/c6x/kernel/vmlinux.lds.S + create mode 100644 arch/c6x/lib/Makefile + create mode 100644 arch/c6x/lib/checksum.c + create mode 100644 arch/c6x/lib/csum_64plus.S + create mode 100644 arch/c6x/lib/divi.S + create mode 100644 arch/c6x/lib/divremi.S + create mode 100644 arch/c6x/lib/divremu.S + create mode 100644 arch/c6x/lib/divu.S + create mode 100644 arch/c6x/lib/llshl.S + create mode 100644 arch/c6x/lib/llshr.S + create mode 100644 arch/c6x/lib/llshru.S + create mode 100644 arch/c6x/lib/memcpy_64plus.S + create mode 100644 arch/c6x/lib/mpyll.S + create mode 100644 arch/c6x/lib/negll.S + create mode 100644 arch/c6x/lib/pop_rts.S + create mode 100644 arch/c6x/lib/push_rts.S + create mode 100644 arch/c6x/lib/remi.S + create mode 100644 arch/c6x/lib/remu.S + create mode 100644 arch/c6x/lib/strasgi.S + create mode 100644 arch/c6x/lib/strasgi_64plus.S + create mode 100644 arch/c6x/mm/Makefile + create mode 100644 arch/c6x/mm/dma-coherent.c + create mode 100644 arch/c6x/mm/init.c + create mode 100644 arch/c6x/platforms/Kconfig + create mode 100644 arch/c6x/platforms/Makefile + create mode 100644 arch/c6x/platforms/cache.c + create mode 100644 arch/c6x/platforms/dscr.c + create mode 100644 arch/c6x/platforms/emif.c + create mode 100644 arch/c6x/platforms/megamod-pic.c + create mode 100644 arch/c6x/platforms/platform.c + create mode 100644 arch/c6x/platforms/pll.c + create mode 100644 arch/c6x/platforms/plldata.c + create mode 100644 arch/c6x/platforms/timer64.c +Merging cris/for-next (ea78f5b CRIS: Update documentation) +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging arch/cris/arch-v32/drivers/cryptocop.c +Merge made by the 'recursive' strategy. + 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 quilt/hexagon (8e116d1 Add extra arch overrides to asm-generic/checksum.h) +$ git merge quilt/hexagon +Resolved 'arch/hexagon/kernel/head.S' using previous resolution. +Resolved 'arch/hexagon/kernel/vmlinux.lds.S' using previous resolution. +Auto-merging arch/hexagon/mm/strnlen_user.S +CONFLICT (add/add): Merge conflict in arch/hexagon/mm/strnlen_user.S +Auto-merging arch/hexagon/mm/pgalloc.c +CONFLICT (add/add): Merge conflict in arch/hexagon/mm/pgalloc.c +Auto-merging arch/hexagon/mm/Makefile +CONFLICT (add/add): Merge conflict in arch/hexagon/mm/Makefile +Auto-merging arch/hexagon/lib/memset.S +CONFLICT (add/add): Merge conflict in arch/hexagon/lib/memset.S +Auto-merging arch/hexagon/kernel/vmlinux.lds.S +CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vmlinux.lds.S +Auto-merging arch/hexagon/kernel/vm_vectors.S +CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vm_vectors.S +Auto-merging arch/hexagon/kernel/vdso.c +CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vdso.c +Auto-merging arch/hexagon/kernel/kgdb.c +CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/kgdb.c +Auto-merging arch/hexagon/kernel/hexagon_ksyms.c +CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/hexagon_ksyms.c +Auto-merging arch/hexagon/kernel/head.S +CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/head.S +Auto-merging arch/hexagon/kernel/Makefile +CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/Makefile +Auto-merging arch/hexagon/include/asm/vdso.h +CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/vdso.h +Auto-merging arch/hexagon/include/asm/timex.h +CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/timex.h +Auto-merging arch/hexagon/include/asm/Kbuild +CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/Kbuild +Auto-merging arch/hexagon/Makefile +CONFLICT (add/add): Merge conflict in arch/hexagon/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/hexagon/Makefile'. +Recorded resolution for 'arch/hexagon/include/asm/Kbuild'. +Recorded resolution for 'arch/hexagon/include/asm/timex.h'. +Recorded resolution for 'arch/hexagon/include/asm/vdso.h'. +Recorded resolution for 'arch/hexagon/kernel/Makefile'. +Recorded resolution for 'arch/hexagon/kernel/hexagon_ksyms.c'. +Recorded resolution for 'arch/hexagon/kernel/kgdb.c'. +Recorded resolution for 'arch/hexagon/kernel/vdso.c'. +Recorded resolution for 'arch/hexagon/kernel/vm_vectors.S'. +Recorded resolution for 'arch/hexagon/lib/memset.S'. +Recorded resolution for 'arch/hexagon/mm/Makefile'. +Recorded resolution for 'arch/hexagon/mm/pgalloc.c'. +Recorded resolution for 'arch/hexagon/mm/strnlen_user.S'. +[master 6866547] Merge branch 'quilt/hexagon' +$ git diff -M --stat --summary HEAD^.. +Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (0ada06b m68k: drop unused Kconfig symbols) +$ git merge m68knommu/for-next +Resolved 'arch/m68k/Kconfig.bus' using previous resolution. +Resolved 'arch/m68k/Kconfig.devices' using previous resolution. +Resolved 'arch/m68k/kernel/Makefile' using previous resolution. +Auto-merging arch/m68k/kernel/Makefile +CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile +Auto-merging arch/m68k/Kconfig.devices +CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.devices +Auto-merging arch/m68k/Kconfig.bus +CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.bus +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 648a67a] Merge remote-tracking branch 'm68knommu/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging microblaze/next (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (a1e1771 MIPS: NXP: Remove unused source files.) +$ git merge mips/mips-for-linux-next +Removing arch/mips/nxp/pnx8550/common/setup.c +Removing arch/mips/nxp/pnx8550/common/pci.c +Auto-merging arch/mips/include/asm/mach-bcm47xx/gpio.h +Merge made by the 'recursive' strategy. + arch/mips/emma/common/prom.c | 2 +- + arch/mips/include/asm/mach-bcm47xx/gpio.h | 18 +++- + arch/mips/nxp/pnx8550/common/pci.c | 134 --------------------------- + arch/mips/nxp/pnx8550/common/setup.c | 143 ----------------------------- + arch/mips/pmc-sierra/yosemite/prom.c | 2 +- + 5 files changed, 17 insertions(+), 282 deletions(-) + delete mode 100644 arch/mips/nxp/pnx8550/common/pci.c + delete mode 100644 arch/mips/nxp/pnx8550/common/setup.c +Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls) +$ git merge parisc/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/futex.h | 31 +++++++++++++++++++++++++++---- + 1 files changed, 27 insertions(+), 4 deletions(-) +Merging powerpc/next (7680057 powerpc: Don't try OPAL takeover on old 970 blades) +$ git merge powerpc/next +Resolved 'arch/powerpc/include/asm/udbg.h' using previous resolution. +Resolved 'arch/powerpc/kernel/udbg.c' using previous resolution. +Resolved 'drivers/tty/serial/8250.c' using previous resolution. +Auto-merging kernel/sched.c +Auto-merging include/linux/dma-mapping.h +Auto-merging drivers/tty/serial/8250.c +CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c +Auto-merging drivers/tty/hvc/hvcs.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.h +Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_net.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/powerpc/platforms/85xx/Kconfig +Removing arch/powerpc/platforms/40x/hcu4.c +Auto-merging arch/powerpc/platforms/40x/Kconfig +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/kernel/udbg.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/udbg.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h +Auto-merging arch/powerpc/configs/ppc40x_defconfig +CONFLICT (modify/delete): arch/powerpc/configs/40x/hcu4_defconfig deleted in powerpc/next and modified in HEAD. Version HEAD of arch/powerpc/configs/40x/hcu4_defconfig left in tree. +Removing arch/powerpc/boot/dts/hcu4.dts +Auto-merging arch/powerpc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig +arch/powerpc/configs/40x/hcu4_defconfig: needs merge +arch/powerpc/include/asm/udbg.h: needs merge +arch/powerpc/kernel/udbg.c: needs merge +drivers/tty/serial/8250.c: needs merge +rm 'arch/powerpc/configs/40x/hcu4_defconfig' +$ git commit -v -a +[master 69674ce] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 7 +- + arch/powerpc/Kconfig.debug | 46 +- + arch/powerpc/boot/Makefile | 3 +- + arch/powerpc/boot/dts/digsy_mtc.dts | 59 +- + arch/powerpc/boot/dts/hcu4.dts | 168 --- + arch/powerpc/boot/dts/mpc5200b.dtsi | 2 + + arch/powerpc/boot/dts/yosemite.dts | 36 + + arch/powerpc/configs/40x/hcu4_defconfig | 81 -- + arch/powerpc/configs/85xx/p1023rds_defconfig | 2 +- + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 2 +- + arch/powerpc/configs/mpc512x_defconfig | 19 +- + arch/powerpc/configs/mpc5200_defconfig | 12 + + arch/powerpc/configs/mpc85xx_defconfig | 2 +- + arch/powerpc/configs/mpc85xx_smp_defconfig | 2 +- + arch/powerpc/configs/ppc40x_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 2 +- + arch/powerpc/include/asm/device.h | 2 + + arch/powerpc/include/asm/firmware.h | 10 + + arch/powerpc/include/asm/hugetlb.h | 63 ++- + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/include/asm/machdep.h | 3 +- + arch/powerpc/include/asm/mmu-book3e.h | 7 + + arch/powerpc/include/asm/mmu-hash64.h | 3 +- + arch/powerpc/include/asm/mmu.h | 18 +- + arch/powerpc/include/asm/mpic.h | 2 - + arch/powerpc/include/asm/opal.h | 443 ++++++++ + arch/powerpc/include/asm/paca.h | 8 + + arch/powerpc/include/asm/page.h | 31 +- + arch/powerpc/include/asm/page_64.h | 11 - + arch/powerpc/include/asm/pte-book3e.h | 3 + + arch/powerpc/include/asm/rtas.h | 6 +- + arch/powerpc/include/asm/smp.h | 1 + + arch/powerpc/include/asm/sparsemem.h | 2 +- + arch/powerpc/include/asm/topology.h | 14 +- + arch/powerpc/include/asm/udbg.h | 3 + + arch/powerpc/include/asm/xics.h | 19 + + arch/powerpc/kernel/asm-offsets.c | 10 + + arch/powerpc/kernel/dma-iommu.c | 28 +- + arch/powerpc/kernel/dma-swiotlb.c | 16 + + arch/powerpc/kernel/dma.c | 44 +- + arch/powerpc/kernel/exceptions-64s.S | 27 +- + arch/powerpc/kernel/head_32.S | 7 +- + arch/powerpc/kernel/head_40x.S | 15 +- + arch/powerpc/kernel/head_44x.S | 16 +- + arch/powerpc/kernel/head_64.S | 22 +- + arch/powerpc/kernel/head_8xx.S | 13 +- + arch/powerpc/kernel/head_fsl_booke.S | 175 +++- + arch/powerpc/kernel/ibmebus.c | 22 +- + arch/powerpc/kernel/iommu.c | 8 + + arch/powerpc/kernel/legacy_serial.c | 25 + + arch/powerpc/kernel/machine_kexec_64.c | 3 +- + arch/powerpc/kernel/misc_32.S | 171 +++ + arch/powerpc/kernel/pci-common.c | 11 + + arch/powerpc/kernel/power6-pmu.c | 4 +- + arch/powerpc/kernel/power7-pmu.c | 2 + + arch/powerpc/kernel/prom.c | 14 + + arch/powerpc/kernel/prom_init.c | 383 ++++++- + arch/powerpc/kernel/prom_init_check.sh | 4 +- + arch/powerpc/kernel/ptrace.c | 18 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 22 +- + arch/powerpc/kernel/smp.c | 30 +- + arch/powerpc/kernel/swsusp.c | 2 +- + arch/powerpc/kernel/udbg.c | 6 + + arch/powerpc/kernel/vio.c | 21 +- + arch/powerpc/mm/Makefile | 1 + + arch/powerpc/mm/hash_utils_64.c | 9 +- + arch/powerpc/mm/hugetlbpage-book3e.c | 121 +++ + arch/powerpc/mm/hugetlbpage.c | 379 ++++++- + arch/powerpc/mm/init_32.c | 9 + + arch/powerpc/mm/mem.c | 8 +- + arch/powerpc/mm/mmu_context_hash64.c | 12 +- + arch/powerpc/mm/mmu_context_nohash.c | 5 + + arch/powerpc/mm/numa.c | 20 +- + arch/powerpc/mm/pgtable.c | 3 +- + arch/powerpc/mm/tlb_low_64e.S | 24 +- + arch/powerpc/mm/tlb_nohash.c | 46 +- + arch/powerpc/platforms/40x/Kconfig | 8 - + arch/powerpc/platforms/40x/Makefile | 1 - + arch/powerpc/platforms/40x/hcu4.c | 61 -- + arch/powerpc/platforms/512x/Kconfig | 1 + + arch/powerpc/platforms/83xx/Kconfig | 9 +- + arch/powerpc/platforms/85xx/Kconfig | 12 +- + arch/powerpc/platforms/86xx/Kconfig | 1 + + arch/powerpc/platforms/Kconfig | 11 +- + arch/powerpc/platforms/Kconfig.cputype | 4 +- + arch/powerpc/platforms/Makefile | 1 + + arch/powerpc/platforms/cell/iommu.c | 21 + + arch/powerpc/platforms/powernv/Kconfig | 16 + + arch/powerpc/platforms/powernv/Makefile | 5 + + arch/powerpc/platforms/powernv/opal-nvram.c | 88 ++ + arch/powerpc/platforms/powernv/opal-rtc.c | 97 ++ + arch/powerpc/platforms/powernv/opal-takeover.S | 140 +++ + arch/powerpc/platforms/powernv/opal-wrappers.S | 101 ++ + arch/powerpc/platforms/powernv/opal.c | 322 ++++++ + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 234 ++++ + arch/powerpc/platforms/powernv/pci.c | 427 ++++++++ + arch/powerpc/platforms/powernv/pci.h | 48 + + arch/powerpc/platforms/powernv/powernv.h | 16 + + arch/powerpc/platforms/powernv/setup.c | 196 ++++ + arch/powerpc/platforms/powernv/smp.c | 182 ++++ + arch/powerpc/platforms/ps3/Kconfig | 12 + + arch/powerpc/platforms/ps3/Makefile | 1 + + arch/powerpc/platforms/ps3/gelic_udbg.c | 273 +++++ + arch/powerpc/platforms/ps3/system-bus.c | 7 + + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/powerpc/platforms/pseries/dlpar.c | 4 + + arch/powerpc/platforms/pseries/eeh.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 34 +- + arch/powerpc/platforms/pseries/nvram.c | 171 +++- + arch/powerpc/platforms/wsp/Kconfig | 11 +- + arch/powerpc/platforms/wsp/Makefile | 2 + + arch/powerpc/platforms/wsp/ics.c | 48 + + arch/powerpc/platforms/wsp/ics.h | 5 + + arch/powerpc/platforms/wsp/msi.c | 102 ++ + arch/powerpc/platforms/wsp/msi.h | 19 + + arch/powerpc/platforms/wsp/psr2.c | 4 + + arch/powerpc/platforms/wsp/wsp.h | 3 + + arch/powerpc/platforms/wsp/wsp_pci.c | 1133 ++++++++++++++++++++ + arch/powerpc/platforms/wsp/wsp_pci.h | 268 +++++ + arch/powerpc/sysdev/Makefile | 1 - + arch/powerpc/sysdev/mpic.c | 24 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 101 ++- + arch/powerpc/sysdev/ppc4xx_pci.h | 12 + + arch/powerpc/sysdev/xics/Makefile | 1 + + arch/powerpc/sysdev/xics/icp-native.c | 2 +- + arch/powerpc/sysdev/xics/ics-opal.c | 244 +++++ + arch/powerpc/sysdev/xics/xics-common.c | 8 +- + arch/powerpc/xmon/xmon.c | 4 +- + drivers/edac/cpc925_edac.c | 67 ++- + drivers/edac/ppc4xx_edac.c | 2 +- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + .../mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c | 0 + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 3 + + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 6 + + drivers/of/fdt.c | 7 +- + drivers/tty/hvc/Kconfig | 9 + + drivers/tty/hvc/Makefile | 1 + + drivers/tty/hvc/hvc_opal.c | 424 ++++++++ + drivers/tty/hvc/hvcs.c | 6 +- + drivers/tty/hvc/hvsi_lib.c | 4 +- + drivers/tty/serial/8250.c | 23 - + include/linux/dma-mapping.h | 3 + + include/linux/topology.h | 4 + + kernel/sched.c | 2 - + 146 files changed, 7176 insertions(+), 746 deletions(-) + delete mode 100644 arch/powerpc/boot/dts/hcu4.dts + delete mode 100644 arch/powerpc/configs/40x/hcu4_defconfig + create mode 100644 arch/powerpc/include/asm/opal.h + create mode 100644 arch/powerpc/mm/hugetlbpage-book3e.c + delete mode 100644 arch/powerpc/platforms/40x/hcu4.c + create mode 100644 arch/powerpc/platforms/powernv/Kconfig + create mode 100644 arch/powerpc/platforms/powernv/Makefile + create mode 100644 arch/powerpc/platforms/powernv/opal-nvram.c + create mode 100644 arch/powerpc/platforms/powernv/opal-rtc.c + create mode 100644 arch/powerpc/platforms/powernv/opal-takeover.S + create mode 100644 arch/powerpc/platforms/powernv/opal-wrappers.S + create mode 100644 arch/powerpc/platforms/powernv/opal.c + create mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c + create mode 100644 arch/powerpc/platforms/powernv/pci.c + create mode 100644 arch/powerpc/platforms/powernv/pci.h + create mode 100644 arch/powerpc/platforms/powernv/powernv.h + create mode 100644 arch/powerpc/platforms/powernv/setup.c + create mode 100644 arch/powerpc/platforms/powernv/smp.c + create mode 100644 arch/powerpc/platforms/ps3/gelic_udbg.c + create mode 100644 arch/powerpc/platforms/wsp/msi.c + create mode 100644 arch/powerpc/platforms/wsp/msi.h + create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.c + create mode 100644 arch/powerpc/platforms/wsp/wsp_pci.h + create mode 100644 arch/powerpc/sysdev/xics/ics-opal.c + rename arch/powerpc/sysdev/mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c (100%) + create mode 100644 drivers/tty/hvc/hvc_opal.c +Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board) +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex/powerpc/next +Merge made by the 'recursive' strategy. + 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 (96cc017 powerpc/p3060qds: Add support for P3060QDS board) +$ git merge galak/next +Auto-merging arch/powerpc/platforms/85xx/p2041_rdb.c +Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c +Auto-merging arch/powerpc/platforms/85xx/Kconfig +Auto-merging arch/powerpc/boot/dts/p2041si.dtsi +Auto-merging arch/powerpc/boot/dts/p2041rdb.dts +Merge made by the 'recursive' strategy. + .../devicetree/bindings/powerpc/fsl/board.txt | 30 +- + .../devicetree/bindings/powerpc/fsl/dcsr.txt | 395 +++++++++++ + .../devicetree/bindings/powerpc/fsl/msi-pic.txt | 42 ++ + arch/powerpc/boot/dts/gef_ppc9a.dts | 33 +- + arch/powerpc/boot/dts/gef_sbc310.dts | 33 +- + arch/powerpc/boot/dts/gef_sbc610.dts | 33 +- + arch/powerpc/boot/dts/ksi8560.dts | 2 +- + arch/powerpc/boot/dts/mgcoge.dts | 9 + + arch/powerpc/boot/dts/mpc8349emitx.dts | 3 +- + arch/powerpc/boot/dts/p1022ds.dts | 2 +- + arch/powerpc/boot/dts/p2020ds.dts | 5 + + .../boot/dts/{p2040rdb.dts => p2041rdb.dts} | 17 +- + .../boot/dts/{p2040si.dtsi => p2041si.dtsi} | 135 +++- + arch/powerpc/boot/dts/p3041ds.dts | 8 +- + arch/powerpc/boot/dts/p3041si.dtsi | 71 ++- + arch/powerpc/boot/dts/p3060qds.dts | 238 +++++++ + arch/powerpc/boot/dts/p3060si.dtsi | 719 ++++++++++++++++++++ + arch/powerpc/boot/dts/p4080ds.dts | 12 +- + arch/powerpc/boot/dts/p4080si.dtsi | 114 +++- + arch/powerpc/boot/dts/p5020ds.dts | 8 +- + arch/powerpc/boot/dts/p5020si.dtsi | 68 ++- + arch/powerpc/boot/dts/sbc8560.dts | 2 +- + arch/powerpc/configs/corenet32_smp_defconfig | 11 +- + arch/powerpc/configs/corenet64_smp_defconfig | 5 - + arch/powerpc/configs/mgcoge_defconfig | 27 +- + arch/powerpc/configs/mpc85xx_defconfig | 5 +- + arch/powerpc/configs/mpc85xx_smp_defconfig | 6 +- + arch/powerpc/include/asm/reg_booke.h | 3 + + arch/powerpc/kernel/head_fsl_booke.S | 4 +- + arch/powerpc/kernel/idle_e500.S | 2 +- + arch/powerpc/kernel/prom.c | 5 +- + arch/powerpc/kernel/traps.c | 9 +- + arch/powerpc/math-emu/math_efp.c | 100 ++-- + arch/powerpc/mm/fsl_booke_mmu.c | 43 +- + arch/powerpc/mm/mmu_decl.h | 2 + + arch/powerpc/mm/tlb_nohash.c | 21 +- + arch/powerpc/platforms/82xx/km82xx.c | 4 + + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 58 ++- + arch/powerpc/platforms/85xx/Kconfig | 18 +- + arch/powerpc/platforms/85xx/Makefile | 3 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 11 +- + .../platforms/85xx/{p2040_rdb.c => p2041_rdb.c} | 18 +- + arch/powerpc/platforms/85xx/p3060_qds.c | 77 +++ + arch/powerpc/platforms/85xx/sbc8560.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 12 +- + arch/powerpc/platforms/Kconfig | 2 +- + arch/powerpc/sysdev/cpm_common.c | 3 +- + arch/powerpc/sysdev/fsl_msi.c | 28 +- + arch/powerpc/sysdev/fsl_msi.h | 3 +- + arch/powerpc/sysdev/mpic.c | 10 + + drivers/gpio/gpio-mpc8xxx.c | 3 + + drivers/virt/fsl_hypervisor.c | 1 + + 52 files changed, 2238 insertions(+), 237 deletions(-) + create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt + rename arch/powerpc/boot/dts/{p2040rdb.dts => p2041rdb.dts} (95%) + rename arch/powerpc/boot/dts/{p2040si.dtsi => p2041si.dtsi} (80%) + create mode 100644 arch/powerpc/boot/dts/p3060qds.dts + create mode 100644 arch/powerpc/boot/dts/p3060si.dtsi + rename arch/powerpc/platforms/85xx/{p2040_rdb.c => p2041_rdb.c} (82%) + create mode 100644 arch/powerpc/platforms/85xx/p3060_qds.c +Merging s390/features (74ea17f [S390] add support for physical memory > 4TB) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/pgtable.h | 23 +------ + arch/s390/include/asm/sparsemem.h | 4 +- + arch/s390/include/asm/unistd.h | 4 +- + arch/s390/kernel/compat_wrapper.S | 20 ++++++ + arch/s390/kernel/mem_detect.c | 122 ++++++++++++++++++++----------------- + arch/s390/kernel/setup.c | 68 ++++++++++++++++----- + arch/s390/kernel/syscalls.S | 2 + + arch/s390/mm/init.c | 16 +++-- + arch/s390/mm/pgtable.c | 11 --- + 9 files changed, 160 insertions(+), 110 deletions(-) +Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest) +$ git merge sh/sh-latest +Already up-to-date. +Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest) +$ git merge rmobile/rmobile-latest +Merge made by the 'recursive' strategy. + arch/arm/mach-shmobile/include/mach/sh73a0.h | 13 ++++ + arch/arm/mach-shmobile/pfc-sh73a0.c | 77 +++++++++++++++++++++----- + 2 files changed, 75 insertions(+), 15 deletions(-) +Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (0124538 nfs: fix a couple of minor portability issues) +$ git merge tile/master +Resolved 'arch/tile/kernel/intvec_32.S' using previous resolution. +Auto-merging fs/nfs/nfs4filelayout.c +Auto-merging arch/tile/lib/atomic_asm_32.S +CONFLICT (content): Merge conflict in arch/tile/lib/atomic_asm_32.S +Auto-merging arch/tile/kernel/intvec_32.S +CONFLICT (content): Merge conflict in arch/tile/kernel/intvec_32.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/tile/lib/atomic_asm_32.S'. +[master 670946d] Merge remote-tracking branch 'tile/master' +$ git diff -M --stat --summary HEAD^.. + fs/nfs/nfs4filelayout.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/boot/compressed/Makefile | 4 ++-- + arch/unicore32/include/asm/bitops.h | 12 ++++++------ + arch/unicore32/kernel/ksyms.c | 4 ++-- + arch/unicore32/lib/findbit.S | 14 ++++++++------ + 4 files changed, 18 insertions(+), 16 deletions(-) +Merging xtensa/master (29aced6 xtensa: remove defining register numbers) +$ git merge xtensa/master +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/irqflags.h | 1 + + arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++--------------- + arch/xtensa/include/asm/timex.h | 4 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + arch/xtensa/kernel/align.S | 14 +++--- + arch/xtensa/kernel/coprocessor.S | 10 ++-- + arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------ + arch/xtensa/kernel/head.S | 12 ++-- + arch/xtensa/kernel/irq.c | 5 ++ + arch/xtensa/kernel/traps.c | 4 +- + arch/xtensa/kernel/vectors.S | 22 ++++---- + arch/xtensa/kernel/vmlinux.lds.S | 1 + + 12 files changed, 139 insertions(+), 125 deletions(-) +Merging ceph/for-next (3395734 libceph: fix double-free of page vector) +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master (9ef5992 cifs: Assume passwords are encoded according to iocharset (try #2)) +$ git merge cifs/master +Merge made by the 'recursive' strategy. + fs/cifs/cifsencrypt.c | 8 +++--- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsproto.h | 8 ++++-- + fs/cifs/connect.c | 2 +- + fs/cifs/file.c | 11 ++++++-- + fs/cifs/sess.c | 2 +- + fs/cifs/smbencrypt.c | 63 +++++++++--------------------------------------- + 7 files changed, 32 insertions(+), 64 deletions(-) +Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (f2a4452 jbd2: Unify log messages in jbd2 code) +$ git merge ext4/dev +Already up-to-date. +Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.) +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (809a4fa GFS2: Move readahead of metadata during deallocation into its own function) +$ git merge gfs2/master +Resolved 'fs/gfs2/file.c' using previous resolution. +Auto-merging fs/gfs2/file.c +CONFLICT (content): Merge conflict in fs/gfs2/file.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4335dab] Merge remote-tracking branch 'gfs2/master' +$ git diff -M --stat --summary HEAD^.. +Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors) +$ git merge hfsplus/for-next +Already up-to-date. +Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes) +$ git merge jfs/next +Already up-to-date. +Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs) +$ git merge logfs/master +Resolved 'fs/logfs/file.c' using previous resolution. +Auto-merging fs/logfs/super.c +Auto-merging fs/logfs/readwrite.c +Auto-merging fs/logfs/logfs.h +Auto-merging fs/logfs/inode.c +Auto-merging fs/logfs/file.c +CONFLICT (content): Merge conflict in fs/logfs/file.c +Auto-merging fs/logfs/dir.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ecc3d8d] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + fs/logfs/dev_mtd.c | 26 ++++++++++++-------------- + fs/logfs/dir.c | 2 +- + fs/logfs/file.c | 2 ++ + fs/logfs/inode.c | 4 +++- + fs/logfs/journal.c | 1 - + fs/logfs/logfs.h | 5 ++++- + fs/logfs/readwrite.c | 22 ++++++++++++---------- + fs/logfs/segment.c | 14 ++++++++++---- + fs/logfs/super.c | 3 ++- + 10 files changed, 47 insertions(+), 33 deletions(-) +Merging nfs/linux-next (31cbecb Merge branch 'osd-devel' into nfs-for-next) +$ git merge nfs/linux-next +Auto-merging fs/nfs/nfs4filelayout.c +Merge made by the 'recursive' strategy. + fs/exofs/Kconfig | 2 +- + fs/nfs/callback_xdr.c | 11 +- + fs/nfs/file.c | 9 +- + fs/nfs/nfs4filelayout.c | 7 +- + fs/nfs/nfs4proc.c | 6 + + fs/nfs/nfs4xdr.c | 2 - + fs/nfs/objlayout/objio_osd.c | 872 ++++++++++-------------------------------- + fs/nfs/objlayout/objlayout.c | 209 ++++------- + fs/nfs/objlayout/objlayout.h | 48 ++-- + fs/nfs/pagelist.c | 2 +- + fs/nfs/pnfs.c | 25 +- + fs/nfs/write.c | 3 +- + fs/nfsd/nfssvc.c | 2 + + include/linux/nfs_fs.h | 1 + + include/linux/sunrpc/clnt.h | 2 + + include/linux/sunrpc/svc.h | 1 + + net/sunrpc/auth_unix.c | 3 + + net/sunrpc/rpcb_clnt.c | 88 +++-- + net/sunrpc/sunrpc_syms.c | 3 - + net/sunrpc/svc.c | 48 +++- + 20 files changed, 456 insertions(+), 888 deletions(-) +Merging nfsd/nfsd-next (fc0d14f nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2) +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it) +$ git merge ocfs2/linux-next +Resolved 'fs/ocfs2/xattr.c' using previous resolution. +Auto-merging fs/ocfs2/xattr.c +CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c +Auto-merging fs/ocfs2/move_extents.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/dir.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9e2912d] Merge remote-tracking branch 'ocfs2/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/ocfs2/aops.c | 69 +++++++++++++-- + fs/ocfs2/aops.h | 14 +++ + fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++---------------- + fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++------- + fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++-------------- + fs/ocfs2/cluster/tcp.h | 2 + + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlm/dlmcommon.h | 56 +++---------- + fs/ocfs2/dlm/dlmdomain.c | 44 +++++----- + fs/ocfs2/dlm/dlmlock.c | 54 ++++++------ + fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++------------------- + fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------ + fs/ocfs2/dlm/dlmthread.c | 16 ++-- + fs/ocfs2/dlmglue.c | 21 +++-- + fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++ + fs/ocfs2/extent_map.h | 2 + + fs/ocfs2/file.c | 93 ++++++++++++++++++++- + fs/ocfs2/inode.h | 3 + + fs/ocfs2/ioctl.c | 8 +- + fs/ocfs2/journal.c | 23 +++++- + fs/ocfs2/mmap.c | 53 +++++------ + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/ocfs2.h | 4 +- + fs/ocfs2/quota_local.c | 13 ++- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++-- + fs/ocfs2/super.c | 23 +++-- + 27 files changed, 926 insertions(+), 521 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K) +$ git merge squashfs/master +Auto-merging fs/squashfs/Kconfig +Merge made by the 'recursive' strategy. + fs/squashfs/Kconfig | 22 ++++++++++++++++++++++ + fs/squashfs/squashfs_fs.h | 7 +++++++ + fs/squashfs/super.c | 2 +- + 3 files changed, 30 insertions(+), 1 deletions(-) +Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (7606f85 UBIFS: fix the dark space calculation) +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/debug.h +Merge made by the 'recursive' strategy. + fs/ubifs/debug.c | 16 ++++++++++++++++ + fs/ubifs/debug.h | 5 +++++ + fs/ubifs/recovery.c | 2 +- + fs/ubifs/sb.c | 2 +- + 4 files changed, 23 insertions(+), 2 deletions(-) +Merging xfs/master (9e4c109 xfs: add AIL pushing tracepoints) +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check) +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again) +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next (44258a5 PCI: Fix PRI and PASID consistency) +$ git merge pci/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 18 +++++ + drivers/pci/ats.c | 20 +++--- + drivers/pci/msi.c | 111 +++++++++++++++++++++++++++++++ + include/linux/msi.h | 3 + + include/linux/pci.h | 1 + + include/linux/pci_regs.h | 4 +- + 6 files changed, 145 insertions(+), 12 deletions(-) +Merging hid/for-next (30307c6 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c (839d881 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging) +$ git merge quilt/i2c +Already up-to-date. +Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge) +$ git merge bjdooks-i2c/next-i2c +Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution. +Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c +CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 46571fd] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/jdelvare-hwmon (a1933c5 hwmon: Use i2c_smbus_{read,write}_word_swapped) +$ git merge quilt/jdelvare-hwmon +Auto-merging drivers/hwmon/ibmaem.c +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 15 ++++- + drivers/hwmon/ad7414.c | 7 +- + drivers/hwmon/ad7418.c | 27 +++------ + drivers/hwmon/ads1015.c | 21 +----- + drivers/hwmon/ads7828.c | 12 +--- + drivers/hwmon/asb100.c | 10 ++-- + drivers/hwmon/ds1621.c | 24 +------ + drivers/hwmon/ds620.c | 42 +++---------- + drivers/hwmon/gl518sm.c | 4 +- + drivers/hwmon/gl520sm.c | 4 +- + drivers/hwmon/ibmaem.c | 60 ++++++++++-------- + drivers/hwmon/jc42.c | 52 ++++++---------- + drivers/hwmon/lm73.c | 30 +++++++--- + drivers/hwmon/lm75.c | 9 +-- + drivers/hwmon/lm77.c | 4 +- + drivers/hwmon/lm90.c | 146 +++++++++++++++++++++---------------------- + drivers/hwmon/lm92.c | 26 ++++---- + drivers/hwmon/max16065.c | 4 +- + drivers/hwmon/sht21.c | 26 +------- + drivers/hwmon/smm665.c | 15 +--- + drivers/hwmon/smsc47b397.c | 13 +++-- + drivers/hwmon/tmp102.c | 44 +++++-------- + drivers/hwmon/w83781d.c | 10 ++-- + 23 files changed, 259 insertions(+), 346 deletions(-) +Merging hwmon-staging/hwmon-next (c5794cf hwmon: (w83627ehf) Better fix for negative temperature values) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging quilt/kernel-doc (b814f03 Documentation/PCI/pci.txt: fix a reference doc name) +$ git merge quilt/kernel-doc +Resolved 'Documentation/PCI/pci.txt' using previous resolution. +Auto-merging Documentation/laptops/thinkpad-acpi.txt +Auto-merging Documentation/PCI/pci.txt +CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f4c933b] Merge branch 'quilt/kernel-doc' +$ git diff -M --stat --summary HEAD^.. + Documentation/CodingStyle | 4 ++-- + Documentation/PCI/pci.txt | 4 ++-- + Documentation/block/switching-sched.txt | 4 ++-- + Documentation/cgroups/cgroups.txt | 4 ++-- + Documentation/filesystems/hfs.txt | 9 ++++----- + Documentation/filesystems/inotify.txt | 3 ++- + Documentation/laptops/thinkpad-acpi.txt | 4 ++-- + Documentation/leds/leds-class.txt | 4 ++-- + Documentation/serial/computone.txt | 2 -- + 9 files changed, 18 insertions(+), 20 deletions(-) +Merging docs/docs-move (c6f211c Merge ra.kernel.org:/pub/scm/linux/kernel/git/rdunlap/linux-docs into docs-move) +$ git merge docs/docs-move +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 308 +++++++++++++++++++++------------------ + drivers/gpu/drm/i915/i915_drv.c | 4 +- + 2 files changed, 170 insertions(+), 142 deletions(-) +Merging v4l-dvb/master (b3f4e1e [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set) +$ git merge v4l-dvb/master +Removing drivers/staging/cx25821/README +Auto-merging drivers/media/video/cx25821/cx25821.h +Auto-merging drivers/media/video/cx25821/cx25821-video.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/v4l/compat.xml | 3 + + Documentation/DocBook/media/v4l/controls.xml | 5 +- + Documentation/DocBook/media/v4l/io.xml | 27 + + Documentation/DocBook/media/v4l/v4l2.xml | 2 + + .../DocBook/media/v4l/vidioc-create-bufs.xml | 139 ++ + .../DocBook/media/v4l/vidioc-prepare-buf.xml | 88 + + arch/arm/mach-pxa/pcm990-baseboard.c | 4 +- + arch/arm/mach-shmobile/board-ap4evb.c | 2 +- + arch/arm/mach-shmobile/board-mackerel.c | 7 +- + arch/sh/boards/mach-ap325rxa/setup.c | 10 +- + arch/sh/boards/mach-migor/setup.c | 4 +- + drivers/dma/ipu/ipu_idmac.c | 65 +- + drivers/media/dvb/ddbridge/Makefile | 2 +- + drivers/media/dvb/dvb-usb/Makefile | 1 + + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + + drivers/media/dvb/dvb-usb/it913x.c | 105 +- + drivers/media/dvb/dvb-usb/mxl111sf-demod.c | 614 +++++++ + drivers/media/dvb/dvb-usb/mxl111sf-demod.h | 55 + + drivers/media/dvb/dvb-usb/mxl111sf.c | 228 +++- + drivers/media/dvb/dvb-usb/mxl111sf.h | 2 +- + drivers/media/dvb/ngene/Makefile | 2 +- + drivers/media/radio/radio-tea5764.c | 4 +- + drivers/media/video/Kconfig | 9 + + drivers/media/video/Makefile | 2 + + drivers/media/video/atmel-isi.c | 142 +- + drivers/media/video/cx18/cx18-driver.c | 2 + + drivers/{staging => media/video}/cx25821/Kconfig | 0 + drivers/{staging => media/video}/cx25821/Makefile | 0 + .../video}/cx25821/cx25821-alsa.c | 0 + .../video}/cx25821/cx25821-audio-upstream.c | 0 + .../video}/cx25821/cx25821-audio-upstream.h | 0 + .../video}/cx25821/cx25821-audio.h | 0 + .../video}/cx25821/cx25821-biffuncs.h | 0 + .../video}/cx25821/cx25821-cards.c | 0 + .../video}/cx25821/cx25821-core.c | 0 + .../video}/cx25821/cx25821-gpio.c | 0 + .../{staging => media/video}/cx25821/cx25821-i2c.c | 0 + .../video}/cx25821/cx25821-medusa-defines.h | 0 + .../video}/cx25821/cx25821-medusa-reg.h | 0 + .../video}/cx25821/cx25821-medusa-video.c | 0 + .../video}/cx25821/cx25821-medusa-video.h | 0 + .../{staging => media/video}/cx25821/cx25821-reg.h | 0 + .../video}/cx25821/cx25821-sram.h | 0 + .../video}/cx25821/cx25821-video-upstream-ch2.c | 0 + .../video}/cx25821/cx25821-video-upstream-ch2.h | 0 + .../video}/cx25821/cx25821-video-upstream.c | 0 + .../video}/cx25821/cx25821-video-upstream.h | 0 + .../video}/cx25821/cx25821-video.c | 2 +- + .../video}/cx25821/cx25821-video.h | 0 + drivers/{staging => media/video}/cx25821/cx25821.h | 3 +- + drivers/media/video/em28xx/em28xx-cards.c | 2 + + drivers/media/video/imx074.c | 54 +- + drivers/media/video/ivtv/ivtv-driver.c | 2 + + drivers/media/video/marvell-ccic/mcam-core.c | 3 +- + drivers/media/video/mem2mem_testdev.c | 7 +- + drivers/media/video/mt9m001.c | 328 ++--- + drivers/media/video/mt9m111.c | 260 +--- + drivers/media/video/mt9t031.c | 347 ++--- + drivers/media/video/mt9t112.c | 269 ++-- + drivers/media/video/mt9v022.c | 447 +++--- + drivers/media/video/mx1_camera.c | 71 +- + drivers/media/video/mx2_camera.c | 78 +- + drivers/media/video/mx3_camera.c | 359 ++--- + drivers/media/video/omap/omap_vout.c | 10 + + drivers/media/video/omap1_camera.c | 62 +- + drivers/media/video/omap3isp/isp.c | 3 + + drivers/media/video/omap3isp/ispccdc.c | 86 +- + drivers/media/video/omap3isp/ispccp2.c | 125 +- + drivers/media/video/omap3isp/ispcsi2.c | 91 +- + drivers/media/video/omap3isp/isph3a_aewb.c | 2 +- + drivers/media/video/omap3isp/isph3a_af.c | 2 +- + drivers/media/video/omap3isp/isphist.c | 2 +- + drivers/media/video/omap3isp/isppreview.c | 419 ++++-- + drivers/media/video/omap3isp/isppreview.h | 9 +- + drivers/media/video/omap3isp/ispreg.h | 3 - + drivers/media/video/omap3isp/ispresizer.c | 104 +- + drivers/media/video/omap3isp/ispstat.c | 52 +- + drivers/media/video/omap3isp/ispstat.h | 2 +- + drivers/media/video/omap3isp/ispvideo.c | 11 +- + drivers/media/video/omap3isp/ispvideo.h | 1 + + drivers/media/video/ov2640.c | 178 +-- + drivers/media/video/ov5642.c | 288 +++-- + drivers/media/video/ov6650.c | 504 ++---- + drivers/media/video/ov772x.c | 198 +-- + drivers/media/video/ov9640.c | 186 +-- + drivers/media/video/ov9640.h | 4 +- + drivers/media/video/ov9740.c | 151 +-- + drivers/media/video/pwc/pwc-if.c | 6 +- + drivers/media/video/pxa_camera.c | 140 +- + drivers/media/video/rj54n1cb0c.c | 223 +-- + drivers/media/video/s5k6aa.c | 1680 ++++++++++++++++++++ + drivers/media/video/s5p-fimc/fimc-capture.c | 6 +- + drivers/media/video/s5p-fimc/fimc-core.c | 6 +- + drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c | 4 +- + drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 7 +- + drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 5 +- + drivers/media/video/s5p-tv/mixer_video.c | 4 +- + drivers/media/video/saa7134/saa7134.h | 12 +- + drivers/media/video/sh_mobile_ceu_camera.c | 491 ++++--- + drivers/media/video/sh_mobile_csi2.c | 132 +- + drivers/media/video/soc_camera.c | 273 ++-- + drivers/media/video/soc_camera_platform.c | 45 +- + drivers/media/video/soc_mediabus.c | 33 + + drivers/media/video/tw9910.c | 268 ++-- + drivers/media/video/v4l2-compat-ioctl32.c | 76 +- + drivers/media/video/v4l2-ctrls.c | 1 + + drivers/media/video/v4l2-device.c | 36 +- + drivers/media/video/v4l2-ioctl.c | 36 + + drivers/media/video/videobuf2-core.c | 391 ++++- + drivers/media/video/vivi.c | 6 +- + drivers/staging/Kconfig | 16 +- + drivers/staging/Makefile | 8 +- + drivers/staging/cx25821/README | 6 - + drivers/staging/media/Kconfig | 37 + + drivers/staging/media/Makefile | 7 + + drivers/staging/media/as102/Kconfig | 7 + + drivers/staging/media/as102/Makefile | 6 + + drivers/staging/media/as102/as102_drv.c | 351 ++++ + drivers/staging/media/as102/as102_drv.h | 141 ++ + drivers/staging/media/as102/as102_fe.c | 603 +++++++ + drivers/staging/media/as102/as102_fw.c | 251 +++ + drivers/staging/media/as102/as102_fw.h | 42 + + drivers/staging/media/as102/as102_usb_drv.c | 478 ++++++ + drivers/staging/media/as102/as102_usb_drv.h | 59 + + drivers/staging/media/as102/as10x_cmd.c | 452 ++++++ + drivers/staging/media/as102/as10x_cmd.h | 540 +++++++ + drivers/staging/media/as102/as10x_cmd_cfg.c | 215 +++ + drivers/staging/media/as102/as10x_cmd_stream.c | 223 +++ + drivers/staging/media/as102/as10x_handle.h | 58 + + drivers/staging/media/as102/as10x_types.h | 198 +++ + drivers/staging/{ => media}/cxd2099/Kconfig | 0 + drivers/staging/{ => media}/cxd2099/Makefile | 0 + drivers/staging/{ => media}/cxd2099/TODO | 0 + drivers/staging/{ => media}/cxd2099/cxd2099.c | 0 + drivers/staging/{ => media}/cxd2099/cxd2099.h | 0 + drivers/staging/{ => media}/dt3155v4l/Kconfig | 0 + drivers/staging/{ => media}/dt3155v4l/Makefile | 0 + drivers/staging/{ => media}/dt3155v4l/dt3155v4l.c | 0 + drivers/staging/{ => media}/dt3155v4l/dt3155v4l.h | 0 + drivers/staging/{ => media}/easycap/Kconfig | 0 + drivers/staging/{ => media}/easycap/Makefile | 0 + drivers/staging/{ => media}/easycap/README | 0 + drivers/staging/{ => media}/easycap/easycap.h | 0 + .../staging/{ => media}/easycap/easycap_ioctl.c | 0 + drivers/staging/{ => media}/easycap/easycap_low.c | 0 + drivers/staging/{ => media}/easycap/easycap_main.c | 0 + .../staging/{ => media}/easycap/easycap_settings.c | 0 + .../staging/{ => media}/easycap/easycap_sound.c | 0 + .../staging/{ => media}/easycap/easycap_testcard.c | 0 + drivers/staging/{ => media}/go7007/Kconfig | 0 + drivers/staging/{ => media}/go7007/Makefile | 0 + drivers/staging/{ => media}/go7007/README | 0 + drivers/staging/{ => media}/go7007/go7007-driver.c | 0 + drivers/staging/{ => media}/go7007/go7007-fw.c | 0 + drivers/staging/{ => media}/go7007/go7007-i2c.c | 0 + drivers/staging/{ => media}/go7007/go7007-priv.h | 0 + drivers/staging/{ => media}/go7007/go7007-usb.c | 0 + drivers/staging/{ => media}/go7007/go7007-v4l2.c | 0 + drivers/staging/{ => media}/go7007/go7007.h | 0 + drivers/staging/{ => media}/go7007/go7007.txt | 0 + drivers/staging/{ => media}/go7007/s2250-board.c | 0 + drivers/staging/{ => media}/go7007/s2250-loader.c | 0 + drivers/staging/{ => media}/go7007/s2250-loader.h | 0 + .../staging/{ => media}/go7007/saa7134-go7007.c | 0 + drivers/staging/{ => media}/go7007/snd-go7007.c | 0 + drivers/staging/{ => media}/go7007/wis-i2c.h | 0 + drivers/staging/{ => media}/go7007/wis-ov7640.c | 0 + drivers/staging/{ => media}/go7007/wis-saa7113.c | 0 + drivers/staging/{ => media}/go7007/wis-saa7115.c | 0 + .../staging/{ => media}/go7007/wis-sony-tuner.c | 0 + drivers/staging/{ => media}/go7007/wis-tw2804.c | 0 + drivers/staging/{ => media}/go7007/wis-tw9903.c | 0 + drivers/staging/{ => media}/go7007/wis-uda1342.c | 0 + drivers/staging/{ => media}/lirc/Kconfig | 0 + drivers/staging/{ => media}/lirc/Makefile | 0 + drivers/staging/{ => media}/lirc/TODO | 0 + drivers/staging/{ => media}/lirc/TODO.lirc_zilog | 0 + drivers/staging/{ => media}/lirc/lirc_bt829.c | 0 + drivers/staging/{ => media}/lirc/lirc_ene0100.h | 0 + .../staging/{ => media}/lirc/lirc_igorplugusb.c | 0 + drivers/staging/{ => media}/lirc/lirc_imon.c | 0 + drivers/staging/{ => media}/lirc/lirc_parallel.c | 0 + drivers/staging/{ => media}/lirc/lirc_parallel.h | 0 + drivers/staging/{ => media}/lirc/lirc_sasem.c | 0 + drivers/staging/{ => media}/lirc/lirc_serial.c | 0 + drivers/staging/{ => media}/lirc/lirc_sir.c | 0 + drivers/staging/{ => media}/lirc/lirc_ttusbir.c | 0 + drivers/staging/{ => media}/lirc/lirc_zilog.c | 0 + drivers/staging/{ => media}/solo6x10/Kconfig | 0 + drivers/staging/{ => media}/solo6x10/Makefile | 0 + drivers/staging/{ => media}/solo6x10/TODO | 0 + drivers/staging/{ => media}/solo6x10/core.c | 0 + drivers/staging/{ => media}/solo6x10/disp.c | 0 + drivers/staging/{ => media}/solo6x10/enc.c | 0 + drivers/staging/{ => media}/solo6x10/g723.c | 0 + drivers/staging/{ => media}/solo6x10/gpio.c | 0 + drivers/staging/{ => media}/solo6x10/i2c.c | 0 + drivers/staging/{ => media}/solo6x10/jpeg.h | 0 + drivers/staging/{ => media}/solo6x10/offsets.h | 0 + drivers/staging/{ => media}/solo6x10/osd-font.h | 0 + drivers/staging/{ => media}/solo6x10/p2m.c | 0 + drivers/staging/{ => media}/solo6x10/registers.h | 0 + drivers/staging/{ => media}/solo6x10/solo6x10.h | 0 + drivers/staging/{ => media}/solo6x10/tw28.c | 0 + drivers/staging/{ => media}/solo6x10/tw28.h | 0 + drivers/staging/{ => media}/solo6x10/v4l2-enc.c | 0 + drivers/staging/{ => media}/solo6x10/v4l2.c | 0 + include/linux/videodev2.h | 27 + + include/media/ov772x.h | 26 +- + include/media/s5k6aa.h | 51 + + include/media/soc_camera.h | 104 +- + include/media/soc_camera_platform.h | 4 +- + include/media/soc_mediabus.h | 2 + + include/media/v4l2-ioctl.h | 2 + + include/media/v4l2-subdev.h | 5 +- + include/media/videobuf2-core.h | 50 +- + 216 files changed, 10316 insertions(+), 3785 deletions(-) + create mode 100644 Documentation/DocBook/media/v4l/vidioc-create-bufs.xml + create mode 100644 Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml + create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-demod.c + create mode 100644 drivers/media/dvb/dvb-usb/mxl111sf-demod.h + rename drivers/{staging => media/video}/cx25821/Kconfig (100%) + rename drivers/{staging => media/video}/cx25821/Makefile (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-alsa.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-audio-upstream.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-audio-upstream.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-audio.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-biffuncs.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-cards.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-core.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-gpio.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-i2c.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-medusa-defines.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-medusa-reg.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-medusa-video.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-medusa-video.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-reg.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-sram.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream-ch2.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream-ch2.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream.c (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821-video.c (99%) + rename drivers/{staging => media/video}/cx25821/cx25821-video.h (100%) + rename drivers/{staging => media/video}/cx25821/cx25821.h (99%) + create mode 100644 drivers/media/video/s5k6aa.c + delete mode 100644 drivers/staging/cx25821/README + create mode 100644 drivers/staging/media/Kconfig + create mode 100644 drivers/staging/media/Makefile + create mode 100644 drivers/staging/media/as102/Kconfig + create mode 100644 drivers/staging/media/as102/Makefile + create mode 100644 drivers/staging/media/as102/as102_drv.c + create mode 100644 drivers/staging/media/as102/as102_drv.h + create mode 100644 drivers/staging/media/as102/as102_fe.c + create mode 100644 drivers/staging/media/as102/as102_fw.c + create mode 100644 drivers/staging/media/as102/as102_fw.h + create mode 100644 drivers/staging/media/as102/as102_usb_drv.c + create mode 100644 drivers/staging/media/as102/as102_usb_drv.h + create mode 100644 drivers/staging/media/as102/as10x_cmd.c + create mode 100644 drivers/staging/media/as102/as10x_cmd.h + create mode 100644 drivers/staging/media/as102/as10x_cmd_cfg.c + create mode 100644 drivers/staging/media/as102/as10x_cmd_stream.c + create mode 100644 drivers/staging/media/as102/as10x_handle.h + create mode 100644 drivers/staging/media/as102/as10x_types.h + rename drivers/staging/{ => media}/cxd2099/Kconfig (100%) + rename drivers/staging/{ => media}/cxd2099/Makefile (100%) + rename drivers/staging/{ => media}/cxd2099/TODO (100%) + rename drivers/staging/{ => media}/cxd2099/cxd2099.c (100%) + rename drivers/staging/{ => media}/cxd2099/cxd2099.h (100%) + rename drivers/staging/{ => media}/dt3155v4l/Kconfig (100%) + rename drivers/staging/{ => media}/dt3155v4l/Makefile (100%) + rename drivers/staging/{ => media}/dt3155v4l/dt3155v4l.c (100%) + rename drivers/staging/{ => media}/dt3155v4l/dt3155v4l.h (100%) + rename drivers/staging/{ => media}/easycap/Kconfig (100%) + rename drivers/staging/{ => media}/easycap/Makefile (100%) + rename drivers/staging/{ => media}/easycap/README (100%) + rename drivers/staging/{ => media}/easycap/easycap.h (100%) + rename drivers/staging/{ => media}/easycap/easycap_ioctl.c (100%) + rename drivers/staging/{ => media}/easycap/easycap_low.c (100%) + rename drivers/staging/{ => media}/easycap/easycap_main.c (100%) + rename drivers/staging/{ => media}/easycap/easycap_settings.c (100%) + rename drivers/staging/{ => media}/easycap/easycap_sound.c (100%) + rename drivers/staging/{ => media}/easycap/easycap_testcard.c (100%) + rename drivers/staging/{ => media}/go7007/Kconfig (100%) + rename drivers/staging/{ => media}/go7007/Makefile (100%) + rename drivers/staging/{ => media}/go7007/README (100%) + rename drivers/staging/{ => media}/go7007/go7007-driver.c (100%) + rename drivers/staging/{ => media}/go7007/go7007-fw.c (100%) + rename drivers/staging/{ => media}/go7007/go7007-i2c.c (100%) + rename drivers/staging/{ => media}/go7007/go7007-priv.h (100%) + rename drivers/staging/{ => media}/go7007/go7007-usb.c (100%) + rename drivers/staging/{ => media}/go7007/go7007-v4l2.c (100%) + rename drivers/staging/{ => media}/go7007/go7007.h (100%) + rename drivers/staging/{ => media}/go7007/go7007.txt (100%) + rename drivers/staging/{ => media}/go7007/s2250-board.c (100%) + rename drivers/staging/{ => media}/go7007/s2250-loader.c (100%) + rename drivers/staging/{ => media}/go7007/s2250-loader.h (100%) + rename drivers/staging/{ => media}/go7007/saa7134-go7007.c (100%) + rename drivers/staging/{ => media}/go7007/snd-go7007.c (100%) + rename drivers/staging/{ => media}/go7007/wis-i2c.h (100%) + rename drivers/staging/{ => media}/go7007/wis-ov7640.c (100%) + rename drivers/staging/{ => media}/go7007/wis-saa7113.c (100%) + rename drivers/staging/{ => media}/go7007/wis-saa7115.c (100%) + rename drivers/staging/{ => media}/go7007/wis-sony-tuner.c (100%) + rename drivers/staging/{ => media}/go7007/wis-tw2804.c (100%) + rename drivers/staging/{ => media}/go7007/wis-tw9903.c (100%) + rename drivers/staging/{ => media}/go7007/wis-uda1342.c (100%) + rename drivers/staging/{ => media}/lirc/Kconfig (100%) + rename drivers/staging/{ => media}/lirc/Makefile (100%) + rename drivers/staging/{ => media}/lirc/TODO (100%) + rename drivers/staging/{ => media}/lirc/TODO.lirc_zilog (100%) + rename drivers/staging/{ => media}/lirc/lirc_bt829.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_ene0100.h (100%) + rename drivers/staging/{ => media}/lirc/lirc_igorplugusb.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_imon.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_parallel.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_parallel.h (100%) + rename drivers/staging/{ => media}/lirc/lirc_sasem.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_serial.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_sir.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_ttusbir.c (100%) + rename drivers/staging/{ => media}/lirc/lirc_zilog.c (100%) + rename drivers/staging/{ => media}/solo6x10/Kconfig (100%) + rename drivers/staging/{ => media}/solo6x10/Makefile (100%) + rename drivers/staging/{ => media}/solo6x10/TODO (100%) + rename drivers/staging/{ => media}/solo6x10/core.c (100%) + rename drivers/staging/{ => media}/solo6x10/disp.c (100%) + rename drivers/staging/{ => media}/solo6x10/enc.c (100%) + rename drivers/staging/{ => media}/solo6x10/g723.c (100%) + rename drivers/staging/{ => media}/solo6x10/gpio.c (100%) + rename drivers/staging/{ => media}/solo6x10/i2c.c (100%) + rename drivers/staging/{ => media}/solo6x10/jpeg.h (100%) + rename drivers/staging/{ => media}/solo6x10/offsets.h (100%) + rename drivers/staging/{ => media}/solo6x10/osd-font.h (100%) + rename drivers/staging/{ => media}/solo6x10/p2m.c (100%) + rename drivers/staging/{ => media}/solo6x10/registers.h (100%) + rename drivers/staging/{ => media}/solo6x10/solo6x10.h (100%) + rename drivers/staging/{ => media}/solo6x10/tw28.c (100%) + rename drivers/staging/{ => media}/solo6x10/tw28.h (100%) + rename drivers/staging/{ => media}/solo6x10/v4l2-enc.c (100%) + rename drivers/staging/{ => media}/solo6x10/v4l2.c (100%) + create mode 100644 include/media/s5k6aa.h +Merging kbuild/for-next (57b742f Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Resolved 'drivers/net/ethernet/stmicro/stmmac/Kconfig' using previous resolution. +Auto-merging scripts/checkpatch.pl +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/net/ethernet/stmicro/stmmac/Kconfig +CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig +Auto-merging arch/x86/um/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/powerpc/platforms/wsp/Kconfig +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Auto-merging arch/powerpc/platforms/40x/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/openrisc/Kconfig +Removing arch/mips/powertv/asic/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/m32r/Kconfig +Auto-merging arch/arm/mach-at91/Kconfig +Auto-merging arch/alpha/Kconfig +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e1529e2] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Kbuild | 6 +- + Makefile | 4 +- + arch/alpha/Kconfig | 5 - + arch/arm/mach-at91/Kconfig | 6 - + arch/m32r/Kconfig | 7 - + arch/mips/Kconfig | 14 - + arch/mips/powertv/Kconfig | 2 - + arch/mips/powertv/asic/Kconfig | 28 -- + arch/openrisc/Kconfig | 12 - + arch/powerpc/Kconfig | 22 - + arch/powerpc/platforms/40x/Kconfig | 5 - + arch/powerpc/platforms/Kconfig.cputype | 8 - + arch/powerpc/platforms/embedded6xx/Kconfig | 4 - + arch/powerpc/platforms/prep/Kconfig | 9 - + arch/powerpc/platforms/wsp/Kconfig | 5 - + arch/score/Kconfig | 19 - + arch/sparc/Kconfig | 7 +- + arch/x86/Kconfig | 3 - + arch/x86/um/Kconfig | 3 - + drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 - + drivers/pci/Kconfig | 11 - + drivers/scsi/Kconfig | 14 - + samples/Kconfig | 6 - + scripts/Makefile.build | 2 +- + scripts/Makefile.lib | 4 + + scripts/basic/fixdep.c | 1 + + scripts/checkpatch.pl | 14 + + scripts/extract-vmlinux | 62 +++ + scripts/genksyms/genksyms.c | 3 +- + scripts/genksyms/genksyms.h | 4 +- + scripts/genksyms/lex.l | 8 + + scripts/genksyms/lex.lex.c_shipped | 12 +- + scripts/genksyms/parse.tab.c_shipped | 645 ++++++++++++++------------- + scripts/genksyms/parse.tab.h_shipped | 7 +- + scripts/genksyms/parse.y | 40 +- + scripts/kconfig/Makefile | 28 +-- + scripts/kconfig/confdata.c | 49 ++- + scripts/kconfig/lxdialog/textbox.c | 3 +- + scripts/kconfig/mconf.c | 86 +++-- + scripts/kconfig/menu.c | 13 +- + scripts/kconfig/nconf.c | 23 +- + scripts/kconfig/nconf.gui.c | 59 ++- + scripts/kconfig/nconf.h | 2 +- + scripts/kconfig/streamline_config.pl | 22 +- + scripts/tags.sh | 4 +- + 45 files changed, 656 insertions(+), 644 deletions(-) + delete mode 100644 arch/mips/powertv/asic/Kconfig + create mode 100755 scripts/extract-vmlinux +Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) +$ git merge kconfig/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging libata/NEXT (a0da191 pata_efar: fix register naming used in efar_set_piomode()) +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next (504255f Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/acpi (38c0a0c Merge branches 'apei', 'bz-13195' and 'doc' into acpi) +$ git merge acpi/acpi +Already up-to-date. +Merging idle-test/idle-test (a0bfa13 cpuidle: stop depending on pm_idle) +$ git merge idle-test/idle-test +Already up-to-date. +Merging powertools/tools-test (d30c4b7 tools/power turbostat: fit output into 80 columns on snb-ep) +$ git merge powertools/tools-test +Already up-to-date. +Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand") +$ git merge cpupowerutils/master +Already up-to-date. +Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (c3b92c8 Linux 3.1) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.) +$ git merge swiotlb/master +Resolved 'drivers/xen/swiotlb-xen.c' using previous resolution. +Auto-merging drivers/xen/swiotlb-xen.c +CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master edc50e8] Merge remote-tracking branch 'swiotlb/master' +$ git diff -M --stat --summary HEAD^.. +Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i') +$ git merge ibft/master +Merge made by the 'recursive' strategy. +Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev) +$ git merge scsi/master +Merge made by the 'recursive' strategy. + drivers/firmware/edd.c | 6 +- + drivers/scsi/bnx2fc/bnx2fc.h | 5 +- + drivers/scsi/bnx2fc/bnx2fc_els.c | 23 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 37 ++ + drivers/scsi/device_handler/scsi_dh.c | 10 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 3 +- + drivers/scsi/fcoe/fcoe.c | 13 +- + drivers/scsi/hosts.c | 9 +- + drivers/scsi/hpsa.c | 221 ++++++++- + drivers/scsi/hpsa.h | 10 +- + drivers/scsi/hpsa_cmd.h | 5 +- + drivers/scsi/ipr.c | 2 + + drivers/scsi/ipr.h | 1 + + drivers/scsi/isci/host.c | 23 +- + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/isci/port.c | 146 +++---- + drivers/scsi/isci/port.h | 6 +- + drivers/scsi/isci/probe_roms.h | 4 +- + drivers/scsi/isci/remote_device.c | 85 ---- + drivers/scsi/isci/remote_device.h | 5 +- + drivers/scsi/isci/request.c | 52 +-- + drivers/scsi/isci/request.h | 6 - + drivers/scsi/isci/task.c | 698 +++++++++------------------ + drivers/scsi/isci/task.h | 35 +-- + drivers/scsi/libfc/fc_exch.c | 7 +- + drivers/scsi/libfc/fc_lport.c | 100 ++-- + drivers/scsi/mpt2sas/mpi/mpi2.h | 11 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 153 ++++++- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 113 +++++- + drivers/scsi/mpt2sas/mpt2sas_base.c | 247 ++++++++-- + drivers/scsi/mpt2sas/mpt2sas_base.h | 32 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 67 ++- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 9 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 634 ++++++++++++++++++++------ + drivers/scsi/mvsas/mv_init.c | 10 + + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 2 +- + drivers/scsi/scsi_lib.c | 9 + + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/scsi_transport_iscsi.c | 2 +- + drivers/scsi/sd.c | 12 +- + drivers/scsi/sd.h | 6 - + drivers/scsi/st.c | 4 +- + include/linux/pci_ids.h | 2 + + 45 files changed, 1756 insertions(+), 1076 deletions(-) +Merging target-updates/for-next (2235007 target: add back error handling in transport_complete_task) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/target/iscsi/iscsi_target.c | 11 +++--- + drivers/target/loopback/tcm_loop.c | 23 ++++++++++++- + drivers/target/target_core_pscsi.c | 2 +- + drivers/target/target_core_tmr.c | 23 +++---------- + drivers/target/target_core_transport.c | 54 ++++++++++++++---------------- + drivers/target/tcm_fc/tcm_fc.h | 2 +- + drivers/target/tcm_fc/tfc_cmd.c | 3 +- + include/target/target_core_base.h | 1 - + include/target/target_core_fabric_ops.h | 7 +++- + include/target/target_core_transport.h | 1 - + 10 files changed, 67 insertions(+), 60 deletions(-) +Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1) +$ git merge target-merge/for-next-merge +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/Makefile | 1 + + drivers/infiniband/ulp/srpt/Kconfig | 12 + + drivers/infiniband/ulp/srpt/Makefile | 2 + + drivers/infiniband/ulp/srpt/ib_dm_mad.h | 139 ++ + drivers/infiniband/ulp/srpt/ib_srpt.c | 4081 +++++++++++++++++++++++++++++++ + drivers/infiniband/ulp/srpt/ib_srpt.h | 444 ++++ + 7 files changed, 4680 insertions(+), 0 deletions(-) + create mode 100644 drivers/infiniband/ulp/srpt/Kconfig + create mode 100644 drivers/infiniband/ulp/srpt/Makefile + create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h + create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c + create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h +Merging slave-dma/next (4598fc2 dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle) +$ git merge slave-dma/next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/dma/pl330.c +Merge made by the 'recursive' strategy. + drivers/dma/amba-pl08x.c | 381 ++++++++++++++++++++++++------------------- + drivers/dma/at_hdmac.c | 5 +- + drivers/dma/dw_dmac.c | 5 +- + drivers/dma/ep93xx_dma.c | 1 + + drivers/dma/imx-dma.c | 1 + + drivers/dma/imx-sdma.c | 1 + + drivers/dma/intel_mid_dma.c | 9 +- + drivers/dma/mpc512x_dma.c | 1 - + drivers/dma/pch_dma.c | 7 +- + drivers/dma/pl330.c | 2 - + drivers/dma/shdma.c | 129 ++++++++++----- + drivers/dma/shdma.h | 7 + + drivers/dma/timb_dma.c | 5 +- + drivers/tty/serial/sh-sci.c | 25 +-- + include/linux/amba/pl08x.h | 22 ++- + include/linux/serial_sci.h | 2 - + 16 files changed, 348 insertions(+), 255 deletions(-) +Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization) +$ git merge async_tx/next +Already up-to-date. +Merging net-next/master (8b3408f dp83640: free packet queues on remove) +$ git merge net-next/master +Already up-to-date. +Merging wireless-next/master (8b3408f dp83640: free packet queues on remove) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (e14f47b Bluetooth: Fix mgmt response when adapter goes down or is removed) +$ git merge bluetooth/master +Recorded preimage for 'include/net/bluetooth/bluetooth.h' +Resolved 'net/bluetooth/l2cap_sock.c' using previous resolution. +Auto-merging net/bluetooth/rfcomm/sock.c +Auto-merging net/bluetooth/l2cap_sock.c +CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c +Auto-merging include/net/bluetooth/bluetooth.h +CONFLICT (content): Merge conflict in include/net/bluetooth/bluetooth.h +Auto-merging drivers/bluetooth/btusb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/net/bluetooth/bluetooth.h'. +[master 35c1820] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/ath3k.c | 15 +- + drivers/bluetooth/bfusb.c | 4 +- + drivers/bluetooth/bluecard_cs.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 4 +- + drivers/bluetooth/btuart_cs.c | 4 +- + drivers/bluetooth/btusb.c | 16 +- + drivers/bluetooth/dtl1_cs.c | 4 +- + drivers/bluetooth/hci_vhci.c | 5 +- + include/net/bluetooth/bluetooth.h | 29 ++- + include/net/bluetooth/hci.h | 15 + + include/net/bluetooth/hci_core.h | 65 +++- + include/net/bluetooth/l2cap.h | 416 ++++++++++++++--- + include/net/bluetooth/mgmt.h | 2 - + net/bluetooth/bnep/core.c | 13 +- + net/bluetooth/cmtp/core.c | 13 +- + net/bluetooth/hci_conn.c | 67 +++- + net/bluetooth/hci_core.c | 289 +++++++++--- + net/bluetooth/hci_event.c | 32 ++- + net/bluetooth/hci_sysfs.c | 40 +- + net/bluetooth/hidp/core.c | 157 ++++--- + net/bluetooth/l2cap_core.c | 929 +++++++++++++++++++++++++++---------- + net/bluetooth/l2cap_sock.c | 90 +++- + net/bluetooth/mgmt.c | 104 +++-- + net/bluetooth/rfcomm/core.c | 65 ++- + net/bluetooth/rfcomm/sock.c | 2 + + net/bluetooth/rfcomm/tty.c | 45 +- + net/bluetooth/smp.c | 3 +- + 27 files changed, 1801 insertions(+), 631 deletions(-) +Merging mtd/master (3f30310 Merge git://git.infradead.org/mtd-2.6) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (48e546b mtd: tests: annotate as DANGEROUS in Kconfig) +$ git merge l2-mtd/master +Resolved 'arch/arm/mach-at91/board-afeb-9260v1.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-neocore926.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-rm9200dk.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-sam9g20ek.c' using previous resolution. +Resolved 'arch/arm/mach-at91/board-sam9m10g45ek.c' using previous resolution. +Resolved 'drivers/mtd/maps/lantiq-flash.c' using previous resolution. +Auto-merging fs/jffs2/fs.c +Auto-merging drivers/mtd/onenand/omap2.c +Removing drivers/mtd/nand/edb7312.c +Auto-merging drivers/mtd/nand/au1550nd.c +Auto-merging drivers/mtd/nand/atmel_nand.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/mtdchar.c +Auto-merging drivers/mtd/maps/lantiq-flash.c +CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c +Removing drivers/mtd/maps/edb7312.c +Removing drivers/mtd/maps/ceiva.c +Auto-merging drivers/mtd/Kconfig +Auto-merging arch/arm/mach-pxa/zylonite.c +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/littleton.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Auto-merging arch/arm/mach-orion5x/ts78xx-setup.c +Auto-merging arch/arm/mach-mmp/aspenite.c +Auto-merging arch/arm/mach-ep93xx/ts72xx.c +Auto-merging arch/arm/mach-davinci/board-tnetv107x-evm.c +Auto-merging arch/arm/mach-davinci/board-neuros-osd2.c +Auto-merging arch/arm/mach-davinci/board-mityomapl138.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm365-evm.c +Auto-merging arch/arm/mach-davinci/board-dm355-leopard.c +Auto-merging arch/arm/mach-davinci/board-dm355-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging arch/arm/mach-davinci/board-da830-evm.c +Auto-merging arch/arm/mach-at91/include/mach/board.h +Auto-merging arch/arm/mach-at91/board-yl-9200.c +Auto-merging arch/arm/mach-at91/board-usb-a926x.c +CONFLICT (modify/delete): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree. +Auto-merging arch/arm/mach-at91/board-snapper9260.c +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c +Auto-merging arch/arm/mach-at91/board-sam9g20ek.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c +Auto-merging arch/arm/mach-at91/board-sam9263ek.c +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-sam9260ek.c +Auto-merging arch/arm/mach-at91/board-sam9-l9260.c +Auto-merging arch/arm/mach-at91/board-rm9200dk.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c +Auto-merging arch/arm/mach-at91/board-qil-a9260.c +Auto-merging arch/arm/mach-at91/board-neocore926.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c +Auto-merging arch/arm/mach-at91/board-kb9202.c +Auto-merging arch/arm/mach-at91/board-cap9adk.c +Auto-merging arch/arm/mach-at91/board-cam60.c +Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-at91/board-usb-a9260.c +arch/arm/mach-at91/board-afeb-9260v1.c: needs merge +arch/arm/mach-at91/board-neocore926.c: needs merge +arch/arm/mach-at91/board-rm9200dk.c: needs merge +arch/arm/mach-at91/board-sam9g20ek.c: needs merge +arch/arm/mach-at91/board-sam9m10g45ek.c: needs merge +arch/arm/mach-at91/board-usb-a9260.c: needs merge +drivers/mtd/maps/lantiq-flash.c: needs merge +rm 'arch/arm/mach-at91/board-usb-a9260.c' +$ git commit -v -a +[master 1434a2b] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/mtdnand.tmpl | 19 +- + .../devicetree/bindings/mtd/atmel-dataflash.txt | 14 + + arch/arm/mach-at91/board-afeb-9260v1.c | 9 +- + arch/arm/mach-at91/board-cam60.c | 9 +- + arch/arm/mach-at91/board-cap9adk.c | 9 +- + arch/arm/mach-at91/board-kb9202.c | 9 +- + arch/arm/mach-at91/board-neocore926.c | 9 +- + arch/arm/mach-at91/board-qil-a9260.c | 9 +- + arch/arm/mach-at91/board-rm9200dk.c | 9 +- + arch/arm/mach-at91/board-sam9-l9260.c | 9 +- + arch/arm/mach-at91/board-sam9260ek.c | 9 +- + arch/arm/mach-at91/board-sam9261ek.c | 9 +- + arch/arm/mach-at91/board-sam9263ek.c | 9 +- + arch/arm/mach-at91/board-sam9g20ek.c | 9 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +- + arch/arm/mach-at91/board-sam9rlek.c | 9 +- + arch/arm/mach-at91/board-snapper9260.c | 10 +- + arch/arm/mach-at91/board-usb-a926x.c | 9 +- + arch/arm/mach-at91/board-yl-9200.c | 9 +- + arch/arm/mach-at91/include/mach/board.h | 3 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-mityomapl138.c | 3 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +- + arch/arm/mach-davinci/include/mach/nand.h | 4 +- + arch/arm/mach-ep93xx/ts72xx.c | 23 +- + arch/arm/mach-mmp/aspenite.c | 5 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 5 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +- + arch/arm/mach-pxa/littleton.c | 5 +- + arch/arm/mach-pxa/mxm8x10.c | 9 +- + arch/arm/mach-pxa/raumfeld.c | 5 +- + arch/arm/mach-pxa/zylonite.c | 5 +- + arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +- + arch/avr32/boards/atngw100/setup.c | 8 +- + arch/avr32/boards/atstk1000/atstk1002.c | 9 +- + arch/avr32/mach-at32ap/include/mach/board.h | 3 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- + drivers/mtd/Kconfig | 21 +- + drivers/mtd/Makefile | 2 +- + drivers/mtd/afs.c | 4 +- + drivers/mtd/ar7part.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 31 +- + drivers/mtd/chips/fwh_lock.h | 3 +- + drivers/mtd/chips/jedec_probe.c | 34 +- + drivers/mtd/cmdlinepart.c | 7 +- + drivers/mtd/devices/Kconfig | 13 +- + drivers/mtd/devices/Makefile | 3 + + drivers/mtd/devices/doc2000.c | 17 +- + drivers/mtd/devices/doc2001.c | 11 +- + drivers/mtd/devices/doc2001plus.c | 11 +- + drivers/mtd/devices/docecc.c | 2 +- + drivers/mtd/devices/docg3.c | 1114 ++++++++++++++ + drivers/mtd/devices/docg3.h | 297 ++++ + drivers/mtd/devices/docprobe.c | 5 - + drivers/mtd/devices/lart.c | 18 +- + drivers/mtd/devices/m25p80.c | 92 +- + drivers/mtd/devices/mtd_dataflash.c | 91 +- + drivers/mtd/devices/sst25l.c | 42 +- + drivers/mtd/ftl.c | 40 +- + drivers/mtd/inftlcore.c | 69 +- + drivers/mtd/inftlmount.c | 116 +- + drivers/mtd/maps/Kconfig | 26 - + drivers/mtd/maps/Makefile | 2 - + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 341 ---- + drivers/mtd/maps/dc21285.c | 9 +- + drivers/mtd/maps/edb7312.c | 134 -- + drivers/mtd/maps/gpio-addr-flash.c | 16 +- + drivers/mtd/maps/h720x-flash.c | 23 +- + drivers/mtd/maps/impa7.c | 28 +- + drivers/mtd/maps/intel_vr_nor.c | 7 +- + drivers/mtd/maps/ixp2000.c | 11 +- + drivers/mtd/maps/ixp4xx.c | 29 +- + drivers/mtd/maps/lantiq-flash.c | 17 +- + drivers/mtd/maps/latch-addr-flash.c | 24 +- + drivers/mtd/maps/pcmciamtd.c | 124 +- + drivers/mtd/maps/physmap.c | 38 +- + drivers/mtd/maps/physmap_of.c | 80 +- + drivers/mtd/maps/plat-ram.c | 23 +- + drivers/mtd/maps/pxa2xx-flash.c | 20 +- + drivers/mtd/maps/rbtx4939-flash.c | 24 +- + drivers/mtd/maps/sa1100-flash.c | 30 +- + drivers/mtd/maps/solutionengine.c | 30 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +- + drivers/mtd/mtd_blkdevs.c | 2 + + drivers/mtd/mtdblock.c | 18 +- + drivers/mtd/mtdchar.c | 162 ++- + drivers/mtd/mtdconcat.c | 10 +- + drivers/mtd/mtdcore.c | 70 +- + drivers/mtd/mtdcore.h | 3 + + drivers/mtd/mtdoops.c | 2 +- + drivers/mtd/mtdpart.c | 62 +- + drivers/mtd/mtdsuper.c | 20 +- + drivers/mtd/mtdswap.c | 31 +- + drivers/mtd/nand/Kconfig | 29 +- + drivers/mtd/nand/Makefile | 2 +- + drivers/mtd/nand/atmel_nand.c | 74 +- + drivers/mtd/nand/au1550nd.c | 29 +- + drivers/mtd/nand/autcpu12.c | 4 +- + drivers/mtd/nand/bcm_umi_nand.c | 57 +- + drivers/mtd/nand/cafe_nand.c | 21 +- + drivers/mtd/nand/cmx270_nand.c | 23 +- + drivers/mtd/nand/cs553x_nand.c | 15 +- + drivers/mtd/nand/davinci_nand.c | 39 +- + drivers/mtd/nand/denali.c | 6 +- + drivers/mtd/nand/diskonchip.c | 8 +- + drivers/mtd/nand/edb7312.c | 203 --- + drivers/mtd/nand/fsl_elbc_nand.c | 75 +- + drivers/mtd/nand/fsl_upm.c | 16 +- + drivers/mtd/nand/fsmc_nand.c | 77 +- + drivers/mtd/nand/gpmi-nand/Makefile | 3 + + drivers/mtd/nand/gpmi-nand/bch-regs.h | 84 + + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 1057 +++++++++++++ + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 1619 ++++++++++++++++++++ + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 273 ++++ + drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 172 +++ + drivers/mtd/nand/h1910.c | 19 +- + drivers/mtd/nand/jz4740_nand.c | 18 +- + drivers/mtd/nand/mpc5121_nfc.c | 22 +- + drivers/mtd/nand/mxc_nand.c | 37 +- + drivers/mtd/nand/nand_base.c | 1109 +++++++------- + drivers/mtd/nand/nand_bbt.c | 692 ++++----- + drivers/mtd/nand/nand_bch.c | 4 +- + drivers/mtd/nand/nand_ecc.c | 10 +- + drivers/mtd/nand/nandsim.c | 4 +- + drivers/mtd/nand/ndfc.c | 22 +- + drivers/mtd/nand/nomadik_nand.c | 1 + + drivers/mtd/nand/nuc900_nand.c | 1 + + drivers/mtd/nand/omap2.c | 22 +- + drivers/mtd/nand/orion_nand.c | 16 +- + drivers/mtd/nand/pasemi_nand.c | 3 +- + drivers/mtd/nand/plat_nand.c | 25 +- + drivers/mtd/nand/ppchameleonevb.c | 47 +- + drivers/mtd/nand/pxa3xx_nand.c | 471 ++++--- + drivers/mtd/nand/r852.c | 6 +- + drivers/mtd/nand/rtc_from4.c | 5 +- + drivers/mtd/nand/s3c2410.c | 27 +- + drivers/mtd/nand/sharpsl.c | 13 +- + drivers/mtd/nand/sm_common.c | 2 +- + drivers/mtd/nand/socrates_nand.c | 28 +- + drivers/mtd/nand/tmio_nand.c | 17 +- + drivers/mtd/nand/txx9ndfmc.c | 8 +- + drivers/mtd/nftlcore.c | 37 +- + drivers/mtd/nftlmount.c | 26 +- + drivers/mtd/ofpart.c | 112 ++- + drivers/mtd/onenand/generic.c | 14 +- + drivers/mtd/onenand/omap2.c | 16 +- + drivers/mtd/onenand/onenand_base.c | 114 +- + drivers/mtd/onenand/onenand_bbt.c | 8 +- + drivers/mtd/onenand/samsung.c | 13 +- + drivers/mtd/redboot.c | 16 +- + drivers/mtd/sm_ftl.c | 26 +- + drivers/mtd/ssfdc.c | 46 +- + drivers/mtd/tests/mtd_oobtest.c | 33 +- + drivers/mtd/tests/mtd_pagetest.c | 37 +- + drivers/mtd/tests/mtd_readtest.c | 13 +- + drivers/mtd/tests/mtd_speedtest.c | 17 +- + drivers/mtd/tests/mtd_stresstest.c | 11 +- + drivers/mtd/tests/mtd_subpagetest.c | 17 +- + drivers/mtd/tests/mtd_torturetest.c | 11 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/io.c | 24 +- + drivers/mtd/ubi/kapi.c | 2 +- + drivers/mtd/ubi/misc.c | 2 +- + drivers/mtd/ubi/scan.c | 4 +- + drivers/mtd/ubi/vtbl.c | 2 +- + drivers/staging/spectra/lld_mtd.c | 6 +- + fs/jffs2/compr.c | 128 ++- + fs/jffs2/compr.h | 2 + + fs/jffs2/fs.c | 2 +- + fs/jffs2/jffs2_fs_sb.h | 6 + + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/scan.c | 4 +- + fs/jffs2/super.c | 119 ++ + fs/jffs2/wbuf.c | 9 +- + include/linux/mtd/bbm.h | 39 +- + include/linux/mtd/mtd.h | 82 +- + include/linux/mtd/nand.h | 92 +- + include/linux/mtd/onenand.h | 4 + + include/linux/mtd/partitions.h | 46 +- + include/linux/mtd/physmap.h | 17 - + include/mtd/mtd-abi.h | 122 ++- + 190 files changed, 7583 insertions(+), 4046 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/atmel-dataflash.txt + create mode 100644 drivers/mtd/devices/docg3.c + create mode 100644 drivers/mtd/devices/docg3.h + delete mode 100644 drivers/mtd/maps/ceiva.c + delete mode 100644 drivers/mtd/maps/edb7312.c + delete mode 100644 drivers/mtd/nand/edb7312.c + create mode 100644 drivers/mtd/nand/gpmi-nand/Makefile + create mode 100644 drivers/mtd/nand/gpmi-nand/bch-regs.h + create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-lib.c + create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.c + create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-nand.h + create mode 100644 drivers/mtd/nand/gpmi-nand/gpmi-regs.h +Merging crypto/master (ea8bdfc crypto: user - Add dependency on NET) +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next (39c848e Merge branch 'fix/hda' into for-next) +$ git merge sound/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound-asoc/for-next (86f14df ASoC: Update git repository URL) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders) +$ git merge cpufreq/next +Merge made by the 'recursive' strategy. +Merging quilt/rr (05478c6 module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree) +$ git merge quilt/rr +Merge made by the 'recursive' strategy. + Documentation/oops-tracing.txt | 2 ++ + include/linux/kernel.h | 1 + + kernel/module.c | 11 +++++++---- + kernel/panic.c | 2 ++ + scripts/mod/modpost.c | 7 +++++++ + 5 files changed, 19 insertions(+), 4 deletions(-) +Merging input/next (fb6c721 Input: tca8418_keypad - initial driver release) +$ git merge input/next +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging drivers/input/tablet/wacom_sys.c +Auto-merging drivers/input/keyboard/Kconfig +Merge made by the 'recursive' strategy. + drivers/input/keyboard/Kconfig | 16 ++ + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/tca8418_keypad.c | 430 +++++++++++++++++++++++++++++++ + drivers/input/tablet/wacom_sys.c | 96 +++++++- + drivers/input/tablet/wacom_wac.c | 101 +++++++- + drivers/input/tablet/wacom_wac.h | 4 +- + include/linux/input/tca8418_keypad.h | 44 ++++ + 7 files changed, 672 insertions(+), 20 deletions(-) + create mode 100644 drivers/input/keyboard/tca8418_keypad.c + create mode 100644 include/linux/input/tca8418_keypad.h +Merging input-mt/next (02f8c6a Linux 3.0) +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.) +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next (30a4b71 Merge branch 'for-3.2/core' into for-next) +$ git merge block/for-next +Resolved 'drivers/md/faulty.c' using previous resolution. +Resolved 'drivers/md/linear.c' using previous resolution. +Resolved 'drivers/md/md.c' using previous resolution. +Resolved 'drivers/md/md.h' using previous resolution. +Resolved 'drivers/md/multipath.c' using previous resolution. +Resolved 'drivers/md/raid0.c' using previous resolution. +Resolved 'drivers/md/raid1.c' using previous resolution. +Resolved 'drivers/md/raid5.c' using previous resolution. +Resolved 'drivers/staging/zram/zram_drv.c' using previous resolution. +Auto-merging include/linux/genhd.h +Auto-merging drivers/staging/zram/zram_drv.c +CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/md/raid5.c +CONFLICT (content): Merge conflict in drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +CONFLICT (content): Merge conflict in drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +CONFLICT (content): Merge conflict in drivers/md/raid1.c +Auto-merging drivers/md/raid0.c +CONFLICT (content): Merge conflict in drivers/md/raid0.c +Auto-merging drivers/md/multipath.c +CONFLICT (content): Merge conflict in drivers/md/multipath.c +Auto-merging drivers/md/md.h +CONFLICT (content): Merge conflict in drivers/md/md.h +Auto-merging drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Auto-merging drivers/md/linear.c +CONFLICT (content): Merge conflict in drivers/md/linear.c +Auto-merging drivers/md/faulty.c +CONFLICT (content): Merge conflict in drivers/md/faulty.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/block/xen-blkback/common.h +Auto-merging drivers/block/xen-blkback/blkback.c +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging block/genhd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/md/raid10.c'. +[master c0ca2c6] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-pci-devices-cciss | 7 + + Documentation/blockdev/cciss.txt | 10 + + arch/m68k/emu/nfblock.c | 3 +- + arch/powerpc/sysdev/axonram.c | 8 +- + block/blk-cgroup.c | 111 +++-- + block/blk-cgroup.h | 2 +- + block/blk-core.c | 461 +++++++++++--------- + block/blk-flush.c | 3 +- + block/blk-sysfs.c | 7 +- + block/blk-tag.c | 6 +- + block/blk-throttle.c | 106 +++-- + block/blk.h | 20 +- + block/elevator.c | 39 +-- + block/genhd.c | 12 +- + block/ioctl.c | 2 +- + block/scsi_ioctl.c | 3 +- + drivers/block/aoe/aoeblk.c | 14 +- + drivers/block/brd.c | 4 +- + drivers/block/cciss.c | 76 +++- + drivers/block/cciss.h | 1 + + drivers/block/cpqarray.c | 2 +- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_req.c | 8 +- + drivers/block/loop.c | 251 ++++++----- + drivers/block/nbd.c | 69 ++-- + drivers/block/pktcdvd.c | 11 +- + drivers/block/ps3vram.c | 6 +- + drivers/block/umem.c | 4 +- + drivers/block/xen-blkback/blkback.c | 130 +++++- + drivers/block/xen-blkback/common.h | 98 ++++- + drivers/block/xen-blkback/xenbus.c | 76 ++++ + drivers/block/xen-blkfront.c | 123 +++++- + drivers/md/dm.c | 25 +- + drivers/md/faulty.c | 14 +- + drivers/md/linear.c | 17 +- + drivers/md/md.c | 12 +- + drivers/md/md.h | 2 +- + drivers/md/multipath.c | 8 +- + drivers/md/raid0.c | 22 +- + drivers/md/raid1.c | 9 +- + drivers/md/raid10.c | 19 +- + drivers/md/raid5.c | 8 +- + drivers/s390/block/dcssblk.c | 7 +- + drivers/s390/block/xpram.c | 5 +- + drivers/scsi/hpsa.c | 7 + + drivers/staging/zram/zram_drv.c | 5 +- + fs/bio.c | 1 - + fs/block_dev.c | 15 +- + include/linux/bio.h | 8 - + include/linux/blk_types.h | 11 +- + include/linux/blkdev.h | 40 +- + include/linux/elevator.h | 6 + + include/linux/genhd.h | 6 +- + include/linux/loop.h | 2 +- + include/xen/interface/io/blkif.h | 36 ++ + mm/bounce.c | 9 +- + 56 files changed, 1225 insertions(+), 744 deletions(-) +Merging quilt/device-mapper (43672a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm) +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning) +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master (85b5fbf power_supply: Fix sysfs format warning) +$ git merge battery/master +Auto-merging drivers/power/ds2780_battery.c +Merge made by the 'recursive' strategy. + .../bindings/power_supply/olpc_battery.txt | 5 + + drivers/power/ds2780_battery.c | 2 +- + drivers/power/max17042_battery.c | 17 ++-- + drivers/power/max8903_charger.c | 2 +- + drivers/power/max8997_charger.c | 1 + + drivers/power/max8998_charger.c | 2 + + drivers/power/olpc_battery.c | 79 ++++++++++++++----- + drivers/power/pda_power.c | 74 ++++++++++++++++-- + drivers/power/power_supply_sysfs.c | 4 +- + drivers/power/wm831x_power.c | 44 +++++++---- + drivers/power/z2_battery.c | 2 +- + include/linux/pda_power.h | 2 + + 12 files changed, 175 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt +Merging mmc/mmc-next (d517455 mmc: omap_hsmmc: fix missing parenthesis in pr_info) +$ git merge mmc/mmc-next +Recorded preimage for 'drivers/mmc/host/omap_hsmmc.c' +Auto-merging drivers/mmc/host/omap_hsmmc.c +CONFLICT (content): Merge conflict in drivers/mmc/host/omap_hsmmc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/mmc/host/omap_hsmmc.c'. +[master 0ab4e7e] Merge remote-tracking branch 'mmc/mmc-next' +$ git diff -M --stat --summary HEAD^.. + drivers/mmc/host/omap_hsmmc.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) +Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack()) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (e24daf8 Merge branch 'slab/next' into for-next) +$ git merge slab/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging uclinux/for-next (6e86841 Linux 2.6.27-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (e0b361a Merge branch 'block-3.1' into for-next) +$ git merge md/for-next +Merge made by the 'recursive' strategy. +Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates) +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next (4a6908a Linux 2.6.28) +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write") +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/fbdev-next (b57287b video: platinumfb: Add __devexit_p at necessary place) +$ git merge fbdev/fbdev-next +Already up-to-date. +Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include ) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (89efed4 regulator: max8649 Convert max8649 to use regmap api) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/Kconfig | 1 + + drivers/regulator/max8649.c | 155 +++++++++++++++---------------------------- + 2 files changed, 56 insertions(+), 100 deletions(-) +Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.) +$ git merge security/next +Already up-to-date. +Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.) +$ git merge selinux/master +Already up-to-date. +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/linux-next (134edca Merge branch 'fixes' into linux-next) +$ git merge watchdog/linux-next +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'recursive' strategy. + .../watchdog/convert_drivers_to_kernel_api.txt | 195 ++++++++++++ + drivers/watchdog/Kconfig | 2 + + drivers/watchdog/coh901327_wdt.c | 2 +- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/iTCO_wdt.c | 19 +- + drivers/watchdog/mpcore_wdt.c | 3 +- + drivers/watchdog/octeon-wdt-main.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 176 +++--------- + drivers/watchdog/sb_wdog.c | 4 +- + drivers/watchdog/sc520_wdt.c | 2 +- + drivers/watchdog/w83627hf_wdt.c | 33 ++- + drivers/watchdog/wdt.c | 2 +- + drivers/watchdog/wdt_pci.c | 2 +- + drivers/watchdog/wm831x_wdt.c | 318 +++++++------------- + 14 files changed, 388 insertions(+), 374 deletions(-) + create mode 100644 Documentation/watchdog/convert_drivers_to_kernel_api.txt +Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block) +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (1abb4ba Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next) +$ git merge iommu/next +Already up-to-date. +Merging cputime/cputime (f611671 [S390] cputime: add sparse checking and cleanup) +$ git merge cputime/cputime +Resolved 'fs/proc/stat.c' using previous resolution. +Resolved 'include/asm-generic/cputime.h' using previous resolution. +Resolved 'kernel/sched_stats.h' using previous resolution. +Auto-merging kernel/sys.c +Auto-merging kernel/signal.c +Auto-merging kernel/sched_stats.h +CONFLICT (content): Merge conflict in kernel/sched_stats.h +Auto-merging kernel/sched.c +Auto-merging kernel/posix-cpu-timers.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Auto-merging include/asm-generic/cputime.h +CONFLICT (content): Merge conflict in include/asm-generic/cputime.h +Auto-merging fs/proc/stat.c +CONFLICT (content): Merge conflict in fs/proc/stat.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +Auto-merging drivers/cpufreq/cpufreq_conservative.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ac38e6c] Merge remote-tracking branch 'cputime/cputime' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/cputime.h | 69 +++++++--------- + arch/powerpc/include/asm/cputime.h | 70 ++++++---------- + arch/s390/include/asm/cputime.h | 140 ++++++++++++++----------------- + drivers/cpufreq/cpufreq_conservative.c | 29 +++---- + drivers/cpufreq/cpufreq_ondemand.c | 33 ++++---- + drivers/cpufreq/cpufreq_stats.c | 5 +- + drivers/macintosh/rack-meter.c | 11 +-- + fs/proc/array.c | 8 +- + fs/proc/stat.c | 28 +++---- + fs/proc/uptime.c | 4 +- + include/asm-generic/cputime.h | 62 +++++++-------- + include/linux/sched.h | 4 +- + kernel/acct.c | 4 +- + kernel/cpu.c | 3 +- + kernel/exit.c | 22 ++---- + kernel/fork.c | 14 +-- + kernel/itimer.c | 15 ++-- + kernel/posix-cpu-timers.c | 136 ++++++++++++------------------- + kernel/sched.c | 80 ++++++++---------- + kernel/sched_stats.h | 6 +- + kernel/signal.c | 6 +- + kernel/sys.c | 6 +- + kernel/tsacct.c | 2 +- + 23 files changed, 325 insertions(+), 432 deletions(-) +Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.) +$ git merge osd/linux-next +Merge made by the 'recursive' strategy. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master (0ce790e Linux 2.6.39-rc1) +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next (59e5253 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (fb11620 PM / Freezer: Revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too") +$ git merge pm/linux-next +Auto-merging kernel/cpu.c +Merge made by the 'recursive' strategy. + Documentation/power/freezing-of-tasks.txt | 8 ++-- + Documentation/power/runtime_pm.txt | 10 ++++ + drivers/acpi/sleep.c | 8 +++ + drivers/base/power/runtime.c | 23 +++++++-- + drivers/usb/core/driver.c | 5 ++ + include/linux/cpu.h | 4 -- + include/linux/freezer.h | 11 +--- + include/linux/opp.h | 4 +- + kernel/cpu.c | 74 +++++++++++++++++++++++++++++ + kernel/freezer.c | 2 +- + kernel/power/qos.c | 3 +- + 11 files changed, 125 insertions(+), 27 deletions(-) +Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared) +$ git merge fsnotify/for-next +Auto-merging include/linux/fsnotify_backend.h +Auto-merging fs/notify/mark.c +Auto-merging fs/notify/group.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/cachefiles/namei.c +Merge made by the 'recursive' strategy. + 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 (94d57c4 enic: Update MAINTAINERS) +$ git merge irda/for-next +Already up-to-date. +Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap()) +$ git merge edac-amd/for-next +Already up-to-date. +Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate) +$ git merge spi/spi/next +Already up-to-date. +Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h) +$ git merge gpio/gpio/next +Already up-to-date. +Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest) +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/cpu/amd.c' using previous resolution. +Resolved 'drivers/char/random.c' using previous resolution. +Auto-merging drivers/char/random.c +CONFLICT (content): Merge conflict in drivers/char/random.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging arch/x86/kernel/cpu/amd.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 57bb439] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-platform-ts5500 | 46 +++ + MAINTAINERS | 5 + + arch/x86/Kconfig | 2 + + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/include/asm/x86_init.h | 12 - + arch/x86/kernel/vsyscall_64.c | 2 +- + arch/x86/kernel/x86_init.c | 4 - + arch/x86/mm/init.c | 145 ++++++-- + arch/x86/platform/Makefile | 1 + + arch/x86/platform/ts5500/Kconfig | 28 ++ + arch/x86/platform/ts5500/Makefile | 4 + + arch/x86/platform/ts5500/ts5500.c | 468 +++++++++++++++++++++++ + arch/x86/platform/ts5500/ts5500_adc.c | 326 ++++++++++++++++ + arch/x86/platform/ts5500/ts5500_adc.h | 62 +++ + arch/x86/platform/ts5500/ts5500_gpio.c | 413 ++++++++++++++++++++ + arch/x86/platform/ts5500/ts5500_gpio.h | 60 +++ + arch/x86/platform/ts5500/ts5500_led.c | 115 ++++++ + arch/x86/xen/mmu.c | 15 - + 18 files changed, 1639 insertions(+), 70 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-ts5500 + create mode 100644 arch/x86/platform/ts5500/Kconfig + create mode 100644 arch/x86/platform/ts5500/Makefile + create mode 100644 arch/x86/platform/ts5500/ts5500.c + create mode 100644 arch/x86/platform/ts5500/ts5500_adc.c + create mode 100644 arch/x86/platform/ts5500/ts5500_adc.h + create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.c + create mode 100644 arch/x86/platform/ts5500/ts5500_gpio.h + create mode 100644 arch/x86/platform/ts5500/ts5500_led.c +Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp()) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kmemleak/kmemleak (614d29d kmemleak: Handle percpu memory allocation) +$ git merge kmemleak/kmemleak +Merge made by the 'recursive' strategy. + Documentation/kmemleak.txt | 3 + + include/linux/kmemleak.h | 8 ++ + mm/kmemleak.c | 152 +++++++++++++++++++++++++++++++++++++------- + mm/percpu.c | 12 +++- + 4 files changed, 150 insertions(+), 25 deletions(-) +Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest) +$ git merge kvm/kvm-updates/3.2 +Already up-to-date. +Merging oprofile/for-next (4167ab9 Merge branch 'core' of git://amd64.org/linux/rric into perf/core) +$ git merge oprofile/for-next +Already up-to-date. +Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen) +$ git merge xen/upstream/xen +Resolved 'arch/x86/xen/Kconfig' using previous resolution. +Auto-merging arch/x86/xen/time.c +Auto-merging arch/x86/xen/Kconfig +CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig +Auto-merging arch/x86/kernel/microcode_core.c +Auto-merging arch/x86/kernel/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b191015] Merge remote-tracking branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/xen/interface.h | 1 + + arch/x86/include/asm/microcode.h | 9 + + arch/x86/include/asm/xen/hypercall.h | 8 + + arch/x86/include/asm/xen/interface.h | 1 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/microcode_core.c | 5 +- + arch/x86/kernel/microcode_xen.c | 198 ++++++++++++++++++++ + arch/x86/xen/Kconfig | 4 + + arch/x86/xen/time.c | 16 ++- + include/xen/interface/platform.h | 320 +++++++++++++++++++++++++++++++++ + include/xen/interface/xen.h | 1 + + 11 files changed, 562 insertions(+), 2 deletions(-) + create mode 100644 arch/x86/kernel/microcode_xen.c + create mode 100644 include/xen/interface/platform.h +Merging xen-two/linux-next (9d5ae84 Merge branch 'stable/vmalloc-3.2' into linux-next) +$ git merge xen-two/linux-next +Auto-merging drivers/net/xen-netback/netback.c +Auto-merging drivers/block/xen-blkback/xenbus.c +Auto-merging drivers/block/xen-blkback/common.h +Removing arch/x86/include/asm/xen/grant_table.h +Removing arch/ia64/include/asm/xen/grant_table.h +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/xen/grant_table.h | 29 ----------- + arch/ia64/xen/grant-table.c | 62 ------------------------ + arch/x86/include/asm/xen/grant_table.h | 7 --- + arch/x86/xen/grant-table.c | 2 +- + drivers/block/xen-blkback/common.h | 5 +-- + drivers/block/xen-blkback/xenbus.c | 54 +++------------------ + drivers/net/xen-netback/common.h | 11 ++-- + drivers/net/xen-netback/netback.c | 80 +++++++------------------------ + drivers/xen/xenbus/xenbus_client.c | 6 +- + include/xen/grant_table.h | 1 - + 10 files changed, 34 insertions(+), 223 deletions(-) + delete mode 100644 arch/ia64/include/asm/xen/grant_table.h + delete mode 100644 arch/x86/include/asm/xen/grant_table.h +Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc) +$ git merge percpu/for-next +Auto-merging mm/percpu.c +Merge made by the 'recursive' strategy. + mm/percpu-vm.c | 5 ++--- + mm/percpu.c | 17 +++++++++-------- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue()) +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap()) +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs) +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (c2f5631 sysctl: remove impossible condition check) +$ git merge sysctl/master +Auto-merging fs/proc/proc_sysctl.c +Merge made by the 'recursive' strategy. + fs/proc/proc_sysctl.c | 14 ++------------ + 1 files changed, 2 insertions(+), 12 deletions(-) +Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.) +$ git merge namespace/master +Auto-merging fs/proc/inode.c +Merge made by the 'recursive' strategy. + fs/proc/inode.c | 6 +- + fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 142 insertions(+), 24 deletions(-) +Merging regmap/for-next (a084481 regmap: Prepare LZO cache for variable block sizes) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-lzo.c | 15 +++++++++------ + 1 files changed, 9 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next (094803e Merge branch 'akpm' (Andrew's incoming)) +$ git merge staging/staging-next +Already up-to-date. +Merging bkl-config/config (4ba8216 BKL: That's all, folks) +$ git merge bkl-config/config +Already up-to-date. +Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.) +$ git merge tmem/tmem +Resolved 'mm/swapfile.c' using previous resolution. +Auto-merging mm/swapfile.c +CONFLICT (content): Merge conflict in mm/swapfile.c +Auto-merging mm/filemap.c +Auto-merging mm/Makefile +Auto-merging mm/Kconfig +Auto-merging include/linux/swap.h +Auto-merging fs/super.c +Auto-merging fs/buffer.c +Auto-merging drivers/staging/zcache/zcache-main.c +Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7aef04d] Merge remote-tracking branch 'tmem/tmem' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 - + Documentation/vm/cleancache.txt | 41 ++-- + Documentation/vm/frontswap.txt | 210 +++++++++++++++ + drivers/staging/zcache/zcache-main.c | 10 +- + drivers/xen/tmem.c | 10 +- + fs/buffer.c | 2 +- + fs/super.c | 2 +- + include/linux/cleancache.h | 24 +- + include/linux/frontswap.h | 126 +++++++++ + include/linux/swap.h | 4 + + include/linux/swapfile.h | 13 + + mm/Kconfig | 17 ++ + mm/Makefile | 1 + + mm/cleancache.c | 98 +++----- + mm/filemap.c | 2 +- + mm/frontswap.c | 273 ++++++++++++++++++++ + mm/page_io.c | 12 + + mm/swapfile.c | 64 ++++- + mm/truncate.c | 10 +- + 19 files changed, 796 insertions(+), 134 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/frontswap.txt + create mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/swapfile.h + create mode 100644 mm/frontswap.c +Merging writeback/writeback-for-next (ea7bf1d Merge branch 'requeue-io-wait' into writeback-for-next) +$ git merge writeback/writeback-for-next +Auto-merging mm/vmscan.c +Auto-merging mm/page-writeback.c +Auto-merging mm/backing-dev.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging fs/quota/quota.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + fs/btrfs/extent-tree.c | 3 +- + fs/buffer.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/fs-writeback.c | 146 ++++++--- + fs/quota/quota.c | 2 +- + fs/sync.c | 4 +- + fs/ubifs/budget.c | 2 +- + include/linux/backing-dev.h | 22 +- + include/linux/sched.h | 7 + + include/linux/writeback.h | 33 ++- + include/trace/events/writeback.h | 43 +-- + kernel/fork.c | 3 + + mm/backing-dev.c | 17 +- + mm/page-writeback.c | 680 +++++++++++++++++++++++++++++--------- + mm/vmscan.c | 3 +- + 15 files changed, 726 insertions(+), 243 deletions(-) +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (ab872c8 pinctrl/sirf: fix sirfsoc_get_group_pins prototype) +$ git merge pinctrl/for-next +Resolved 'arch/arm/mach-u300/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-u300/core.c' using previous resolution. +Auto-merging arch/arm/mach-u300/core.c +CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c +Auto-merging arch/arm/mach-u300/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 39d5980] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging moduleh/for-sfr (67b8499 Revert "tracing: Include module.h in define_trace.h") +$ git merge moduleh/for-sfr +Auto-merging sound/soc/samsung/dma.c +Auto-merging sound/soc/samsung/ac97.c +Auto-merging sound/pci/rme9652/hdspm.c +Auto-merging sound/pci/rme9652/hdsp.c +Auto-merging sound/pci/intel8x0.c +Auto-merging sound/pci/hda/patch_via.c +Auto-merging sound/pci/hda/patch_sigmatel.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/pci/hda/hda_hwdep.c +Auto-merging sound/core/hwdep.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/ipv6/udplite.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/netfilter.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/udplite.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/hci_sysfs.c +Auto-merging net/8021q/vlan_core.c +Auto-merging mm/truncate.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page-writeback.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mmap.c +Auto-merging mm/mlock.c +Auto-merging mm/migrate.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/kmemleak.c +Auto-merging mm/highmem.c +Auto-merging mm/filemap.c +Auto-merging mm/bounce.c +Auto-merging kernel/utsname_sysctl.c +Auto-merging kernel/sys.c +Auto-merging kernel/stop_machine.c +Auto-merging kernel/signal.c +Auto-merging kernel/power/qos.c +Auto-merging kernel/module.c +Auto-merging kernel/freezer.c +Auto-merging kernel/events/core.c +Auto-merging kernel/crash_dump.c +Auto-merging kernel/cpuset.c +Auto-merging kernel/cpu.c +Auto-merging include/xen/xenbus.h +Auto-merging include/sound/core.h +Auto-merging include/net/sock.h +Auto-merging include/net/ip_vs.h +Auto-merging include/net/inet_timewait_sock.h +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging include/media/saa7146.h +Auto-merging include/linux/of.h +Auto-merging include/linux/mtd/mtd.h +Auto-merging include/linux/gameport.h +Auto-merging include/linux/dmaengine.h +CONFLICT (content): Merge conflict in include/linux/dmaengine.h +Auto-merging include/linux/device.h +Auto-merging include/linux/crypto.h +Auto-merging include/linux/blkdev.h +Auto-merging include/drm/drmP.h +Auto-merging fs/ocfs2/cluster/tcp.c +Auto-merging fs/nfsd/nfssvc.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/pnfs.c +Auto-merging fs/nfs/pagelist.c +Auto-merging fs/nfs/nfs4filelayout.c +Auto-merging fs/logfs/super.c +Auto-merging fs/cifs/connect.c +Auto-merging drivers/xen/xenbus/xenbus_client.c +Auto-merging drivers/w1/w1_int.c +Auto-merging drivers/video/backlight/l4f00242t03.c +Auto-merging drivers/usb/core/driver.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_tmr.c +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/staging/media/solo6x10/g723.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/libfc/fc_lport.c +Auto-merging drivers/scsi/libfc/fc_exch.c +Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c +Auto-merging drivers/scsi/device_handler/scsi_dh.c +Auto-merging drivers/s390/kvm/kvm_virtio.c +Auto-merging drivers/s390/cio/qdio_debug.c +Auto-merging drivers/s390/char/vmur.c +Auto-merging drivers/regulator/tps6586x-regulator.c +Auto-merging drivers/regulator/mc13783-regulator.c +Auto-merging drivers/regulator/db8500-prcmu.c +Auto-merging drivers/regulator/core.c +Auto-merging drivers/regulator/88pm8607.c +Auto-merging drivers/power/power_supply_sysfs.c +Auto-merging drivers/power/max8998_charger.c +Auto-merging drivers/power/max8997_charger.c +Auto-merging drivers/power/max8903_charger.c +Auto-merging drivers/power/max17042_battery.c +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/pci/msi.c +Auto-merging drivers/pci/ats.c +Auto-merging drivers/net/wireless/libertas/main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-pci.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/srq.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/pd.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/mr.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c +Auto-merging drivers/net/ethernet/emulex/benet/be_main.c +Auto-merging drivers/net/bonding/bond_procfs.c +Auto-merging drivers/mtd/redboot.c +Auto-merging drivers/mtd/onenand/onenand_bbt.c +Auto-merging drivers/mtd/nand/sm_common.c +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/nand/nand_bbt.c +Auto-merging drivers/mtd/nand/diskonchip.c +Auto-merging drivers/mtd/nand/cmx270_nand.c +Auto-merging drivers/mtd/nand/cafe_nand.c +Auto-merging drivers/mtd/mtdsuper.c +Auto-merging drivers/mtd/cmdlinepart.c +Auto-merging drivers/mtd/ar7part.c +Auto-merging drivers/mfd/twl6030-irq.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/mfd/max8997.c +Auto-merging drivers/mfd/asic3.c +CONFLICT (modify/delete): drivers/mfd/ab3550-core.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/mfd/ab3550-core.c left in tree. +Auto-merging drivers/mfd/ab3100-core.c +Auto-merging drivers/media/video/v4l2-subdev.c +Auto-merging drivers/media/video/v4l2-device.c +Auto-merging drivers/media/video/v4l2-ctrls.c +Auto-merging drivers/media/video/tvp7002.c +Auto-merging drivers/media/video/sr030pc30.c +Auto-merging drivers/media/video/sh_mobile_csi2.c +Auto-merging drivers/media/video/rj54n1cb0c.c +Auto-merging drivers/media/video/pvrusb2/pvrusb2-v4l2.c +Auto-merging drivers/media/video/pvrusb2/pvrusb2-hdw.c +Auto-merging drivers/media/video/ov6650.c +CONFLICT (content): Merge conflict in drivers/media/video/ov6650.c +Auto-merging drivers/media/video/noon010pc30.c +Auto-merging drivers/media/video/mxb.c +Auto-merging drivers/media/video/mt9v022.c +Auto-merging drivers/media/video/mt9t031.c +Auto-merging drivers/media/video/mt9m111.c +CONFLICT (content): Merge conflict in drivers/media/video/mt9m111.c +Auto-merging drivers/media/video/mt9m001.c +Auto-merging drivers/media/video/m5mols/m5mols_core.c +Auto-merging drivers/media/video/imx074.c +Auto-merging drivers/media/video/hexium_orion.c +Auto-merging drivers/media/video/hexium_gemini.c +Auto-merging drivers/media/video/cx25840/cx25840-ir.c +Auto-merging drivers/media/video/adp1653.c +Auto-merging drivers/media/rc/rc-main.c +Auto-merging drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c +Auto-merging drivers/media/rc/ir-lirc-codec.c +Auto-merging drivers/media/radio/wl128x/fmdrv_v4l2.c +Auto-merging drivers/media/radio/radio-wl1273.c +Auto-merging drivers/media/dvb/frontends/dibx000_common.c +CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c +Auto-merging drivers/media/common/saa7146_video.c +Auto-merging drivers/media/common/saa7146_hlp.c +Auto-merging drivers/media/common/saa7146_fops.c +Auto-merging drivers/media/common/saa7146_core.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid0.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/linear.c +Auto-merging drivers/md/faulty.c +Auto-merging drivers/md/dm-raid.c +Auto-merging drivers/md/dm-log-userspace-base.c +Auto-merging drivers/leds/leds-lm3530.c +Auto-merging drivers/leds/leds-gpio.c +Auto-merging drivers/leds/leds-asic3.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_fs.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_cm.c +Auto-merging drivers/infiniband/hw/qib/qib_verbs.c +Auto-merging drivers/infiniband/hw/qib/qib_init.c +Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c +Auto-merging drivers/infiniband/hw/qib/qib_iba7220.c +Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c +Auto-merging drivers/infiniband/hw/qib/qib_driver.c +Auto-merging drivers/infiniband/hw/mthca/mthca_provider.c +Auto-merging drivers/infiniband/hw/ipath/ipath_init_chip.c +Auto-merging drivers/infiniband/hw/cxgb4/qp.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/infiniband/core/ucma.c +Auto-merging drivers/infiniband/core/sysfs.c +Auto-merging drivers/infiniband/corRecorded preimage for 'drivers/media/video/mt9m111.c' +Resolved 'drivers/media/dvb/frontends/dibx000_common.c' using previous resolution. +Resolved 'include/linux/dmaengine.h' using previous resolution. +e/mad.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/cm.c +Auto-merging drivers/i2c/busses/i2c-tegra.c +Auto-merging drivers/i2c/busses/i2c-sh7760.c +Auto-merging drivers/hid/hid-roccat.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpio/gpio-mxs.c +Auto-merging drivers/gpio/gpio-mxc.c +Auto-merging drivers/dma/ipu/ipu_idmac.c +Auto-merging drivers/dma/intel_mid_dma.c +Auto-merging drivers/dma/imx-sdma.c +Auto-merging drivers/dma/imx-dma.c +Auto-merging drivers/cpufreq/cpufreq_stats.c +Auto-merging drivers/char/virtio_console.c +Auto-merging drivers/char/ttyprintk.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/block/ps3vram.c +Auto-merging drivers/block/aoe/aoeblk.c +Auto-merging drivers/base/power/runtime.c +Auto-merging block/ioctl.c +Auto-merging arch/x86/kernel/vsyscall_64.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/crypto/aes_glue.c +Auto-merging arch/sh/mm/init.c +Auto-merging arch/sh/kernel/topology.c +Auto-merging arch/s390/mm/init.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/sysdev/fsl_rio.c +Auto-merging arch/powerpc/sysdev/cpm_common.c +Auto-merging arch/powerpc/platforms/pseries/iommu.c +Auto-merging arch/powerpc/platforms/pseries/eeh.c +Auto-merging arch/powerpc/platforms/ps3/system-bus.c +Auto-merging arch/powerpc/mm/tlb_nohash.c +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/powerpc/mm/mmu_context_hash64.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/hash_utils_64.c +Auto-merging arch/powerpc/kernel/vio.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/ptrace.c +Auto-merging arch/powerpc/kernel/prom.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/kernel/ibmebus.c +Auto-merging arch/powerpc/kernel/dma.c +Auto-merging arch/powerpc/kernel/dma-iommu.c +Auto-merging arch/powerpc/include/asm/machdep.h +Auto-merging arch/mips/kernel/cpu-probe.c +Auto-merging arch/microblaze/kernel/dma.c +Auto-merging arch/blackfin/mach-bf537/boards/tcm_bf537.c +Auto-merging arch/blackfin/mach-bf537/boards/stamp.c +Auto-merging arch/blackfin/mach-bf537/boards/pnav10.c +Auto-merging arch/blackfin/mach-bf537/boards/dnp5370.c +Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537u.c +Auto-merging arch/blackfin/mach-bf537/boards/cm_bf537e.c +Auto-merging arch/blackfin/mach-bf527/boards/tll6527m.c +Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c +Auto-merging arch/blackfin/mach-bf527/boards/ezbrd.c +Auto-merging arch/blackfin/mach-bf527/boards/cm_bf527.c +Auto-merging arch/blackfin/mach-bf527/boards/ad7160eval.c +Auto-merging arch/blackfin/mach-bf518/boards/ezbrd.c +Auto-merging arch/arm/plat-samsung/platformdata.c +Auto-merging arch/arm/plat-samsung/dev-backlight.c +Auto-merging arch/arm/mach-tegra/pcie.c +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-omap2/voltage.c +Auto-merging arch/arm/mach-omap2/prcm.c +Auto-merging arch/arm/mach-omap2/pm.c +Auto-merging arch/arm/mach-omap2/display.c +Auto-merging arch/arm/mach-omap2/clockdomain.c +Auto-merging arch/arm/mach-omap2/board-omap3evm.c +Auto-merging arch/arm/mach-omap1/board-voiceblue.c +Auto-merging arch/arm/mach-omap1/board-sx1.c +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Auto-merging arch/arm/mach-imx/mach-mx31moboard.c +Auto-merging arch/arm/mach-imx/mach-mx31lite.c +Auto-merging arch/arm/mach-imx/mach-mx31lilly.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/kernel/setup.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/mfd/ab3550-core.c +drivers/media/dvb/frontends/dibx000_common.c: needs merge +drivers/media/video/mt9m111.c: needs merge +drivers/media/video/ov6650.c: needs merge +drivers/mfd/ab3550-core.c: needs merge +include/linux/dmaengine.h: needs merge +rm 'drivers/mfd/ab3550-core.c' +$ git commit -v -a +Recorded resolution for 'drivers/media/video/mt9m111.c'. +Recorded resolution for 'drivers/media/video/ov6650.c'. +[master a436aa3] Merge remote-tracking branch 'moduleh/for-sfr' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/core_irongate.c | 1 + + arch/alpha/kernel/pci-sysfs.c | 1 + + arch/alpha/kernel/pci_iommu.c | 1 + + arch/alpha/kernel/setup.c | 1 + + arch/arm/common/it8152.c | 1 + + arch/arm/common/scoop.c | 1 + + arch/arm/kernel/armksyms.c | 2 +- + arch/arm/kernel/bios32.c | 2 +- + arch/arm/kernel/devtree.c | 2 +- + arch/arm/kernel/elf.c | 2 +- + arch/arm/kernel/etm.c | 1 + + arch/arm/kernel/io.c | 2 +- + arch/arm/kernel/irq.c | 1 - + arch/arm/kernel/leds.c | 3 +- + arch/arm/kernel/perf_event.c | 2 +- + arch/arm/kernel/pj4-cp0.c | 1 - + arch/arm/kernel/process.c | 2 +- + arch/arm/kernel/ptrace.c | 1 + + arch/arm/kernel/return_address.c | 2 +- + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/stacktrace.c | 2 +- + arch/arm/kernel/sys_arm.c | 2 +- + arch/arm/kernel/time.c | 2 +- + arch/arm/kernel/unwind.c | 2 +- + arch/arm/kernel/xscale-cp0.c | 1 - + arch/arm/mach-at91/cpuidle.c | 1 + + arch/arm/mach-bcmring/dma.c | 1 + + arch/arm/mach-bcmring/mm.c | 1 + + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + + arch/arm/mach-davinci/board-dm646x-evm.c | 1 + + arch/arm/mach-davinci/cdce949.c | 1 + + arch/arm/mach-davinci/cpufreq.c | 1 + + arch/arm/mach-davinci/cpuidle.c | 1 + + arch/arm/mach-ep93xx/core.c | 1 + + arch/arm/mach-exynos4/dev-sysmmu.c | 1 + + arch/arm/mach-imx/mach-mx31lilly.c | 1 + + arch/arm/mach-imx/mach-mx31lite.c | 1 + + arch/arm/mach-imx/mach-mx31moboard.c | 1 + + arch/arm/mach-iop13xx/pci.c | 1 + + arch/arm/mach-ixp2000/core.c | 1 + + arch/arm/mach-ixp4xx/common-pci.c | 1 + + arch/arm/mach-ixp4xx/common.c | 1 + + arch/arm/mach-kirkwood/cpuidle.c | 1 + + arch/arm/mach-msm/io.c | 1 + + arch/arm/mach-netx/xc.c | 1 + + arch/arm/mach-omap1/board-ams-delta.c | 1 + + arch/arm/mach-omap1/board-sx1.c | 1 + + arch/arm/mach-omap1/board-voiceblue.c | 1 + + arch/arm/mach-omap1/mailbox.c | 1 + + arch/arm/mach-omap2/board-omap3evm.c | 1 + + arch/arm/mach-omap2/clockdomain.c | 1 + + arch/arm/mach-omap2/display.c | 1 + + arch/arm/mach-omap2/gpmc-onenand.c | 1 + + arch/arm/mach-omap2/pm.c | 1 + + arch/arm/mach-omap2/prcm.c | 1 + + arch/arm/mach-omap2/usb-tusb6010.c | 2 + + arch/arm/mach-omap2/voltage.c | 1 + + arch/arm/mach-pxa/colibri-pxa270.c | 1 + + arch/arm/mach-pxa/corgi.c | 1 + + arch/arm/mach-pxa/poodle.c | 1 + + arch/arm/mach-pxa/spitz.c | 1 + + arch/arm/mach-pxa/trizeps4.c | 1 + + arch/arm/mach-s3c2410/mach-h1940.c | 1 + + arch/arm/mach-s3c64xx/dev-audio.c | 1 + + arch/arm/mach-sa1100/collie.c | 1 + + arch/arm/mach-sa1100/jornada720.c | 1 + + arch/arm/mach-shmobile/clock.c | 1 + + arch/arm/mach-tegra/pcie.c | 1 + + arch/arm/mm/fault-armv.c | 1 - + arch/arm/mm/init.c | 1 + + arch/arm/plat-iop/gpio.c | 1 + + arch/arm/plat-iop/time.c | 1 + + arch/arm/plat-omap/clock.c | 1 + + arch/arm/plat-omap/mailbox.c | 1 + + arch/arm/plat-samsung/dev-backlight.c | 1 + + arch/arm/plat-samsung/platformdata.c | 1 + + arch/arm/vfp/vfpmodule.c | 1 - + arch/avr32/mach-at32ap/clock.c | 1 + + arch/avr32/mach-at32ap/cpufreq.c | 1 + + arch/avr32/mach-at32ap/intc.c | 1 + + arch/avr32/mach-at32ap/pio.c | 1 + + arch/avr32/mm/dma-coherent.c | 1 + + arch/blackfin/kernel/dma-mapping.c | 1 + + arch/blackfin/kernel/perf_event.c | 1 + + arch/blackfin/kernel/sys_bfin.c | 1 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 1 + + arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 + + arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 + + arch/blackfin/mach-bf527/boards/ezbrd.c | 1 + + arch/blackfin/mach-bf527/boards/ezkit.c | 1 + + arch/blackfin/mach-bf527/boards/tll6527m.c | 1 + + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 1 + + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 1 + + arch/blackfin/mach-bf537/boards/dnp5370.c | 1 + + arch/blackfin/mach-bf537/boards/pnav10.c | 1 + + arch/blackfin/mach-bf537/boards/stamp.c | 1 + + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 1 + + arch/blackfin/mach-common/cpufreq.c | 1 + + arch/blackfin/mm/init.c | 1 + + arch/ia64/hp/common/hwsw_iommu.c | 1 + + arch/ia64/kernel/dma-mapping.c | 1 + + arch/ia64/kernel/topology.c | 1 + + arch/ia64/pci/pci.c | 1 + + arch/ia64/sn/kernel/io_acpi_init.c | 1 + + arch/ia64/sn/kernel/io_init.c | 1 + + arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 + + arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 + + arch/ia64/sn/pci/tioca_provider.c | 1 + + arch/ia64/xen/hypervisor.c | 1 + + arch/m68k/atari/time.c | 1 + + arch/m68k/kernel/dma_mm.c | 1 + + arch/m68k/kernel/dma_no.c | 1 + + arch/microblaze/kernel/dma.c | 1 + + arch/microblaze/kernel/irq.c | 1 + + arch/microblaze/mm/init.c | 1 + + arch/microblaze/pci/iomap.c | 1 + + arch/microblaze/pci/pci-common.c | 1 + + arch/mips/bcm47xx/gpio.c | 1 + + arch/mips/bcm47xx/setup.c | 1 + + arch/mips/cavium-octeon/csrc-octeon.c | 1 + + arch/mips/cavium-octeon/dma-octeon.c | 1 + + arch/mips/cavium-octeon/flash_setup.c | 1 + + arch/mips/kernel/8250-platform.c | 1 - + arch/mips/kernel/cpu-probe.c | 3 +- + arch/mips/kernel/i8253.c | 2 +- + arch/mips/kernel/init_task.c | 2 +- + arch/mips/kernel/irq-msc01.c | 1 - + arch/mips/kernel/irq.c | 1 - + arch/mips/kernel/mips-mt.c | 2 +- + arch/mips/kernel/mips_ksyms.c | 2 +- + arch/mips/kernel/module.c | 1 - + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/prom.c | 2 +- + arch/mips/kernel/reset.c | 2 +- + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/setup.c | 2 +- + arch/mips/kernel/spinlock_test.c | 2 +- + arch/mips/kernel/stacktrace.c | 2 +- + arch/mips/kernel/time.c | 2 +- + arch/mips/kernel/traps.c | 1 - + arch/mips/kernel/unaligned.c | 1 - + arch/mips/kernel/vpe.c | 1 - + arch/mips/loongson/common/platform.c | 1 + + arch/mips/pci/pci-ip27.c | 1 + + arch/mips/pci/pci.c | 1 + + arch/mips/powertv/pci/fixup-powertv.c | 1 + + arch/mips/powertv/powertv-usb.c | 1 + + arch/mips/rb532/gpio.c | 1 + + arch/mips/rb532/setup.c | 1 + + arch/mips/txx9/generic/spi_eeprom.c | 1 + + arch/mips/txx9/rbtx4939/setup.c | 1 + + arch/mips/vr41xx/common/giu.c | 1 + + arch/mips/vr41xx/common/rtc.c | 1 + + arch/parisc/kernel/drivers.c | 1 + + arch/parisc/kernel/pci-dma.c | 1 + + arch/parisc/kernel/setup.c | 1 + + arch/parisc/lib/iomap.c | 1 + + arch/powerpc/include/asm/lv1call.h | 1 + + arch/powerpc/include/asm/machdep.h | 1 + + arch/powerpc/include/asm/spu.h | 1 + + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/clock.c | 2 +- + arch/powerpc/kernel/cputable.c | 2 +- + arch/powerpc/kernel/crash.c | 1 + + arch/powerpc/kernel/dma-iommu.c | 1 + + arch/powerpc/kernel/dma.c | 1 + + arch/powerpc/kernel/firmware.c | 3 +- + arch/powerpc/kernel/hw_breakpoint.c | 1 - + arch/powerpc/kernel/ibmebus.c | 2 + + arch/powerpc/kernel/init_task.c | 2 +- + arch/powerpc/kernel/io-workarounds.c | 1 + + arch/powerpc/kernel/io.c | 2 +- + arch/powerpc/kernel/iomap.c | 1 + + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/isa-bridge.c | 1 + + arch/powerpc/kernel/kvm.c | 1 + + arch/powerpc/kernel/module.c | 1 - + arch/powerpc/kernel/of_platform.c | 2 +- + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kernel/pci-common.c | 1 + + arch/powerpc/kernel/pci_32.c | 1 + + arch/powerpc/kernel/pci_64.c | 1 + + arch/powerpc/kernel/pci_dn.c | 1 + + arch/powerpc/kernel/pci_of_scan.c | 1 + + arch/powerpc/kernel/pmc.c | 2 +- + arch/powerpc/kernel/ppc_ksyms.c | 2 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/prom_parse.c | 1 - + arch/powerpc/kernel/ptrace.c | 3 - + arch/powerpc/kernel/rtas.c | 2 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/signal_64.c | 1 - + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/stacktrace.c | 2 +- + arch/powerpc/kernel/swsusp_64.c | 1 + + arch/powerpc/kernel/sysfs.c | 2 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/kernel/vdso.c | 1 - + arch/powerpc/kernel/vio.c | 3 +- + arch/powerpc/kvm/44x.c | 1 + + arch/powerpc/kvm/book3s.c | 1 + + arch/powerpc/kvm/book3s_exports.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 1 + + arch/powerpc/kvm/book3s_hv_builtin.c | 1 + + arch/powerpc/kvm/book3s_pr.c | 1 + + arch/powerpc/kvm/powerpc.c | 1 - + arch/powerpc/lib/checksum_wrappers_64.c | 2 +- + arch/powerpc/lib/devres.c | 2 +- + arch/powerpc/lib/locks.c | 2 +- + arch/powerpc/lib/rheap.c | 2 +- + arch/powerpc/mm/dma-noncoherent.c | 1 + + arch/powerpc/mm/hash_utils_64.c | 1 + + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/mmu_context_hash32.c | 1 + + arch/powerpc/mm/mmu_context_hash64.c | 2 +- + arch/powerpc/mm/numa.c | 2 +- + arch/powerpc/mm/pgtable_64.c | 1 + + arch/powerpc/mm/slice.c | 2 +- + arch/powerpc/mm/tlb_hash32.c | 1 + + arch/powerpc/mm/tlb_nohash.c | 1 + + arch/powerpc/platforms/44x/warp.c | 1 + + arch/powerpc/platforms/512x/clock.c | 1 + + arch/powerpc/platforms/52xx/mpc52xx_common.c | 1 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 + + arch/powerpc/platforms/83xx/suspend.c | 1 + + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 - + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 - + arch/powerpc/platforms/85xx/sbc8548.c | 1 - + arch/powerpc/platforms/86xx/gef_gpio.c | 1 + + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - + arch/powerpc/platforms/cell/axon_msi.c | 1 + + arch/powerpc/platforms/cell/beat.c | 2 +- + arch/powerpc/platforms/cell/beat_spu_priv1.c | 2 - + arch/powerpc/platforms/cell/beat_wrapper.h | 1 + + arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 + + arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 + + arch/powerpc/platforms/cell/cbe_powerbutton.c | 1 + + arch/powerpc/platforms/cell/cbe_regs.c | 2 +- + arch/powerpc/platforms/cell/celleb_setup.c | 1 + + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 1 + + arch/powerpc/platforms/cell/interrupt.c | 2 +- + arch/powerpc/platforms/cell/pmu.c | 1 + + arch/powerpc/platforms/cell/qpace_setup.c | 1 + + arch/powerpc/platforms/cell/setup.c | 1 + + arch/powerpc/platforms/cell/smp.c | 1 - + arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- + arch/powerpc/platforms/cell/spu_fault.c | 2 +- + arch/powerpc/platforms/cell/spu_manage.c | 2 +- + arch/powerpc/platforms/cell/spu_notify.c | 3 +- + arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 - + arch/powerpc/platforms/cell/spufs/backing_ops.c | 1 - + arch/powerpc/platforms/cell/spufs/context.c | 2 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 1 - + arch/powerpc/platforms/cell/spufs/fault.c | 1 - + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + arch/powerpc/platforms/cell/spufs/hw_ops.c | 1 - + arch/powerpc/platforms/cell/spufs/sched.c | 1 - + arch/powerpc/platforms/cell/spufs/switch.c | 2 +- + arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +- + arch/powerpc/platforms/embedded6xx/holly.c | 1 + + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 + + arch/powerpc/platforms/iseries/hvlpconfig.c | 2 +- + arch/powerpc/platforms/iseries/iommu.c | 2 +- + arch/powerpc/platforms/iseries/ksyms.c | 2 +- + arch/powerpc/platforms/iseries/lpardata.c | 1 - + arch/powerpc/platforms/iseries/lpevents.c | 2 +- + arch/powerpc/platforms/iseries/mf.c | 1 + + arch/powerpc/platforms/iseries/pci.c | 1 - + arch/powerpc/platforms/iseries/setup.c | 1 + + arch/powerpc/platforms/iseries/smp.c | 1 - + arch/powerpc/platforms/iseries/vio.c | 2 +- + arch/powerpc/platforms/iseries/viopath.c | 2 +- + arch/powerpc/platforms/maple/setup.c | 1 + + arch/powerpc/platforms/pasemi/cpufreq.c | 1 + + arch/powerpc/platforms/pasemi/dma_lib.c | 3 +- + arch/powerpc/platforms/pasemi/setup.c | 1 + + arch/powerpc/platforms/powermac/backlight.c | 1 + + arch/powerpc/platforms/powermac/feature.c | 1 + + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/powerpc/platforms/powermac/nvram.c | 2 +- + arch/powerpc/platforms/powermac/pic.c | 1 - + arch/powerpc/platforms/powermac/setup.c | 1 + + arch/powerpc/platforms/ps3/exports.c | 2 - + arch/powerpc/platforms/ps3/interrupt.c | 2 +- + arch/powerpc/platforms/ps3/mm.c | 2 +- + arch/powerpc/platforms/ps3/os-area.c | 1 + + arch/powerpc/platforms/ps3/setup.c | 1 + + arch/powerpc/platforms/ps3/spu.c | 1 + + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/eeh.c | 2 + + arch/powerpc/platforms/pseries/eeh_event.c | 1 + + arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 + + arch/powerpc/platforms/pseries/hvconsole.c | 3 +- + arch/powerpc/platforms/pseries/io_event_irq.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 1 + + arch/powerpc/platforms/pseries/lpar.c | 1 + + arch/powerpc/platforms/pseries/mobility.c | 1 + + arch/powerpc/platforms/pseries/pci_dlpar.c | 1 + + arch/powerpc/platforms/pseries/plpar_wrappers.h | 3 + + arch/powerpc/platforms/pseries/setup.c | 2 +- + arch/powerpc/platforms/pseries/smp.c | 1 - + arch/powerpc/platforms/pseries/suspend.c | 1 + + arch/powerpc/sysdev/bestcomm/sram.c | 2 +- + arch/powerpc/sysdev/cpm_common.c | 1 + + arch/powerpc/sysdev/dcr.c | 1 + + arch/powerpc/sysdev/fsl_gtm.c | 1 + + arch/powerpc/sysdev/fsl_lbc.c | 3 +- + arch/powerpc/sysdev/fsl_pmc.c | 1 + + arch/powerpc/sysdev/fsl_rio.c | 2 +- + arch/powerpc/sysdev/fsl_soc.c | 2 +- + arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 + + arch/powerpc/sysdev/mpc8xx_pic.c | 1 - + arch/powerpc/sysdev/mv64x60_pci.c | 1 + + arch/powerpc/sysdev/pmi.c | 1 + + arch/powerpc/sysdev/ppc4xx_msi.c | 1 + + arch/powerpc/sysdev/qe_lib/gpio.c | 1 + + arch/powerpc/sysdev/qe_lib/ucc.c | 2 +- + arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +- + arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +- + arch/powerpc/sysdev/qe_lib/usb.c | 1 + + arch/powerpc/sysdev/rtc_cmos_setup.c | 1 + + arch/powerpc/sysdev/scom.c | 1 + + arch/powerpc/sysdev/simple_gpio.c | 1 - + arch/powerpc/sysdev/tsi108_dev.c | 2 +- + arch/powerpc/xmon/xmon.c | 2 +- + arch/s390/crypto/sha_common.c | 1 + + arch/s390/mm/init.c | 1 + + arch/sh/drivers/dma/dma-sysfs.c | 1 + + arch/sh/drivers/pci/pci.c | 1 + + arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 + + arch/sh/kernel/perf_event.c | 1 + + arch/sh/kernel/topology.c | 1 + + arch/sh/mm/init.c | 1 + + arch/sparc/include/asm/termios.h | 1 - + arch/sparc/kernel/apc.c | 1 + + arch/sparc/kernel/auxio_32.c | 1 + + arch/sparc/kernel/btext.c | 1 - + arch/sparc/kernel/central.c | 1 + + arch/sparc/kernel/cpu.c | 2 +- + arch/sparc/kernel/cpumap.c | 2 +- + arch/sparc/kernel/dma.c | 1 - + arch/sparc/kernel/ebus.c | 2 +- + arch/sparc/kernel/hvapi.c | 2 +- + arch/sparc/kernel/idprom.c | 2 +- + arch/sparc/kernel/iommu.c | 2 +- + arch/sparc/kernel/irq_32.c | 1 + + arch/sparc/kernel/irq_64.c | 1 - + arch/sparc/kernel/ldc.c | 2 +- + arch/sparc/kernel/leon_kernel.c | 1 - + arch/sparc/kernel/leon_pci.c | 1 + + arch/sparc/kernel/leon_pci_grpci2.c | 2 +- + arch/sparc/kernel/mdesc.c | 2 + + arch/sparc/kernel/nmi.c | 2 +- + arch/sparc/kernel/of_device_32.c | 1 - + arch/sparc/kernel/of_device_64.c | 3 +- + arch/sparc/kernel/of_device_common.c | 2 +- + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/pci_fire.c | 1 + + arch/sparc/kernel/pci_psycho.c | 1 + + arch/sparc/kernel/pci_sabre.c | 1 + + arch/sparc/kernel/pci_schizo.c | 1 + + arch/sparc/kernel/pci_sun4v.c | 1 + + arch/sparc/kernel/pcic.c | 1 + + arch/sparc/kernel/pcr.c | 3 +- + arch/sparc/kernel/pmc.c | 1 + + arch/sparc/kernel/power.c | 2 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/prom_32.c | 1 - + arch/sparc/kernel/prom_64.c | 1 - + arch/sparc/kernel/prom_common.c | 2 +- + arch/sparc/kernel/reboot.c | 2 +- + arch/sparc/kernel/sbus.c | 1 + + arch/sparc/kernel/setup_32.c | 1 + + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/kernel/sparc_ksyms_64.c | 2 +- + arch/sparc/kernel/stacktrace.c | 2 +- + arch/sparc/kernel/sys_sparc32.c | 1 - + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/kernel/time_64.c | 2 +- + arch/sparc/kernel/traps_32.c | 1 + + arch/sparc/kernel/unaligned_32.c | 1 - + arch/sparc/kernel/vio.c | 1 + + arch/sparc/kernel/viohs.c | 2 +- + arch/sparc/mm/fault_32.c | 1 - + arch/sparc/mm/generic_32.c | 1 + + arch/sparc/mm/generic_64.c | 1 + + arch/sparc/mm/highmem.c | 1 + + arch/sparc/mm/hugetlbpage.c | 1 - + arch/unicore32/mm/init.c | 1 + + arch/x86/crypto/aes_glue.c | 1 + + arch/x86/crypto/aesni-intel_glue.c | 1 + + arch/x86/kernel/cpu/amd.c | 1 + + arch/x86/kernel/cpu/mcheck/mce-apei.c | 1 + + arch/x86/kernel/cpu/mcheck/mce.c | 1 + + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + + arch/x86/kernel/cpu/perf_event_intel.c | 1 + + arch/x86/kernel/devicetree.c | 1 + + arch/x86/kernel/e820.c | 1 + + arch/x86/kernel/hpet.c | 1 + + arch/x86/kernel/irq.c | 1 + + arch/x86/kernel/nmi.c | 1 + + arch/x86/kernel/pci-dma.c | 1 + + arch/x86/kernel/probe_roms.c | 4 +- + arch/x86/kernel/rtc.c | 1 + + arch/x86/kernel/smp.c | 1 + + arch/x86/kernel/tboot.c | 1 + + arch/x86/kernel/time.c | 1 + + arch/x86/kernel/topology.c | 1 + + arch/x86/kernel/vsyscall_64.c | 1 + + arch/x86/lguest/boot.c | 1 + + arch/x86/pci/i386.c | 1 + + arch/x86/pci/legacy.c | 1 + + arch/x86/platform/efi/efi.c | 1 + + arch/x86/platform/efi/efi_32.c | 1 + + arch/x86/platform/mrst/vrtc.c | 1 + + arch/x86/platform/olpc/olpc-xo1-pm.c | 1 + + arch/x86/platform/uv/bios_uv.c | 1 + + arch/x86/power/cpu.c | 1 + + arch/x86/video/fbdev.c | 1 + + block/blk-integrity.c | 1 + + block/bsg-lib.c | 2 +- + block/ioctl.c | 1 + + crypto/async_tx/async_memcpy.c | 1 + + crypto/async_tx/async_pq.c | 1 + + crypto/async_tx/async_raid6_recov.c | 1 + + crypto/async_tx/async_tx.c | 1 + + crypto/async_tx/async_xor.c | 1 + + crypto/async_tx/raid6test.c | 1 + + crypto/crypto_wq.c | 1 + + crypto/md4.c | 1 + + crypto/proc.c | 1 + + crypto/vmac.c | 1 + + crypto/xcbc.c | 1 + + drivers/acpi/acpica/evxface.c | 1 + + drivers/acpi/acpica/evxfevnt.c | 1 + + drivers/acpi/acpica/evxfgpe.c | 1 + + drivers/acpi/acpica/evxfregn.c | 1 + + drivers/acpi/acpica/hwsleep.c | 1 + + drivers/acpi/acpica/hwtimer.c | 1 + + drivers/acpi/acpica/hwxface.c | 1 + + drivers/acpi/acpica/nsxfeval.c | 1 + + drivers/acpi/acpica/nsxfname.c | 1 + + drivers/acpi/acpica/nsxfobj.c | 1 + + drivers/acpi/acpica/rsxface.c | 1 + + drivers/acpi/acpica/tbxface.c | 1 + + drivers/acpi/acpica/utdebug.c | 1 + + drivers/acpi/acpica/utdecode.c | 1 + + drivers/acpi/acpica/utglobal.c | 1 + + drivers/acpi/acpica/utxface.c | 1 + + drivers/acpi/acpica/utxferror.c | 1 + + drivers/acpi/atomicio.c | 2 +- + drivers/acpi/blacklist.c | 1 - + drivers/acpi/debugfs.c | 1 + + drivers/acpi/ec_sys.c | 1 + + drivers/acpi/event.c | 1 + + drivers/acpi/glue.c | 1 + + drivers/acpi/proc.c | 1 + + drivers/acpi/processor_core.c | 1 + + drivers/acpi/sbshc.c | 1 + + drivers/acpi/video_detect.c | 1 + + drivers/ata/libata-eh.c | 1 + + drivers/ata/libata-pmp.c | 1 + + drivers/ata/libata-scsi.c | 1 + + drivers/ata/libata-sff.c | 1 + + drivers/base/base.h | 1 + + drivers/base/dma-coherent.c | 1 + + drivers/base/dma-mapping.c | 1 + + drivers/base/hypervisor.c | 1 + + drivers/base/power/common.c | 2 +- + drivers/base/power/generic_ops.c | 1 + + drivers/base/power/main.c | 1 + + drivers/base/power/qos.c | 1 + + drivers/base/power/runtime.c | 1 + + drivers/base/power/sysfs.c | 1 + + drivers/base/power/trace.c | 1 + + drivers/base/power/wakeup.c | 1 + + drivers/base/regmap/regcache.c | 1 + + drivers/base/transport_class.c | 1 + + drivers/bcma/core.c | 1 + + drivers/bcma/driver_chipcommon.c | 1 + + drivers/bcma/driver_chipcommon_pmu.c | 1 + + drivers/bcma/driver_pci.c | 1 + + drivers/bcma/host_pci.c | 1 + + drivers/bcma/main.c | 1 + + drivers/block/aoe/aoeblk.c | 1 + + drivers/block/aoe/aoechr.c | 1 + + drivers/block/ps3disk.c | 1 + + drivers/block/ps3vram.c | 1 + + drivers/block/virtio_blk.c | 1 + + drivers/bluetooth/btmrvl_main.c | 2 + + drivers/bluetooth/btmrvl_sdio.c | 1 + + drivers/bluetooth/btwilink.c | 1 + + drivers/char/hw_random/virtio-rng.c | 1 + + drivers/char/mem.c | 1 + + drivers/char/ps3flash.c | 1 + + drivers/char/ramoops.c | 1 + + drivers/char/ttyprintk.c | 1 + + drivers/char/virtio_console.c | 1 + + drivers/clocksource/sh_cmt.c | 1 + + drivers/clocksource/sh_mtu2.c | 1 + + drivers/clocksource/sh_tmu.c | 1 + + drivers/cpufreq/cpufreq_stats.c | 1 + + drivers/cpufreq/s3c64xx-cpufreq.c | 1 + + drivers/cpuidle/cpuidle.c | 1 + + drivers/cpuidle/governors/ladder.c | 2 +- + drivers/cpuidle/governors/menu.c | 1 + + drivers/crypto/mv_cesa.c | 1 + + drivers/dca/dca-core.c | 1 + + drivers/dca/dca-sysfs.c | 1 + + drivers/dma/imx-dma.c | 1 + + drivers/dma/imx-sdma.c | 1 + + drivers/dma/intel_mid_dma.c | 1 + + drivers/dma/ipu/ipu_idmac.c | 1 + + drivers/dma/ste_dma40.c | 1 + + drivers/edac/mce_amd_inj.c | 1 + + drivers/firewire/core-iso.c | 1 + + drivers/firmware/google/gsmi.c | 1 + + drivers/gpio/gpio-74x164.c | 1 + + drivers/gpio/gpio-ep93xx.c | 1 + + drivers/gpio/gpio-mc33880.c | 1 + + drivers/gpio/gpio-mcp23s08.c | 1 + + drivers/gpio/gpio-ml-ioh.c | 1 + + drivers/gpio/gpio-mpc5200.c | 1 + + drivers/gpio/gpio-mxc.c | 1 + + drivers/gpio/gpio-mxs.c | 1 + + drivers/gpio/gpio-pcf857x.c | 1 + + drivers/gpio/gpio-pch.c | 1 + + drivers/gpio/gpio-xilinx.c | 1 + + drivers/gpu/drm/ati_pcigart.c | 1 + + drivers/gpu/drm/drm_buffer.c | 1 + + drivers/gpu/drm/drm_bufs.c | 1 + + drivers/gpu/drm/drm_cache.c | 1 + + drivers/gpu/drm/drm_crtc.c | 1 + + drivers/gpu/drm/drm_crtc_helper.c | 3 + + drivers/gpu/drm/drm_debugfs.c | 1 + + drivers/gpu/drm/drm_dma.c | 1 + + drivers/gpu/drm/drm_drv.c | 1 + + drivers/gpu/drm/drm_edid.c | 1 + + drivers/gpu/drm/drm_encoder_slave.c | 2 + + drivers/gpu/drm/drm_fb_helper.c | 1 + + drivers/gpu/drm/drm_fops.c | 1 + + drivers/gpu/drm/drm_hashtab.c | 1 + + drivers/gpu/drm/drm_ioc32.c | 1 + + drivers/gpu/drm/drm_irq.c | 1 + + drivers/gpu/drm/drm_memory.c | 1 + + drivers/gpu/drm/drm_mm.c | 1 + + drivers/gpu/drm/drm_modes.c | 1 + + drivers/gpu/drm/drm_pci.c | 1 + + drivers/gpu/drm/drm_platform.c | 1 + + drivers/gpu/drm/drm_proc.c | 1 + + drivers/gpu/drm/drm_sman.c | 1 + + drivers/gpu/drm/drm_sysfs.c | 1 + + drivers/gpu/drm/drm_usb.c | 1 + + drivers/gpu/drm/drm_vm.c | 1 + + drivers/gpu/drm/i2c/ch7006_drv.c | 2 + + drivers/gpu/drm/i2c/sil164_drv.c | 2 + + drivers/gpu/drm/i810/i810_drv.c | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_dma.c | 1 + + drivers/gpu/drm/i915/i915_drv.c | 1 + + drivers/gpu/drm/i915/intel_dp.c | 1 + + drivers/gpu/drm/i915/intel_i2c.c | 1 + + drivers/gpu/drm/i915/intel_sdvo.c | 1 + + drivers/gpu/drm/mga/mga_drv.c | 2 + + drivers/gpu/drm/mga/mga_warp.c | 1 + + drivers/gpu/drm/nouveau/nouveau_drv.c | 1 + + drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 + + drivers/gpu/drm/nouveau/nouveau_temp.c | 2 + + drivers/gpu/drm/nouveau/nvc0_graph.c | 1 + + drivers/gpu/drm/r128/r128_cce.c | 1 + + drivers/gpu/drm/r128/r128_drv.c | 2 + + drivers/gpu/drm/radeon/ni.c | 1 + + drivers/gpu/drm/radeon/r100.c | 1 + + drivers/gpu/drm/radeon/r600.c | 1 + + drivers/gpu/drm/radeon/r600_cp.c | 2 + + drivers/gpu/drm/radeon/radeon_cp.c | 2 + + drivers/gpu/drm/radeon/radeon_drv.c | 1 + + drivers/gpu/drm/radeon/radeon_i2c.c | 2 + + drivers/gpu/drm/savage/savage_drv.c | 2 + + drivers/gpu/drm/sis/sis_drv.c | 2 + + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 + + drivers/gpu/drm/ttm/ttm_tt.c | 1 + + drivers/gpu/drm/via/via_drv.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 + + drivers/hid/hid-axff.c | 1 + + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-dr.c | 1 + + drivers/hid/hid-emsff.c | 1 + + drivers/hid/hid-gaff.c | 1 + + drivers/hid/hid-holtekff.c | 1 + + drivers/hid/hid-picolcd.c | 1 + + drivers/hid/hid-pl.c | 1 + + drivers/hid/hid-roccat-common.c | 1 + + drivers/hid/hid-roccat.c | 1 + + drivers/hid/hid-sjoy.c | 1 + + drivers/hid/hid-tmff.c | 1 + + drivers/hid/hid-zpff.c | 1 + + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hwmon/ultra45_env.c | 1 + + drivers/i2c/busses/i2c-pxa-pci.c | 1 + + drivers/i2c/busses/i2c-sh7760.c | 1 + + drivers/i2c/busses/i2c-tegra.c | 1 + + drivers/i2c/i2c-boardinfo.c | 1 + + drivers/ide/buddha.c | 1 + + drivers/ide/cmd640.c | 1 + + drivers/ide/ide-acpi.c | 1 + + drivers/ide/ide-atapi.c | 1 + + drivers/ide/ide-disk_proc.c | 1 + + drivers/ide/ide-dma-sff.c | 1 + + drivers/ide/ide-dma.c | 1 + + drivers/ide/ide-eh.c | 1 + + drivers/ide/ide-floppy_proc.c | 1 + + drivers/ide/ide-io-std.c | 1 + + drivers/ide/ide-ioctls.c | 1 + + drivers/ide/ide-legacy.c | 1 + + drivers/ide/ide-lib.c | 1 + + drivers/ide/ide-pnp.c | 1 + + drivers/ide/ide-taskfile.c | 1 + + drivers/ide/ide-xfer-mode.c | 1 + + drivers/ide/macide.c | 1 + + drivers/ide/pmac.c | 1 + + drivers/ide/q40ide.c | 1 + + drivers/ide/setup-pci.c | 1 + + drivers/ide/tc86c001.c | 1 + + drivers/idle/intel_idle.c | 1 + + drivers/infiniband/core/addr.c | 1 + + drivers/infiniband/core/cm.c | 1 + + drivers/infiniband/core/cma.c | 1 + + drivers/infiniband/core/fmr_pool.c | 1 + + drivers/infiniband/core/iwcm.c | 1 + + drivers/infiniband/core/mad.c | 1 + + drivers/infiniband/core/multicast.c | 1 + + drivers/infiniband/core/netlink.c | 1 + + drivers/infiniband/core/packer.c | 1 + + drivers/infiniband/core/sysfs.c | 1 + + drivers/infiniband/core/ucma.c | 1 + + drivers/infiniband/core/ud_header.c | 1 + + drivers/infiniband/core/umem.c | 1 + + drivers/infiniband/core/uverbs_marshall.c | 1 + + drivers/infiniband/core/verbs.c | 1 + + drivers/infiniband/hw/cxgb4/qp.c | 3 + + drivers/infiniband/hw/ipath/ipath_diag.c | 1 + + drivers/infiniband/hw/ipath/ipath_driver.c | 1 + + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 + + drivers/infiniband/hw/ipath/ipath_init_chip.c | 1 + + drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + + drivers/infiniband/hw/mthca/mthca_catas.c | 1 + + drivers/infiniband/hw/mthca/mthca_cmd.c | 1 + + drivers/infiniband/hw/mthca/mthca_provider.c | 2 + + drivers/infiniband/hw/qib/qib_diag.c | 1 + + drivers/infiniband/hw/qib/qib_driver.c | 1 + + drivers/infiniband/hw/qib/qib_file_ops.c | 1 + + drivers/infiniband/hw/qib/qib_iba7220.c | 1 + + drivers/infiniband/hw/qib/qib_iba7322.c | 1 + + drivers/infiniband/hw/qib/qib_init.c | 1 + + drivers/infiniband/hw/qib/qib_pcie.c | 1 + + drivers/infiniband/hw/qib/qib_sd7220.c | 1 + + drivers/infiniband/hw/qib/qib_sdma.c | 1 + + drivers/infiniband/hw/qib/qib_tx.c | 1 + + drivers/infiniband/hw/qib/qib_verbs.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 + + drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + + drivers/input/input-compat.c | 1 + + drivers/input/input-mt.c | 1 + + drivers/input/input-polldev.c | 1 + + drivers/input/joystick/as5011.c | 1 + + drivers/input/keyboard/nomadik-ske-keypad.c | 1 + + drivers/input/keyboard/tnetv107x-keypad.c | 1 + + drivers/input/misc/ad714x.c | 1 + + drivers/input/misc/adxl34x.c | 1 + + drivers/input/misc/ati_remote2.c | 1 + + drivers/input/misc/cma3000_d0x.c | 1 + + drivers/input/misc/dm355evm_keys.c | 1 + + drivers/input/sparse-keymap.c | 1 + + drivers/input/touchscreen/ad7877.c | 1 + + drivers/input/touchscreen/ad7879-spi.c | 1 + + drivers/input/touchscreen/ad7879.c | 1 + + drivers/input/touchscreen/ads7846.c | 1 + + drivers/input/touchscreen/bu21013_ts.c | 1 + + drivers/iommu/intel-iommu.c | 1 + + drivers/isdn/capi/kcapi_proc.c | 1 + + drivers/isdn/gigaset/asyncdata.c | 1 + + drivers/isdn/gigaset/capi.c | 1 + + drivers/isdn/gigaset/dummyll.c | 1 + + drivers/isdn/gigaset/ev-layer.c | 1 + + drivers/isdn/gigaset/i4l.c | 1 + + drivers/isdn/gigaset/interface.c | 1 + + drivers/isdn/hardware/mISDN/mISDNisar.c | 1 + + drivers/isdn/i4l/isdn_tty.c | 1 + + drivers/isdn/mISDN/clock.c | 1 + + drivers/isdn/mISDN/dsp_audio.c | 1 + + drivers/isdn/mISDN/dsp_pipeline.c | 1 + + drivers/isdn/mISDN/socket.c | 1 + + drivers/leds/dell-led.c | 1 + + drivers/leds/leds-88pm860x.c | 1 + + drivers/leds/leds-asic3.c | 1 + + drivers/leds/leds-atmel-pwm.c | 1 + + drivers/leds/leds-cobalt-raq.c | 1 + + drivers/leds/leds-fsg.c | 1 + + drivers/leds/leds-gpio.c | 1 + + drivers/leds/leds-lm3530.c | 1 + + drivers/leds/leds-locomo.c | 1 + + drivers/leds/leds-lt3593.c | 1 + + drivers/leds/leds-net48xx.c | 1 + + drivers/leds/leds-net5501.c | 1 + + drivers/leds/leds-ns2.c | 1 + + drivers/leds/leds-s3c24xx.c | 1 + + drivers/leds/leds-wm831x-status.c | 1 + + drivers/leds/leds-wm8350.c | 1 + + drivers/leds/leds-wrap.c | 1 + + drivers/lguest/lguest_device.c | 1 + + drivers/lguest/lguest_user.c | 1 + + drivers/md/dm-exception-store.c | 1 + + drivers/md/dm-log-userspace-base.c | 1 + + drivers/md/dm-path-selector.c | 1 + + drivers/md/dm-raid.c | 1 + + drivers/md/dm-round-robin.c | 1 + + drivers/md/dm-service-time.c | 1 + + drivers/md/dm-snap-persistent.c | 1 + + drivers/md/dm-snap-transient.c | 1 + + drivers/md/dm-uevent.c | 1 + + drivers/md/faulty.c | 1 + + drivers/md/linear.c | 1 + + drivers/md/md.c | 1 + + drivers/md/multipath.c | 1 + + drivers/md/raid0.c | 1 + + drivers/md/raid1.c | 1 + + drivers/md/raid10.c | 1 + + drivers/md/raid5.c | 1 + + drivers/media/common/saa7146_core.c | 1 + + drivers/media/common/saa7146_fops.c | 1 + + drivers/media/common/saa7146_hlp.c | 1 + + drivers/media/common/saa7146_video.c | 1 + + drivers/media/common/tuners/tuner-types.c | 1 + + drivers/media/dvb/frontends/dibx000_common.c | 1 + + drivers/media/dvb/siano/sms-cards.c | 1 + + drivers/media/dvb/siano/smsendian.c | 1 + + drivers/media/dvb/siano/smssdio.c | 1 + + drivers/media/dvb/siano/smsusb.c | 1 + + drivers/media/media-device.c | 1 + + drivers/media/radio/radio-timb.c | 1 + + drivers/media/radio/radio-wl1273.c | 1 + + drivers/media/radio/si4713-i2c.c | 1 + + drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 + + drivers/media/rc/ir-jvc-decoder.c | 1 + + drivers/media/rc/ir-lirc-codec.c | 1 + + drivers/media/rc/ir-nec-decoder.c | 1 + + drivers/media/rc/ir-raw.c | 2 + + drivers/media/rc/ir-rc5-decoder.c | 1 + + drivers/media/rc/ir-rc5-sz-decoder.c | 1 + + drivers/media/rc/ir-rc6-decoder.c | 1 + + drivers/media/rc/ir-sony-decoder.c | 1 + + drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 + + drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 + + drivers/media/rc/keymaps/rc-anysee.c | 1 + + drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 + + drivers/media/rc/keymaps/rc-asus-pc39.c | 1 + + drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 + + .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 + + drivers/media/rc/keymaps/rc-avermedia.c | 1 + + drivers/media/rc/keymaps/rc-avertv-303.c | 1 + + drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 + + drivers/media/rc/keymaps/rc-behold-columbus.c | 1 + + drivers/media/rc/keymaps/rc-behold.c | 1 + + drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 + + drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 + + drivers/media/rc/keymaps/rc-cinergy.c | 1 + + drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 + + drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 + + drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 + + drivers/media/rc/keymaps/rc-digittrade.c | 1 + + drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 + + drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 + + drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 + + drivers/media/rc/keymaps/rc-em-terratec.c | 1 + + drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 + + drivers/media/rc/keymaps/rc-encore-enltv.c | 1 + + drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 + + drivers/media/rc/keymaps/rc-evga-indtube.c | 1 + + drivers/media/rc/keymaps/rc-eztv.c | 1 + + drivers/media/rc/keymaps/rc-flydvb.c | 1 + + drivers/media/rc/keymaps/rc-flyvideo.c | 1 + + drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 + + drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 + + drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 + + drivers/media/rc/keymaps/rc-gotview7135.c | 1 + + drivers/media/rc/keymaps/rc-hauppauge.c | 1 + + drivers/media/rc/keymaps/rc-imon-mce.c | 1 + + drivers/media/rc/keymaps/rc-imon-pad.c | 1 + + drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 + + drivers/media/rc/keymaps/rc-kaiomy.c | 1 + + drivers/media/rc/keymaps/rc-kworld-315u.c | 1 + + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 + + drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 + + drivers/media/rc/keymaps/rc-lirc.c | 1 + + drivers/media/rc/keymaps/rc-lme2510.c | 1 + + drivers/media/rc/keymaps/rc-manli.c | 1 + + drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 + + drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 + + drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 + + drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 + + drivers/media/rc/keymaps/rc-nebula.c | 1 + + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 + + drivers/media/rc/keymaps/rc-norwood.c | 1 + + drivers/media/rc/keymaps/rc-npgtech.c | 1 + + drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 + + drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 + + drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 + + drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 + + drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 + + drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 + + drivers/media/rc/keymaps/rc-pixelview-new.c | 1 + + drivers/media/rc/keymaps/rc-pixelview.c | 1 + + .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 + + drivers/media/rc/keymaps/rc-proteus-2309.c | 1 + + drivers/media/rc/keymaps/rc-purpletv.c | 1 + + drivers/media/rc/keymaps/rc-pv951.c | 1 + + drivers/media/rc/keymaps/rc-rc6-mce.c | 1 + + .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 + + drivers/media/rc/keymaps/rc-streamzap.c | 1 + + drivers/media/rc/keymaps/rc-tbs-nec.c | 1 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 + + drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 + + drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 + + drivers/media/rc/keymaps/rc-terratec-slim.c | 1 + + drivers/media/rc/keymaps/rc-tevii-nec.c | 1 + + drivers/media/rc/keymaps/rc-tivo.c | 1 + + drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 + + drivers/media/rc/keymaps/rc-trekstor.c | 1 + + drivers/media/rc/keymaps/rc-tt-1500.c | 1 + + drivers/media/rc/keymaps/rc-twinhan1027.c | 1 + + drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 + + drivers/media/rc/keymaps/rc-videomate-s350.c | 1 + + drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 + + drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 + + drivers/media/rc/keymaps/rc-winfast.c | 1 + + drivers/media/rc/rc-main.c | 1 + + drivers/media/video/adp1653.c | 1 + + drivers/media/video/ak881x.c | 1 + + drivers/media/video/cpia2/cpia2_usb.c | 1 + + drivers/media/video/cx25840/cx25840-ir.c | 1 + + drivers/media/video/davinci/dm355_ccdc.c | 1 + + drivers/media/video/davinci/dm644x_ccdc.c | 1 + + drivers/media/video/hdpvr/hdpvr-i2c.c | 1 + + drivers/media/video/hexium_gemini.c | 1 + + drivers/media/video/hexium_orion.c | 1 + + drivers/media/video/imx074.c | 1 + + drivers/media/video/m5mols/m5mols_core.c | 1 + + drivers/media/video/mt9m001.c | 1 + + drivers/media/video/mt9m111.c | 1 + + drivers/media/video/mt9t031.c | 1 + + drivers/media/video/mt9v011.c | 1 + + drivers/media/video/mt9v022.c | 1 + + drivers/media/video/mt9v032.c | 1 + + drivers/media/video/mxb.c | 1 + + drivers/media/video/noon010pc30.c | 1 + + drivers/media/video/omap24xxcam.c | 1 + + drivers/media/video/ov6650.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 + + drivers/media/video/rj54n1cb0c.c | 1 + + drivers/media/video/sh_mobile_csi2.c | 1 + + drivers/media/video/sh_vou.c | 1 + + drivers/media/video/sr030pc30.c | 1 + + drivers/media/video/tcm825x.c | 1 + + drivers/media/video/timblogiw.c | 1 + + drivers/media/video/tvp514x.c | 1 + + drivers/media/video/tvp5150.c | 1 + + drivers/media/video/tvp7002.c | 1 + + drivers/media/video/usbvision/usbvision-cards.c | 1 + + drivers/media/video/v4l2-ctrls.c | 1 + + drivers/media/video/v4l2-device.c | 1 + + drivers/media/video/v4l2-event.c | 1 + + drivers/media/video/v4l2-fh.c | 1 + + drivers/media/video/v4l2-int-device.c | 1 + + drivers/media/video/v4l2-subdev.c | 1 + + drivers/memstick/core/memstick.c | 1 + + drivers/memstick/core/mspro_block.c | 1 + + drivers/memstick/host/jmb38x_ms.c | 1 + + drivers/memstick/host/tifm_ms.c | 1 + + drivers/message/i2o/pci.c | 1 + + drivers/mfd/ab3100-core.c | 1 + + drivers/mfd/ab8500-debugfs.c | 1 + + drivers/mfd/ab8500-sysctrl.c | 1 + + drivers/mfd/abx500-core.c | 1 + + drivers/mfd/asic3.c | 1 + + drivers/mfd/dm355evm_msp.c | 1 + + drivers/mfd/max8997.c | 1 + + drivers/mfd/mfd-core.c | 1 + + drivers/mfd/pcf50633-irq.c | 1 + + drivers/mfd/tmio_core.c | 1 + + drivers/mfd/twl-core.c | 1 + + drivers/mfd/twl6030-irq.c | 1 + + drivers/mfd/wl1273-core.c | 1 + + drivers/mfd/wm8400-core.c | 1 + + drivers/misc/ab8500-pwm.c | 1 + + drivers/misc/atmel-ssc.c | 1 + + drivers/misc/atmel_tclib.c | 1 + + drivers/misc/bh1780gli.c | 1 + + drivers/misc/kgdbts.c | 1 + + drivers/misc/sgi-gru/grukservices.c | 1 + + drivers/misc/ti-st/st_kim.c | 1 + + drivers/misc/tifm_7xx1.c | 1 + + drivers/misc/tifm_core.c | 1 + + drivers/mmc/core/bus.c | 2 + + drivers/mmc/core/debugfs.c | 1 + + drivers/mmc/core/host.c | 1 + + drivers/mmc/core/mmc.c | 1 + + drivers/mmc/core/mmc_ops.c | 1 + + drivers/mmc/core/quirks.c | 1 + + drivers/mmc/core/sd.c | 1 + + drivers/mmc/core/sd_ops.c | 1 + + drivers/mmc/core/sdio_bus.c | 1 + + drivers/mmc/core/sdio_io.c | 1 + + drivers/mmc/core/sdio_irq.c | 1 + + drivers/mmc/host/sdhci-tegra.c | 1 + + drivers/mtd/ar7part.c | 1 + + drivers/mtd/cmdlinepart.c | 1 + + drivers/mtd/lpddr/lpddr_cmds.c | 1 + + drivers/mtd/mtdblock_ro.c | 1 + + drivers/mtd/mtdsuper.c | 1 + + drivers/mtd/nand/cafe_nand.c | 1 + + drivers/mtd/nand/cmx270_nand.c | 1 + + drivers/mtd/nand/diskonchip.c | 1 + + drivers/mtd/nand/nand_bbt.c | 1 + + drivers/mtd/nand/omap2.c | 1 + + drivers/mtd/nand/sm_common.c | 1 + + drivers/mtd/onenand/onenand_bbt.c | 1 + + drivers/mtd/redboot.c | 1 + + drivers/mtd/rfd_ftl.c | 1 + + drivers/mtd/ubi/vmt.c | 1 + + drivers/net/bonding/bond_procfs.c | 1 + + drivers/net/ethernet/brocade/bna/bnad.c | 1 + + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 1 + + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 1 + + drivers/net/ethernet/emulex/benet/be_main.c | 1 + + drivers/net/ethernet/ethoc.c | 1 + + drivers/net/ethernet/freescale/ucc_geth.c | 1 + + drivers/net/ethernet/intel/e1000e/param.c | 1 + + drivers/net/ethernet/mellanox/mlx4/alloc.c | 1 + + drivers/net/ethernet/mellanox/mlx4/catas.c | 1 + + drivers/net/ethernet/mellanox/mlx4/cmd.c | 1 + + drivers/net/ethernet/mellanox/mlx4/cq.c | 1 + + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 1 + + drivers/net/ethernet/mellanox/mlx4/eq.c | 1 + + drivers/net/ethernet/mellanox/mlx4/fw.c | 1 + + drivers/net/ethernet/mellanox/mlx4/intf.c | 1 + + drivers/net/ethernet/mellanox/mlx4/mcg.c | 1 + + drivers/net/ethernet/mellanox/mlx4/mr.c | 1 + + drivers/net/ethernet/mellanox/mlx4/pd.c | 1 + + drivers/net/ethernet/mellanox/mlx4/port.c | 1 + + drivers/net/ethernet/mellanox/mlx4/qp.c | 1 + + drivers/net/ethernet/mellanox/mlx4/srq.c | 1 + + drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 + + drivers/net/ethernet/octeon/octeon_mgmt.c | 1 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 1 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 1 + + drivers/net/ethernet/sfc/rx.c | 1 + + drivers/net/ethernet/smsc/smsc9420.c | 1 + + drivers/net/ethernet/xscale/ixp4xx_eth.c | 1 + + drivers/net/phy/realtek.c | 1 + + drivers/net/usb/lg-vl600.c | 1 + + drivers/net/veth.c | 1 + + drivers/net/vmxnet3/vmxnet3_drv.c | 1 + + drivers/net/wimax/i2400m/control.c | 2 + + drivers/net/wimax/i2400m/debugfs.c | 1 + + drivers/net/wimax/i2400m/fw.c | 1 + + drivers/net/wimax/i2400m/netdev.c | 1 + + drivers/net/wimax/i2400m/rx.c | 2 + + drivers/net/wimax/i2400m/sdio.c | 1 + + drivers/net/wimax/i2400m/tx.c | 1 + + drivers/net/wimax/i2400m/usb.c | 1 + + drivers/net/wireless/adm8211.c | 1 + + drivers/net/wireless/ath/ath5k/debug.c | 3 +- + drivers/net/wireless/ath/ath5k/pci.c | 1 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 + + drivers/net/wireless/ath/ath6kl/debug.c | 1 + + drivers/net/wireless/ath/ath6kl/sdio.c | 1 + + drivers/net/wireless/ath/ath9k/ahb.c | 1 + + drivers/net/wireless/ath/ath9k/ani.c | 1 + + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 1 + + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 1 + + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 1 + + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 1 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 1 + + drivers/net/wireless/ath/ath9k/btcoex.c | 1 + + drivers/net/wireless/ath/ath9k/calib.c | 1 + + drivers/net/wireless/ath/ath9k/debug.c | 1 + + drivers/net/wireless/ath/ath9k/hw.c | 1 + + drivers/net/wireless/ath/ath9k/init.c | 1 + + drivers/net/wireless/ath/ath9k/mac.c | 1 + + drivers/net/wireless/ath/ath9k/pci.c | 1 + + drivers/net/wireless/ath/ath9k/rc.c | 1 + + drivers/net/wireless/ath/carl9170/fw.c | 1 + + drivers/net/wireless/ath/debug.c | 1 + + drivers/net/wireless/ath/hw.c | 1 + + drivers/net/wireless/ath/key.c | 1 + + drivers/net/wireless/ath/regd.c | 1 + + drivers/net/wireless/b43/main.c | 2 +- + drivers/net/wireless/b43/pcmcia.c | 1 + + drivers/net/wireless/b43legacy/main.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 1 + + drivers/net/wireless/hostap/hostap_80211_rx.c | 1 + + drivers/net/wireless/hostap/hostap_80211_tx.c | 1 + + drivers/net/wireless/hostap/hostap_ap.c | 2 + + drivers/net/wireless/hostap/hostap_info.c | 1 + + drivers/net/wireless/hostap/hostap_ioctl.c | 1 + + drivers/net/wireless/hostap/hostap_proc.c | 1 + + drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1 + + drivers/net/wireless/iwlegacy/iwl-rx.c | 1 + + drivers/net/wireless/iwlegacy/iwl-scan.c | 1 + + drivers/net/wireless/iwlegacy/iwl-sta.c | 1 + + drivers/net/wireless/iwlegacy/iwl-tx.c | 1 + + drivers/net/wireless/iwlwifi/iwl-pci.c | 1 + + drivers/net/wireless/iwmc3200wifi/commands.c | 1 + + drivers/net/wireless/iwmc3200wifi/debugfs.c | 1 + + drivers/net/wireless/iwmc3200wifi/main.c | 1 + + drivers/net/wireless/iwmc3200wifi/sdio.c | 1 + + drivers/net/wireless/libertas/cmd.c | 1 + + drivers/net/wireless/libertas/debugfs.c | 1 + + drivers/net/wireless/libertas/if_sdio.c | 2 +- + drivers/net/wireless/libertas/if_spi.c | 2 +- + drivers/net/wireless/libertas/if_usb.c | 2 +- + drivers/net/wireless/libertas/main.c | 2 +- + drivers/net/wireless/libertas/rx.c | 1 + + drivers/net/wireless/libertas/tx.c | 1 + + drivers/net/wireless/libertas_tf/cmd.c | 1 + + drivers/net/wireless/libertas_tf/if_usb.c | 2 +- + drivers/net/wireless/libertas_tf/main.c | 1 + + drivers/net/wireless/mac80211_hwsim.c | 1 + + drivers/net/wireless/orinoco/fw.c | 1 + + drivers/net/wireless/p54/eeprom.c | 1 + + drivers/net/wireless/p54/fwio.c | 1 + + drivers/net/wireless/p54/main.c | 1 + + drivers/net/wireless/p54/p54pci.c | 1 + + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/p54/txrx.c | 1 + + drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 + + drivers/net/wireless/rtl818x/rtl8187/dev.c | 1 + + drivers/net/wireless/rtlwifi/base.c | 1 + + drivers/net/wireless/rtlwifi/cam.c | 1 + + drivers/net/wireless/rtlwifi/efuse.c | 1 + + drivers/net/wireless/rtlwifi/pci.c | 1 + + drivers/net/wireless/rtlwifi/ps.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192c/main.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 1 + + drivers/net/wireless/rtlwifi/usb.c | 1 + + drivers/net/wireless/wl12xx/boot.c | 1 + + drivers/net/wireless/zd1211rw/zd_usb.c | 1 + + drivers/nfc/nfcwilink.c | 1 + + drivers/of/of_net.c | 1 + + drivers/of/of_pci.c | 1 + + drivers/of/of_pci_irq.c | 1 + + drivers/of/of_spi.c | 1 + + drivers/parisc/ccio-dma.c | 1 + + drivers/parisc/sba_iommu.c | 1 + + drivers/pci/ats.c | 1 + + drivers/pci/hotplug-pci.c | 1 + + drivers/pci/hotplug/pciehp_acpi.c | 1 + + drivers/pci/hotplug/pcihp_slot.c | 1 + + drivers/pci/hotplug/rpadlpar_core.c | 1 + + drivers/pci/htirq.c | 1 + + drivers/pci/ioapic.c | 1 + + drivers/pci/iov.c | 1 + + drivers/pci/irq.c | 1 + + drivers/pci/msi.c | 1 + + drivers/pci/pci-sysfs.c | 1 + + drivers/pci/quirks.c | 1 + + drivers/pci/rom.c | 1 + + drivers/pci/setup-res.c | 1 + + drivers/pci/slot.c | 1 + + drivers/pci/vpd.c | 1 + + drivers/pcmcia/db1xxx_ss.c | 1 + + drivers/pcmcia/pxa2xx_cm_x255.c | 1 + + drivers/pcmcia/pxa2xx_cm_x270.c | 1 + + drivers/pinctrl/core.c | 1 + + drivers/platform/x86/intel_scu_ipc.c | 1 + + drivers/platform/x86/msi-wmi.c | 1 + + drivers/platform/x86/wmi.c | 1 + + drivers/pnp/pnpacpi/core.c | 1 + + drivers/power/max17042_battery.c | 1 + + drivers/power/max8903_charger.c | 1 + + drivers/power/max8997_charger.c | 1 + + drivers/power/max8998_charger.c | 1 + + drivers/power/power_supply_sysfs.c | 1 + + drivers/ps3/ps3stor_lib.c | 1 + + drivers/ps3/sys-manager-core.c | 1 + + drivers/rapidio/switches/idt_gen2.c | 1 + + drivers/regulator/88pm8607.c | 1 + + drivers/regulator/ab8500.c | 1 + + drivers/regulator/bq24022.c | 1 + + drivers/regulator/core.c | 1 + + drivers/regulator/da903x.c | 1 + + drivers/regulator/db8500-prcmu.c | 1 + + drivers/regulator/dummy.c | 1 + + drivers/regulator/fixed.c | 1 + + drivers/regulator/lp3971.c | 1 + + drivers/regulator/lp3972.c | 1 + + drivers/regulator/max8925-regulator.c | 1 + + drivers/regulator/max8997.c | 1 + + drivers/regulator/mc13783-regulator.c | 1 + + drivers/regulator/mc13892-regulator.c | 1 + + drivers/regulator/mc13xxx-regulator-core.c | 1 + + drivers/regulator/tps6586x-regulator.c | 1 + + drivers/regulator/userspace-consumer.c | 1 + + drivers/regulator/virtual.c | 1 + + drivers/regulator/wm8400-regulator.c | 1 + + drivers/rtc/interface.c | 1 + + drivers/rtc/rtc-dm355evm.c | 1 + + drivers/rtc/rtc-ds1305.c | 1 + + drivers/rtc/rtc-ds1511.c | 1 + + drivers/rtc/rtc-ds1553.c | 1 + + drivers/rtc/rtc-ds1672.c | 1 + + drivers/rtc/rtc-ds1742.c | 1 + + drivers/rtc/rtc-em3027.c | 1 + + drivers/rtc/rtc-isl12022.c | 1 + + drivers/rtc/rtc-mv.c | 1 + + drivers/rtc/rtc-pcf2123.c | 1 + + drivers/rtc/rtc-pcf8563.c | 1 + + drivers/rtc/rtc-rs5c348.c | 1 + + drivers/rtc/rtc-rs5c372.c | 1 + + drivers/rtc/rtc-stk17ta8.c | 1 + + drivers/rtc/rtc-tx4939.c | 1 + + drivers/rtc/rtc-x1205.c | 1 + + drivers/s390/char/fs3270.c | 1 + + drivers/s390/char/sclp_cpi_sys.c | 1 + + drivers/s390/char/vmcp.c | 1 + + drivers/s390/char/vmur.c | 1 + + drivers/s390/cio/chp.c | 2 + + drivers/s390/cio/qdio_debug.c | 2 + + drivers/s390/cio/qdio_setup.c | 1 + + drivers/s390/kvm/kvm_virtio.c | 1 + + drivers/s390/scsi/zfcp_aux.c | 1 + + drivers/s390/scsi/zfcp_ccw.c | 1 + + drivers/s390/scsi/zfcp_dbf.c | 1 + + drivers/s390/scsi/zfcp_qdio.c | 1 + + drivers/s390/scsi/zfcp_scsi.c | 1 + + drivers/scsi/a2091.c | 1 + + drivers/scsi/a3000.c | 1 + + drivers/scsi/aacraid/aachba.c | 1 + + drivers/scsi/be2iscsi/be_main.c | 1 + + drivers/scsi/bfa/bfad_debugfs.c | 1 + + drivers/scsi/bfa/bfad_im.c | 2 + + drivers/scsi/cxgbi/libcxgbi.c | 1 + + drivers/scsi/device_handler/scsi_dh.c | 1 + + drivers/scsi/device_handler/scsi_dh_alua.c | 1 + + drivers/scsi/device_handler/scsi_dh_emc.c | 1 + + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 + + drivers/scsi/device_handler/scsi_dh_rdac.c | 1 + + drivers/scsi/gvp11.c | 1 + + drivers/scsi/iscsi_tcp.c | 1 + + drivers/scsi/libfc/fc_disc.c | 1 + + drivers/scsi/libfc/fc_elsct.c | 1 + + drivers/scsi/libfc/fc_exch.c | 1 + + drivers/scsi/libfc/fc_libfc.c | 1 + + drivers/scsi/libfc/fc_lport.c | 1 + + drivers/scsi/libfc/fc_npiv.c | 1 + + drivers/scsi/libfc/fc_rport.c | 1 + + drivers/scsi/libiscsi.c | 1 + + drivers/scsi/libiscsi_tcp.c | 1 + + drivers/scsi/libsas/sas_host_smp.c | 1 + + drivers/scsi/libsas/sas_scsi_host.c | 1 + + drivers/scsi/libsas/sas_task.c | 1 + + drivers/scsi/libsrp.c | 1 + + drivers/scsi/lpfc/lpfc_attr.c | 1 + + drivers/scsi/lpfc/lpfc_debugfs.c | 1 + + drivers/scsi/lpfc/lpfc_init.c | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 1 + + drivers/scsi/mac53c94.c | 1 + + drivers/scsi/megaraid/megaraid_mbox.c | 1 + + drivers/scsi/osd/osd_initiator.c | 1 + + drivers/scsi/ps3rom.c | 1 + + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/scsi_lib_dma.c | 1 + + drivers/scsi/scsi_netlink.c | 1 + + drivers/scsi/scsi_pm.c | 1 + + drivers/scsi/scsi_tgt_if.c | 1 + + drivers/scsi/sr_ioctl.c | 1 + + drivers/sfi/sfi_core.h | 3 + + drivers/sh/intc/core.c | 2 + + drivers/sh/intc/dynamic.c | 1 + + drivers/sh/intc/virq.c | 1 + + drivers/sh/maple/maple.c | 1 + + drivers/spi/spi-altera.c | 1 + + drivers/spi/spi-au1550.c | 1 + + drivers/spi/spi-bitbang.c | 1 + + drivers/spi/spi-butterfly.c | 1 + + drivers/spi/spi-dw-mmio.c | 1 + + drivers/spi/spi-dw-pci.c | 1 + + drivers/spi/spi-dw.c | 1 + + drivers/spi/spi-gpio.c | 1 + + drivers/spi/spi-oc-tiny.c | 1 + + drivers/spi/spi-omap-uwire.c | 1 + + drivers/spi/spi-orion.c | 1 + + drivers/spi/spi-pxa2xx-pci.c | 1 + + drivers/spi/spi-s3c24xx.c | 1 + + drivers/spi/spi-sh-msiof.c | 1 + + drivers/spi/spi-sh-sci.c | 1 + + drivers/spi/spi-ti-ssp.c | 1 + + drivers/spi/spi-tle62x0.c | 1 + + drivers/spi/spi-txx9.c | 1 + + drivers/spi/spi.c | 1 + + drivers/ssb/b43_pci_bridge.c | 1 + + drivers/ssb/driver_chipcommon.c | 1 + + drivers/ssb/driver_chipcommon_pmu.c | 1 + + drivers/ssb/driver_gige.c | 1 + + drivers/ssb/driver_pcicore.c | 1 + + drivers/ssb/embedded.c | 1 + + drivers/ssb/main.c | 1 + + drivers/ssb/pcihost_wrapper.c | 1 + + drivers/staging/cxt1e1/linux.c | 1 + + drivers/staging/gma500/intel_i2c.c | 1 + + drivers/staging/gma500/mdfld_dsi_output.c | 1 + + drivers/staging/gma500/mdfld_output.c | 3 +- + drivers/staging/gma500/mid_bios.c | 1 + + drivers/staging/gma500/mrst_hdmi_i2c.c | 1 + + drivers/staging/gma500/psb_drv.c | 1 + + drivers/staging/iio/accel/adis16201_ring.c | 1 + + drivers/staging/iio/accel/adis16201_trigger.c | 1 + + drivers/staging/iio/accel/adis16203_ring.c | 1 + + drivers/staging/iio/accel/adis16203_trigger.c | 1 + + drivers/staging/iio/accel/adis16204_ring.c | 1 + + drivers/staging/iio/accel/adis16204_trigger.c | 1 + + drivers/staging/iio/accel/adis16209_ring.c | 1 + + drivers/staging/iio/accel/adis16209_trigger.c | 1 + + drivers/staging/iio/accel/adis16240_ring.c | 1 + + drivers/staging/iio/accel/adis16240_trigger.c | 1 + + drivers/staging/iio/accel/lis3l02dq_ring.c | 1 + + drivers/staging/iio/adc/ad7793.c | 1 + + drivers/staging/iio/dac/ad5686.c | 1 + + drivers/staging/iio/gyro/adis16060_core.c | 1 + + drivers/staging/iio/gyro/adis16260_ring.c | 1 + + drivers/staging/iio/gyro/adis16260_trigger.c | 1 + + drivers/staging/iio/iio_simple_dummy_buffer.c | 1 + + drivers/staging/iio/imu/adis16400_ring.c | 1 + + drivers/staging/iio/imu/adis16400_trigger.c | 1 + + drivers/staging/iio/industrialio-buffer.c | 1 + + drivers/staging/iio/meter/ade7758_ring.c | 1 + + drivers/staging/iio/meter/ade7758_trigger.c | 1 + + drivers/staging/intel_sst/intel_sst.c | 1 + + .../staging/intel_sst/intel_sst_drv_interface.c | 1 + + drivers/staging/line6/audio.c | 1 + + drivers/staging/media/solo6x10/g723.c | 1 + + drivers/staging/rts5139/rts51x_scsi.c | 1 + + drivers/staging/usbip/usbip_common.c | 1 + + drivers/staging/usbip/usbip_event.c | 1 + + drivers/staging/winbond/wbusb.c | 1 + + drivers/staging/wlags49_h2/wl_cs.c | 1 + + drivers/target/iscsi/iscsi_target.c | 1 + + drivers/target/iscsi/iscsi_target_configfs.c | 1 + + drivers/target/iscsi/iscsi_target_stat.c | 1 + + drivers/target/target_core_alua.c | 1 + + drivers/target/target_core_device.c | 1 + + drivers/target/target_core_fabric_lib.c | 1 + + drivers/target/target_core_file.c | 1 + + drivers/target/target_core_hba.c | 1 + + drivers/target/target_core_iblock.c | 1 + + drivers/target/target_core_pscsi.c | 1 + + drivers/target/target_core_tmr.c | 1 + + drivers/target/target_core_tpg.c | 1 + + drivers/target/target_core_transport.c | 1 + + drivers/tty/hvc/hvc_iseries.c | 1 + + drivers/tty/hvc/hvc_vio.c | 1 + + drivers/tty/serial/jsm/jsm_driver.c | 2 +- + drivers/tty/serial/kgdboc.c | 1 + + drivers/tty/serial/max3100.c | 1 + + drivers/tty/serial/max3107-aava.c | 1 + + drivers/tty/serial/max3107.c | 1 + + drivers/tty/serial/nwpserial.c | 1 + + drivers/tty/serial/timbuart.c | 1 + + drivers/tty/serial/xilinx_uartps.c | 1 + + drivers/tty/vt/vc_screen.c | 1 + + drivers/uio/uio_pdrv.c | 1 + + drivers/uio/uio_pdrv_genirq.c | 1 + + drivers/usb/c67x00/c67x00-drv.c | 1 + + drivers/usb/core/driver.c | 1 + + drivers/usb/core/notify.c | 1 + + drivers/usb/gadget/cdc2.c | 1 + + drivers/usb/gadget/composite.c | 1 + + drivers/usb/gadget/dbgp.c | 1 + + drivers/usb/gadget/f_fs.c | 1 + + drivers/usb/gadget/f_obex.c | 1 + + drivers/usb/gadget/f_sourcesink.c | 1 + + drivers/usb/gadget/file_storage.c | 1 + + drivers/usb/gadget/fusb300_udc.c | 1 + + drivers/usb/gadget/gmidi.c | 1 + + drivers/usb/gadget/u_serial.c | 1 + + drivers/usb/host/fsl-mph-dr-of.c | 1 + + drivers/usb/host/isp1760-if.c | 1 + + drivers/usb/host/pci-quirks.c | 1 + + drivers/usb/host/whci/debug.c | 1 + + drivers/usb/host/whci/hcd.c | 1 + + drivers/usb/host/xhci-hub.c | 1 + + drivers/usb/host/xhci-pci.c | 1 + + drivers/usb/mon/mon_bin.c | 1 + + drivers/usb/mon/mon_stat.c | 1 + + drivers/usb/mon/mon_text.c | 1 + + drivers/usb/otg/gpio_vbus.c | 1 + + drivers/usb/otg/otg.c | 1 + + drivers/usb/otg/ulpi.c | 1 + + drivers/usb/serial/aircable.c | 1 + + drivers/usb/serial/qcserial.c | 1 + + drivers/usb/storage/option_ms.c | 1 + + drivers/usb/storage/protocol.c | 1 + + drivers/usb/storage/sierra_ms.c | 1 + + drivers/usb/storage/transport.c | 1 + + drivers/usb/storage/uas.c | 1 + + drivers/usb/wusbcore/devconnect.c | 1 + + drivers/usb/wusbcore/mmc.c | 1 + + drivers/usb/wusbcore/rh.c | 1 + + drivers/usb/wusbcore/security.c | 1 + + drivers/usb/wusbcore/wa-hc.c | 1 + + drivers/usb/wusbcore/wa-rpipe.c | 1 + + drivers/usb/wusbcore/wa-xfer.c | 1 + + drivers/uwb/est.c | 1 + + drivers/uwb/i1480/dfu/dfu.c | 1 + + drivers/uwb/ie.c | 1 + + drivers/uwb/lc-dev.c | 2 + + drivers/uwb/lc-rc.c | 1 + + drivers/uwb/neh.c | 1 + + drivers/uwb/pal.c | 1 + + drivers/uwb/radio.c | 1 + + drivers/uwb/reset.c | 1 + + drivers/uwb/rsv.c | 1 + + drivers/uwb/scan.c | 1 + + drivers/uwb/umc-bus.c | 1 + + drivers/uwb/umc-dev.c | 1 + + drivers/uwb/umc-drv.c | 1 + + drivers/uwb/whci.c | 1 + + drivers/video/atmel_lcdfb.c | 1 + + drivers/video/backlight/88pm860x_bl.c | 1 + + drivers/video/backlight/adp5520_bl.c | 1 + + drivers/video/backlight/ams369fg06.c | 1 + + drivers/video/backlight/da903x_bl.c | 1 + + drivers/video/backlight/ep93xx_bl.c | 1 + + drivers/video/backlight/l4f00242t03.c | 1 + + drivers/video/backlight/ld9040.c | 1 + + drivers/video/backlight/lms283gf05.c | 1 + + drivers/video/backlight/max8925_bl.c | 1 + + drivers/video/backlight/s6e63m0.c | 1 + + drivers/video/backlight/wm831x_bl.c | 1 + + drivers/video/carminefb.c | 1 + + drivers/video/cobalt_lcdfb.c | 1 + + drivers/video/ep93xx-fb.c | 1 + + drivers/video/fb_ddc.c | 3 +- + drivers/video/fb_notify.c | 1 + + drivers/video/mb862xx/mb862xx-i2c.c | 1 + + drivers/video/mb862xx/mb862xxfbdrv.c | 1 + + drivers/video/msm/mdp.c | 1 + + drivers/video/omap/lcd_mipid.c | 1 + + drivers/video/omap/omapfb_main.c | 1 + + drivers/video/omap2/dss/dispc.c | 1 + + drivers/video/omap2/dss/dpi.c | 1 + + drivers/video/omap2/dss/dsi.c | 1 + + drivers/video/omap2/dss/dss.c | 1 + + drivers/video/omap2/dss/rfbi.c | 1 + + drivers/video/omap2/dss/sdi.c | 1 + + drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 + + drivers/video/savage/savagefb_accel.c | 1 + + drivers/video/sh_mipi_dsi.c | 1 + + drivers/video/sh_mobile_lcdcfb.c | 1 + + drivers/video/via/via-gpio.c | 1 + + drivers/video/w100fb.c | 1 + + drivers/virtio/virtio.c | 1 + + drivers/virtio/virtio_balloon.c | 1 + + drivers/virtio/virtio_ring.c | 1 + + drivers/w1/w1_family.c | 1 + + drivers/w1/w1_int.c | 2 + + drivers/watchdog/stmp3xxx_wdt.c | 1 + + drivers/xen/balloon.c | 1 + + drivers/xen/manage.c | 1 + + drivers/xen/swiotlb-xen.c | 1 + + drivers/xen/xen-pciback/conf_space.c | 1 + + drivers/xen/xenbus/xenbus_client.c | 1 + + drivers/xen/xenbus/xenbus_probe.c | 1 + + drivers/xen/xenbus/xenbus_probe_backend.c | 1 + + drivers/xen/xenbus/xenbus_probe_frontend.c | 1 + + drivers/zorro/proc.c | 1 + + fs/bio-integrity.c | 1 + + fs/cifs/connect.c | 1 + + fs/exofs/ore.c | 1 + + fs/exofs/super.c | 1 + + fs/fuse/cuse.c | 1 + + fs/gfs2/ops_fstype.c | 1 + + fs/ioprio.c | 1 + + fs/jfs/jfs_logmgr.c | 1 + + fs/logfs/super.c | 1 + + fs/nfs/nfs4filelayout.c | 1 + + fs/nfs/pagelist.c | 1 + + fs/nfs/pnfs.c | 1 + + fs/nfs/pnfs_dev.c | 1 + + fs/nfs/write.c | 1 + + fs/nfsd/nfs4acl.c | 1 + + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/nfssvc.c | 1 + + fs/ocfs2/cluster/tcp.c | 1 + + fs/ocfs2/dlm/dlmdebug.c | 1 + + fs/proc/vmcore.c | 1 + + include/acpi/platform/aclinux.h | 1 - + include/drm/drmP.h | 3 +- + include/linux/bcma/bcma.h | 7 +- + include/linux/blkdev.h | 2 +- + include/linux/cpuidle.h | 3 +- + include/linux/crypto.h | 6 -- + include/linux/device.h | 15 ++- + include/linux/device_cgroup.h | 1 - + include/linux/dmaengine.h | 2 + + include/linux/export.h | 89 ++++++++++++++++++++ + include/linux/firmware.h | 2 +- + include/linux/ftrace.h | 2 +- + include/linux/gameport.h | 17 ++-- + include/linux/hid.h | 9 +- + include/linux/i2c.h | 10 +- + include/linux/ipmi.h | 3 +- + include/linux/ipmi_smi.h | 1 - + include/linux/irq.h | 32 +++----- + include/linux/irqdesc.h | 1 + + include/linux/mdio-bitbang.h | 3 +- + include/linux/miscdevice.h | 3 +- + include/linux/module.h | 73 +---------------- + include/linux/moduleparam.h | 5 + + include/linux/mtd/mtd.h | 3 +- + include/linux/of.h | 1 + + include/linux/of_platform.h | 1 - + include/linux/pci_hotplug.h | 10 +-- + include/linux/pm_runtime.h | 1 + + include/linux/regmap.h | 2 +- + include/linux/regulator/driver.h | 1 + + include/linux/serio.h | 20 +++-- + include/linux/ssb/ssb.h | 7 +- + include/linux/stop_machine.h | 1 + + include/linux/sunrpc/svc_xprt.h | 3 +- + include/linux/sysdev.h | 1 - + include/linux/textsearch.h | 3 +- + include/linux/uio_driver.h | 12 ++-- + include/linux/usb.h | 9 +- + include/linux/uwb.h | 1 + + include/linux/uwb/umc.h | 7 +- + include/linux/vermagic.h | 1 - + include/linux/vlynq.h | 3 +- + include/media/saa7146.h | 3 +- + include/media/v4l2-int-device.h | 3 +- + include/net/bluetooth/hci_core.h | 24 +++--- + include/net/inet_timewait_sock.h | 1 - + include/net/ip_vs.h | 15 ++-- + include/net/lib80211.h | 3 +- + include/net/netfilter/nf_conntrack.h | 2 + + include/net/sch_generic.h | 1 - + include/net/sock.h | 2 +- + include/sound/core.h | 2 +- + include/trace/define_trace.h | 10 -- + include/trace/events/module.h | 2 +- + include/xen/xenbus.h | 1 + + kernel/async.c | 2 +- + kernel/audit.c | 2 +- + kernel/auditsc.c | 2 +- + kernel/capability.c | 2 +- + kernel/cgroup_freezer.c | 2 +- + kernel/compat.c | 1 + + kernel/cpu.c | 2 +- + kernel/cpuset.c | 2 +- + kernel/crash_dump.c | 2 +- + kernel/cred.c | 2 +- + kernel/debug/kdb/kdb_debugger.c | 1 + + kernel/dma.c | 2 +- + kernel/events/core.c | 1 + + kernel/freezer.c | 2 +- + kernel/futex.c | 2 +- + kernel/groups.c | 2 +- + kernel/hrtimer.c | 2 +- + kernel/hung_task.c | 2 +- + kernel/irq/generic-chip.c | 1 + + kernel/irq/irqdesc.c | 2 +- + kernel/irq_work.c | 4 +- + kernel/kfifo.c | 2 +- + kernel/kprobes.c | 2 +- + kernel/ksysfs.c | 3 +- + kernel/kthread.c | 2 +- + kernel/latencytop.c | 2 +- + kernel/lockdep_proc.c | 2 +- + kernel/module.c | 2 +- + kernel/mutex-debug.c | 2 +- + kernel/mutex.c | 2 +- + kernel/notifier.c | 2 +- + kernel/nsproxy.c | 2 +- + kernel/padata.c | 2 +- + kernel/params.c | 2 +- + kernel/pid.c | 2 +- + kernel/posix-timers.c | 2 +- + kernel/power/hibernate.c | 1 + + kernel/power/main.c | 1 + + kernel/power/qos.c | 1 + + kernel/power/suspend.c | 2 + + kernel/power/user.c | 1 + + kernel/profile.c | 2 +- + kernel/ptrace.c | 2 +- + kernel/range.c | 2 +- + kernel/rcupdate.c | 2 +- + kernel/rcutiny.c | 3 +- + kernel/rcutiny_plugin.h | 1 + + kernel/rcutree.c | 2 +- + kernel/relay.c | 2 +- + kernel/resource.c | 2 +- + kernel/rtmutex-debug.c | 2 +- + kernel/rtmutex-tester.c | 2 +- + kernel/rtmutex.c | 2 +- + kernel/rwsem.c | 2 +- + kernel/sched_clock.c | 2 +- + kernel/semaphore.c | 2 +- + kernel/signal.c | 2 +- + kernel/smp.c | 2 +- + kernel/softirq.c | 2 +- + kernel/spinlock.c | 2 +- + kernel/srcu.c | 2 +- + kernel/stacktrace.c | 2 +- + kernel/stop_machine.c | 2 +- + kernel/sys.c | 3 +- + kernel/time.c | 2 +- + kernel/time/posix-clock.c | 1 + + kernel/timer.c | 2 +- + kernel/trace/blktrace.c | 1 + + kernel/trace/ftrace.c | 1 + + kernel/trace/trace_syscalls.c | 1 + + kernel/up.c | 2 +- + kernel/user-return-notifier.c | 2 +- + kernel/user.c | 2 +- + kernel/user_namespace.c | 2 +- + kernel/utsname.c | 2 +- + kernel/utsname_sysctl.c | 2 +- + kernel/wait.c | 2 +- + kernel/workqueue.c | 2 +- + lib/dma-debug.c | 1 + + lib/raid6/algos.c | 1 + + lib/raid6/mktables.c | 1 + + lib/raid6/recov.c | 1 + + mm/bootmem.c | 2 +- + mm/bounce.c | 2 +- + mm/dmapool.c | 3 +- + mm/filemap.c | 2 +- + mm/filemap_xip.c | 2 +- + mm/fremap.c | 1 - + mm/highmem.c | 2 +- + mm/kmemleak.c | 2 +- + mm/maccess.c | 2 +- + mm/memcontrol.c | 1 + + mm/memory-failure.c | 1 + + mm/memory.c | 2 +- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 2 +- + mm/mempool.c | 2 +- + mm/migrate.c | 2 +- + mm/mlock.c | 2 +- + mm/mm_init.c | 2 +- + mm/mmap.c | 2 +- + mm/mmu_context.c | 2 +- + mm/mmu_notifier.c | 2 +- + mm/mmzone.c | 1 - + mm/nobootmem.c | 2 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 2 +- + mm/quicklist.c | 1 - + mm/readahead.c | 2 +- + mm/rmap.c | 2 +- + mm/shmem.c | 2 +- + mm/slob.c | 2 +- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 2 +- + mm/swap.c | 2 +- + mm/swap_state.c | 1 - + mm/swapfile.c | 1 - + mm/truncate.c | 2 +- + mm/util.c | 2 +- + net/802/fc.c | 1 + + net/802/garp.c | 1 + + net/802/stp.c | 1 + + net/8021q/vlan_core.c | 1 + + net/8021q/vlan_netlink.c | 1 + + net/appletalk/aarp.c | 1 + + net/appletalk/atalk_proc.c | 1 + + net/atm/pvc.c | 1 + + net/atm/svc.c | 1 + + net/ax25/ax25_route.c | 1 + + net/ax25/ax25_uid.c | 1 + + net/bluetooth/hci_sysfs.c | 1 + + net/bluetooth/l2cap_sock.c | 1 + + net/bluetooth/mgmt.c | 1 + + net/bridge/br_input.c | 1 + + net/bridge/br_stp_if.c | 1 + + net/caif/caif_dev.c | 1 + + net/caif/cfpkt_skbuff.c | 1 + + net/ceph/messenger.c | 1 + + net/compat.c | 1 + + net/core/dev_addr_lists.c | 1 + + net/core/fib_rules.c | 1 + + net/core/net-sysfs.c | 1 + + net/core/net-traces.c | 1 + + net/core/net_namespace.c | 1 + + net/core/netevent.c | 1 + + net/core/netpoll.c | 1 + + net/core/timestamping.c | 1 + + net/core/user_dma.c | 1 + + net/dcb/dcbevent.c | 1 + + net/dcb/dcbnl.c | 1 + + net/dccp/ackvec.c | 1 + + net/dccp/ccids/lib/tfrc.c | 1 + + net/dccp/timer.c | 1 + + net/decnet/dn_route.c | 1 + + net/decnet/dn_rules.c | 1 + + net/dsa/dsa.c | 1 + + net/ieee802154/nl-mac.c | 1 + + net/ipv4/fib_rules.c | 1 + + net/ipv4/fib_trie.c | 1 + + net/ipv4/inet_timewait_sock.c | 1 + + net/ipv4/ipconfig.c | 1 + + net/ipv4/ipmr.c | 1 + + net/ipv4/netfilter.c | 1 + + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 1 + + net/ipv4/netfilter/nf_nat_proto_common.c | 1 + + net/ipv4/netfilter/nf_nat_proto_icmp.c | 1 + + net/ipv4/netfilter/nf_nat_proto_sctp.c | 1 + + net/ipv4/netfilter/nf_nat_proto_tcp.c | 1 + + net/ipv4/netfilter/nf_nat_proto_udp.c | 1 + + net/ipv4/netfilter/nf_nat_proto_udplite.c | 1 + + net/ipv4/ping.c | 1 + + net/ipv4/proc.c | 1 + + net/ipv4/raw.c | 1 + + net/ipv4/syncookies.c | 1 + + net/ipv4/udplite.c | 1 + + net/ipv4/xfrm4_state.c | 1 + + net/ipv6/addrconf.c | 1 + + net/ipv6/addrconf_core.c | 1 + + net/ipv6/exthdrs.c | 1 + + net/ipv6/exthdrs_core.c | 1 + + net/ipv6/fib6_rules.c | 1 + + net/ipv6/ip6_flowlabel.c | 1 + + net/ipv6/ip6mr.c | 1 + + net/ipv6/netfilter.c | 1 + + net/ipv6/proc.c | 1 + + net/ipv6/raw.c | 1 + + net/ipv6/reassembly.c | 1 + + net/ipv6/route.c | 1 + + net/ipv6/sysctl_net_ipv6.c | 1 + + net/ipv6/udplite.c | 1 + + net/ipv6/xfrm6_state.c | 1 + + net/ipx/ipx_proc.c | 1 + + net/irda/discovery.c | 1 + + net/irda/irda_device.c | 1 + + net/irda/irttp.c | 1 + + net/irda/qos.c | 2 + + net/llc/llc_input.c | 1 + + net/llc/llc_output.c | 1 + + net/llc/llc_proc.c | 1 + + net/mac80211/agg-rx.c | 1 + + net/mac80211/agg-tx.c | 1 + + net/mac80211/ht.c | 1 + + net/mac80211/key.c | 1 + + net/mac80211/led.c | 1 + + net/mac80211/mlme.c | 2 + + net/mac80211/offchannel.c | 1 + + net/mac80211/rate.c | 1 + + net/mac80211/rc80211_minstrel_debugfs.c | 1 + + net/mac80211/rc80211_minstrel_ht_debugfs.c | 1 + + net/mac80211/rc80211_pid_debugfs.c | 1 + + net/mac80211/rx.c | 1 + + net/mac80211/scan.c | 1 + + net/mac80211/status.c | 1 + + net/mac80211/tkip.c | 1 + + net/mac80211/tx.c | 1 + + net/mac80211/util.c | 1 + + net/netfilter/ipset/ip_set_getport.c | 1 + + net/netfilter/ipset/pfxlen.c | 1 + + net/netfilter/nf_conntrack_acct.c | 1 + + net/netfilter/nf_conntrack_ecache.c | 1 + + net/netfilter/nf_conntrack_expect.c | 2 + + net/netfilter/x_tables.c | 1 + + net/netfilter/xt_quota.c | 1 + + net/netfilter/xt_statistic.c | 1 + + net/netrom/nr_route.c | 1 + + net/nfc/af_nfc.c | 1 + + net/nfc/nci/core.c | 1 + + net/nfc/rawsock.c | 1 + + net/phonet/datagram.c | 1 + + net/phonet/pep.c | 1 + + net/phonet/socket.c | 1 + + net/rds/cong.c | 1 + + net/rds/connection.c | 1 + + net/rds/ib.c | 1 + + net/rds/info.c | 1 + + net/rds/iw.c | 1 + + net/rds/message.c | 1 + + net/rds/page.c | 1 + + net/rds/rdma_transport.c | 1 + + net/rds/recv.c | 1 + + net/rds/send.c | 2 + + net/rds/stats.c | 1 + + net/rds/tcp.c | 1 + + net/rds/threads.c | 1 + + net/rfkill/input.c | 1 + + net/rose/rose_route.c | 1 + + net/rxrpc/ar-output.c | 1 + + net/rxrpc/ar-recvmsg.c | 1 + + net/sched/act_api.c | 1 + + net/sched/cls_flow.c | 1 + + net/sched/sch_mq.c | 1 + + net/sched/sch_mqprio.c | 1 + + net/sctp/proc.c | 1 + + net/sctp/socket.c | 1 + + net/sunrpc/addr.c | 1 + + net/sunrpc/backchannel_rqst.c | 1 + + net/sunrpc/socklib.c | 1 + + net/sunrpc/svc_xprt.c | 1 + + net/sunrpc/svcsock.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + + net/sysctl_net.c | 1 + + net/tipc/core.c | 2 + + net/tipc/socket.c | 1 + + net/wimax/op-msg.c | 1 + + net/wimax/op-reset.c | 1 + + net/wimax/op-rfkill.c | 1 + + net/wimax/stack.c | 1 + + net/wireless/ibss.c | 1 + + net/wireless/mesh.c | 1 + + net/wireless/radiotap.c | 1 + + net/wireless/reg.c | 2 + + net/wireless/sme.c | 1 + + net/wireless/util.c | 1 + + net/wireless/wext-compat.c | 1 + + net/wireless/wext-core.c | 1 + + net/wireless/wext-sme.c | 1 + + net/wireless/wext-spy.c | 1 + + net/x25/x25_proc.c | 1 + + net/xfrm/xfrm_proc.c | 1 + + net/xfrm/xfrm_replay.c | 1 + + security/selinux/hooks.c | 1 + + security/selinux/netlink.c | 1 + + sound/aoa/soundbus/i2sbus/pcm.c | 1 + + sound/arm/pxa2xx-ac97-lib.c | 1 + + sound/arm/pxa2xx-pcm.c | 1 + + sound/core/control.c | 1 + + sound/core/device.c | 1 + + sound/core/hwdep.c | 1 + + sound/core/info.c | 1 + + sound/core/info_oss.c | 1 + + sound/core/init.c | 1 + + sound/core/isadma.c | 1 + + sound/core/jack.c | 1 + + sound/core/memory.c | 1 + + sound/core/misc.c | 2 + + sound/core/oss/mixer_oss.c | 1 + + sound/core/oss/pcm_oss.c | 2 +- + sound/core/pcm.c | 1 + + sound/core/pcm_lib.c | 1 + + sound/core/pcm_memory.c | 1 + + sound/core/pcm_misc.c | 1 + + sound/core/pcm_native.c | 1 + + sound/core/rawmidi.c | 2 +- + sound/core/seq/oss/seq_oss.c | 2 +- + sound/core/seq/oss/seq_oss_init.c | 1 + + sound/core/seq/oss/seq_oss_synth.c | 1 + + sound/core/seq/seq.c | 2 +- + sound/core/seq/seq_clientmgr.c | 1 + + sound/core/seq/seq_device.c | 1 + + sound/core/seq/seq_dummy.c | 2 +- + sound/core/seq/seq_info.c | 1 + + sound/core/seq/seq_lock.c | 1 + + sound/core/seq/seq_memory.c | 1 + + sound/core/seq/seq_midi.c | 2 +- + sound/core/seq/seq_midi_emul.c | 1 + + sound/core/seq/seq_midi_event.c | 1 + + sound/core/seq/seq_ports.c | 1 + + sound/core/seq/seq_system.c | 1 + + sound/core/seq/seq_virmidi.c | 1 + + sound/core/sound.c | 2 +- + sound/core/sound_oss.c | 1 + + sound/core/timer.c | 2 +- + sound/core/vmaster.c | 1 + + sound/drivers/aloop.c | 2 +- + sound/drivers/dummy.c | 2 +- + sound/drivers/ml403-ac97cr.c | 2 +- + sound/drivers/mpu401/mpu401.c | 2 +- + sound/drivers/mpu401/mpu401_uart.c | 1 + + sound/drivers/mtpav.c | 1 + + sound/drivers/mts64.c | 1 + + sound/drivers/opl3/opl3_lib.c | 1 + + sound/drivers/opl3/opl3_oss.c | 1 + + sound/drivers/opl3/opl3_seq.c | 1 + + sound/drivers/opl3/opl3_synth.c | 1 + + sound/drivers/opl4/opl4_lib.c | 1 + + sound/drivers/opl4/opl4_proc.c | 1 + + sound/drivers/opl4/opl4_seq.c | 1 + + sound/drivers/pcsp/pcsp.c | 2 +- + sound/drivers/portman2x4.c | 1 + + sound/drivers/serial-u16550.c | 2 +- + sound/drivers/virmidi.c | 2 +- + sound/drivers/vx/vx_core.c | 1 + + sound/drivers/vx/vx_hwdep.c | 1 + + sound/firewire/iso-resources.c | 1 + + sound/firewire/packets-buffer.c | 1 + + sound/i2c/cs8427.c | 1 + + sound/i2c/i2c.c | 1 + + sound/i2c/other/ak4113.c | 1 + + sound/i2c/other/ak4114.c | 1 + + sound/i2c/other/ak4117.c | 1 + + sound/i2c/other/ak4xxx-adda.c | 1 + + sound/i2c/other/pt2258.c | 1 + + sound/i2c/other/tea575x-tuner.c | 1 + + sound/i2c/tea6330t.c | 1 + + sound/isa/ad1816a/ad1816a.c | 2 +- + sound/isa/ad1848/ad1848.c | 2 +- + sound/isa/als100.c | 2 +- + sound/isa/azt2320.c | 2 +- + sound/isa/cmi8330.c | 2 +- + sound/isa/cs423x/cs4231.c | 2 +- + sound/isa/cs423x/cs4236.c | 2 +- + sound/isa/es1688/es1688.c | 2 +- + sound/isa/es1688/es1688_lib.c | 1 + + sound/isa/es18xx.c | 2 +- + sound/isa/gus/gus_main.c | 1 + + sound/isa/gus/gus_volume.c | 1 + + sound/isa/gus/gusclassic.c | 2 +- + sound/isa/gus/gusextreme.c | 2 +- + sound/isa/gus/gusmax.c | 2 +- + sound/isa/gus/interwave.c | 2 +- + sound/isa/msnd/msnd.c | 1 + + sound/isa/msnd/msnd_midi.c | 1 + + sound/isa/msnd/msnd_pinnacle_mixer.c | 1 + + sound/isa/opl3sa2.c | 2 +- + sound/isa/opti9xx/miro.c | 2 +- + sound/isa/opti9xx/opti92x-ad1848.c | 2 +- + sound/isa/sb/emu8000.c | 1 + + sound/isa/sb/emu8000_callback.c | 1 + + sound/isa/sb/emu8000_patch.c | 1 + + sound/isa/sb/emu8000_synth.c | 1 + + sound/isa/sb/sb16.c | 2 +- + sound/isa/sb/sb16_csp.c | 1 + + sound/isa/sb/sb16_main.c | 1 + + sound/isa/sb/sb8.c | 2 +- + sound/isa/sb/sb8_main.c | 1 + + sound/isa/sb/sb_common.c | 1 + + sound/isa/sscape.c | 2 +- + sound/isa/wavefront/wavefront.c | 2 +- + sound/isa/wavefront/wavefront_fx.c | 1 + + sound/isa/wavefront/wavefront_synth.c | 1 + + sound/isa/wss/wss_lib.c | 1 + + sound/mips/au1x00.c | 1 + + sound/mips/hal2.c | 1 + + sound/mips/sgio2audio.c | 1 + + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/ac97/ac97_pcm.c | 1 + + sound/pci/ad1889.c | 1 + + sound/pci/ak4531_codec.c | 1 + + sound/pci/ali5451/ali5451.c | 2 +- + sound/pci/als300.c | 2 +- + sound/pci/als4000.c | 2 +- + sound/pci/asihpi/asihpi.c | 1 + + sound/pci/asihpi/hpioctl.c | 1 + + sound/pci/atiixp.c | 2 +- + sound/pci/atiixp_modem.c | 2 +- + sound/pci/au88x0/au88x0.c | 2 +- + sound/pci/au88x0/au88x0_game.c | 1 + + sound/pci/aw2/aw2-alsa.c | 1 + + sound/pci/azt3328.c | 2 +- + sound/pci/bt87x.c | 2 +- + sound/pci/ca0106/ca0106_main.c | 2 +- + sound/pci/cmipci.c | 2 +- + sound/pci/cs4281.c | 2 +- + sound/pci/cs46xx/cs46xx.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 1 + + sound/pci/cs5530.c | 2 +- + sound/pci/cs5535audio/cs5535audio.c | 2 +- + sound/pci/ctxfi/xfi.c | 1 + + sound/pci/echoaudio/darla20.c | 2 +- + sound/pci/echoaudio/darla24.c | 2 +- + sound/pci/echoaudio/echo3g.c | 2 +- + sound/pci/echoaudio/echoaudio.c | 2 + + sound/pci/echoaudio/gina20.c | 2 +- + sound/pci/echoaudio/gina24.c | 2 +- + sound/pci/echoaudio/indigo.c | 2 +- + sound/pci/echoaudio/indigodj.c | 2 +- + sound/pci/echoaudio/indigodjx.c | 2 +- + sound/pci/echoaudio/indigoio.c | 2 +- + sound/pci/echoaudio/indigoiox.c | 2 +- + sound/pci/echoaudio/layla20.c | 2 +- + sound/pci/echoaudio/layla24.c | 2 +- + sound/pci/echoaudio/mia.c | 2 +- + sound/pci/echoaudio/mona.c | 2 +- + sound/pci/emu10k1/emu10k1.c | 2 +- + sound/pci/emu10k1/emu10k1_callback.c | 1 + + sound/pci/emu10k1/emu10k1_main.c | 1 + + sound/pci/emu10k1/emu10k1_synth.c | 1 + + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/emu10k1/io.c | 1 + + sound/pci/emu10k1/memory.c | 1 + + sound/pci/emu10k1/voice.c | 1 + + sound/pci/ens1370.c | 2 +- + sound/pci/es1938.c | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/fm801.c | 2 +- + sound/pci/hda/hda_beep.c | 1 + + sound/pci/hda/hda_codec.c | 1 + + sound/pci/hda/hda_generic.c | 1 + + sound/pci/hda/hda_hwdep.c | 1 + + sound/pci/hda/patch_analog.c | 1 + + sound/pci/hda/patch_ca0110.c | 1 + + sound/pci/hda/patch_ca0132.c | 1 + + sound/pci/hda/patch_cirrus.c | 1 + + sound/pci/hda/patch_cmedia.c | 1 + + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 1 + + sound/pci/hda/patch_si3054.c | 1 + + sound/pci/hda/patch_sigmatel.c | 1 + + sound/pci/hda/patch_via.c | 1 + + sound/pci/ice1712/ak4xxx.c | 1 + + sound/pci/ice1712/ice1712.c | 2 +- + sound/pci/ice1712/ice1724.c | 2 +- + sound/pci/intel8x0.c | 2 +- + sound/pci/intel8x0m.c | 2 +- + sound/pci/korg1212/korg1212.c | 2 +- + sound/pci/lola/lola.c | 2 +- + sound/pci/maestro3.c | 2 +- + sound/pci/mixart/mixart.c | 2 +- + sound/pci/mixart/mixart_hwdep.c | 1 + + sound/pci/nm256/nm256.c | 2 +- + sound/pci/oxygen/oxygen.c | 1 + + sound/pci/oxygen/oxygen_io.c | 1 + + sound/pci/oxygen/oxygen_lib.c | 1 + + sound/pci/oxygen/virtuoso.c | 1 + + sound/pci/pcxhr/pcxhr.c | 2 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 1 + + sound/pci/riptide/riptide.c | 1 + + sound/pci/rme32.c | 2 +- + sound/pci/rme96.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/rme9652/rme9652.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/sonicvibes.c | 2 +- + sound/pci/trident/trident.c | 2 +- + sound/pci/trident/trident_main.c | 1 + + sound/pci/via82xx.c | 2 +- + sound/pci/via82xx_modem.c | 2 +- + sound/pci/vx222/vx222.c | 2 +- + sound/pci/ymfpci/ymfpci.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 1 + + sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +- + sound/pcmcia/vx/vxpocket.c | 2 +- + sound/ppc/powermac.c | 2 +- + sound/ppc/snd_ps3.c | 1 + + sound/sh/aica.c | 2 +- + sound/sh/sh_dac_audio.c | 1 + + sound/soc/blackfin/bf5xx-sport.c | 1 + + sound/soc/blackfin/bfin-eval-adav80x.c | 1 + + sound/soc/codecs/ac97.c | 1 + + sound/soc/codecs/ads117x.c | 1 + + sound/soc/codecs/ak4642.c | 1 + + sound/soc/codecs/cx20442.c | 1 + + sound/soc/codecs/da7210.c | 1 + + sound/soc/codecs/dmic.c | 1 + + sound/soc/codecs/pcm3008.c | 1 + + sound/soc/codecs/sn95031.c | 1 + + sound/soc/codecs/wl1273.c | 1 + + sound/soc/ep93xx/edb93xx.c | 1 + + sound/soc/ep93xx/snappercl15.c | 1 + + sound/soc/imx/wm1133-ev1.c | 1 + + sound/soc/mid-x86/mfld_machine.c | 1 + + sound/soc/mid-x86/sst_platform.c | 1 + + sound/soc/omap/am3517evm.c | 1 + + sound/soc/omap/ams-delta.c | 1 + + sound/soc/omap/igep0020.c | 1 + + sound/soc/omap/n810.c | 1 + + sound/soc/omap/omap-pcm.c | 1 + + sound/soc/omap/omap3beagle.c | 1 + + sound/soc/omap/omap3evm.c | 1 + + sound/soc/omap/omap3pandora.c | 1 + + sound/soc/omap/omap4-hdmi-card.c | 1 + + sound/soc/omap/osk5912.c | 1 + + sound/soc/omap/overo.c | 1 + + sound/soc/omap/rx51.c | 1 + + sound/soc/omap/sdp3430.c | 1 + + sound/soc/omap/sdp4430.c | 1 + + sound/soc/omap/zoom2.c | 1 + + sound/soc/pxa/pxa2xx-pcm.c | 1 + + sound/soc/samsung/ac97.c | 1 + + sound/soc/samsung/dma.c | 1 + + sound/soc/samsung/goni_wm8994.c | 1 + + sound/soc/samsung/h1940_uda1380.c | 1 + + sound/soc/samsung/i2s.c | 1 + + sound/soc/samsung/idma.c | 1 + + sound/soc/samsung/jive_wm8750.c | 1 + + sound/soc/samsung/ln2440sbc_alc650.c | 1 + + sound/soc/samsung/pcm.c | 1 + + sound/soc/samsung/rx1950_uda1380.c | 1 + + sound/soc/samsung/s3c2412-i2s.c | 1 + + sound/soc/samsung/s3c24xx-i2s.c | 1 + + sound/soc/samsung/s3c24xx_simtec.c | 1 + + sound/soc/samsung/s3c24xx_simtec_hermes.c | 1 + + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 1 + + sound/soc/samsung/s3c24xx_uda134x.c | 1 + + sound/soc/samsung/smartq_wm8987.c | 1 + + sound/soc/samsung/smdk_spdif.c | 1 + + sound/soc/samsung/smdk_wm8580.c | 1 + + sound/soc/samsung/smdk_wm8580pcm.c | 1 + + sound/soc/samsung/smdk_wm8994pcm.c | 1 + + sound/soc/samsung/smdk_wm9713.c | 1 + + sound/soc/samsung/spdif.c | 1 + + sound/soc/samsung/speyside.c | 1 + + sound/soc/samsung/speyside_wm8962.c | 1 + + sound/soc/sh/fsi-ak4642.c | 1 + + sound/soc/sh/fsi-da7210.c | 1 + + sound/soc/sh/fsi-hdmi.c | 1 + + sound/soc/sh/fsi.c | 1 + + sound/soc/sh/siu_dai.c | 1 + + sound/soc/soc-cache.c | 1 + + sound/soc/soc-io.c | 1 + + sound/soc/soc-jack.c | 1 + + sound/soc/soc-utils.c | 1 + + sound/soc/tegra/tegra_asoc_utils.c | 1 + + sound/sparc/dbri.c | 1 + + sound/synth/emux/emux.c | 1 + + sound/synth/emux/emux_oss.c | 1 + + sound/synth/emux/emux_seq.c | 2 +- + sound/synth/emux/emux_synth.c | 1 + + sound/synth/emux/soundfont.c | 1 + + sound/synth/util_mem.c | 1 + + sound/usb/6fire/firmware.c | 1 + + sound/usb/card.c | 1 + + sound/usb/midi.c | 1 + + sound/usb/usx2y/us122l.c | 1 + + sound/usb/usx2y/usbusx2yaudio.c | 1 + + virt/kvm/iommu.c | 2 + + 2057 files changed, 2248 insertions(+), 606 deletions(-) + create mode 100644 include/linux/export.h +$ git am -3 ../modsplit/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch +Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/plat-samsung/dma-ops.c +M arch/arm/plat-samsung/s3c-dma-ops.c +$ git add . +$ git commit -v -a --amend +[master 1567980] Merge remote-tracking branch 'moduleh/for-sfr' +$ git am -3 ../modsplit/powerpc-powernv-include-export.h-in-hvc_opal.h-for-T.patch +Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/tty/hvc/hvc_opal.c +$ git add . +$ git commit -v -a --amend +[master f518549] Merge remote-tracking branch 'moduleh/for-sfr' +$ git am -3 ../modsplit/drivers-md-change-module.h-export.h-in-persistent-da.patch +Applying: drivers/md: change module.h -> export.h in persistent-data/dm-* +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/persistent-data/dm-btree-remove.c +M drivers/md/persistent-data/dm-btree.c +M drivers/md/persistent-data/dm-space-map-disk.c +M drivers/md/persistent-data/dm-transaction-manager.c +$ git add . +$ git commit -v -a --amend +[master a861d77] Merge remote-tracking branch 'moduleh/for-sfr' +$ git am -3 ../modsplit/device-mapper-dm-bufio.c-needs-to-include-module.h.patch +Applying: device-mapper: dm-bufio.c needs to include module.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-bufio.c +$ git add . +$ git commit -v -a --amend +[master e02e3c6] Merge remote-tracking branch 'moduleh/for-sfr' +$ git am -3 ../modsplit/device-mapper-using-EXPORT_SYBOL-in-dm-space-map-che.patch +Applying: device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/persistent-data/dm-space-map-checker.c +$ git add . +$ git commit -v -a --amend +[master 9d5b3c5] Merge remote-tracking branch 'moduleh/for-sfr' +Merging kvmtool/master (3b08ed0 config: Add 'make kvmconfig') +$ git merge kvmtool/master +Resolved 'include/net/9p/9p.h' using previous resolution. +Resolved 'scripts/kconfig/Makefile' using previous resolution. +Auto-merging scripts/kconfig/Makefile +CONFLICT (content): Merge conflict in scripts/kconfig/Makefile +Auto-merging include/net/9p/9p.h +CONFLICT (content): Merge conflict in include/net/9p/9p.h +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6a7c139] Merge remote-tracking branch 'kvmtool/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + arch/x86/Kconfig | 27 + + scripts/kconfig/Makefile | 6 +- + tools/kvm/.gitignore | 10 + + tools/kvm/CREDITS-Git | 30 + + tools/kvm/Documentation/kernel-debugging.txt | 15 + + tools/kvm/Documentation/kvm-balloon.txt | 24 + + tools/kvm/Documentation/kvm-debug.txt | 16 + + tools/kvm/Documentation/kvm-list.txt | 16 + + tools/kvm/Documentation/kvm-pause.txt | 16 + + tools/kvm/Documentation/kvm-resume.txt | 16 + + tools/kvm/Documentation/kvm-run.txt | 62 ++ + tools/kvm/Documentation/kvm-setup.txt | 15 + + tools/kvm/Documentation/kvm-stat.txt | 19 + + tools/kvm/Documentation/kvm-stop.txt | 16 + + tools/kvm/Documentation/kvm-version.txt | 21 + + tools/kvm/Makefile | 305 ++++++ + tools/kvm/README | 109 +++ + tools/kvm/bios.c | 157 +++ + tools/kvm/bios/.gitignore | 3 + + tools/kvm/bios/bios-rom.S | 12 + + tools/kvm/bios/e820.c | 72 ++ + tools/kvm/bios/entry.S | 92 ++ + tools/kvm/bios/gen-offsets.sh | 14 + + tools/kvm/bios/int10.c | 154 +++ + tools/kvm/bios/int15.c | 18 + + tools/kvm/bios/local.S | 7 + + tools/kvm/bios/macro.S | 25 + + tools/kvm/bios/memcpy.c | 23 + + tools/kvm/bios/rom.ld.S | 17 + + tools/kvm/builtin-balloon.c | 90 ++ + tools/kvm/builtin-debug.c | 89 ++ + tools/kvm/builtin-help.c | 62 ++ + tools/kvm/builtin-list.c | 156 +++ + tools/kvm/builtin-pause.c | 78 ++ + tools/kvm/builtin-resume.c | 78 ++ + tools/kvm/builtin-run.c | 995 +++++++++++++++++++ + tools/kvm/builtin-setup.c | 228 +++++ + tools/kvm/builtin-stat.c | 131 +++ + tools/kvm/builtin-stop.c | 78 ++ + tools/kvm/builtin-version.c | 15 + + tools/kvm/code16gcc.h | 15 + + tools/kvm/command-list.txt | 14 + + tools/kvm/config/feature-tests.mak | 168 ++++ + tools/kvm/config/utilities.mak | 188 ++++ + tools/kvm/cpuid.c | 55 ++ + tools/kvm/disk/blk.c | 39 + + tools/kvm/disk/core.c | 241 +++++ + tools/kvm/disk/qcow.c | 1334 ++++++++++++++++++++++++++ + tools/kvm/disk/raw.c | 142 +++ + tools/kvm/framebuffer.c | 68 ++ + tools/kvm/guest/init.c | 46 + + tools/kvm/guest_compat.c | 104 ++ + tools/kvm/hw/i8042.c | 348 +++++++ + tools/kvm/hw/pci-shmem.c | 261 +++++ + tools/kvm/hw/rtc.c | 87 ++ + tools/kvm/hw/serial.c | 364 +++++++ + tools/kvm/hw/vesa.c | 77 ++ + tools/kvm/include/asm/hweight.h | 8 + + tools/kvm/include/bios/memcpy.h | 9 + + tools/kvm/include/kvm/8250-serial.h | 10 + + tools/kvm/include/kvm/apic.h | 17 + + tools/kvm/include/kvm/assembly.h | 24 + + tools/kvm/include/kvm/barrier.h | 15 + + tools/kvm/include/kvm/bios-export.h | 13 + + tools/kvm/include/kvm/bios.h | 84 ++ + tools/kvm/include/kvm/boot-protocol.h | 16 + + tools/kvm/include/kvm/brlock.h | 41 + + tools/kvm/include/kvm/builtin-balloon.h | 7 + + tools/kvm/include/kvm/builtin-debug.h | 7 + + tools/kvm/include/kvm/builtin-help.h | 6 + + tools/kvm/include/kvm/builtin-list.h | 7 + + tools/kvm/include/kvm/builtin-pause.h | 7 + + tools/kvm/include/kvm/builtin-resume.h | 7 + + tools/kvm/include/kvm/builtin-run.h | 7 + + tools/kvm/include/kvm/builtin-setup.h | 9 + + tools/kvm/include/kvm/builtin-stat.h | 7 + + tools/kvm/include/kvm/builtin-stop.h | 7 + + tools/kvm/include/kvm/builtin-version.h | 6 + + tools/kvm/include/kvm/compiler.h | 6 + + tools/kvm/include/kvm/cpufeature.h | 41 + + tools/kvm/include/kvm/disk-image.h | 81 ++ + tools/kvm/include/kvm/e820.h | 12 + + tools/kvm/include/kvm/framebuffer.h | 34 + + tools/kvm/include/kvm/guest_compat.h | 9 + + tools/kvm/include/kvm/i8042.h | 12 + + tools/kvm/include/kvm/interrupt.h | 26 + + tools/kvm/include/kvm/ioeventfd.h | 27 + + tools/kvm/include/kvm/ioport.h | 65 ++ + tools/kvm/include/kvm/irq.h | 31 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-cpu.h | 46 + + tools/kvm/include/kvm/kvm-ipc.h | 27 + + tools/kvm/include/kvm/kvm.h | 108 +++ + tools/kvm/include/kvm/mptable.h | 8 + + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 213 ++++ + tools/kvm/include/kvm/pci-shmem.h | 28 + + tools/kvm/include/kvm/pci.h | 74 ++ + tools/kvm/include/kvm/qcow.h | 131 +++ + tools/kvm/include/kvm/rbtree-interval.h | 27 + + tools/kvm/include/kvm/read-write.h | 43 + + tools/kvm/include/kvm/rtc.h | 6 + + tools/kvm/include/kvm/rwsem.h | 39 + + tools/kvm/include/kvm/sdl.h | 17 + + tools/kvm/include/kvm/segment.h | 21 + + tools/kvm/include/kvm/strbuf.h | 6 + + tools/kvm/include/kvm/symbol.h | 22 + + tools/kvm/include/kvm/term.h | 18 + + tools/kvm/include/kvm/threadpool.h | 37 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 358 +++++++ + tools/kvm/include/kvm/util.h | 78 ++ + tools/kvm/include/kvm/vesa.h | 18 + + tools/kvm/include/kvm/virtio-9p.h | 74 ++ + tools/kvm/include/kvm/virtio-balloon.h | 8 + + tools/kvm/include/kvm/virtio-blk.h | 13 + + tools/kvm/include/kvm/virtio-console.h | 9 + + tools/kvm/include/kvm/virtio-net.h | 21 + + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + + tools/kvm/include/kvm/virtio-pci.h | 60 ++ + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio.h | 62 ++ + tools/kvm/include/kvm/vnc.h | 14 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/kernel.h | 39 + + tools/kvm/include/linux/module.h | 6 + + tools/kvm/include/linux/prefetch.h | 6 + + tools/kvm/include/linux/types.h | 50 + + tools/kvm/interrupt.c | 27 + + tools/kvm/ioeventfd.c | 128 +++ + tools/kvm/ioport.c | 192 ++++ + tools/kvm/irq.c | 193 ++++ + tools/kvm/kvm-cmd.c | 91 ++ + tools/kvm/kvm-cpu.c | 523 ++++++++++ + tools/kvm/kvm-ipc.c | 171 ++++ + tools/kvm/kvm.c | 821 ++++++++++++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 132 +++ + tools/kvm/mptable.c | 284 ++++++ + tools/kvm/net/uip/arp.c | 30 + + tools/kvm/net/uip/buf.c | 114 +++ + tools/kvm/net/uip/core.c | 190 ++++ + tools/kvm/net/uip/csum.c | 92 ++ + tools/kvm/net/uip/dhcp.c | 203 ++++ + tools/kvm/net/uip/icmp.c | 29 + + tools/kvm/net/uip/ipv4.c | 29 + + tools/kvm/net/uip/tcp.c | 317 ++++++ + tools/kvm/net/uip/udp.c | 236 +++++ + tools/kvm/pci.c | 169 ++++ + tools/kvm/read-write.c | 344 +++++++ + tools/kvm/symbol.c | 98 ++ + tools/kvm/term.c | 170 ++++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 109 +++ + tools/kvm/threadpool.c | 146 +++ + tools/kvm/ui/sdl.c | 280 ++++++ + tools/kvm/ui/vnc.c | 218 +++++ + tools/kvm/util.c | 101 ++ + tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + + tools/kvm/util/generate-cmdlist.sh | 23 + + tools/kvm/util/kvm-ifup-vbr0 | 6 + + tools/kvm/util/parse-options.c | 577 +++++++++++ + tools/kvm/util/rbtree-interval.c | 90 ++ + tools/kvm/util/set_private_br.sh | 51 + + tools/kvm/util/strbuf.c | 13 + + tools/kvm/virtio/9p-pdu.c | 287 ++++++ + tools/kvm/virtio/9p.c | 1266 ++++++++++++++++++++++++ + tools/kvm/virtio/balloon.c | 264 +++++ + tools/kvm/virtio/blk.c | 288 ++++++ + tools/kvm/virtio/console.c | 199 ++++ + tools/kvm/virtio/core.c | 111 +++ + tools/kvm/virtio/net.c | 423 ++++++++ + tools/kvm/virtio/pci.c | 319 ++++++ + tools/kvm/virtio/rng.c | 185 ++++ + 185 files changed, 19088 insertions(+), 1 deletions(-) + create mode 100644 tools/kvm/.gitignore + create mode 100644 tools/kvm/CREDITS-Git + create mode 100644 tools/kvm/Documentation/kernel-debugging.txt + create mode 100644 tools/kvm/Documentation/kvm-balloon.txt + create mode 100644 tools/kvm/Documentation/kvm-debug.txt + create mode 100644 tools/kvm/Documentation/kvm-list.txt + create mode 100644 tools/kvm/Documentation/kvm-pause.txt + create mode 100644 tools/kvm/Documentation/kvm-resume.txt + create mode 100644 tools/kvm/Documentation/kvm-run.txt + create mode 100644 tools/kvm/Documentation/kvm-setup.txt + create mode 100644 tools/kvm/Documentation/kvm-stat.txt + create mode 100644 tools/kvm/Documentation/kvm-stop.txt + create mode 100644 tools/kvm/Documentation/kvm-version.txt + create mode 100644 tools/kvm/Makefile + create mode 100644 tools/kvm/README + create mode 100644 tools/kvm/bios.c + create mode 100644 tools/kvm/bios/.gitignore + create mode 100644 tools/kvm/bios/bios-rom.S + create mode 100644 tools/kvm/bios/e820.c + create mode 100644 tools/kvm/bios/entry.S + create mode 100644 tools/kvm/bios/gen-offsets.sh + create mode 100644 tools/kvm/bios/int10.c + create mode 100644 tools/kvm/bios/int15.c + create mode 100644 tools/kvm/bios/local.S + create mode 100644 tools/kvm/bios/macro.S + create mode 100644 tools/kvm/bios/memcpy.c + create mode 100644 tools/kvm/bios/rom.ld.S + create mode 100644 tools/kvm/builtin-balloon.c + create mode 100644 tools/kvm/builtin-debug.c + create mode 100644 tools/kvm/builtin-help.c + create mode 100644 tools/kvm/builtin-list.c + create mode 100644 tools/kvm/builtin-pause.c + create mode 100644 tools/kvm/builtin-resume.c + create mode 100644 tools/kvm/builtin-run.c + create mode 100644 tools/kvm/builtin-setup.c + create mode 100644 tools/kvm/builtin-stat.c + create mode 100644 tools/kvm/builtin-stop.c + create mode 100644 tools/kvm/builtin-version.c + create mode 100644 tools/kvm/code16gcc.h + create mode 100644 tools/kvm/command-list.txt + create mode 100644 tools/kvm/config/feature-tests.mak + create mode 100644 tools/kvm/config/utilities.mak + create mode 100644 tools/kvm/cpuid.c + create mode 100644 tools/kvm/disk/blk.c + create mode 100644 tools/kvm/disk/core.c + create mode 100644 tools/kvm/disk/qcow.c + create mode 100644 tools/kvm/disk/raw.c + create mode 100644 tools/kvm/framebuffer.c + create mode 100644 tools/kvm/guest/init.c + create mode 100644 tools/kvm/guest_compat.c + create mode 100644 tools/kvm/hw/i8042.c + create mode 100644 tools/kvm/hw/pci-shmem.c + create mode 100644 tools/kvm/hw/rtc.c + create mode 100644 tools/kvm/hw/serial.c + create mode 100644 tools/kvm/hw/vesa.c + create mode 100644 tools/kvm/include/asm/hweight.h + create mode 100644 tools/kvm/include/bios/memcpy.h + create mode 100644 tools/kvm/include/kvm/8250-serial.h + create mode 100644 tools/kvm/include/kvm/apic.h + create mode 100644 tools/kvm/include/kvm/assembly.h + create mode 100644 tools/kvm/include/kvm/barrier.h + create mode 100644 tools/kvm/include/kvm/bios-export.h + create mode 100644 tools/kvm/include/kvm/bios.h + create mode 100644 tools/kvm/include/kvm/boot-protocol.h + create mode 100644 tools/kvm/include/kvm/brlock.h + create mode 100644 tools/kvm/include/kvm/builtin-balloon.h + create mode 100644 tools/kvm/include/kvm/builtin-debug.h + create mode 100644 tools/kvm/include/kvm/builtin-help.h + create mode 100644 tools/kvm/include/kvm/builtin-list.h + create mode 100644 tools/kvm/include/kvm/builtin-pause.h + create mode 100644 tools/kvm/include/kvm/builtin-resume.h + create mode 100644 tools/kvm/include/kvm/builtin-run.h + create mode 100644 tools/kvm/include/kvm/builtin-setup.h + create mode 100644 tools/kvm/include/kvm/builtin-stat.h + create mode 100644 tools/kvm/include/kvm/builtin-stop.h + create mode 100644 tools/kvm/include/kvm/builtin-version.h + create mode 100644 tools/kvm/include/kvm/compiler.h + create mode 100644 tools/kvm/include/kvm/cpufeature.h + create mode 100644 tools/kvm/include/kvm/disk-image.h + create mode 100644 tools/kvm/include/kvm/e820.h + create mode 100644 tools/kvm/include/kvm/framebuffer.h + create mode 100644 tools/kvm/include/kvm/guest_compat.h + create mode 100644 tools/kvm/include/kvm/i8042.h + create mode 100644 tools/kvm/include/kvm/interrupt.h + create mode 100644 tools/kvm/include/kvm/ioeventfd.h + create mode 100644 tools/kvm/include/kvm/ioport.h + create mode 100644 tools/kvm/include/kvm/irq.h + create mode 100644 tools/kvm/include/kvm/kvm-cmd.h + create mode 100644 tools/kvm/include/kvm/kvm-cpu.h + create mode 100644 tools/kvm/include/kvm/kvm-ipc.h + create mode 100644 tools/kvm/include/kvm/kvm.h + create mode 100644 tools/kvm/include/kvm/mptable.h + create mode 100644 tools/kvm/include/kvm/mutex.h + create mode 100644 tools/kvm/include/kvm/parse-options.h + create mode 100644 tools/kvm/include/kvm/pci-shmem.h + create mode 100644 tools/kvm/include/kvm/pci.h + create mode 100644 tools/kvm/include/kvm/qcow.h + create mode 100644 tools/kvm/include/kvm/rbtree-interval.h + create mode 100644 tools/kvm/include/kvm/read-write.h + create mode 100644 tools/kvm/include/kvm/rtc.h + create mode 100644 tools/kvm/include/kvm/rwsem.h + create mode 100644 tools/kvm/include/kvm/sdl.h + create mode 100644 tools/kvm/include/kvm/segment.h + create mode 100644 tools/kvm/include/kvm/strbuf.h + create mode 100644 tools/kvm/include/kvm/symbol.h + create mode 100644 tools/kvm/include/kvm/term.h + create mode 100644 tools/kvm/include/kvm/threadpool.h + create mode 100644 tools/kvm/include/kvm/types.h + create mode 100644 tools/kvm/include/kvm/uip.h + create mode 100644 tools/kvm/include/kvm/util.h + create mode 100644 tools/kvm/include/kvm/vesa.h + create mode 100644 tools/kvm/include/kvm/virtio-9p.h + create mode 100644 tools/kvm/include/kvm/virtio-balloon.h + create mode 100644 tools/kvm/include/kvm/virtio-blk.h + create mode 100644 tools/kvm/include/kvm/virtio-console.h + create mode 100644 tools/kvm/include/kvm/virtio-net.h + create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h + create mode 100644 tools/kvm/include/kvm/virtio-pci.h + create mode 100644 tools/kvm/include/kvm/virtio-rng.h + create mode 100644 tools/kvm/include/kvm/virtio.h + create mode 100644 tools/kvm/include/kvm/vnc.h + create mode 100644 tools/kvm/include/linux/bitops.h + create mode 100644 tools/kvm/include/linux/byteorder.h + create mode 100644 tools/kvm/include/linux/kernel.h + create mode 100644 tools/kvm/include/linux/module.h + create mode 100644 tools/kvm/include/linux/prefetch.h + create mode 100644 tools/kvm/include/linux/types.h + create mode 100644 tools/kvm/interrupt.c + create mode 100644 tools/kvm/ioeventfd.c + create mode 100644 tools/kvm/ioport.c + create mode 100644 tools/kvm/irq.c + create mode 100644 tools/kvm/kvm-cmd.c + create mode 100644 tools/kvm/kvm-cpu.c + create mode 100644 tools/kvm/kvm-ipc.c + create mode 100644 tools/kvm/kvm.c + create mode 100644 tools/kvm/main.c + create mode 100644 tools/kvm/mmio.c + create mode 100644 tools/kvm/mptable.c + create mode 100644 tools/kvm/net/uip/arp.c + create mode 100644 tools/kvm/net/uip/buf.c + create mode 100644 tools/kvm/net/uip/core.c + create mode 100644 tools/kvm/net/uip/csum.c + create mode 100644 tools/kvm/net/uip/dhcp.c + create mode 100644 tools/kvm/net/uip/icmp.c + create mode 100644 tools/kvm/net/uip/ipv4.c + create mode 100644 tools/kvm/net/uip/tcp.c + create mode 100644 tools/kvm/net/uip/udp.c + create mode 100644 tools/kvm/pci.c + create mode 100644 tools/kvm/read-write.c + create mode 100644 tools/kvm/symbol.c + create mode 100644 tools/kvm/term.c + create mode 100644 tools/kvm/tests/Makefile + create mode 100644 tools/kvm/tests/boot/Makefile + create mode 100644 tools/kvm/tests/boot/init.c + create mode 100644 tools/kvm/tests/kernel/.gitignore + create mode 100644 tools/kvm/tests/kernel/Makefile + create mode 100644 tools/kvm/tests/kernel/README + create mode 100644 tools/kvm/tests/kernel/kernel.S + create mode 100644 tools/kvm/tests/pit/.gitignore + create mode 100644 tools/kvm/tests/pit/Makefile + create mode 100644 tools/kvm/tests/pit/README + create mode 100644 tools/kvm/tests/pit/tick.S + create mode 100644 tools/kvm/threadpool.c + create mode 100644 tools/kvm/ui/sdl.c + create mode 100644 tools/kvm/ui/vnc.c + create mode 100644 tools/kvm/util.c + create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN + create mode 100755 tools/kvm/util/generate-cmdlist.sh + create mode 100755 tools/kvm/util/kvm-ifup-vbr0 + create mode 100644 tools/kvm/util/parse-options.c + create mode 100644 tools/kvm/util/rbtree-interval.c + create mode 100755 tools/kvm/util/set_private_br.sh + create mode 100644 tools/kvm/util/strbuf.c + create mode 100644 tools/kvm/virtio/9p-pdu.c + create mode 100644 tools/kvm/virtio/9p.c + create mode 100644 tools/kvm/virtio/balloon.c + create mode 100644 tools/kvm/virtio/blk.c + create mode 100644 tools/kvm/virtio/console.c + create mode 100644 tools/kvm/virtio/core.c + create mode 100644 tools/kvm/virtio/net.c + create mode 100644 tools/kvm/virtio/pci.c + create mode 100644 tools/kvm/virtio/rng.c +Merging scsi-post-merge/merge-base:master () +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm +From ../next + * [new branch] quilt/akpm -> akpm +$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base +From ../next + * [new branch] quilt/akpm-base -> akpm-base +$ git checkout akpm +Switched to branch 'akpm' +$ git rebase --onto master akpm-base +First, rewinding head to replay your work on top of it... +Applying: drm: fix kconfig unmet dependency warning +Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy +Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 +Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver +Applying: x86: fix mmap random address range +Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map +Applying: vrtc: change its year offset from 1960 to 1972 +Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms +Applying: mrst: battery fixes +Applying: drivers/power/intel_mid_battery.c: fix build +Applying: x86,mrst: add mapping for bma023 +Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer +Applying: arch/x86/kernel/ptrace.c: quiet sparse noise +Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static +Applying: x86: tlb flush avoid superflous leave_mm() +Applying: x86: reduce clock calibration time during slave cpu startup +Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix +Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file +Applying: arm, exec: remove redundant set_fs(USER_DS) +Applying: audit: always follow va_copy() with va_end() +Applying: btrfs: don't dereference extent_mapping if NULL +Applying: ceph/mds_client.c: quiet sparse noise +Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac +Applying: devtmpfsd: fix task state handling +Applying: drivers/gpu/vga/vgaarb.c: add missing kfree +Applying: drm: avoid switching to text console if there is no panic timeout +Applying: hrtimers: Special-case zero length sleeps +Applying: ia64, exec: remove redundant set_fs(USER_DS) +Applying: brlocks/lglocks: clean up code +Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes +Applying: ipc/mqueue: cleanup definition names and locations +Applying: ipc/mqueue: switch back to using non-max values on create +Applying: ipc/mqueue: enforce hard limits +Applying: ipc/mqueue: update maximums for the mqueue subsystem +Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix +Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes +Applying: unicore32, exec: remove redundant set_fs(USER_DS) +Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt() +Applying: debugobjects: extend debugobjects to assert that an object is initialized +Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers +Applying: ext4: use proper little-endian bitops +Applying: ocfs2: avoid unaligned access to dqc_bitmap +Applying: parisc, exec: remove redundant set_fs(USER_DS) +Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused +Applying: scsi: fix a header to include linux/types.h +Applying: drivers/scsi/megaraid.c: fix sparse warnings +Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb() +Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id +Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user() +Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock +Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements +Applying: loop: prevent information leak after failed read +Applying: loop: cleanup set_status interface +Applying: loop-cleanup-set_status-interface-checkpatch-fixes +Applying: cciss: auto engage SCSI mid layer at driver load time +Applying: block: avoid unnecessary plug list flush +Applying: block: add missed trace_block_plug +Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone() +Applying: bio: change some signed vars to unsigned +Applying: paride: fix potential information leak in pg_read() +Applying: slab: add taint flag outputting to debug paths. +Applying: slub: add taint flag outputting to debug paths +Applying: drivers/tty/serial/pch_uart.c: add console support +Applying: mm/page-writeback.c: make determine_dirtyable_memory static again +Applying: vmscan: fix initial shrinker size handling +Applying: vmscan: use atomic-long for shrinker batching +Applying: vmscan-use-atomic-long-for-shrinker-batching-fix +Applying: vmscan: promote shared file mapped pages +Applying: vmscan: activate executable pages after first usage +Applying: mm: add free_hot_cold_page_list() helper +Applying: mm: fix page-faults detection in swap-token logic +Applying: mm: add extra free kbytes tunable +Applying: mm-add-extra-free-kbytes-tunable-update +Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes +Applying: sparc: gup_pte_range() support THP based tail recounting +Applying: thp: share get_huge_page_tail() +Applying: mm: add vm_area_add_early() +Applying: selinuxfs: remove custom hex_to_bin() +Applying: include/linux/security.h: fix security_inode_init_security() arg +Applying: hpet: factor timer allocate from open +Applying: intel_idle: fix API misuse +Applying: intel_idle: disable auto_demotion for hotplugged CPUs +Applying: poll: add poll_requested_events() function +Applying: lib/crc: add slice by 8 algorithm to crc32.c +Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix +Applying: epoll: limit paths +Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs +Applying: oprofilefs: handle zero-length writes +Applying: cgroups: add res_counter_write_u64() API +Applying: cgroups: new resource counter inheritance API +Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks +Applying: cgroups: new cancel_attach_task() subsystem callback +Applying: cgroups: ability to stop res charge propagation on bounded ancestor +Applying: cgroups: add res counter common ancestor searching +Applying: res_counter: allow charge failure pointer to be null +Applying: cgroups: pull up res counter charge failure interpretation to caller +Applying: cgroups: allow subsystems to cancel a fork +Applying: cgroups: add a task counter subsystem +Applying: cgroups: ERR_PTR needs err.h +Applying: proc: force dcache drop on unauthorized access +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks() +Applying: vfs: cache request_queue in struct block_device +Applying: dio: optimize cache misses in the submission path +Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes +Applying: dio: using prefetch requires including prefetch.h +Applying: ramoops: update parameters only after successful init +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm +From ../rebase-tmp + + 11a2f1f...a1b5371 akpm -> akpm (forced update) +$ rm -rf ../rebase-tmp +Merging akpm (a1b5371 ramoops: update parameters only after successful init) +$ git merge --no-ff akpm +Merge made by the 'recursive' strategy. + Documentation/DocBook/debugobjects.tmpl | 50 +++ + Documentation/blockdev/cciss.txt | 14 +- + Documentation/cgroups/cgroups.txt | 13 +- + Documentation/cgroups/resource_counter.txt | 20 ++- + Documentation/cgroups/task_counter.txt | 153 ++++++++++ + Documentation/sysctl/vm.txt | 16 + + arch/arm/include/asm/processor.h | 1 - + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/ia64/include/asm/processor.h | 1 - + arch/parisc/include/asm/processor.h | 2 - + arch/parisc/kernel/process.c | 1 - + arch/unicore32/include/asm/processor.h | 1 - + arch/x86/include/asm/mrst.h | 9 + + arch/x86/kernel/e820.c | 59 ++--- + arch/x86/kernel/ptrace.c | 3 +- + arch/x86/kernel/rtc.c | 5 + + arch/x86/kernel/smpboot.c | 16 +- + arch/x86/kernel/tsc.c | 20 ++ + arch/x86/mm/mmap.c | 4 +- + arch/x86/mm/pageattr.c | 2 +- + arch/x86/mm/tlb.c | 16 +- + arch/x86/platform/iris/iris.c | 67 ++++- + arch/x86/platform/mrst/mrst.c | 1 + + arch/x86/platform/mrst/vrtc.c | 4 +- + block/blk-cgroup.c | 12 +- + block/blk-core.c | 18 +- + drivers/base/devtmpfs.c | 3 +- + drivers/block/cciss.c | 1 + + drivers/block/cciss_scsi.c | 1 + + drivers/block/loop.c | 47 ++- + drivers/block/paride/pg.c | 1 + + drivers/char/hpet.c | 56 +++- + drivers/char/ramoops.c | 17 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/firmware/dmi_scan.c | 6 +- + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/drm_fb_helper.c | 7 + + drivers/gpu/vga/vgaarb.c | 18 +- + drivers/idle/intel_idle.c | 59 +++-- + drivers/message/fusion/mptbase.c | 7 +- + drivers/message/fusion/mptbase.h | 1 + + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 - + drivers/oprofile/oprofilefs.c | 5 +- + drivers/platform/x86/acerhdf.c | 1 + + drivers/power/intel_mid_battery.c | 12 +- + drivers/rtc/rtc-mrst.c | 19 +- + drivers/scsi/aacraid/commctrl.c | 1 + + drivers/scsi/megaraid.c | 8 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +- + drivers/scsi/osd/osd_uld.c | 22 +- + drivers/scsi/sg.c | 25 +- + drivers/tty/serial/Kconfig | 9 + + drivers/tty/serial/pch_uart.c | 160 ++++++++++- + fs/bio.c | 7 +- + fs/block_dev.c | 3 + + fs/btrfs/inode.c | 3 +- + fs/ceph/mds_client.c | 4 +- + fs/dcache.c | 10 +- + fs/direct-io.c | 56 +++- + fs/eventpoll.c | 245 +++++++++++++-- + fs/ext4/ext4.h | 7 +- + fs/ext4/ialloc.c | 4 +- + fs/file_table.c | 23 +- + fs/internal.h | 3 +- + fs/namei.c | 26 +- + fs/namespace.c | 124 ++++---- + fs/ocfs2/ocfs2.h | 47 +++ + fs/ocfs2/quota_local.c | 10 +- + fs/pnode.c | 4 +- + fs/proc/base.c | 42 +--- + fs/select.c | 38 +-- + include/linux/bio.h | 10 +- + include/linux/cgroup.h | 28 ++- + include/linux/cgroup_subsys.h | 8 + + include/linux/debugobjects.h | 6 + + include/linux/eventpoll.h | 1 + + include/linux/fs.h | 5 +- + include/linux/gfp.h | 1 + + include/linux/hpet.h | 1 + + include/linux/ipc_namespace.h | 40 +++- + include/linux/lglock.h | 152 ++-------- + include/linux/mm.h | 1 + + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 2 +- + include/linux/poll.h | 7 +- + include/linux/res_counter.h | 27 ++- + include/linux/security.h | 2 +- + include/linux/shrinker.h | 2 +- + include/linux/swap.h | 36 +++ + include/linux/vmalloc.h | 1 + + include/linux/writeback.h | 2 - + include/scsi/scsi_netlink.h | 2 +- + init/Kconfig | 9 + + init/calibrate.c | 15 + + init/do_mounts_rd.c | 14 + + ipc/mq_sysctl.c | 31 +-- + ipc/mqueue.c | 24 +- + ipc/sem.c | 250 +++++++++++----- + kernel/Makefile | 3 +- + kernel/audit.c | 5 +- + kernel/cgroup.c | 58 +++- + kernel/cgroup_freezer.c | 9 +- + kernel/cgroup_task_counter.c | 239 +++++++++++++++ + kernel/cpuset.c | 6 +- + kernel/events/core.c | 5 +- + kernel/exit.c | 2 +- + kernel/fork.c | 8 +- + kernel/hrtimer.c | 8 + + kernel/lglock.c | 101 ++++++ + kernel/res_counter.c | 97 +++++- + kernel/sched.c | 6 +- + kernel/sysctl.c | 11 +- + kernel/timer.c | 54 +++- + lib/crc32.c | 370 ++++++++++++++++------- + lib/crc32defs.h | 16 +- + lib/debugobjects.c | 33 ++ + lib/gen_crc32table.c | 59 +++-- + mm/memory.c | 13 + + mm/page-writeback.c | 122 ++++---- + mm/page_alloc.c | 49 +++- + mm/rmap.c | 3 +- + mm/slab.c | 9 +- + mm/slub.c | 2 +- + mm/swap.c | 14 +- + mm/vmalloc.c | 28 ++- + mm/vmscan.c | 54 ++-- + net/netfilter/nf_conntrack_netlink.c | 5 + + security/selinux/selinuxfs.c | 14 +- + 128 files changed, 2729 insertions(+), 1012 deletions(-) + create mode 100644 Documentation/cgroups/task_counter.txt + create mode 100644 kernel/cgroup_task_counter.c + create mode 100644 kernel/lglock.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..643a9d6c2102 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,24 @@ +Importing hexagon based on v3.1-rc9 +Unchanged quilt series hexagon +Importing i2c based on 839d8810747bbf39e0a5a7f223b67bffa7945f8d +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 839d8810747bbf39e0a5a7f223b67bffa7945f8d +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 3.1-rc3 +Unchanged quilt series kernel-doc +Importing rr based on v3.1-8907-g43672a0 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 43672a0784707d795556b1f93925da8b8e797d03 +HEAD is now at 43672a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm +$ git am ../quilt/rr/module:enable_dynamic_debugging_regardless_of_taint.patch +Applying: module: Enable dynamic debugging regardless of taint +$ git am ../quilt/rr/module:bug_add_taint_oot_flag_for_s_not_built_in_tree.patch +Applying: module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + dfb79dc...05478c6 master -> quilt/rr (forced update) +Importing device-mapper based on v3.1-8907-g43672a0 + quilt series is empty +$ git update-ref refs/heads/quilt/device-mapper 43672a0784707d795556b1f93925da8b8e797d03 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..13f7b1c71d58 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20111104 -- 2.39.2