Add linux-next specific files for 20121130
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..f51e7a6
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,213 @@
+Name SHA1
+---- ----
+origin e9296e89b85604862bd9ec2d54dc43edad775c0d
+fixes 12250d843e8489ee00b5b7726da855e51694e792
+kbuild-current bad9955db1b73d7286f74a8136a0628a9b1ac017
+arm-current ea3aacf5f22c1002cac97985354658072232e280
+m68k-current 34fa78b59c52d1db3513db4c1a999db26b2e9ac2
+powerpc-merge e716e014384688d1a50d1aa5213ee74748c6d4e0
+sparc 194d9831f0419b5125dc94ec0ece4434d8ef74f0
+net e196c0e579902f42cf72414461fb034e5a1ffbf7
+sound-current d846b17475d52f037437d125cd19c28f1d36e4f0
+pci-current ff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc
+wireless 6bdd253f635f7b2ef027d116933a6c9ec148b87f
+driver-core.current 77b67063bb6bce6d475e910d3b886a606d0d91f7
+tty.current b1a925f44a3a21c538144e30b08f966cad7adb63
+usb.current f4a75d2eb7b1e2206094b901be09adb31ba63681
+staging.current f4a75d2eb7b1e2206094b901be09adb31ba63681
+char-misc.current f4a75d2eb7b1e2206094b901be09adb31ba63681
+input-current 0a0d62857366d8a6531e7fed1c3ccdd9a2b5b40b
+md-current 874807a83139abc094f939e93623c5623573d543
+audit-current c158a35c8a681cf68d36f22f058f9f5466386c71
+crypto-current 9efade1b3e981f5064f9db9ca971b4dc7557ae42
+ide 9974e43d900af7979e0a571b8e0c9674c7399b79
+dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442
+sh-current 44033109e99cf584d6285226ed521098f5ef7250
+irqdomain-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+devicetree-current 0e622d39197f0b64b9e043fe75ac3634bf9f3a05
+spi-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+gpio-current 96b70641b937e99c1579cb6ebbcdb7b0af98cdd0
+rr-fixes b251f0f399e275b027d6541cfbac1d2a3206b44a
+asm-generic 9b04ebd1584766229c58fedaa8fe4dfff575ac3a
+arm 5350eb2c2848e6ae7b400b77fb261d615c8d20a9
+arm-perf 3d70f8c617a436c7146ecb81df2265b4626dfe89
+davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625
+xilinx 74cad6042156c30fe64d3226e041c77139ae8bcf
+arm64 f2bd5d240635b15b5e32cd3c36ed0f4ad31e8442
+blackfin 9d8460173f6f6089cb001066f92c889832da8fab
+c6x 93bbd0c087eb299e0fe11c59d340932180c082b5
+cris eacb25c79aa10bccd17854df664694bc9ee79184
+hexagon e1858b2a21cd84a855945a4747fb2db41b250c22
+ia64 7843ae0ec641fe3acd02f966d45909f3e42e3e63
+m68k 5fec45a20db3656ce36fac24639aac76c6641215
+m68knommu 5a1b2a15cc95d93767b5ceaf490685ab1a9caaa5
+microblaze f229605441030bcd315c21d97b25889d63ed0130
+mips 46845cf7280edff8151b654e6420d4a11e96b1df
+openrisc 634bd40a894d64df09ba36c12bb6e70787989ba9
+parisc 949a05d03490e39e773e8652ccab9157e6f595b4
+powerpc 1a9bd45412665e73c72612b6f744378d860e02a8
+4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d
+mpc5xxx 451815bc42b8b6b8d7e02b16d5ba333a93ce0c1a
+galak 1723d90915d4689fa2e8cd4151d45ea38c96cb99
+s390 683c3dcef439f969b2c7fd09b60144cb4e2155a5
+sh 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb
+sparc-next 43c422eda99b894f18d1cca17bcd2401efaf7bd0
+tile ddffeb8c4d0331609ef2581d84de4d763607bd37
+unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2
+xtensa 518129b24e46c34a8d2b4c7aa046c41fac765f33
+btrfs c37b2b6269ee4637fb7cdb5da0d1e47215d57ce2
+ceph 35152979e6181b1fbb4b61c3ff641c14df53ad66
+cifs 0950d2ae2fe96a657c0e5e66a4ae3b64753c0961
+configfs b930c26416c4ea6855726fd977145ccea9afbdda
+ecryptfs e4bc6522d53b7b8eb02cfac35fd18275fd86269d
+ext3 55eede29d55a97fce2f9b5c21d4804f4a2b59158
+ext4 f3b59291a69d0b734be1fc8be489fef2dd846d3d
+f2fs 7117448a5968d0c40ad13782f1c091cfdbd5daa2
+fuse 23ab0c76c0855eca2beffcdc9ed4a5a41043fb69
+gfs2 1e2d9d44f3ceb7dac7cb14d2476d0a8128c8e169
+jfs 4e7a4b01222343481d8ff084dbef9b80f7089a19
+logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c
+nfs f937b66ad1af768617e0fb0b1f517450019cddb4
+nfsd f3c7521fe53a7892d8c8c4715f7c0f4add7b2e19
+ocfs2 4538df64655dcfe17b33080b219dc783161a262e
+omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84
+squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa
+v9fs 552aad02a283ee88406b102b4d6455eef7127196
+ubifs a28ad42a4a0c6f302f488f26488b8b37c9b30024
+xfs b870553cdecb26d5291af09602352b763e323df2
+pci 053f328c93a3fc9713abfa7060454438407e94a7
+hid 8f348a1cea9469ef36b87caf0ac139e58aaef345
+i2c c1ec1ae179f67f6a3acc2fbb2e7a35c2e220753f
+i2c-embedded 972deb4f49b5b6703d9c6117ba0aeda2180d4447
+jdelvare-hwmon d2d9cf34496831c002e470517a0273bcb05da2cd
+hwmon-staging 8b59397f37b4712df0712e8a289283a309020342
+v4l-dvb db46f44f32c26ac6b61fe2b4240d61b6074ba450
+kbuild a5ce08dcd7ab248b78f51d9a60e04761ca7fbba4
+kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb
+libata a52f514c911978dee418f19d1d0103e3bc25fa62
+infiniband 78c90247afb786b1a1fbfffbcd42907ce480e36f
+pstore b042e47491ba5f487601b5141a3f1d8582304170
+acpi 32cc109cbbeac76d7a772e2dd4d6f9480313528c
+cpuidle 3cf7997a389de59498c966c529456696ce8bc1a7
+cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37
+thermal d12250ef8dc1bbc811d505776be053e358ba82f5
+ieee1394 790198f74c9d1b46b6a89504361b1a844670d050
+ubi 6a059abdbae7b6b35ddc69f6336f7afc1ce79bac
+dlm da8c66638ae684c99abcb30e89d2803402e7ca20
+swiotlb af51a9f1848ff50079a10def56a2c064f326af22
+scsi a3667aaed5698b84bad2f1b3f71adc86499f4bc6
+target-updates 3e4f574857eebce60bb56d7524f3f9eaa2a126d0
+target-merge 6f0c0580b70c89094b3422ba81118c7b959c7556
+ibft 935a9fee51c945b8942be2d7b4bae069167b4886
+isci 6734092e66011def7875bd67beef889d0fee1cc9
+slave-dma 858e3fc0606123b9c959988c5c3fe56e8f680bfa
+dmaengine a2bd1140a264b561e38d99e656cd843c2d840e86
+net-next bb728820fe7c42fdb838ab2745fb5fe6b18b5ffa
+wireless-next 0751f8654602e4255f0b9c17784d8100d5896010
+bluetooth 92a185b572a2ee46badcbb6ca2f71d04e6ea48af
+mtd 35f95d228e55eebdc87b5c0dbdecc46884f476a6
+l2-mtd 0f722de047e3e041d33446b570f8c960ad188965
+crypto a465348ff5d3e564ae0bcde63d5ef2066c079aad
+drm 7136470d4b37b46565b29b8b9425a8361421483b
+sound 9b4ef97757953c6071563b7cbfc689e3dd771603
+sound-asoc 536bc8f605a8ea62d1f75d5ec3ed8bc0526a6271
+modules 56713a28675b966e027a824a0130b80dffab209f
+virtio b15a62a51cbf27fd36fc3cd63962ae67b45e07ef
+input 1a22e16fc3d6abc8d6323cc0973435439932fe5f
+input-mt 6f0c0580b70c89094b3422ba81118c7b959c7556
+cgroup 9718ceb3431acdeee9bdec5c18e18266333970aa
+block 95678efc1e9aa7bbc4add2dd374721c5c66e0dcf
+device-mapper cee3685bb2d9a7ce21520f810d27030472f1077b
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98
+mmc 2656109070eddd02d771c926e5648f0787918b19
+kgdb 58bcdf6847831913b41e9dfee1cbc579f939ef8b
+slab f1d58d715a1d8b937eb8f89c593e55fa7534eb6a
+uclinux ddffeb8c4d0331609ef2581d84de4d763607bd37
+md fb07ccebfd75d8a84910c670f255b76c76579d7a
+mfd 64cdfe256aae6d43d472331ba03bd4ccbfcb1abb
+battery eba3b670a9166a91be5a11fe33290dca6b9457a2
+fbdev cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a
+viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77
+omap_dss2 bb026693581fdfd8cffe200c8933609c058e7980
+regulator 47366619fae316329f48c5ad51deec966930ad16
+security c91c1bf2f53482c7d8111aa347abdcba148e5668
+selinux c2d7b247f0c028d325a5da5b9611b60ba160f237
+lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02
+watchdog 58ddfed79a60ba5d5eb4dce2767aa592947e1586
+dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96
+iommu f6cffc1f283e11f623a9b7c36fd9cd32b77ccb1c
+vfio 74d8627792be5ac767780d0f1c8baea9271934b8
+osd b6755ffb0c03c2e763cc56f72cc2ceaba8ea2805
+jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193
+trivial 8fdbb340ef0683437e791360d63726d5725add66
+audit dcd6c92267155e70a94b3927bce681ce74b80d1f
+pm 5d699e5c835669312daf3a5af4d9ce6022ac320a
+apm fb9d78aca709b7a6389c79d6211fb384c69bb79f
+fsnotify 1aec9c0d718693553543349e92138033b0bcea4c
+edac c215786e009a4310f3ab4c18cb365def571d3d9b
+edac-amd a8373ecc0c26d8afafd0d2e88f96756e26b7f3ee
+devicetree f3b6159e6a12136ac9c59aaa92ba9f3e484df650
+dt-rh 4a92a385f867b26297b736e9b9cc42bd6dbf0f2b
+spi 743179849015dc71bb2ea63d8cd4bfa7fdfb4bc6
+spi-mb 170c2d0a87922adb43a8e8ca47cba3e30407d4d6
+tip a07005cbd84724600e46a709a6a10ed0350f241a
+ftrace bf3071f5a054db9e5bab873355d27a7330ce5187
+rcu 98dbec158343a1220d2905adb0e338c2a77c2e77
+cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee
+uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa
+kvm e6c7d32172f10b68fa9a3be05aa1231352a52171
+kvm-ppc a2ef34ac04527d794df0c59d0c78ff7bf3f493a3
+oprofile 44009105081b51417f311f4c3be0061870b6b8ed
+xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495
+xen-two ca63454c05deabcfcd44b5dde7b9344b811061a8
+xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59
+percpu b4916cb17c261a6043bcb2a98d0d6512497a7cf8
+workqueues d8318e5e51f42001b11f2b7bed968bad4eecf432
+drivers-x86 455f38ccba672b33cda0a96cf9089be312ba95de
+hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49
+sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00
+regmap 51b6d983b23ea28fbd8a445142505f019bcaf7da
+hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a
+leds 5c6f844cee2139182b3a778f2a883a77e5bb8f7d
+driver-core da095fd3d5063f2dd03468d71f7df39a0430d86f
+tty 218cbbd82132d48c6f4e042e31beb6019f92db01
+usb fb37ef98015f864d22be223a0e0d93547cd1d4ef
+staging 8b7a13c3f404cbd26b495fa9c34339cb9b7b8164
+char-misc 962b686c450493adb8596e813bdfd0e1613482e6
+tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+writeback 2f60d628ffd042e65e0b1d3431fb3e38d6f7c1be
+arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268
+hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad
+pinctrl e7125b5249455146b8e260ecc261e65b8ae6b68e
+vhost e0953c8b85baaa38d77ebd5dc4051bc3837c1191
+memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077
+remoteproc 6f0c0580b70c89094b3422ba81118c7b959c7556
+irqdomain a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+gpio b53bc2819a71099ecfc3d61ba0796b3dcc6be321
+gpio-lw 12fff48d7fbab64ff4164a09864a28e2f45f5ded
+arm-soc d180b0b351e094463f78460037c89e0821a65ac4
+bcm2835 d7f292ea1d34383a0f2181d8bbe85f272bf86cb5
+cortex 77a3018e38b901f565b36f16924a3f86ad3e7328
+ep93xx fab1f7446a5baac4bf2f90e151a879677c0de916
+ixp4xx b94740b3b38fd8e37fcd3bb06a18ec2796061c7d
+msm a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+renesas 6cee927094f4813151bee91ddc45556c5ca8f77e
+samsung d1a8169e923d749477935a5984c2dc204a0824c4
+tegra 3c8d1fc07405e749b019372df1c971a884926592
+kvmtool 6f09dabf84e68ae16c815791939c3de93102f6d2
+dma-mapping 2b8836a7fcae3bf2afe80f62cceafc3ad7d85632
+pwm 9685ac4bff68d44816235915fcceca9b2728c1b9
+dma-buf ba4205121f8199c32658b03c2660b1a9f9ff217c
+userns 98f842e675f96ffac96e6c50315790912b2812be
+ktest 95f57838418358e93212e9dddd60d3502c7f8e2e
+signal 541880d9a2c7871f6370071d55aa6662d329c51e
+clk 1f61e5f143b578606389887887af549bc5554353
+random ec8f02da9ea500474417d1d31fa3d46a562ab366
+lzo-update ba32bf9f4149eeab14bb97ca2edd2f8d1619dfd8
+drop-experimental 93871239fb40b6fd9a423bddac5d95c1b2d843db
+scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47
+vfs a77cfcb429ed98845a4e4df72473b8f37acd890b
+akpm-current 064904e0d5055892ea494e2fadcef3b706b53732
+akpm cfb65dadcd079ad4547407a1584bc6b96bd48bb3
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..ca6ef05
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,215 @@
+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://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes
+arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#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
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.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/helgaas/pci.git#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.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+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.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.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://github.com/pmundt/linux-sh.git#sh-fixes-for-linus
+irqdomain-current git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/merge
+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
+gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge
+rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next
+xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream
+blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/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 git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#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://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.linux-mips.org/pub/scm/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://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next
+4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next
+mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next
+galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sh git git://github.com/pmundt/linux-sh.git#sh-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://github.com/gxt/linux.git#unicore32
+xtensa git git://github.com/czankel/xtensa-linux.git#for_next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+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/tyhicks/ecryptfs.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
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+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
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+logfs git git://github.com/prasad-joshi/logfs_upstream.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
+ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.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://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
+ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next
+xfs git git://oss.sgi.com/xfs/xfs.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#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/
+i2c-embedded git git://git.pengutronix.de/git/wsa/linux.git#i2c-embedded/for-next
+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
+v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
+kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT
+infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next
+pstore git git://git.infradead.org/users/cbou/linux-pstore.git#master
+acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+cpuidle git git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next
+cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+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.git#linux-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+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
+ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next
+isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all
+slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next
+dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.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/bluetooth/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://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://people.freedesktop.org/~airlied/linux.git#drm-next
+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
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next
+virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+input-mt git git://github.com/rydberg/linux.git#for-next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+block git git://git.kernel.dk/linux-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.git#master
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/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.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next
+battery git git://git.infradead.org/battery-2.6.git#master
+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://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next
+selinux git git://git.infradead.org/users/eparis/selinux.git#master
+lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+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
+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.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
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next
+dt-rh git git://sources.calxeda.com/kernel/linux.git#for-next
+spi git git://git.secretlab.ca/git/linux-2.6#spi/next
+spi-mb git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git#spi-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime
+uprobes git git://github.com/srikard/linux.git#for-next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next
+oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen
+xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next
+xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next
+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
+drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#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.git#master
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next
+writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/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.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map
+remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next
+irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next
+gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next
+gpio-lw git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next
+cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next
+ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next
+ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next
+msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next
+kvmtool git git://github.com/penberg/linux-kvm.git#master
+dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next
+pwm git git://gitorious.org/linux-pwm/linux-pwm.git#for-next
+dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next
+userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next
+clk git git://git.linaro.org/people/mturquette/linux.git#clk-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update
+drop-experimental git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#linux-next
+scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/
+akpm mmotm http://www.ozlabs.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000..09ed83e
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,13656 @@
+$ date
+Friday 30 November 10:10:38 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at e23739b Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
+Merging origin/master (e9296e8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge origin/master
+Updating e23739b..e9296e8
+Fast-forward
+ drivers/atm/ambassador.c | 1 +
+ drivers/net/can/usb/peak_usb/pcan_usb.c | 8 ++++++--
+ drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 8 ++++++--
+ drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 2 +-
+ drivers/net/team/team.c | 4 +++-
+ drivers/net/usb/qmi_wwan.c | 1 +
+ drivers/vhost/vhost.c | 2 +-
+ include/linux/percpu-rwsem.h | 4 ++--
+ net/can/bcm.c | 3 +++
+ net/ipv4/icmp.c | 3 ++-
+ net/ipv4/ipmr.c | 4 ++++
+ net/irda/irttp.c | 1 +
+ net/netfilter/ipset/ip_set_hash_netiface.c | 2 +-
+ net/openvswitch/flow.c | 14 +++++---------
+ net/openvswitch/vport-netdev.c | 2 +-
+ net/sctp/chunk.c | 20 ++++++++++++++------
+ net/sctp/socket.c | 4 ++--
+ net/sctp/transport.c | 2 +-
+ 18 files changed, 55 insertions(+), 30 deletions(-)
+Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes (ea3aacf ARM: 7586/1: sp804: set cpumask to cpu_possible_mask for clock event device)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/common/timer-sp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging m68k-current/for-linus (34fa78b m68k: fix sigset_t accessor functions)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (e716e01 powerpc/eeh: Do not invalidate PE properly)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (194d983 Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (e196c0e bonding: fix race condition in bonding_store_slaves_active)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/bonding/bond_main.c | 93 ++++++++++++--------------------------
+ drivers/net/bonding/bond_sysfs.c | 36 +++++----------
+ 2 files changed, 41 insertions(+), 88 deletions(-)
+Merging sound-current/for-linus (d846b17 ALSA: hda - Fix build without CONFIG_PM)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (6bdd253 mac80211: fix remain-on-channel (non-)cancelling)
+$ git merge wireless/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++------
+ net/mac80211/offchannel.c | 2 --
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+Merging driver-core.current/driver-core-linus (77b6706 Linux 3.7-rc5)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (b1a925f tty vt: Fix a regression in command line edition)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (f4a75d2e Linux 3.7-rc6)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (f4a75d2e Linux 3.7-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (f4a75d2e Linux 3.7-rc6)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (0a0d628 ARM - OMAP: ads7846: fix pendown debounce setting)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (874807a md/raid1{,0}: fix deadlock in bitmap_unplug.)
+$ git merge md-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/md/raid1.c | 2 +-
+ drivers/md/raid10.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ git merge ide/master
+Already up-to-date.
+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 (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (0e622d3 of/address: sparc: Declare of_iomap as an extern function for sparc again)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging spi-current/spi/merge (a0d271c Linux 3.6)
+$ git merge spi-current/spi/merge
+Already up-to-date.
+Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging rr-fixes/fixes (b251f0f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
+$ git merge asm-generic/master
+Merge made by the 'recursive' strategy.
+ arch/openrisc/include/asm/io.h | 1 +
+ include/asm-generic/io.h | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+Merging arm/for-next (5350eb2 Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Auto-merging include/linux/platform_data/sa11x0-serial.h
+Auto-merging include/linux/platform_data/pxa2xx_udc.h
+Removing arch/avr32/include/asm/mach/serial_at91.h
+Removing arch/arm/include/asm/mach/serial_at91.h
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/cpus.txt | 77 ++++++
+ arch/arm/Kconfig | 2 +
+ arch/arm/common/gic.c | 45 +++-
+ arch/arm/common/vic.c | 19 +-
+ arch/arm/include/asm/cpu.h | 1 +
+ arch/arm/include/asm/cputype.h | 13 +
+ arch/arm/include/asm/cti.h | 20 +-
+ arch/arm/include/asm/hardware/cache-l2x0.h | 5 +
+ arch/arm/include/asm/hardware/vic.h | 2 +-
+ arch/arm/include/asm/hw_breakpoint.h | 8 +-
+ arch/arm/include/asm/mach/serial_at91.h | 33 ---
+ arch/arm/include/asm/mmu.h | 13 +-
+ arch/arm/include/asm/mmu_context.h | 88 +------
+ arch/arm/include/asm/perf_event.h | 7 +
+ arch/arm/include/asm/pgtable-2level.h | 2 +
+ arch/arm/include/asm/pgtable-3level.h | 4 +-
+ arch/arm/include/asm/pgtable.h | 10 +-
+ arch/arm/include/asm/pmu.h | 28 +-
+ arch/arm/include/asm/prom.h | 2 +
+ arch/arm/include/asm/smp.h | 1 +
+ arch/arm/include/asm/smp_plat.h | 17 ++
+ arch/arm/include/asm/syscall.h | 9 +
+ arch/arm/include/asm/thread_info.h | 7 +-
+ arch/arm/kernel/devtree.c | 104 ++++++++
+ arch/arm/kernel/entry-common.S | 15 +-
+ arch/arm/kernel/hw_breakpoint.c | 154 ++++++-----
+ arch/arm/kernel/perf_event.c | 85 ++++--
+ arch/arm/kernel/perf_event_cpu.c | 74 ++++--
+ arch/arm/kernel/perf_event_v6.c | 126 ++++-----
+ arch/arm/kernel/perf_event_v7.c | 246 ++++++++---------
+ arch/arm/kernel/perf_event_xscale.c | 157 +++++------
+ arch/arm/kernel/process.c | 4 +-
+ arch/arm/kernel/ptrace.c | 29 +-
+ arch/arm/kernel/setup.c | 78 +++---
+ arch/arm/kernel/smp.c | 6 +
+ arch/arm/kernel/smp_twd.c | 54 ++--
+ arch/arm/kernel/topology.c | 42 +--
+ arch/arm/kernel/vmlinux.lds.S | 19 +-
+ arch/arm/mach-ixp4xx/include/mach/udc.h | 2 +-
+ arch/arm/mach-omap2/pmu.c | 2 -
+ arch/arm/mach-pxa/include/mach/udc.h | 2 +-
+ arch/arm/mach-sa1100/assabet.c | 2 +-
+ arch/arm/mach-sa1100/badge4.c | 2 +-
+ arch/arm/mach-sa1100/cerf.c | 2 +-
+ arch/arm/mach-sa1100/collie.c | 2 +-
+ arch/arm/mach-sa1100/h3xxx.c | 2 +-
+ arch/arm/mach-sa1100/hackkit.c | 2 +-
+ arch/arm/mach-sa1100/jornada720.c | 2 +-
+ arch/arm/mach-sa1100/lart.c | 2 +-
+ arch/arm/mach-sa1100/nanoengine.c | 2 +-
+ arch/arm/mach-sa1100/neponset.c | 2 +-
+ arch/arm/mach-sa1100/pleb.c | 2 +-
+ arch/arm/mach-sa1100/shannon.c | 2 +-
+ arch/arm/mach-sa1100/simpad.c | 2 +-
+ arch/arm/mm/cache-aurora-l2.h | 55 ++++
+ arch/arm/mm/cache-l2x0.c | 278 ++++++++++++++++++--
+ arch/arm/mm/context.c | 207 ++++++++-------
+ arch/arm/mm/idmap.c | 14 +-
+ arch/arm/mm/ioremap.c | 16 +-
+ arch/arm/mm/mmu.c | 2 +-
+ arch/arm/mm/proc-macros.S | 4 +
+ arch/arm/mm/proc-v7-2level.S | 10 +-
+ arch/arm/mm/proc-v7-3level.S | 5 +-
+ arch/arm/mm/proc-v7.S | 2 +-
+ arch/arm/plat-omap/include/plat/omap-serial.h | 55 ----
+ arch/avr32/include/asm/mach/serial_at91.h | 33 ---
+ drivers/mmc/host/mmci.c | 58 ++--
+ drivers/mmc/host/mmci.h | 4 +
+ drivers/tty/serial/atmel_serial.c | 18 --
+ drivers/tty/serial/omap-serial.c | 235 +++++++++++------
+ drivers/tty/serial/sa1100.c | 2 +-
+ drivers/tty/serial/serial_core.c | 71 ++++-
+ drivers/usb/gadget/pxa25x_udc.c | 4 +-
+ drivers/watchdog/sp805_wdt.c | 6 +-
+ .../linux/platform_data/pxa2xx_udc.h | 5 +-
+ .../linux/platform_data/sa11x0-serial.h | 6 +-
+ include/linux/serial_core.h | 6 +
+ scripts/sortextable.c | 1 +
+ 78 files changed, 1635 insertions(+), 1100 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/cpus.txt
+ delete mode 100644 arch/arm/include/asm/mach/serial_at91.h
+ create mode 100644 arch/arm/mm/cache-aurora-l2.h
+ delete mode 100644 arch/avr32/include/asm/mach/serial_at91.h
+ rename arch/arm/include/asm/mach/udc_pxa2xx.h => include/linux/platform_data/pxa2xx_udc.h (94%)
+ rename arch/arm/include/asm/mach/serial_sa1100.h => include/linux/platform_data/sa11x0-serial.h (93%)
+Merging arm-perf/for-next/perf (3d70f8c Linux 3.7-rc4)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging xilinx/arm-next (74cad60 serial: xilinx_uartps: get clock rate info from dts)
+$ git merge xilinx/arm-next
+Auto-merging arch/arm/mm/mmu.c
+Removing arch/arm/mach-zynq/include/mach/zynq_soc.h
+Removing arch/arm/mach-zynq/include/mach/uncompress.h
+Removing arch/arm/mach-zynq/include/mach/uart.h
+Removing arch/arm/mach-zynq/include/mach/clkdev.h
+Auto-merging arch/arm/include/debug/zynq.S
+Removing arch/arm/boot/dts/zynq-ep107.dts
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/zynq-7000.txt | 55 +++
+ arch/arm/Kconfig | 14 +-
+ arch/arm/Kconfig.debug | 18 +
+ arch/arm/Makefile | 1 -
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/zynq-7000.dtsi | 166 +++++++++
+ arch/arm/boot/dts/zynq-ep107.dts | 52 ---
+ arch/arm/boot/dts/zynq-zc702.dts | 44 +++
+ arch/arm/include/asm/mach/map.h | 7 +
+ .../mach/debug-macro.S => include/debug/zynq.S} | 23 +-
+ arch/arm/kernel/debug.S | 14 +
+ arch/arm/mach-zynq/Kconfig | 13 +
+ arch/arm/mach-zynq/common.c | 80 ++--
+ arch/arm/mach-zynq/common.h | 4 +-
+ arch/arm/mach-zynq/include/mach/clkdev.h | 32 --
+ arch/arm/mach-zynq/include/mach/uart.h | 25 --
+ arch/arm/mach-zynq/include/mach/uncompress.h | 51 ---
+ arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ---
+ arch/arm/mach-zynq/timer.c | 298 ++++++++-------
+ arch/arm/mm/mmu.c | 16 +
+ drivers/clk/Makefile | 1 +
+ drivers/clk/clk-zynq.c | 383 ++++++++++++++++++++
+ drivers/tty/serial/Kconfig | 1 +
+ drivers/tty/serial/xilinx_uartps.c | 39 +-
+ include/linux/clk/zynq.h | 24 ++
+ 25 files changed, 991 insertions(+), 419 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/zynq-7000.txt
+ create mode 100644 arch/arm/boot/dts/zynq-7000.dtsi
+ delete mode 100644 arch/arm/boot/dts/zynq-ep107.dts
+ create mode 100644 arch/arm/boot/dts/zynq-zc702.dts
+ rename arch/arm/{mach-zynq/include/mach/debug-macro.S => include/debug/zynq.S} (61%)
+ create mode 100644 arch/arm/mach-zynq/Kconfig
+ delete mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
+ delete mode 100644 arch/arm/mach-zynq/include/mach/uart.h
+ delete mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
+ create mode 100644 drivers/clk/clk-zynq.c
+ create mode 100644 include/linux/clk/zynq.h
+Merging arm64/upstream (f2bd5d2 ARM64: Remove incorrect Kconfig symbol HAVE_SPARSE_IRQ)
+$ git merge arm64/upstream
+Auto-merging arch/arm64/include/asm/pgtable.h
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/memory.txt | 2 +-
+ arch/arm64/Kconfig | 4 +-
+ arch/arm64/include/asm/Kbuild | 1 +
+ arch/arm64/include/asm/cacheflush.h | 11 ++++-
+ arch/arm64/include/asm/pgtable.h | 2 +
+ arch/arm64/include/asm/processor.h | 5 ---
+ arch/arm64/include/asm/syscalls.h | 14 +++---
+ arch/arm64/include/asm/unistd.h | 1 +
+ arch/arm64/include/asm/unistd32.h | 8 ++--
+ arch/arm64/kernel/entry.S | 17 +++----
+ arch/arm64/kernel/process.c | 83 +++++++++++++----------------------
+ arch/arm64/kernel/signal.c | 49 ++++++++++-----------
+ arch/arm64/kernel/signal32.c | 20 ++++-----
+ arch/arm64/kernel/sys.c | 76 ++------------------------------
+ arch/arm64/kernel/sys32.S | 19 --------
+ arch/arm64/kernel/sys_compat.c | 38 +++-------------
+ arch/arm64/mm/fault.c | 13 +++++-
+ arch/arm64/mm/flush.c | 9 ----
+ arch/arm64/mm/init.c | 4 +-
+ 19 files changed, 113 insertions(+), 263 deletions(-)
+Merging blackfin/for-linus (9d84601 Blackfin: dpmc: use module_platform_driver macro)
+$ git merge blackfin/for-linus
+Removing arch/blackfin/include/asm/kvm_para.h
+Merge made by the 'recursive' strategy.
+ arch/blackfin/include/asm/Kbuild | 6 +-
+ arch/blackfin/include/asm/bfin_sport.h | 128 +-----
+ arch/blackfin/include/asm/bfin_twi.h | 2 +-
+ arch/blackfin/include/asm/fixed_code.h | 30 +-
+ arch/blackfin/include/asm/kvm_para.h | 1 -
+ arch/blackfin/include/asm/pgtable.h | 2 -
+ arch/blackfin/include/asm/ptrace.h | 161 +-------
+ arch/blackfin/include/asm/uaccess.h | 41 +-
+ arch/blackfin/include/asm/unistd.h | 430 +------------------
+ arch/blackfin/include/uapi/asm/Kbuild | 16 +
+ arch/blackfin/include/uapi/asm/bfin_sport.h | 136 ++++++
+ arch/blackfin/include/{ => uapi}/asm/byteorder.h | 0
+ arch/blackfin/include/{ => uapi}/asm/cachectl.h | 0
+ arch/blackfin/include/{ => uapi}/asm/fcntl.h | 0
+ arch/blackfin/include/uapi/asm/fixed_code.h | 38 ++
+ arch/blackfin/include/{ => uapi}/asm/ioctls.h | 0
+ arch/blackfin/include/{ => uapi}/asm/poll.h | 0
+ arch/blackfin/include/{ => uapi}/asm/posix_types.h | 0
+ arch/blackfin/include/uapi/asm/ptrace.h | 170 ++++++++
+ arch/blackfin/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/blackfin/include/{ => uapi}/asm/siginfo.h | 0
+ arch/blackfin/include/{ => uapi}/asm/signal.h | 0
+ arch/blackfin/include/{ => uapi}/asm/stat.h | 0
+ arch/blackfin/include/{ => uapi}/asm/swab.h | 0
+ arch/blackfin/include/uapi/asm/unistd.h | 437 ++++++++++++++++++++
+ arch/blackfin/mach-common/dpmc.c | 19 +-
+ 26 files changed, 817 insertions(+), 800 deletions(-)
+ delete mode 100644 arch/blackfin/include/asm/kvm_para.h
+ create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
+ rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
+ rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
+ rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
+Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h)
+$ git merge c6x/for-linux-next
+Removing arch/c6x/include/uapi/asm/kvm_para.h
+Merge made by the 'recursive' strategy.
+ arch/c6x/include/asm/setup.h | 33 +++++++++++++++++++++++++++++++++
+ arch/c6x/include/uapi/asm/Kbuild | 2 ++
+ arch/c6x/include/uapi/asm/kvm_para.h | 1 -
+ arch/c6x/include/uapi/asm/setup.h | 33 +++------------------------------
+ arch/c6x/kernel/entry.S | 5 +++--
+ 5 files changed, 41 insertions(+), 33 deletions(-)
+ create mode 100644 arch/c6x/include/asm/setup.h
+ delete mode 100644 arch/c6x/include/uapi/asm/kvm_para.h
+Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
+$ git merge cris/for-next
+Auto-merging arch/cris/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/cris/include/arch-v10/arch/Kbuild | 5 +-
+ arch/cris/include/arch-v32/arch/Kbuild | 3 +-
+ arch/cris/include/arch-v32/arch/cryptocop.h | 116 +------
+ arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
+ arch/cris/include/asm/Kbuild | 5 -
+ arch/cris/include/asm/ptrace.h | 5 +-
+ arch/cris/include/asm/signal.h | 122 +------
+ arch/cris/include/asm/swab.h | 3 +-
+ arch/cris/include/asm/termios.h | 43 +--
+ arch/cris/include/asm/types.h | 5 +-
+ arch/cris/include/asm/unistd.h | 342 +------------------
+ arch/cris/include/uapi/arch-v10/arch/Kbuild | 4 +
+ .../include/{ => uapi}/arch-v10/arch/sv_addr.agh | 0
+ .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h | 0
+ .../cris/include/{ => uapi}/arch-v10/arch/svinto.h | 0
+ arch/cris/include/{ => uapi}/arch-v10/arch/user.h | 0
+ arch/cris/include/uapi/arch-v32/arch/Kbuild | 2 +
+ arch/cris/include/uapi/arch-v32/arch/cryptocop.h | 122 +++++++
+ arch/cris/include/{ => uapi}/arch-v32/arch/user.h | 0
+ arch/cris/include/uapi/asm/Kbuild | 34 ++
+ arch/cris/include/{ => uapi}/asm/auxvec.h | 0
+ arch/cris/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/cris/include/{ => uapi}/asm/byteorder.h | 0
+ arch/cris/include/{ => uapi}/asm/errno.h | 0
+ arch/cris/include/{ => uapi}/asm/ethernet.h | 0
+ arch/cris/include/{ => uapi}/asm/etraxgpio.h | 0
+ arch/cris/include/{ => uapi}/asm/fcntl.h | 0
+ arch/cris/include/{ => uapi}/asm/ioctl.h | 0
+ arch/cris/include/{ => uapi}/asm/ioctls.h | 0
+ arch/cris/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/cris/include/{ => uapi}/asm/mman.h | 0
+ arch/cris/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/cris/include/{ => uapi}/asm/param.h | 0
+ arch/cris/include/{ => uapi}/asm/poll.h | 0
+ arch/cris/include/{ => uapi}/asm/posix_types.h | 0
+ arch/cris/include/uapi/asm/ptrace.h | 1 +
+ arch/cris/include/{ => uapi}/asm/resource.h | 0
+ arch/cris/include/{ => uapi}/asm/rs485.h | 0
+ arch/cris/include/{ => uapi}/asm/sembuf.h | 0
+ arch/cris/include/{ => uapi}/asm/setup.h | 0
+ arch/cris/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/cris/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/cris/include/{ => uapi}/asm/siginfo.h | 0
+ arch/cris/include/uapi/asm/signal.h | 122 +++++++
+ arch/cris/include/{ => uapi}/asm/socket.h | 0
+ arch/cris/include/{ => uapi}/asm/sockios.h | 0
+ arch/cris/include/{ => uapi}/asm/stat.h | 0
+ arch/cris/include/{ => uapi}/asm/statfs.h | 0
+ arch/cris/include/uapi/asm/swab.h | 3 +
+ arch/cris/include/{ => uapi}/asm/sync_serial.h | 0
+ arch/cris/include/{ => uapi}/asm/termbits.h | 0
+ arch/cris/include/uapi/asm/termios.h | 45 +++
+ arch/cris/include/uapi/asm/types.h | 1 +
+ arch/cris/include/uapi/asm/unistd.h | 344 ++++++++++++++++++++
+ arch/cris/kernel/asm-offsets.c | 6 +-
+ 55 files changed, 689 insertions(+), 646 deletions(-)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
+ create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
+ rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/param.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/ptrace.h
+ rename arch/cris/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/rs485.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/signal.h
+ rename arch/cris/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/statfs.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/swab.h
+ rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/termios.h
+ create mode 100644 arch/cris/include/uapi/asm/types.h
+ create mode 100644 arch/cris/include/uapi/asm/unistd.h
+Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (7843ae0 Merge branch 'pstore_mevent' into next)
+$ git merge ia64/next
+Merge made by the 'recursive' strategy.
+ arch/ia64/kernel/topology.c | 4 +-
+ drivers/acpi/apei/erst.c | 16 ++---
+ drivers/firmware/efivars.c | 163 ++++++++++++++++++++++++++++++-------------
+ fs/pstore/inode.c | 7 +-
+ fs/pstore/internal.h | 2 +-
+ fs/pstore/platform.c | 13 ++--
+ fs/pstore/ram.c | 9 ++-
+ include/linux/efi.h | 1 +
+ include/linux/pstore.h | 6 +-
+ 9 files changed, 146 insertions(+), 75 deletions(-)
+Merging m68k/for-next (5fec45a m68k/sun3: Fix instruction faults)
+$ git merge m68k/for-next
+Removing arch/m68k/mm/init_no.c
+Removing arch/m68k/mm/init_mm.c
+Removing arch/m68k/include/uapi/asm/termios.h
+Removing arch/m68k/include/uapi/asm/termbits.h
+Removing arch/m68k/include/uapi/asm/sockios.h
+Removing arch/m68k/include/uapi/asm/socket.h
+Removing arch/m68k/include/uapi/asm/shmbuf.h
+Removing arch/m68k/include/uapi/asm/sembuf.h
+Removing arch/m68k/include/uapi/asm/msgbuf.h
+Removing arch/m68k/include/uapi/asm/auxvec.h
+Removing arch/m68k/include/asm/termios.h
+Removing arch/m68k/include/asm/spinlock.h
+Removing arch/m68k/include/asm/shmparam.h
+Removing arch/m68k/include/asm/hw_irq.h
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.bus | 4 +-
+ arch/m68k/Kconfig.cpu | 3 +-
+ arch/m68k/Kconfig.debug | 2 +-
+ arch/m68k/Kconfig.devices | 6 +-
+ arch/m68k/include/asm/Kbuild | 4 +
+ arch/m68k/include/asm/hw_irq.h | 6 -
+ arch/m68k/include/asm/shmparam.h | 6 -
+ arch/m68k/include/asm/spinlock.h | 6 -
+ arch/m68k/include/asm/termios.h | 50 --------
+ arch/m68k/include/uapi/asm/Kbuild | 17 +--
+ arch/m68k/include/uapi/asm/auxvec.h | 4 -
+ arch/m68k/include/uapi/asm/msgbuf.h | 31 -----
+ arch/m68k/include/uapi/asm/sembuf.h | 25 ----
+ arch/m68k/include/uapi/asm/shmbuf.h | 42 -------
+ arch/m68k/include/uapi/asm/socket.h | 72 -----------
+ arch/m68k/include/uapi/asm/sockios.h | 13 --
+ arch/m68k/include/uapi/asm/termbits.h | 201 -----------------------------
+ arch/m68k/include/uapi/asm/termios.h | 44 -------
+ arch/m68k/kernel/traps.c | 2 +-
+ arch/m68k/mm/init.c | 224 ++++++++++++++++++++++++++++++++-
+ arch/m68k/mm/init_mm.c | 176 --------------------------
+ arch/m68k/mm/init_no.c | 145 ---------------------
+ arch/m68k/mm/mcfmmu.c | 4 -
+ arch/m68k/mm/motorola.c | 14 ---
+ arch/m68k/mm/sun3mmu.c | 4 -
+ arch/m68k/sun3/sun3ints.c | 29 +----
+ 26 files changed, 247 insertions(+), 887 deletions(-)
+ delete mode 100644 arch/m68k/include/asm/hw_irq.h
+ delete mode 100644 arch/m68k/include/asm/shmparam.h
+ delete mode 100644 arch/m68k/include/asm/spinlock.h
+ delete mode 100644 arch/m68k/include/asm/termios.h
+ delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h
+ delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h
+ delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h
+ delete mode 100644 arch/m68k/include/uapi/asm/shmbuf.h
+ delete mode 100644 arch/m68k/include/uapi/asm/socket.h
+ delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
+ delete mode 100644 arch/m68k/include/uapi/asm/termbits.h
+ delete mode 100644 arch/m68k/include/uapi/asm/termios.h
+ delete mode 100644 arch/m68k/mm/init_mm.c
+ delete mode 100644 arch/m68k/mm/init_no.c
+Merging m68knommu/for-next (5a1b2a1 m68knommu: modify clock code so it can be used by all ColdFire CPU types)
+$ git merge m68knommu/for-next
+Removing arch/m68k/include/asm/m5249sim.h
+Auto-merging arch/m68k/Kconfig.cpu
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.cpu | 3 +-
+ arch/m68k/include/asm/m5249sim.h | 269 -------------------------------
+ arch/m68k/include/asm/m525xsim.h | 116 ++++++++++++-
+ arch/m68k/include/asm/mcfclk.h | 9 +-
+ arch/m68k/include/asm/mcfsim.h | 5 +-
+ arch/m68k/include/asm/page_no.h | 2 +-
+ arch/m68k/lib/memcpy.c | 3 +-
+ arch/m68k/platform/coldfire/clk.c | 100 +++++-------
+ arch/m68k/platform/coldfire/intc-5249.c | 8 +-
+ arch/m68k/platform/coldfire/m5206.c | 20 +++
+ arch/m68k/platform/coldfire/m523x.c | 28 ++++
+ arch/m68k/platform/coldfire/m5249.c | 28 +++-
+ arch/m68k/platform/coldfire/m525x.c | 20 +++
+ arch/m68k/platform/coldfire/m5272.c | 26 +++
+ arch/m68k/platform/coldfire/m527x.c | 30 ++++
+ arch/m68k/platform/coldfire/m528x.c | 28 ++++
+ arch/m68k/platform/coldfire/m5307.c | 20 +++
+ arch/m68k/platform/coldfire/m5407.c | 20 +++
+ arch/m68k/platform/coldfire/m54xx.c | 26 +++
+ 19 files changed, 413 insertions(+), 348 deletions(-)
+ delete mode 100644 arch/m68k/include/asm/m5249sim.h
+Merging microblaze/next (f229605 microblaze: dma-mapping: Support debug_dma_mapping_error)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/Kbuild | 2 -
+ arch/microblaze/include/asm/dma-mapping.h | 2 +
+ arch/microblaze/include/asm/elf.h | 97 +----
+ arch/microblaze/include/asm/ptrace.h | 62 +--
+ arch/microblaze/include/asm/setup.h | 6 +-
+ arch/microblaze/include/asm/uaccess.h | 3 +-
+ arch/microblaze/include/asm/unistd.h | 390 +------------------
+ arch/microblaze/include/uapi/asm/Kbuild | 32 ++
+ arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0
+ .../include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0
+ arch/microblaze/include/uapi/asm/elf.h | 121 ++++++
+ arch/microblaze/include/{ => uapi}/asm/errno.h | 0
+ arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/microblaze/include/{ => uapi}/asm/mman.h | 0
+ arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/microblaze/include/{ => uapi}/asm/param.h | 0
+ arch/microblaze/include/{ => uapi}/asm/poll.h | 0
+ .../include/{ => uapi}/asm/posix_types.h | 0
+ arch/microblaze/include/uapi/asm/ptrace.h | 72 ++++
+ arch/microblaze/include/{ => uapi}/asm/resource.h | 0
+ arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0
+ arch/microblaze/include/uapi/asm/setup.h | 19 +
+ arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0
+ .../microblaze/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0
+ arch/microblaze/include/{ => uapi}/asm/signal.h | 0
+ arch/microblaze/include/{ => uapi}/asm/socket.h | 0
+ arch/microblaze/include/{ => uapi}/asm/sockios.h | 0
+ arch/microblaze/include/{ => uapi}/asm/stat.h | 0
+ arch/microblaze/include/{ => uapi}/asm/statfs.h | 0
+ arch/microblaze/include/{ => uapi}/asm/swab.h | 0
+ arch/microblaze/include/{ => uapi}/asm/termbits.h | 0
+ arch/microblaze/include/{ => uapi}/asm/termios.h | 0
+ arch/microblaze/include/{ => uapi}/asm/types.h | 0
+ arch/microblaze/include/uapi/asm/unistd.h | 400 ++++++++++++++++++++
+ arch/microblaze/kernel/entry-nommu.S | 1 -
+ arch/microblaze/kernel/entry.S | 2 +-
+ arch/microblaze/kernel/process.c | 1 -
+ 43 files changed, 653 insertions(+), 557 deletions(-)
+ rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/elf.h
+ rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
+ rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/setup.h
+ rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
+Merging mips/mips-for-linux-next (46845cf Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/bcm47xx/gpio.c
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 9 +
+ arch/mips/Kconfig | 85 ++-
+ arch/mips/Makefile | 6 +-
+ arch/mips/ar7/platform.c | 3 +
+ arch/mips/bcm47xx/Kconfig | 2 +
+ arch/mips/bcm47xx/Makefile | 2 +-
+ arch/mips/bcm47xx/gpio.c | 102 ---
+ arch/mips/bcm47xx/prom.c | 20 +-
+ arch/mips/bcm47xx/setup.c | 11 +-
+ arch/mips/bcm47xx/sprom.c | 780 +++++++++++---------
+ arch/mips/bcm63xx/Makefile | 7 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 71 +-
+ arch/mips/bcm63xx/clk.c | 34 +-
+ arch/mips/bcm63xx/nvram.c | 107 +++
+ arch/mips/bcm63xx/reset.c | 223 ++++++
+ arch/mips/cavium-octeon/flash_setup.c | 3 +-
+ arch/mips/cavium-octeon/octeon-memcpy.S | 27 -
+ arch/mips/cavium-octeon/setup.c | 40 +-
+ arch/mips/configs/ath79_defconfig | 111 +++
+ arch/mips/configs/cavium_octeon_defconfig | 98 ++-
+ arch/mips/fw/sni/Makefile | 2 +-
+ arch/mips/include/asm/cpu.h | 6 +-
+ arch/mips/include/asm/fw/arc/types.h | 8 +-
+ arch/mips/include/asm/kexec.h | 27 +-
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +-
+ arch/mips/include/asm/mach-bcm47xx/gpio.h | 154 +---
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 35 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 29 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h | 21 +
+ .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 17 -
+ .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 +
+ arch/mips/include/asm/mach-loongson1/platform.h | 3 +-
+ arch/mips/include/asm/mach-loongson1/regs-clk.h | 7 +-
+ arch/mips/include/asm/mach-netlogic/irq.h | 4 +-
+ arch/mips/include/asm/mach-netlogic/multi-node.h | 54 ++
+ arch/mips/include/asm/mipsregs.h | 2 +-
+ arch/mips/include/asm/netlogic/common.h | 51 +-
+ arch/mips/include/asm/netlogic/interrupt.h | 2 +-
+ arch/mips/include/asm/netlogic/mips-extns.h | 142 ++++
+ arch/mips/include/asm/netlogic/xlp-hal/pic.h | 44 +-
+ arch/mips/include/asm/netlogic/xlp-hal/sys.h | 1 -
+ arch/mips/include/asm/netlogic/xlr/fmn.h | 363 +++++++++
+ arch/mips/include/asm/netlogic/xlr/pic.h | 2 -
+ arch/mips/include/asm/netlogic/xlr/xlr.h | 6 +-
+ arch/mips/include/asm/page.h | 8 +-
+ arch/mips/include/asm/pgtable-64.h | 2 +-
+ arch/mips/include/asm/pgtable-bits.h | 13 +-
+ arch/mips/include/asm/pgtable.h | 168 ++++-
+ arch/mips/include/asm/processor.h | 4 -
+ arch/mips/include/asm/sgiarcs.h | 8 +-
+ arch/mips/include/asm/smp.h | 7 +
+ arch/mips/include/asm/sparsemem.h | 2 +-
+ arch/mips/include/asm/tlbdebug.h | 1 +
+ arch/mips/kernel/Makefile | 3 +-
+ arch/mips/kernel/asm-offsets.c | 4 -
+ arch/mips/kernel/crash.c | 71 ++
+ arch/mips/kernel/crash_dump.c | 77 ++
+ arch/mips/kernel/machine_kexec.c | 33 +-
+ arch/mips/kernel/mips_ksyms.c | 2 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 124 ++++
+ arch/mips/kernel/relocate_kernel.S | 88 ++-
+ arch/mips/kernel/scall64-n32.S | 6 -
+ arch/mips/kernel/setup.c | 56 ++
+ arch/mips/kernel/signal.c | 13 +-
+ arch/mips/kernel/smp.c | 17 +
+ arch/mips/kernel/traps.c | 4 +
+ arch/mips/lantiq/Kconfig | 4 +
+ arch/mips/lantiq/prom.c | 5 +-
+ arch/mips/lantiq/xway/Makefile | 2 +
+ arch/mips/lantiq/xway/dma.c | 15 +-
+ arch/mips/lantiq/xway/reset.c | 58 +-
+ arch/mips/lantiq/xway/sysctrl.c | 4 +
+ arch/mips/lantiq/xway/xrx200_phy_fw.c | 97 +++
+ arch/mips/lib/dump_tlb.c | 47 ++
+ arch/mips/loongson1/Kconfig | 2 +-
+ arch/mips/loongson1/common/clock.c | 159 +---
+ arch/mips/loongson1/common/platform.c | 10 +-
+ arch/mips/loongson1/ls1b/board.c | 5 +-
+ arch/mips/mm/c-octeon.c | 46 +-
+ arch/mips/mm/c-r4k.c | 8 +-
+ arch/mips/mm/pgtable-64.c | 31 +
+ arch/mips/mm/tlb-r4k.c | 22 +-
+ arch/mips/mm/tlbex.c | 101 ++-
+ arch/mips/netlogic/Kconfig | 28 +
+ arch/mips/netlogic/common/irq.c | 165 +++--
+ arch/mips/netlogic/common/smp.c | 89 ++-
+ arch/mips/netlogic/common/smpboot.S | 6 +-
+ arch/mips/netlogic/xlp/nlm_hal.c | 67 +-
+ arch/mips/netlogic/xlp/setup.c | 50 +-
+ arch/mips/netlogic/xlp/wakeup.c | 83 ++-
+ arch/mips/netlogic/xlr/Makefile | 4 +-
+ arch/mips/netlogic/xlr/fmn-config.c | 290 ++++++++
+ arch/mips/netlogic/xlr/fmn.c | 204 +++++
+ arch/mips/netlogic/xlr/setup.c | 37 +-
+ arch/mips/netlogic/xlr/wakeup.c | 23 +-
+ arch/mips/oprofile/Makefile | 1 +
+ arch/mips/oprofile/common.c | 1 +
+ arch/mips/oprofile/op_model_mipsxx.c | 29 +
+ arch/mips/pci/pci-bcm63xx.c | 34 +-
+ arch/mips/pci/pci-octeon.c | 4 +
+ arch/mips/pci/pci-xlr.c | 69 +-
+ arch/mips/sibyte/Kconfig | 2 +-
+ arch/mips/sni/setup.c | 8 +-
+ drivers/bcma/Kconfig | 9 +
+ drivers/bcma/Makefile | 1 +
+ drivers/bcma/bcma_private.h | 10 +
+ drivers/bcma/driver_chipcommon.c | 81 +-
+ drivers/bcma/driver_gpio.c | 98 +++
+ drivers/bcma/main.c | 5 +
+ drivers/edac/Kconfig | 33 +-
+ drivers/edac/Makefile | 5 +
+ drivers/edac/octeon_edac-l2c.c | 118 +++
+ drivers/edac/octeon_edac-lmc.c | 150 ++++
+ drivers/edac/octeon_edac-lmc.h | 78 ++
+ drivers/edac/octeon_edac-pc.c | 140 ++++
+ drivers/edac/octeon_edac-pci.c | 135 ++++
+ drivers/ssb/Kconfig | 9 +
+ drivers/ssb/Makefile | 1 +
+ drivers/ssb/driver_chipcommon.c | 78 +-
+ drivers/ssb/driver_extif.c | 43 +-
+ drivers/ssb/driver_gpio.c | 176 +++++
+ drivers/ssb/main.c | 7 +
+ drivers/ssb/ssb_private.h | 17 +
+ include/linux/bcma/bcma_driver_chipcommon.h | 10 +
+ include/linux/ssb/ssb.h | 4 +
+ include/linux/ssb/ssb_driver_chipcommon.h | 3 +
+ include/linux/ssb/ssb_driver_extif.h | 1 +
+ 127 files changed, 5050 insertions(+), 1411 deletions(-)
+ delete mode 100644 arch/mips/bcm47xx/gpio.c
+ create mode 100644 arch/mips/bcm63xx/nvram.c
+ create mode 100644 arch/mips/bcm63xx/reset.c
+ create mode 100644 arch/mips/configs/ath79_defconfig
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h
+ create mode 100644 arch/mips/include/asm/mach-netlogic/multi-node.h
+ create mode 100644 arch/mips/include/asm/netlogic/xlr/fmn.h
+ create mode 100644 arch/mips/kernel/crash.c
+ create mode 100644 arch/mips/kernel/crash_dump.c
+ create mode 100644 arch/mips/lantiq/xway/xrx200_phy_fw.c
+ create mode 100644 arch/mips/netlogic/xlr/fmn-config.c
+ create mode 100644 arch/mips/netlogic/xlr/fmn.c
+ create mode 100644 drivers/bcma/driver_gpio.c
+ create mode 100644 drivers/edac/octeon_edac-l2c.c
+ create mode 100644 drivers/edac/octeon_edac-lmc.c
+ create mode 100644 drivers/edac/octeon_edac-lmc.h
+ create mode 100644 drivers/edac/octeon_edac-pc.c
+ create mode 100644 drivers/edac/octeon_edac-pci.c
+ create mode 100644 drivers/ssb/driver_gpio.c
+Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
+$ git merge openrisc/for-upstream
+Removing arch/openrisc/include/uapi/asm/kvm_para.h
+Merge made by the 'recursive' strategy.
+ arch/openrisc/include/asm/Kbuild | 1 +
+ arch/openrisc/include/uapi/asm/kvm_para.h | 1 -
+ arch/openrisc/kernel/asm-offsets.c | 6 +-----
+ 3 files changed, 2 insertions(+), 6 deletions(-)
+ delete mode 100644 arch/openrisc/include/uapi/asm/kvm_para.h
+Merging parisc/for-next (949a05d [PARISC] fix virtual aliasing issue in get_shared_area())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging powerpc/next (1a9bd45 powerpc+of: Export of_reconfig_notifier_[register,unregister])
+$ git merge powerpc/next
+Removing arch/powerpc/xmon/start.c
+Auto-merging arch/powerpc/kernel/cpu_setup_power.S
+Removing arch/powerpc/include/asm/pSeries_reconfig.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/powerpc/fsl/raideng.txt | 81 +++++
+ Documentation/powerpc/ptrace.txt | 16 +
+ arch/arm/mach-mxs/mach-mxs.c | 2 +-
+ arch/powerpc/Makefile | 2 +-
+ arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 1 +
+ arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 6 +
+ arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi | 85 ++++++
+ arch/powerpc/configs/pseries_defconfig | 2 +-
+ arch/powerpc/include/asm/bitops.h | 75 +----
+ arch/powerpc/include/asm/cputable.h | 12 +-
+ arch/powerpc/include/asm/dbell.h | 2 +-
+ arch/powerpc/include/asm/exception-64s.h | 97 +++++-
+ arch/powerpc/include/asm/firmware.h | 4 +-
+ arch/powerpc/include/asm/fsl_gtm.h | 2 +-
+ arch/powerpc/include/asm/fsl_guts.h | 4 +-
+ arch/powerpc/include/asm/hvcall.h | 23 +-
+ arch/powerpc/include/asm/immap_qe.h | 2 +-
+ arch/powerpc/include/asm/machdep.h | 3 -
+ arch/powerpc/include/asm/mmu.h | 1 +
+ arch/powerpc/include/asm/pSeries_reconfig.h | 47 ---
+ arch/powerpc/include/asm/ppc-opcode.h | 6 +-
+ arch/powerpc/include/asm/prom.h | 16 +
+ arch/powerpc/include/asm/qe.h | 2 +-
+ arch/powerpc/include/asm/qe_ic.h | 2 +-
+ arch/powerpc/include/asm/reg.h | 3 +
+ arch/powerpc/include/asm/rtas.h | 5 +
+ arch/powerpc/include/asm/setup.h | 29 ++
+ arch/powerpc/include/asm/ucc.h | 2 +-
+ arch/powerpc/include/asm/ucc_fast.h | 2 +-
+ arch/powerpc/include/asm/ucc_slow.h | 2 +-
+ arch/powerpc/include/asm/udbg.h | 1 -
+ arch/powerpc/include/uapi/asm/setup.h | 31 --
+ arch/powerpc/kernel/Makefile | 2 +-
+ .../{cpu_setup_power7.S => cpu_setup_power.S} | 32 +-
+ arch/powerpc/kernel/cputable.c | 38 +++
+ arch/powerpc/kernel/entry_64.S | 2 +
+ arch/powerpc/kernel/exceptions-64s.S | 308 ++++++++++++++++----
+ arch/powerpc/kernel/head_64.S | 6 +-
+ arch/powerpc/kernel/idle.c | 3 -
+ arch/powerpc/kernel/iommu.c | 16 +-
+ arch/powerpc/kernel/machine_kexec.c | 14 +-
+ arch/powerpc/kernel/machine_kexec_64.c | 8 +-
+ arch/powerpc/kernel/pci_32.c | 2 +-
+ arch/powerpc/kernel/prom.c | 7 +-
+ arch/powerpc/kernel/prom_init.c | 11 +-
+ arch/powerpc/kernel/ptrace.c | 90 +++++-
+ arch/powerpc/kernel/rtas.c | 1 -
+ arch/powerpc/kernel/rtas_flash.c | 4 +-
+ arch/powerpc/kernel/setup_64.c | 5 +
+ arch/powerpc/kernel/udbg.c | 23 --
+ arch/powerpc/mm/numa.c | 12 -
+ arch/powerpc/mm/tlb_nohash_low.S | 15 +-
+ arch/powerpc/perf/power7-pmu.c | 17 +-
+ arch/powerpc/platforms/52xx/lite5200.c | 2 +-
+ arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 8 +-
+ arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +-
+ arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +-
+ arch/powerpc/platforms/83xx/mpc836x_rdk.c | 2 +-
+ arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +-
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c | 8 +-
+ arch/powerpc/platforms/85xx/smp.c | 49 +++-
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +
+ arch/powerpc/platforms/powermac/cpufreq_32.c | 5 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 25 +-
+ arch/powerpc/platforms/ps3/os-area.c | 6 +-
+ arch/powerpc/platforms/pseries/dlpar.c | 34 +--
+ arch/powerpc/platforms/pseries/firmware.c | 1 +
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 8 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 60 ++--
+ arch/powerpc/platforms/pseries/iommu.c | 10 +-
+ arch/powerpc/platforms/pseries/mobility.c | 4 +-
+ arch/powerpc/platforms/pseries/plpar_wrappers.h | 31 ++
+ arch/powerpc/platforms/pseries/reconfig.c | 119 +-------
+ arch/powerpc/platforms/pseries/setup.c | 77 ++++-
+ arch/powerpc/platforms/pseries/smp.c | 1 -
+ arch/powerpc/sysdev/fsl_gtm.c | 2 +-
+ arch/powerpc/sysdev/fsl_pci.c | 37 ++-
+ arch/powerpc/sysdev/pmi.c | 13 +-
+ arch/powerpc/sysdev/qe_lib/qe.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +-
+ arch/powerpc/sysdev/qe_lib/qe_ic.h | 2 +-
+ arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +-
+ 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 | 2 +-
+ arch/powerpc/xmon/Makefile | 2 +-
+ arch/powerpc/xmon/nonstdio.c | 53 ++--
+ arch/powerpc/xmon/nonstdio.h | 6 -
+ arch/powerpc/xmon/start.c | 34 ---
+ arch/powerpc/xmon/xmon.c | 26 +-
+ drivers/crypto/nx/nx-842.c | 20 +-
+ drivers/crypto/nx/nx.c | 1 -
+ drivers/infiniband/hw/ehca/hcp_if.c | 20 --
+ drivers/macintosh/smu.c | 2 +-
+ drivers/macintosh/windfarm_fcu_controls.c | 14 +-
+ drivers/macintosh/windfarm_lm75_sensor.c | 14 +-
+ drivers/macintosh/windfarm_max6690_sensor.c | 13 +-
+ drivers/macintosh/windfarm_smu_sat.c | 13 +-
+ drivers/net/ethernet/ibm/ehea/ehea_phyp.h | 20 --
+ drivers/of/base.c | 142 ++++++++-
+ drivers/video/Kconfig | 8 +-
+ drivers/video/gxt4500.c | 15 +-
+ drivers/virt/fsl_hypervisor.c | 3 -
+ include/linux/of.h | 29 +-
+ tools/perf/perf.h | 2 +-
+ 107 files changed, 1366 insertions(+), 783 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/raideng.txt
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi
+ delete mode 100644 arch/powerpc/include/asm/pSeries_reconfig.h
+ create mode 100644 arch/powerpc/include/asm/setup.h
+ rename arch/powerpc/kernel/{cpu_setup_power7.S => cpu_setup_power.S} (80%)
+ delete mode 100644 arch/powerpc/xmon/start.c
+$ git am -3 ../patches/0001-lib-disable-PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT.patch
+Applying: lib: disable PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
+$ git reset HEAD^
+Unstaged changes after reset:
+M lib/Kconfig.debug
+$ git add -A .
+$ git commit -v -a --amend
+[master a7e259e] Merge remote-tracking branch 'powerpc/next'
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (451815b powerpc: mpc5200: Add a3m071 board support)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/boot/dts/a3m071.dts | 153 +++++++++++++++++++++++++
+ arch/powerpc/platforms/512x/Kconfig | 1 -
+ arch/powerpc/platforms/512x/mpc5121_ads.c | 3 +
+ arch/powerpc/platforms/512x/mpc512x.h | 11 +-
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 25 +---
+ arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 16 +--
+ 7 files changed, 171 insertions(+), 39 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/a3m071.dts
+Merging galak/next (1723d90 powerpc/dma/raidengine: add raidengine device)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (683c3dc s390/ccwgroup: allow drivers to call set_{on,off}line)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 11 +
+ arch/s390/Makefile | 1 +
+ arch/s390/crypto/aes_s390.c | 18 +-
+ arch/s390/crypto/des_s390.c | 12 +-
+ arch/s390/crypto/ghash_s390.c | 21 +-
+ arch/s390/crypto/sha_common.c | 9 +-
+ arch/s390/include/asm/ccwdev.h | 6 +-
+ arch/s390/include/asm/ccwgroup.h | 3 +
+ arch/s390/include/asm/page.h | 2 +
+ arch/s390/include/asm/pgtable.h | 11 +-
+ arch/s390/include/asm/topology.h | 34 +-
+ arch/s390/kernel/Makefile | 2 +-
+ arch/s390/kernel/dis.c | 563 +++++++++++++++++++++-----------
+ arch/s390/kernel/entry.S | 7 +-
+ arch/s390/kernel/entry.h | 21 +-
+ arch/s390/kernel/entry64.S | 36 +-
+ arch/s390/kernel/head.S | 74 +++--
+ arch/s390/kernel/pgm_check.S | 152 +++++++++
+ arch/s390/kernel/setup.c | 39 +--
+ arch/s390/kernel/signal.c | 2 +
+ arch/s390/kernel/topology.c | 113 +++----
+ arch/s390/kernel/traps.c | 52 +--
+ arch/s390/mm/Makefile | 12 +-
+ arch/s390/mm/dump_pagetables.c | 7 +-
+ arch/s390/mm/fault.c | 31 +-
+ arch/s390/mm/init.c | 29 --
+ arch/s390/mm/pageattr.c | 82 ++++-
+ arch/s390/mm/pgtable.c | 16 -
+ arch/s390/mm/vmem.c | 46 ++-
+ drivers/s390/block/dasd_eckd.c | 76 +++--
+ drivers/s390/block/dasd_fba.c | 23 +-
+ drivers/s390/block/dasd_ioctl.c | 11 +-
+ drivers/s390/char/sclp_cmd.c | 17 +-
+ drivers/s390/cio/ccwgroup.c | 26 +-
+ drivers/s390/cio/device.c | 11 -
+ drivers/s390/cio/device.h | 2 -
+ drivers/s390/cio/device_ops.c | 17 +-
+ drivers/s390/cio/qdio_main.c | 52 +--
+ drivers/s390/cio/qdio_setup.c | 7 +-
+ drivers/s390/cio/qdio_thinint.c | 2 -
+ drivers/s390/crypto/zcrypt_msgtype50.c | 68 ++--
+ drivers/s390/crypto/zcrypt_msgtype50.h | 2 +
+ 42 files changed, 1061 insertions(+), 665 deletions(-)
+ create mode 100644 arch/s390/kernel/pgm_check.S
+Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (ddffeb8 Linux 3.7-rc1)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (518129b xtensa: add XTFPGA DTS)
+$ git merge xtensa/for_next
+Merge made by the 'recursive' strategy.
+ Documentation/xtensa/atomctl.txt | 44 ++++
+ arch/xtensa/Kconfig | 21 ++
+ arch/xtensa/Kconfig.debug | 22 +-
+ arch/xtensa/Makefile | 12 +
+ arch/xtensa/boot/Makefile | 25 +-
+ arch/xtensa/boot/boot-elf/Makefile | 26 +-
+ arch/xtensa/boot/boot-redboot/Makefile | 26 +-
+ arch/xtensa/boot/boot-uboot/Makefile | 14 +
+ arch/xtensa/boot/dts/lx60.dts | 11 +
+ arch/xtensa/boot/dts/ml605.dts | 11 +
+ arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 26 ++
+ arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 18 ++
+ arch/xtensa/boot/dts/xtfpga.dtsi | 56 ++++
+ arch/xtensa/include/asm/atomic.h | 271 +++++++++++++------
+ arch/xtensa/include/asm/barrier.h | 6 +-
+ arch/xtensa/include/asm/bitops.h | 127 ++++++++-
+ arch/xtensa/include/asm/bootparam.h | 1 +
+ arch/xtensa/include/asm/cmpxchg.h | 71 +++--
+ arch/xtensa/include/asm/dma-mapping.h | 2 +
+ arch/xtensa/include/asm/initialize_mmu.h | 55 ++++
+ arch/xtensa/include/asm/prom.h | 6 +
+ arch/xtensa/include/asm/ptrace.h | 2 +-
+ arch/xtensa/include/asm/regs.h | 4 +
+ arch/xtensa/include/asm/spinlock.h | 188 +++++++++++++-
+ arch/xtensa/include/asm/traps.h | 23 ++
+ arch/xtensa/kernel/align.S | 1 +
+ arch/xtensa/kernel/asm-offsets.c | 1 +
+ arch/xtensa/kernel/coprocessor.S | 22 ++
+ arch/xtensa/kernel/entry.S | 43 +++-
+ arch/xtensa/kernel/head.S | 17 +-
+ arch/xtensa/kernel/irq.c | 132 +++++++---
+ arch/xtensa/kernel/setup.c | 272 ++++++++++++++++++--
+ arch/xtensa/kernel/time.c | 7 +-
+ arch/xtensa/kernel/traps.c | 11 +
+ arch/xtensa/kernel/vectors.S | 65 +++--
+ arch/xtensa/lib/checksum.S | 5 +-
+ arch/xtensa/mm/misc.S | 49 ++++
+ arch/xtensa/mm/tlb.c | 2 +-
+ .../xtensa/platforms/iss/include/platform/serial.h | 15 ++
+ .../platforms/iss/include/platform/simcall.h | 7 +-
+ arch/xtensa/platforms/xtfpga/Makefile | 9 +
+ .../platforms/xtfpga/include/platform/hardware.h | 69 +++++
+ .../xtensa/platforms/xtfpga/include/platform/lcd.h | 20 ++
+ .../platforms/xtfpga/include/platform/serial.h | 18 ++
+ arch/xtensa/platforms/xtfpga/lcd.c | 76 ++++++
+ arch/xtensa/platforms/xtfpga/setup.c | 269 +++++++++++++++++++
+ arch/xtensa/variants/s6000/gpio.c | 4 +-
+ 47 files changed, 1938 insertions(+), 244 deletions(-)
+ create mode 100644 Documentation/xtensa/atomctl.txt
+ create mode 100644 arch/xtensa/boot/boot-uboot/Makefile
+ create mode 100644 arch/xtensa/boot/dts/lx60.dts
+ create mode 100644 arch/xtensa/boot/dts/ml605.dts
+ create mode 100644 arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi
+ create mode 100644 arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi
+ create mode 100644 arch/xtensa/boot/dts/xtfpga.dtsi
+ create mode 100644 arch/xtensa/include/asm/initialize_mmu.h
+ create mode 100644 arch/xtensa/include/asm/prom.h
+ create mode 100644 arch/xtensa/include/asm/traps.h
+ create mode 100644 arch/xtensa/platforms/xtfpga/Makefile
+ create mode 100644 arch/xtensa/platforms/xtfpga/include/platform/hardware.h
+ create mode 100644 arch/xtensa/platforms/xtfpga/include/platform/lcd.h
+ create mode 100644 arch/xtensa/platforms/xtfpga/include/platform/serial.h
+ create mode 100644 arch/xtensa/platforms/xtfpga/lcd.c
+ create mode 100644 arch/xtensa/platforms/xtfpga/setup.c
+Merging btrfs/next (c37b2b6 Btrfs: do not bug when we fail to commit the transaction)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (3515297 rbd: activate v2 image support)
+$ git merge ceph/master
+Auto-merging net/ceph/messenger.c
+Merge made by the 'recursive' strategy.
+ drivers/block/rbd.c | 100 +++++++++++++++++++++++++++++++++++++++-----------
+ net/ceph/messenger.c | 58 +++++++++++++----------------
+ 2 files changed, 104 insertions(+), 54 deletions(-)
+Merging cifs/for-next (0950d2a cifs: Add handling of blank password option)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsacl.c | 190 ++++++++++++++++++++++++++-------------------------
+ fs/cifs/cifsacl.h | 31 ++++++---
+ fs/cifs/cifsfs.c | 15 ++--
+ fs/cifs/cifsglob.h | 15 +---
+ fs/cifs/cifsproto.h | 3 +
+ fs/cifs/connect.c | 47 ++++++-------
+ fs/cifs/dir.c | 31 +++++++++
+ fs/cifs/file.c | 83 ++++++++++++----------
+ fs/cifs/inode.c | 7 +-
+ fs/cifs/smb1ops.c | 35 +---------
+ fs/cifs/smb2file.c | 12 ----
+ fs/cifs/smb2ops.c | 35 +++++-----
+ 12 files changed, 246 insertions(+), 258 deletions(-)
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (e4bc652 eCryptfs: Avoid unnecessary disk read and data decryption during writing)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/mmap.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+Merging ext3/for_next (55eede2 quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK)
+$ git merge ext3/for_next
+Auto-merging fs/quota/quota.c
+Auto-merging fs/ext3/super.c
+Merge made by the 'recursive' strategy.
+ fs/ext3/inode.c | 3 +--
+ fs/ext3/super.c | 3 ---
+ fs/quota/quota.c | 4 ++++
+ fs/udf/inode.c | 14 +++++++++-----
+ 4 files changed, 14 insertions(+), 10 deletions(-)
+Merging ext4/dev (f3b5929 ext4: remove calls to ext4_jbd2_file_inode() from delalloc write path)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/Makefile | 2 +-
+ fs/ext4/acl.c | 6 +-
+ fs/ext4/ext4.h | 10 +-
+ fs/ext4/ext4_extents.h | 3 +-
+ fs/ext4/ext4_jbd2.h | 7 -
+ fs/ext4/extents.c | 319 +++++----------------------
+ fs/ext4/extents_status.c | 500 +++++++++++++++++++++++++++++++++++++++++++
+ fs/ext4/extents_status.h | 45 ++++
+ fs/ext4/file.c | 334 ++++++++++++++++++++++++++++-
+ fs/ext4/indirect.c | 4 +-
+ fs/ext4/inode.c | 175 ++++++---------
+ fs/ext4/mballoc.c | 60 ++++--
+ fs/ext4/namei.c | 35 ++-
+ fs/ext4/page-io.c | 2 +-
+ fs/ext4/resize.c | 17 +-
+ fs/ext4/super.c | 43 ++--
+ fs/ext4/xattr.c | 1 -
+ fs/jbd2/journal.c | 1 -
+ fs/jbd2/transaction.c | 11 -
+ include/linux/jbd2.h | 9 +-
+ include/trace/events/ext4.h | 136 ++++++++++--
+ 21 files changed, 1232 insertions(+), 488 deletions(-)
+ create mode 100644 fs/ext4/extents_status.c
+ create mode 100644 fs/ext4/extents_status.h
+Merging f2fs/dev (7117448 f2fs: fix endian conversion bugs reported by sparse)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/00-INDEX | 2 +
+ Documentation/filesystems/f2fs.txt | 421 +++++++++
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/f2fs/Kconfig | 52 ++
+ fs/f2fs/Makefile | 7 +
+ fs/f2fs/acl.c | 465 ++++++++++
+ fs/f2fs/acl.h | 57 ++
+ fs/f2fs/checkpoint.c | 794 ++++++++++++++++
+ fs/f2fs/data.c | 701 ++++++++++++++
+ fs/f2fs/debug.c | 361 ++++++++
+ fs/f2fs/dir.c | 672 ++++++++++++++
+ fs/f2fs/f2fs.h | 1082 ++++++++++++++++++++++
+ fs/f2fs/file.c | 637 +++++++++++++
+ fs/f2fs/gc.c | 742 +++++++++++++++
+ fs/f2fs/gc.h | 117 +++
+ fs/f2fs/hash.c | 97 ++
+ fs/f2fs/inode.c | 266 ++++++
+ fs/f2fs/namei.c | 504 ++++++++++
+ fs/f2fs/node.c | 1763 +++++++++++++++++++++++++++++++++++
+ fs/f2fs/node.h | 353 +++++++
+ fs/f2fs/recovery.c | 375 ++++++++
+ fs/f2fs/segment.c | 1798 ++++++++++++++++++++++++++++++++++++
+ fs/f2fs/segment.h | 615 ++++++++++++
+ fs/f2fs/super.c | 656 +++++++++++++
+ fs/f2fs/xattr.c | 389 ++++++++
+ fs/f2fs/xattr.h | 145 +++
+ include/linux/f2fs_fs.h | 410 ++++++++
+ include/uapi/linux/magic.h | 1 +
+ 29 files changed, 13484 insertions(+)
+ create mode 100644 Documentation/filesystems/f2fs.txt
+ create mode 100644 fs/f2fs/Kconfig
+ create mode 100644 fs/f2fs/Makefile
+ create mode 100644 fs/f2fs/acl.c
+ create mode 100644 fs/f2fs/acl.h
+ create mode 100644 fs/f2fs/checkpoint.c
+ create mode 100644 fs/f2fs/data.c
+ create mode 100644 fs/f2fs/debug.c
+ create mode 100644 fs/f2fs/dir.c
+ create mode 100644 fs/f2fs/f2fs.h
+ create mode 100644 fs/f2fs/file.c
+ create mode 100644 fs/f2fs/gc.c
+ create mode 100644 fs/f2fs/gc.h
+ create mode 100644 fs/f2fs/hash.c
+ create mode 100644 fs/f2fs/inode.c
+ create mode 100644 fs/f2fs/namei.c
+ create mode 100644 fs/f2fs/node.c
+ create mode 100644 fs/f2fs/node.h
+ create mode 100644 fs/f2fs/recovery.c
+ create mode 100644 fs/f2fs/segment.c
+ create mode 100644 fs/f2fs/segment.h
+ create mode 100644 fs/f2fs/super.c
+ create mode 100644 fs/f2fs/xattr.c
+ create mode 100644 fs/f2fs/xattr.h
+ create mode 100644 include/linux/f2fs_fs.h
+Merging fuse/for-next (23ab0c7 cuse: do not register multiple devices with identical names)
+$ git merge fuse/for-next
+Auto-merging fs/Kconfig
+Merge made by the 'recursive' strategy.
+ fs/Kconfig | 10 --
+ fs/fuse/Kconfig | 16 ++-
+ fs/fuse/cuse.c | 44 ++++++---
+ fs/fuse/dev.c | 122 ++++++++++++++++-------
+ fs/fuse/dir.c | 199 ++++++++++++++++++++++++++++++++-----
+ fs/fuse/file.c | 240 +++++++++++++++++++++++++++++----------------
+ fs/fuse/fuse_i.h | 58 ++++++++---
+ fs/fuse/inode.c | 11 ++-
+ include/linux/fs.h | 2 +-
+ include/uapi/linux/fuse.h | 12 +++
+ mm/filemap.c | 2 +-
+ 11 files changed, 527 insertions(+), 189 deletions(-)
+Merging gfs2/master (1e2d9d4 GFS2: Set gl_object during inode create)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 2 +-
+ fs/gfs2/bmap.c | 54 ++++++++++++-
+ fs/gfs2/dir.c | 7 +-
+ fs/gfs2/file.c | 4 +-
+ fs/gfs2/glock.c | 40 ++++++----
+ fs/gfs2/glock.h | 54 ++++++-------
+ fs/gfs2/glops.c | 19 ++---
+ fs/gfs2/incore.h | 6 +-
+ fs/gfs2/inode.c | 209 ++++++++++++++++++++++++++------------------------
+ fs/gfs2/lock_dlm.c | 20 +++--
+ fs/gfs2/ops_fstype.c | 3 +
+ fs/gfs2/quota.c | 10 +--
+ fs/gfs2/rgrp.c | 139 +++++++++++++++++++++++++++++----
+ fs/gfs2/rgrp.h | 3 +-
+ fs/gfs2/trace_gfs2.h | 2 +-
+ fs/gfs2/xattr.c | 2 +-
+ 16 files changed, 380 insertions(+), 194 deletions(-)
+Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (f937b66 Merge branch 'bugfixes' into linux-next)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/lockd/clnt4xdr.c | 8 -
+ fs/lockd/clntproc.c | 3 +-
+ fs/lockd/clntxdr.c | 9 +-
+ fs/lockd/host.c | 15 +-
+ fs/lockd/mon.c | 4 +-
+ fs/nfs/Makefile | 2 +-
+ fs/nfs/blocklayout/blocklayout.c | 1 +
+ fs/nfs/cache_lib.c | 1 -
+ fs/nfs/callback.h | 4 +-
+ fs/nfs/callback_proc.c | 17 +-
+ fs/nfs/callback_xdr.c | 5 +-
+ fs/nfs/client.c | 7 +-
+ fs/nfs/inode.c | 4 +-
+ fs/nfs/internal.h | 35 --
+ fs/nfs/mount_clnt.c | 8 +-
+ fs/nfs/nfs2xdr.c | 4 +-
+ fs/nfs/nfs3client.c | 2 +
+ fs/nfs/nfs3xdr.c | 7 +-
+ fs/nfs/nfs4_fs.h | 29 +-
+ fs/nfs/nfs4client.c | 5 +-
+ fs/nfs/nfs4file.c | 1 -
+ fs/nfs/nfs4filelayout.c | 44 +--
+ fs/nfs/nfs4filelayoutdev.c | 3 +-
+ fs/nfs/nfs4proc.c | 728 +++++++++-----------------------------
+ fs/nfs/nfs4session.c | 436 +++++++++++++++++++++++
+ fs/nfs/nfs4session.h | 136 +++++++
+ fs/nfs/nfs4state.c | 119 ++++---
+ fs/nfs/nfs4xdr.c | 52 +--
+ fs/nfs/objlayout/objlayout.c | 11 -
+ fs/nfs/pnfs.c | 17 +-
+ fs/nfs/super.c | 1 +
+ fs/nfs/write.c | 28 +-
+ fs/nfsd/nfs4callback.c | 1 +
+ include/linux/nfs_fs_sb.h | 47 ---
+ include/linux/nfs_xdr.h | 16 +-
+ include/linux/sunrpc/clnt.h | 1 +
+ net/sunrpc/backchannel_rqst.c | 9 +-
+ net/sunrpc/bc_svc.c | 2 +-
+ net/sunrpc/cache.c | 4 +-
+ net/sunrpc/clnt.c | 45 ++-
+ net/sunrpc/rpc_pipe.c | 12 +-
+ net/sunrpc/rpcb_clnt.c | 5 +-
+ net/sunrpc/sched.c | 27 +-
+ net/sunrpc/svc.c | 12 +-
+ net/sunrpc/svc_xprt.c | 11 +-
+ net/sunrpc/svcsock.c | 6 +-
+ net/sunrpc/xdr.c | 5 +-
+ net/sunrpc/xprtsock.c | 13 +-
+ 48 files changed, 1023 insertions(+), 939 deletions(-)
+ create mode 100644 fs/nfs/nfs4session.c
+ create mode 100644 fs/nfs/nfs4session.h
+Merging nfsd/nfsd-next (f3c7521 NFSD: Fold fault_inject.h into state.h)
+$ git merge nfsd/nfsd-next
+Auto-merging net/sunrpc/svc.c
+Auto-merging fs/nfsd/nfs4callback.c
+Removing fs/nfsd/fault_inject.h
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/nfs41-server.txt | 20 +-
+ fs/exportfs/expfs.c | 4 +-
+ fs/fhandle.c | 2 +-
+ fs/nfsd/fault_inject.c | 1 -
+ fs/nfsd/fault_inject.h | 28 -
+ fs/nfsd/netns.h | 52 ++
+ fs/nfsd/nfs4callback.c | 69 ++-
+ fs/nfsd/nfs4proc.c | 43 +-
+ fs/nfsd/nfs4recover.c | 529 +++++++++++++---
+ fs/nfsd/nfs4state.c | 774 ++++++++++++++----------
+ fs/nfsd/nfs4xdr.c | 278 +++++----
+ fs/nfsd/nfsctl.c | 14 +-
+ fs/nfsd/nfsd.h | 7 +-
+ fs/nfsd/nfsfh.c | 4 +-
+ fs/nfsd/nfssvc.c | 17 +-
+ fs/nfsd/state.h | 56 +-
+ fs/nfsd/vfs.c | 26 +-
+ fs/nfsd/xdr4.h | 7 +-
+ include/linux/exportfs.h | 5 +
+ include/linux/sunrpc/cache.h | 6 +-
+ net/sunrpc/svc.c | 5 +-
+ 21 files changed, 1266 insertions(+), 681 deletions(-)
+ delete mode 100644 fs/nfsd/fault_inject.h
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ fs/ocfs2/symlink.c | 2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
+$ git merge v9fs/for-next
+Merge made by the 'recursive' strategy.
+Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (b870553 xfs: fix stray dquot unlock when reclaiming dquots)
+$ git merge xfs/for-next
+Resolved 'fs/xfs/xfs_fsops.c' using previous resolution.
+Auto-merging fs/xfs/xfs_log_recover.c
+Auto-merging fs/xfs/xfs_log.c
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging fs/xfs/xfs_ioctl.c
+Auto-merging fs/xfs/xfs_inode.c
+Removing fs/xfs/xfs_iget.c
+Auto-merging fs/xfs/xfs_icache.h
+Auto-merging fs/xfs/xfs_icache.c
+Auto-merging fs/xfs/xfs_ialloc.c
+Auto-merging fs/xfs/xfs_fsops.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_fsops.c
+Removing fs/xfs/xfs_fs_subr.c
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_bmap.c
+Auto-merging fs/xfs/xfs_attr_leaf.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/xfs/xfs_alloc_btree.c
+Auto-merging fs/xfs/xfs_alloc.h
+Auto-merging fs/xfs/xfs_alloc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 84117d1] Merge remote-tracking branch 'xfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/xfs.txt | 13 +-
+ fs/xfs/Kconfig | 1 +
+ fs/xfs/Makefile | 4 +-
+ fs/xfs/uuid.h | 6 +
+ fs/xfs/xfs_ag.h | 5 +
+ fs/xfs/xfs_alloc.c | 140 ++++--
+ fs/xfs/xfs_alloc.h | 3 +
+ fs/xfs/xfs_alloc_btree.c | 77 +++
+ fs/xfs/xfs_alloc_btree.h | 2 +
+ fs/xfs/xfs_aops.c | 83 ++--
+ fs/xfs/xfs_attr.c | 103 ++--
+ fs/xfs/xfs_attr_leaf.c | 143 +++---
+ fs/xfs/xfs_attr_leaf.h | 6 +
+ fs/xfs/xfs_bmap.c | 64 ++-
+ fs/xfs/xfs_bmap_btree.c | 63 +++
+ fs/xfs/xfs_bmap_btree.h | 1 +
+ fs/xfs/xfs_btree.c | 111 +++--
+ fs/xfs/xfs_btree.h | 22 +-
+ fs/xfs/xfs_buf.c | 59 ++-
+ fs/xfs/xfs_buf.h | 27 +-
+ fs/xfs/xfs_cksum.h | 63 +++
+ fs/xfs/xfs_da_btree.c | 141 +++++-
+ fs/xfs/xfs_da_btree.h | 10 +-
+ fs/xfs/xfs_dfrag.c | 13 +-
+ fs/xfs/xfs_dir2_block.c | 436 ++++++++++-------
+ fs/xfs/xfs_dir2_data.c | 170 +++++--
+ fs/xfs/xfs_dir2_leaf.c | 172 +++++--
+ fs/xfs/xfs_dir2_node.c | 288 +++++++----
+ fs/xfs/xfs_dir2_priv.h | 19 +-
+ fs/xfs/xfs_dquot.c | 134 ++++-
+ fs/xfs/xfs_dquot.h | 2 +
+ fs/xfs/xfs_export.c | 1 +
+ fs/xfs/xfs_file.c | 42 +-
+ fs/xfs/xfs_fs.h | 33 +-
+ fs/xfs/xfs_fs_subr.c | 96 ----
+ fs/xfs/xfs_fsops.c | 141 ++++--
+ fs/xfs/xfs_globals.c | 4 +-
+ fs/xfs/xfs_ialloc.c | 83 +++-
+ fs/xfs/xfs_ialloc.h | 4 +-
+ fs/xfs/xfs_ialloc_btree.c | 55 +++
+ fs/xfs/xfs_ialloc_btree.h | 2 +
+ fs/xfs/{xfs_sync.c => xfs_icache.c} | 914 ++++++++++++++++++++++++-----------
+ fs/xfs/{xfs_sync.h => xfs_icache.h} | 28 +-
+ fs/xfs/xfs_iget.c | 705 ---------------------------
+ fs/xfs/xfs_inode.c | 437 ++++++++++++++---
+ fs/xfs/xfs_inode.h | 12 +-
+ fs/xfs/xfs_ioctl.c | 21 +
+ fs/xfs/xfs_iomap.c | 31 +-
+ fs/xfs/xfs_iops.c | 8 +-
+ fs/xfs/xfs_itable.c | 4 +-
+ fs/xfs/xfs_linux.h | 2 +
+ fs/xfs/xfs_log.c | 241 +++++++--
+ fs/xfs/xfs_log.h | 4 +
+ fs/xfs/xfs_log_priv.h | 12 +-
+ fs/xfs/xfs_log_recover.c | 146 +++---
+ fs/xfs/xfs_mount.c | 163 ++++---
+ fs/xfs/xfs_mount.h | 13 +-
+ fs/xfs/xfs_qm.c | 22 +-
+ fs/xfs/xfs_qm_syscalls.c | 6 +-
+ fs/xfs/xfs_rtalloc.c | 16 +-
+ fs/xfs/xfs_sb.h | 7 +
+ fs/xfs/xfs_super.c | 148 ++++--
+ fs/xfs/xfs_super.h | 1 +
+ fs/xfs/xfs_sysctl.c | 9 +
+ fs/xfs/xfs_sysctl.h | 1 +
+ fs/xfs/xfs_trace.h | 60 ++-
+ fs/xfs/xfs_trans.h | 19 +-
+ fs/xfs/xfs_trans_buf.c | 9 +-
+ fs/xfs/xfs_vnodeops.c | 168 +++++--
+ fs/xfs/xfs_vnodeops.h | 9 +-
+ 70 files changed, 3747 insertions(+), 2311 deletions(-)
+ create mode 100644 fs/xfs/xfs_cksum.h
+ delete mode 100644 fs/xfs/xfs_fs_subr.c
+ rename fs/xfs/{xfs_sync.c => xfs_icache.c} (55%)
+ rename fs/xfs/{xfs_sync.h => xfs_icache.h} (64%)
+ delete mode 100644 fs/xfs/xfs_iget.c
+Merging pci/next (053f328 Merge branch 'pci/don-sriov' into next)
+$ git merge pci/next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-pci | 34 ++++++
+ Documentation/PCI/pci-iov-howto.txt | 48 ++++++++-
+ arch/x86/pci/acpi.c | 46 ++++++++-
+ arch/x86/pci/common.c | 2 +-
+ drivers/acpi/pci_bind.c | 12 ++-
+ drivers/acpi/pci_irq.c | 17 ++-
+ drivers/acpi/pci_root.c | 165 ++++++++++++++++-------------
+ drivers/pci/ioapic.c | 2 +
+ drivers/pci/iov.c | 87 ++++++++++++----
+ drivers/pci/irq.c | 10 +-
+ drivers/pci/pci-driver.c | 6 +-
+ drivers/pci/pci-stub.c | 2 +-
+ drivers/pci/pci-sysfs.c | 172 +++++++++++++++++++++++++++++--
+ drivers/pci/pci.c | 33 +++---
+ drivers/pci/pci.h | 8 +-
+ drivers/pci/pcie/aer/aerdrv.h | 5 +-
+ drivers/pci/pcie/aer/aerdrv_core.c | 22 +++-
+ drivers/pci/pcie/aspm.c | 7 +-
+ drivers/pci/probe.c | 23 +++++
+ drivers/pci/quirks.c | 39 +++++++
+ drivers/pci/remove.c | 36 +++++++
+ drivers/pci/setup-bus.c | 22 +---
+ include/acpi/acpi_drivers.h | 4 +-
+ include/linux/pci.h | 19 +++-
+ include/uapi/linux/pci_regs.h | 6 +-
+ 25 files changed, 641 insertions(+), 186 deletions(-)
+Merging hid/for-next (8f348a1 Merge branch 'for-3.8/upstream' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/input/input-mt.c
+Merge made by the 'recursive' strategy.
+ .../ABI/obsolete/sysfs-driver-hid-roccat-koneplus | 38 +
+ .../ABI/obsolete/sysfs-driver-hid-roccat-kovaplus | 66 ++
+ .../ABI/obsolete/sysfs-driver-hid-roccat-pyra | 73 ++
+ .../ABI/testing/sysfs-driver-hid-roccat-isku | 8 +
+ .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 48 +-
+ .../ABI/testing/sysfs-driver-hid-roccat-kovaplus | 69 +-
+ .../ABI/testing/sysfs-driver-hid-roccat-lua | 7 +
+ .../ABI/testing/sysfs-driver-hid-roccat-pyra | 76 +-
+ .../ABI/testing/sysfs-driver-hid-roccat-savu | 3 +-
+ Documentation/input/event-codes.txt | 11 +
+ drivers/hid/Kconfig | 11 +
+ drivers/hid/Makefile | 6 +-
+ drivers/hid/hid-apple.c | 3 +-
+ drivers/hid/hid-core.c | 33 +-
+ drivers/hid/hid-icade.c | 259 ++++++
+ drivers/hid/hid-ids.h | 12 +
+ drivers/hid/hid-input.c | 97 +-
+ drivers/hid/hid-multitouch.c | 109 ++-
+ drivers/hid/hid-roccat-isku.c | 44 +-
+ drivers/hid/hid-roccat-isku.h | 78 +-
+ drivers/hid/hid-roccat-koneplus.c | 348 ++-----
+ drivers/hid/hid-roccat-koneplus.h | 101 +-
+ drivers/hid/hid-roccat-kovaplus.c | 237 +++--
+ drivers/hid/hid-roccat-kovaplus.h | 16 +-
+ drivers/hid/hid-roccat-lua.c | 227 +++++
+ drivers/hid/hid-roccat-lua.h | 29 +
+ drivers/hid/hid-roccat-pyra.c | 342 +++----
+ drivers/hid/hid-roccat-pyra.h | 24 +-
+ drivers/hid/hid-roccat-savu.c | 4 +-
+ drivers/hid/hid-sensor-hub.c | 4 -
+ drivers/hid/hidraw.c | 16 +-
+ drivers/hid/i2c-hid/Kconfig | 21 +
+ drivers/hid/i2c-hid/Makefile | 5 +
+ drivers/hid/i2c-hid/i2c-hid.c | 975 ++++++++++++++++++++
+ drivers/hid/usbhid/hid-quirks.c | 2 +
+ drivers/hid/usbhid/hiddev.c | 10 +-
+ drivers/input/input-mt.c | 2 +-
+ include/linux/hid.h | 3 +
+ include/linux/i2c/i2c-hid.h | 35 +
+ include/linux/input/mt.h | 6 +
+ include/uapi/linux/input.h | 1 +
+ 41 files changed, 2457 insertions(+), 1002 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus
+ create mode 100644 Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-lua
+ create mode 100644 drivers/hid/hid-icade.c
+ create mode 100644 drivers/hid/hid-roccat-lua.c
+ create mode 100644 drivers/hid/hid-roccat-lua.h
+ create mode 100644 drivers/hid/i2c-hid/Kconfig
+ create mode 100644 drivers/hid/i2c-hid/Makefile
+ create mode 100644 drivers/hid/i2c-hid/i2c-hid.c
+ create mode 100644 include/linux/i2c/i2c-hid.h
+Merging i2c/master (c1ec1ae i2c: Mention functionality flags in SMBus protocol documentation)
+$ git merge i2c/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/i2c/smbus-protocol | 40 +++++++++++++++++++++++++++++---------
+ MAINTAINERS | 2 +-
+ drivers/i2c/busses/i2c-i801.c | 13 +++----------
+ drivers/i2c/busses/i2c-piix4.c | 5 ++---
+ 4 files changed, 37 insertions(+), 23 deletions(-)
+Merging i2c-embedded/i2c-embedded/for-next (972deb4 i2c: omap: Remove the OMAP_I2C_FLAG_RESET_REGS_POSTIDLE flag)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
+Auto-merging include/linux/i2c-omap.h
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+Auto-merging drivers/i2c/busses/i2c-omap.c
+CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
+Auto-merging drivers/i2c/busses/i2c-mxs.c
+Auto-merging drivers/i2c/busses/i2c-at91.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 01b1575] Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/i2c/i2c-cbus-gpio.txt | 27 ++
+ .../devicetree/bindings/i2c/i2c-mux-gpio.txt | 81 +++++
+ .../devicetree/bindings/i2c/i2c-ocores.txt | 2 +-
+ .../devicetree/bindings/i2c/samsung-i2c.txt | 20 +-
+ arch/arm/boot/dts/imx28-cfa10049.dts | 24 ++
+ arch/arm/mach-omap2/board-n8x0.c | 42 +++
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 3 +-
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3 +-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +-
+ drivers/i2c/busses/Kconfig | 10 +
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-at91.c | 338 ++++++++++++++++++--
+ drivers/i2c/busses/i2c-cbus-gpio.c | 300 +++++++++++++++++
+ drivers/i2c/busses/i2c-gpio.c | 6 +-
+ drivers/i2c/busses/i2c-mxs.c | 2 +-
+ drivers/i2c/busses/i2c-nomadik.c | 14 -
+ drivers/i2c/busses/i2c-ocores.c | 164 ++++++++--
+ drivers/i2c/busses/i2c-omap.c | 226 +++++++------
+ drivers/i2c/busses/i2c-rcar.c | 6 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 211 +++++++-----
+ drivers/i2c/busses/i2c-sh_mobile.c | 150 ++++++---
+ drivers/i2c/muxes/i2c-mux-gpio.c | 145 +++++++--
+ include/linux/i2c-omap.h | 2 -
+ include/linux/i2c/i2c-sh_mobile.h | 1 +
+ include/linux/platform_data/i2c-cbus-gpio.h | 27 ++
+ 26 files changed, 1461 insertions(+), 359 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
+ create mode 100644 drivers/i2c/busses/i2c-cbus-gpio.c
+ create mode 100644 include/linux/platform_data/i2c-cbus-gpio.h
+Merging jdelvare-hwmon/master (d2d9cf3 hwmon: (it87) Support PECI for additional chips)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/it87 | 10 +
+ drivers/hwmon/hwmon.c | 26 +-
+ drivers/hwmon/it87.c | 918 +++++++++++++++++++++++----------------------
+ drivers/hwmon/w83627ehf.c | 99 ++++-
+ drivers/hwmon/w83627hf.c | 81 +++-
+ 5 files changed, 679 insertions(+), 455 deletions(-)
+Merging hwmon-staging/hwmon-next (8b59397 hwmon: (da9055) Fix chan_mux[DA9055_ADC_ADCIN3] setting)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/ads7828 | 46 +++--
+ Documentation/hwmon/coretemp | 2 +
+ Documentation/hwmon/da9055 | 47 +++++
+ drivers/hwmon/Kconfig | 19 +-
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/ads7828.c | 247 ++++++++++--------------
+ drivers/hwmon/coretemp.c | 60 +++---
+ drivers/hwmon/da9052-hwmon.c | 27 +--
+ drivers/hwmon/da9055-hwmon.c | 336 +++++++++++++++++++++++++++++++++
+ drivers/hwmon/ina2xx.c | 13 +-
+ include/linux/platform_data/ads7828.h | 29 +++
+ 11 files changed, 603 insertions(+), 224 deletions(-)
+ create mode 100644 Documentation/hwmon/da9055
+ create mode 100644 drivers/hwmon/da9055-hwmon.c
+ create mode 100644 include/linux/platform_data/ads7828.h
+Merging v4l-dvb/master (db46f44 Merge /home/v4l/v4l/for_upstream)
+$ git merge v4l-dvb/master
+Removing include/linux/dvb/video.h
+Removing include/linux/dvb/dmx.h
+Removing include/linux/dvb/Kbuild
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/v4l/compat.xml | 7 +
+ Documentation/DocBook/media/v4l/io.xml | 188 ++-
+ Documentation/DocBook/media/v4l/v4l2.xml | 1 +
+ .../DocBook/media/v4l/vidioc-create-bufs.xml | 16 +-
+ Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 212 +++
+ Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 17 +
+ Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | 47 +-
+ MAINTAINERS | 250 ++-
+ arch/arm/mach-omap2/devices.c | 10 +
+ arch/arm/mach-pxa/pcm990-baseboard.c | 6 +
+ drivers/base/dma-mapping.c | 4 +-
+ drivers/hid/hid-picolcd_cir.c | 2 +-
+ drivers/media/common/Kconfig | 7 +
+ drivers/media/common/b2c2/Kconfig | 5 -
+ drivers/media/common/siano/Kconfig | 18 +-
+ drivers/media/common/siano/Makefile | 6 +-
+ drivers/media/common/siano/smscoreapi.c | 2 +-
+ drivers/media/common/siano/smsir.c | 2 +-
+ drivers/media/common/siano/smsir.h | 9 +
+ drivers/media/dvb-core/dmxdev.c | 2 +-
+ drivers/media/dvb-core/dmxdev.h | 1 +
+ drivers/media/dvb-core/dvb-usb-ids.h | 1 +
+ drivers/media/dvb-core/dvb_frontend.c | 10 -
+ drivers/media/dvb-frontends/cx22700.c | 4 +-
+ drivers/media/dvb-frontends/cx24123.c | 2 +-
+ drivers/media/dvb-frontends/dib9000.h | 2 +-
+ drivers/media/dvb-frontends/drxd_hard.c | 8 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 24 +-
+ drivers/media/dvb-frontends/drxk_hard.h | 6 +-
+ drivers/media/dvb-frontends/ds3000.c | 15 +-
+ drivers/media/dvb-frontends/l64781.c | 4 +-
+ drivers/media/dvb-frontends/mt312.c | 4 +-
+ drivers/media/dvb-frontends/rtl2830.c | 6 +-
+ drivers/media/dvb-frontends/rtl2832.c | 6 +-
+ drivers/media/dvb-frontends/stb0899_drv.c | 2 +-
+ drivers/media/dvb-frontends/stv0367.c | 19 +-
+ drivers/media/dvb-frontends/tda10071.c | 6 +-
+ drivers/media/dvb-frontends/tda18271c2dd.c | 1 +
+ drivers/media/firewire/firedtv.h | 1 +
+ drivers/media/i2c/adp1653.c | 4 +-
+ drivers/media/i2c/adv7183.c | 13 +-
+ drivers/media/i2c/adv7604.c | 16 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
+ drivers/media/i2c/ir-kbd-i2c.c | 14 +-
+ drivers/media/i2c/s5k4ecgx.c | 2 +-
+ drivers/media/i2c/smiapp-pll.c | 219 +--
+ drivers/media/i2c/smiapp-pll.h | 61 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 74 +-
+ drivers/media/i2c/smiapp/smiapp-limits.c | 2 +-
+ drivers/media/i2c/smiapp/smiapp-limits.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp-quirk.c | 2 +-
+ drivers/media/i2c/smiapp/smiapp-quirk.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp-reg-defs.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp-reg.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp-regs.c | 2 +-
+ drivers/media/i2c/smiapp/smiapp-regs.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp.h | 2 +-
+ drivers/media/i2c/soc_camera/mt9v022.c | 88 +-
+ drivers/media/i2c/soc_camera/ov2640.c | 55 +-
+ drivers/media/i2c/vs6624.c | 13 +-
+ drivers/media/mmc/siano/Kconfig | 3 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 7 +-
+ drivers/media/pci/cx18/cx18-alsa-main.c | 2 +-
+ drivers/media/pci/cx18/cx18-alsa-pcm.c | 1 +
+ drivers/media/pci/cx18/cx18-i2c.c | 2 +-
+ drivers/media/pci/cx18/cx18-streams.c | 2 +-
+ drivers/media/pci/cx23885/altera-ci.c | 45 +-
+ drivers/media/pci/cx23885/cimax2.c | 17 +-
+ drivers/media/pci/cx23885/cx23885-alsa.c | 6 +-
+ drivers/media/pci/cx23885/cx23885-av.c | 1 +
+ drivers/media/pci/cx23885/cx23885-cards.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-core.c | 8 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-f300.c | 1 +
+ drivers/media/pci/cx23885/cx23885-input.c | 7 +-
+ drivers/media/pci/cx23885/cx23885-input.h | 2 +-
+ drivers/media/pci/cx23885/cx23885-ioctl.c | 2 +
+ drivers/media/pci/cx23885/cx23885-ir.c | 1 +
+ drivers/media/pci/cx23885/cx23888-ir.c | 1 +
+ drivers/media/pci/cx23885/netup-init.c | 1 +
+ drivers/media/pci/cx25821/cx25821-audio-upstream.c | 44 +-
+ drivers/media/pci/cx25821/cx25821-biffuncs.h | 6 +-
+ drivers/media/pci/cx25821/cx25821-i2c.c | 4 +-
+ .../media/pci/cx25821/cx25821-video-upstream-ch2.c | 54 +-
+ drivers/media/pci/cx25821/cx25821-video-upstream.c | 47 +-
+ drivers/media/pci/cx25821/cx25821-video.c | 8 +-
+ drivers/media/pci/cx88/cx88-alsa.c | 14 +-
+ drivers/media/pci/cx88/cx88-blackbird.c | 7 +-
+ drivers/media/pci/cx88/cx88-core.c | 12 +-
+ drivers/media/pci/cx88/cx88-input.c | 8 +-
+ drivers/media/pci/cx88/cx88-mpeg.c | 18 +-
+ drivers/media/pci/cx88/cx88.h | 4 +-
+ drivers/media/pci/dm1105/dm1105.c | 8 +-
+ drivers/media/pci/ivtv/ivtv-alsa-main.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 6 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 4 -
+ drivers/media/pci/ivtv/ivtv-firmware.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-i2c.c | 8 +-
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +-
+ drivers/media/pci/mantis/mantis_input.c | 5 +-
+ drivers/media/pci/mantis/mantis_uart.c | 2 +-
+ drivers/media/pci/mantis/mantis_vp1033.c | 6 +-
+ drivers/media/pci/meye/meye.c | 2 +-
+ drivers/media/pci/ngene/ngene-cards.c | 4 +-
+ drivers/media/pci/ngene/ngene-core.c | 7 +-
+ drivers/media/pci/saa7134/saa7134-core.c | 3 +-
+ drivers/media/pci/saa7134/saa7134-input.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-api.c | 26 +-
+ drivers/media/pci/saa7164/saa7164-bus.c | 6 +-
+ drivers/media/pci/saa7164/saa7164-cmd.c | 16 +-
+ drivers/media/pci/saa7164/saa7164-core.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-encoder.c | 15 +-
+ drivers/media/pci/saa7164/saa7164-fw.c | 8 +-
+ drivers/media/pci/saa7164/saa7164-vbi.c | 6 +-
+ drivers/media/pci/ttpci/av7110.h | 1 +
+ drivers/media/pci/ttpci/budget-av.c | 4 +-
+ drivers/media/platform/Kconfig | 12 +
+ drivers/media/platform/Makefile | 1 +
+ drivers/media/platform/blackfin/bfin_capture.c | 14 +-
+ drivers/media/platform/coda.c | 4 +-
+ drivers/media/platform/davinci/Kconfig | 2 +-
+ drivers/media/platform/davinci/dm355_ccdc.c | 8 +-
+ drivers/media/platform/davinci/dm644x_ccdc.c | 16 +-
+ drivers/media/platform/davinci/isif.c | 5 +-
+ drivers/media/platform/davinci/vpbe.c | 10 +-
+ drivers/media/platform/davinci/vpbe_display.c | 303 ++--
+ drivers/media/platform/davinci/vpbe_osd.c | 9 +-
+ drivers/media/platform/davinci/vpif.c | 8 +-
+ drivers/media/platform/davinci/vpif_capture.c | 34 +-
+ drivers/media/platform/davinci/vpif_display.c | 28 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 2 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 6 +-
+ drivers/media/platform/exynos-gsc/gsc-regs.h | 16 +-
+ drivers/media/platform/fsl-viu.c | 6 +-
+ drivers/media/platform/m2m-deinterlace.c | 24 +-
+ drivers/media/platform/mem2mem_testdev.c | 4 +-
+ drivers/media/platform/mx2_emmaprp.c | 14 +-
+ drivers/media/platform/omap/omap_vout.c | 36 +-
+ drivers/media/platform/omap3isp/isp.c | 83 +-
+ drivers/media/platform/omap3isp/isp.h | 5 +-
+ drivers/media/platform/omap3isp/ispcsi2.c | 6 +-
+ drivers/media/platform/omap3isp/ispcsiphy.c | 227 ++-
+ drivers/media/platform/omap3isp/ispcsiphy.h | 10 -
+ drivers/media/platform/omap3isp/isphist.c | 8 +-
+ drivers/media/platform/omap3isp/isppreview.c | 41 +-
+ drivers/media/platform/omap3isp/ispreg.h | 99 +-
+ drivers/media/platform/omap3isp/ispstat.c | 5 +-
+ drivers/media/platform/omap3isp/ispstat.h | 2 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 3 +-
+ drivers/media/platform/s3c-camif/Makefile | 5 +
+ drivers/media/platform/s3c-camif/camif-capture.c | 1672 ++++++++++++++++++++
+ drivers/media/platform/s3c-camif/camif-core.c | 662 ++++++++
+ drivers/media/platform/s3c-camif/camif-core.h | 393 +++++
+ drivers/media/platform/s3c-camif/camif-regs.c | 606 +++++++
+ drivers/media/platform/s3c-camif/camif-regs.h | 269 ++++
+ drivers/media/platform/s5p-fimc/fimc-capture.c | 21 +-
+ drivers/media/platform/s5p-fimc/fimc-lite.c | 6 +-
+ drivers/media/platform/s5p-fimc/fimc-m2m.c | 19 +-
+ drivers/media/platform/s5p-fimc/fimc-mdevice.c | 8 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 7 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 14 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 16 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 2 +-
+ drivers/media/platform/s5p-tv/mixer_video.c | 13 +-
+ drivers/media/platform/soc_camera/Kconfig | 1 +
+ drivers/media/platform/soc_camera/soc_camera.c | 14 +-
+ drivers/media/platform/vivi.c | 8 +-
+ drivers/media/radio/radio-aimslab.c | 2 +-
+ drivers/media/radio/radio-cadet.c | 3 +-
+ drivers/media/radio/radio-isa.c | 10 +-
+ drivers/media/radio/radio-sf16fmi.c | 2 +-
+ drivers/media/radio/radio-tea5764.c | 4 +-
+ drivers/media/radio/si4713-i2c.c | 2 +-
+ drivers/media/radio/wl128x/fmdrv.h | 2 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 2 +-
+ drivers/media/radio/wl128x/fmdrv_rx.c | 2 +-
+ drivers/media/rc/ati_remote.c | 2 +-
+ drivers/media/rc/ene_ir.c | 33 +-
+ drivers/media/rc/fintek-cir.c | 6 +-
+ drivers/media/rc/gpio-ir-recv.c | 2 +-
+ drivers/media/rc/iguanair.c | 2 +-
+ drivers/media/rc/imon.c | 40 +-
+ drivers/media/rc/ir-jvc-decoder.c | 4 +-
+ drivers/media/rc/ir-lirc-codec.c | 4 +-
+ drivers/media/rc/ir-mce_kbd-decoder.c | 4 +-
+ drivers/media/rc/ir-nec-decoder.c | 4 +-
+ drivers/media/rc/ir-rc5-decoder.c | 14 +-
+ drivers/media/rc/ir-rc5-sz-decoder.c | 6 +-
+ drivers/media/rc/ir-rc6-decoder.c | 8 +-
+ drivers/media/rc/ir-rx51.c | 13 +-
+ drivers/media/rc/ir-sanyo-decoder.c | 4 +-
+ drivers/media/rc/ir-sony-decoder.c | 17 +-
+ drivers/media/rc/ite-cir.c | 6 +-
+ drivers/media/rc/keymaps/rc-imon-mce.c | 2 +-
+ drivers/media/rc/keymaps/rc-rc6-mce.c | 2 +-
+ drivers/media/rc/mceusb.c | 2 +-
+ drivers/media/rc/nuvoton-cir.c | 13 +-
+ drivers/media/rc/nuvoton-cir.h | 1 -
+ drivers/media/rc/rc-loopback.c | 2 +-
+ drivers/media/rc/rc-main.c | 73 +-
+ drivers/media/rc/redrat3.c | 2 +-
+ drivers/media/rc/streamzap.c | 2 +-
+ drivers/media/rc/ttusbir.c | 2 +-
+ drivers/media/rc/winbond-cir.c | 113 +-
+ drivers/media/tuners/fc2580.c | 61 +-
+ drivers/media/tuners/max2165.c | 2 +-
+ drivers/media/tuners/tua9001.c | 2 +-
+ drivers/media/tuners/xc4000.c | 2 +-
+ drivers/media/usb/au0828/au0828-cards.c | 2 +-
+ drivers/media/usb/au0828/au0828-dvb.c | 5 +-
+ drivers/media/usb/au0828/au0828-video.c | 16 +-
+ drivers/media/usb/cx231xx/cx231xx-avcore.c | 9 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 8 +-
+ drivers/media/usb/cx231xx/cx231xx-i2c.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-input.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/af9015.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/anysee.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/az6007.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 14 +-
+ drivers/media/usb/dvb-usb-v2/it913x.c | 12 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 6 +-
+ drivers/media/usb/dvb-usb-v2/usb_urb.c | 8 +-
+ drivers/media/usb/dvb-usb/az6027.c | 11 +-
+ drivers/media/usb/dvb-usb/dib0700.h | 2 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c | 16 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 146 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 2 +-
+ drivers/media/usb/dvb-usb/pctv452e.c | 4 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
+ drivers/media/usb/dvb-usb/ttusb2.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 8 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 15 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 84 +-
+ drivers/media/usb/em28xx/em28xx-input.c | 16 +-
+ drivers/media/usb/em28xx/em28xx.h | 1 +
+ drivers/media/usb/gspca/gspca.c | 3 +-
+ drivers/media/usb/gspca/gspca.h | 2 +-
+ drivers/media/usb/gspca/jeilinj.c | 6 +-
+ drivers/media/usb/gspca/m5602/m5602_s5k4aa.c | 6 +
+ drivers/media/usb/gspca/pac7302.c | 62 +-
+ drivers/media/usb/gspca/sonixb.c | 1 +
+ drivers/media/usb/hdpvr/hdpvr-core.c | 2 +
+ drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 6 +-
+ drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-
+ drivers/media/usb/pwc/pwc-ctrl.c | 2 +
+ drivers/media/usb/pwc/pwc-if.c | 8 +-
+ drivers/media/usb/s2255/s2255drv.c | 2 +-
+ drivers/media/usb/siano/Kconfig | 3 +-
+ drivers/media/usb/sn9c102/sn9c102_core.c | 2 +
+ drivers/media/usb/stk1160/stk1160-i2c.c | 2 +-
+ drivers/media/usb/stk1160/stk1160-video.c | 23 +-
+ drivers/media/usb/stk1160/stk1160.h | 5 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c | 5 +-
+ drivers/media/usb/tlg2300/pd-dvb.c | 1 +
+ drivers/media/usb/tlg2300/pd-video.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-input.c | 20 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 1 +
+ drivers/media/usb/usbvision/usbvision.h | 2 +-
+ drivers/media/usb/uvc/uvc_ctrl.c | 29 +-
+ drivers/media/usb/uvc/uvc_driver.c | 10 +
+ drivers/media/usb/uvc/uvc_entity.c | 2 +
+ drivers/media/usb/uvc/uvc_queue.c | 2 +-
+ drivers/media/usb/uvc/uvc_v4l2.c | 89 +-
+ drivers/media/usb/uvc/uvc_video.c | 1 +
+ drivers/media/usb/uvc/uvcvideo.h | 8 +
+ drivers/media/usb/zr364xx/zr364xx.c | 3 +-
+ drivers/media/v4l2-core/Kconfig | 3 +
+ drivers/media/v4l2-core/v4l2-common.c | 3 +-
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 19 +
+ drivers/media/v4l2-core/v4l2-dev.c | 1 +
+ drivers/media/v4l2-core/v4l2-event.c | 2 +-
+ drivers/media/v4l2-core/v4l2-fh.c | 2 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 11 +
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 19 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 22 +-
+ drivers/media/v4l2-core/videobuf-core.c | 4 +
+ drivers/media/v4l2-core/videobuf2-core.c | 300 +++-
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 700 +++++++-
+ drivers/media/v4l2-core/videobuf2-memops.c | 40 -
+ drivers/media/v4l2-core/videobuf2-vmalloc.c | 56 +
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 4 +-
+ drivers/staging/media/go7007/go7007-fw.c | 42 +-
+ drivers/staging/media/go7007/go7007-v4l2.c | 2 +-
+ drivers/staging/media/go7007/s2250-board.c | 13 +-
+ drivers/staging/media/go7007/wis-ov7640.c | 20 +-
+ drivers/staging/media/go7007/wis-saa7113.c | 20 +-
+ drivers/staging/media/go7007/wis-saa7115.c | 20 +-
+ drivers/staging/media/go7007/wis-sony-tuner.c | 13 +-
+ drivers/staging/media/go7007/wis-tw2804.c | 13 +-
+ drivers/staging/media/go7007/wis-tw9903.c | 13 +-
+ drivers/staging/media/go7007/wis-uda1342.c | 13 +-
+ drivers/staging/media/lirc/lirc_serial.c | 6 +-
+ include/linux/dvb/dmx.h | 29 -
+ include/linux/dvb/video.h | 29 -
+ include/media/adp1653.h | 4 +-
+ include/media/davinci/vpbe_display.h | 15 +-
+ include/media/davinci/vpbe_osd.h | 2 +-
+ include/media/ir-kbd-i2c.h | 2 +-
+ include/media/mt9v022.h | 16 +
+ include/media/rc-core.h | 4 +-
+ include/media/rc-map.h | 64 +-
+ include/media/s3c_camif.h | 45 +
+ include/media/smiapp.h | 2 +-
+ include/media/v4l2-event.h | 2 +-
+ include/media/v4l2-fh.h | 2 +-
+ include/media/v4l2-ioctl.h | 2 +
+ include/media/v4l2-mem2mem.h | 3 +
+ include/media/videobuf2-core.h | 38 +
+ include/media/videobuf2-memops.h | 5 -
+ include/uapi/linux/videodev2.h | 37 +-
+ 317 files changed, 7781 insertions(+), 1888 deletions(-)
+ create mode 100644 Documentation/DocBook/media/v4l/vidioc-expbuf.xml
+ create mode 100644 drivers/media/platform/s3c-camif/Makefile
+ create mode 100644 drivers/media/platform/s3c-camif/camif-capture.c
+ create mode 100644 drivers/media/platform/s3c-camif/camif-core.c
+ create mode 100644 drivers/media/platform/s3c-camif/camif-core.h
+ create mode 100644 drivers/media/platform/s3c-camif/camif-regs.c
+ create mode 100644 drivers/media/platform/s3c-camif/camif-regs.h
+ delete mode 100644 include/linux/dvb/Kbuild
+ delete mode 100644 include/linux/dvb/dmx.h
+ delete mode 100644 include/linux/dvb/video.h
+ create mode 100644 include/media/mt9v022.h
+ create mode 100644 include/media/s3c_camif.h
+Merging kbuild/for-next (a5ce08d Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 2 +-
+ scripts/kconfig/expr.c | 10 +++++-----
+ scripts/kconfig/gconf.c | 2 +-
+ scripts/kconfig/lkc.h | 8 ++++++++
+ scripts/kconfig/lxdialog/check-lxdialog.sh | 1 +
+ scripts/kconfig/mconf.c | 10 ++++++++--
+ scripts/kconfig/menu.c | 4 ++--
+ scripts/kconfig/nconf.c | 12 ++++++++++--
+ scripts/kconfig/symbol.c | 12 ++++++------
+ scripts/kconfig/util.c | 23 +++++++++++++++++++++--
+ scripts/kconfig/zconf.l | 8 ++++----
+ scripts/kconfig/zconf.lex.c_shipped | 8 ++++----
+ scripts/pnmtologo.c | 7 +++++++
+ 13 files changed, 78 insertions(+), 29 deletions(-)
+Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/NEXT (a52f514 ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>()
+$ git merge libata/NEXT
+Merge made by the 'recursive' strategy.
+ drivers/ata/ata_piix.c | 25 ++++++++++++++++++++++---
+ drivers/ata/pata_arasan_cf.c | 7 +++++--
+ drivers/ata/pata_cmd64x.c | 6 +++---
+ drivers/ata/pata_cs5536.c | 32 +++++++++++++++++++++++++++++++-
+ drivers/ata/pata_rdc.c | 3 ---
+ drivers/ata/sata_highbank.c | 2 +-
+ drivers/ata/sata_inic162x.c | 2 --
+ drivers/ata/sata_promise.c | 15 +++++++++++++--
+ drivers/ata/sata_sil24.c | 4 ----
+ drivers/ata/sata_sx4.c | 14 ++++++--------
+ 10 files changed, 81 insertions(+), 29 deletions(-)
+Merging infiniband/for-next (78c9024 Merge branches 'cma' and 'mlx4' into for-next)
+$ git merge infiniband/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cma.c | 9 +++--
+ drivers/infiniband/hw/amso1100/c2_ae.c | 1 +
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 ++--
+ drivers/infiniband/hw/cxgb4/cm.c | 6 ++--
+ drivers/infiniband/hw/ipath/ipath_init_chip.c | 10 ------
+ drivers/infiniband/hw/mlx4/cm.c | 4 +--
+ drivers/infiniband/hw/mlx4/cq.c | 34 ++++++++++++++-----
+ drivers/infiniband/hw/mlx4/main.c | 27 ++++++++++++---
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 +
+ drivers/infiniband/hw/mlx4/user.h | 12 ++++++-
+ drivers/infiniband/hw/nes/nes_cm.c | 8 ++---
+ drivers/infiniband/hw/nes/nes_mgt.c | 42 +++++++++++-------------
+ drivers/infiniband/hw/nes/nes_nic.c | 13 ++++----
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 11 ++++---
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +--
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 5 +--
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 36 ++++++++++++--------
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 30 ++++++++++++++++-
+ drivers/net/ethernet/mellanox/mlx4/fw.h | 1 +
+ drivers/net/ethernet/mellanox/mlx4/main.c | 38 ++++++++++++++++++++-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 +
+ include/linux/mlx4/device.h | 21 ++++++++++++
+ include/rdma/Kbuild | 6 ----
+ include/rdma/rdma_netlink.h | 36 +-------------------
+ include/uapi/rdma/Kbuild | 6 ++++
+ include/{ => uapi}/rdma/ib_user_cm.h | 0
+ include/{ => uapi}/rdma/ib_user_mad.h | 0
+ include/{ => uapi}/rdma/ib_user_sa.h | 0
+ include/{ => uapi}/rdma/ib_user_verbs.h | 0
+ include/uapi/rdma/rdma_netlink.h | 37 +++++++++++++++++++++
+ include/{ => uapi}/rdma/rdma_user_cm.h | 0
+ 33 files changed, 271 insertions(+), 138 deletions(-)
+ rename include/{ => uapi}/rdma/ib_user_cm.h (100%)
+ rename include/{ => uapi}/rdma/ib_user_mad.h (100%)
+ rename include/{ => uapi}/rdma/ib_user_sa.h (100%)
+ rename include/{ => uapi}/rdma/ib_user_verbs.h (100%)
+ create mode 100644 include/uapi/rdma/rdma_netlink.h
+ rename include/{ => uapi}/rdma/rdma_user_cm.h (100%)
+Merging pstore/master (b042e47 pstore/ram: Fix undefined usage of rounddown_pow_of_two(0))
+$ git merge pstore/master
+Auto-merging fs/pstore/ram.c
+Merge made by the 'recursive' strategy.
+ fs/pstore/ram.c | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+Merging acpi/next (32cc109 tools/power turbostat: v3.0: monitor Watts and Temperature)
+$ git merge acpi/next
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/msr-index.h | 37 ++
+ tools/power/x86/turbostat/Makefile | 7 +-
+ tools/power/x86/turbostat/turbostat.8 | 103 ++--
+ tools/power/x86/turbostat/turbostat.c | 676 +++++++++++++++++++++--
+ tools/power/x86/x86_energy_perf_policy/Makefile | 6 +-
+ 5 files changed, 751 insertions(+), 78 deletions(-)
+Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
+$ git merge cpuidle/cpuidle-next
+Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
+Resolved 'include/linux/cpuidle.h' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+CONFLICT (content): Merge conflict in include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/coupled.c
+CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master aa95c08] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+$ git diff -M --stat --summary HEAD^..
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (d12250e thermal: rcar: add rcar_zone_to_priv() macro)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/db8500-thermal.txt | 44 ++
+ Documentation/thermal/sysfs-api.txt | 64 ++
+ arch/arm/boot/dts/dbx5x0.dtsi | 14 +
+ arch/arm/boot/dts/snowball.dts | 31 +
+ arch/arm/configs/u8500_defconfig | 2 +
+ arch/arm/mach-ux500/board-mop500.c | 64 ++
+ drivers/acpi/thermal.c | 6 +-
+ drivers/platform/x86/acerhdf.c | 2 +-
+ drivers/platform/x86/intel_mid_thermal.c | 2 +-
+ drivers/power/power_supply_core.c | 2 +-
+ drivers/staging/omap-thermal/omap-thermal-common.c | 2 +-
+ drivers/thermal/Kconfig | 82 ++-
+ drivers/thermal/Makefile | 17 +-
+ drivers/thermal/cpu_cooling.c | 107 +--
+ drivers/thermal/db8500_cpufreq_cooling.c | 108 +++
+ drivers/thermal/db8500_thermal.c | 531 +++++++++++++++
+ drivers/thermal/exynos_thermal.c | 2 +-
+ drivers/thermal/fair_share.c | 133 ++++
+ drivers/thermal/rcar_thermal.c | 27 +-
+ drivers/thermal/spear_thermal.c | 2 +-
+ drivers/thermal/step_wise.c | 194 ++++++
+ drivers/thermal/thermal_core.h | 53 ++
+ drivers/thermal/thermal_sys.c | 700 +++++++++++++-------
+ drivers/thermal/user_space.c | 68 ++
+ include/linux/cpu_cooling.h | 6 +-
+ include/linux/platform_data/db8500_thermal.h | 38 ++
+ include/linux/thermal.h | 128 +++-
+ 27 files changed, 2031 insertions(+), 398 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/db8500-thermal.txt
+ create mode 100644 drivers/thermal/db8500_cpufreq_cooling.c
+ create mode 100644 drivers/thermal/db8500_thermal.c
+ create mode 100644 drivers/thermal/fair_share.c
+ create mode 100644 drivers/thermal/step_wise.c
+ create mode 100644 drivers/thermal/thermal_core.h
+ create mode 100644 drivers/thermal/user_space.c
+ create mode 100644 include/linux/platform_data/db8500_thermal.h
+Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (6a059ab UBI: use list_move_tail instead of list_del/list_add_tail)
+$ git merge ubi/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/fastmap.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+Merging dlm/next (da8c666 dlm: fix lvb invalidation conditions)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/Kconfig | 2 +-
+ fs/dlm/dlm_internal.h | 1 +
+ fs/dlm/lock.c | 16 +++++++++++++---
+ fs/dlm/lowcomms.c | 5 ++---
+ fs/dlm/recover.c | 37 ++++++++++++++++++++++++++++++-------
+ 5 files changed, 47 insertions(+), 14 deletions(-)
+Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/xen/swiotlb-xen.c | 25 ++---
+ include/linux/swiotlb.h | 20 ++--
+ lib/swiotlb.c | 269 +++++++++++++++++++++++----------------------
+ 3 files changed, 163 insertions(+), 151 deletions(-)
+Merging scsi/for-next (a3667aa [SCSI] csiostor: Chelsio FCoE offload driver)
+$ git merge scsi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/scsi/hptiop.txt | 69 +-
+ MAINTAINERS | 5 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 20 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 36 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 41 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 8 +-
+ drivers/scsi/Kconfig | 1 +
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/aacraid/aachba.c | 87 +-
+ drivers/scsi/aacraid/aacraid.h | 2 +-
+ drivers/scsi/be2iscsi/be.h | 7 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 236 +-
+ drivers/scsi/be2iscsi/be_cmds.h | 93 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 124 +-
+ drivers/scsi/be2iscsi/be_iscsi.h | 2 +-
+ drivers/scsi/be2iscsi/be_main.c | 1059 ++++--
+ drivers/scsi/be2iscsi/be_main.h | 152 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 424 ++-
+ drivers/scsi/be2iscsi/be_mgmt.h | 23 +-
+ drivers/scsi/bnx2i/bnx2i.h | 2 +-
+ drivers/scsi/bnx2i/bnx2i_init.c | 43 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +-
+ drivers/scsi/csiostor/Kconfig | 19 +
+ drivers/scsi/csiostor/Makefile | 11 +
+ drivers/scsi/csiostor/csio_attr.c | 796 ++++
+ drivers/scsi/csiostor/csio_defs.h | 121 +
+ drivers/scsi/csiostor/csio_hw.c | 4395 +++++++++++++++++++++++
+ drivers/scsi/csiostor/csio_hw.h | 667 ++++
+ drivers/scsi/csiostor/csio_init.c | 1274 +++++++
+ drivers/scsi/csiostor/csio_init.h | 158 +
+ drivers/scsi/csiostor/csio_isr.c | 624 ++++
+ drivers/scsi/csiostor/csio_lnode.c | 2133 +++++++++++
+ drivers/scsi/csiostor/csio_lnode.h | 255 ++
+ drivers/scsi/csiostor/csio_mb.c | 1770 +++++++++
+ drivers/scsi/csiostor/csio_mb.h | 278 ++
+ drivers/scsi/csiostor/csio_rnode.c | 912 +++++
+ drivers/scsi/csiostor/csio_rnode.h | 141 +
+ drivers/scsi/csiostor/csio_scsi.c | 2555 +++++++++++++
+ drivers/scsi/csiostor/csio_scsi.h | 342 ++
+ drivers/scsi/csiostor/csio_wr.c | 1632 +++++++++
+ drivers/scsi/csiostor/csio_wr.h | 512 +++
+ drivers/scsi/csiostor/t4fw_api_stor.h | 578 +++
+ drivers/scsi/hptiop.c | 413 ++-
+ drivers/scsi/hptiop.h | 72 +-
+ drivers/scsi/lpfc/lpfc.h | 2 +
+ drivers/scsi/lpfc/lpfc_attr.c | 85 +
+ drivers/scsi/lpfc/lpfc_crtn.h | 1 +
+ drivers/scsi/lpfc/lpfc_ct.c | 2 +-
+ drivers/scsi/lpfc/lpfc_els.c | 8 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 3 +
+ drivers/scsi/lpfc/lpfc_init.c | 57 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 19 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 16 +-
+ drivers/scsi/lpfc/lpfc_sli.h | 4 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 3 +
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/osd/osd_uld.c | 28 +
+ drivers/scsi/sd.c | 17 +-
+ drivers/scsi/virtio_scsi.c | 2 +
+ include/scsi/scsi_device.h | 1 +
+ 63 files changed, 21648 insertions(+), 714 deletions(-)
+ create mode 100644 drivers/scsi/csiostor/Kconfig
+ create mode 100644 drivers/scsi/csiostor/Makefile
+ create mode 100644 drivers/scsi/csiostor/csio_attr.c
+ create mode 100644 drivers/scsi/csiostor/csio_defs.h
+ create mode 100644 drivers/scsi/csiostor/csio_hw.c
+ create mode 100644 drivers/scsi/csiostor/csio_hw.h
+ create mode 100644 drivers/scsi/csiostor/csio_init.c
+ create mode 100644 drivers/scsi/csiostor/csio_init.h
+ create mode 100644 drivers/scsi/csiostor/csio_isr.c
+ create mode 100644 drivers/scsi/csiostor/csio_lnode.c
+ create mode 100644 drivers/scsi/csiostor/csio_lnode.h
+ create mode 100644 drivers/scsi/csiostor/csio_mb.c
+ create mode 100644 drivers/scsi/csiostor/csio_mb.h
+ create mode 100644 drivers/scsi/csiostor/csio_rnode.c
+ create mode 100644 drivers/scsi/csiostor/csio_rnode.h
+ create mode 100644 drivers/scsi/csiostor/csio_scsi.c
+ create mode 100644 drivers/scsi/csiostor/csio_scsi.h
+ create mode 100644 drivers/scsi/csiostor/csio_wr.c
+ create mode 100644 drivers/scsi/csiostor/csio_wr.h
+ create mode 100644 drivers/scsi/csiostor/t4fw_api_stor.h
+Merging target-updates/for-next (3e4f574 ib_srpt: Convert TMR path to target_submit_tmr)
+$ git merge target-updates/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 178 ++--
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 1 -
+ drivers/scsi/qla2xxx/qla_target.c | 21 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +-
+ drivers/target/iscsi/iscsi_target.c | 84 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 4 +-
+ drivers/target/iscsi/iscsi_target_core.h | 2 +-
+ drivers/target/iscsi/iscsi_target_erl1.c | 11 +-
+ drivers/target/iscsi/iscsi_target_erl2.c | 2 +-
+ drivers/target/iscsi/iscsi_target_login.c | 18 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 10 +-
+ drivers/target/iscsi/iscsi_target_tmr.c | 4 +-
+ drivers/target/iscsi/iscsi_target_tq.c | 3 +-
+ drivers/target/iscsi/iscsi_target_util.c | 8 +-
+ drivers/target/loopback/tcm_loop.h | 1 -
+ drivers/target/sbp/Kconfig | 2 +-
+ drivers/target/target_core_alua.c | 346 +++-----
+ drivers/target/target_core_alua.h | 9 +-
+ drivers/target/target_core_configfs.c | 705 +++++----------
+ drivers/target/target_core_device.c | 709 +++++++--------
+ drivers/target/target_core_fabric_configfs.c | 25 +-
+ drivers/target/target_core_fabric_lib.c | 3 +-
+ drivers/target/target_core_file.c | 190 ++--
+ drivers/target/target_core_file.h | 2 +
+ drivers/target/target_core_hba.c | 9 +-
+ drivers/target/target_core_iblock.c | 501 ++++++-----
+ drivers/target/target_core_iblock.h | 1 +
+ drivers/target/target_core_internal.h | 16 +-
+ drivers/target/target_core_pr.c | 1225 +++++++++++---------------
+ drivers/target/target_core_pr.h | 10 +-
+ drivers/target/target_core_pscsi.c | 349 +++-----
+ drivers/target/target_core_pscsi.h | 2 +-
+ drivers/target/target_core_rd.c | 126 +--
+ drivers/target/target_core_rd.h | 1 +
+ drivers/target/target_core_sbc.c | 185 ++--
+ drivers/target/target_core_spc.c | 572 ++++++++----
+ drivers/target/target_core_stat.c | 312 ++-----
+ drivers/target/target_core_tmr.c | 9 +-
+ drivers/target/target_core_tpg.c | 5 +-
+ drivers/target/target_core_transport.c | 673 ++++----------
+ drivers/target/target_core_ua.c | 20 +-
+ drivers/target/target_core_ua.h | 2 +-
+ drivers/vhost/tcm_vhost.c | 4 -
+ include/target/target_core_backend.h | 49 +-
+ include/target/target_core_base.h | 206 ++---
+ include/target/target_core_fabric.h | 13 +-
+ 46 files changed, 2724 insertions(+), 3908 deletions(-)
+Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging slave-dma/next (858e3fc dmaengine: fix !of_dma compilation warning)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/dma/dma.txt | 81 ++++++
+ Documentation/devicetree/bindings/dma/snps-dma.txt | 44 ++++
+ arch/arm/boot/dts/spear1340.dtsi | 19 ++
+ arch/arm/boot/dts/spear13xx.dtsi | 38 +++
+ arch/arm/mach-spear13xx/include/mach/spear.h | 2 -
+ arch/arm/mach-spear13xx/spear1310.c | 4 +-
+ arch/arm/mach-spear13xx/spear1340.c | 27 +-
+ arch/arm/mach-spear13xx/spear13xx.c | 54 +---
+ crypto/async_tx/async_xor.c | 4 +-
+ drivers/dma/Kconfig | 3 +-
+ drivers/dma/amba-pl08x.c | 8 +-
+ drivers/dma/at_hdmac_regs.h | 8 +-
+ drivers/dma/dmaengine.c | 16 ++
+ drivers/dma/dmatest.c | 16 +-
+ drivers/dma/dw_dmac.c | 167 +++++++++++--
+ drivers/dma/dw_dmac_regs.h | 6 +
+ drivers/dma/iop-adma.c | 45 ++--
+ drivers/dma/mv_xor.c | 62 ++---
+ drivers/dma/pch_dma.c | 13 +-
+ drivers/of/Makefile | 2 +-
+ drivers/of/dma.c | 264 ++++++++++++++++++++
+ include/linux/dmaengine.h | 24 +-
+ include/linux/dw_dmac.h | 45 ++--
+ include/linux/of_dma.h | 74 ++++++
+ 24 files changed, 804 insertions(+), 222 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/dma.txt
+ create mode 100644 drivers/of/dma.c
+ create mode 100644 include/linux/of_dma.h
+Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (bb72882 core: make GRO methods static.)
+$ git merge net-next/master
+Resolved 'drivers/net/ethernet/mellanox/mlx4/en_rx.c' using previous resolution.
+Auto-merging net/mac80211/offchannel.c
+Removing kernel/time/timecompare.c
+Auto-merging include/uapi/linux/hdlc/ioctl.h
+Removing include/linux/timecompare.h
+Auto-merging include/linux/pci.h
+Removing include/linux/nfc/pn544.h
+Auto-merging include/linux/bcma/bcma_driver_chipcommon.h
+Auto-merging drivers/vhost/tcm_vhost.c
+Auto-merging drivers/nfc/pn544/pn544.c
+Removing drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
+Removing drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_rx.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/en_rx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+Removing drivers/net/ethernet/cadence/at91_ether.h
+Auto-merging drivers/net/bonding/bond_main.c
+Auto-merging drivers/bcma/main.c
+Auto-merging drivers/bcma/driver_chipcommon.c
+Auto-merging arch/powerpc/include/asm/ppc-opcode.h
+CONFLICT (modify/delete): arch/m68k/include/uapi/asm/socket.h deleted in HEAD and modified in net-next/master. Version net-next/master of arch/m68k/include/uapi/asm/socket.h left in tree.
+Auto-merging arch/cris/include/uapi/asm/socket.h
+Auto-merging arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+Removing arch/arm/mach-at91/include/mach/at91rm9200_emac.h
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/m68k/include/uapi/asm/socket.h
+arch/m68k/include/uapi/asm/socket.h: needs merge
+rm 'arch/m68k/include/uapi/asm/socket.h'
+$ git commit -v -a
+[master b58ea2e] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-mdio | 9 +
+ .../ABI/testing/sysfs-class-net-batman-adv | 11 +-
+ Documentation/ABI/testing/sysfs-class-net-grcan | 35 +
+ Documentation/ABI/testing/sysfs-class-net-mesh | 40 +-
+ .../devicetree/bindings/net/can/grcan.txt | 28 +
+ .../devicetree/bindings/net/cdns-emac.txt | 23 +
+ Documentation/devicetree/bindings/net/cpsw.txt | 48 +-
+ Documentation/kernel-parameters.txt | 18 +
+ Documentation/networking/batman-adv.txt | 3 +-
+ Documentation/networking/ip-sysctl.txt | 31 +-
+ Documentation/networking/packet_mmap.txt | 246 +-
+ Documentation/networking/stmmac.txt | 28 +-
+ MAINTAINERS | 13 +-
+ arch/alpha/include/asm/socket.h | 1 +
+ arch/arm/boot/dts/am335x-bone.dts | 8 +
+ arch/arm/boot/dts/am335x-evm.dts | 8 +
+ arch/arm/boot/dts/am33xx.dtsi | 48 +
+ arch/arm/boot/dts/imx6q.dtsi | 5 +-
+ arch/arm/configs/omap2plus_defconfig | 3 +
+ arch/arm/mach-at91/Kconfig | 4 -
+ arch/arm/mach-at91/board-csb337.c | 2 +
+ arch/arm/mach-at91/include/mach/at91rm9200_emac.h | 138 --
+ arch/arm/mach-imx/mach-imx6q.c | 12 +
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 31 +
+ arch/arm/net/bpf_jit_32.c | 29 +-
+ arch/arm/net/bpf_jit_32.h | 2 +
+ arch/avr32/Kconfig | 1 -
+ arch/avr32/include/uapi/asm/socket.h | 1 +
+ arch/cris/include/uapi/asm/socket.h | 1 +
+ arch/frv/include/uapi/asm/socket.h | 1 +
+ arch/h8300/include/asm/socket.h | 1 +
+ arch/ia64/include/uapi/asm/socket.h | 1 +
+ arch/m32r/include/asm/socket.h | 1 +
+ arch/mips/bcm47xx/nvram.c | 4 +-
+ arch/mips/bcm47xx/wgt634u.c | 8 +-
+ arch/mips/include/uapi/asm/socket.h | 1 +
+ arch/mn10300/include/uapi/asm/socket.h | 1 +
+ arch/parisc/include/uapi/asm/socket.h | 1 +
+ arch/powerpc/include/asm/ppc-opcode.h | 3 +
+ arch/powerpc/include/uapi/asm/socket.h | 1 +
+ arch/powerpc/net/bpf_jit.h | 6 +
+ arch/powerpc/net/bpf_jit_comp.c | 25 +
+ arch/s390/include/uapi/asm/socket.h | 1 +
+ arch/sparc/include/uapi/asm/socket.h | 1 +
+ arch/sparc/net/bpf_jit_comp.c | 19 +
+ arch/x86/net/bpf_jit_comp.c | 21 +
+ arch/xtensa/include/uapi/asm/socket.h | 1 +
+ drivers/bcma/driver_chipcommon.c | 23 +-
+ drivers/bcma/driver_chipcommon_nflash.c | 3 +
+ drivers/bcma/driver_chipcommon_pmu.c | 5 +-
+ drivers/bcma/driver_chipcommon_sflash.c | 35 +-
+ drivers/bcma/driver_mips.c | 48 +-
+ drivers/bcma/driver_pci_host.c | 14 +-
+ drivers/bcma/host_pci.c | 6 +-
+ drivers/bcma/main.c | 54 +-
+ drivers/bcma/sprom.c | 5 +-
+ drivers/bluetooth/btmrvl_sdio.c | 28 +-
+ drivers/bluetooth/btusb.c | 1 +
+ drivers/dma/ioat/dca.c | 23 +
+ drivers/isdn/hardware/mISDN/hfcpci.c | 2 +-
+ drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +-
+ drivers/isdn/hisax/callc.c | 2 +-
+ drivers/isdn/hisax/hfc_pci.c | 2 +-
+ drivers/isdn/hisax/hfc_sx.c | 2 +-
+ drivers/isdn/mISDN/l1oip_core.c | 5 +-
+ drivers/isdn/pcbit/layer2.c | 2 +-
+ drivers/net/bonding/bond_main.c | 2 +-
+ drivers/net/can/Kconfig | 9 +
+ drivers/net/can/Makefile | 1 +
+ drivers/net/can/at91_can.c | 1 +
+ drivers/net/can/bfin_can.c | 1 +
+ drivers/net/can/c_can/c_can.c | 12 +
+ drivers/net/can/c_can/c_can.h | 3 +
+ drivers/net/can/c_can/c_can_platform.c | 30 +-
+ drivers/net/can/cc770/cc770_platform.c | 2 +
+ drivers/net/can/flexcan.c | 2 +
+ drivers/net/can/grcan.c | 1756 +++++++++++++++
+ drivers/net/can/janz-ican3.c | 4 +-
+ drivers/net/can/mscan/mpc5xxx_can.c | 1 +
+ drivers/net/can/sja1000/Kconfig | 3 +-
+ drivers/net/can/sja1000/plx_pci.c | 19 +
+ drivers/net/can/sja1000/sja1000_of_platform.c | 6 +-
+ drivers/net/can/sja1000/sja1000_platform.c | 1 +
+ drivers/net/can/ti_hecc.c | 1 +
+ drivers/net/can/usb/Kconfig | 29 +
+ drivers/net/can/usb/Makefile | 1 +
+ drivers/net/can/usb/esd_usb2.c | 35 +-
+ drivers/net/can/usb/kvaser_usb.c | 1627 +++++++++++++
+ drivers/net/dsa/Kconfig | 5 +-
+ drivers/net/ethernet/8390/etherh.c | 6 -
+ drivers/net/ethernet/adi/Kconfig | 2 +-
+ drivers/net/ethernet/adi/bfin_mac.c | 259 ++-
+ drivers/net/ethernet/adi/bfin_mac.h | 13 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 134 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 469 ++--
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 87 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 8 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 11 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 34 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 29 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 985 +++++---
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 17 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 871 ++++---
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 45 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 59 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 12 +
+ drivers/net/ethernet/broadcom/tg3.c | 276 ++-
+ drivers/net/ethernet/broadcom/tg3.h | 8 +
+ drivers/net/ethernet/cadence/Kconfig | 9 +-
+ drivers/net/ethernet/cadence/at91_ether.c | 1279 +++--------
+ drivers/net/ethernet/cadence/at91_ether.h | 112 -
+ drivers/net/ethernet/cadence/macb.c | 556 +++--
+ drivers/net/ethernet/cadence/macb.h | 67 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 59 +-
+ drivers/net/ethernet/chelsio/Kconfig | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/common.h | 7 +-
+ drivers/net/ethernet/cisco/Kconfig | 2 +-
+ drivers/net/ethernet/cisco/enic/Kconfig | 2 +-
+ drivers/net/ethernet/dec/ewrk3.c | 3 +-
+ drivers/net/ethernet/dlink/dl2k.c | 16 +-
+ drivers/net/ethernet/dnet.c | 3 -
+ drivers/net/ethernet/emulex/Kconfig | 2 +-
+ drivers/net/ethernet/emulex/benet/Kconfig | 2 +-
+ drivers/net/ethernet/emulex/benet/be.h | 51 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 409 +++-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 177 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 80 +-
+ drivers/net/ethernet/emulex/benet/be_hw.h | 20 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 844 ++++---
+ drivers/net/ethernet/emulex/benet/be_roce.c | 5 +-
+ drivers/net/ethernet/freescale/Kconfig | 9 +
+ drivers/net/ethernet/freescale/Makefile | 1 +
+ drivers/net/ethernet/freescale/fec.c | 161 +-
+ drivers/net/ethernet/freescale/fec.h | 119 +
+ drivers/net/ethernet/freescale/fec_ptp.c | 383 ++++
+ drivers/net/ethernet/freescale/gianfar.c | 14 +-
+ drivers/net/ethernet/i825xx/ether1.c | 6 -
+ drivers/net/ethernet/ibm/Kconfig | 5 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +-
+ drivers/net/ethernet/ibm/emac/mal.c | 6 +-
+ drivers/net/ethernet/intel/Kconfig | 30 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c | 17 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 11 +
+ drivers/net/ethernet/intel/igb/Makefile | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 28 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 3 +
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 15 +
+ drivers/net/ethernet/intel/igb/e1000_i210.c | 94 +
+ drivers/net/ethernet/intel/igb/e1000_i210.h | 11 +
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 4 +
+ drivers/net/ethernet/intel/igb/e1000_mac.h | 1 +
+ drivers/net/ethernet/intel/igb/e1000_nvm.c | 71 +
+ drivers/net/ethernet/intel/igb/e1000_nvm.h | 16 +
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 49 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.h | 1 +
+ drivers/net/ethernet/intel/igb/igb.h | 110 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 392 +++-
+ drivers/net/ethernet/intel/igb/igb_main.c | 1512 ++++++++-----
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 102 +-
+ drivers/net/ethernet/intel/igbvf/defines.h | 1 +
+ drivers/net/ethernet/intel/igbvf/igbvf.h | 2 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 30 +-
+ drivers/net/ethernet/intel/ixgbe/Makefile | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 15 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 158 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 76 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 32 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 109 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 4 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 22 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 393 ++--
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 31 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 164 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 470 ++--
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
+ drivers/net/ethernet/intel/ixgbevf/defines.h | 7 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 16 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 394 +++-
+ drivers/net/ethernet/intel/ixgbevf/mbx.h | 10 +
+ drivers/net/ethernet/intel/ixgbevf/vf.c | 61 +
+ drivers/net/ethernet/intel/ixgbevf/vf.h | 2 +
+ drivers/net/ethernet/marvell/pxa168_eth.c | 7 +-
+ drivers/net/ethernet/mellanox/Kconfig | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/Kconfig | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 19 +-
+ drivers/net/ethernet/micrel/ks8695net.c | 3 -
+ drivers/net/ethernet/micrel/ksz884x.c | 13 +-
+ drivers/net/ethernet/neterion/Kconfig | 2 +-
+ drivers/net/ethernet/neterion/s2io.c | 3 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 4 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 17 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 -
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 14 -
+ .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 93 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 16 +-
+ drivers/net/ethernet/qlogic/qlcnic/Makefile | 3 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 416 ++--
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 48 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 3 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h | 16 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 472 +---
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 826 +------
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 1309 +++++++++++
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1663 +-------------
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 629 ++++++
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 962 ++++++++
+ drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 16 +-
+ drivers/net/ethernet/realtek/8139cp.c | 52 +-
+ drivers/net/ethernet/realtek/atp.c | 58 +-
+ drivers/net/ethernet/realtek/atp.h | 2 -
+ drivers/net/ethernet/realtek/r8169.c | 110 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 2 +-
+ drivers/net/ethernet/seeq/ether3.c | 6 -
+ drivers/net/ethernet/sfc/Kconfig | 10 +-
+ drivers/net/ethernet/sfc/Makefile | 3 +-
+ drivers/net/ethernet/sfc/net_driver.h | 2 -
+ drivers/net/ethernet/sfc/nic.h | 26 -
+ drivers/net/ethernet/smsc/smc911x.c | 10 -
+ drivers/net/ethernet/smsc/smc91x.c | 10 -
+ drivers/net/ethernet/smsc/smsc911x.c | 5 -
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 25 -
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 -
+ drivers/net/ethernet/stmicro/stmmac/common.h | 39 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 3 -
+ .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 6 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 5 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 20 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 14 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 100 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 261 +--
+ drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c | 134 --
+ drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h | 46 -
+ drivers/net/ethernet/ti/Kconfig | 9 +
+ drivers/net/ethernet/ti/Makefile | 2 +-
+ drivers/net/ethernet/ti/cpsw.c | 629 ++++--
+ drivers/net/ethernet/ti/cpsw_ale.c | 31 +-
+ drivers/net/ethernet/ti/cpsw_ale.h | 1 +
+ drivers/net/ethernet/ti/cpts.c | 427 ++++
+ drivers/net/ethernet/ti/cpts.h | 146 ++
+ drivers/net/ethernet/ti/davinci_mdio.c | 2 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +-
+ drivers/net/ethernet/wiznet/w5100.c | 2 -
+ drivers/net/ethernet/wiznet/w5300.c | 2 -
+ drivers/net/hyperv/rndis_filter.c | 5 -
+ drivers/net/irda/sh_irda.c | 4 -
+ drivers/net/netconsole.c | 6 +
+ drivers/net/phy/davicom.c | 6 +
+ drivers/net/phy/mdio_bus.c | 14 +
+ drivers/net/phy/micrel.c | 44 +
+ drivers/net/phy/smsc.c | 69 +-
+ drivers/net/ppp/ppp_generic.c | 2 +-
+ drivers/net/tun.c | 852 +++++--
+ drivers/net/usb/Kconfig | 22 +
+ drivers/net/usb/Makefile | 1 +
+ drivers/net/usb/asix_common.c | 117 +-
+ drivers/net/usb/asix_devices.c | 19 +-
+ drivers/net/usb/cdc_mbim.c | 412 ++++
+ drivers/net/usb/cdc_ncm.c | 645 +++---
+ drivers/net/usb/dm9601.c | 107 +-
+ drivers/net/usb/int51x1.c | 52 +-
+ drivers/net/usb/mcs7830.c | 85 +-
+ drivers/net/usb/net1080.c | 110 +-
+ drivers/net/usb/plusb.c | 11 +-
+ drivers/net/usb/sierra_net.c | 47 +-
+ drivers/net/usb/smsc75xx.c | 957 +++++---
+ drivers/net/usb/smsc95xx.c | 706 ++++--
+ drivers/net/usb/smsc95xx.h | 25 +
+ drivers/net/usb/usbnet.c | 196 ++
+ drivers/net/veth.c | 1 +
+ drivers/net/virtio_net.c | 12 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 36 +-
+ drivers/net/vxlan.c | 262 ++-
+ drivers/net/wan/Makefile | 4 +-
+ drivers/net/wan/wanxlfw.S | 1 +
+ drivers/net/wireless/airo.c | 2 +-
+ drivers/net/wireless/at76c50x-usb.c | 85 +-
+ drivers/net/wireless/ath/Kconfig | 1 +
+ drivers/net/wireless/ath/Makefile | 1 +
+ drivers/net/wireless/ath/ar5523/Kconfig | 7 +
+ drivers/net/wireless/ath/ar5523/Makefile | 1 +
+ drivers/net/wireless/ath/ar5523/ar5523.c | 1798 +++++++++++++++
+ drivers/net/wireless/ath/ar5523/ar5523.h | 152 ++
+ drivers/net/wireless/ath/ar5523/ar5523_hw.h | 431 ++++
+ drivers/net/wireless/ath/ath5k/ahb.c | 15 +-
+ drivers/net/wireless/ath/ath5k/base.c | 12 +-
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c | 5 +-
+ drivers/net/wireless/ath/ath5k/reset.c | 6 +-
+ drivers/net/wireless/ath/ath6kl/Kconfig | 9 +
+ drivers/net/wireless/ath/ath6kl/Makefile | 1 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 410 ++--
+ drivers/net/wireless/ath/ath6kl/cfg80211.h | 1 -
+ drivers/net/wireless/ath/ath6kl/core.c | 21 +
+ drivers/net/wireless/ath/ath6kl/core.h | 69 +-
+ drivers/net/wireless/ath/ath6kl/debug.h | 1 +
+ drivers/net/wireless/ath/ath6kl/hif.c | 12 +-
+ drivers/net/wireless/ath/ath6kl/htc_mbox.c | 13 +-
+ drivers/net/wireless/ath/ath6kl/htc_pipe.c | 14 +-
+ drivers/net/wireless/ath/ath6kl/init.c | 92 +-
+ drivers/net/wireless/ath/ath6kl/main.c | 55 +-
+ drivers/net/wireless/ath/ath6kl/recovery.c | 160 ++
+ drivers/net/wireless/ath/ath6kl/sdio.c | 27 +-
+ drivers/net/wireless/ath/ath6kl/txrx.c | 47 +-
+ drivers/net/wireless/ath/ath6kl/usb.c | 32 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 284 ++-
+ drivers/net/wireless/ath/ath6kl/wmi.h | 78 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 81 +
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 22 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 30 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mci.c | 71 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mci.h | 8 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 47 +-
+ .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 338 ++-
+ .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 4 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 37 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 2 +-
+ drivers/net/wireless/ath/ath9k/btcoex.c | 63 +-
+ drivers/net/wireless/ath/ath9k/btcoex.h | 8 +
+ drivers/net/wireless/ath/ath9k/calib.c | 1 +
+ drivers/net/wireless/ath/ath9k/common.h | 7 -
+ drivers/net/wireless/ath/ath9k/debug.c | 230 +-
+ drivers/net/wireless/ath/ath9k/debug.h | 18 +-
+ .../net/wireless/ath/ath9k/dfs_pattern_detector.c | 12 +-
+ .../net/wireless/ath/ath9k/dfs_pattern_detector.h | 4 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 136 +-
+ drivers/net/wireless/ath/ath9k/htc.h | 4 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 8 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 8 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 25 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 44 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 28 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 11 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 6 +-
+ drivers/net/wireless/ath/ath9k/init.c | 7 +-
+ drivers/net/wireless/ath/ath9k/link.c | 17 +-
+ drivers/net/wireless/ath/ath9k/main.c | 90 +-
+ drivers/net/wireless/ath/ath9k/mci.c | 210 +-
+ drivers/net/wireless/ath/ath9k/mci.h | 36 +
+ drivers/net/wireless/ath/ath9k/pci.c | 12 -
+ drivers/net/wireless/ath/ath9k/rc.c | 53 +-
+ drivers/net/wireless/ath/ath9k/rc.h | 16 +
+ drivers/net/wireless/ath/ath9k/recv.c | 7 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 13 +-
+ drivers/net/wireless/ath/ath9k/wow.c | 2 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 12 +-
+ drivers/net/wireless/ath/carl9170/fw.c | 5 -
+ drivers/net/wireless/ath/carl9170/mac.c | 21 +-
+ drivers/net/wireless/ath/carl9170/rx.c | 51 +-
+ drivers/net/wireless/ath/carl9170/usb.c | 7 +
+ drivers/net/wireless/ath/hw.c | 20 +-
+ drivers/net/wireless/b43/main.c | 2 +-
+ drivers/net/wireless/b43/xmit.c | 2 +-
+ drivers/net/wireless/b43legacy/xmit.c | 2 +-
+ drivers/net/wireless/brcm80211/Kconfig | 15 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 2 +
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 43 +-
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 140 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 255 +--
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 6 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 101 -
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 879 ++------
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 6 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 11 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 681 ++----
+ .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 15 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 392 ++--
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 509 +++++
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 207 ++
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 344 +++
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 39 +
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 319 ++-
+ drivers/net/wireless/brcm80211/brcmfmac/usb.h | 18 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2104 +++++------------
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 257 +--
+ drivers/net/wireless/brcm80211/brcmsmac/Makefile | 3 +-
+ drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 +-
+ drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 723 +++---
+ drivers/net/wireless/brcm80211/brcmsmac/ampdu.h | 29 +-
+ drivers/net/wireless/brcm80211/brcmsmac/antsel.c | 4 +-
+ .../brcm80211/brcmsmac/brcms_trace_events.h | 175 +-
+ drivers/net/wireless/brcm80211/brcmsmac/channel.c | 10 +-
+ drivers/net/wireless/brcm80211/brcmsmac/debug.c | 44 +
+ drivers/net/wireless/brcm80211/brcmsmac/debug.h | 52 +
+ drivers/net/wireless/brcm80211/brcmsmac/dma.c | 343 ++-
+ drivers/net/wireless/brcm80211/brcmsmac/dma.h | 11 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 123 +-
+ drivers/net/wireless/brcm80211/brcmsmac/main.c | 1197 +++-------
+ drivers/net/wireless/brcm80211/brcmsmac/main.h | 48 +-
+ drivers/net/wireless/brcm80211/brcmsmac/pub.h | 37 -
+ drivers/net/wireless/brcm80211/brcmsmac/stf.c | 8 +-
+ drivers/net/wireless/brcm80211/brcmsmac/types.h | 3 +-
+ drivers/net/wireless/brcm80211/include/defs.h | 11 +-
+ drivers/net/wireless/hostap/hostap_80211_rx.c | 2 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 5 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 40 +-
+ drivers/net/wireless/ipw2x00/libipw.h | 2 +-
+ drivers/net/wireless/ipw2x00/libipw_geo.c | 3 +-
+ drivers/net/wireless/ipw2x00/libipw_rx.c | 6 +-
+ drivers/net/wireless/iwlegacy/3945.c | 2 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 4 +-
+ drivers/net/wireless/iwlegacy/common.h | 5 +-
+ drivers/net/wireless/iwlwifi/Kconfig | 9 -
+ drivers/net/wireless/iwlwifi/dvm/agn.h | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/commands.h | 7 +-
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/dev.h | 1 -
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 37 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 16 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 29 +-
+ drivers/net/wireless/iwlwifi/dvm/rx.c | 6 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 9 +-
+ drivers/net/wireless/iwlwifi/dvm/ucode.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-devtrace.h | 95 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-io.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-io.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 35 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 1 -
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 117 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 399 +++-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 1046 +--------
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 1259 ++++++++---
+ drivers/net/wireless/libertas/cfg.c | 24 +-
+ drivers/net/wireless/libertas/if_sdio.c | 39 +-
+ drivers/net/wireless/libertas/mesh.c | 2 +-
+ drivers/net/wireless/mac80211_hwsim.c | 580 ++++-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 8 +-
+ drivers/net/wireless/mwifiex/11n_rxreorder.c | 8 +-
+ drivers/net/wireless/mwifiex/Kconfig | 1 -
+ drivers/net/wireless/mwifiex/cfg80211.c | 74 +-
+ drivers/net/wireless/mwifiex/cmdevt.c | 24 +-
+ drivers/net/wireless/mwifiex/debugfs.c | 10 +-
+ drivers/net/wireless/mwifiex/init.c | 39 +-
+ drivers/net/wireless/mwifiex/join.c | 6 +-
+ drivers/net/wireless/mwifiex/main.c | 94 +-
+ drivers/net/wireless/mwifiex/main.h | 19 +-
+ drivers/net/wireless/mwifiex/scan.c | 55 +-
+ drivers/net/wireless/mwifiex/sdio.c | 39 +-
+ drivers/net/wireless/mwifiex/sdio.h | 1 +
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 4 -
+ drivers/net/wireless/mwifiex/sta_event.c | 10 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 13 +-
+ drivers/net/wireless/mwifiex/sta_rx.c | 26 +-
+ drivers/net/wireless/mwifiex/txrx.c | 38 +-
+ drivers/net/wireless/mwifiex/uap_cmd.c | 11 +-
+ drivers/net/wireless/mwifiex/uap_event.c | 7 +
+ drivers/net/wireless/mwifiex/uap_txrx.c | 17 +-
+ drivers/net/wireless/mwifiex/usb.c | 2 +-
+ drivers/net/wireless/mwifiex/util.c | 19 +-
+ drivers/net/wireless/mwifiex/wmm.c | 12 +-
+ drivers/net/wireless/mwifiex/wmm.h | 2 +
+ drivers/net/wireless/mwl8k.c | 57 +-
+ drivers/net/wireless/orinoco/cfg.c | 11 +-
+ drivers/net/wireless/orinoco/main.h | 2 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 9 +-
+ drivers/net/wireless/p54/txrx.c | 6 +-
+ drivers/net/wireless/rndis_wlan.c | 12 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 100 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 19 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +-
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 2 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
+ drivers/net/wireless/rtlwifi/Kconfig | 11 +
+ drivers/net/wireless/rtlwifi/Makefile | 4 +-
+ drivers/net/wireless/rtlwifi/base.c | 24 +
+ drivers/net/wireless/rtlwifi/base.h | 2 +
+ drivers/net/wireless/rtlwifi/cam.c | 9 +-
+ drivers/net/wireless/rtlwifi/core.c | 5 +-
+ drivers/net/wireless/rtlwifi/debug.h | 2 +
+ drivers/net/wireless/rtlwifi/pci.c | 20 +-
+ drivers/net/wireless/rtlwifi/pci.h | 2 +
+ drivers/net/wireless/rtlwifi/rc.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 227 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 88 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 3 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 30 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 93 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 23 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 48 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 30 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 16 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 25 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 22 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 95 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 65 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/rf.c | 18 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 41 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 89 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 64 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 11 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 23 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/Makefile | 22 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/btc.h | 41 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/def.h | 163 ++
+ drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 920 ++++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/dm.h | 149 ++
+ drivers/net/wireless/rtlwifi/rtl8723ae/fw.c | 745 ++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/fw.h | 101 +
+ .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c | 542 +++++
+ .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h | 160 ++
+ drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c | 1786 +++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h | 151 ++
+ drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2380 ++++++++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/hw.h | 73 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/led.c | 151 ++
+ drivers/net/wireless/rtlwifi/rtl8723ae/led.h | 39 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/phy.c | 2044 +++++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/phy.h | 224 ++
+ drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c | 109 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h | 322 +++
+ drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c | 129 ++
+ drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.h | 98 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/reg.h | 2097 +++++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/rf.c | 505 +++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/rf.h | 43 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 387 ++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/sw.h | 37 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/table.c | 738 ++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/table.h | 50 +
+ drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 670 ++++++
+ drivers/net/wireless/rtlwifi/rtl8723ae/trx.h | 725 ++++++
+ drivers/net/wireless/rtlwifi/stats.c | 268 +++
+ drivers/net/wireless/rtlwifi/stats.h | 46 +
+ drivers/net/wireless/rtlwifi/wifi.h | 161 +-
+ drivers/net/wireless/ti/wl1251/rx.c | 2 +-
+ drivers/net/wireless/ti/wlcore/main.c | 11 +-
+ drivers/nfc/Makefile | 2 +-
+ drivers/nfc/pn533.c | 18 +-
+ drivers/nfc/pn544/Makefile | 7 +
+ drivers/nfc/pn544/i2c.c | 500 ++++
+ drivers/nfc/{pn544_hci.c => pn544/pn544.c} | 679 +++---
+ drivers/nfc/pn544/pn544.h | 32 +
+ drivers/pps/Kconfig | 1 -
+ drivers/ptp/Kconfig | 19 +-
+ drivers/ptp/ptp_chardev.c | 61 +-
+ drivers/s390/net/claw.c | 2 -
+ drivers/s390/net/ctcm_main.c | 2 -
+ drivers/s390/net/ctcm_mpc.c | 3 -
+ drivers/s390/net/qeth_core.h | 1 +
+ drivers/s390/net/qeth_core_main.c | 49 +-
+ drivers/s390/net/qeth_l2_main.c | 4 +-
+ drivers/s390/net/qeth_l3_main.c | 8 +-
+ drivers/ssb/b43_pci_bridge.c | 1 +
+ drivers/ssb/driver_chipcommon_pmu.c | 3 +
+ drivers/ssb/driver_mipscore.c | 16 +-
+ drivers/vhost/net.c | 111 +-
+ drivers/vhost/tcm_vhost.c | 2 +-
+ drivers/vhost/vhost.c | 52 +-
+ drivers/vhost/vhost.h | 11 +-
+ fs/proc/proc_sysctl.c | 9 +-
+ include/linux/bcma/bcma.h | 7 +-
+ include/linux/bcma/bcma_driver_chipcommon.h | 5 +
+ include/linux/bcma/bcma_driver_mips.h | 3 +
+ include/linux/bcma/bcma_regs.h | 5 +-
+ include/linux/etherdevice.h | 20 +
+ include/linux/filter.h | 3 +
+ include/linux/hdlc/Kbuild | 1 -
+ include/linux/ieee80211.h | 119 +-
+ include/linux/if_tunnel.h | 17 +
+ include/linux/ipv6.h | 1 +
+ include/linux/ktime.h | 19 +
+ include/linux/micrel_phy.h | 1 +
+ include/linux/netdevice.h | 38 +-
+ include/linux/nfc/pn544.h | 104 -
+ include/linux/pci.h | 14 +
+ include/linux/platform_data/cpsw.h | 23 +-
+ include/linux/platform_data/macb.h | 1 +
+ include/linux/platform_data/pn544.h | 44 +
+ include/linux/rtnetlink.h | 3 +
+ include/linux/skbuff.h | 7 +-
+ include/linux/ssb/ssb_driver_mips.h | 10 +-
+ include/linux/ssb/ssb_regs.h | 2 +-
+ include/linux/stmmac.h | 1 +
+ include/linux/sysctl.h | 3 +-
+ include/linux/timecompare.h | 125 -
+ include/linux/usb/cdc_ncm.h | 134 ++
+ include/linux/usb/usbnet.h | 10 +
+ include/net/af_unix.h | 1 -
+ include/net/bluetooth/a2mp.h | 24 +-
+ include/net/bluetooth/amp.h | 54 +
+ include/net/bluetooth/bluetooth.h | 1 -
+ include/net/bluetooth/hci.h | 69 +-
+ include/net/bluetooth/hci_core.h | 96 +-
+ include/net/bluetooth/l2cap.h | 48 +-
+ include/net/cfg80211.h | 237 +-
+ include/net/cls_cgroup.h | 6 +-
+ include/net/ip6_checksum.h | 35 +
+ include/net/ip6_fib.h | 20 +-
+ include/net/ip6_route.h | 3 -
+ include/net/ip_vs.h | 195 +-
+ include/net/ipip.h | 40 +-
+ include/net/mac80211.h | 260 ++-
+ include/net/net_namespace.h | 24 +-
+ include/net/netns/sctp.h | 3 +
+ include/net/nfc/hci.h | 21 +-
+ include/net/nfc/nfc.h | 2 +-
+ include/net/protocol.h | 31 +-
+ include/net/request_sock.h | 12 +-
+ include/net/route.h | 9 +-
+ include/net/sctp/command.h | 38 +-
+ include/net/sctp/constants.h | 8 -
+ include/net/sctp/sm.h | 2 +
+ include/net/sctp/structs.h | 1 +
+ include/net/sctp/ulpqueue.h | 2 +-
+ include/net/tcp.h | 1 -
+ include/uapi/asm-generic/socket.h | 1 +
+ include/uapi/linux/filter.h | 4 +-
+ include/uapi/linux/hdlc/Kbuild | 1 +
+ include/{ => uapi}/linux/hdlc/ioctl.h | 7 +-
+ include/uapi/linux/if_bridge.h | 18 +
+ include/uapi/linux/if_ether.h | 1 +
+ include/uapi/linux/if_link.h | 21 +
+ include/uapi/linux/if_packet.h | 1 +
+ include/uapi/linux/if_tun.h | 5 +
+ include/uapi/linux/if_tunnel.h | 20 +
+ include/uapi/linux/in6.h | 1 +
+ include/uapi/linux/inet_diag.h | 3 +-
+ include/uapi/linux/ipv6.h | 1 +
+ include/uapi/linux/ipv6_route.h | 3 +
+ include/uapi/linux/netconf.h | 23 +
+ include/uapi/linux/netfilter_ipv6/ip6_tables.h | 3 +
+ include/uapi/linux/nfc.h | 15 +
+ include/uapi/linux/nl80211.h | 161 +-
+ include/uapi/linux/ptp_clock.h | 14 +
+ include/uapi/linux/rtnetlink.h | 9 +
+ include/uapi/linux/unix_diag.h | 1 +
+ include/uapi/linux/usb/cdc.h | 23 +
+ kernel/nsproxy.c | 2 +-
+ kernel/time/Makefile | 2 +-
+ kernel/time/timecompare.c | 193 --
+ net/8021q/vlan.c | 14 +-
+ net/8021q/vlan_dev.c | 12 +-
+ net/atm/br2684.c | 36 +-
+ net/batman-adv/Kconfig | 11 +
+ net/batman-adv/Makefile | 1 +
+ net/batman-adv/bat_iv_ogm.c | 51 +-
+ net/batman-adv/bitarray.c | 23 +-
+ net/batman-adv/bridge_loop_avoidance.c | 131 +-
+ net/batman-adv/bridge_loop_avoidance.h | 6 +-
+ net/batman-adv/debugfs.c | 60 +-
+ net/batman-adv/distributed-arp-table.c | 1066 +++++++++
+ net/batman-adv/distributed-arp-table.h | 167 ++
+ net/batman-adv/gateway_client.c | 19 +-
+ net/batman-adv/hard-interface.c | 48 +-
+ net/batman-adv/hash.h | 22 +
+ net/batman-adv/icmp_socket.c | 16 +-
+ net/batman-adv/main.c | 89 +-
+ net/batman-adv/main.h | 36 +-
+ net/batman-adv/originator.c | 22 +-
+ net/batman-adv/packet.h | 84 +-
+ net/batman-adv/routing.c | 315 ++-
+ net/batman-adv/send.c | 37 +
+ net/batman-adv/send.h | 3 +
+ net/batman-adv/soft-interface.c | 85 +-
+ net/batman-adv/sysfs.c | 58 +-
+ net/batman-adv/translation-table.c | 526 +++--
+ net/batman-adv/translation-table.h | 8 +-
+ net/batman-adv/types.h | 102 +-
+ net/batman-adv/unicast.c | 143 +-
+ net/batman-adv/unicast.h | 36 +-
+ net/batman-adv/vis.c | 44 +-
+ net/bluetooth/Kconfig | 2 +-
+ net/bluetooth/Makefile | 2 +-
+ net/bluetooth/a2mp.c | 459 +++-
+ net/bluetooth/af_bluetooth.c | 10 +-
+ net/bluetooth/amp.c | 471 ++++
+ net/bluetooth/bnep/core.c | 3 +-
+ net/bluetooth/bnep/netdev.c | 1 -
+ net/bluetooth/cmtp/capi.c | 2 +-
+ net/bluetooth/cmtp/core.c | 2 +-
+ net/bluetooth/cmtp/sock.c | 2 +-
+ net/bluetooth/hci_conn.c | 76 +-
+ net/bluetooth/hci_core.c | 228 +-
+ net/bluetooth/hci_event.c | 510 ++++-
+ net/bluetooth/hci_sysfs.c | 10 +-
+ net/bluetooth/hidp/core.c | 8 +-
+ net/bluetooth/l2cap_core.c | 1535 ++++++++++---
+ net/bluetooth/l2cap_sock.c | 94 +-
+ net/bluetooth/lib.c | 14 -
+ net/bluetooth/mgmt.c | 105 +-
+ net/bluetooth/rfcomm/core.c | 19 +-
+ net/bluetooth/rfcomm/sock.c | 9 +-
+ net/bluetooth/rfcomm/tty.c | 6 +-
+ net/bluetooth/sco.c | 12 +-
+ net/bluetooth/smp.c | 2 +-
+ net/bridge/br_device.c | 4 +-
+ net/bridge/br_input.c | 17 +-
+ net/bridge/br_ioctl.c | 25 +-
+ net/bridge/br_netlink.c | 247 +-
+ net/bridge/br_private.h | 18 +-
+ net/bridge/br_stp.c | 22 +-
+ net/bridge/br_stp_bpdu.c | 7 +
+ net/bridge/br_sysfs_br.c | 22 +-
+ net/bridge/br_sysfs_if.c | 44 +-
+ net/caif/cfctrl.c | 3 +-
+ net/can/gw.c | 6 +
+ net/core/dev.c | 161 +-
+ net/core/ethtool.c | 2 +-
+ net/core/filter.c | 139 ++
+ net/core/flow.c | 4 +-
+ net/core/neighbour.c | 4 +
+ net/core/net-sysfs.c | 17 +-
+ net/core/net_namespace.c | 23 +-
+ net/core/netprio_cgroup.c | 2 +-
+ net/core/pktgen.c | 47 +-
+ net/core/rtnetlink.c | 226 +-
+ net/core/scm.c | 6 +-
+ net/core/skbuff.c | 24 +-
+ net/core/sock.c | 84 +-
+ net/core/sysctl_net_core.c | 5 +
+ net/dcb/dcbnl.c | 3 +
+ net/dccp/minisocks.c | 3 +-
+ net/decnet/dn_dev.c | 6 +
+ net/decnet/dn_fib.c | 6 +
+ net/dsa/Kconfig | 18 +-
+ net/ipv4/af_inet.c | 93 +-
+ net/ipv4/arp.c | 2 +-
+ net/ipv4/devinet.c | 192 +-
+ net/ipv4/fib_frontend.c | 2 +-
+ net/ipv4/fib_semantics.c | 2 +-
+ net/ipv4/inet_connection_sock.c | 25 +-
+ net/ipv4/inet_diag.c | 5 +-
+ net/ipv4/ip_fragment.c | 4 +
+ net/ipv4/ip_gre.c | 32 +-
+ net/ipv4/ip_options.c | 6 +-
+ net/ipv4/ip_sockglue.c | 5 +-
+ net/ipv4/ip_vti.c | 26 +-
+ net/ipv4/ipconfig.c | 6 +-
+ net/ipv4/ipip.c | 271 ++-
+ net/ipv4/ipmr.c | 30 +-
+ net/ipv4/netfilter/arp_tables.c | 8 +-
+ net/ipv4/netfilter/ip_tables.c | 8 +-
+ net/ipv4/netfilter/iptable_nat.c | 4 +-
+ net/ipv4/protocol.c | 21 +
+ net/ipv4/route.c | 4 +
+ net/ipv4/syncookies.c | 2 +-
+ net/ipv4/sysctl_net_ipv4.c | 3 +
+ net/ipv4/tcp.c | 7 +-
+ net/ipv4/tcp_cong.c | 3 +-
+ net/ipv4/tcp_input.c | 45 +-
+ net/ipv4/tcp_ipv4.c | 38 +-
+ net/ipv4/tcp_minisocks.c | 8 +-
+ net/ipv4/tcp_output.c | 5 +
+ net/ipv4/tcp_timer.c | 8 +-
+ net/ipv6/Makefile | 5 +-
+ net/ipv6/addrconf.c | 189 +-
+ net/ipv6/af_inet6.c | 245 +-
+ net/ipv6/ah6.c | 10 +-
+ net/ipv6/anycast.c | 4 +-
+ net/ipv6/datagram.c | 8 +-
+ net/ipv6/exthdrs.c | 70 +-
+ net/ipv6/exthdrs_core.c | 44 +
+ net/ipv6/exthdrs_offload.c | 41 +
+ net/ipv6/fib6_rules.c | 2 +-
+ net/ipv6/icmp.c | 2 +-
+ net/ipv6/ip6_fib.c | 57 +
+ net/ipv6/ip6_flowlabel.c | 3 +-
+ net/ipv6/ip6_gre.c | 29 +-
+ net/ipv6/ip6_offload.c | 282 +++
+ net/ipv6/ip6_offload.h | 18 +
+ net/ipv6/ip6_output.c | 72 +-
+ net/ipv6/ip6_tunnel.c | 288 ++-
+ net/ipv6/ip6mr.c | 14 +-
+ net/ipv6/ipv6_sockglue.c | 9 +-
+ net/ipv6/mcast.c | 4 +-
+ net/ipv6/ndisc.c | 19 +-
+ net/ipv6/netfilter/ip6_tables.c | 14 +-
+ net/ipv6/netfilter/ip6t_rpfilter.c | 2 +-
+ net/ipv6/netfilter/ip6table_nat.c | 4 +-
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 70 +-
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 4 +-
+ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 6 +-
+ net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 2 +-
+ net/ipv6/output_core.c | 76 +
+ net/ipv6/protocol.c | 25 +
+ net/ipv6/raw.c | 6 +-
+ net/ipv6/reassembly.c | 4 +
+ net/ipv6/route.c | 186 +-
+ net/ipv6/sit.c | 459 +++-
+ net/ipv6/syncookies.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 124 +-
+ net/ipv6/tcpv6_offload.c | 95 +
+ net/ipv6/udp.c | 94 -
+ net/ipv6/udp_offload.c | 120 +
+ net/ipv6/xfrm6_policy.c | 21 +-
+ net/ipv6/xfrm6_state.c | 4 +-
+ net/key/af_key.c | 2 +-
+ net/l2tp/l2tp_netlink.c | 2 +-
+ net/llc/af_llc.c | 2 +-
+ net/mac80211/Kconfig | 2 +-
+ net/mac80211/Makefile | 1 +
+ net/mac80211/aes_cmac.c | 18 +
+ net/mac80211/agg-rx.c | 2 +-
+ net/mac80211/agg-tx.c | 12 +-
+ net/mac80211/cfg.c | 464 ++--
+ net/mac80211/chan.c | 411 +++-
+ net/mac80211/debugfs.h | 6 +-
+ net/mac80211/debugfs_key.c | 6 +-
+ net/mac80211/debugfs_netdev.c | 78 +-
+ net/mac80211/debugfs_sta.c | 19 +-
+ net/mac80211/driver-ops.h | 140 +-
+ net/mac80211/ht.c | 4 +-
+ net/mac80211/ibss.c | 157 +-
+ net/mac80211/ieee80211_i.h | 209 +-
+ net/mac80211/iface.c | 96 +-
+ net/mac80211/key.c | 15 +-
+ net/mac80211/key.h | 8 +-
+ net/mac80211/main.c | 145 +-
+ net/mac80211/mesh.c | 82 +-
+ net/mac80211/mesh.h | 18 +-
+ net/mac80211/mesh_plink.c | 61 +-
+ net/mac80211/mesh_sync.c | 101 +-
+ net/mac80211/mlme.c | 406 ++--
+ net/mac80211/offchannel.c | 22 +-
+ net/mac80211/pm.c | 46 +-
+ net/mac80211/rate.c | 5 +-
+ net/mac80211/rate.h | 12 +-
+ net/mac80211/rx.c | 201 +-
+ net/mac80211/scan.c | 38 +-
+ net/mac80211/sta_info.c | 69 +-
+ net/mac80211/sta_info.h | 27 +-
+ net/mac80211/status.c | 160 +-
+ net/mac80211/trace.h | 246 +-
+ net/mac80211/tx.c | 282 ++-
+ net/mac80211/util.c | 305 ++-
+ net/mac80211/vht.c | 35 +
+ net/mac80211/wme.c | 40 +-
+ net/netfilter/ipset/ip_set_core.c | 2 +-
+ net/netfilter/ipvs/Kconfig | 7 +-
+ net/netfilter/ipvs/ip_vs_conn.c | 15 +-
+ net/netfilter/ipvs/ip_vs_core.c | 404 ++--
+ net/netfilter/ipvs/ip_vs_ctl.c | 8 +-
+ net/netfilter/ipvs/ip_vs_dh.c | 2 +-
+ net/netfilter/ipvs/ip_vs_lblc.c | 7 +-
+ net/netfilter/ipvs/ip_vs_lblcr.c | 6 +-
+ net/netfilter/ipvs/ip_vs_nfct.c | 2 +-
+ net/netfilter/ipvs/ip_vs_pe_sip.c | 18 +-
+ net/netfilter/ipvs/ip_vs_proto.c | 6 +-
+ net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 9 +-
+ net/netfilter/ipvs/ip_vs_proto_sctp.c | 42 +-
+ net/netfilter/ipvs/ip_vs_proto_tcp.c | 40 +-
+ net/netfilter/ipvs/ip_vs_proto_udp.c | 41 +-
+ net/netfilter/ipvs/ip_vs_sched.c | 2 +-
+ net/netfilter/ipvs/ip_vs_sh.c | 2 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 81 +-
+ net/netfilter/nf_conntrack_acct.c | 4 +
+ net/netfilter/nf_conntrack_ecache.c | 4 +
+ net/netfilter/nf_conntrack_helper.c | 4 +
+ net/netfilter/nf_conntrack_proto_dccp.c | 8 +-
+ net/netfilter/nf_conntrack_standalone.c | 4 +
+ net/netfilter/nf_conntrack_timestamp.c | 4 +
+ net/netfilter/nfnetlink.c | 2 +-
+ net/netfilter/xt_ipvs.c | 4 +-
+ net/netlink/af_netlink.c | 2 +-
+ net/nfc/Kconfig | 4 +-
+ net/nfc/core.c | 33 +-
+ net/nfc/hci/command.c | 28 +-
+ net/nfc/hci/core.c | 90 +-
+ net/nfc/hci/llc.c | 2 +-
+ net/nfc/hci/llc_shdlc.c | 7 +-
+ net/nfc/llcp/Kconfig | 4 +-
+ net/nfc/llcp/commands.c | 148 +-
+ net/nfc/llcp/llcp.c | 243 +-
+ net/nfc/llcp/llcp.h | 13 +
+ net/nfc/llcp/sock.c | 42 +-
+ net/nfc/nci/Kconfig | 4 +-
+ net/nfc/nci/core.c | 29 +-
+ net/nfc/netlink.c | 157 +-
+ net/nfc/nfc.h | 6 +
+ net/nfc/rawsock.c | 1 -
+ net/packet/af_packet.c | 50 +-
+ net/packet/internal.h | 1 +
+ net/phonet/pn_netlink.c | 6 +
+ net/rds/ib.h | 2 +-
+ net/rds/ib_recv.c | 24 +-
+ net/sched/Kconfig | 2 +-
+ net/sched/act_api.c | 3 +
+ net/sched/cls_api.c | 2 +
+ net/sched/cls_cgroup.c | 24 +
+ net/sched/sch_api.c | 18 +-
+ net/sched/sch_cbq.c | 3 +-
+ net/sched/sch_htb.c | 139 +-
+ net/sched/sch_qfq.c | 830 ++++---
+ net/sctp/Kconfig | 39 +-
+ net/sctp/protocol.c | 9 +
+ net/sctp/sm_make_chunk.c | 19 +
+ net/sctp/sm_sideeffect.c | 54 +-
+ net/sctp/socket.c | 19 +-
+ net/sctp/sysctl.c | 59 +
+ net/sctp/tsnmap.c | 8 +-
+ net/sctp/ulpqueue.c | 3 +-
+ net/socket.c | 8 -
+ net/sysctl_net.c | 15 +-
+ net/tipc/Kconfig | 13 +-
+ net/tipc/bcast.c | 27 +-
+ net/tipc/bearer.c | 110 +-
+ net/tipc/bearer.h | 24 +-
+ net/tipc/core.c | 5 -
+ net/tipc/discover.c | 2 +-
+ net/tipc/link.c | 188 +-
+ net/tipc/link.h | 4 -
+ net/tipc/name_distr.c | 2 +-
+ net/tipc/node.c | 15 +-
+ net/tipc/node.h | 6 +-
+ net/tipc/socket.c | 58 +-
+ net/unix/diag.c | 3 +
+ net/unix/sysctl_net_unix.c | 4 +
+ net/wireless/Kconfig | 5 +-
+ net/wireless/Makefile | 4 +-
+ net/wireless/ap.c | 4 +-
+ net/wireless/chan.c | 278 ++-
+ net/wireless/core.c | 23 +-
+ net/wireless/core.h | 36 +-
+ net/wireless/ethtool.c | 15 +-
+ net/wireless/ibss.c | 36 +-
+ net/wireless/mesh.c | 58 +-
+ net/wireless/mlme.c | 116 +-
+ net/wireless/nl80211.c | 839 ++++---
+ net/wireless/nl80211.h | 8 +-
+ net/wireless/rdev-ops.h | 878 ++++++++
+ net/wireless/scan.c | 181 +-
+ net/wireless/sme.c | 12 +-
+ net/wireless/sysfs.c | 5 +-
+ net/wireless/trace.c | 7 +
+ net/wireless/trace.h | 2324 +++++++++++++++++++
+ net/wireless/util.c | 188 +-
+ net/wireless/wext-compat.c | 74 +-
+ net/wireless/wext-sme.c | 11 +-
+ net/xfrm/xfrm_ipcomp.c | 8 +-
+ net/xfrm/xfrm_replay.c | 13 +-
+ net/xfrm/xfrm_sysctl.c | 4 +
+ net/xfrm/xfrm_user.c | 2 +-
+ 945 files changed, 69170 insertions(+), 26167 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-mdio
+ create mode 100644 Documentation/ABI/testing/sysfs-class-net-grcan
+ create mode 100644 Documentation/devicetree/bindings/net/can/grcan.txt
+ create mode 100644 Documentation/devicetree/bindings/net/cdns-emac.txt
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_emac.h
+ create mode 100644 drivers/net/can/grcan.c
+ create mode 100644 drivers/net/can/usb/kvaser_usb.c
+ delete mode 100644 drivers/net/ethernet/cadence/at91_ether.h
+ create mode 100644 drivers/net/ethernet/freescale/fec_ptp.c
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+ delete mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
+ delete mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
+ create mode 100644 drivers/net/ethernet/ti/cpts.c
+ create mode 100644 drivers/net/ethernet/ti/cpts.h
+ create mode 100644 drivers/net/usb/cdc_mbim.c
+ create mode 100644 drivers/net/wireless/ath/ar5523/Kconfig
+ create mode 100644 drivers/net/wireless/ath/ar5523/Makefile
+ create mode 100644 drivers/net/wireless/ath/ar5523/ar5523.c
+ create mode 100644 drivers/net/wireless/ath/ar5523/ar5523.h
+ create mode 100644 drivers/net/wireless/ath/ar5523/ar5523_hw.h
+ create mode 100644 drivers/net/wireless/ath/ath6kl/recovery.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fweh.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fweh.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/debug.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/debug.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/Makefile
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/btc.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/def.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/fw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/hw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/led.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/led.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/phy.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/phy.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/reg.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/rf.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/rf.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/sw.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/table.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/table.h
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+ create mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/trx.h
+ create mode 100644 drivers/net/wireless/rtlwifi/stats.c
+ create mode 100644 drivers/net/wireless/rtlwifi/stats.h
+ create mode 100644 drivers/nfc/pn544/Makefile
+ create mode 100644 drivers/nfc/pn544/i2c.c
+ rename drivers/nfc/{pn544_hci.c => pn544/pn544.c} (58%)
+ create mode 100644 drivers/nfc/pn544/pn544.h
+ delete mode 100644 include/linux/nfc/pn544.h
+ create mode 100644 include/linux/platform_data/pn544.h
+ delete mode 100644 include/linux/timecompare.h
+ create mode 100644 include/linux/usb/cdc_ncm.h
+ create mode 100644 include/net/bluetooth/amp.h
+ rename include/{ => uapi}/linux/hdlc/ioctl.h (96%)
+ create mode 100644 include/uapi/linux/netconf.h
+ delete mode 100644 kernel/time/timecompare.c
+ create mode 100644 net/batman-adv/distributed-arp-table.c
+ create mode 100644 net/batman-adv/distributed-arp-table.h
+ create mode 100644 net/bluetooth/amp.c
+ create mode 100644 net/ipv6/exthdrs_offload.c
+ create mode 100644 net/ipv6/ip6_offload.c
+ create mode 100644 net/ipv6/ip6_offload.h
+ create mode 100644 net/ipv6/output_core.c
+ create mode 100644 net/ipv6/tcpv6_offload.c
+ create mode 100644 net/ipv6/udp_offload.c
+ create mode 100644 net/mac80211/vht.c
+ create mode 100644 net/wireless/rdev-ops.h
+ create mode 100644 net/wireless/trace.c
+ create mode 100644 net/wireless/trace.h
+Merging wireless-next/master (0751f86 bcma: add more package IDs)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (92a185b Bluetooth: AMP: Mark controller radio powered down after HCIDEVDOWN)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/mgmt.c
+Auto-merging net/bluetooth/hci_core.c
+Merge made by the 'recursive' strategy.
+ include/net/bluetooth/hci_core.h | 15 +++++----
+ net/bluetooth/hci_core.c | 5 +++
+ net/bluetooth/hci_event.c | 56 +++++++++++++++++++++++++++----
+ net/bluetooth/l2cap_core.c | 56 +++++++++++++++----------------
+ net/bluetooth/mgmt.c | 10 +++---
+ net/bluetooth/rfcomm/sock.c | 2 +-
+ net/bluetooth/sco.c | 67 ++++++++++++++++++++++++++++++++++++--
+ 7 files changed, 160 insertions(+), 51 deletions(-)
+Merging mtd/master (35f95d2 Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (0f722de mtd: m25p80: modify info for Micron N25Q128)
+$ git merge l2-mtd/master
+Removing include/linux/platform_data/mtd-nomadik-nand.h
+Removing include/linux/mtd/gpmi-nand.h
+Auto-merging include/linux/bcma/bcma.h
+Auto-merging drivers/mtd/ofpart.c
+Removing drivers/mtd/nand/nomadik_nand.c
+Removing drivers/mtd/maps/fortunet.c
+Auto-merging drivers/bcma/driver_chipcommon_pmu.c
+Removing arch/arm/mach-nomadik/include/mach/fsmc.h
+Auto-merging arch/arm/boot/dts/spear13xx.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/davinci/nand.txt | 8 +
+ .../devicetree/bindings/mtd/denali-nand.txt | 23 ++
+ .../devicetree/bindings/mtd/flctl-nand.txt | 49 +++
+ .../devicetree/bindings/mtd/fsmc-nand.txt | 12 +-
+ Documentation/devicetree/bindings/mtd/m25p80.txt | 29 ++
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 3 +
+ arch/arm/boot/dts/spear13xx.dtsi | 10 +-
+ arch/arm/boot/dts/spear300.dtsi | 8 +-
+ arch/arm/boot/dts/spear310.dtsi | 8 +-
+ arch/arm/boot/dts/spear320.dtsi | 8 +-
+ arch/arm/boot/dts/spear600.dtsi | 8 +-
+ arch/arm/configs/nhk8815_defconfig | 2 +-
+ arch/arm/mach-nomadik/board-nhk8815.c | 73 ++---
+ arch/arm/mach-nomadik/include/mach/fsmc.h | 29 --
+ arch/arm/mach-u300/core.c | 14 +-
+ drivers/bcma/driver_chipcommon_pmu.c | 3 +-
+ drivers/clk/clk-nomadik.c | 1 +
+ drivers/mtd/ar7part.c | 7 +-
+ drivers/mtd/bcm63xxpart.c | 32 +-
+ drivers/mtd/cmdlinepart.c | 91 +++---
+ drivers/mtd/devices/bcm47xxsflash.c | 4 +-
+ drivers/mtd/devices/block2mtd.c | 2 +-
+ drivers/mtd/devices/docprobe.c | 2 -
+ drivers/mtd/devices/m25p80.c | 48 +--
+ drivers/mtd/devices/mtd_dataflash.c | 14 +-
+ drivers/mtd/devices/spear_smi.c | 23 +-
+ drivers/mtd/devices/sst25l.c | 10 +-
+ drivers/mtd/maps/Kconfig | 7 -
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/amd76xrom.c | 7 +-
+ drivers/mtd/maps/autcpu12-nvram.c | 6 +-
+ drivers/mtd/maps/bfin-async-flash.c | 9 +-
+ drivers/mtd/maps/ck804xrom.c | 6 +-
+ drivers/mtd/maps/esb2rom.c | 6 +-
+ drivers/mtd/maps/fortunet.c | 277 -----------------
+ drivers/mtd/maps/gpio-addr-flash.c | 12 +-
+ drivers/mtd/maps/ichxrom.c | 8 +-
+ drivers/mtd/maps/intel_vr_nor.c | 18 +-
+ drivers/mtd/maps/lantiq-flash.c | 8 +-
+ drivers/mtd/maps/latch-addr-flash.c | 4 +-
+ drivers/mtd/maps/pci.c | 6 +-
+ drivers/mtd/maps/physmap_of.c | 13 +-
+ drivers/mtd/maps/pismo.c | 18 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 6 +-
+ drivers/mtd/maps/sa1100-flash.c | 6 +-
+ drivers/mtd/maps/scb2_flash.c | 8 +-
+ drivers/mtd/maps/sun_uflash.c | 6 +-
+ drivers/mtd/maps/vmu-flash.c | 10 +-
+ drivers/mtd/mtd_blkdevs.c | 51 ++--
+ drivers/mtd/mtdoops.c | 15 +-
+ drivers/mtd/nand/Kconfig | 35 ++-
+ drivers/mtd/nand/Makefile | 4 +-
+ drivers/mtd/nand/ams-delta.c | 6 +-
+ drivers/mtd/nand/atmel_nand.c | 12 +-
+ drivers/mtd/nand/au1550nd.c | 8 +-
+ drivers/mtd/nand/bcm47xxnflash/Makefile | 4 +
+ drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 22 ++
+ drivers/mtd/nand/bcm47xxnflash/main.c | 108 +++++++
+ drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 316 ++++++++++++++++++++
+ drivers/mtd/nand/bf5xx_nand.c | 8 +-
+ drivers/mtd/nand/cafe_nand.c | 12 +-
+ drivers/mtd/nand/cs553x_nand.c | 3 +-
+ drivers/mtd/nand/davinci_nand.c | 13 +-
+ drivers/mtd/nand/denali.c | 162 ++--------
+ drivers/mtd/nand/denali.h | 5 +
+ drivers/mtd/nand/denali_dt.c | 167 +++++++++++
+ drivers/mtd/nand/denali_pci.c | 144 +++++++++
+ drivers/mtd/nand/diskonchip.c | 2 -
+ drivers/mtd/nand/fsl_elbc_nand.c | 17 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 6 +-
+ drivers/mtd/nand/fsl_upm.c | 8 +-
+ drivers/mtd/nand/fsmc_nand.c | 106 +++----
+ drivers/mtd/nand/gpio.c | 26 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 1 -
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 41 +--
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 1 -
+ drivers/mtd/nand/jz4740_nand.c | 14 +-
+ drivers/mtd/nand/lpc32xx_mlc.c | 6 +-
+ drivers/mtd/nand/lpc32xx_slc.c | 6 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 8 +-
+ drivers/mtd/nand/mxc_nand.c | 6 +-
+ drivers/mtd/nand/nand_base.c | 18 +-
+ drivers/mtd/nand/ndfc.c | 6 +-
+ drivers/mtd/nand/nomadik_nand.c | 235 ---------------
+ drivers/mtd/nand/nuc900_nand.c | 6 +-
+ drivers/mtd/nand/omap2.c | 2 +-
+ drivers/mtd/nand/orion_nand.c | 4 +-
+ drivers/mtd/nand/pasemi_nand.c | 4 +-
+ drivers/mtd/nand/plat_nand.c | 6 +-
+ drivers/mtd/nand/s3c2410.c | 7 +-
+ drivers/mtd/nand/sh_flctl.c | 306 +++++++++++++++++--
+ drivers/mtd/nand/sharpsl.c | 6 +-
+ drivers/mtd/nand/socrates_nand.c | 6 +-
+ drivers/mtd/ofpart.c | 5 +-
+ drivers/mtd/onenand/generic.c | 6 +-
+ drivers/mtd/onenand/omap2.c | 6 +-
+ drivers/mtd/onenand/samsung.c | 4 +-
+ drivers/mtd/tests/mtd_nandbiterrs.c | 73 ++---
+ drivers/mtd/tests/mtd_nandecctest.c | 6 +-
+ drivers/mtd/tests/mtd_oobtest.c | 171 ++++++-----
+ drivers/mtd/tests/mtd_pagetest.c | 152 +++++-----
+ drivers/mtd/tests/mtd_readtest.c | 42 +--
+ drivers/mtd/tests/mtd_speedtest.c | 88 +++---
+ drivers/mtd/tests/mtd_stresstest.c | 44 +--
+ drivers/mtd/tests/mtd_subpagetest.c | 124 ++++----
+ drivers/mtd/tests/mtd_torturetest.c | 73 ++---
+ fs/jffs2/nodemgmt.c | 6 +-
+ include/linux/bcma/bcma.h | 1 +
+ include/linux/mtd/blktrans.h | 4 +-
+ include/linux/mtd/doc2000.h | 22 +-
+ include/linux/mtd/fsmc.h | 3 -
+ include/linux/mtd/gpmi-nand.h | 68 -----
+ include/linux/mtd/map.h | 4 +-
+ include/linux/mtd/mtd.h | 2 +-
+ include/linux/mtd/nand.h | 4 +-
+ include/linux/mtd/sh_flctl.h | 14 +-
+ include/linux/platform_data/mtd-nomadik-nand.h | 16 -
+ 117 files changed, 2141 insertions(+), 1709 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/flctl-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
+ delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
+ delete mode 100644 drivers/mtd/maps/fortunet.c
+ create mode 100644 drivers/mtd/nand/bcm47xxnflash/Makefile
+ create mode 100644 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+ create mode 100644 drivers/mtd/nand/bcm47xxnflash/main.c
+ create mode 100644 drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+ create mode 100644 drivers/mtd/nand/denali_dt.c
+ create mode 100644 drivers/mtd/nand/denali_pci.c
+ delete mode 100644 drivers/mtd/nand/nomadik_nand.c
+ delete mode 100644 include/linux/mtd/gpmi-nand.h
+ delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
+Merging crypto/master (a465348 crypto: s5p-sss - Fix compilation error)
+$ git merge crypto/master
+Auto-merging arch/x86/crypto/crc32c-intel_glue.c
+Merge made by the 'recursive' strategy.
+ arch/x86/crypto/Makefile | 5 +
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 1102 ++++
+ arch/x86/crypto/camellia_aesni_avx_glue.c | 558 ++
+ arch/x86/crypto/camellia_glue.c | 92 +-
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 332 +-
+ arch/x86/crypto/cast5_avx_glue.c | 79 +-
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 190 +-
+ arch/x86/crypto/cast6_avx_glue.c | 77 +-
+ .../crypto/{crc32c-intel.c => crc32c-intel_glue.c} | 81 +
+ arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 460 ++
+ arch/x86/crypto/glue_helper-asm-avx.S | 91 +
+ arch/x86/crypto/glue_helper.c | 12 +-
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 166 +-
+ arch/x86/crypto/serpent_avx_glue.c | 49 +-
+ arch/x86/crypto/serpent_sse2_glue.c | 12 +-
+ arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 208 +-
+ arch/x86/crypto/twofish_avx_glue.c | 73 +-
+ arch/x86/crypto/twofish_glue_3way.c | 20 +-
+ arch/x86/include/asm/crypto/camellia.h | 82 +
+ arch/x86/include/asm/crypto/glue_helper.h | 28 +-
+ arch/x86/include/asm/crypto/serpent-avx.h | 27 +-
+ arch/x86/include/asm/crypto/twofish.h | 4 +-
+ crypto/Kconfig | 32 +
+ crypto/tcrypt.c | 29 +
+ crypto/testmgr.c | 92 +
+ crypto/testmgr.h | 5641 +++++++++++++++++++-
+ crypto/vmac.c | 47 +-
+ drivers/crypto/Kconfig | 1 +
+ drivers/crypto/picoxcell_crypto.c | 1 +
+ drivers/crypto/s5p-sss.c | 2 +-
+ drivers/crypto/talitos.c | 3 +-
+ drivers/crypto/tegra-aes.c | 10 +-
+ include/crypto/vmac.h | 2 +
+ 33 files changed, 8833 insertions(+), 775 deletions(-)
+ create mode 100644 arch/x86/crypto/camellia-aesni-avx-asm_64.S
+ create mode 100644 arch/x86/crypto/camellia_aesni_avx_glue.c
+ rename arch/x86/crypto/{crc32c-intel.c => crc32c-intel_glue.c} (69%)
+ create mode 100644 arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+ create mode 100644 arch/x86/crypto/glue_helper-asm-avx.S
+ create mode 100644 arch/x86/include/asm/crypto/camellia.h
+Merging drm/drm-next (7136470 Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
+$ git merge drm/drm-next
+Recorded preimage for 'drivers/gpu/drm/nouveau/core/engine/disp/nv50.c'
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
+Removing drivers/gpu/drm/nouveau/nvd0_display.c
+Removing drivers/gpu/drm/nouveau/nv50_sor.c
+Removing drivers/gpu/drm/nouveau/nv50_evo.h
+Removing drivers/gpu/drm/nouveau/nv50_evo.c
+Removing drivers/gpu/drm/nouveau/nv50_dac.c
+Removing drivers/gpu/drm/nouveau/nv50_cursor.c
+Removing drivers/gpu/drm/nouveau/nv50_crtc.c
+Removing drivers/gpu/drm/nouveau/nouveau_hdmi.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_abi16.c
+Auto-merging drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
+Auto-merging drivers/gpu/drm/nouveau/core/include/core/object.h
+Auto-merging drivers/gpu/drm/nouveau/core/engine/graph/nv40.c
+Auto-merging drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_crt.c
+Auto-merging drivers/gpu/drm/drm_dp_helper.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/nouveau/core/engine/disp/nv50.c'.
+[master 205df76] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 39 +-
+ .../bindings/gpu/nvidia,tegra20-host1x.txt | 191 ++
+ Documentation/kref.txt | 88 +
+ MAINTAINERS | 9 +
+ drivers/char/agp/intel-agp.h | 91 -
+ drivers/char/agp/intel-gtt.c | 320 +--
+ drivers/gpu/drm/Kconfig | 2 +
+ drivers/gpu/drm/Makefile | 6 +-
+ drivers/gpu/drm/ast/ast_ttm.c | 2 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.c | 13 +-
+ drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 +-
+ drivers/gpu/drm/drm_crtc.c | 32 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 161 +-
+ .../drm/{drm_dp_i2c_helper.c => drm_dp_helper.c} | 146 +-
+ drivers/gpu/drm/drm_edid.c | 29 +-
+ drivers/gpu/drm/drm_fb_helper.c | 74 +-
+ drivers/gpu/drm/drm_hashtab.c | 38 +-
+ drivers/gpu/drm/drm_ioctl.c | 3 +
+ drivers/gpu/drm/drm_irq.c | 117 +-
+ drivers/gpu/drm/drm_modes.c | 8 +-
+ drivers/gpu/drm/drm_pci.c | 2 +-
+ drivers/gpu/drm/drm_stub.c | 37 +-
+ drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail.h | 6 +
+ drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +
+ drivers/gpu/drm/gma500/oaktrail_device.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 365 ++-
+ drivers/gpu/drm/i915/i915_debugfs.c | 52 +-
+ drivers/gpu/drm/i915/i915_dma.c | 86 +-
+ drivers/gpu/drm/i915/i915_drv.c | 131 +-
+ drivers/gpu/drm/i915/i915_drv.h | 454 ++--
+ drivers/gpu/drm/i915/i915_gem.c | 196 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 416 +++-
+ drivers/gpu/drm/i915/i915_irq.c | 80 +-
+ drivers/gpu/drm/i915/i915_reg.h | 297 ++-
+ drivers/gpu/drm/i915/i915_suspend.c | 763 +++---
+ drivers/gpu/drm/i915/i915_sysfs.c | 43 +-
+ drivers/gpu/drm/i915/i915_trace.h | 10 +-
+ drivers/gpu/drm/i915/intel_bios.c | 3 +-
+ drivers/gpu/drm/i915/intel_crt.c | 49 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 1074 ++++++--
+ drivers/gpu/drm/i915/intel_display.c | 1660 +++++++++----
+ drivers/gpu/drm/i915/intel_dp.c | 961 +++++---
+ drivers/gpu/drm/i915/intel_drv.h | 117 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 133 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 9 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 225 +-
+ drivers/gpu/drm/i915/intel_modes.c | 11 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 2 +
+ drivers/gpu/drm/i915/intel_panel.c | 77 +-
+ drivers/gpu/drm/i915/intel_pm.c | 489 ++--
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 126 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 6 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 97 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 101 +-
+ drivers/gpu/drm/i915/intel_tv.c | 21 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 4 +-
+ drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 +-
+ drivers/gpu/drm/nouveau/Makefile | 38 +-
+ drivers/gpu/drm/nouveau/core/core/engctx.c | 15 +
+ drivers/gpu/drm/nouveau/core/core/falcon.c | 247 ++
+ drivers/gpu/drm/nouveau/core/core/gpuobj.c | 4 +-
+ drivers/gpu/drm/nouveau/core/core/mm.c | 17 +-
+ drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c | 108 +-
+ drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c | 110 +
+ drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c | 110 +
+ drivers/gpu/drm/nouveau/core/engine/copy/nva3.c | 124 +-
+ drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c | 167 +-
+ drivers/gpu/drm/nouveau/core/engine/copy/nve0.c | 54 +-
+ drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c | 46 +-
+ drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c | 83 +-
+ drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 88 +
+ drivers/gpu/drm/nouveau/core/engine/disp/hdanva3.c | 48 +
+ drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c | 53 +
+ .../gpu/drm/nouveau/core/engine/disp/hdminv84.c | 66 +
+ .../gpu/drm/nouveau/core/engine/disp/hdminva3.c | 66 +
+ .../gpu/drm/nouveau/core/engine/disp/hdminvd0.c | 62 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 1143 ++++++++-
+ drivers/gpu/drm/nouveau/core/engine/disp/nv50.h | 142 ++
+ drivers/gpu/drm/nouveau/core/engine/disp/nv84.c | 98 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nv94.c | 109 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nva0.c | 88 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nva3.c | 111 +
+ drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 884 ++++++-
+ drivers/gpu/drm/nouveau/core/engine/disp/nve0.c | 94 +
+ drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c | 112 +
+ drivers/gpu/drm/nouveau/core/engine/disp/sornv94.c | 190 ++
+ drivers/gpu/drm/nouveau/core/engine/disp/sornvd0.c | 126 +
+ drivers/gpu/drm/nouveau/core/engine/dmaobj/base.c | 71 +-
+ drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c | 68 +-
+ drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c | 126 +-
+ drivers/gpu/drm/nouveau/core/engine/dmaobj/nvc0.c | 104 +-
+ drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c | 122 +
+ drivers/gpu/drm/nouveau/core/engine/fifo/base.c | 19 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c | 17 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c | 6 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c | 8 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c | 8 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 36 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c | 60 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 26 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 21 +-
+ drivers/gpu/drm/nouveau/core/engine/graph/nv04.c | 184 +-
+ drivers/gpu/drm/nouveau/core/engine/graph/nv10.c | 10 +-
+ drivers/gpu/drm/nouveau/core/engine/graph/nv20.c | 6 +-
+ drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 38 +-
+ drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 83 +-
+ drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 2 +-
+ drivers/gpu/drm/nouveau/core/engine/graph/regs.h | 5 +
+ drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c | 6 +-
+ drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c | 1 -
+ drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c | 107 +-
+ drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c | 110 +
+ .../gpu/drm/nouveau/core/engine/software/nv04.c | 4 +-
+ .../gpu/drm/nouveau/core/engine/software/nv10.c | 2 +-
+ .../gpu/drm/nouveau/core/engine/software/nv50.c | 10 +-
+ .../gpu/drm/nouveau/core/engine/software/nvc0.c | 10 +-
+ drivers/gpu/drm/nouveau/core/engine/vp/nv84.c | 108 +-
+ drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c | 110 +
+ drivers/gpu/drm/nouveau/core/engine/vp/nve0.c | 110 +
+ drivers/gpu/drm/nouveau/core/include/core/class.h | 225 ++
+ drivers/gpu/drm/nouveau/core/include/core/engctx.h | 3 +
+ drivers/gpu/drm/nouveau/core/include/core/falcon.h | 81 +
+ drivers/gpu/drm/nouveau/core/include/core/gpuobj.h | 4 +-
+ drivers/gpu/drm/nouveau/core/include/core/mm.h | 6 +
+ drivers/gpu/drm/nouveau/core/include/core/object.h | 41 +-
+ drivers/gpu/drm/nouveau/core/include/core/parent.h | 2 +-
+ drivers/gpu/drm/nouveau/core/include/engine/bsp.h | 41 +-
+ drivers/gpu/drm/nouveau/core/include/engine/copy.h | 39 +-
+ .../gpu/drm/nouveau/core/include/engine/crypt.h | 39 -
+ drivers/gpu/drm/nouveau/core/include/engine/disp.h | 5 +
+ .../gpu/drm/nouveau/core/include/engine/dmaobj.h | 29 +-
+ drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 6 +-
+ drivers/gpu/drm/nouveau/core/include/engine/ppp.h | 40 +-
+ drivers/gpu/drm/nouveau/core/include/engine/vp.h | 41 +-
+ .../gpu/drm/nouveau/core/include/subdev/bios/dcb.h | 34 +-
+ .../drm/nouveau/core/include/subdev/bios/disp.h | 48 +
+ .../gpu/drm/nouveau/core/include/subdev/bios/dp.h | 32 +-
+ drivers/gpu/drm/nouveau/core/include/subdev/fb.h | 43 +-
+ drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 4 +-
+ drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 32 +-
+ drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 63 +
+ drivers/gpu/drm/nouveau/core/subdev/bios/disp.c | 178 ++
+ drivers/gpu/drm/nouveau/core/subdev/bios/dp.c | 182 +-
+ drivers/gpu/drm/nouveau/core/subdev/bios/gpio.c | 4 +-
+ drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 13 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/base.c | 28 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/nv10.c | 4 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/nv20.c | 6 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/nv30.c | 6 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/nv40.c | 28 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/nv50.c | 26 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/nvc0.c | 64 +-
+ drivers/gpu/drm/nouveau/core/subdev/device/nve0.c | 17 +-
+ drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c | 34 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/base.c | 92 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv04.c | 62 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c | 52 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c | 89 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c | 86 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv25.c | 81 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c | 51 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c | 82 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c | 82 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c | 131 +-
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv41.c | 106 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv44.c | 114 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c | 79 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv47.c | 66 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv49.c | 84 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv4e.c | 72 +
+ drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 393 +--
+ drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 126 +-
+ drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c | 2 +-
+ drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c | 8 +-
+ drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c | 4 +-
+ drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | 4 +-
+ drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 8 +-
+ drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c | 1 +
+ drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c | 1 +
+ drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 27 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 30 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.h | 4 +
+ drivers/gpu/drm/nouveau/nouveau_bios.c | 235 +-
+ drivers/gpu/drm/nouveau/nouveau_bios.h | 9 -
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 3 -
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 16 +
+ drivers/gpu/drm/nouveau/nouveau_crtc.h | 10 -
+ drivers/gpu/drm/nouveau/nouveau_display.c | 25 +-
+ drivers/gpu/drm/nouveau/nouveau_dp.c | 141 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 98 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.h | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 7 +-
+ drivers/gpu/drm/nouveau/nouveau_hdmi.c | 261 --
+ drivers/gpu/drm/nouveau/nouveau_irq.c | 12 -
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 4 -
+ drivers/gpu/drm/nouveau/nouveau_vga.c | 5 +-
+ drivers/gpu/drm/nouveau/nv04_crtc.c | 6 +-
+ drivers/gpu/drm/nouveau/nv04_display.c | 5 -
+ drivers/gpu/drm/nouveau/nv10_fence.c | 7 +-
+ drivers/gpu/drm/nouveau/nv50_crtc.c | 764 ------
+ drivers/gpu/drm/nouveau/nv50_cursor.c | 136 --
+ drivers/gpu/drm/nouveau/nv50_dac.c | 321 ---
+ drivers/gpu/drm/nouveau/nv50_display.c | 2579 ++++++++++++++------
+ drivers/gpu/drm/nouveau/nv50_display.h | 71 +-
+ drivers/gpu/drm/nouveau/nv50_evo.c | 403 ---
+ drivers/gpu/drm/nouveau/nv50_evo.h | 120 -
+ drivers/gpu/drm/nouveau/nv50_fence.c | 5 +-
+ drivers/gpu/drm/nouveau/nv50_pm.c | 2 +-
+ drivers/gpu/drm/nouveau/nv50_sor.c | 530 ----
+ drivers/gpu/drm/nouveau/nvc0_fence.c | 28 +-
+ drivers/gpu/drm/nouveau/nvd0_display.c | 2141 ----------------
+ drivers/gpu/drm/radeon/atombios_dp.c | 149 +-
+ drivers/gpu/drm/radeon/r600.c | 8 +-
+ drivers/gpu/drm/radeon/r600_cp.c | 7 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 13 +-
+ drivers/gpu/drm/radeon/radeon_gart.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 9 +-
+ drivers/gpu/drm/tegra/Kconfig | 23 +
+ drivers/gpu/drm/tegra/Makefile | 7 +
+ drivers/gpu/drm/tegra/dc.c | 834 +++++++
+ drivers/gpu/drm/tegra/dc.h | 388 +++
+ drivers/gpu/drm/tegra/drm.c | 115 +
+ drivers/gpu/drm/tegra/drm.h | 234 ++
+ drivers/gpu/drm/tegra/fb.c | 56 +
+ drivers/gpu/drm/tegra/hdmi.c | 1334 ++++++++++
+ drivers/gpu/drm/tegra/hdmi.h | 575 +++++
+ drivers/gpu/drm/tegra/host1x.c | 325 +++
+ drivers/gpu/drm/tegra/output.c | 272 +++
+ drivers/gpu/drm/tegra/rgb.c | 228 ++
+ drivers/gpu/drm/ttm/ttm_bo.c | 55 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 2 -
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 1 -
+ drivers/gpu/drm/ttm/ttm_object.c | 51 +-
+ drivers/gpu/drm/udl/udl_connector.c | 12 +-
+ drivers/gpu/drm/vmwgfx/Makefile | 3 +-
+ drivers/gpu/drm/vmwgfx/svga3d_surfacedefs.h | 909 +++++++
+ drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 23 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 274 +++
+ drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 9 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 92 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 153 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 913 +++++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 7 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 21 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2111 ++++++----------
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 84 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 893 +++++++
+ drivers/gpu/vga/vga_switcheroo.c | 6 -
+ include/drm/drmP.h | 3 +
+ include/drm/drm_crtc.h | 10 +-
+ include/drm/drm_crtc_helper.h | 3 +
+ include/drm/drm_dp_helper.h | 39 +
+ include/drm/drm_hashtab.h | 14 +
+ include/drm/intel-gtt.h | 7 +-
+ include/drm/ttm/ttm_bo_api.h | 30 +-
+ include/drm/ttm/ttm_bo_driver.h | 26 +-
+ include/drm/ttm/ttm_execbuf_util.h | 3 -
+ include/drm/ttm/ttm_memory.h | 2 -
+ include/drm/ttm/ttm_object.h | 4 +
+ include/linux/kref.h | 21 +
+ include/uapi/drm/drm.h | 1 +
+ include/uapi/drm/i915_drm.h | 6 +
+ 275 files changed, 24222 insertions(+), 13248 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+ rename drivers/gpu/drm/{drm_dp_i2c_helper.c => drm_dp_helper.c} (58%)
+ create mode 100644 drivers/gpu/drm/nouveau/core/core/falcon.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/hdanva3.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/hdminv84.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/hdminvd0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nv50.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nv84.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nv94.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nva0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nva3.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nve0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/sornv94.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/sornvd0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/engine/vp/nve0.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/include/core/falcon.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/disp.h
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/disp.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv25.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv41.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv44.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv47.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv49.c
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv4e.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nouveau_hdmi.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nv50_crtc.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nv50_cursor.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nv50_dac.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nv50_evo.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nv50_evo.h
+ delete mode 100644 drivers/gpu/drm/nouveau/nv50_sor.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nvd0_display.c
+ create mode 100644 drivers/gpu/drm/tegra/Kconfig
+ create mode 100644 drivers/gpu/drm/tegra/Makefile
+ create mode 100644 drivers/gpu/drm/tegra/dc.c
+ create mode 100644 drivers/gpu/drm/tegra/dc.h
+ create mode 100644 drivers/gpu/drm/tegra/drm.c
+ create mode 100644 drivers/gpu/drm/tegra/drm.h
+ create mode 100644 drivers/gpu/drm/tegra/fb.c
+ create mode 100644 drivers/gpu/drm/tegra/hdmi.c
+ create mode 100644 drivers/gpu/drm/tegra/hdmi.h
+ create mode 100644 drivers/gpu/drm/tegra/host1x.c
+ create mode 100644 drivers/gpu/drm/tegra/output.c
+ create mode 100644 drivers/gpu/drm/tegra/rgb.c
+ create mode 100644 drivers/gpu/drm/vmwgfx/svga3d_surfacedefs.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+Merging sound/for-next (9b4ef97 ALSA: usb - Don't create "Speaker" mixer controls on headphones and headsets)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/hda_codec.c
+Merge made by the 'recursive' strategy.
+ Documentation/sound/alsa/ALSA-Configuration.txt | 3 -
+ include/sound/Kbuild | 10 -
+ include/sound/asequencer.h | 594 +-------------
+ include/sound/asound.h | 935 +---------------------
+ include/sound/emu10k1.h | 359 +--------
+ include/sound/pcm.h | 3 +
+ include/sound/sb16_csp.h | 104 +--
+ include/sound/vx_core.h | 6 -
+ include/uapi/sound/Kbuild | 10 +
+ include/uapi/sound/asequencer.h | 614 ++++++++++++++
+ include/uapi/sound/asound.h | 971 +++++++++++++++++++++++
+ include/{ => uapi}/sound/asound_fm.h | 0
+ include/{ => uapi}/sound/compress_offload.h | 0
+ include/{ => uapi}/sound/compress_params.h | 0
+ include/uapi/sound/emu10k1.h | 373 +++++++++
+ include/{ => uapi}/sound/hdsp.h | 0
+ include/{ => uapi}/sound/hdspm.h | 0
+ include/uapi/sound/sb16_csp.h | 122 +++
+ include/{ => uapi}/sound/sfnt_info.h | 0
+ sound/core/oss/pcm_plugin.c | 6 +-
+ sound/core/pcm.c | 3 +-
+ sound/core/pcm_compat.c | 20 +-
+ sound/core/pcm_lib.c | 57 +-
+ sound/core/pcm_native.c | 4 +-
+ sound/drivers/Kconfig | 2 +-
+ sound/drivers/aloop.c | 36 +-
+ sound/drivers/dummy.c | 73 +-
+ sound/drivers/vx/vx_hwdep.c | 139 ----
+ sound/firewire/Kconfig | 13 +
+ sound/firewire/Makefile | 2 +
+ sound/firewire/scs1x.c | 527 ++++++++++++
+ sound/isa/Kconfig | 4 +-
+ sound/oss/sb_audio.c | 3 +-
+ sound/pci/Kconfig | 5 +-
+ sound/pci/asihpi/hpidspcd.c | 22 +-
+ sound/pci/asihpi/hpioctl.c | 17 +-
+ sound/pci/au88x0/au88x0_core.c | 7 +-
+ sound/pci/emu10k1/emu10k1.c | 4 +
+ sound/pci/emu10k1/emu10k1_main.c | 92 +--
+ sound/pci/hda/Kconfig | 5 +-
+ sound/pci/hda/Makefile | 1 +
+ sound/pci/hda/hda_codec.c | 176 ++--
+ sound/pci/hda/hda_codec.h | 6 +
+ sound/pci/hda/hda_intel.c | 130 ++-
+ sound/pci/hda/hda_intel_trace.h | 62 ++
+ sound/pci/hda/hda_jack.c | 93 ++-
+ sound/pci/hda/hda_jack.h | 6 +
+ sound/pci/hda/hda_local.h | 8 +-
+ sound/pci/hda/patch_analog.c | 73 +-
+ sound/pci/hda/patch_cirrus.c | 47 +-
+ sound/pci/hda/patch_conexant.c | 77 +-
+ sound/pci/hda/patch_hdmi.c | 22 +-
+ sound/pci/hda/patch_realtek.c | 45 +-
+ sound/pci/hda/patch_sigmatel.c | 150 ++--
+ sound/pci/hda/patch_via.c | 14 +-
+ sound/pci/ice1712/Makefile | 2 +-
+ sound/pci/ice1712/amp.c | 1 -
+ sound/pci/ice1712/aureon.c | 4 +-
+ sound/pci/ice1712/delta.c | 1 -
+ sound/pci/ice1712/ews.c | 5 +-
+ sound/pci/ice1712/hoontech.c | 1 -
+ sound/pci/ice1712/ice1712.c | 9 +-
+ sound/pci/ice1712/ice1712.h | 12 +-
+ sound/pci/ice1712/ice1724.c | 23 +-
+ sound/pci/ice1712/juli.c | 4 +-
+ sound/pci/ice1712/maya44.c | 5 +-
+ sound/pci/ice1712/phase.c | 3 +-
+ sound/pci/ice1712/pontis.c | 1 -
+ sound/pci/ice1712/prodigy192.c | 5 +-
+ sound/pci/ice1712/prodigy_hifi.c | 1 -
+ sound/pci/ice1712/psc724.c | 464 +++++++++++
+ sound/pci/ice1712/psc724.h | 13 +
+ sound/pci/ice1712/quartet.c | 10 +-
+ sound/pci/ice1712/revo.c | 1 -
+ sound/pci/ice1712/se.c | 11 +-
+ sound/pci/ice1712/vt1720_mobo.c | 1 -
+ sound/pci/ice1712/wm8766.c | 361 +++++++++
+ sound/pci/ice1712/wm8766.h | 163 ++++
+ sound/pci/ice1712/wm8776.c | 633 +++++++++++++++
+ sound/pci/ice1712/wm8776.h | 226 ++++++
+ sound/pci/ice1712/wtm.c | 1 -
+ sound/pci/mixart/mixart_hwdep.c | 76 --
+ sound/pci/oxygen/virtuoso.c | 1 +
+ sound/pci/oxygen/xonar_wm87x6.c | 6 +-
+ sound/pci/pcxhr/pcxhr_hwdep.c | 86 --
+ sound/pci/rme9652/hdsp.c | 63 +-
+ sound/pci/ymfpci/ymfpci_main.c | 6 +-
+ sound/usb/6fire/comm.c | 3 +-
+ sound/usb/Kconfig | 2 +-
+ sound/usb/card.c | 7 -
+ sound/usb/card.h | 2 +
+ sound/usb/endpoint.c | 53 +-
+ sound/usb/endpoint.h | 5 +-
+ sound/usb/format.c | 10 +-
+ sound/usb/mixer.c | 74 +-
+ sound/usb/mixer.h | 1 +
+ sound/usb/mixer_quirks.c | 216 ++++-
+ sound/usb/pcm.c | 69 +-
+ sound/usb/quirks-table.h | 198 +++++
+ sound/usb/stream.c | 230 +++++-
+ sound/usb/usbaudio.h | 1 -
+ 101 files changed, 6302 insertions(+), 2823 deletions(-)
+ create mode 100644 include/uapi/sound/asequencer.h
+ create mode 100644 include/uapi/sound/asound.h
+ rename include/{ => uapi}/sound/asound_fm.h (100%)
+ rename include/{ => uapi}/sound/compress_offload.h (100%)
+ rename include/{ => uapi}/sound/compress_params.h (100%)
+ create mode 100644 include/uapi/sound/emu10k1.h
+ rename include/{ => uapi}/sound/hdsp.h (100%)
+ rename include/{ => uapi}/sound/hdspm.h (100%)
+ create mode 100644 include/uapi/sound/sb16_csp.h
+ rename include/{ => uapi}/sound/sfnt_info.h (100%)
+ create mode 100644 sound/firewire/scs1x.c
+ create mode 100644 sound/pci/hda/hda_intel_trace.h
+ create mode 100644 sound/pci/ice1712/psc724.c
+ create mode 100644 sound/pci/ice1712/psc724.h
+ create mode 100644 sound/pci/ice1712/wm8766.c
+ create mode 100644 sound/pci/ice1712/wm8766.h
+ create mode 100644 sound/pci/ice1712/wm8776.c
+ create mode 100644 sound/pci/ice1712/wm8776.h
+Merging sound-asoc/for-next (536bc8f Merge branches 'fix/fsl', 'topic/ab8500', 'topic/adsp', 'topic/ak4104', 'topic/ak4535', 'topic/ak4642', 'topic/atmel', 'topic/cs4271', 'topic/da7210', 'topic/da9055', 'topic/davinci', 'topic/dmaengine', 'topic/fsi', 'topic/fsl', 'topic/hotplug', 'topic/jack', 'topic/jz4740', 'topic/kirkwood', 'topic/lm49453', 'topic/log', 'topic/max98090', 'topic/rt5631', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/ux500', 'topic/wm0010', 'topic/wm2000', 'topic/wm2200', 'topic/wm8350', 'topic/wm8400', 'topic/wm8510', 'topic/wm8741', 'topic/wm8750', 'topic/wm8753', 'topic/wm8770', 'topic/wm8804', 'topic/wm8962', 'topic/wm8971', 'topic/wm8978', 'topic/wm8985', 'topic/wm8988', 'topic/wm8993', 'topic/wm8994' and 'topic/wm8995' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging drivers/mfd/arizona-core.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/misc/atmel-ssc.txt | 15 +
+ Documentation/devicetree/bindings/sound/ak4104.txt | 22 +
+ .../sound/atmel-at91sam9g20ek-wm8731-audio.txt | 26 +
+ Documentation/devicetree/bindings/sound/cs4271.txt | 2 +
+ .../devicetree/bindings/sound/omap-abe-twl6040.txt | 4 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 8 +
+ arch/arm/boot/dts/at91sam9263.dtsi | 16 +
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 32 +-
+ arch/arm/boot/dts/at91sam9g45.dtsi | 16 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 8 +
+ arch/arm/mach-at91/at91rm9200.c | 9 +-
+ arch/arm/mach-at91/at91rm9200_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9260.c | 3 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9261.c | 9 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9263.c | 6 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 4 +-
+ arch/arm/mach-at91/at91sam9g45.c | 6 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 4 +-
+ arch/arm/mach-at91/at91sam9rl.c | 6 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 4 +-
+ arch/arm/mach-at91/at91sam9x5.c | 1 +
+ arch/arm/mach-at91/board-sam9g20ek.c | 11 +
+ arch/arm/mach-davinci/board-da850-evm.c | 24 +-
+ drivers/base/regmap/internal.h | 2 +
+ drivers/base/regmap/regmap-debugfs.c | 50 +-
+ drivers/base/regmap/regmap.c | 154 +++--
+ drivers/input/misc/Kconfig | 10 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/arizona-haptics.c | 255 ++++++++
+ drivers/mfd/arizona-core.c | 2 +
+ drivers/mfd/wm8994-core.c | 35 +-
+ drivers/misc/atmel-ssc.c | 135 ++--
+ include/linux/atmel-ssc.h | 6 +
+ include/linux/mfd/arizona/core.h | 4 +
+ include/linux/mfd/arizona/pdata.h | 6 +
+ include/linux/mfd/wm8994/core.h | 4 +
+ include/linux/mfd/wm8994/pdata.h | 5 +
+ include/linux/platform_data/asoc-s3c.h | 6 -
+ include/linux/platform_data/davinci_asp.h | 3 +
+ include/linux/regmap.h | 6 +-
+ include/sound/cs4271.h | 1 +
+ include/sound/sh_fsi.h | 6 +
+ include/sound/tlv320aic32x4.h | 1 +
+ sound/soc/atmel/Kconfig | 3 +-
+ sound/soc/atmel/atmel-pcm.c | 23 +-
+ sound/soc/atmel/atmel-pcm.h | 3 +
+ sound/soc/atmel/atmel_ssc_dai.c | 157 ++---
+ sound/soc/atmel/atmel_ssc_dai.h | 3 +-
+ sound/soc/atmel/sam9g20_wm8731.c | 116 +++-
+ sound/soc/codecs/Kconfig | 16 +
+ sound/soc/codecs/Makefile | 6 +
+ sound/soc/codecs/ab8500-codec.c | 2 +-
+ sound/soc/codecs/ak4104.c | 65 +-
+ sound/soc/codecs/ak4535.c | 7 +-
+ sound/soc/codecs/ak4642.c | 23 +-
+ sound/soc/codecs/arizona.c | 21 +
+ sound/soc/codecs/arizona.h | 65 +-
+ sound/soc/codecs/cs4271.c | 21 +-
+ sound/soc/codecs/da7210.c | 13 +-
+ sound/soc/codecs/da9055.c | 43 +-
+ sound/soc/codecs/jz4740.c | 142 ++---
+ sound/soc/codecs/lm49453.c | 10 +-
+ sound/soc/codecs/max98088.c | 14 +-
+ sound/soc/codecs/max98090.c | 577 +++++++++++++++++
+ sound/soc/codecs/rt5631.c | 2 +-
+ sound/soc/codecs/si476x.c | 255 ++++++++
+ sound/soc/codecs/tlv320aic32x4.c | 24 +
+ sound/soc/codecs/tlv320aic32x4.h | 3 +
+ sound/soc/codecs/wm0010.c | 419 +++++++-----
+ sound/soc/codecs/wm2000.c | 2 +-
+ sound/soc/codecs/wm2200.c | 269 ++++++--
+ sound/soc/codecs/wm5100.c | 2 +-
+ sound/soc/codecs/wm5102.c | 120 ++--
+ sound/soc/codecs/wm5110.c | 49 +-
+ sound/soc/codecs/wm8350.c | 4 +-
+ sound/soc/codecs/wm8400.c | 14 +-
+ sound/soc/codecs/wm8510.c | 3 -
+ sound/soc/codecs/wm8741.c | 4 +-
+ sound/soc/codecs/wm8750.c | 86 ++-
+ sound/soc/codecs/wm8753.c | 33 +-
+ sound/soc/codecs/wm8770.c | 217 ++++---
+ sound/soc/codecs/wm8804.c | 17 +-
+ sound/soc/codecs/wm8958-dsp2.c | 79 +--
+ sound/soc/codecs/wm8962.c | 7 +-
+ sound/soc/codecs/wm8971.c | 80 ++-
+ sound/soc/codecs/wm8978.c | 3 -
+ sound/soc/codecs/wm8985.c | 30 +-
+ sound/soc/codecs/wm8988.c | 14 +-
+ sound/soc/codecs/wm8993.c | 7 +-
+ sound/soc/codecs/wm8994.c | 184 +++---
+ sound/soc/codecs/wm8994.h | 1 -
+ sound/soc/codecs/wm8995.c | 40 +-
+ sound/soc/codecs/wm_adsp.c | 666 ++++++++++++++++++++
+ sound/soc/codecs/wm_adsp.h | 59 ++
+ sound/soc/codecs/wmfw.h | 128 ++++
+ sound/soc/davinci/davinci-evm.c | 5 +
+ sound/soc/davinci/davinci-mcasp.c | 93 ++-
+ sound/soc/davinci/davinci-mcasp.h | 2 +-
+ sound/soc/davinci/davinci-pcm.c | 53 +-
+ sound/soc/davinci/davinci-pcm.h | 2 +
+ sound/soc/fsl/Kconfig | 20 +-
+ sound/soc/fsl/Makefile | 14 +-
+ sound/soc/fsl/imx-pcm.c | 4 +
+ sound/soc/fsl/imx-sgtl5000.c | 1 +
+ sound/soc/fsl/p1022_rdk.c | 392 ++++++++++++
+ sound/soc/fsl/pcm030-audio-fabric.c | 4 +-
+ sound/soc/kirkwood/kirkwood-dma.c | 16 +-
+ sound/soc/kirkwood/kirkwood-i2s.c | 235 ++++---
+ sound/soc/kirkwood/kirkwood.h | 11 +-
+ sound/soc/mxs/mxs-saif.c | 2 +
+ sound/soc/omap/mcbsp.c | 4 +-
+ sound/soc/omap/mcbsp.h | 6 +
+ sound/soc/omap/omap-abe-twl6040.c | 4 +-
+ sound/soc/omap/omap-mcbsp.c | 5 +-
+ sound/soc/samsung/ac97.c | 6 +-
+ sound/soc/samsung/bells.c | 222 +++++--
+ sound/soc/samsung/i2s.c | 20 +-
+ sound/soc/samsung/pcm.c | 12 +-
+ sound/soc/samsung/spdif.c | 12 +-
+ sound/soc/sh/fsi.c | 550 ++++++++++++++--
+ sound/soc/soc-cache.c | 10 +-
+ sound/soc/soc-core.c | 243 +++----
+ sound/soc/soc-dapm.c | 134 ++--
+ sound/soc/soc-dmaengine-pcm.c | 2 +
+ sound/soc/soc-jack.c | 16 +-
+ sound/soc/soc-pcm.c | 195 +++---
+ sound/soc/tegra/tegra20_das.c | 2 +-
+ sound/soc/tegra/tegra20_i2s.c | 4 +-
+ sound/soc/tegra/tegra20_spdif.c | 2 +-
+ sound/soc/tegra/tegra30_ahub.c | 6 +-
+ sound/soc/tegra/tegra30_i2s.c | 4 +-
+ sound/soc/tegra/tegra_alc5632.c | 2 +-
+ sound/soc/tegra/tegra_wm8753.c | 2 +-
+ sound/soc/tegra/tegra_wm8903.c | 2 +-
+ sound/soc/tegra/trimslice.c | 2 +-
+ sound/soc/ux500/mop500.c | 4 +-
+ sound/soc/ux500/ux500_msp_dai.c | 55 +-
+ sound/soc/ux500/ux500_msp_dai.h | 1 +
+ sound/soc/ux500/ux500_pcm.c | 19 +-
+ sound/soc/ux500/ux500_pcm.h | 3 +
+ 142 files changed, 5700 insertions(+), 1796 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/misc/atmel-ssc.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt
+ create mode 100644 drivers/input/misc/arizona-haptics.c
+ create mode 100644 sound/soc/codecs/max98090.c
+ create mode 100644 sound/soc/codecs/si476x.c
+ create mode 100644 sound/soc/codecs/wm_adsp.c
+ create mode 100644 sound/soc/codecs/wm_adsp.h
+ create mode 100644 sound/soc/codecs/wmfw.h
+ create mode 100644 sound/soc/fsl/p1022_rdk.c
+Merging modules/modules-next (58876af moduleparam: use __UNIQUE_ID())
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/ima_policy | 3 +-
+ Makefile | 6 +
+ arch/arm/include/uapi/asm/unistd.h | 1 +
+ arch/arm/kernel/calls.S | 1 +
+ arch/powerpc/include/asm/systbl.h | 1 +
+ arch/powerpc/include/asm/unistd.h | 2 +-
+ arch/powerpc/include/uapi/asm/unistd.h | 1 +
+ arch/x86/syscalls/syscall_32.tbl | 1 +
+ arch/x86/syscalls/syscall_64.tbl | 1 +
+ include/linux/compiler-gcc4.h | 2 +
+ include/linux/compiler.h | 9 +
+ include/linux/ima.h | 6 +
+ include/linux/moduleparam.h | 6 +-
+ include/linux/security.h | 13 ++
+ include/linux/syscalls.h | 1 +
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/module.h | 8 +
+ kernel/module.c | 402 ++++++++++++++++++++------------
+ kernel/sys_ni.c | 1 +
+ scripts/Makefile.modsign | 32 +++
+ security/capability.c | 6 +
+ security/integrity/ima/ima.h | 2 +-
+ security/integrity/ima/ima_api.c | 4 +-
+ security/integrity/ima/ima_main.c | 21 ++
+ security/integrity/ima/ima_policy.c | 3 +
+ security/security.c | 10 +
+ 26 files changed, 383 insertions(+), 164 deletions(-)
+ create mode 100644 include/uapi/linux/module.h
+ create mode 100644 scripts/Makefile.modsign
+$ git reset --hard HEAD^
+HEAD is now at e29d5d5 Merge remote-tracking branch 'sound-asoc/for-next'
+Merging refs/next/20121115/modules
+$ git merge refs/next/20121115/modules
+Auto-merging kernel/module.c
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/ima_policy | 3 +-
+ Makefile | 6 +
+ arch/arm/include/uapi/asm/unistd.h | 1 +
+ arch/arm/kernel/calls.S | 1 +
+ arch/powerpc/include/asm/systbl.h | 1 +
+ arch/powerpc/include/asm/unistd.h | 2 +-
+ arch/powerpc/include/uapi/asm/unistd.h | 1 +
+ arch/x86/syscalls/syscall_32.tbl | 1 +
+ arch/x86/syscalls/syscall_64.tbl | 1 +
+ include/linux/ima.h | 6 +
+ include/linux/security.h | 13 ++
+ include/linux/syscalls.h | 1 +
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/module.h | 8 +
+ kernel/module.c | 402 ++++++++++++++++++++------------
+ kernel/sys_ni.c | 1 +
+ scripts/Makefile.modsign | 32 +++
+ security/capability.c | 6 +
+ security/integrity/ima/ima.h | 2 +-
+ security/integrity/ima/ima_api.c | 4 +-
+ security/integrity/ima/ima_main.c | 21 ++
+ security/integrity/ima/ima_policy.c | 3 +
+ security/security.c | 10 +
+ 23 files changed, 370 insertions(+), 160 deletions(-)
+ create mode 100644 include/uapi/linux/module.h
+ create mode 100644 scripts/Makefile.modsign
+Merging virtio/virtio-next (b15a62a virtio-mmio: Fix irq parsing in command line parameter)
+$ git merge virtio/virtio-next
+Auto-merging mm/highmem.c
+Auto-merging drivers/scsi/virtio_scsi.c
+Auto-merging drivers/net/virtio_net.c
+Merge made by the 'recursive' strategy.
+ drivers/char/virtio_console.c | 18 +++++---
+ drivers/lguest/core.c | 2 +-
+ drivers/net/virtio_net.c | 48 +++++++++-------------
+ drivers/rpmsg/virtio_rpmsg_bus.c | 6 +--
+ drivers/scsi/virtio_scsi.c | 24 ++++++-----
+ drivers/virtio/virtio_balloon.c | 7 ++--
+ drivers/virtio/virtio_mmio.c | 30 +++++++++-----
+ drivers/virtio/virtio_pci.c | 20 ++-------
+ drivers/virtio/virtio_ring.c | 46 +++++++++------------
+ include/linux/virtio.h | 10 ++++-
+ include/linux/virtio_scsi.h | 28 ++++++++++++-
+ mm/highmem.c | 1 +
+ net/9p/trans_virtio.c | 3 +-
+ tools/lguest/lguest.c | 84 ++++++++++++++++----------------------
+ tools/virtio/virtio_test.c | 4 +-
+ 15 files changed, 166 insertions(+), 165 deletions(-)
+Merging input/next (1a22e16 Input: gpio-keys-polled - honor 'autorepeat' setting in platform data)
+$ git merge input/next
+Removing drivers/input/touchscreen/h3600_ts_input.c
+Auto-merging drivers/input/misc/Makefile
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging drivers/input/input-mt.c
+Merge made by the 'recursive' strategy.
+ .../bindings/input/gpio-matrix-keypad.txt | 46 ++
+ .../devicetree/bindings/input/pwm-beeper.txt | 7 +
+ .../devicetree/bindings/input/stmpe-keypad.txt | 39 ++
+ .../devicetree/bindings/input/tca8418_keypad.txt | 8 +
+ .../bindings/input/touchscreen/mms114.txt | 34 ++
+ .../bindings/input/touchscreen/stmpe.txt | 43 ++
+ arch/arm/mach-omap1/board-nokia770.c | 14 +-
+ arch/arm/mach-ux500/board-mop500-stuib.c | 93 +---
+ drivers/input/gameport/emu10k1-gp.c | 6 +-
+ drivers/input/gameport/fm801-gp.c | 6 +-
+ drivers/input/input-mt.c | 2 +-
+ drivers/input/input.c | 181 ++++++--
+ drivers/input/joystick/as5011.c | 29 +-
+ drivers/input/joystick/maplecontrol.c | 6 +-
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/adp5520-keys.c | 6 +-
+ drivers/input/keyboard/adp5588-keys.c | 18 +-
+ drivers/input/keyboard/adp5589-keys.c | 21 +-
+ drivers/input/keyboard/bf54x-keys.c | 6 +-
+ drivers/input/keyboard/davinci_keyscan.c | 4 +-
+ drivers/input/keyboard/ep93xx_keypad.c | 6 +-
+ drivers/input/keyboard/gpio_keys.c | 80 +++-
+ drivers/input/keyboard/gpio_keys_polled.c | 14 +-
+ drivers/input/keyboard/hilkbd.c | 10 +-
+ drivers/input/keyboard/imx_keypad.c | 9 +-
+ drivers/input/keyboard/jornada680_kbd.c | 6 +-
+ drivers/input/keyboard/jornada720_kbd.c | 6 +-
+ drivers/input/keyboard/lm8323.c | 6 +-
+ drivers/input/keyboard/lm8333.c | 6 +-
+ drivers/input/keyboard/locomokbd.c | 8 +-
+ drivers/input/keyboard/lpc32xx-keys.c | 8 +-
+ drivers/input/keyboard/matrix_keypad.c | 129 ++++--
+ drivers/input/keyboard/max7359_keypad.c | 6 +-
+ drivers/input/keyboard/mcs_touchkey.c | 6 +-
+ drivers/input/keyboard/mpr121_touchkey.c | 12 +-
+ drivers/input/keyboard/nomadik-ske-keypad.c | 38 +-
+ drivers/input/keyboard/omap-keypad.c | 6 +-
+ drivers/input/keyboard/omap4-keypad.c | 10 +-
+ drivers/input/keyboard/opencores-kbd.c | 6 +-
+ drivers/input/keyboard/pmic8xxx-keypad.c | 10 +-
+ drivers/input/keyboard/pxa27x_keypad.c | 6 +-
+ drivers/input/keyboard/pxa930_rotary.c | 6 +-
+ drivers/input/keyboard/qt1070.c | 8 +-
+ drivers/input/keyboard/qt2160.c | 31 +-
+ drivers/input/keyboard/samsung-keypad.c | 109 ++---
+ drivers/input/keyboard/sh_keysc.c | 6 +-
+ drivers/input/keyboard/spear-keyboard.c | 98 ++--
+ drivers/input/keyboard/stmpe-keypad.c | 142 +++---
+ drivers/input/keyboard/tc3589x-keypad.c | 6 +-
+ drivers/input/keyboard/tca6416-keypad.c | 8 +-
+ drivers/input/keyboard/tca8418_keypad.c | 179 ++++----
+ drivers/input/keyboard/tegra-kbc.c | 16 +-
+ drivers/input/keyboard/tnetv107x-keypad.c | 6 +-
+ drivers/input/keyboard/twl4030_keypad.c | 8 +-
+ drivers/input/keyboard/w90p910_keypad.c | 6 +-
+ drivers/input/matrix-keymap.c | 23 +-
+ drivers/input/misc/88pm80x_onkey.c | 6 +-
+ drivers/input/misc/88pm860x_onkey.c | 6 +-
+ drivers/input/misc/Kconfig | 29 +-
+ drivers/input/misc/Makefile | 2 +
+ drivers/input/misc/ab8500-ponkey.c | 6 +-
+ drivers/input/misc/ad714x-i2c.c | 6 +-
+ drivers/input/misc/ad714x-spi.c | 6 +-
+ drivers/input/misc/adxl34x-i2c.c | 6 +-
+ drivers/input/misc/adxl34x-spi.c | 6 +-
+ drivers/input/misc/bfin_rotary.c | 6 +-
+ drivers/input/misc/bma150.c | 28 +-
+ drivers/input/misc/cma3000_d0x_i2c.c | 6 +-
+ drivers/input/misc/cobalt_btns.c | 6 +-
+ drivers/input/misc/da9052_onkey.c | 6 +-
+ drivers/input/misc/da9055_onkey.c | 171 +++++++
+ drivers/input/misc/dm355evm_keys.c | 6 +-
+ drivers/input/misc/gp2ap002a00f.c | 8 +-
+ drivers/input/misc/gpio_tilt_polled.c | 6 +-
+ drivers/input/misc/ixp4xx-beeper.c | 6 +-
+ drivers/input/misc/kxtj9.c | 16 +-
+ drivers/input/misc/m68kspkr.c | 6 +-
+ drivers/input/misc/max8925_onkey.c | 6 +-
+ drivers/input/misc/max8997_haptic.c | 6 +-
+ drivers/input/misc/mc13783-pwrbutton.c | 6 +-
+ drivers/input/misc/mma8450.c | 6 +-
+ drivers/input/misc/mpu3050.c | 8 +-
+ drivers/input/misc/pcap_keys.c | 6 +-
+ drivers/input/misc/pcf50633-input.c | 6 +-
+ drivers/input/misc/pcf8574_keypad.c | 6 +-
+ drivers/input/misc/pcspkr.c | 6 +-
+ drivers/input/misc/pm8xxx-vibrator.c | 6 +-
+ drivers/input/misc/pmic8xxx-pwrkey.c | 6 +-
+ drivers/input/misc/pwm-beeper.c | 20 +-
+ drivers/input/misc/rb532_button.c | 6 +-
+ drivers/input/misc/retu-pwrbutton.c | 99 ++++
+ drivers/input/misc/rotary_encoder.c | 9 +-
+ drivers/input/misc/sgi_btns.c | 6 +-
+ drivers/input/misc/sparcspkr.c | 14 +-
+ drivers/input/misc/twl4030-pwrbutton.c | 3 +-
+ drivers/input/misc/twl4030-vibra.c | 6 +-
+ drivers/input/misc/twl6040-vibra.c | 6 +-
+ drivers/input/misc/wistron_btns.c | 20 +-
+ drivers/input/misc/wm831x-on.c | 11 +-
+ drivers/input/misc/xen-kbdfront.c | 2 +-
+ drivers/input/mouse/alps.c | 10 +-
+ drivers/input/mouse/gpio_mouse.c | 6 +-
+ drivers/input/mouse/maplemouse.c | 6 +-
+ drivers/input/mouse/navpoint.c | 6 +-
+ drivers/input/mouse/pxa930_trkball.c | 6 +-
+ drivers/input/mouse/synaptics_i2c.c | 6 +-
+ drivers/input/serio/Kconfig | 9 +
+ drivers/input/serio/Makefile | 1 +
+ drivers/input/serio/altera_ps2.c | 6 +-
+ drivers/input/serio/ambakmi.c | 6 +-
+ drivers/input/serio/arc_ps2.c | 274 +++++++++++
+ drivers/input/serio/ct82c710.c | 6 +-
+ drivers/input/serio/gscps2.c | 6 +-
+ drivers/input/serio/hil_mlc.c | 13 +-
+ drivers/input/serio/i8042-io.h | 2 +-
+ drivers/input/serio/i8042-sparcio.h | 6 +-
+ drivers/input/serio/i8042.c | 6 +-
+ drivers/input/serio/maceps2.c | 8 +-
+ drivers/input/serio/pcips2.c | 6 +-
+ drivers/input/serio/q40kbd.c | 6 +-
+ drivers/input/serio/rpckbd.c | 6 +-
+ drivers/input/serio/sa1111ps2.c | 12 +-
+ drivers/input/serio/serio.c | 11 -
+ drivers/input/serio/xilinx_ps2.c | 8 +-
+ drivers/input/tablet/wacom_sys.c | 58 ++-
+ drivers/input/tablet/wacom_wac.c | 29 +-
+ drivers/input/tablet/wacom_wac.h | 2 +
+ drivers/input/touchscreen/88pm860x-ts.c | 8 +-
+ drivers/input/touchscreen/Kconfig | 12 -
+ drivers/input/touchscreen/Makefile | 1 -
+ drivers/input/touchscreen/ad7877.c | 6 +-
+ drivers/input/touchscreen/ad7879-i2c.c | 6 +-
+ drivers/input/touchscreen/ad7879-spi.c | 6 +-
+ drivers/input/touchscreen/ads7846.c | 10 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 6 +-
+ drivers/input/touchscreen/atmel_tsadcc.c | 6 +-
+ drivers/input/touchscreen/auo-pixcir-ts.c | 8 +-
+ drivers/input/touchscreen/bu21013_ts.c | 125 +++--
+ drivers/input/touchscreen/cy8ctmg110_ts.c | 19 +-
+ drivers/input/touchscreen/cyttsp_i2c.c | 6 +-
+ drivers/input/touchscreen/cyttsp_spi.c | 6 +-
+ drivers/input/touchscreen/da9034-ts.c | 6 +-
+ drivers/input/touchscreen/da9052_tsi.c | 10 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 28 +-
+ drivers/input/touchscreen/eeti_ts.c | 6 +-
+ drivers/input/touchscreen/egalax_ts.c | 8 +-
+ drivers/input/touchscreen/h3600_ts_input.c | 479 --------------------
+ drivers/input/touchscreen/htcpen.c | 6 +-
+ drivers/input/touchscreen/ili210x.c | 6 +-
+ drivers/input/touchscreen/intel-mid-touch.c | 14 +-
+ drivers/input/touchscreen/jornada720_ts.c | 6 +-
+ drivers/input/touchscreen/lpc32xx_ts.c | 6 +-
+ drivers/input/touchscreen/max11801_ts.c | 8 +-
+ drivers/input/touchscreen/mc13783_ts.c | 4 +-
+ drivers/input/touchscreen/mcs5000_ts.c | 6 +-
+ drivers/input/touchscreen/mms114.c | 68 ++-
+ drivers/input/touchscreen/pcap_ts.c | 6 +-
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 6 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 6 +-
+ drivers/input/touchscreen/st1232.c | 8 +-
+ drivers/input/touchscreen/stmpe-ts.c | 133 +++---
+ drivers/input/touchscreen/ti_tscadc.c | 2 +-
+ drivers/input/touchscreen/tnetv107x-ts.c | 6 +-
+ drivers/input/touchscreen/tps6507x-ts.c | 4 +-
+ drivers/input/touchscreen/tsc2005.c | 8 +-
+ drivers/input/touchscreen/tsc2007.c | 6 +-
+ drivers/input/touchscreen/ucb1400_ts.c | 8 +-
+ drivers/input/touchscreen/w90p910_ts.c | 6 +-
+ drivers/input/touchscreen/wacom_i2c.c | 6 +-
+ drivers/input/touchscreen/wm831x-ts.c | 12 +-
+ drivers/mfd/stmpe.c | 2 +
+ include/linux/input.h | 10 +-
+ include/linux/input/bu21013.h | 10 +-
+ 173 files changed, 2227 insertions(+), 1644 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
+ create mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.txt
+ create mode 100644 Documentation/devicetree/bindings/input/stmpe-keypad.txt
+ create mode 100644 Documentation/devicetree/bindings/input/tca8418_keypad.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
+ create mode 100644 drivers/input/misc/da9055_onkey.c
+ create mode 100644 drivers/input/misc/retu-pwrbutton.c
+ create mode 100644 drivers/input/serio/arc_ps2.c
+ delete mode 100644 drivers/input/touchscreen/h3600_ts_input.c
+Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (9718ceb cgroup: list_del_init() on removed events)
+$ git merge cgroup/for-next
+Resolved 'mm/memcontrol.c' using previous resolution.
+Resolved 'net/sched/cls_cgroup.c' using previous resolution.
+Auto-merging net/sched/cls_cgroup.c
+CONFLICT (content): Merge conflict in net/sched/cls_cgroup.c
+Auto-merging net/core/netprio_cgroup.c
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e898a21] Merge remote-tracking branch 'cgroup/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cgroups/cgroups.txt | 61 ++-
+ Documentation/cgroups/freezer-subsystem.txt | 63 ++-
+ Documentation/cgroups/net_prio.txt | 2 +
+ block/blk-cgroup.c | 15 +-
+ include/linux/cgroup.h | 167 +++++--
+ include/linux/freezer.h | 57 ++-
+ include/net/netprio_cgroup.h | 11 +-
+ kernel/cgroup.c | 717 ++++++++++++++-------------
+ kernel/cgroup_freezer.c | 514 +++++++++++--------
+ kernel/cpuset.c | 90 ++--
+ kernel/events/core.c | 8 +-
+ kernel/fork.c | 9 +-
+ kernel/freezer.c | 11 +-
+ kernel/power/process.c | 13 +-
+ kernel/sched/core.c | 16 +-
+ kernel/signal.c | 20 +-
+ mm/hugetlb_cgroup.c | 23 +-
+ mm/memcontrol.c | 191 +++----
+ net/core/netprio_cgroup.c | 260 +++++-----
+ net/sched/cls_cgroup.c | 28 +-
+ security/device_cgroup.c | 20 +-
+ 21 files changed, 1224 insertions(+), 1072 deletions(-)
+Merging block/for-next (95678ef Merge branch 'for-3.8/core' into for-next)
+$ git merge block/for-next
+Removing include/linux/drbd_tag_magic.h
+Removing include/linux/drbd_nl.h
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 4 +-
+ block/cfq-iosched.c | 3 +-
+ block/elevator.c | 16 +-
+ block/genhd.c | 10 +-
+ block/partitions/efi.c | 7 +-
+ block/partitions/msdos.c | 21 +-
+ drivers/block/cciss.c | 21 +-
+ drivers/block/drbd/Makefile | 2 +
+ drivers/block/drbd/drbd_actlog.c | 702 +++----
+ drivers/block/drbd/drbd_bitmap.c | 249 +--
+ drivers/block/drbd/drbd_int.h | 1392 ++++++-------
+ drivers/block/drbd/drbd_interval.c | 207 ++
+ drivers/block/drbd/drbd_interval.h | 40 +
+ drivers/block/drbd/drbd_main.c | 3861 ++++++++++++++---------------------
+ drivers/block/drbd/drbd_nl.c | 3334 +++++++++++++++++-------------
+ drivers/block/drbd/drbd_nla.c | 55 +
+ drivers/block/drbd/drbd_nla.h | 8 +
+ drivers/block/drbd/drbd_proc.c | 41 +-
+ drivers/block/drbd/drbd_receiver.c | 3894 +++++++++++++++++++++---------------
+ drivers/block/drbd/drbd_req.c | 1574 +++++++--------
+ drivers/block/drbd/drbd_req.h | 187 +-
+ drivers/block/drbd/drbd_state.c | 1857 +++++++++++++++++
+ drivers/block/drbd/drbd_state.h | 161 ++
+ drivers/block/drbd/drbd_strings.c | 1 +
+ drivers/block/drbd/drbd_worker.c | 1237 +++++++-----
+ drivers/block/drbd/drbd_wrappers.h | 11 +-
+ include/linux/drbd.h | 81 +-
+ include/linux/drbd_genl.h | 378 ++++
+ include/linux/drbd_genl_api.h | 55 +
+ include/linux/drbd_limits.h | 90 +-
+ include/linux/drbd_nl.h | 163 --
+ include/linux/drbd_tag_magic.h | 84 -
+ include/linux/genhd.h | 8 +-
+ include/linux/genl_magic_func.h | 422 ++++
+ include/linux/genl_magic_struct.h | 277 +++
+ include/linux/idr.h | 11 +
+ include/linux/lru_cache.h | 67 +-
+ init/do_mounts.c | 61 +-
+ lib/lru_cache.c | 359 ++--
+ 39 files changed, 12339 insertions(+), 8612 deletions(-)
+ create mode 100644 drivers/block/drbd/drbd_interval.c
+ create mode 100644 drivers/block/drbd/drbd_interval.h
+ create mode 100644 drivers/block/drbd/drbd_nla.c
+ create mode 100644 drivers/block/drbd/drbd_nla.h
+ create mode 100644 drivers/block/drbd/drbd_state.c
+ create mode 100644 drivers/block/drbd/drbd_state.h
+ create mode 100644 include/linux/drbd_genl.h
+ create mode 100644 include/linux/drbd_genl_api.h
+ delete mode 100644 include/linux/drbd_nl.h
+ delete mode 100644 include/linux/drbd_tag_magic.h
+ create mode 100644 include/linux/genl_magic_func.h
+ create mode 100644 include/linux/genl_magic_struct.h
+Merging device-mapper/master (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
+$ git merge device-mapper/master
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-raid1.c | 10 ++---
+ drivers/md/dm-snap.c | 5 +--
+ drivers/md/persistent-data/dm-btree-internal.h | 16 ++++----
+ drivers/md/persistent-data/dm-btree-remove.c | 50 ++++++++++++------------
+ drivers/md/persistent-data/dm-btree-spine.c | 6 +--
+ drivers/md/persistent-data/dm-btree.c | 22 +++++------
+ 6 files changed, 53 insertions(+), 56 deletions(-)
+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 (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (2656109 mmc: sdhci-spear: Don't call clk_{un}prepare() in suspend/resume)
+$ git merge mmc/mmc-next
+Removing include/linux/mmc/mxs-mmc.h
+Removing drivers/mmc/host/at91_mci.h
+Removing drivers/mmc/host/at91_mci.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mmc/mmc.txt | 6 +
+ .../devicetree/bindings/mmc/samsung-sdhci.txt | 20 +-
+ .../{synposis-dw-mshc.txt => synopsis-dw-mshc.txt} | 0
+ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 1 +
+ .../devicetree/bindings/mmc/vt8500-sdmmc.txt | 23 +
+ Documentation/mmc/mmc-dev-attrs.txt | 7 +
+ MAINTAINERS | 9 +-
+ arch/arm/mach-at91/include/mach/board.h | 10 -
+ arch/arm/plat-omap/include/plat/mmc.h | 1 +
+ drivers/mmc/card/block.c | 81 ++
+ drivers/mmc/card/queue.c | 17 +-
+ drivers/mmc/core/core.c | 32 +-
+ drivers/mmc/core/debugfs.c | 16 +
+ drivers/mmc/core/mmc.c | 17 +-
+ drivers/mmc/core/mmc_ops.c | 11 +
+ drivers/mmc/core/sdio_io.c | 10 +-
+ drivers/mmc/core/sdio_ops.c | 32 +-
+ drivers/mmc/host/Kconfig | 34 +-
+ drivers/mmc/host/Makefile | 2 +-
+ drivers/mmc/host/at91_mci.c | 1219 --------------------
+ drivers/mmc/host/at91_mci.h | 115 --
+ drivers/mmc/host/dw_mmc-pci.c | 2 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 16 +-
+ drivers/mmc/host/dw_mmc.c | 30 +-
+ drivers/mmc/host/mxcmmc.c | 2 +-
+ drivers/mmc/host/mxs-mmc.c | 31 +-
+ drivers/mmc/host/omap_hsmmc.c | 177 ++-
+ drivers/mmc/host/sdhci-dove.c | 1 -
+ drivers/mmc/host/sdhci-of-esdhc.c | 3 +
+ drivers/mmc/host/sdhci-pltfm.c | 6 +
+ drivers/mmc/host/sdhci-pxav3.c | 13 +-
+ drivers/mmc/host/sdhci-s3c.c | 63 +-
+ drivers/mmc/host/sdhci-spear.c | 9 +-
+ drivers/mmc/host/sdhci.c | 31 +-
+ drivers/mmc/host/wmt-sdmmc.c | 1029 +++++++++++++++++
+ include/linux/mmc/card.h | 2 +
+ include/linux/mmc/core.h | 2 +
+ include/linux/mmc/dw_mmc.h | 5 +-
+ include/linux/mmc/host.h | 16 +-
+ include/linux/mmc/mmc.h | 2 +
+ include/linux/mmc/mxs-mmc.h | 19 -
+ include/linux/mmc/sdhci.h | 4 +-
+ include/linux/platform_data/pxa_sdhci.h | 6 +-
+ 43 files changed, 1538 insertions(+), 1594 deletions(-)
+ rename Documentation/devicetree/bindings/mmc/{synposis-dw-mshc.txt => synopsis-dw-mshc.txt} (100%)
+ create mode 100644 Documentation/devicetree/bindings/mmc/vt8500-sdmmc.txt
+ delete mode 100644 drivers/mmc/host/at91_mci.c
+ delete mode 100644 drivers/mmc/host/at91_mci.h
+ create mode 100644 drivers/mmc/host/wmt-sdmmc.c
+ delete mode 100644 include/linux/mmc/mxs-mmc.h
+Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (f1d58d7 Merge branch 'slab/next' into for-next)
+$ git merge slab/for-next
+Resolved 'mm/slob.c' using previous resolution.
+Auto-merging mm/slob.c
+CONFLICT (content): Merge conflict in mm/slob.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 30663f4] Merge remote-tracking branch 'slab/for-next'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/mm_types.h | 7 +--
+ include/linux/slab.h | 9 ++-
+ mm/slab.c | 151 +++++++++-------------------------------------
+ mm/slab.h | 45 ++++++++++++++
+ mm/slab_common.c | 116 +++++++++++++++++++++++++++++++++++
+ mm/slob.c | 36 ++++-------
+ mm/slub.c | 147 ++++++++++++--------------------------------
+ 7 files changed, 248 insertions(+), 263 deletions(-)
+Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (fb07cce md/raid5: use async_tx_quiesce() instead of open-coding it.)
+$ git merge md/for-next
+Auto-merging block/blk-core.c
+Auto-merging arch/x86/Makefile
+Merge made by the 'recursive' strategy.
+ arch/x86/Makefile | 5 +-
+ block/blk-core.c | 1 +
+ drivers/md/md.c | 26 ++-
+ drivers/md/md.h | 10 ++
+ drivers/md/raid5.c | 451 ++++++++++++++++++++++++++++++++++++++++++++---
+ drivers/md/raid5.h | 19 ++
+ include/linux/raid/pq.h | 1 +
+ lib/raid6/Makefile | 2 +-
+ lib/raid6/algos.c | 3 +
+ lib/raid6/recov_avx2.c | 327 ++++++++++++++++++++++++++++++++++
+ lib/raid6/test/Makefile | 2 +-
+ lib/raid6/x86.h | 14 +-
+ 12 files changed, 819 insertions(+), 42 deletions(-)
+ create mode 100644 lib/raid6/recov_avx2.c
+Merging mfd/for-next (64cdfe2 mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ)
+$ git merge mfd/for-next
+Resolved 'drivers/mfd/twl-core.c' using previous resolution.
+Resolved 'drivers/mmc/host/Kconfig' using previous resolution.
+Auto-merging include/linux/regmap.h
+Removing include/linux/input/ti_tscadc.h
+Auto-merging drivers/mmc/host/Makefile
+Auto-merging drivers/mmc/host/Kconfig
+CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig
+Auto-merging drivers/mfd/wm8994-core.c
+Auto-merging drivers/mfd/wm5102-tables.c
+Auto-merging drivers/mfd/twl6040.c
+Removing drivers/mfd/twl6040-irq.c
+Auto-merging drivers/mfd/twl4030-irq.c
+Auto-merging drivers/mfd/twl-core.c
+CONFLICT (content): Merge conflict in drivers/mfd/twl-core.c
+Removing drivers/mfd/tps65910-irq.c
+Auto-merging drivers/mfd/stmpe.c
+CONFLICT (modify/delete): drivers/input/touchscreen/ti_tscadc.c deleted in mfd/for-next and modified in HEAD. Version HEAD of drivers/input/touchscreen/ti_tscadc.c left in tree.
+Auto-merging drivers/input/touchscreen/da9052_tsi.c
+Auto-merging drivers/input/touchscreen/Makefile
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/misc/da9052_onkey.c
+Auto-merging drivers/i2c/busses/Makefile
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/base/regmap/regmap.c
+Auto-merging drivers/base/regmap/internal.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/input/touchscreen/ti_tscadc.c
+drivers/input/touchscreen/ti_tscadc.c: needs merge
+rm 'drivers/input/touchscreen/ti_tscadc.c'
+$ git commit -v -a
+[master feeabc0] Merge remote-tracking branch 'mfd/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/mfd/stmpe.txt | 25 +
+ .../devicetree/bindings/regulator/tps65217.txt | 4 +
+ drivers/base/regmap/internal.h | 4 +-
+ drivers/base/regmap/regmap-irq.c | 19 +
+ drivers/base/regmap/regmap.c | 65 +-
+ drivers/gpio/Kconfig | 13 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-da9052.c | 6 +-
+ drivers/gpio/gpio-tps6586x.c | 9 +
+ drivers/gpio/gpio-twl4030.c | 12 +-
+ drivers/gpio/gpio-viperboard.c | 517 ++++++++
+ drivers/i2c/busses/Kconfig | 10 +
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-viperboard.c | 480 +++++++
+ drivers/iio/adc/Kconfig | 14 +
+ drivers/iio/adc/Makefile | 2 +
+ drivers/iio/adc/ti_am335x_adc.c | 260 ++++
+ drivers/iio/adc/viperboard_adc.c | 181 +++
+ drivers/input/misc/da9052_onkey.c | 22 +-
+ drivers/input/touchscreen/Kconfig | 6 +-
+ drivers/input/touchscreen/Makefile | 2 +-
+ drivers/input/touchscreen/da9052_tsi.c | 59 +-
+ drivers/input/touchscreen/ti_am335x_tsc.c | 398 ++++++
+ drivers/input/touchscreen/ti_tscadc.c | 486 -------
+ drivers/memstick/host/Kconfig | 10 +
+ drivers/memstick/host/Makefile | 1 +
+ drivers/memstick/host/rtsx_pci_ms.c | 641 ++++++++++
+ drivers/mfd/Kconfig | 73 +-
+ drivers/mfd/Makefile | 13 +-
+ drivers/mfd/ab8500-core.c | 102 +-
+ drivers/mfd/as3711.c | 217 ++++
+ drivers/mfd/da9052-core.c | 273 +---
+ drivers/mfd/da9052-irq.c | 288 +++++
+ drivers/mfd/db8500-prcmu.c | 8 +-
+ drivers/mfd/jz4740-adc.c | 20 +-
+ drivers/mfd/lpc_ich.c | 16 +-
+ drivers/mfd/mc13xxx-core.c | 94 +-
+ drivers/mfd/mc13xxx-i2c.c | 22 +-
+ drivers/mfd/mc13xxx-spi.c | 29 +-
+ drivers/mfd/mc13xxx.h | 18 +-
+ drivers/mfd/mfd-core.c | 15 +-
+ drivers/mfd/rc5t583-irq.c | 2 +-
+ drivers/mfd/retu-mfd.c | 264 ++++
+ drivers/mfd/rtl8411.c | 251 ++++
+ drivers/mfd/rts5209.c | 223 ++++
+ drivers/mfd/rts5229.c | 205 +++
+ drivers/mfd/rtsx_pcr.c | 1252 ++++++++++++++++++
+ drivers/mfd/rtsx_pcr.h | 32 +
+ drivers/mfd/sec-irq.c | 102 +-
+ drivers/mfd/sta2x11-mfd.c | 532 +++++---
+ drivers/mfd/stmpe-i2c.c | 8 +-
+ drivers/mfd/stmpe.c | 190 +--
+ drivers/mfd/ti_am335x_tscadc.c | 274 ++++
+ drivers/mfd/tps65090.c | 312 ++---
+ drivers/mfd/tps65217.c | 12 +
+ drivers/mfd/tps6586x.c | 103 +-
+ drivers/mfd/tps65910-irq.c | 260 ----
+ drivers/mfd/tps65910.c | 233 +++-
+ drivers/mfd/tps80031.c | 573 +++++++++
+ drivers/mfd/twl-core.c | 227 ++--
+ drivers/mfd/twl4030-irq.c | 10 +-
+ drivers/mfd/twl4030-madc.c | 14 +-
+ drivers/mfd/twl4030-power.c | 124 +-
+ drivers/mfd/twl6030-irq.c | 4 +-
+ drivers/mfd/twl6040-irq.c | 205 ---
+ drivers/mfd/{twl6040-core.c => twl6040.c} | 138 +-
+ drivers/mfd/viperboard.c | 137 ++
+ drivers/mfd/wm5102-tables.c | 13 +-
+ drivers/mfd/wm8994-core.c | 1 +
+ drivers/mmc/host/Kconfig | 7 +
+ drivers/mmc/host/Makefile | 2 +
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 1348 ++++++++++++++++++++
+ drivers/power/da9052-battery.c | 44 +-
+ drivers/rtc/rtc-twl.c | 32 +-
+ include/linux/i2c/twl.h | 73 +-
+ include/linux/input/ti_am335x_tsc.h | 23 +
+ include/linux/input/ti_tscadc.h | 17 -
+ include/linux/mfd/as3711.h | 126 ++
+ include/linux/mfd/da9052/da9052.h | 10 +
+ include/linux/mfd/da9055/core.h | 2 +-
+ include/linux/mfd/da9055/pdata.h | 2 +-
+ include/linux/mfd/da9055/reg.h | 2 +-
+ include/linux/mfd/rc5t583.h | 3 +-
+ include/linux/mfd/retu.h | 22 +
+ include/linux/mfd/rtsx_common.h | 48 +
+ include/linux/mfd/rtsx_pci.h | 794 ++++++++++++
+ include/linux/mfd/sta2x11-mfd.h | 198 ++-
+ include/linux/mfd/stmpe.h | 2 +
+ include/linux/mfd/ti_am335x_tscadc.h | 152 +++
+ include/linux/mfd/tps65090.h | 73 +-
+ include/linux/mfd/tps6586x.h | 1 +
+ include/linux/mfd/tps65910.h | 143 ++-
+ include/linux/mfd/tps80031.h | 637 +++++++++
+ include/linux/mfd/twl6040.h | 10 +-
+ include/linux/mfd/viperboard.h | 110 ++
+ include/linux/platform_data/ti_am335x_adc.h | 14 +
+ include/linux/regmap.h | 18 +-
+ 97 files changed, 11620 insertions(+), 2430 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/stmpe.txt
+ create mode 100644 drivers/gpio/gpio-viperboard.c
+ create mode 100644 drivers/i2c/busses/i2c-viperboard.c
+ create mode 100644 drivers/iio/adc/ti_am335x_adc.c
+ create mode 100644 drivers/iio/adc/viperboard_adc.c
+ create mode 100644 drivers/input/touchscreen/ti_am335x_tsc.c
+ delete mode 100644 drivers/input/touchscreen/ti_tscadc.c
+ create mode 100644 drivers/memstick/host/rtsx_pci_ms.c
+ create mode 100644 drivers/mfd/as3711.c
+ create mode 100644 drivers/mfd/da9052-irq.c
+ create mode 100644 drivers/mfd/retu-mfd.c
+ create mode 100644 drivers/mfd/rtl8411.c
+ create mode 100644 drivers/mfd/rts5209.c
+ create mode 100644 drivers/mfd/rts5229.c
+ create mode 100644 drivers/mfd/rtsx_pcr.c
+ create mode 100644 drivers/mfd/rtsx_pcr.h
+ create mode 100644 drivers/mfd/ti_am335x_tscadc.c
+ delete mode 100644 drivers/mfd/tps65910-irq.c
+ create mode 100644 drivers/mfd/tps80031.c
+ delete mode 100644 drivers/mfd/twl6040-irq.c
+ rename drivers/mfd/{twl6040-core.c => twl6040.c} (84%)
+ create mode 100644 drivers/mfd/viperboard.c
+ create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
+ create mode 100644 include/linux/input/ti_am335x_tsc.h
+ delete mode 100644 include/linux/input/ti_tscadc.h
+ create mode 100644 include/linux/mfd/as3711.h
+ create mode 100644 include/linux/mfd/retu.h
+ create mode 100644 include/linux/mfd/rtsx_common.h
+ create mode 100644 include/linux/mfd/rtsx_pci.h
+ create mode 100644 include/linux/mfd/ti_am335x_tscadc.h
+ create mode 100644 include/linux/mfd/tps80031.h
+ create mode 100644 include/linux/mfd/viperboard.h
+ create mode 100644 include/linux/platform_data/ti_am335x_adc.h
+Merging battery/master (eba3b67 max8925_power: Add support for device-tree initialization)
+$ git merge battery/master
+Auto-merging drivers/power/power_supply_core.c
+Auto-merging drivers/mfd/ab8500-core.c
+Auto-merging arch/arm/boot/dts/dbx5x0.dtsi
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/ab8500.txt | 27 +-
+ .../bindings/power_supply/ab8500/btemp.txt | 16 +
+ .../bindings/power_supply/ab8500/chargalg.txt | 16 +
+ .../bindings/power_supply/ab8500/charger.txt | 25 +
+ .../devicetree/bindings/power_supply/ab8500/fg.txt | 58 +
+ Documentation/power/power_supply_class.txt | 3 +
+ arch/arm/boot/dts/dbx5x0.dtsi | 28 +-
+ drivers/mfd/ab8500-core.c | 20 +
+ drivers/power/Kconfig | 23 +-
+ drivers/power/Makefile | 4 +-
+ drivers/power/ab8500_bmdata.c | 521 ++++++
+ drivers/power/ab8500_btemp.c | 77 +-
+ drivers/power/ab8500_charger.c | 84 +-
+ drivers/power/ab8500_fg.c | 82 +-
+ drivers/power/abx500_chargalg.c | 56 +-
+ drivers/power/bq2415x_charger.c | 1670 ++++++++++++++++++++
+ drivers/power/bq27x00_battery.c | 8 +
+ drivers/power/ds2782_battery.c | 4 +-
+ drivers/power/generic-adc-battery.c | 5 +-
+ drivers/power/jz4740-battery.c | 45 +-
+ drivers/power/lp8788-charger.c | 75 +-
+ drivers/power/max17042_battery.c | 3 +-
+ drivers/power/max8925_power.c | 51 +-
+ drivers/power/power_supply_core.c | 96 ++
+ drivers/power/power_supply_sysfs.c | 2 +
+ drivers/power/rx51_battery.c | 251 +++
+ drivers/power/twl4030_charger.c | 12 +-
+ include/linux/mfd/abx500.h | 34 +-
+ include/linux/mfd/lp8788.h | 8 +-
+ include/linux/power/bq2415x_charger.h | 95 ++
+ include/linux/power_supply.h | 3 +
+ 31 files changed, 3123 insertions(+), 279 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt
+ create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt
+ create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/charger.txt
+ create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/fg.txt
+ create mode 100644 drivers/power/ab8500_bmdata.c
+ create mode 100644 drivers/power/bq2415x_charger.c
+ create mode 100644 drivers/power/rx51_battery.c
+ create mode 100644 include/linux/power/bq2415x_charger.h
+Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
+$ git merge fbdev/fbdev-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (bb02669 Merge branch 'master' of git://gitorious.org/linux-omap-dss2/linux into for-linus)
+$ git merge omap_dss2/for-next
+Auto-merging include/video/omapvrfb.h
+Removing drivers/video/omap2/vram.c
+Auto-merging drivers/video/Kconfig
+Auto-merging drivers/media/platform/omap/omap_vout.c
+Removing arch/arm/plat-omap/include/plat/vram.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/arm/OMAP/DSS | 10 +-
+ .../devicetree/bindings/video/exynos_dp.txt | 80 +++
+ MAINTAINERS | 6 +
+ arch/arm/mach-davinci/da830.c | 2 +-
+ arch/arm/mach-davinci/da850.c | 2 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 22 +-
+ arch/arm/mach-davinci/pm_domain.c | 1 +
+ arch/arm/mach-omap2/board-rx51-video.c | 14 -
+ arch/arm/mach-omap2/board-rx51.c | 3 -
+ arch/arm/mach-omap2/display.c | 53 +-
+ arch/arm/mach-omap2/sdrc.c | 16 -
+ arch/arm/mach-shmobile/board-ag5evm.c | 198 +++---
+ arch/arm/mach-shmobile/board-ap4evb.c | 4 +-
+ arch/arm/mach-shmobile/board-mackerel.c | 6 -
+ arch/arm/plat-omap/common.c | 2 -
+ arch/arm/plat-omap/fb.c | 66 +-
+ arch/arm/plat-omap/include/plat/sdrc.h | 7 -
+ arch/arm/plat-omap/include/plat/vram.h | 43 --
+ arch/sh/boards/mach-ap325rxa/setup.c | 6 -
+ arch/sh/boards/mach-ecovec24/setup.c | 6 -
+ arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 16 +-
+ arch/sh/boards/mach-kfr2r09/setup.c | 7 +-
+ arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 6 +-
+ drivers/media/platform/omap/omap_vout.c | 2 +-
+ drivers/media/platform/omap/omap_vout_vrfb.c | 2 +-
+ drivers/media/platform/omap/omap_voutdef.h | 2 +-
+ drivers/video/Kconfig | 2 +-
+ drivers/video/da8xx-fb.c | 169 +++--
+ drivers/video/exynos/exynos_dp_core.c | 697 ++++++++++++--------
+ drivers/video/exynos/exynos_dp_core.h | 21 +-
+ drivers/video/exynos/exynos_dp_reg.c | 77 ++-
+ drivers/video/exynos/exynos_dp_reg.h | 3 +-
+ drivers/video/fsl-diu-fb.c | 201 +++---
+ drivers/video/omap2/Kconfig | 3 -
+ drivers/video/omap2/Makefile | 1 -
+ drivers/video/omap2/displays/panel-acx565akm.c | 23 -
+ drivers/video/omap2/displays/panel-generic-dpi.c | 36 -
+ .../omap2/displays/panel-lgphilips-lb035q02.c | 34 -
+ drivers/video/omap2/displays/panel-n8x0.c | 89 +--
+ .../omap2/displays/panel-nec-nl8048hl11-01b.c | 24 -
+ drivers/video/omap2/displays/panel-picodlp.c | 44 --
+ .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 17 -
+ drivers/video/omap2/displays/panel-taal.c | 72 --
+ drivers/video/omap2/displays/panel-tfp410.c | 33 -
+ .../video/omap2/displays/panel-tpo-td043mtea1.c | 20 -
+ drivers/video/omap2/dss/Kconfig | 35 +-
+ drivers/video/omap2/dss/Makefile | 4 +-
+ drivers/video/omap2/dss/apply.c | 85 ++-
+ drivers/video/omap2/dss/core.c | 42 +-
+ drivers/video/omap2/dss/dispc.c | 684 +++++++++++--------
+ drivers/video/omap2/dss/display-sysfs.c | 321 +++++++++
+ drivers/video/omap2/dss/display.c | 368 +----------
+ drivers/video/omap2/dss/dpi.c | 101 ++-
+ drivers/video/omap2/dss/dsi.c | 211 +++---
+ drivers/video/omap2/dss/dss.c | 111 +++-
+ drivers/video/omap2/dss/dss.h | 83 +--
+ drivers/video/omap2/dss/dss_features.c | 73 +-
+ drivers/video/omap2/dss/dss_features.h | 7 +-
+ drivers/video/omap2/dss/hdmi.c | 149 +++--
+ drivers/video/omap2/dss/hdmi_panel.c | 82 +--
+ drivers/video/omap2/dss/rfbi.c | 2 +-
+ drivers/video/omap2/dss/sdi.c | 2 +-
+ drivers/video/omap2/dss/ti_hdmi.h | 3 +
+ drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 11 +-
+ drivers/video/omap2/dss/venc.c | 2 +-
+ drivers/video/omap2/dss/venc_panel.c | 19 -
+ drivers/video/omap2/omapfb/Kconfig | 1 -
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 17 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 182 +++--
+ drivers/video/omap2/omapfb/omapfb-sysfs.c | 2 +-
+ drivers/video/omap2/omapfb/omapfb.h | 5 +
+ drivers/video/omap2/vram.c | 514 ---------------
+ drivers/video/omap2/vrfb.c | 142 +++-
+ drivers/video/s3c-fb.c | 24 +-
+ drivers/video/sh_mipi_dsi.c | 69 +-
+ drivers/video/sh_mobile_lcdcfb.c | 74 ++-
+ drivers/video/sh_mobile_lcdcfb.h | 1 +
+ include/linux/fsl-diu-fb.h | 9 +
+ include/video/da8xx-fb.h | 25 +-
+ include/video/omapdss.h | 24 +-
+ .../plat/vrfb.h => include/video/omapvrfb.h | 2 +
+ include/video/samsung_fimd.h | 168 ++---
+ include/video/sh_mipi_dsi.h | 4 +-
+ include/video/sh_mobile_lcdc.h | 1 -
+ 84 files changed, 2741 insertions(+), 3066 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/video/exynos_dp.txt
+ delete mode 100644 arch/arm/plat-omap/include/plat/vram.h
+ create mode 100644 drivers/video/omap2/dss/display-sysfs.c
+ delete mode 100644 drivers/video/omap2/vram.c
+ rename arch/arm/plat-omap/include/plat/vrfb.h => include/video/omapvrfb.h (95%)
+Merging regulator/for-next (4736661 Merge remote-tracking branches 'regulator/fix/wm831x', 'regulator/topic/arizona', 'regulator/topic/as3711', 'regulator/topic/da9052', 'regulator/topic/da9055', 'regulator/topic/log', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/max8973', 'regulator/topic/max8997', 'regulator/topic/min', 'regulator/topic/s2mps11', 'regulator/topic/stub', 'regulator/topic/tol', 'regulator/topic/tps65090', 'regulator/topic/tps6586x', 'regulator/topic/tps65910' and 'regulator/topic/tps80031' into regulator-next)
+$ git merge regulator/for-next
+Resolved 'include/linux/mfd/tps65090.h' using previous resolution.
+Removing include/linux/regulator/tps65090-regulator.h
+Auto-merging include/linux/mfd/tps6586x.h
+Auto-merging include/linux/mfd/tps65090.h
+CONFLICT (content): Merge conflict in include/linux/mfd/tps65090.h
+Auto-merging include/linux/mfd/da9055/pdata.h
+Auto-merging drivers/mfd/wm5102-tables.c
+Auto-merging drivers/mfd/tps6586x.c
+Auto-merging drivers/mfd/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c05998c] Merge remote-tracking branch 'regulator/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/regulator/gpio-regulator.txt | 37 +
+ .../bindings/regulator/max8925-regulator.txt | 40 +
+ .../bindings/regulator/max8997-regulator.txt | 146 ++++
+ .../devicetree/bindings/regulator/vexpress.txt | 32 +
+ drivers/mfd/Kconfig | 1 -
+ drivers/mfd/max8997.c | 73 +-
+ drivers/mfd/tps6586x.c | 76 +-
+ drivers/mfd/wm5102-tables.c | 3 +
+ drivers/regulator/88pm8607.c | 6 +-
+ drivers/regulator/Kconfig | 54 ++
+ drivers/regulator/Makefile | 6 +
+ drivers/regulator/aat2870-regulator.c | 4 +-
+ drivers/regulator/ab3100.c | 6 +-
+ drivers/regulator/ab8500.c | 12 +-
+ drivers/regulator/ad5398.c | 6 +-
+ drivers/regulator/anatop-regulator.c | 6 +-
+ drivers/regulator/arizona-ldo1.c | 136 +++-
+ drivers/regulator/arizona-micsupp.c | 8 +-
+ drivers/regulator/as3711-regulator.c | 369 +++++++++
+ drivers/regulator/core.c | 20 +-
+ drivers/regulator/da903x.c | 6 +-
+ drivers/regulator/da9052-regulator.c | 16 +-
+ drivers/regulator/da9055-regulator.c | 641 ++++++++++++++++
+ drivers/regulator/db8500-prcmu.c | 6 +-
+ drivers/regulator/dbx500-prcmu.c | 4 +-
+ drivers/regulator/dummy.c | 2 +-
+ drivers/regulator/fan53555.c | 6 +-
+ drivers/regulator/fixed.c | 6 +-
+ drivers/regulator/gpio-regulator.c | 106 ++-
+ drivers/regulator/isl6271a-regulator.c | 6 +-
+ drivers/regulator/lp3971.c | 8 +-
+ drivers/regulator/lp3972.c | 8 +-
+ drivers/regulator/lp872x.c | 4 +-
+ drivers/regulator/lp8788-buck.c | 6 +-
+ drivers/regulator/lp8788-ldo.c | 14 +-
+ drivers/regulator/max1586.c | 6 +-
+ drivers/regulator/max77686.c | 170 ++++-
+ drivers/regulator/max8649.c | 6 +-
+ drivers/regulator/max8660.c | 6 +-
+ drivers/regulator/max8907-regulator.c | 6 +-
+ drivers/regulator/max8925-regulator.c | 78 +-
+ drivers/regulator/max8952.c | 6 +-
+ drivers/regulator/max8973-regulator.c | 505 +++++++++++++
+ drivers/regulator/max8997.c | 187 ++++-
+ drivers/regulator/max8998.c | 6 +-
+ drivers/regulator/mc13783-regulator.c | 6 +-
+ drivers/regulator/mc13892-regulator.c | 6 +-
+ drivers/regulator/mc13xxx-regulator-core.c | 4 +-
+ drivers/regulator/palmas-regulator.c | 45 +-
+ drivers/regulator/pcap-regulator.c | 6 +-
+ drivers/regulator/pcf50633-regulator.c | 182 +----
+ drivers/regulator/rc5t583-regulator.c | 6 +-
+ drivers/regulator/s2mps11.c | 16 +-
+ drivers/regulator/s5m8767.c | 6 +-
+ drivers/regulator/tps51632-regulator.c | 327 ++++++++
+ drivers/regulator/tps6105x-regulator.c | 6 +-
+ drivers/regulator/tps62360-regulator.c | 8 +-
+ drivers/regulator/tps65023-regulator.c | 6 +-
+ drivers/regulator/tps6507x-regulator.c | 6 +-
+ drivers/regulator/tps65090-regulator.c | 254 +++++--
+ drivers/regulator/tps65217-regulator.c | 6 +-
+ drivers/regulator/tps6524x-regulator.c | 4 +-
+ drivers/regulator/tps6586x-regulator.c | 189 ++++-
+ drivers/regulator/tps65910-regulator.c | 13 +-
+ drivers/regulator/tps65912-regulator.c | 6 +-
+ drivers/regulator/tps80031-regulator.c | 795 ++++++++++++++++++++
+ drivers/regulator/twl-regulator.c | 6 +-
+ drivers/regulator/vexpress.c | 147 ++++
+ drivers/regulator/virtual.c | 6 +-
+ drivers/regulator/wm831x-dcdc.c | 28 +-
+ drivers/regulator/wm831x-isink.c | 6 +-
+ drivers/regulator/wm831x-ldo.c | 18 +-
+ drivers/regulator/wm8400-regulator.c | 6 +-
+ drivers/regulator/wm8994-regulator.c | 6 +-
+ include/linux/mfd/arizona/registers.h | 16 +
+ include/linux/mfd/da9055/pdata.h | 27 +-
+ include/linux/mfd/max8997-private.h | 1 +
+ include/linux/mfd/max8997.h | 1 +
+ include/linux/mfd/tps65090.h | 35 +
+ include/linux/mfd/tps6586x.h | 3 +
+ include/linux/regulator/consumer.h | 12 +
+ include/linux/regulator/driver.h | 5 +
+ include/linux/regulator/max8973-regulator.h | 72 ++
+ include/linux/regulator/tps51632-regulator.h | 47 ++
+ include/linux/regulator/tps65090-regulator.h | 50 --
+ 85 files changed, 4616 insertions(+), 629 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max8925-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max8997-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt
+ create mode 100644 drivers/regulator/as3711-regulator.c
+ create mode 100644 drivers/regulator/da9055-regulator.c
+ create mode 100644 drivers/regulator/max8973-regulator.c
+ create mode 100644 drivers/regulator/tps51632-regulator.c
+ create mode 100644 drivers/regulator/tps80031-regulator.c
+ create mode 100644 drivers/regulator/vexpress.c
+ create mode 100644 include/linux/regulator/max8973-regulator.h
+ create mode 100644 include/linux/regulator/tps51632-regulator.h
+ delete mode 100644 include/linux/regulator/tps65090-regulator.h
+Merging security/next (c91c1bf Smack: create a sysfs mount point for smackfs)
+$ git merge security/next
+Resolved 'net/dns_resolver/dns_key.c' using previous resolution.
+Resolved 'security/keys/keyctl.c' using previous resolution.
+Resolved 'security/keys/keyring.c' using previous resolution.
+Resolved 'security/keys/process_keys.c' using previous resolution.
+Auto-merging security/keys/request_key.c
+Auto-merging security/keys/process_keys.c
+CONFLICT (content): Merge conflict in security/keys/process_keys.c
+Auto-merging security/keys/keyring.c
+CONFLICT (content): Merge conflict in security/keys/keyring.c
+Auto-merging security/keys/keyctl.c
+CONFLICT (content): Merge conflict in security/keys/keyctl.c
+Auto-merging security/keys/key.c
+Auto-merging net/dns_resolver/dns_key.c
+CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
+Auto-merging kernel/cred.c
+Auto-merging include/linux/key.h
+Auto-merging fs/nfs/idmap.c
+Auto-merging fs/cifs/cifsacl.c
+Auto-merging arch/x86/kernel/vsyscall_64.c
+Auto-merging Documentation/security/keys.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master dc393dd] Merge remote-tracking branch 'security/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/prctl/seccomp_filter.txt | 74 +++++++++++++++++--
+ Documentation/security/keys.txt | 17 +++++
+ arch/x86/kernel/vsyscall_64.c | 110 ++++++++++++++-------------
+ drivers/char/tpm/tpm_ibmvtpm.c | 81 +++++++-------------
+ drivers/char/tpm/tpm_ibmvtpm.h | 5 +-
+ fs/cifs/cifsacl.c | 12 +--
+ fs/nfs/idmap.c | 12 +--
+ include/linux/cred.h | 17 +----
+ include/linux/key.h | 1 +
+ kernel/cred.c | 127 ++++----------------------------
+ kernel/seccomp.c | 13 +++-
+ net/dns_resolver/dns_key.c | 9 +--
+ security/keys/key.c | 6 +-
+ security/keys/keyctl.c | 15 ++--
+ security/keys/keyring.c | 10 +--
+ security/keys/process_keys.c | 94 ++++++++++-------------
+ security/keys/request_key.c | 21 ++++--
+ security/smack/Kconfig | 5 +-
+ security/smack/smackfs.c | 17 +++++
+ security/yama/yama_lsm.c | 88 +++++++++++++++-------
+ 20 files changed, 365 insertions(+), 369 deletions(-)
+Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
+$ git merge selinux/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/davinci_wdt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (f6cffc1 Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'arm/exynos', 'x86/vt-d' and 'arm/tegra' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API-HOWTO.txt | 126 ++++++++++++++++++++++
+ Documentation/DMA-API.txt | 12 +++
+ arch/arm64/include/asm/dma-mapping.h | 1 +
+ arch/c6x/include/asm/dma-mapping.h | 1 +
+ arch/ia64/include/asm/dma-mapping.h | 1 +
+ arch/mips/include/asm/dma-mapping.h | 2 +
+ arch/powerpc/include/asm/dma-mapping.h | 1 +
+ arch/sh/include/asm/dma-mapping.h | 1 +
+ arch/sparc/include/asm/dma-mapping.h | 1 +
+ arch/tile/include/asm/dma-mapping.h | 1 +
+ arch/x86/include/asm/dma-mapping.h | 1 +
+ drivers/iommu/Kconfig | 2 +-
+ drivers/iommu/amd_iommu.c | 184 ++++++++++++++++++++++++--------
+ drivers/iommu/amd_iommu_types.h | 1 +
+ drivers/iommu/exynos-iommu.c | 29 ++++-
+ drivers/iommu/intel-iommu.c | 31 ++++++
+ drivers/iommu/tegra-gart.c | 2 +-
+ drivers/iommu/tegra-smmu.c | 6 +-
+ include/linux/dma-debug.h | 7 ++
+ lib/dma-debug.c | 66 ++++++++++--
+ 20 files changed, 415 insertions(+), 61 deletions(-)
+Merging vfio/next (74d8627 vfio-pci: Enable device before attempting reset)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci.c | 83 ++++++++++++++++++++++++-------------------
+ drivers/vfio/vfio.c | 34 +++++++++---------
+ 2 files changed, 64 insertions(+), 53 deletions(-)
+Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
+$ 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 trivial/for-next (8fdbb34 messages: i2o: Fix typo in messages/i2o)
+$ git merge trivial/for-next
+Auto-merging sound/pci/ice1712/delta.c
+Auto-merging sound/pci/es1968.c
+Auto-merging net/mac80211/driver-ops.h
+Auto-merging net/ipv4/tcp_cong.c
+Auto-merging mm/memory_hotplug.c
+Auto-merging include/linux/stmmac.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/linux/lru_cache.h
+Auto-merging fs/jbd2/transaction.c
+Auto-merging fs/jbd/transaction.c
+Auto-merging fs/fhandle.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging drivers/vhost/tcm_vhost.c
+Auto-merging drivers/target/iscsi/iscsi_target_util.c
+Auto-merging drivers/target/iscsi/iscsi_target_configfs.c
+Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+Auto-merging drivers/regulator/palmas-regulator.c
+Auto-merging drivers/net/ethernet/micrel/ksz884x.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/eq.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+Auto-merging drivers/mtd/nand/s3c2410.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+Auto-merging drivers/gpu/drm/radeon/si.c
+Auto-merging drivers/gpu/drm/radeon/evergreen.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/dev-kmsg | 2 +-
+ Documentation/ABI/testing/sysfs-devices-power | 2 +-
+ Documentation/ABI/testing/sysfs-driver-ppi | 2 +-
+ Documentation/accounting/getdelays.c | 1 -
+ Documentation/dma-buf-sharing.txt | 4 +--
+ Documentation/dontdiff | 1 -
+ .../fault-injection/notifier-error-inject.txt | 4 +--
+ Documentation/hid/uhid.txt | 2 +-
+ Documentation/hwmon/pmbus | 2 +-
+ Documentation/input/alps.txt | 2 +-
+ Documentation/kbuild/modules.txt | 2 +-
+ Documentation/kernel-doc-nano-HOWTO.txt | 13 ++++++--
+ Documentation/misc-devices/mei/mei-amt-version.c | 4 +--
+ Documentation/video4linux/bttv/Cards | 2 +-
+ Documentation/video4linux/bttv/Sound-FAQ | 2 +-
+ Documentation/vm/frontswap.txt | 2 +-
+ README | 4 +++
+ arch/alpha/kernel/pci_iommu.c | 12 +++----
+ arch/arm/kernel/kprobes-test.c | 2 +-
+ arch/arm/mach-s3c24xx/include/mach/bast-map.h | 2 +-
+ arch/arm/mach-s3c24xx/include/mach/dma.h | 2 +-
+ arch/arm/mach-s3c24xx/include/mach/vr1000-map.h | 2 +-
+ arch/arm/mach-s3c24xx/pm.c | 2 +-
+ arch/arm/plat-s3c24xx/dma.c | 2 +-
+ arch/blackfin/mm/sram-alloc.c | 2 +-
+ arch/cris/include/arch-v10/arch/irq.h | 2 +-
+ arch/cris/include/arch-v32/arch/irq.h | 2 +-
+ arch/ia64/kvm/kvm-ia64.c | 2 +-
+ arch/m68k/math-emu/fp_log.c | 2 +-
+ arch/mips/txx9/generic/pci.c | 2 +-
+ arch/powerpc/include/asm/oprofile_impl.h | 2 +-
+ arch/powerpc/include/asm/pte-hash64-64k.h | 2 +-
+ arch/powerpc/include/asm/smu.h | 4 +--
+ arch/powerpc/kernel/legacy_serial.c | 2 +-
+ arch/powerpc/kernel/of_platform.c | 2 +-
+ arch/powerpc/kernel/signal_64.c | 2 +-
+ arch/powerpc/mm/slice.c | 2 +-
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +-
+ arch/powerpc/platforms/cell/iommu.c | 2 +-
+ arch/powerpc/platforms/cell/spider-pic.c | 6 ++--
+ arch/powerpc/platforms/powermac/pic.c | 2 +-
+ arch/sh/boards/board-espt.c | 2 +-
+ arch/x86/boot/.gitignore | 1 -
+ drivers/acpi/acpica/dsopcode.c | 2 +-
+ drivers/base/firmware_class.c | 2 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 2 +-
+ drivers/char/ppdev.c | 6 +---
+ drivers/eisa/eisa.ids | 4 +--
+ drivers/firewire/init_ohci1394_dma.c | 4 +--
+ drivers/firewire/ohci.c | 2 +-
+ drivers/gpu/drm/radeon/evergreen.c | 2 +-
+ drivers/gpu/drm/radeon/ni.c | 4 +--
+ drivers/gpu/drm/radeon/radeon_ring.c | 4 +--
+ drivers/gpu/drm/radeon/si.c | 6 ++--
+ drivers/i2c/busses/i2c-nuc900.c | 2 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 4 +--
+ drivers/isdn/hisax/amd7930_fn.c | 2 +-
+ drivers/isdn/hisax/isar.c | 2 +-
+ drivers/md/md.c | 2 +-
+ drivers/md/persistent-data/dm-block-manager.c | 4 +--
+ drivers/md/persistent-data/dm-btree.h | 2 +-
+ drivers/md/raid5.c | 2 +-
+ drivers/message/i2o/README.ioctl | 12 +++----
+ drivers/message/i2o/i2o_block.c | 2 +-
+ drivers/message/i2o/i2o_config.c | 2 +-
+ drivers/mtd/maps/plat-ram.c | 2 +-
+ drivers/mtd/nand/s3c2410.c | 2 +-
+ drivers/net/bonding/bonding.h | 2 +-
+ drivers/net/ethernet/8390/ax88796.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 2 +-
+ .../myricom/myri10ge/myri10ge_mcp_gen_header.h | 2 +-
+ drivers/net/sungem_phy.c | 8 ++---
+ drivers/net/wimax/i2400m/debugfs.c | 1 +
+ drivers/net/wireless/atmel.c | 2 +-
+ drivers/net/wireless/ipw2x00/ipw2100.h | 2 +-
+ drivers/net/wireless/zd1211rw/zd_chip.c | 2 +-
+ drivers/regulator/palmas-regulator.c | 2 +-
+ drivers/rtc/rtc-isl1208.c | 2 +-
+ drivers/rtc/rtc-s3c.c | 2 +-
+ drivers/s390/block/dasd_devmap.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +-
+ drivers/scsi/libsas/sas_expander.c | 2 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 4 +--
+ drivers/scsi/qla2xxx/qla_nx.c | 4 +--
+ drivers/scsi/qla2xxx/qla_target.c | 12 +++----
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +-
+ drivers/staging/comedi/drivers/usbdux.c | 2 +-
+ drivers/staging/csr/netdev.c | 2 +-
+ drivers/staging/tidspbridge/rmgr/node.c | 2 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 2 +-
+ drivers/target/iscsi/iscsi_target_erl0.c | 6 ++--
+ drivers/target/iscsi/iscsi_target_parameters.c | 1 +
+ drivers/target/iscsi/iscsi_target_util.c | 2 +-
+ drivers/tty/hvc/hvc_opal.c | 2 +-
+ drivers/tty/hvc/hvc_vio.c | 2 +-
+ drivers/tty/ipwireless/setup_protocol.h | 2 +-
+ drivers/tty/serial/8250/Kconfig | 2 +-
+ drivers/tty/serial/bfin_uart.c | 2 +-
+ drivers/tty/serial/icom.c | 2 +-
+ drivers/usb/core/driver.c | 2 +-
+ drivers/usb/gadget/at91_udc.c | 2 +-
+ drivers/usb/gadget/tcm_usb_gadget.c | 2 +-
+ drivers/usb/storage/realtek_cr.c | 2 +-
+ drivers/vhost/tcm_vhost.c | 2 +-
+ drivers/watchdog/booke_wdt.c | 2 +-
+ drivers/xen/xen-pciback/pci_stub.c | 2 +-
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/extent-tree.c | 2 +-
+ fs/btrfs/extent_map.c | 3 +-
+ fs/btrfs/ordered-data.h | 2 +-
+ fs/btrfs/volumes.c | 2 +-
+ fs/cifs/README | 2 +-
+ fs/ext4/ext4.h | 2 +-
+ fs/fhandle.c | 4 +--
+ fs/jbd/transaction.c | 2 +-
+ fs/jbd2/transaction.c | 2 +-
+ fs/logfs/inode.c | 2 +-
+ fs/notify/fanotify/Kconfig | 2 +-
+ fs/notify/notification.c | 2 +-
+ include/linux/dlm.h | 2 +-
+ include/linux/ipmi_smi.h | 2 +-
+ include/linux/lru_cache.h | 4 +--
+ include/linux/netdevice.h | 2 +-
+ include/linux/stmmac.h | 2 +-
+ include/linux/vgaarb.h | 4 +--
+ include/linux/watchdog.h | 2 +-
+ include/net/irda/irlmp.h | 2 +-
+ include/net/sock.h | 2 +-
+ mm/memory_hotplug.c | 6 ++--
+ mm/util.c | 2 +-
+ net/can/proc.c | 2 +-
+ net/ipv4/tcp_cong.c | 2 +-
+ net/mac80211/driver-ops.h | 2 +-
+ net/netfilter/nf_log.c | 2 +-
+ net/rfkill/core.c | 4 +--
+ net/sctp/endpointola.c | 2 +-
+ net/sctp/sm_statefuns.c | 2 +-
+ scripts/kernel-doc | 34 ++++++++++++++++++++
+ sound/core/seq/seq_device.c | 2 +-
+ sound/pci/emu10k1/emu10k1_patch.c | 2 +-
+ sound/pci/es1968.c | 2 +-
+ sound/pci/ice1712/delta.c | 2 +-
+ sound/pci/sis7019.c | 2 +-
+ sound/usb/quirks.c | 2 +-
+ usr/gen_init_cpio.c | 1 -
+ 149 files changed, 230 insertions(+), 196 deletions(-)
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (5d699e5 Merge branch 'acpi-enumeration-next' into linux-next)
+$ git merge pm/linux-next
+Auto-merging include/linux/freezer.h
+Auto-merging drivers/mtd/nand/sh_flctl.c
+Auto-merging drivers/mmc/host/Makefile
+Auto-merging drivers/mmc/host/Kconfig
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/acpi/thermal.c
+Auto-merging drivers/acpi/pci_irq.c
+Auto-merging drivers/acpi/acpica/dsopcode.c
+Auto-merging arch/arm/Kconfig
+Auto-merging Documentation/ABI/testing/sysfs-devices-power
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-devices-power | 31 +
+ Documentation/ABI/testing/sysfs-devices-sun | 14 +
+ .../devicetree/bindings/cpufreq/cpufreq-spear.txt | 42 ++
+ Documentation/power/pm_qos_interface.txt | 2 +-
+ arch/arm/Kconfig | 1 +
+ arch/ia64/include/asm/device.h | 3 -
+ arch/ia64/kernel/acpi.c | 2 +
+ arch/powerpc/platforms/pseries/processor_idle.c | 4 +-
+ arch/x86/include/asm/device.h | 3 -
+ arch/x86/kernel/acpi/boot.c | 6 +
+ arch/x86/kernel/acpi/sleep.c | 2 +
+ drivers/acpi/Kconfig | 6 +
+ drivers/acpi/Makefile | 6 +-
+ drivers/acpi/acpi_i2c.c | 103 +++
+ drivers/acpi/acpi_memhotplug.c | 193 +++--
+ drivers/acpi/acpi_pad.c | 8 +-
+ drivers/acpi/acpi_platform.c | 104 +++
+ drivers/acpi/acpica/Makefile | 3 +
+ drivers/acpi/acpica/acdebug.h | 94 ++-
+ drivers/acpi/acpica/acdispat.h | 11 +-
+ drivers/acpi/acpica/acevents.h | 6 +-
+ drivers/acpi/acpica/acglobal.h | 73 +-
+ drivers/acpi/acpica/aclocal.h | 16 +-
+ drivers/acpi/acpica/acmacros.h | 163 ++---
+ drivers/acpi/acpica/acobject.h | 7 +-
+ drivers/acpi/acpica/acopcode.h | 6 +-
+ drivers/acpi/acpica/acparser.h | 3 +-
+ drivers/acpi/acpica/acpredef.h | 11 +-
+ drivers/acpi/acpica/acstruct.h | 2 +-
+ drivers/acpi/acpica/acutils.h | 58 +-
+ drivers/acpi/acpica/amlresrc.h | 1 -
+ drivers/acpi/acpica/dscontrol.c | 2 +-
+ drivers/acpi/acpica/dsfield.c | 2 +-
+ drivers/acpi/acpica/dsmethod.c | 6 +-
+ drivers/acpi/acpica/dsmthdat.c | 14 +-
+ drivers/acpi/acpica/dsobject.c | 6 +-
+ drivers/acpi/acpica/dsopcode.c | 3 +-
+ drivers/acpi/acpica/dsutils.c | 33 +-
+ drivers/acpi/acpica/dswexec.c | 10 +-
+ drivers/acpi/acpica/dswload2.c | 4 +-
+ drivers/acpi/acpica/dswstate.c | 26 +-
+ drivers/acpi/acpica/evgpe.c | 20 +-
+ drivers/acpi/acpica/evgpeblk.c | 3 +-
+ drivers/acpi/acpica/evgpeutil.c | 3 +-
+ drivers/acpi/acpica/evrgnini.c | 7 +-
+ drivers/acpi/acpica/evxface.c | 2 +-
+ drivers/acpi/acpica/evxfgpe.c | 13 +-
+ drivers/acpi/acpica/exconvrt.c | 4 +-
+ drivers/acpi/acpica/excreate.c | 9 +-
+ drivers/acpi/acpica/exdebug.c | 10 +-
+ drivers/acpi/acpica/exdump.c | 20 +-
+ drivers/acpi/acpica/exfield.c | 4 +-
+ drivers/acpi/acpica/exfldio.c | 15 +-
+ drivers/acpi/acpica/exmisc.c | 5 +-
+ drivers/acpi/acpica/exmutex.c | 9 +-
+ drivers/acpi/acpica/exnames.c | 9 +-
+ drivers/acpi/acpica/exoparg1.c | 11 +-
+ drivers/acpi/acpica/exoparg2.c | 2 +-
+ drivers/acpi/acpica/exoparg3.c | 3 +-
+ drivers/acpi/acpica/exoparg6.c | 5 +-
+ drivers/acpi/acpica/exprep.c | 13 +-
+ drivers/acpi/acpica/exregion.c | 3 +-
+ drivers/acpi/acpica/exresnte.c | 9 +-
+ drivers/acpi/acpica/exresolv.c | 3 +-
+ drivers/acpi/acpica/exresop.c | 8 +-
+ drivers/acpi/acpica/exstore.c | 4 +-
+ drivers/acpi/acpica/exstoren.c | 11 +-
+ drivers/acpi/acpica/exstorob.c | 5 +-
+ drivers/acpi/acpica/exsystem.c | 9 +-
+ drivers/acpi/acpica/exutils.c | 5 +-
+ drivers/acpi/acpica/hwacpi.c | 3 +-
+ drivers/acpi/acpica/hwgpe.c | 4 +-
+ drivers/acpi/acpica/hwpci.c | 4 +-
+ drivers/acpi/acpica/hwregs.c | 1 -
+ drivers/acpi/acpica/hwtimer.c | 6 +-
+ drivers/acpi/acpica/hwvalid.c | 1 -
+ drivers/acpi/acpica/hwxface.c | 1 -
+ drivers/acpi/acpica/hwxfsleep.c | 12 +-
+ drivers/acpi/acpica/nsaccess.c | 7 +-
+ drivers/acpi/acpica/nsalloc.c | 4 +-
+ drivers/acpi/acpica/nsdump.c | 10 +-
+ drivers/acpi/acpica/nsinit.c | 4 +-
+ drivers/acpi/acpica/nsload.c | 10 +-
+ drivers/acpi/acpica/nsnames.c | 2 +-
+ drivers/acpi/acpica/nsobject.c | 8 +-
+ drivers/acpi/acpica/nsparse.c | 8 +-
+ drivers/acpi/acpica/nssearch.c | 17 +-
+ drivers/acpi/acpica/nsutils.c | 18 +-
+ drivers/acpi/acpica/nswalk.c | 10 +-
+ drivers/acpi/acpica/nsxfeval.c | 20 +-
+ drivers/acpi/acpica/nsxfname.c | 66 +-
+ drivers/acpi/acpica/nsxfobj.c | 4 +-
+ drivers/acpi/acpica/psargs.c | 8 +-
+ drivers/acpi/acpica/psloop.c | 61 +-
+ drivers/acpi/acpica/psopcode.c | 29 +-
+ drivers/acpi/acpica/psparse.c | 13 +-
+ drivers/acpi/acpica/psutils.c | 4 +-
+ drivers/acpi/acpica/rscalc.c | 14 +-
+ drivers/acpi/acpica/rslist.c | 4 +-
+ drivers/acpi/acpica/tbfind.c | 2 +-
+ drivers/acpi/acpica/tbinstal.c | 2 +
+ drivers/acpi/acpica/tbutils.c | 2 +-
+ drivers/acpi/acpica/tbxface.c | 4 +-
+ drivers/acpi/acpica/tbxfload.c | 2 +-
+ drivers/acpi/acpica/tbxfroot.c | 3 +-
+ drivers/acpi/acpica/utcache.c | 323 +++++++++
+ drivers/acpi/acpica/utclib.c | 749 ++++++++++++++++++++
+ drivers/acpi/acpica/utdebug.c | 37 +-
+ drivers/acpi/acpica/utids.c | 104 ++-
+ drivers/acpi/acpica/utmath.c | 2 +-
+ drivers/acpi/acpica/utmisc.c | 150 +++-
+ drivers/acpi/acpica/utmutex.c | 14 +-
+ drivers/acpi/acpica/utobject.c | 8 +-
+ drivers/acpi/acpica/utstate.c | 2 +-
+ drivers/acpi/acpica/uttrack.c | 692 ++++++++++++++++++
+ drivers/acpi/acpica/utxface.c | 5 +-
+ drivers/acpi/acpica/utxferror.c | 2 +-
+ drivers/acpi/apei/ghes.c | 2 +-
+ drivers/acpi/battery.c | 77 ++
+ drivers/acpi/bus.c | 21 +-
+ drivers/acpi/container.c | 27 +-
+ drivers/acpi/device_pm.c | 668 +++++++++++++++++
+ drivers/acpi/dock.c | 56 +-
+ drivers/acpi/ec.c | 97 +--
+ drivers/acpi/glue.c | 56 +-
+ drivers/acpi/hed.c | 2 +-
+ drivers/acpi/internal.h | 11 +-
+ drivers/acpi/osl.c | 22 +-
+ drivers/acpi/pci_irq.c | 15 +-
+ drivers/acpi/power.c | 2 +-
+ drivers/acpi/proc.c | 11 +-
+ drivers/acpi/processor_driver.c | 74 +-
+ drivers/acpi/processor_idle.c | 57 +-
+ drivers/acpi/resource.c | 526 ++++++++++++++
+ drivers/acpi/scan.c | 137 +++-
+ drivers/acpi/sleep.c | 203 +-----
+ drivers/acpi/sysfs.c | 4 +-
+ drivers/acpi/thermal.c | 34 +
+ drivers/acpi/utils.c | 38 +
+ drivers/base/core.c | 2 +-
+ drivers/base/platform.c | 26 +-
+ drivers/base/power/clock_ops.c | 6 +-
+ drivers/base/power/domain.c | 11 +-
+ drivers/base/power/opp.c | 44 +-
+ drivers/base/power/power.h | 6 +-
+ drivers/base/power/qos.c | 321 +++++++--
+ drivers/base/power/sysfs.c | 94 ++-
+ drivers/cpufreq/Kconfig.arm | 7 +
+ drivers/cpufreq/Makefile | 5 +-
+ drivers/cpufreq/cpufreq-cpu0.c | 2 +-
+ drivers/cpufreq/cpufreq.c | 37 +-
+ drivers/cpufreq/cpufreq_conservative.c | 558 ++++-----------
+ drivers/cpufreq/cpufreq_governor.c | 318 +++++++++
+ drivers/cpufreq/cpufreq_governor.h | 176 +++++
+ drivers/cpufreq/cpufreq_ondemand.c | 731 ++++++-------------
+ drivers/cpufreq/cpufreq_performance.c | 2 +
+ drivers/cpufreq/cpufreq_powersave.c | 2 +
+ drivers/cpufreq/cpufreq_stats.c | 4 +-
+ drivers/cpufreq/cpufreq_userspace.c | 2 +
+ drivers/cpufreq/exynos-cpufreq.c | 11 +-
+ drivers/cpufreq/freq_table.c | 2 +
+ drivers/cpufreq/longhaul.c | 4 +-
+ drivers/cpufreq/powernow-k8.c | 4 +-
+ drivers/cpufreq/spear-cpufreq.c | 291 ++++++++
+ drivers/cpuidle/Kconfig | 9 +
+ drivers/cpuidle/cpuidle.c | 55 +-
+ drivers/cpuidle/cpuidle.h | 13 +-
+ drivers/cpuidle/driver.c | 209 +++++-
+ drivers/cpuidle/governors/menu.c | 168 ++++-
+ drivers/cpuidle/sysfs.c | 201 +++++-
+ drivers/devfreq/devfreq.c | 4 +-
+ drivers/gpio/Kconfig | 4 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpiolib-acpi.c | 54 ++
+ drivers/i2c/i2c-core.c | 6 +
+ drivers/idle/intel_idle.c | 14 +-
+ drivers/mmc/host/Kconfig | 12 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/sdhci-acpi.c | 304 ++++++++
+ drivers/mtd/nand/sh_flctl.c | 4 +-
+ drivers/pci/pci-acpi.c | 79 +--
+ drivers/pnp/base.h | 2 +
+ drivers/pnp/pnpacpi/core.c | 4 +
+ drivers/pnp/pnpacpi/rsparser.c | 296 +-------
+ drivers/pnp/resource.c | 16 +
+ drivers/spi/spi.c | 103 ++-
+ include/acpi/acconfig.h | 1 +
+ include/acpi/acexcep.h | 2 +-
+ include/acpi/acnames.h | 1 +
+ include/acpi/acpi_bus.h | 78 +-
+ include/acpi/acpiosxf.h | 3 +-
+ include/acpi/acpixf.h | 18 +-
+ include/acpi/actbl3.h | 22 +-
+ include/acpi/actypes.h | 42 +-
+ include/linux/acpi.h | 135 +++-
+ include/linux/acpi_gpio.h | 19 +
+ include/linux/cpufreq.h | 5 +-
+ include/linux/cpuidle.h | 15 +-
+ include/linux/device.h | 18 +
+ include/linux/freezer.h | 1 +
+ include/linux/i2c.h | 9 +
+ include/linux/platform_device.h | 1 +
+ include/linux/pm.h | 3 +-
+ include/linux/pm_qos.h | 77 +-
+ include/linux/tick.h | 6 +
+ kernel/cpu.c | 8 +-
+ kernel/power/main.c | 2 +-
+ kernel/power/qos.c | 65 +-
+ kernel/power/swap.c | 2 +-
+ kernel/time/tick-sched.c | 4 +
+ tools/power/cpupower/.gitignore | 7 +
+ tools/power/cpupower/Makefile | 3 +-
+ tools/power/cpupower/debug/i386/Makefile | 5 +-
+ tools/power/cpupower/man/cpupower-monitor.1 | 15 +-
+ tools/power/cpupower/utils/helpers/cpuid.c | 2 +
+ tools/power/cpupower/utils/helpers/helpers.h | 18 +-
+ tools/power/cpupower/utils/helpers/sysfs.c | 19 -
+ tools/power/cpupower/utils/helpers/topology.c | 53 +-
+ .../cpupower/utils/idle_monitor/cpupower-monitor.c | 21 +-
+ .../cpupower/utils/idle_monitor/cpupower-monitor.h | 17 +
+ tools/power/cpupower/utils/idle_monitor/snb_idle.c | 10 +-
+ 221 files changed, 8082 insertions(+), 2760 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-sun
+ create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-spear.txt
+ create mode 100644 drivers/acpi/acpi_i2c.c
+ create mode 100644 drivers/acpi/acpi_platform.c
+ create mode 100644 drivers/acpi/acpica/utcache.c
+ create mode 100644 drivers/acpi/acpica/utclib.c
+ create mode 100644 drivers/acpi/acpica/uttrack.c
+ create mode 100644 drivers/acpi/device_pm.c
+ create mode 100644 drivers/acpi/resource.c
+ create mode 100644 drivers/cpufreq/cpufreq_governor.c
+ create mode 100644 drivers/cpufreq/cpufreq_governor.h
+ create mode 100644 drivers/cpufreq/spear-cpufreq.c
+ create mode 100644 drivers/gpio/gpiolib-acpi.c
+ create mode 100644 drivers/mmc/host/sdhci-acpi.c
+ create mode 100644 include/linux/acpi_gpio.h
+Merging apm/for-next (fb9d78a 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 (1aec9c0 inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Resolved 'kernel/audit_tree.c' using previous resolution.
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+CONFLICT (content): Merge conflict in kernel/audit_tree.c
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/inotify/inotify_user.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Auto-merging fs/notify/fanotify/fanotify.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2dc0c91] Merge remote-tracking branch 'fsnotify/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/notify/dnotify/dnotify.c | 4 +-
+ fs/notify/fanotify/fanotify.c | 6 +++
+ fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
+ fs/notify/group.c | 47 ++++++++++--------
+ fs/notify/inode_mark.c | 14 ++++--
+ fs/notify/inotify/inotify_fsnotify.c | 4 +-
+ fs/notify/inotify/inotify_user.c | 34 ++++++-------
+ fs/notify/mark.c | 91 +++++++++++++++++++---------------
+ fs/notify/notification.c | 1 +
+ fs/notify/vfsmount_mark.c | 14 ++++--
+ include/linux/fsnotify_backend.h | 31 ++++++++----
+ kernel/audit_tree.c | 10 ++--
+ kernel/audit_watch.c | 4 +-
+ 13 files changed, 178 insertions(+), 119 deletions(-)
+Merging edac/linux_next (c215786 Merge branch 'fixes' into next)
+$ git merge edac/linux_next
+Auto-merging drivers/edac/edac_mc.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 21 +-
+ drivers/edac/i7300_edac.c | 8 +-
+ drivers/edac/i7core_edac.c | 6 +-
+ drivers/edac/i82975x_edac.c | 457 +++++++++++++++++++++++++------------------
+ drivers/edac/sb_edac.c | 2 +-
+ include/linux/edac.h | 1 -
+ 6 files changed, 291 insertions(+), 204 deletions(-)
+Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
+$ git merge edac-amd/for-next
+Auto-merging include/linux/edac.h
+Auto-merging drivers/edac/edac_mc.c
+Auto-merging drivers/edac/amd64_edac.h
+Auto-merging drivers/edac/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/edac/Kconfig | 8 +-
+ drivers/edac/amd64_edac.c | 297 +++++++++++++++------------------------
+ drivers/edac/amd64_edac.h | 59 ++++++--
+ drivers/edac/amd64_edac_inj.c | 128 +++++++++--------
+ drivers/edac/edac_mc.c | 57 ++++----
+ drivers/edac/edac_mc_sysfs.c | 39 +++--
+ drivers/edac/edac_module.c | 27 +++-
+ drivers/edac/edac_pci.c | 3 +-
+ drivers/edac/highbank_mc_edac.c | 8 +-
+ drivers/edac/mce_amd.c | 254 +++++++++++++++++----------------
+ drivers/edac/mce_amd.h | 11 +-
+ include/linux/edac.h | 3 +
+ 12 files changed, 456 insertions(+), 438 deletions(-)
+Merging devicetree/devicetree/next (f3b6159 of/spi: Honour "status=disabled" property of device)
+$ git merge devicetree/devicetree/next
+Auto-merging include/linux/of.h
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/of/base.c
+Auto-merging drivers/i2c/busses/i2c-ocores.c
+Auto-merging arch/powerpc/sysdev/fsl_pci.c
+Auto-merging arch/powerpc/platforms/pseries/reconfig.c
+Auto-merging arch/arm/include/asm/prom.h
+Auto-merging Documentation/devicetree/bindings/i2c/i2c-pxa.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/l2cc.txt | 2 +-
+ Documentation/devicetree/bindings/gpio/led.txt | 14 +--
+ .../bindings/i2c/{atmel-i2c.txt => i2c-at91.txt} | 0
+ .../bindings/i2c/{davinci.txt => i2c-davinci.txt} | 0
+ .../bindings/i2c/{gpio-i2c.txt => i2c-gpio.txt} | 0
+ .../bindings/i2c/{fsl-imx-i2c.txt => i2c-imx.txt} | 0
+ .../bindings/i2c/{fsl-i2c.txt => i2c-mpc.txt} | 0
+ .../bindings/i2c/{mux.txt => i2c-mux.txt} | 0
+ .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 18 ++++
+ .../bindings/i2c/{nomadik.txt => i2c-nomadik.txt} | 0
+ .../i2c/{cavium-i2c.txt => i2c-octeon.txt} | 0
+ .../bindings/i2c/{omap-i2c.txt => i2c-omap.txt} | 0
+ .../bindings/i2c/{pnx.txt => i2c-pnx.txt} | 0
+ .../i2c/{ce4100-i2c.txt => i2c-pxa-pci-ce4100.txt} | 0
+ .../bindings/i2c/{mrvl-i2c.txt => i2c-pxa.txt} | 18 ----
+ .../i2c/{samsung-i2c.txt => i2c-s3c2410.txt} | 0
+ .../bindings/i2c/{sirf-i2c.txt => i2c-sirf.txt} | 0
+ .../i2c/{arm-versatile.txt => i2c-versatile.txt} | 0
+ .../bindings/i2c/{xiic.txt => i2c-xiic.txt} | 0
+ Documentation/devicetree/bindings/leds/common.txt | 23 +++++
+ .../devicetree/bindings/vendor-prefixes.txt | 3 +
+ Documentation/devicetree/usage-model.txt | 2 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 4 +-
+ arch/arm/include/asm/prom.h | 2 +
+ arch/powerpc/platforms/powermac/pfunc_core.c | 2 +-
+ arch/powerpc/platforms/pseries/reconfig.c | 3 +-
+ arch/powerpc/sysdev/fsl_pci.c | 2 +-
+ arch/powerpc/sysdev/scom.c | 2 +-
+ arch/sparc/kernel/pci_impl.h | 2 +-
+ drivers/i2c/busses/i2c-ocores.c | 4 -
+ drivers/of/base.c | 99 ++++++++++++++++++--
+ drivers/of/fdt.c | 16 ++--
+ drivers/of/of_i2c.c | 2 +-
+ drivers/of/of_mdio.c | 2 +-
+ drivers/spi/spi.c | 2 +-
+ include/linux/of.h | 53 +++++++++--
+ scripts/dtc/Makefile | 2 +
+ 37 files changed, 212 insertions(+), 65 deletions(-)
+ rename Documentation/devicetree/bindings/i2c/{atmel-i2c.txt => i2c-at91.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{davinci.txt => i2c-davinci.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{gpio-i2c.txt => i2c-gpio.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{fsl-imx-i2c.txt => i2c-imx.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{fsl-i2c.txt => i2c-mpc.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{mux.txt => i2c-mux.txt} (100%)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
+ rename Documentation/devicetree/bindings/i2c/{nomadik.txt => i2c-nomadik.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{cavium-i2c.txt => i2c-octeon.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{omap-i2c.txt => i2c-omap.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{pnx.txt => i2c-pnx.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{ce4100-i2c.txt => i2c-pxa-pci-ce4100.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{mrvl-i2c.txt => i2c-pxa.txt} (70%)
+ rename Documentation/devicetree/bindings/i2c/{samsung-i2c.txt => i2c-s3c2410.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{sirf-i2c.txt => i2c-sirf.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{arm-versatile.txt => i2c-versatile.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{xiic.txt => i2c-xiic.txt} (100%)
+ create mode 100644 Documentation/devicetree/bindings/leds/common.txt
+Merging dt-rh/for-next (4a92a38 Merge remote-tracking branch 'grant/devicetree/next' into for-next)
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging spi/spi/next (7431798 of_spi: add generic binding support to specify cs gpio)
+$ git merge spi/spi/next
+Auto-merging drivers/spi/spi.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 20 ++++++++
+ drivers/spi/spi-bitbang.c | 27 +++++------
+ drivers/spi/spi-omap2-mcspi.c | 1 -
+ drivers/spi/spi.c | 54 +++++++++++++++++++--
+ include/linux/spi/spi.h | 3 ++
+ 5 files changed, 85 insertions(+), 20 deletions(-)
+Merging spi-mb/spi-next (170c2d0 Merge branch 'spi-mcspi' into spi-next)
+$ git merge spi-mb/spi-next
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-omap2-mcspi.c
+Merge made by the 'recursive' strategy.
+ .../bindings/spi/nvidia,tegra20-sflash.txt | 26 +
+ .../bindings/spi/nvidia,tegra20-slink.txt | 26 +
+ Documentation/devicetree/bindings/spi/omap-spi.txt | 4 +-
+ drivers/spi/Kconfig | 14 +
+ drivers/spi/Makefile | 3 +-
+ drivers/spi/spi-bcm63xx.c | 16 +-
+ drivers/spi/spi-omap2-mcspi.c | 64 +-
+ drivers/spi/spi-pl022.c | 52 +-
+ drivers/spi/spi-s3c64xx.c | 34 +-
+ drivers/spi/spi-tegra20-sflash.c | 665 ++++++++++
+ drivers/spi/spi-tegra20-slink.c | 1358 ++++++++++++++++++++
+ drivers/spi/spi.c | 16 +-
+ drivers/spi/spidev.c | 10 +
+ include/linux/platform_data/spi-omap2-mcspi.h | 4 +
+ include/linux/spi/spi-tegra.h | 40 +
+ 15 files changed, 2257 insertions(+), 75 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt
+ create mode 100644 drivers/spi/spi-tegra20-sflash.c
+ create mode 100644 drivers/spi/spi-tegra20-slink.c
+ create mode 100644 include/linux/spi/spi-tegra.h
+Merging tip/auto-latest (a07005c Merge branch 'x86/mm')
+$ git merge tip/auto-latest
+Auto-merging tools/perf/tests/parse-events.c
+Auto-merging tools/perf/tests/dso-data.c
+Auto-merging tools/perf/tests/builtin-test.c
+Auto-merging tools/perf/perf.h
+Auto-merging mm/memcontrol.c
+Auto-merging kernel/time/tick-sched.c
+Auto-merging kernel/sched/core.c
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/acpi.h
+Auto-merging fs/proc/base.c
+Auto-merging drivers/base/core.c
+Auto-merging drivers/acpi/osl.c
+Auto-merging drivers/acpi/Kconfig
+Auto-merging arch/x86/kernel/ptrace.c
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/acpi/sleep.c
+Auto-merging arch/x86/kernel/acpi/boot.c
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging CREDITS
+Merge made by the 'recursive' strategy.
+ CREDITS | 1 +
+ Documentation/acpi/initrd_table_override.txt | 94 +
+ Documentation/kernel-parameters.txt | 20 +
+ Documentation/scheduler/numa-problem.txt | 236 +++
+ Documentation/x86/boot.txt | 4 +-
+ MAINTAINERS | 8 +
+ arch/ia64/kernel/time.c | 8 +-
+ arch/powerpc/kernel/time.c | 4 +-
+ arch/s390/kernel/vtime.c | 4 +
+ arch/s390/kvm/kvm-s390.c | 4 -
+ arch/sh/mm/Kconfig | 1 +
+ arch/x86/Kconfig | 35 +-
+ arch/x86/include/asm/cpufeature.h | 1 +
+ arch/x86/include/asm/mce.h | 21 +-
+ arch/x86/include/asm/msr-index.h | 2 +
+ arch/x86/include/asm/page.h | 3 +-
+ arch/x86/include/asm/page_32.h | 1 +
+ arch/x86/include/asm/page_64.h | 36 +
+ arch/x86/include/asm/page_64_types.h | 22 -
+ arch/x86/include/asm/pgtable.h | 6 +
+ arch/x86/include/asm/pgtable_64.h | 5 +
+ arch/x86/include/asm/processor.h | 2 +-
+ arch/x86/kernel/Makefile | 1 -
+ arch/x86/kernel/acpi/boot.c | 6 +
+ arch/x86/kernel/acpi/sleep.c | 2 +-
+ arch/x86/kernel/apic/apic.c | 73 +-
+ arch/x86/kernel/apic/apic_numachip.c | 1 +
+ arch/x86/kernel/apic/io_apic.c | 5 +-
+ arch/x86/kernel/cpu/amd.c | 9 +-
+ arch/x86/kernel/cpu/intel.c | 2 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 75 +-
+ arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 -
+ arch/x86/kernel/cpu/mcheck/mce-severity.c | 4 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 209 +-
+ arch/x86/kernel/cpu/mcheck/mce_intel.c | 8 +-
+ arch/x86/kernel/cpu/perf_event.c | 121 ++
+ arch/x86/kernel/cpu/perf_event.h | 5 +
+ arch/x86/kernel/cpu/perf_event_amd.c | 9 +
+ arch/x86/kernel/cpu/perf_event_intel.c | 9 +
+ arch/x86/kernel/cpu/perf_event_p6.c | 2 +
+ arch/x86/kernel/entry_64.S | 41 +-
+ arch/x86/kernel/ftrace.c | 4 +-
+ arch/x86/kernel/head32.c | 4 +-
+ arch/x86/kernel/head64.c | 4 +-
+ arch/x86/kernel/hpet.c | 4 +-
+ arch/x86/kernel/process.c | 39 +-
+ arch/x86/kernel/ptrace.c | 7 +
+ arch/x86/kernel/rtc.c | 6 -
+ arch/x86/kernel/setup.c | 20 +-
+ arch/x86/kernel/smpboot.c | 2 +-
+ arch/x86/kernel/tsc.c | 6 +
+ arch/x86/kernel/x8664_ksyms_64.c | 3 +
+ arch/x86/lguest/boot.c | 2 +-
+ arch/x86/lib/copy_page_64.S | 120 +-
+ arch/x86/mm/gup.c | 23 +-
+ arch/x86/mm/init_64.c | 18 +-
+ arch/x86/mm/pageattr.c | 8 +-
+ arch/x86/mm/pgtable.c | 8 +-
+ arch/x86/mm/physaddr.c | 51 +-
+ arch/x86/platform/efi/efi.c | 4 +-
+ arch/x86/realmode/init.c | 8 +-
+ drivers/acpi/Kconfig | 9 +
+ drivers/acpi/osl.c | 202 +-
+ drivers/base/core.c | 21 +
+ fs/proc/base.c | 78 -
+ include/asm-generic/pgtable.h | 59 +
+ include/linux/acpi.h | 16 +
+ include/linux/device.h | 7 +
+ include/linux/earlycpio.h | 17 +
+ include/linux/ftrace_event.h | 14 +-
+ include/linux/hardirq.h | 15 +-
+ include/linux/huge_mm.h | 12 +
+ include/linux/hugetlb.h | 8 +-
+ include/linux/init_task.h | 8 +
+ include/linux/irq.h | 9 +
+ include/linux/irqdesc.h | 3 +
+ include/linux/kernel.h | 7 +-
+ include/linux/kernel_stat.h | 9 +-
+ include/linux/kvm_host.h | 12 +-
+ include/linux/mempolicy.h | 8 +
+ include/linux/migrate.h | 7 +
+ include/linux/mm.h | 99 +-
+ include/linux/mm_types.h | 10 +
+ include/linux/mmzone.h | 14 +-
+ include/linux/page-flags-layout.h | 83 +
+ include/linux/ring_buffer.h | 3 +-
+ include/linux/sched.h | 74 +-
+ include/linux/vtime.h | 47 +
+ include/trace/ftrace.h | 3 +-
+ include/trace/syscall.h | 23 -
+ init/Kconfig | 81 +
+ kernel/bounds.c | 4 +
+ kernel/events/hw_breakpoint.c | 12 +-
+ kernel/irq/chip.c | 1 +
+ kernel/irq/manage.c | 41 +-
+ kernel/irq/resend.c | 8 +
+ kernel/lockdep_proc.c | 2 +-
+ kernel/sched/auto_group.c | 68 +-
+ kernel/sched/auto_group.h | 9 +-
+ kernel/sched/core.c | 90 +-
+ kernel/sched/cputime.c | 20 +-
+ kernel/sched/debug.c | 36 +-
+ kernel/sched/fair.c | 2135 ++++++++++++++++----
+ kernel/sched/features.h | 15 +
+ kernel/sched/sched.h | 98 +-
+ kernel/softirq.c | 6 +-
+ kernel/sysctl.c | 51 +-
+ kernel/time/tick-sched.c | 113 +-
+ kernel/trace/Kconfig | 1 +
+ kernel/trace/ftrace.c | 6 +-
+ kernel/trace/ring_buffer.c | 51 +-
+ kernel/trace/trace.c | 372 ++--
+ kernel/trace/trace.h | 14 +-
+ kernel/trace/trace_branch.c | 4 +-
+ kernel/trace/trace_events.c | 51 +-
+ kernel/trace/trace_events_filter.c | 4 +-
+ kernel/trace/trace_functions.c | 5 +-
+ kernel/trace/trace_functions_graph.c | 6 +-
+ kernel/trace/trace_irqsoff.c | 14 +-
+ kernel/trace/trace_kprobe.c | 10 +-
+ kernel/trace/trace_probe.c | 14 +-
+ kernel/trace/trace_sched_switch.c | 4 +-
+ kernel/trace/trace_sched_wakeup.c | 10 +-
+ kernel/trace/trace_selftest.c | 13 +-
+ kernel/trace/trace_syscalls.c | 61 +-
+ kernel/trace/trace_uprobe.c | 2 +-
+ lib/Makefile | 2 +-
+ lib/earlycpio.c | 145 ++
+ mm/Makefile | 1 +
+ mm/huge_memory.c | 166 +-
+ mm/hugetlb.c | 10 +-
+ mm/internal.h | 5 +-
+ mm/memcontrol.c | 7 +-
+ mm/memory.c | 110 +-
+ mm/mempolicy.c | 185 +-
+ mm/migrate.c | 106 +-
+ mm/mprotect.c | 69 +-
+ mm/numa.c | 73 +
+ mm/pgtable-generic.c | 9 +-
+ scripts/kconfig/Makefile | 7 +-
+ tools/kvm/.gitignore | 12 +
+ 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-sandbox.txt | 16 +
+ 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/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 457 +++++
+ tools/kvm/README | 112 +
+ tools/kvm/builtin-balloon.c | 80 +
+ tools/kvm/builtin-debug.c | 110 +
+ tools/kvm/builtin-help.c | 63 +
+ tools/kvm/builtin-list.c | 149 ++
+ tools/kvm/builtin-pause.c | 88 +
+ tools/kvm/builtin-resume.c | 88 +
+ tools/kvm/builtin-run.c | 697 +++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 262 +++
+ tools/kvm/builtin-stat.c | 127 ++
+ tools/kvm/builtin-stop.c | 70 +
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 177 ++
+ tools/kvm/config/utilities.mak | 196 ++
+ tools/kvm/disk/blk.c | 76 +
+ tools/kvm/disk/core.c | 354 ++++
+ tools/kvm/disk/qcow.c | 1529 ++++++++++++++
+ tools/kvm/disk/raw.c | 141 ++
+ tools/kvm/framebuffer.c | 80 +
+ tools/kvm/guest/init.c | 72 +
+ tools/kvm/guest_compat.c | 99 +
+ tools/kvm/hw/i8042.c | 355 ++++
+ tools/kvm/hw/pci-shmem.c | 405 ++++
+ tools/kvm/hw/rtc.c | 149 ++
+ tools/kvm/hw/serial.c | 452 +++++
+ tools/kvm/hw/vesa.c | 89 +
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 20 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/disk-image.h | 96 +
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/framebuffer.h | 36 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 28 +
+ tools/kvm/include/kvm/ioport.h | 70 +
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-config.h | 60 +
+ tools/kvm/include/kvm/kvm-cpu.h | 26 +
+ tools/kvm/include/kvm/kvm-ipc.h | 26 +
+ tools/kvm/include/kvm/kvm.h | 121 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 218 ++
+ tools/kvm/include/kvm/pci-shmem.h | 32 +
+ tools/kvm/include/kvm/pci.h | 95 +
+ tools/kvm/include/kvm/qcow.h | 133 ++
+ tools/kvm/include/kvm/rbtree-interval.h | 28 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 28 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 20 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 24 +
+ tools/kvm/include/kvm/threadpool.h | 38 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 360 ++++
+ tools/kvm/include/kvm/util-init.h | 51 +
+ tools/kvm/include/kvm/util.h | 97 +
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 76 +
+ tools/kvm/include/kvm/virtio-balloon.h | 9 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 10 +
+ tools/kvm/include/kvm/virtio-mmio.h | 58 +
+ tools/kvm/include/kvm/virtio-net.h | 30 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
+ tools/kvm/include/kvm/virtio-pci.h | 49 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-scsi.h | 26 +
+ tools/kvm/include/kvm/virtio.h | 102 +
+ tools/kvm/include/kvm/vnc.h | 22 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 20 +
+ tools/kvm/include/linux/kernel.h | 41 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/stddef.h | 16 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 216 ++
+ tools/kvm/ioport.c | 198 ++
+ tools/kvm/kvm-cmd.c | 91 +
+ tools/kvm/kvm-cpu.c | 242 +++
+ tools/kvm/kvm-ipc.c | 498 +++++
+ tools/kvm/kvm.c | 458 +++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 139 ++
+ 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 | 202 ++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 345 ++++
+ tools/kvm/net/uip/udp.c | 236 +++
+ tools/kvm/pci.c | 215 ++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 195 ++
+ tools/kvm/powerpc/cpu_info.h | 42 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 68 +
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 +
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 56 +
+ tools/kvm/powerpc/kvm-cpu.c | 290 +++
+ tools/kvm/powerpc/kvm.c | 529 +++++
+ tools/kvm/powerpc/spapr.h | 93 +
+ tools/kvm/powerpc/spapr_hcall.c | 134 ++
+ tools/kvm/powerpc/spapr_hvcons.c | 108 +
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 423 ++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 233 +++
+ tools/kvm/powerpc/xics.c | 522 +++++
+ tools/kvm/powerpc/xics.h | 18 +
+ tools/kvm/symbol.c | 133 ++
+ tools/kvm/term.c | 171 ++
+ 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 | 101 +
+ tools/kvm/ui/sdl.c | 321 +++
+ tools/kvm/ui/vnc.c | 248 +++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/init.c | 69 +
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 ++++++
+ tools/kvm/util/rbtree-interval.c | 118 ++
+ tools/kvm/util/read-write.c | 354 ++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 62 +
+ tools/kvm/util/threadpool.c | 173 ++
+ tools/kvm/util/util.c | 133 ++
+ tools/kvm/virtio/9p-pdu.c | 287 +++
+ tools/kvm/virtio/9p.c | 1432 +++++++++++++
+ tools/kvm/virtio/balloon.c | 270 +++
+ tools/kvm/virtio/blk.c | 315 +++
+ tools/kvm/virtio/console.c | 203 ++
+ tools/kvm/virtio/core.c | 233 +++
+ tools/kvm/virtio/mmio.c | 264 +++
+ tools/kvm/virtio/net.c | 670 ++++++
+ tools/kvm/virtio/pci.c | 398 ++++
+ tools/kvm/virtio/rng.c | 193 ++
+ tools/kvm/virtio/scsi.c | 309 +++
+ tools/kvm/x86/bios.c | 174 ++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 +
+ tools/kvm/x86/bios/entry.S | 92 +
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 +
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 60 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 20 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 +
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 43 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 77 +
+ tools/kvm/x86/irq.c | 224 ++
+ tools/kvm/x86/kvm-cpu.c | 425 ++++
+ tools/kvm/x86/kvm.c | 362 ++++
+ tools/kvm/x86/mptable.c | 289 +++
+ tools/lib/traceevent/Makefile | 2 +-
+ tools/lib/traceevent/event-parse.c | 22 +-
+ tools/perf/Documentation/Makefile | 31 +-
+ tools/perf/Documentation/android.txt | 78 +
+ tools/perf/Documentation/perf-diff.txt | 60 +
+ tools/perf/Documentation/perf-inject.txt | 11 +
+ tools/perf/Documentation/perf-stat.txt | 5 +
+ tools/perf/Documentation/perf-trace.txt | 6 +
+ tools/perf/Makefile | 157 +-
+ tools/perf/arch/common.c | 211 ++
+ tools/perf/arch/common.h | 10 +
+ tools/perf/builtin-annotate.c | 17 +-
+ tools/perf/builtin-buildid-cache.c | 1 +
+ tools/perf/builtin-buildid-list.c | 6 +-
+ tools/perf/builtin-diff.c | 437 +++-
+ tools/perf/builtin-evlist.c | 5 +-
+ tools/perf/builtin-inject.c | 195 +-
+ tools/perf/builtin-kmem.c | 5 +-
+ tools/perf/builtin-kvm.c | 35 +-
+ tools/perf/builtin-lock.c | 2 -
+ tools/perf/builtin-record.c | 40 +-
+ tools/perf/builtin-report.c | 23 +-
+ tools/perf/builtin-sched.c | 8 +-
+ tools/perf/builtin-script.c | 87 +-
+ tools/perf/builtin-stat.c | 42 +-
+ tools/perf/builtin-timechart.c | 5 +-
+ tools/perf/builtin-top.c | 17 +-
+ tools/perf/builtin-trace.c | 403 +++-
+ tools/perf/config/feature-tests.mak | 25 +-
+ tools/perf/config/utilities.mak | 10 +-
+ tools/perf/perf.c | 5 +
+ tools/perf/perf.h | 18 +-
+ tools/perf/tests/attr.c | 174 ++
+ tools/perf/tests/attr.py | 322 +++
+ tools/perf/tests/attr/README | 64 +
+ tools/perf/tests/attr/base-record | 39 +
+ tools/perf/tests/attr/base-stat | 39 +
+ tools/perf/tests/attr/test-record-basic | 5 +
+ tools/perf/tests/attr/test-record-branch-any | 8 +
+ .../perf/tests/attr/test-record-branch-filter-any | 8 +
+ .../tests/attr/test-record-branch-filter-any_call | 8 +
+ .../tests/attr/test-record-branch-filter-any_ret | 8 +
+ tools/perf/tests/attr/test-record-branch-filter-hv | 8 +
+ .../tests/attr/test-record-branch-filter-ind_call | 8 +
+ tools/perf/tests/attr/test-record-branch-filter-k | 8 +
+ tools/perf/tests/attr/test-record-branch-filter-u | 8 +
+ tools/perf/tests/attr/test-record-count | 8 +
+ tools/perf/tests/attr/test-record-data | 8 +
+ tools/perf/tests/attr/test-record-freq | 6 +
+ tools/perf/tests/attr/test-record-graph-default | 6 +
+ tools/perf/tests/attr/test-record-graph-dwarf | 10 +
+ tools/perf/tests/attr/test-record-graph-fp | 6 +
+ tools/perf/tests/attr/test-record-group | 17 +
+ tools/perf/tests/attr/test-record-group1 | 20 +
+ tools/perf/tests/attr/test-record-no-delay | 9 +
+ tools/perf/tests/attr/test-record-no-inherit | 7 +
+ tools/perf/tests/attr/test-record-no-samples | 6 +
+ tools/perf/tests/attr/test-record-period | 7 +
+ tools/perf/tests/attr/test-record-raw | 7 +
+ tools/perf/tests/attr/test-stat-basic | 6 +
+ tools/perf/tests/attr/test-stat-default | 64 +
+ tools/perf/tests/attr/test-stat-detailed-1 | 101 +
+ tools/perf/tests/attr/test-stat-detailed-2 | 155 ++
+ tools/perf/tests/attr/test-stat-detailed-3 | 173 ++
+ tools/perf/tests/attr/test-stat-group | 15 +
+ tools/perf/tests/attr/test-stat-group1 | 17 +
+ tools/perf/tests/attr/test-stat-no-inherit | 7 +
+ tools/perf/{ => tests}/builtin-test.c | 69 +-
+ .../{util/dso-test-data.c => tests/dso-data.c} | 1 +
+ .../parse-events-test.c => tests/parse-events.c} | 68 +
+ tools/perf/ui/browsers/annotate.c | 45 +-
+ tools/perf/ui/browsers/hists.c | 97 +-
+ tools/perf/ui/browsers/scripts.c | 189 ++
+ tools/perf/ui/gtk/browser.c | 4 +-
+ tools/perf/ui/hist.c | 138 +-
+ tools/perf/ui/stdio/hist.c | 2 +-
+ tools/perf/util/PERF-VERSION-GEN | 14 +-
+ tools/perf/util/annotate.c | 72 +-
+ tools/perf/util/annotate.h | 10 +-
+ tools/perf/util/build-id.c | 27 +-
+ tools/perf/util/build-id.h | 11 +-
+ tools/perf/util/dso.c | 595 ++++++
+ tools/perf/util/dso.h | 148 ++
+ tools/perf/util/event.c | 228 +--
+ tools/perf/util/event.h | 9 +-
+ tools/perf/util/evlist.c | 3 -
+ tools/perf/util/header.c | 13 +
+ tools/perf/util/header.h | 1 +
+ tools/perf/util/hist.c | 100 +
+ tools/perf/util/hist.h | 49 +-
+ tools/perf/util/machine.c | 464 +++++
+ tools/perf/util/machine.h | 148 ++
+ tools/perf/util/map.c | 182 +-
+ tools/perf/util/map.h | 93 -
+ tools/perf/util/parse-events.c | 30 +-
+ tools/perf/util/parse-events.h | 2 +
+ tools/perf/util/parse-events.l | 2 +
+ tools/perf/util/parse-events.y | 18 +
+ tools/perf/util/pmu.c | 7 +-
+ tools/perf/util/python.c | 2 +
+ tools/perf/util/rblist.c | 4 +-
+ .../util/scripting-engines/trace-event-python.c | 1 -
+ tools/perf/util/session.c | 4 +-
+ tools/perf/util/session.h | 5 +-
+ tools/perf/util/sort.h | 45 +-
+ tools/perf/util/strbuf.c | 8 +-
+ tools/perf/util/string.c | 18 +
+ tools/perf/util/symbol.c | 658 +-----
+ tools/perf/util/symbol.h | 161 +-
+ tools/perf/util/thread.c | 41 +-
+ tools/perf/util/thread.h | 2 +
+ tools/perf/util/trace-event-read.c | 2 -
+ tools/perf/util/util.c | 35 +
+ tools/perf/util/util.h | 8 +
+ 475 files changed, 36118 insertions(+), 3207 deletions(-)
+ create mode 100644 Documentation/acpi/initrd_table_override.txt
+ create mode 100644 Documentation/scheduler/numa-problem.txt
+ create mode 100644 include/linux/earlycpio.h
+ create mode 100644 include/linux/page-flags-layout.h
+ create mode 100644 include/linux/vtime.h
+ create mode 100644 lib/earlycpio.c
+ create mode 100644 mm/numa.c
+ 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-sandbox.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/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ 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-sandbox.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/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/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-sandbox.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/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/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-config.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/msi.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-init.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-mmio.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-scsi.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/compiler.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/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.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/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/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ 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/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100644 tools/kvm/util/init.c
+ 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 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.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/mmio.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
+ create mode 100644 tools/kvm/virtio/scsi.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+ create mode 100644 tools/perf/Documentation/android.txt
+ create mode 100644 tools/perf/arch/common.c
+ create mode 100644 tools/perf/arch/common.h
+ create mode 100644 tools/perf/tests/attr.c
+ create mode 100644 tools/perf/tests/attr.py
+ create mode 100644 tools/perf/tests/attr/README
+ create mode 100644 tools/perf/tests/attr/base-record
+ create mode 100644 tools/perf/tests/attr/base-stat
+ create mode 100644 tools/perf/tests/attr/test-record-basic
+ create mode 100644 tools/perf/tests/attr/test-record-branch-any
+ create mode 100644 tools/perf/tests/attr/test-record-branch-filter-any
+ create mode 100644 tools/perf/tests/attr/test-record-branch-filter-any_call
+ create mode 100644 tools/perf/tests/attr/test-record-branch-filter-any_ret
+ create mode 100644 tools/perf/tests/attr/test-record-branch-filter-hv
+ create mode 100644 tools/perf/tests/attr/test-record-branch-filter-ind_call
+ create mode 100644 tools/perf/tests/attr/test-record-branch-filter-k
+ create mode 100644 tools/perf/tests/attr/test-record-branch-filter-u
+ create mode 100644 tools/perf/tests/attr/test-record-count
+ create mode 100644 tools/perf/tests/attr/test-record-data
+ create mode 100644 tools/perf/tests/attr/test-record-freq
+ create mode 100644 tools/perf/tests/attr/test-record-graph-default
+ create mode 100644 tools/perf/tests/attr/test-record-graph-dwarf
+ create mode 100644 tools/perf/tests/attr/test-record-graph-fp
+ create mode 100644 tools/perf/tests/attr/test-record-group
+ create mode 100644 tools/perf/tests/attr/test-record-group1
+ create mode 100644 tools/perf/tests/attr/test-record-no-delay
+ create mode 100644 tools/perf/tests/attr/test-record-no-inherit
+ create mode 100644 tools/perf/tests/attr/test-record-no-samples
+ create mode 100644 tools/perf/tests/attr/test-record-period
+ create mode 100644 tools/perf/tests/attr/test-record-raw
+ create mode 100644 tools/perf/tests/attr/test-stat-basic
+ create mode 100644 tools/perf/tests/attr/test-stat-default
+ create mode 100644 tools/perf/tests/attr/test-stat-detailed-1
+ create mode 100644 tools/perf/tests/attr/test-stat-detailed-2
+ create mode 100644 tools/perf/tests/attr/test-stat-detailed-3
+ create mode 100644 tools/perf/tests/attr/test-stat-group
+ create mode 100644 tools/perf/tests/attr/test-stat-group1
+ create mode 100644 tools/perf/tests/attr/test-stat-no-inherit
+ rename tools/perf/{ => tests}/builtin-test.c (97%)
+ rename tools/perf/{util/dso-test-data.c => tests/dso-data.c} (99%)
+ rename tools/perf/{util/parse-events-test.c => tests/parse-events.c} (96%)
+ create mode 100644 tools/perf/ui/browsers/scripts.c
+ create mode 100644 tools/perf/util/dso.c
+ create mode 100644 tools/perf/util/dso.h
+ create mode 100644 tools/perf/util/machine.c
+ create mode 100644 tools/perf/util/machine.h
+Merging ftrace/for-next (bf3071f tracing: Remove unnecessary WARN_ONCE's from tracing_buffers_splice_read)
+$ git merge ftrace/for-next
+Auto-merging arch/unicore32/include/asm/Kbuild
+Auto-merging arch/openrisc/include/asm/Kbuild
+Auto-merging arch/microblaze/include/asm/Kbuild
+Auto-merging arch/m68k/include/asm/Kbuild
+Auto-merging arch/cris/include/asm/Kbuild
+Auto-merging arch/blackfin/include/asm/Kbuild
+Auto-merging arch/arm64/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm64/include/asm/Kbuild | 1 +
+ arch/avr32/include/asm/Kbuild | 1 +
+ arch/blackfin/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/hexagon/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/mips/include/asm/Kbuild | 1 +
+ arch/mn10300/include/asm/Kbuild | 1 +
+ arch/openrisc/include/asm/Kbuild | 1 +
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/s390/include/asm/Kbuild | 1 +
+ arch/score/include/asm/Kbuild | 1 +
+ arch/sh/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/um/include/asm/Kbuild | 1 +
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/x86/include/asm/trace_clock.h | 20 ++++++++
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/trace_clock.c | 21 ++++++++
+ arch/xtensa/include/asm/Kbuild | 1 +
+ include/asm-generic/trace_clock.h | 16 ++++++
+ include/linux/ftrace_event.h | 6 +++
+ include/linux/trace_clock.h | 2 +
+ include/trace/ftrace.h | 73 --------------------------
+ kernel/trace/trace.c | 99 ++++++++++++++++++++++--------------
+ kernel/trace/trace.h | 4 --
+ kernel/trace/trace_output.c | 78 +++++++++++++++++++---------
+ kernel/trace/trace_stack.c | 4 --
+ 38 files changed, 207 insertions(+), 144 deletions(-)
+ create mode 100644 arch/x86/include/asm/trace_clock.h
+ create mode 100644 arch/x86/kernel/trace_clock.c
+ create mode 100644 include/asm-generic/trace_clock.h
+Merging rcu/rcu/next (98dbec1 context_tracking: New context tracking susbsystem)
+$ git merge rcu/rcu/next
+Resolved 'arch/x86/kernel/ptrace.c' using previous resolution.
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging arch/x86/kernel/signal.c
+Auto-merging arch/x86/kernel/ptrace.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/ptrace.c
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/include/asm/context_tracking.h
+Auto-merging arch/x86/Kconfig
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e6f97dd] Merge remote-tracking branch 'rcu/rcu/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/RCU/RTFP.txt | 2 +-
+ Documentation/RCU/checklist.txt | 17 +-
+ Documentation/RCU/listRCU.txt | 2 +-
+ Documentation/RCU/rcuref.txt | 61 ++-
+ Documentation/RCU/trace.txt | 396 ++++++++++---------
+ Documentation/RCU/whatisRCU.txt | 17 +-
+ Documentation/kernel-parameters.txt | 21 +
+ Documentation/memory-barriers.txt | 9 +-
+ arch/Kconfig | 15 +-
+ arch/um/drivers/mconsole_kern.c | 2 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/include/asm/{rcu.h => context_tracking.h} | 15 +-
+ arch/x86/kernel/entry_64.S | 2 +-
+ arch/x86/kernel/ptrace.c | 8 +-
+ arch/x86/kernel/signal.c | 5 +-
+ arch/x86/kernel/traps.c | 2 +-
+ arch/x86/mm/fault.c | 2 +-
+ include/linux/context_tracking.h | 18 +
+ include/linux/rculist.h | 17 -
+ include/linux/rcupdate.h | 29 +-
+ include/linux/sched.h | 10 +-
+ include/linux/srcu.h | 34 ++
+ include/trace/events/rcu.h | 1 +
+ init/Kconfig | 67 ++--
+ kernel/Makefile | 1 +
+ kernel/context_tracking.c | 83 ++++
+ kernel/ksysfs.c | 18 +
+ kernel/rcu.h | 2 +
+ kernel/rcupdate.c | 3 +
+ kernel/rcutiny.c | 2 +-
+ kernel/rcutiny_plugin.h | 5 +-
+ kernel/rcutorture.c | 54 +--
+ kernel/rcutree.c | 347 ++++++++++------
+ kernel/rcutree.h | 67 +++-
+ kernel/rcutree_plugin.h | 415 +++++++++++++++++++-
+ kernel/rcutree_trace.c | 330 ++++++++--------
+ kernel/sched/core.c | 23 +-
+ kernel/srcu.c | 16 +-
+ lib/Kconfig.debug | 2 +-
+ 39 files changed, 1493 insertions(+), 629 deletions(-)
+ rename arch/x86/include/asm/{rcu.h => context_tracking.h} (63%)
+ create mode 100644 include/linux/context_tracking.h
+ create mode 100644 kernel/context_tracking.c
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (e6c7d32 KVM: VMX: fix invalid cpu passed to smp_call_function_single)
+$ git merge kvm/linux-next
+Recorded preimage for 'kernel/sched/core.c'
+Auto-merging kernel/sched/core.c
+CONFLICT (content): Merge conflict in kernel/sched/core.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/kvm_host.h
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/powerpc/include/asm/Kbuild
+Auto-merging arch/ia64/kvm/kvm-ia64.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'kernel/sched/core.c'.
+[master b5f5a19] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 85 +++-
+ MAINTAINERS | 4 +-
+ arch/ia64/kvm/kvm-ia64.c | 7 +-
+ arch/powerpc/include/asm/Kbuild | 1 -
+ arch/powerpc/include/asm/epapr_hcalls.h | 83 +---
+ arch/powerpc/include/asm/fsl_hcalls.h | 36 +-
+ arch/powerpc/include/asm/kvm_asm.h | 1 +
+ arch/powerpc/include/asm/kvm_book3s.h | 2 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h | 2 +-
+ arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
+ arch/powerpc/include/asm/kvm_host.h | 55 ++-
+ arch/powerpc/include/asm/kvm_para.h | 15 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 64 ++-
+ arch/powerpc/include/asm/reg_booke.h | 7 +
+ arch/powerpc/include/asm/smp.h | 8 +
+ arch/powerpc/include/uapi/asm/Kbuild | 1 +
+ arch/powerpc/include/uapi/asm/epapr_hcalls.h | 98 ++++
+ arch/powerpc/include/uapi/asm/kvm.h | 59 +++
+ arch/powerpc/include/uapi/asm/kvm_para.h | 7 +-
+ arch/powerpc/kernel/epapr_hcalls.S | 28 ++
+ arch/powerpc/kernel/epapr_paravirt.c | 11 +-
+ arch/powerpc/kernel/kvm.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 5 +
+ arch/powerpc/kernel/smp.c | 46 ++
+ arch/powerpc/kvm/44x.c | 1 +
+ arch/powerpc/kvm/44x_emulate.c | 112 +++--
+ arch/powerpc/kvm/Kconfig | 3 +
+ arch/powerpc/kvm/book3s.c | 125 +++++
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 3 +-
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 3 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 67 ++-
+ arch/powerpc/kvm/book3s_hv.c | 633 +++++++++++++++++++-------
+ arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 11 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
+ arch/powerpc/kvm/book3s_pr.c | 180 ++++++--
+ arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
+ arch/powerpc/kvm/booke.c | 310 +++++++++++--
+ arch/powerpc/kvm/booke_emulate.c | 22 +-
+ arch/powerpc/kvm/e500.h | 3 +-
+ arch/powerpc/kvm/e500_tlb.c | 94 +++-
+ arch/powerpc/kvm/emulate.c | 221 +++++----
+ arch/powerpc/kvm/powerpc.c | 155 ++++++-
+ arch/powerpc/kvm/trace.h | 200 ++++++--
+ arch/powerpc/platforms/Kconfig | 1 +
+ arch/powerpc/sysdev/fsl_msi.c | 9 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +
+ arch/s390/kvm/interrupt.c | 19 +-
+ arch/s390/kvm/kvm-s390.c | 7 +-
+ arch/x86/include/asm/clocksource.h | 1 +
+ arch/x86/include/asm/fixmap.h | 5 +
+ arch/x86/include/asm/kvm_guest.h | 6 +
+ arch/x86/include/asm/kvm_host.h | 10 +-
+ arch/x86/include/asm/pvclock.h | 47 ++
+ arch/x86/include/asm/vsyscall.h | 20 +
+ arch/x86/kernel/kvm.c | 20 +-
+ arch/x86/kernel/kvmclock.c | 88 +++-
+ arch/x86/kernel/pvclock.c | 143 +++---
+ arch/x86/kvm/lapic.c | 2 +-
+ arch/x86/kvm/mmu.c | 49 +-
+ arch/x86/kvm/paging_tmpl.h | 115 ++---
+ arch/x86/kvm/svm.c | 12 +-
+ arch/x86/kvm/trace.h | 63 +++
+ arch/x86/kvm/vmx.c | 60 ++-
+ arch/x86/kvm/x86.c | 488 +++++++++++++++++---
+ arch/x86/vdso/vclock_gettime.c | 81 +++-
+ arch/x86/vdso/vgetcpu.c | 11 +-
+ drivers/tty/Kconfig | 1 +
+ drivers/virt/Kconfig | 1 +
+ include/linux/kvm_host.h | 40 +-
+ include/linux/pvclock_gtod.h | 9 +
+ include/linux/sched.h | 8 +
+ include/uapi/linux/kvm.h | 18 +-
+ kernel/sched/core.c | 15 +
+ kernel/time/timekeeping.c | 50 ++
+ virt/kvm/iommu.c | 10 +-
+ virt/kvm/kvm_main.c | 44 +-
+ 78 files changed, 3288 insertions(+), 971 deletions(-)
+ create mode 100644 arch/powerpc/include/uapi/asm/epapr_hcalls.h
+ create mode 100644 arch/x86/include/asm/kvm_guest.h
+ create mode 100644 include/linux/pvclock_gtod.h
+Merging kvm-ppc/kvm-ppc-next (a2ef34a KVM: PPC: Book3S HV: Handle guest-caused machine checks on POWER7 without panicking)
+$ git merge kvm-ppc/kvm-ppc-next
+Auto-merging include/linux/kvm_host.h
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/powerpc/include/asm/reg.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 54 ++++
+ MAINTAINERS | 1 +
+ arch/powerpc/include/asm/kvm_book3s.h | 10 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h | 31 +++
+ arch/powerpc/include/asm/kvm_host.h | 6 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 2 +
+ arch/powerpc/include/asm/mmu-hash64.h | 10 +
+ arch/powerpc/include/asm/reg.h | 1 +
+ arch/powerpc/include/uapi/asm/kvm.h | 25 ++
+ arch/powerpc/kernel/asm-offsets.c | 4 +-
+ arch/powerpc/kvm/Kconfig | 1 +
+ arch/powerpc/kvm/Makefile | 5 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 407 +++++++++++++++++++++++++++++-
+ arch/powerpc/kvm/book3s_emulate.c | 16 +-
+ arch/powerpc/kvm/book3s_exports.c | 3 -
+ arch/powerpc/kvm/book3s_hv.c | 32 ++-
+ arch/powerpc/kvm/book3s_hv_ras.c | 144 +++++++++++
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 139 ++++++++--
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 131 +++++-----
+ arch/powerpc/kvm/book3s_pr.c | 114 +++++----
+ arch/powerpc/kvm/book3s_rmhandlers.S | 3 -
+ arch/powerpc/kvm/powerpc.c | 34 ++-
+ include/linux/kvm_host.h | 12 +-
+ include/uapi/linux/kvm.h | 3 +
+ virt/kvm/eventfd.c | 6 +
+ 25 files changed, 1013 insertions(+), 181 deletions(-)
+ create mode 100644 arch/powerpc/kvm/book3s_hv_ras.c
+Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next (ca63454 Merge branch 'stable/pvh.v6.1' into linux-next)
+$ git merge xen-two/linux-next
+Auto-merging drivers/xen/xen-pciback/pci_stub.c
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/xen/interface.h | 1 +
+ arch/arm/xen/enlighten.c | 125 +++++++++++++++++++----
+ arch/x86/include/asm/xen/interface.h | 12 ++-
+ arch/x86/include/asm/xen/page.h | 3 +
+ arch/x86/xen/Kconfig | 11 ++
+ arch/x86/xen/enlighten.c | 174 +++++++++++++++++++++++--------
+ arch/x86/xen/irq.c | 5 +-
+ arch/x86/xen/mmu.c | 187 +++++++++++++++++++++++++++++++---
+ arch/x86/xen/mmu.h | 2 +
+ arch/x86/xen/p2m.c | 2 +-
+ arch/x86/xen/setup.c | 64 +++++++++---
+ arch/x86/xen/smp.c | 75 +++++++++-----
+ arch/x86/xen/suspend.c | 2 +-
+ arch/x86/xen/xen-head.S | 11 +-
+ arch/x86/xen/xen-ops.h | 2 +-
+ drivers/net/xen-netback/netback.c | 11 +-
+ drivers/xen/Kconfig | 3 +
+ drivers/xen/Makefile | 7 +-
+ drivers/xen/balloon.c | 19 ++--
+ drivers/xen/cpu_hotplug.c | 4 +-
+ drivers/xen/events.c | 9 +-
+ drivers/xen/gntdev.c | 3 +-
+ drivers/xen/grant-table.c | 78 ++++----------
+ drivers/xen/privcmd.c | 72 ++++++++++++-
+ drivers/xen/xen-acpi-pad.c | 182 +++++++++++++++++++++++++++++++++
+ drivers/xen/xen-pciback/pci_stub.c | 118 +++++++++++----------
+ drivers/xen/xenbus/xenbus_client.c | 9 +-
+ drivers/xen/xenbus/xenbus_xs.c | 1 -
+ include/xen/grant_table.h | 12 ---
+ include/xen/interface/memory.h | 44 +++++++-
+ include/xen/interface/physdev.h | 10 ++
+ include/xen/interface/platform.h | 17 ++++
+ include/xen/xen-ops.h | 9 +-
+ 33 files changed, 1012 insertions(+), 272 deletions(-)
+ create mode 100644 drivers/xen/xen-acpi-pad.c
+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 (b4916cb percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree())
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ mm/percpu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging workqueues/for-next (d8318e5 Merge branch 'for-3.8' into for-next)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
+$ git merge drivers-x86/linux-next
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 76 insertions(+)
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (51b6d98 Merge remote-tracking branches 'regmap/topic/domain', 'regmap/topic/table' and 'regmap/topic/type' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h | 4 ++
+ drivers/base/regmap/regmap.c | 52 +++++++++++++++++++++++--
+ include/linux/regmap.h | 83 ++++++++++++++++++++++++++++++++++------
+ 3 files changed, 125 insertions(+), 14 deletions(-)
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (5c6f844 leds: leds-clevo-mail: Use pr_* instead of printks)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/led-class.c | 2 +-
+ drivers/leds/led-triggers.c | 25 +++++++++++++++++++------
+ drivers/leds/leds-88pm860x.c | 9 ++-------
+ drivers/leds/leds-adp5520.c | 4 ++--
+ drivers/leds/leds-bd2802.c | 10 +++++-----
+ drivers/leds/leds-clevo-mail.c | 11 +++++------
+ drivers/leds/leds-cobalt-qube.c | 11 ++++-------
+ drivers/leds/leds-cobalt-raq.c | 11 ++++-------
+ drivers/leds/leds-da903x.c | 10 +++++-----
+ drivers/leds/leds-fsg.c | 15 +++++----------
+ drivers/leds/leds-gpio.c | 37 ++++++++++++++++++-------------------
+ drivers/leds/leds-lm355x.c | 4 ++--
+ drivers/leds/leds-lm3642.c | 12 ++++++------
+ drivers/leds/leds-lp3944.c | 2 +-
+ drivers/leds/leds-lp5521.c | 4 ++--
+ drivers/leds/leds-lp5523.c | 24 +++++++++++++++++++-----
+ drivers/leds/leds-lt3593.c | 20 ++++++--------------
+ drivers/leds/leds-net48xx.c | 2 +-
+ drivers/leds/leds-netxbig.c | 2 +-
+ drivers/leds/leds-ns2.c | 36 +++++++++++-------------------------
+ drivers/leds/leds-pca955x.c | 2 +-
+ drivers/leds/leds-pwm.c | 2 +-
+ drivers/leds/leds-rb532.c | 2 +-
+ drivers/leds/leds-renesas-tpu.c | 25 ++++++++++---------------
+ drivers/leds/leds-ss4200.c | 2 +-
+ drivers/leds/leds-wm8350.c | 4 ++--
+ drivers/leds/leds-wrap.c | 2 +-
+ drivers/leds/ledtrig-backlight.c | 4 ++--
+ drivers/leds/ledtrig-gpio.c | 2 +-
+ include/linux/leds.h | 17 +++++++++++++++++
+ 30 files changed, 156 insertions(+), 157 deletions(-)
+Merging driver-core/driver-core-next (da095fd acpi: remove use of __devinit)
+$ git merge driver-core/driver-core-next
+Auto-merging lib/Makefile
+CONFLICT (content): Merge conflict in lib/Makefile
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/ksysfs.c
+Auto-merging include/linux/pci.h
+Auto-merging drivers/watchdog/sp805_wdt.c
+Auto-merging drivers/watchdog/davinci_wdt.c
+Auto-merging drivers/rapidio/rio.c
+Auto-merging drivers/power/max8925_power.c
+CONFLICT (content): Merge conflict in drivers/power/max8925_power.c
+Auto-merging drivers/power/max17042_battery.c
+Auto-merging drivers/power/lp8788-charger.c
+Auto-merging drivers/power/jz4740-battery.c
+Auto-merging drivers/power/generic-adc-battery.c
+Auto-merging drivers/power/da9052-battery.c
+CONFLICT (content): Merge conflict in drivers/power/da9052-battery.c
+Auto-merging drivers/power/bq27x00_battery.c
+Auto-merging drivers/power/abx500_chargalg.c
+CONFLICT (content): Merge conflict in drivers/power/abx500_chargalg.c
+Auto-merging drivers/power/ab8500_fg.c
+CONFLICT (content): Merge conflict in drivers/power/ab8500_fg.c
+Auto-merging drivers/power/ab8500_charger.c
+CONFLICT (content): Merge conflict in drivers/power/ab8500_charger.c
+Auto-merging drivers/power/ab8500_btemp.c
+CONFLICT (content): Merge conflict in drivers/power/ab8500_btemp.c
+Auto-merging drivers/pci/quirks.c
+CONFLICT (content): Merge conflict in drivers/pci/quirks.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/pci.h
+CONFLICT (content): Merge conflict in drivers/pci/pci.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci-sysfs.c
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging drivers/pci/ioapic.c
+Removing drivers/pci/hotplug.c
+Auto-merging drivers/mmc/host/sdhci-spear.c
+Auto-merging drivers/mmc/host/sdhci-s3c.c
+Auto-merging drivers/mmc/host/sdhci-pxav3.c
+Auto-merging drivers/mmc/host/sdhci-of-esdhc.c
+Auto-merging drivers/mmc/host/sdhci-dove.c
+Auto-merging drivers/mmc/host/omap_hsmmc.c
+Auto-merging drivers/mmc/host/mmci.c
+Auto-merging drivers/mmc/host/dw_mmc-pltfm.c
+Auto-merging drivers/mmc/host/dw_mmc-pci.c
+Auto-merging drivers/mfd/wm8994-core.c
+Auto-merging drivers/mfd/twl4030-power.c
+Auto-merging drivers/mfd/twl4030-madc.c
+Auto-merging drivers/mfd/twl-core.c
+Auto-merging drivers/mfd/tps65910.c
+Auto-merging drivers/mfd/tps6586x.c
+Auto-merging drivers/mfd/tps65217.c
+Auto-merging drivers/mfd/tps65090.c
+CONFLICT (content): Merge conflict in drivers/mfd/tps65090.c
+Auto-merging drivers/mfd/stmpe-i2c.c
+Auto-merging drivers/mfd/sta2x11-mfd.c
+CONFLICT (content): Merge conflict in drivers/mfd/sta2x11-mfd.c
+Auto-merging drivers/mfd/mc13xxx-spi.c
+Auto-merging drivers/mfd/mc13xxx-i2c.c
+Auto-merging drivers/mfd/lpc_ich.c
+Auto-merging drivers/mfd/jz4740-adc.c
+Auto-merging drivers/mfd/db8500-prcmu.c
+Auto-merging drivers/mfd/da9052-core.c
+CONFLICT (content): Merge conflict in drivers/mfd/da9052-core.c
+Auto-merging drivers/mfd/arizona-core.c
+Auto-merging drivers/mfd/ab8500-core.c
+CONFLICT (content): Merge conflict in drivers/mfd/ab8500-core.c
+Auto-merging drivers/leds/leds-ss4200.c
+Auto-merging drivers/leds/leds-renesas-tpu.c
+Auto-merging drivers/leds/leds-rb532.c
+Auto-merging drivers/leds/leds-pwm.c
+Auto-merging drivers/leds/leds-pca955x.c
+Auto-merging drivers/leds/leds-ns2.c
+Auto-merging drivers/leds/leds-netxbig.c
+Auto-merging drivers/leds/leds-lt3593.c
+Auto-merging drivers/leds/leds-lp5523.c
+Auto-merging drivers/leds/leds-lp5521.c
+Auto-merging drivers/leds/leds-lp3944.c
+Auto-merging drivers/leds/leds-lm3642.c
+Auto-merging drivers/leds/leds-lm355x.c
+Auto-merging drivers/leds/leds-gpio.c
+Auto-merging drivers/leds/leds-da903x.c
+Auto-merging drivers/leds/leds-cobalt-raq.c
+Auto-merging drivers/leds/leds-cobalt-qube.c
+Auto-merging drivers/leds/leds-clevo-mail.c
+Auto-merging drivers/leds/leds-bd2802.c
+Auto-merging drivers/leds/leds-adp5520.c
+Auto-merging drivers/hwmon/w83627hf.c
+Auto-merging drivers/hwmon/w83627ehf.c
+Auto-merging drivers/hwmon/it87.c
+Auto-merging drivers/hwmon/da9052-hwmon.c
+Auto-merging drivers/hwmon/coretemp.c
+Auto-merging drivers/gpio/gpio-twl4030.c
+Auto-merging drivers/gpio/gpio-tps6586x.c
+CONFLICT (content): Merge conflict in drivers/gpio/gpio-tps6586x.c
+Auto-merging drivers/gpio/gpio-mvebu.c
+Auto-merging Resolved 'drivers/dma/dw_dmac.c' using previous resolution.
+Resolved 'drivers/gpio/gpio-tps6586x.c' using previous resolution.
+Resolved 'drivers/mfd/ab8500-core.c' using previous resolution.
+Resolved 'drivers/mfd/da9052-core.c' using previous resolution.
+Resolved 'drivers/mfd/sta2x11-mfd.c' using previous resolution.
+Resolved 'drivers/mfd/tps65090.c' using previous resolution.
+Resolved 'drivers/pci/pci.h' using previous resolution.
+Resolved 'drivers/pci/quirks.c' using previous resolution.
+Resolved 'drivers/power/ab8500_btemp.c' using previous resolution.
+Resolved 'drivers/power/ab8500_charger.c' using previous resolution.
+Resolved 'drivers/power/ab8500_fg.c' using previous resolution.
+Resolved 'drivers/power/abx500_chargalg.c' using previous resolution.
+Resolved 'drivers/power/da9052-battery.c' using previous resolution.
+Resolved 'drivers/power/max8925_power.c' using previous resolution.
+Resolved 'lib/Makefile' using previous resolution.
+drivers/gpio/gpio-mcp23s08.c
+Auto-merging drivers/gpio/gpio-da9052.c
+Auto-merging drivers/firewire/ohci.c
+Auto-merging drivers/dma/pch_dma.c
+Auto-merging drivers/dma/mv_xor.c
+Auto-merging drivers/dma/iop-adma.c
+Auto-merging drivers/dma/dw_dmac.c
+CONFLICT (content): Merge conflict in drivers/dma/dw_dmac.c
+Auto-merging drivers/char/tpm/tpm_ibmvtpm.c
+Auto-merging drivers/base/platform.c
+Auto-merging drivers/base/firmware_class.c
+Auto-merging drivers/base/core.c
+Auto-merging drivers/acpi/pci_root.c
+Auto-merging drivers/acpi/hed.c
+Auto-merging drivers/acpi/apei/ghes.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5709d3b] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/firmware_class/README | 12 +
+ Documentation/zh_CN/arm/kernel_user_helpers.txt | 284 +++++++++++++++++++++++
+ Documentation/zh_CN/arm64/memory.txt | 14 +-
+ arch/microblaze/pci/pci-common.c | 4 -
+ arch/mips/pci/pci.c | 2 -
+ arch/powerpc/kernel/pci-common.c | 4 -
+ arch/powerpc/kernel/pci_64.c | 4 -
+ arch/sh/drivers/pci/pci.c | 2 -
+ arch/unicore32/kernel/pci.c | 2 -
+ drivers/acpi/apei/ghes.c | 2 +-
+ drivers/acpi/hed.c | 2 +-
+ drivers/acpi/pci_root.c | 2 +-
+ drivers/base/Kconfig | 7 +-
+ drivers/base/attribute_container.c | 2 +-
+ drivers/base/bus.c | 14 --
+ drivers/base/core.c | 8 +-
+ drivers/base/devres.c | 4 +-
+ drivers/base/firmware_class.c | 50 +++-
+ drivers/base/platform.c | 4 +-
+ drivers/char/tpm/tpm_i2c_infineon.c | 4 +-
+ drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
+ drivers/char/tpm/tpm_infineon.c | 4 +-
+ drivers/char/tpm/tpm_tis.c | 2 +-
+ drivers/clk/clk-max77686.c | 6 +-
+ drivers/clk/clk-wm831x.c | 6 +-
+ drivers/dma/dw_dmac.c | 4 +-
+ drivers/dma/edma.c | 4 +-
+ drivers/dma/fsldma.c | 4 +-
+ drivers/dma/intel_mid_dma.c | 4 +-
+ drivers/dma/ioat/pci.c | 2 +-
+ drivers/dma/iop-adma.c | 10 +-
+ drivers/dma/mmp_pdma.c | 6 +-
+ drivers/dma/mmp_tdma.c | 6 +-
+ drivers/dma/mpc512x_dma.c | 4 +-
+ drivers/dma/mv_xor.c | 8 +-
+ drivers/dma/pch_dma.c | 4 +-
+ drivers/dma/pl330.c | 2 +-
+ drivers/dma/ppc4xx/adma.c | 4 +-
+ drivers/dma/sa11x0-dma.c | 6 +-
+ drivers/dma/sh/shdma.c | 6 +-
+ drivers/dma/sirf-dma.c | 4 +-
+ drivers/dma/tegra20-apb-dma.c | 4 +-
+ drivers/dma/timb_dma.c | 2 +-
+ drivers/firewire/nosy.c | 4 +-
+ drivers/firewire/ohci.c | 2 +-
+ drivers/gpio/gpio-74x164.c | 6 +-
+ drivers/gpio/gpio-ab8500.c | 6 +-
+ drivers/gpio/gpio-adnp.c | 10 +-
+ drivers/gpio/gpio-adp5520.c | 6 +-
+ drivers/gpio/gpio-adp5588.c | 6 +-
+ drivers/gpio/gpio-arizona.c | 6 +-
+ drivers/gpio/gpio-cs5535.c | 6 +-
+ drivers/gpio/gpio-da9052.c | 8 +-
+ drivers/gpio/gpio-em.c | 6 +-
+ drivers/gpio/gpio-ep93xx.c | 2 +-
+ drivers/gpio/gpio-generic.c | 6 +-
+ drivers/gpio/gpio-ich.c | 10 +-
+ drivers/gpio/gpio-janz-ttl.c | 10 +-
+ drivers/gpio/gpio-langwell.c | 8 +-
+ drivers/gpio/gpio-lpc32xx.c | 4 +-
+ drivers/gpio/gpio-max7300.c | 6 +-
+ drivers/gpio/gpio-max7301.c | 6 +-
+ drivers/gpio/gpio-max730x.c | 4 +-
+ drivers/gpio/gpio-max732x.c | 8 +-
+ drivers/gpio/gpio-mc33880.c | 6 +-
+ drivers/gpio/gpio-mcp23s08.c | 6 +-
+ drivers/gpio/gpio-ml-ioh.c | 8 +-
+ drivers/gpio/gpio-mpc5200.c | 4 +-
+ drivers/gpio/gpio-msic.c | 2 +-
+ drivers/gpio/gpio-msm-v2.c | 6 +-
+ drivers/gpio/gpio-mvebu.c | 4 +-
+ drivers/gpio/gpio-mxc.c | 4 +-
+ drivers/gpio/gpio-mxs.c | 2 +-
+ drivers/gpio/gpio-omap.c | 6 +-
+ drivers/gpio/gpio-pca953x.c | 6 +-
+ drivers/gpio/gpio-pch.c | 8 +-
+ drivers/gpio/gpio-pxa.c | 6 +-
+ drivers/gpio/gpio-rc5t583.c | 6 +-
+ drivers/gpio/gpio-rdc321x.c | 6 +-
+ drivers/gpio/gpio-sch.c | 6 +-
+ drivers/gpio/gpio-sodaville.c | 4 +-
+ drivers/gpio/gpio-sta2x11.c | 4 +-
+ drivers/gpio/gpio-stmpe.c | 8 +-
+ drivers/gpio/gpio-stp-xway.c | 2 +-
+ drivers/gpio/gpio-sx150x.c | 6 +-
+ drivers/gpio/gpio-tc3589x.c | 6 +-
+ drivers/gpio/gpio-tegra.c | 4 +-
+ drivers/gpio/gpio-timberdale.c | 4 +-
+ drivers/gpio/gpio-tps6586x.c | 6 +-
+ drivers/gpio/gpio-tps65910.c | 6 +-
+ drivers/gpio/gpio-tps65912.c | 6 +-
+ drivers/gpio/gpio-twl4030.c | 8 +-
+ drivers/gpio/gpio-twl6040.c | 4 +-
+ drivers/gpio/gpio-vr41xx.c | 6 +-
+ drivers/gpio/gpio-vt8500.c | 2 +-
+ drivers/gpio/gpio-vx855.c | 6 +-
+ drivers/gpio/gpio-wm831x.c | 6 +-
+ drivers/gpio/gpio-wm8350.c | 6 +-
+ drivers/gpio/gpio-wm8994.c | 6 +-
+ drivers/gpio/gpio-xilinx.c | 4 +-
+ drivers/hwmon/abituguru.c | 12 +-
+ drivers/hwmon/abituguru3.c | 6 +-
+ drivers/hwmon/ad7314.c | 6 +-
+ drivers/hwmon/ad7414.c | 4 +-
+ drivers/hwmon/adcxx.c | 6 +-
+ drivers/hwmon/ads7871.c | 6 +-
+ drivers/hwmon/adt7411.c | 6 +-
+ drivers/hwmon/coretemp.c | 8 +-
+ drivers/hwmon/da9052-hwmon.c | 6 +-
+ drivers/hwmon/dme1737.c | 6 +-
+ drivers/hwmon/f71805f.c | 8 +-
+ drivers/hwmon/f71882fg.c | 8 +-
+ drivers/hwmon/fam15h_power.c | 10 +-
+ drivers/hwmon/gpio-fan.c | 8 +-
+ drivers/hwmon/hih6130.c | 6 +-
+ drivers/hwmon/i5k_amb.c | 18 +-
+ drivers/hwmon/it87.c | 12 +-
+ drivers/hwmon/jz4740-hwmon.c | 6 +-
+ drivers/hwmon/k10temp.c | 8 +-
+ drivers/hwmon/k8temp.c | 8 +-
+ drivers/hwmon/lm70.c | 6 +-
+ drivers/hwmon/lm78.c | 6 +-
+ drivers/hwmon/max1111.c | 8 +-
+ drivers/hwmon/max197.c | 6 +-
+ drivers/hwmon/mc13783-adc.c | 4 +-
+ drivers/hwmon/ntc_thermistor.c | 6 +-
+ drivers/hwmon/pc87360.c | 8 +-
+ drivers/hwmon/pc87427.c | 10 +-
+ drivers/hwmon/s3c-hwmon.c | 6 +-
+ drivers/hwmon/sch5627.c | 4 +-
+ drivers/hwmon/sch5636.c | 2 +-
+ drivers/hwmon/sht15.c | 6 +-
+ drivers/hwmon/sht21.c | 6 +-
+ drivers/hwmon/sis5595.c | 16 +-
+ drivers/hwmon/smsc47b397.c | 6 +-
+ drivers/hwmon/tmp102.c | 6 +-
+ drivers/hwmon/twl4030-madc-hwmon.c | 4 +-
+ drivers/hwmon/ultra45_env.c | 6 +-
+ drivers/hwmon/via-cputemp.c | 6 +-
+ drivers/hwmon/via686a.c | 14 +-
+ drivers/hwmon/vt1211.c | 8 +-
+ drivers/hwmon/vt8231.c | 12 +-
+ drivers/hwmon/w83627ehf.c | 12 +-
+ drivers/hwmon/w83627hf.c | 14 +-
+ drivers/hwmon/w83781d.c | 6 +-
+ drivers/hwmon/wm831x-hwmon.c | 6 +-
+ drivers/hwmon/wm8350-hwmon.c | 6 +-
+ drivers/hwspinlock/omap_hwspinlock.c | 6 +-
+ drivers/hwspinlock/u8500_hsem.c | 6 +-
+ drivers/leds/leds-adp5520.c | 8 +-
+ drivers/leds/leds-asic3.c | 6 +-
+ drivers/leds/leds-atmel-pwm.c | 2 +-
+ drivers/leds/leds-bd2802.c | 2 +-
+ drivers/leds/leds-blinkm.c | 6 +-
+ drivers/leds/leds-clevo-mail.c | 2 +-
+ drivers/leds/leds-cobalt-qube.c | 6 +-
+ drivers/leds/leds-cobalt-raq.c | 6 +-
+ drivers/leds/leds-da903x.c | 6 +-
+ drivers/leds/leds-da9052.c | 6 +-
+ drivers/leds/leds-gpio.c | 12 +-
+ drivers/leds/leds-lm3530.c | 6 +-
+ drivers/leds/leds-lm3533.c | 8 +-
+ drivers/leds/leds-lm355x.c | 8 +-
+ drivers/leds/leds-lm3642.c | 8 +-
+ drivers/leds/leds-lp3944.c | 6 +-
+ drivers/leds/leds-lp5521.c | 8 +-
+ drivers/leds/leds-lp5523.c | 4 +-
+ drivers/leds/leds-lp8788.c | 6 +-
+ drivers/leds/leds-lt3593.c | 8 +-
+ drivers/leds/leds-max8997.c | 6 +-
+ drivers/leds/leds-mc13783.c | 10 +-
+ drivers/leds/leds-netxbig.c | 10 +-
+ drivers/leds/leds-ns2.c | 8 +-
+ drivers/leds/leds-ot200.c | 6 +-
+ drivers/leds/leds-pca955x.c | 6 +-
+ drivers/leds/leds-pca9633.c | 6 +-
+ drivers/leds/leds-pwm.c | 4 +-
+ drivers/leds/leds-rb532.c | 6 +-
+ drivers/leds/leds-regulator.c | 6 +-
+ drivers/leds/leds-renesas-tpu.c | 6 +-
+ drivers/leds/leds-ss4200.c | 4 +-
+ drivers/leds/leds-sunfire.c | 12 +-
+ drivers/leds/leds-tca6507.c | 6 +-
+ drivers/mfd/88pm800.c | 12 +-
+ drivers/mfd/88pm805.c | 10 +-
+ drivers/mfd/88pm80x.c | 2 +-
+ drivers/mfd/88pm860x-core.c | 104 ++++-----
+ drivers/mfd/ab3100-core.c | 13 +-
+ drivers/mfd/ab8500-core.c | 40 ++--
+ drivers/mfd/ab8500-debugfs.c | 6 +-
+ drivers/mfd/ab8500-gpadc.c | 6 +-
+ drivers/mfd/ab8500-sysctrl.c | 6 +-
+ drivers/mfd/adp5520.c | 6 +-
+ drivers/mfd/arizona-core.c | 4 +-
+ drivers/mfd/arizona-i2c.c | 6 +-
+ drivers/mfd/arizona-spi.c | 6 +-
+ drivers/mfd/asic3.c | 4 +-
+ drivers/mfd/cs5535-mfd.c | 12 +-
+ drivers/mfd/da903x.c | 10 +-
+ drivers/mfd/da9052-core.c | 4 +-
+ drivers/mfd/da9052-i2c.c | 6 +-
+ drivers/mfd/da9052-spi.c | 6 +-
+ drivers/mfd/da9055-core.c | 4 +-
+ drivers/mfd/da9055-i2c.c | 6 +-
+ drivers/mfd/davinci_voicecodec.c | 4 +-
+ drivers/mfd/db8500-prcmu.c | 2 +-
+ drivers/mfd/ezx-pcap.c | 8 +-
+ drivers/mfd/htc-i2cpld.c | 12 +-
+ drivers/mfd/intel_msic.c | 10 +-
+ drivers/mfd/janz-cmodio.c | 10 +-
+ drivers/mfd/jz4740-adc.c | 6 +-
+ drivers/mfd/lm3533-core.c | 18 +-
+ drivers/mfd/lp8788.c | 4 +-
+ drivers/mfd/lpc_ich.c | 20 +-
+ drivers/mfd/lpc_sch.c | 6 +-
+ drivers/mfd/max77686.c | 2 +-
+ drivers/mfd/max8907.c | 4 +-
+ drivers/mfd/max8925-core.c | 58 ++---
+ drivers/mfd/max8925-i2c.c | 6 +-
+ drivers/mfd/mc13xxx-i2c.c | 4 +-
+ drivers/mfd/mc13xxx-spi.c | 4 +-
+ drivers/mfd/omap-usb-host.c | 4 +-
+ drivers/mfd/omap-usb-tll.c | 6 +-
+ drivers/mfd/palmas.c | 6 +-
+ drivers/mfd/pcf50633-adc.c | 6 +-
+ drivers/mfd/pcf50633-core.c | 6 +-
+ drivers/mfd/pm8921-core.c | 8 +-
+ drivers/mfd/pm8xxx-irq.c | 4 +-
+ drivers/mfd/rc5t583.c | 6 +-
+ drivers/mfd/rdc321x-southbridge.c | 6 +-
+ drivers/mfd/sm501.c | 16 +-
+ drivers/mfd/sta2x11-mfd.c | 30 +--
+ drivers/mfd/stmpe-i2c.c | 6 +-
+ drivers/mfd/stmpe-spi.c | 6 +-
+ drivers/mfd/syscon.c | 6 +-
+ drivers/mfd/tc3589x.c | 8 +-
+ drivers/mfd/tc6387xb.c | 6 +-
+ drivers/mfd/tc6393xb.c | 12 +-
+ drivers/mfd/ti-ssp.c | 6 +-
+ drivers/mfd/timberdale.c | 64 ++---
+ drivers/mfd/tps6105x.c | 8 +-
+ drivers/mfd/tps65090.c | 6 +-
+ drivers/mfd/tps65217.c | 6 +-
+ drivers/mfd/tps6586x.c | 10 +-
+ drivers/mfd/tps65910.c | 10 +-
+ drivers/mfd/tps65911-comparator.c | 6 +-
+ drivers/mfd/tps65912-spi.c | 6 +-
+ drivers/mfd/twl-core.c | 2 +-
+ drivers/mfd/twl4030-audio.c | 6 +-
+ drivers/mfd/twl4030-madc.c | 4 +-
+ drivers/mfd/twl4030-power.c | 20 +-
+ drivers/mfd/vx855.c | 6 +-
+ drivers/mfd/wl1273-core.c | 4 +-
+ drivers/mfd/wm831x-spi.c | 6 +-
+ drivers/mfd/wm8994-core.c | 16 +-
+ drivers/mmc/host/atmel-mci.c | 2 +-
+ drivers/mmc/host/au1xmmc.c | 4 +-
+ drivers/mmc/host/bfin_sdh.c | 6 +-
+ drivers/mmc/host/cb710-mmc.c | 6 +-
+ drivers/mmc/host/dw_mmc-pci.c | 4 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 4 +-
+ drivers/mmc/host/dw_mmc-pltfm.h | 2 +-
+ drivers/mmc/host/jz4740_mmc.c | 12 +-
+ drivers/mmc/host/mmc_spi.c | 6 +-
+ drivers/mmc/host/mmci.c | 10 +-
+ drivers/mmc/host/omap.c | 8 +-
+ drivers/mmc/host/omap_hsmmc.c | 6 +-
+ drivers/mmc/host/pxamci.c | 4 +-
+ drivers/mmc/host/s3cmci.c | 6 +-
+ drivers/mmc/host/sdhci-cns3xxx.c | 6 +-
+ drivers/mmc/host/sdhci-dove.c | 8 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 8 +-
+ drivers/mmc/host/sdhci-of-esdhc.c | 6 +-
+ drivers/mmc/host/sdhci-of-hlwd.c | 6 +-
+ drivers/mmc/host/sdhci-pci.c | 14 +-
+ drivers/mmc/host/sdhci-pxav2.c | 6 +-
+ drivers/mmc/host/sdhci-pxav3.c | 6 +-
+ drivers/mmc/host/sdhci-s3c.c | 10 +-
+ drivers/mmc/host/sdhci-spear.c | 12 +-
+ drivers/mmc/host/sdhci-tegra.c | 10 +-
+ drivers/mmc/host/sh_mmcif.c | 4 +-
+ drivers/mmc/host/sh_mobile_sdhi.c | 4 +-
+ drivers/mmc/host/tmio_mmc.c | 6 +-
+ drivers/mmc/host/tmio_mmc_pio.c | 2 +-
+ drivers/mmc/host/via-sdmmc.c | 6 +-
+ drivers/mmc/host/wbsd.c | 28 +--
+ drivers/pci/Makefile | 7 +-
+ drivers/pci/hotplug.c | 37 ---
+ drivers/pci/hotplug/cpcihp_zt5550.c | 4 +-
+ drivers/pci/ioapic.c | 6 +-
+ drivers/pci/pci-driver.c | 42 +++-
+ drivers/pci/pci-sysfs.c | 7 -
+ drivers/pci/pci.c | 4 +-
+ drivers/pci/pci.h | 5 -
+ drivers/pci/pcie/aer/aerdrv.c | 4 +-
+ drivers/pci/pcie/portdrv_pci.c | 2 +-
+ drivers/pci/probe.c | 20 +-
+ drivers/pci/quirks.c | 134 +++++------
+ drivers/pci/xen-pcifront.c | 10 +-
+ drivers/pcmcia/bcm63xx_pcmcia.c | 12 +-
+ drivers/pcmcia/bfin_cf_pcmcia.c | 6 +-
+ drivers/pcmcia/db1xxx_ss.c | 6 +-
+ drivers/pcmcia/ds.c | 13 +-
+ drivers/pcmcia/electra_cf.c | 4 +-
+ drivers/pcmcia/i82092.c | 6 +-
+ drivers/pcmcia/pd6729.c | 8 +-
+ drivers/pcmcia/pxa2xx_sharpsl.c | 2 +-
+ drivers/pcmcia/rsrc_nonstatic.c | 6 +-
+ drivers/pcmcia/sa1100_assabet.c | 2 +-
+ drivers/pcmcia/sa1100_cerf.c | 2 +-
+ drivers/pcmcia/sa1100_generic.c | 4 +-
+ drivers/pcmcia/sa1100_h3600.c | 2 +-
+ drivers/pcmcia/sa1100_shannon.c | 2 +-
+ drivers/pcmcia/sa1100_simpad.c | 2 +-
+ drivers/pcmcia/sa1111_generic.c | 4 +-
+ drivers/pcmcia/sa1111_jornada720.c | 2 +-
+ drivers/pcmcia/vrc4171_card.c | 8 +-
+ drivers/pcmcia/vrc4173_cardu.c | 8 +-
+ drivers/pcmcia/xxs1500_ss.c | 6 +-
+ drivers/pcmcia/yenta_socket.c | 6 +-
+ drivers/pinctrl/pinctrl-bcm2835.c | 8 +-
+ drivers/pinctrl/pinctrl-imx.c | 2 +-
+ drivers/pinctrl/pinctrl-imx23.c | 4 +-
+ drivers/pinctrl/pinctrl-imx28.c | 4 +-
+ drivers/pinctrl/pinctrl-imx35.c | 4 +-
+ drivers/pinctrl/pinctrl-imx51.c | 4 +-
+ drivers/pinctrl/pinctrl-imx53.c | 4 +-
+ drivers/pinctrl/pinctrl-imx6q.c | 4 +-
+ drivers/pinctrl/pinctrl-mmp2.c | 4 +-
+ drivers/pinctrl/pinctrl-mxs.c | 2 +-
+ drivers/pinctrl/pinctrl-pxa168.c | 4 +-
+ drivers/pinctrl/pinctrl-pxa910.c | 4 +-
+ drivers/pinctrl/pinctrl-single.c | 6 +-
+ drivers/pinctrl/pinctrl-sirf.c | 2 +-
+ drivers/pinctrl/pinctrl-tegra.c | 2 +-
+ drivers/pinctrl/pinctrl-tegra20.c | 4 +-
+ drivers/pinctrl/pinctrl-tegra30.c | 4 +-
+ drivers/pinctrl/pinctrl-u300.c | 4 +-
+ drivers/pinctrl/spear/pinctrl-spear.c | 2 +-
+ drivers/pinctrl/spear/pinctrl-spear.h | 2 +-
+ drivers/pinctrl/spear/pinctrl-spear1310.c | 6 +-
+ drivers/pinctrl/spear/pinctrl-spear1340.c | 6 +-
+ drivers/pinctrl/spear/pinctrl-spear300.c | 6 +-
+ drivers/pinctrl/spear/pinctrl-spear310.c | 6 +-
+ drivers/pinctrl/spear/pinctrl-spear320.c | 6 +-
+ drivers/pnp/pnpbios/core.c | 20 +-
+ drivers/power/88pm860x_battery.c | 6 +-
+ drivers/power/88pm860x_charger.c | 6 +-
+ drivers/power/ab8500_btemp.c | 6 +-
+ drivers/power/ab8500_charger.c | 6 +-
+ drivers/power/ab8500_fg.c | 6 +-
+ drivers/power/abx500_chargalg.c | 6 +-
+ drivers/power/avs/smartreflex.c | 8 +-
+ drivers/power/bq27x00_battery.c | 6 +-
+ drivers/power/charger-manager.c | 4 +-
+ drivers/power/collie_battery.c | 6 +-
+ drivers/power/da9052-battery.c | 6 +-
+ drivers/power/ds2780_battery.c | 6 +-
+ drivers/power/ds2781_battery.c | 6 +-
+ drivers/power/generic-adc-battery.c | 6 +-
+ drivers/power/gpio-charger.c | 6 +-
+ drivers/power/intel_mid_battery.c | 8 +-
+ drivers/power/isp1704_charger.c | 6 +-
+ drivers/power/jz4740-battery.c | 6 +-
+ drivers/power/lp8727_charger.c | 4 +-
+ drivers/power/lp8788-charger.c | 6 +-
+ drivers/power/max17040_battery.c | 6 +-
+ drivers/power/max17042_battery.c | 6 +-
+ drivers/power/max8903_charger.c | 6 +-
+ drivers/power/max8925_power.c | 10 +-
+ drivers/power/max8997_charger.c | 6 +-
+ drivers/power/max8998_charger.c | 6 +-
+ drivers/power/olpc_battery.c | 6 +-
+ drivers/power/pcf50633-charger.c | 6 +-
+ drivers/power/s3c_adc_battery.c | 2 +-
+ drivers/power/sbs-battery.c | 6 +-
+ drivers/power/smb347-charger.c | 2 +-
+ drivers/power/tosa_battery.c | 6 +-
+ drivers/power/wm831x_backup.c | 6 +-
+ drivers/power/wm831x_power.c | 6 +-
+ drivers/power/wm8350_power.c | 6 +-
+ drivers/power/wm97xx_battery.c | 6 +-
+ drivers/power/z2_battery.c | 6 +-
+ drivers/ptp/ptp_pch.c | 4 +-
+ drivers/pwm/pwm-ab8500.c | 6 +-
+ drivers/pwm/pwm-bfin.c | 4 +-
+ drivers/pwm/pwm-imx.c | 6 +-
+ drivers/pwm/pwm-jz4740.c | 6 +-
+ drivers/pwm/pwm-lpc32xx.c | 4 +-
+ drivers/pwm/pwm-mxs.c | 4 +-
+ drivers/pwm/pwm-puv3.c | 6 +-
+ drivers/pwm/pwm-pxa.c | 6 +-
+ drivers/pwm/pwm-samsung.c | 4 +-
+ drivers/pwm/pwm-tegra.c | 4 +-
+ drivers/pwm/pwm-tiecap.c | 6 +-
+ drivers/pwm/pwm-tiehrpwm.c | 6 +-
+ drivers/pwm/pwm-twl6030.c | 2 +-
+ drivers/rapidio/devices/tsi721.c | 4 +-
+ drivers/rapidio/devices/tsi721.h | 2 +-
+ drivers/rapidio/devices/tsi721_dma.c | 2 +-
+ drivers/rapidio/rio-scan.c | 14 +-
+ drivers/rapidio/rio.c | 6 +-
+ drivers/video/backlight/adp5520_bl.c | 6 +-
+ drivers/video/backlight/adp8860_bl.c | 14 +-
+ drivers/video/backlight/adp8870_bl.c | 14 +-
+ drivers/video/backlight/ams369fg06.c | 6 +-
+ drivers/video/backlight/apple_bl.c | 4 +-
+ drivers/video/backlight/corgi_lcd.c | 6 +-
+ drivers/video/backlight/ep93xx_bl.c | 2 +-
+ drivers/video/backlight/hp680_bl.c | 2 +-
+ drivers/video/backlight/ili9320.c | 4 +-
+ drivers/video/backlight/l4f00242t03.c | 6 +-
+ drivers/video/backlight/ld9040.c | 4 +-
+ drivers/video/backlight/lm3533_bl.c | 8 +-
+ drivers/video/backlight/lm3630_bl.c | 8 +-
+ drivers/video/backlight/lm3639_bl.c | 8 +-
+ drivers/video/backlight/lms283gf05.c | 6 +-
+ drivers/video/backlight/lp855x_bl.c | 4 +-
+ drivers/video/backlight/ltv350qv.c | 6 +-
+ drivers/video/backlight/max8925_bl.c | 6 +-
+ drivers/video/backlight/pcf50633-backlight.c | 6 +-
+ drivers/video/backlight/platform_lcd.c | 6 +-
+ drivers/video/backlight/s6e63m0.c | 6 +-
+ drivers/video/backlight/tdo24m.c | 6 +-
+ drivers/video/backlight/tosa_bl.c | 6 +-
+ drivers/video/backlight/tosa_lcd.c | 6 +-
+ drivers/video/backlight/vgg2432a4.c | 6 +-
+ drivers/watchdog/acquirewdt.c | 6 +-
+ drivers/watchdog/advantechwdt.c | 6 +-
+ drivers/watchdog/ar7_wdt.c | 6 +-
+ drivers/watchdog/at91rm9200_wdt.c | 6 +-
+ drivers/watchdog/ath79_wdt.c | 6 +-
+ drivers/watchdog/bcm63xx_wdt.c | 6 +-
+ drivers/watchdog/bfin_wdt.c | 6 +-
+ drivers/watchdog/cpu5wdt.c | 8 +-
+ drivers/watchdog/cpwd.c | 6 +-
+ drivers/watchdog/da9052_wdt.c | 6 +-
+ drivers/watchdog/davinci_wdt.c | 6 +-
+ drivers/watchdog/dw_wdt.c | 6 +-
+ drivers/watchdog/ep93xx_wdt.c | 6 +-
+ drivers/watchdog/gef_wdt.c | 4 +-
+ drivers/watchdog/geodewdt.c | 6 +-
+ drivers/watchdog/hpwdt.c | 30 +--
+ drivers/watchdog/i6300esb.c | 10 +-
+ drivers/watchdog/iTCO_wdt.c | 8 +-
+ drivers/watchdog/ib700wdt.c | 6 +-
+ drivers/watchdog/ie6xx_wdt.c | 10 +-
+ drivers/watchdog/jz4740_wdt.c | 6 +-
+ drivers/watchdog/ks8695_wdt.c | 6 +-
+ drivers/watchdog/lantiq_wdt.c | 6 +-
+ drivers/watchdog/max63xx_wdt.c | 6 +-
+ drivers/watchdog/mixcomwd.c | 2 +-
+ drivers/watchdog/mpc8xxx_wdt.c | 6 +-
+ drivers/watchdog/mpcore_wdt.c | 6 +-
+ drivers/watchdog/mtx-1_wdt.c | 6 +-
+ drivers/watchdog/mv64x60_wdt.c | 6 +-
+ drivers/watchdog/nuc900_wdt.c | 6 +-
+ drivers/watchdog/nv_tco.c | 10 +-
+ drivers/watchdog/of_xilinx_wdt.c | 8 +-
+ drivers/watchdog/omap_wdt.c | 6 +-
+ drivers/watchdog/orion_wdt.c | 8 +-
+ drivers/watchdog/pcwd.c | 8 +-
+ drivers/watchdog/pcwd_pci.c | 6 +-
+ drivers/watchdog/pnx4008_wdt.c | 6 +-
+ drivers/watchdog/rc32434_wdt.c | 6 +-
+ drivers/watchdog/rdc321x_wdt.c | 6 +-
+ drivers/watchdog/riowd.c | 6 +-
+ drivers/watchdog/s3c2410_wdt.c | 6 +-
+ drivers/watchdog/sch311x_wdt.c | 6 +-
+ drivers/watchdog/shwdt.c | 6 +-
+ drivers/watchdog/sp5100_tco.c | 10 +-
+ drivers/watchdog/sp805_wdt.c | 6 +-
+ drivers/watchdog/stmp3xxx_wdt.c | 6 +-
+ drivers/watchdog/ts72xx_wdt.c | 6 +-
+ drivers/watchdog/twl4030_wdt.c | 6 +-
+ drivers/watchdog/via_wdt.c | 6 +-
+ drivers/watchdog/wdt_pci.c | 6 +-
+ drivers/watchdog/wm831x_wdt.c | 6 +-
+ drivers/watchdog/wm8350_wdt.c | 6 +-
+ drivers/watchdog/xen_wdt.c | 6 +-
+ fs/debugfs/inode.c | 1 -
+ fs/sysfs/file.c | 4 +-
+ include/linux/kobject.h | 18 --
+ include/linux/mfd/88pm80x.h | 2 +-
+ include/linux/mfd/abx500/ab8500.h | 4 +-
+ include/linux/mfd/pm8xxx/irq.h | 8 +-
+ include/linux/pci.h | 8 +-
+ kernel/ksysfs.c | 5 +-
+ kernel/sysctl.c | 4 +-
+ lib/Makefile | 3 +-
+ 490 files changed, 2029 insertions(+), 1819 deletions(-)
+ create mode 100644 Documentation/zh_CN/arm/kernel_user_helpers.txt
+ delete mode 100644 drivers/pci/hotplug.c
+Merging tty/tty-next (218cbbd staging/fwserial: Remove superfluous free)
+$ git merge tty/tty-next
+Resolved 'drivers/tty/serial/omap-serial.c' using previous resolution.
+Resolved 'drivers/tty/serial/xilinx_uartps.c' using previous resolution.
+Auto-merging drivers/tty/vt/vt.c
+Auto-merging drivers/tty/serial/xilinx_uartps.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/xilinx_uartps.c
+Auto-merging drivers/tty/serial/serial_core.c
+Auto-merging drivers/tty/serial/sa1100.c
+Auto-merging drivers/tty/serial/omap-serial.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
+Auto-merging drivers/tty/serial/icom.c
+Auto-merging drivers/tty/serial/bfin_uart.c
+Auto-merging drivers/tty/serial/atmel_serial.c
+Auto-merging drivers/tty/serial/Kconfig
+Auto-merging drivers/tty/hvc/hvc_vio.c
+Auto-merging drivers/tty/hvc/hvc_opal.c
+Auto-merging arch/x86/platform/ce4100/ce4100.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b96f8e5] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-tty | 112 +
+ .../bindings/tty/serial/fsl-mxs-auart.txt | 8 +
+ .../devicetree/bindings/tty/serial/of-serial.txt | 5 +-
+ MAINTAINERS | 1 +
+ arch/alpha/include/asm/ioctls.h | 3 +
+ arch/alpha/kernel/srmcons.c | 5 +-
+ arch/arm/boot/dts/imx28.dtsi | 1 +
+ arch/arm/plat-omap/include/plat/serial.h | 9 -
+ arch/ia64/hp/sim/simserial.c | 1 +
+ arch/m68k/emu/nfcon.c | 6 +-
+ arch/mips/include/uapi/asm/ioctls.h | 3 +
+ arch/parisc/include/uapi/asm/ioctls.h | 3 +
+ arch/parisc/kernel/pdc_cons.c | 5 +-
+ arch/powerpc/include/uapi/asm/ioctls.h | 3 +
+ arch/sh/include/uapi/asm/ioctls.h | 3 +
+ arch/sparc/include/uapi/asm/ioctls.h | 3 +
+ arch/um/drivers/chan_kern.c | 17 +-
+ arch/um/drivers/line.c | 2 +
+ arch/x86/platform/ce4100/ce4100.c | 3 +
+ arch/xtensa/include/uapi/asm/ioctls.h | 3 +
+ arch/xtensa/platforms/iss/console.c | 1 +
+ drivers/bluetooth/hci_ldisc.c | 7 +-
+ drivers/char/pcmcia/synclink_cs.c | 5 +-
+ drivers/char/ttyprintk.c | 4 +-
+ drivers/isdn/capi/capi.c | 36 +-
+ drivers/isdn/gigaset/common.c | 1 +
+ drivers/isdn/i4l/isdn_tty.c | 4 +
+ drivers/misc/pti.c | 7 +-
+ drivers/mmc/card/sdio_uart.c | 24 +-
+ drivers/net/usb/hso.c | 5 +-
+ drivers/s390/char/con3215.c | 1 +
+ drivers/s390/char/sclp_tty.c | 4 +-
+ drivers/s390/char/sclp_vt220.c | 2 +
+ drivers/s390/char/tty3270.c | 2 +
+ drivers/staging/Kconfig | 4 +
+ drivers/staging/Makefile | 2 +
+ drivers/staging/ccg/u_serial.c | 5 +-
+ drivers/staging/dgrp/dgrp_common.h | 1 -
+ drivers/staging/dgrp/dgrp_driver.c | 4 -
+ drivers/staging/dgrp/dgrp_net_ops.c | 73 +-
+ drivers/staging/dgrp/dgrp_specproc.c | 4 +-
+ drivers/staging/dgrp/dgrp_sysfs.c | 18 -
+ drivers/staging/dgrp/dgrp_tty.c | 39 +-
+ drivers/staging/fwserial/Kconfig | 9 +
+ drivers/staging/fwserial/Makefile | 2 +
+ drivers/staging/fwserial/TODO | 37 +
+ drivers/staging/fwserial/dma_fifo.c | 307 ++
+ drivers/staging/fwserial/dma_fifo.h | 130 +
+ drivers/staging/fwserial/fwserial.c | 2943 ++++++++++++++++++
+ drivers/staging/fwserial/fwserial.h | 387 +++
+ drivers/staging/ipack/devices/ipoctal.c | 2 +
+ drivers/staging/sb105x/Kconfig | 9 +
+ drivers/staging/sb105x/Makefile | 3 +
+ drivers/staging/sb105x/sb_mp_register.h | 295 ++
+ drivers/staging/sb105x/sb_pci_mp.c | 3195 ++++++++++++++++++++
+ drivers/staging/sb105x/sb_pci_mp.h | 293 ++
+ drivers/staging/sb105x/sb_ser_core.h | 368 +++
+ drivers/tty/amiserial.c | 2 +
+ drivers/tty/bfin_jtag_comm.c | 6 +-
+ drivers/tty/cyclades.c | 28 +-
+ drivers/tty/ehv_bytechan.c | 4 +-
+ drivers/tty/hvc/hvc_opal.c | 8 +-
+ drivers/tty/hvc/hvc_vio.c | 6 +-
+ drivers/tty/hvc/hvc_xen.c | 2 +-
+ drivers/tty/hvc/hvcs.c | 20 +-
+ drivers/tty/hvc/hvsi.c | 1 +
+ drivers/tty/ipwireless/network.c | 5 +-
+ drivers/tty/ipwireless/tty.c | 1 +
+ drivers/tty/isicom.c | 35 +-
+ drivers/tty/moxa.c | 12 +-
+ drivers/tty/mxser.c | 35 +-
+ drivers/tty/n_gsm.c | 11 +-
+ drivers/tty/n_tty.c | 752 ++---
+ drivers/tty/nozomi.c | 23 +-
+ drivers/tty/pty.c | 81 +-
+ drivers/tty/rocket.c | 4 +-
+ drivers/tty/serial/68328serial.c | 2 +
+ drivers/tty/serial/8250/8250.c | 98 +-
+ drivers/tty/serial/8250/8250.h | 36 +
+ drivers/tty/serial/8250/8250_acorn.c | 6 +-
+ drivers/tty/serial/8250/8250_dw.c | 31 +-
+ drivers/tty/serial/8250/8250_early.c | 46 +-
+ drivers/tty/serial/8250/8250_em.c | 8 +-
+ drivers/tty/serial/8250/8250_hp300.c | 10 +-
+ drivers/tty/serial/8250/8250_pci.c | 352 ++-
+ drivers/tty/serial/8250/8250_pnp.c | 14 +-
+ drivers/tty/serial/Kconfig | 47 +-
+ drivers/tty/serial/Makefile | 1 +
+ drivers/tty/serial/altera_jtaguart.c | 6 +-
+ drivers/tty/serial/altera_uart.c | 6 +-
+ drivers/tty/serial/amba-pl011.c | 25 +-
+ drivers/tty/serial/apbuart.c | 2 +-
+ drivers/tty/serial/ar933x_uart.c | 96 +-
+ drivers/tty/serial/arc_uart.c | 746 +++++
+ drivers/tty/serial/atmel_serial.c | 10 +-
+ drivers/tty/serial/bcm63xx_uart.c | 6 +-
+ drivers/tty/serial/bfin_sport_uart.c | 6 +-
+ drivers/tty/serial/bfin_uart.c | 20 +-
+ drivers/tty/serial/clps711x.c | 595 ++--
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 4 +-
+ drivers/tty/serial/efm32-uart.c | 6 +-
+ drivers/tty/serial/icom.c | 14 +-
+ drivers/tty/serial/ifx6x60.c | 168 +-
+ drivers/tty/serial/ifx6x60.h | 2 +
+ drivers/tty/serial/ioc3_serial.c | 2 +-
+ drivers/tty/serial/jsm/jsm.h | 8 +-
+ drivers/tty/serial/jsm/jsm_driver.c | 9 +-
+ drivers/tty/serial/jsm/jsm_neo.c | 116 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 104 +-
+ drivers/tty/serial/kgdb_nmi.c | 2 +
+ drivers/tty/serial/lpc32xx_hs.c | 6 +-
+ drivers/tty/serial/max3100.c | 6 +-
+ drivers/tty/serial/max310x.c | 11 +-
+ drivers/tty/serial/mcf.c | 6 +-
+ drivers/tty/serial/mfd.c | 7 +-
+ drivers/tty/serial/mpc52xx_uart.c | 2 +-
+ drivers/tty/serial/mrst_max3110.c | 6 +-
+ drivers/tty/serial/msm_serial.c | 2 +-
+ drivers/tty/serial/msm_serial_hs.c | 8 +-
+ drivers/tty/serial/mux.c | 6 +-
+ drivers/tty/serial/mxs-auart.c | 376 ++-
+ drivers/tty/serial/of_serial.c | 38 +-
+ drivers/tty/serial/omap-serial.c | 24 +-
+ drivers/tty/serial/pch_uart.c | 4 +-
+ drivers/tty/serial/pxa.c | 55 +
+ drivers/tty/serial/sa1100.c | 2 +-
+ drivers/tty/serial/samsung.c | 46 +-
+ drivers/tty/serial/sc26xx.c | 6 +-
+ drivers/tty/serial/sccnxp.c | 6 +-
+ drivers/tty/serial/serial_core.c | 186 +-
+ drivers/tty/serial/serial_txx9.c | 16 +-
+ drivers/tty/serial/sh-sci.c | 154 +-
+ drivers/tty/serial/sirfsoc_uart.c | 4 +-
+ drivers/tty/serial/sunhv.c | 6 +-
+ drivers/tty/serial/sunsab.c | 8 +-
+ drivers/tty/serial/sunsu.c | 10 +-
+ drivers/tty/serial/sunzilog.c | 14 +-
+ drivers/tty/serial/timbuart.c | 6 +-
+ drivers/tty/serial/uartlite.c | 14 +-
+ drivers/tty/serial/vr41xx_siu.c | 8 +-
+ drivers/tty/serial/vt8500_serial.c | 14 +-
+ drivers/tty/serial/xilinx_uartps.c | 6 +-
+ drivers/tty/synclink.c | 7 +-
+ drivers/tty/synclink_gt.c | 11 +-
+ drivers/tty/synclinkmp.c | 11 +-
+ drivers/tty/sysrq.c | 3 +-
+ drivers/tty/tty_audit.c | 15 +-
+ drivers/tty/tty_buffer.c | 228 +-
+ drivers/tty/tty_io.c | 24 +-
+ drivers/tty/tty_ioctl.c | 21 -
+ drivers/tty/tty_ldisc.c | 47 +-
+ drivers/tty/tty_mutex.c | 4 +-
+ drivers/tty/tty_port.c | 18 +-
+ drivers/tty/vt/consolemap.c | 6 +-
+ drivers/tty/vt/selection.c | 9 +-
+ drivers/tty/vt/vt.c | 5 +-
+ drivers/tty/vt/vt_ioctl.c | 1 +
+ drivers/usb/gadget/u_serial.c | 5 +-
+ drivers/usb/serial/usb-serial.c | 1 +
+ fs/compat_ioctl.c | 3 +
+ fs/devpts/inode.c | 61 +-
+ include/linux/devpts_fs.h | 20 +-
+ include/linux/pci_ids.h | 5 +
+ include/linux/serial_8250.h | 2 +
+ include/linux/tty.h | 45 +-
+ include/linux/tty_flip.h | 2 +-
+ include/uapi/asm-generic/ioctls.h | 3 +
+ include/uapi/linux/serial_core.h | 5 +-
+ include/uapi/linux/serial_reg.h | 18 +
+ kernel/auditsc.c | 2 +-
+ kernel/printk.c | 12 +-
+ net/irda/ircomm/ircomm_tty.c | 1 +
+ 172 files changed, 11956 insertions(+), 1771 deletions(-)
+ create mode 100644 drivers/staging/fwserial/Kconfig
+ create mode 100644 drivers/staging/fwserial/Makefile
+ create mode 100644 drivers/staging/fwserial/TODO
+ create mode 100644 drivers/staging/fwserial/dma_fifo.c
+ create mode 100644 drivers/staging/fwserial/dma_fifo.h
+ create mode 100644 drivers/staging/fwserial/fwserial.c
+ create mode 100644 drivers/staging/fwserial/fwserial.h
+ create mode 100644 drivers/staging/sb105x/Kconfig
+ create mode 100644 drivers/staging/sb105x/Makefile
+ create mode 100644 drivers/staging/sb105x/sb_mp_register.h
+ create mode 100644 drivers/staging/sb105x/sb_pci_mp.c
+ create mode 100644 drivers/staging/sb105x/sb_pci_mp.h
+ create mode 100644 drivers/staging/sb105x/sb_ser_core.h
+ create mode 100644 drivers/tty/serial/arc_uart.c
+$ git am -3 ../patches/0001-disable-the-SB105X-driver.patch
+Applying: disable the SB105X driver
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/sb105x/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master 3215ebf] Merge remote-tracking branch 'tty/tty-next'
+Merging usb/usb-next (fb37ef9 USB: mark uas driver as BROKEN)
+$ git merge usb/usb-next
+Removing firmware/dabusb/firmware.HEX
+Removing firmware/dabusb/bitstream.bin.ihex
+Auto-merging drivers/usb/storage/realtek_cr.c
+Removing drivers/usb/host/ohci-xls.c
+Removing drivers/usb/host/ohci-sh.c
+Removing drivers/usb/host/ohci-ppc-soc.c
+Removing drivers/usb/host/ohci-pnx8550.c
+Removing drivers/usb/host/ohci-cns3xxx.c
+Removing drivers/usb/host/ohci-au1xxx.c
+Removing drivers/usb/host/ehci-xls.c
+Removing drivers/usb/host/ehci-ls1x.c
+Removing drivers/usb/host/ehci-lpm.c
+Removing drivers/usb/host/ehci-ixp4xx.c
+Removing drivers/usb/host/ehci-cns3xxx.c
+Removing drivers/usb/host/ehci-au1xxx.c
+Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
+Removing drivers/usb/gadget/file_storage.c
+Auto-merging drivers/usb/gadget/at91_udc.c
+Auto-merging drivers/usb/core/driver.c
+Auto-merging arch/mips/loongson1/common/platform.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/gadget.tmpl | 2 +-
+ Documentation/devices.txt | 3 -
+ .../devicetree/bindings/usb/am33xx-usb.txt | 8 +-
+ Documentation/usb/error-codes.txt | 7 +-
+ Documentation/usb/mass-storage.txt | 15 +-
+ MAINTAINERS | 6 -
+ arch/arm/configs/afeb9260_defconfig | 2 +-
+ arch/arm/configs/at91sam9260_defconfig | 2 +-
+ arch/arm/configs/at91sam9261_defconfig | 2 +-
+ arch/arm/configs/at91sam9263_defconfig | 2 +-
+ arch/arm/configs/at91sam9g20_defconfig | 2 +-
+ arch/arm/configs/corgi_defconfig | 2 +-
+ arch/arm/configs/davinci_all_defconfig | 2 +-
+ arch/arm/configs/h7202_defconfig | 3 +-
+ arch/arm/configs/magician_defconfig | 2 +-
+ arch/arm/configs/mini2440_defconfig | 2 +-
+ arch/arm/configs/omap1_defconfig | 3 +-
+ arch/arm/configs/prima2_defconfig | 1 -
+ arch/arm/configs/spitz_defconfig | 2 +-
+ arch/arm/configs/stamp9g20_defconfig | 2 +-
+ arch/arm/configs/viper_defconfig | 2 +-
+ arch/arm/configs/zeus_defconfig | 2 +-
+ arch/arm/mach-cns3xxx/cns3420vb.c | 53 +-
+ arch/avr32/configs/atngw100_defconfig | 2 +-
+ arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +-
+ arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +-
+ arch/avr32/configs/atngw100_mrmt_defconfig | 2 +-
+ arch/avr32/configs/atngw100mkii_defconfig | 2 +-
+ .../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +-
+ .../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +-
+ arch/avr32/configs/atstk1002_defconfig | 2 +-
+ arch/avr32/configs/atstk1003_defconfig | 2 +-
+ arch/avr32/configs/atstk1004_defconfig | 2 +-
+ arch/avr32/configs/atstk1006_defconfig | 2 +-
+ arch/avr32/configs/favr-32_defconfig | 2 +-
+ arch/avr32/configs/hammerhead_defconfig | 2 +-
+ arch/blackfin/configs/CM-BF527_defconfig | 2 +-
+ arch/blackfin/configs/CM-BF548_defconfig | 2 +-
+ arch/blackfin/configs/CM-BF561_defconfig | 2 +-
+ arch/mips/alchemy/common/Makefile | 2 +-
+ arch/mips/alchemy/common/platform.c | 58 +-
+ .../mips/alchemy/common/usb.c | 0
+ arch/mips/ath79/dev-usb.c | 2 -
+ arch/mips/configs/bcm47xx_defconfig | 2 +-
+ arch/mips/configs/db1000_defconfig | 1 +
+ arch/mips/configs/db1235_defconfig | 2 +
+ arch/mips/configs/gpr_defconfig | 1 +
+ arch/mips/configs/ls1b_defconfig | 1 +
+ arch/mips/configs/mtx1_defconfig | 3 +-
+ arch/mips/loongson1/common/platform.c | 7 +-
+ arch/mips/netlogic/xlr/platform.c | 17 +-
+ arch/mips/pnx8550/common/platform.c | 31 +-
+ arch/sh/configs/ecovec24_defconfig | 2 +-
+ arch/sh/configs/se7724_defconfig | 2 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7720.c | 6 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 6 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 6 +-
+ drivers/usb/c67x00/c67x00-drv.c | 6 +-
+ drivers/usb/chipidea/Kconfig | 1 +
+ drivers/usb/chipidea/ci13xxx_imx.c | 8 +-
+ drivers/usb/chipidea/ci13xxx_msm.c | 6 +-
+ drivers/usb/chipidea/ci13xxx_pci.c | 6 +-
+ drivers/usb/chipidea/core.c | 9 +-
+ drivers/usb/chipidea/debug.c | 3 -
+ drivers/usb/chipidea/host.c | 67 +-
+ drivers/usb/chipidea/usbmisc_imx6q.c | 6 +-
+ drivers/usb/class/cdc-acm.c | 38 +
+ drivers/usb/core/devices.c | 18 +-
+ drivers/usb/core/driver.c | 25 -
+ drivers/usb/core/generic.c | 7 +-
+ drivers/usb/core/hcd.c | 19 +-
+ drivers/usb/core/hub.c | 97 +-
+ drivers/usb/core/message.c | 66 +-
+ drivers/usb/core/urb.c | 29 +-
+ drivers/usb/core/usb.c | 13 +-
+ drivers/usb/dwc3/Makefile | 14 +-
+ drivers/usb/dwc3/core.c | 96 +-
+ drivers/usb/dwc3/core.h | 3 -
+ drivers/usb/dwc3/debugfs.c | 4 +-
+ drivers/usb/dwc3/dwc3-exynos.c | 57 +-
+ drivers/usb/dwc3/dwc3-omap.c | 24 +-
+ drivers/usb/dwc3/dwc3-pci.c | 24 +-
+ drivers/usb/dwc3/gadget.c | 4 +-
+ drivers/usb/early/ehci-dbgp.c | 4 +-
+ drivers/usb/gadget/Kconfig | 29 +-
+ drivers/usb/gadget/Makefile | 2 -
+ drivers/usb/gadget/at91_udc.c | 4 +-
+ drivers/usb/gadget/bcm63xx_udc.c | 6 +-
+ drivers/usb/gadget/composite.c | 8 +-
+ drivers/usb/gadget/config.c | 39 +-
+ drivers/usb/gadget/dummy_hcd.c | 170 +-
+ drivers/usb/gadget/f_acm.c | 79 +-
+ drivers/usb/gadget/f_ecm.c | 112 +-
+ drivers/usb/gadget/f_eem.c | 51 +-
+ drivers/usb/gadget/f_fs.c | 4 +-
+ drivers/usb/gadget/f_hid.c | 30 +-
+ drivers/usb/gadget/f_loopback.c | 28 +-
+ drivers/usb/gadget/f_mass_storage.c | 63 +-
+ drivers/usb/gadget/f_midi.c | 14 +-
+ drivers/usb/gadget/f_ncm.c | 94 +-
+ drivers/usb/gadget/f_obex.c | 42 +-
+ drivers/usb/gadget/f_phonet.c | 21 +-
+ drivers/usb/gadget/f_rndis.c | 94 +-
+ drivers/usb/gadget/f_serial.c | 38 +-
+ drivers/usb/gadget/f_sourcesink.c | 104 +-
+ drivers/usb/gadget/f_subset.c | 75 +-
+ drivers/usb/gadget/f_uac1.c | 23 +-
+ drivers/usb/gadget/f_uac2.c | 222 +-
+ drivers/usb/gadget/f_uvc.c | 138 +-
+ drivers/usb/gadget/file_storage.c | 3656 --------------------
+ drivers/usb/gadget/fsl_qe_udc.c | 14 +-
+ drivers/usb/gadget/fsl_udc_core.c | 2 +-
+ drivers/usb/gadget/hid.c | 4 +-
+ drivers/usb/gadget/inode.c | 3 -
+ drivers/usb/gadget/lpc32xx_udc.c | 6 +-
+ drivers/usb/gadget/mv_u3d_core.c | 2 +-
+ drivers/usb/gadget/mv_udc_core.c | 4 +-
+ drivers/usb/gadget/net2272.c | 29 +-
+ drivers/usb/gadget/net2280.c | 2 +-
+ drivers/usb/gadget/omap_udc.c | 10 +-
+ drivers/usb/gadget/printer.c | 12 +-
+ drivers/usb/gadget/pxa27x_udc.h | 2 +-
+ drivers/usb/gadget/s3c-hsotg.c | 12 +-
+ drivers/usb/gadget/s3c-hsudc.c | 2 +-
+ drivers/usb/gadget/storage_common.c | 165 +-
+ drivers/usb/gadget/tcm_usb_gadget.c | 11 +-
+ drivers/usb/gadget/udc-core.c | 11 -
+ drivers/usb/host/Kconfig | 35 +-
+ drivers/usb/host/Makefile | 4 +-
+ drivers/usb/host/bcma-hcd.c | 15 +-
+ drivers/usb/host/ehci-atmel.c | 15 +-
+ drivers/usb/host/ehci-au1xxx.c | 184 -
+ drivers/usb/host/ehci-cns3xxx.c | 155 -
+ drivers/usb/host/ehci-dbg.c | 112 -
+ drivers/usb/host/ehci-fsl.c | 1 -
+ drivers/usb/host/ehci-grlib.c | 20 +-
+ drivers/usb/host/ehci-hcd.c | 204 +-
+ drivers/usb/host/ehci-hub.c | 47 +-
+ drivers/usb/host/ehci-ixp4xx.c | 139 -
+ drivers/usb/host/ehci-lpm.c | 84 -
+ drivers/usb/host/ehci-ls1x.c | 147 -
+ drivers/usb/host/ehci-msm.c | 5 +-
+ drivers/usb/host/ehci-mxc.c | 10 +-
+ drivers/usb/host/ehci-octeon.c | 3 -
+ drivers/usb/host/ehci-omap.c | 3 -
+ drivers/usb/host/ehci-orion.c | 20 +-
+ drivers/usb/host/ehci-pci.c | 132 +-
+ drivers/usb/host/ehci-platform.c | 102 +-
+ drivers/usb/host/ehci-pmcmsp.c | 1 -
+ drivers/usb/host/ehci-ppc-of.c | 4 +-
+ drivers/usb/host/ehci-ps3.c | 2 +-
+ drivers/usb/host/ehci-q.c | 12 +-
+ drivers/usb/host/ehci-s5p.c | 16 +-
+ drivers/usb/host/ehci-sched.c | 136 +-
+ drivers/usb/host/ehci-sh.c | 9 +-
+ drivers/usb/host/ehci-spear.c | 59 +-
+ drivers/usb/host/ehci-tegra.c | 18 +-
+ drivers/usb/host/ehci-vt8500.c | 21 -
+ drivers/usb/host/ehci-w90x900.c | 10 +-
+ drivers/usb/host/ehci-xilinx-of.c | 2 +-
+ drivers/usb/host/ehci-xls.c | 142 -
+ drivers/usb/host/ehci.h | 45 +-
+ drivers/usb/host/fhci-hcd.c | 8 +-
+ drivers/usb/host/fsl-mph-dr-of.c | 16 +-
+ drivers/usb/host/imx21-hcd.c | 2 +-
+ drivers/usb/host/isp116x-hcd.c | 2 +-
+ drivers/usb/host/isp1362-hcd.c | 6 +-
+ drivers/usb/host/isp1760-if.c | 15 +-
+ drivers/usb/host/ohci-at91.c | 22 +-
+ drivers/usb/host/ohci-au1xxx.c | 234 --
+ drivers/usb/host/ohci-cns3xxx.c | 166 -
+ drivers/usb/host/ohci-ep93xx.c | 4 +-
+ drivers/usb/host/ohci-exynos.c | 38 +-
+ drivers/usb/host/ohci-hcd.c | 139 +-
+ drivers/usb/host/ohci-hub.c | 42 -
+ drivers/usb/host/ohci-jz4740.c | 6 +-
+ drivers/usb/host/ohci-nxp.c | 4 +-
+ drivers/usb/host/ohci-octeon.c | 2 +-
+ drivers/usb/host/ohci-omap.c | 2 +-
+ drivers/usb/host/ohci-omap3.c | 6 +-
+ drivers/usb/host/ohci-pci.c | 49 +-
+ drivers/usb/host/ohci-platform.c | 34 +-
+ drivers/usb/host/ohci-pnx8550.c | 243 --
+ drivers/usb/host/ohci-ppc-of.c | 4 +-
+ drivers/usb/host/ohci-ppc-soc.c | 216 --
+ drivers/usb/host/ohci-ps3.c | 4 +-
+ drivers/usb/host/ohci-pxa27x.c | 8 +-
+ drivers/usb/host/ohci-q.c | 23 +-
+ drivers/usb/host/ohci-s3c2410.c | 41 +-
+ drivers/usb/host/ohci-sa1111.c | 2 +-
+ drivers/usb/host/ohci-sh.c | 141 -
+ drivers/usb/host/ohci-sm501.c | 2 +-
+ drivers/usb/host/ohci-spear.c | 50 +-
+ drivers/usb/host/ohci-tmio.c | 8 +-
+ drivers/usb/host/ohci-xls.c | 152 -
+ drivers/usb/host/pci-quirks.c | 20 +-
+ drivers/usb/host/r8a66597-hcd.c | 12 +-
+ drivers/usb/host/sl811-hcd.c | 6 +-
+ drivers/usb/host/ssb-hcd.c | 19 +-
+ drivers/usb/host/u132-hcd.c | 6 +-
+ drivers/usb/host/uhci-grlib.c | 2 +-
+ drivers/usb/host/uhci-platform.c | 2 +-
+ drivers/usb/host/uhci-q.c | 73 +-
+ drivers/usb/host/xhci-mem.c | 9 +-
+ drivers/usb/host/xhci-pci.c | 16 +-
+ drivers/usb/host/xhci-ring.c | 34 +-
+ drivers/usb/host/xhci.c | 32 +-
+ drivers/usb/host/xhci.h | 2 +-
+ drivers/usb/misc/Kconfig | 1 +
+ drivers/usb/misc/ezusb.c | 38 +-
+ drivers/usb/misc/usbtest.c | 4 +
+ drivers/usb/musb/am35x.c | 40 +-
+ drivers/usb/musb/blackfin.c | 38 +-
+ drivers/usb/musb/cppi_dma.c | 4 +-
+ drivers/usb/musb/da8xx.c | 40 +-
+ drivers/usb/musb/davinci.c | 40 +-
+ drivers/usb/musb/musb_core.c | 137 +-
+ drivers/usb/musb/musb_core.h | 5 +-
+ drivers/usb/musb/musb_debugfs.c | 2 +-
+ drivers/usb/musb/musb_dma.h | 3 +-
+ drivers/usb/musb/musb_dsps.c | 141 +-
+ drivers/usb/musb/musb_gadget.c | 36 +-
+ drivers/usb/musb/musb_gadget_ep0.c | 6 +-
+ drivers/usb/musb/musb_host.c | 2 +-
+ drivers/usb/musb/musbhsdma.c | 3 +-
+ drivers/usb/musb/musbhsdma.h | 4 -
+ drivers/usb/musb/omap2430.c | 52 +-
+ drivers/usb/musb/tusb6010.c | 40 +-
+ drivers/usb/musb/tusb6010_omap.c | 3 +-
+ drivers/usb/musb/ux500.c | 62 +-
+ drivers/usb/musb/ux500_dma.c | 3 +-
+ drivers/usb/otg/ab8500-usb.c | 6 +-
+ drivers/usb/otg/fsl_otg.c | 6 +-
+ drivers/usb/otg/isp1301_omap.c | 2 +-
+ drivers/usb/otg/msm_otg.c | 4 +-
+ drivers/usb/otg/mv_otg.c | 14 +-
+ drivers/usb/otg/mxs-phy.c | 59 +-
+ drivers/usb/otg/nop-usb-xceiv.c | 6 +-
+ drivers/usb/otg/twl4030-usb.c | 48 +-
+ drivers/usb/otg/twl6030-usb.c | 2 +-
+ drivers/usb/phy/Kconfig | 12 +
+ drivers/usb/phy/Makefile | 1 +
+ drivers/usb/phy/mv_u3d_phy.c | 4 +-
+ drivers/usb/phy/omap-usb2.c | 6 +-
+ drivers/usb/phy/rcar-phy.c | 220 ++
+ drivers/usb/phy/tegra_usb_phy.c | 4 +-
+ drivers/usb/renesas_usbhs/common.c | 9 +-
+ drivers/usb/renesas_usbhs/common.h | 1 +
+ drivers/usb/renesas_usbhs/fifo.c | 14 +-
+ drivers/usb/renesas_usbhs/mod.c | 3 +-
+ drivers/usb/renesas_usbhs/mod_gadget.c | 11 +
+ drivers/usb/renesas_usbhs/mod_host.c | 45 +-
+ drivers/usb/renesas_usbhs/pipe.c | 101 +
+ drivers/usb/renesas_usbhs/pipe.h | 1 +
+ drivers/usb/serial/aircable.c | 5 -
+ drivers/usb/serial/ark3116.c | 5 -
+ drivers/usb/serial/belkin_sa.c | 5 -
+ drivers/usb/serial/bus.c | 10 -
+ drivers/usb/serial/cp210x.c | 37 +-
+ drivers/usb/serial/cyberjack.c | 5 -
+ drivers/usb/serial/cypress_m8.c | 5 -
+ drivers/usb/serial/digi_acceleport.c | 4 -
+ drivers/usb/serial/empeg.c | 4 -
+ drivers/usb/serial/ftdi_sio.c | 82 +-
+ drivers/usb/serial/ftdi_sio_ids.h | 6 +
+ drivers/usb/serial/generic.c | 1 +
+ drivers/usb/serial/hp4x.c | 5 -
+ drivers/usb/serial/io_edgeport.c | 4 -
+ drivers/usb/serial/io_ti.c | 4 -
+ drivers/usb/serial/ipaq.c | 5 -
+ drivers/usb/serial/ipw.c | 4 -
+ drivers/usb/serial/iuu_phoenix.c | 8 +-
+ drivers/usb/serial/keyspan.c | 4 -
+ drivers/usb/serial/keyspan_pda.c | 4 -
+ drivers/usb/serial/kl5kusb105.c | 4 -
+ drivers/usb/serial/kobil_sct.c | 2 -
+ drivers/usb/serial/mct_u232.c | 4 -
+ drivers/usb/serial/metro-usb.c | 2 -
+ drivers/usb/serial/mos7720.c | 4 -
+ drivers/usb/serial/mos7840.c | 4 -
+ drivers/usb/serial/omninet.c | 4 -
+ drivers/usb/serial/opticon.c | 351 +-
+ drivers/usb/serial/option.c | 113 +-
+ drivers/usb/serial/oti6858.c | 2 -
+ drivers/usb/serial/quatech2.c | 2 -
+ drivers/usb/serial/siemens_mpi.c | 2 -
+ drivers/usb/serial/sierra.c | 3 +-
+ drivers/usb/serial/spcp8x5.c | 4 -
+ drivers/usb/serial/ssu100.c | 2 -
+ drivers/usb/serial/usb_wwan.c | 2 -
+ drivers/usb/serial/vivopay-serial.c | 3 -
+ drivers/usb/storage/Kconfig | 2 +-
+ drivers/usb/storage/realtek_cr.c | 2 +-
+ drivers/usb/storage/usb.c | 1 -
+ drivers/usb/usb-skeleton.c | 13 +-
+ drivers/usb/wusbcore/devconnect.c | 13 -
+ drivers/uwb/Kconfig | 3 +-
+ drivers/uwb/reset.c | 1 +
+ drivers/uwb/umc-bus.c | 2 +-
+ firmware/Makefile | 1 -
+ firmware/dabusb/bitstream.bin.ihex | 761 ----
+ firmware/dabusb/firmware.HEX | 649 ----
+ include/linux/usb.h | 50 +-
+ include/linux/usb/composite.h | 4 +-
+ include/linux/usb/ehci_pdriver.h | 5 +-
+ include/linux/usb/ezusb.h | 8 -
+ include/linux/usb/gadget.h | 7 +
+ include/linux/usb/ohci_pdriver.h | 2 +
+ include/linux/usb/phy.h | 15 +-
+ 310 files changed, 3027 insertions(+), 10753 deletions(-)
+ rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%)
+ delete mode 100644 drivers/usb/gadget/file_storage.c
+ delete mode 100644 drivers/usb/host/ehci-au1xxx.c
+ delete mode 100644 drivers/usb/host/ehci-cns3xxx.c
+ delete mode 100644 drivers/usb/host/ehci-ixp4xx.c
+ delete mode 100644 drivers/usb/host/ehci-lpm.c
+ delete mode 100644 drivers/usb/host/ehci-ls1x.c
+ delete mode 100644 drivers/usb/host/ehci-xls.c
+ delete mode 100644 drivers/usb/host/ohci-au1xxx.c
+ delete mode 100644 drivers/usb/host/ohci-cns3xxx.c
+ delete mode 100644 drivers/usb/host/ohci-pnx8550.c
+ delete mode 100644 drivers/usb/host/ohci-ppc-soc.c
+ delete mode 100644 drivers/usb/host/ohci-sh.c
+ delete mode 100644 drivers/usb/host/ohci-xls.c
+ create mode 100644 drivers/usb/phy/rcar-phy.c
+ delete mode 100644 firmware/dabusb/bitstream.bin.ihex
+ delete mode 100644 firmware/dabusb/firmware.HEX
+Merging staging/staging-next (8b7a13c staging: r8712u: Fix possible buffer overrun)
+$ git merge staging/staging-next
+Auto-merging include/linux/ipack.h
+Removing drivers/staging/vt6656/upc.h
+Removing drivers/staging/vt6656/ioctl.h
+Removing drivers/staging/vt6656/ioctl.c
+Removing drivers/staging/telephony/phonedev.c
+Removing drivers/staging/telephony/ixj_pcmcia.c
+Removing drivers/staging/telephony/ixj.h
+Removing drivers/staging/telephony/ixj.c
+Removing drivers/staging/telephony/ixj-ver.h
+Removing drivers/staging/telephony/TODO
+Removing drivers/staging/telephony/Makefile
+Removing drivers/staging/telephony/Kconfig
+Removing drivers/staging/rts_pstor/xd.h
+Removing drivers/staging/rts_pstor/xd.c
+Removing drivers/staging/rts_pstor/trace.h
+Removing drivers/staging/rts_pstor/spi.h
+Removing drivers/staging/rts_pstor/spi.c
+Removing drivers/staging/rts_pstor/sd.h
+Removing drivers/staging/rts_pstor/sd.c
+Removing drivers/staging/rts_pstor/rtsx_transport.h
+Removing drivers/staging/rts_pstor/rtsx_transport.c
+Removing drivers/staging/rts_pstor/rtsx_sys.h
+Removing drivers/staging/rts_pstor/rtsx_scsi.h
+Removing drivers/staging/rts_pstor/rtsx_scsi.c
+Removing drivers/staging/rts_pstor/rtsx_chip.h
+Removing drivers/staging/rts_pstor/rtsx_chip.c
+Removing drivers/staging/rts_pstor/rtsx_card.h
+Removing drivers/staging/rts_pstor/rtsx_card.c
+Removing drivers/staging/rts_pstor/rtsx.h
+Removing drivers/staging/rts_pstor/rtsx.c
+Removing drivers/staging/rts_pstor/ms.h
+Removing drivers/staging/rts_pstor/ms.c
+Removing drivers/staging/rts_pstor/general.h
+Removing drivers/staging/rts_pstor/general.c
+Removing drivers/staging/rts_pstor/debug.h
+Removing drivers/staging/rts_pstor/TODO
+Removing drivers/staging/rts_pstor/Makefile
+Removing drivers/staging/rts_pstor/Kconfig
+Auto-merging drivers/staging/omap-thermal/omap-thermal-common.c
+Auto-merging drivers/staging/media/lirc/lirc_serial.c
+Auto-merging drivers/staging/media/dt3155v4l/dt3155v4l.c
+Removing drivers/staging/line6/dumprequest.h
+Removing drivers/staging/line6/dumprequest.c
+Removing drivers/staging/line6/control.h
+Removing drivers/staging/line6/control.c
+Removing drivers/staging/ipack/ipack_ids.h
+Removing drivers/staging/ipack/bridges/Kconfig
+Removing drivers/staging/ipack/TODO
+Removing drivers/staging/ipack/Kconfig
+Removing drivers/staging/iio/gyro/adis16260_trigger.c
+Removing drivers/staging/iio/gyro/adis16260_ring.c
+Removing drivers/staging/iio/adc/max1363_ring.c
+Removing drivers/staging/iio/adc/max1363.h
+Removing drivers/staging/iio/adc/adt7310.c
+Removing drivers/staging/iio/adc/ad7887_ring.c
+Removing drivers/staging/iio/adc/ad7887.h
+Removing drivers/staging/iio/adc/ad7298_ring.c
+Removing drivers/staging/iio/adc/ad7298.h
+Removing drivers/staging/iio/accel/adis16240_trigger.c
+Removing drivers/staging/iio/accel/adis16240_ring.c
+Removing drivers/staging/iio/accel/adis16209_trigger.c
+Removing drivers/staging/iio/accel/adis16209_ring.c
+Removing drivers/staging/iio/accel/adis16204_trigger.c
+Removing drivers/staging/iio/accel/adis16204_ring.c
+Removing drivers/staging/iio/accel/adis16203_trigger.c
+Removing drivers/staging/iio/accel/adis16203_ring.c
+Removing drivers/staging/iio/accel/adis16201_trigger.c
+Removing drivers/staging/iio/accel/adis16201_ring.c
+Auto-merging drivers/staging/fwserial/fwserial.c
+CONFLICT (add/add): Merge conflict in drivers/staging/fwserial/fwserial.c
+Auto-merging drivers/staging/dgrp/dgrp_tty.c
+CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_tty.c
+Auto-merging drivers/staging/dgrp/dgrp_sysfs.c
+Auto-merging drivers/staging/dgrp/dgrp_net_ops.c
+Auto-merging drivers/staging/csr/netdev.c
+Removing drivers/staging/csr/csr_panic.h
+Removing drivers/staging/csr/csr_panic.c
+Removing drivers/staging/csr/csr_lib.h
+Auto-merging drivers/staging/comedi/drivers/usbdux.c
+Removing drivers/staging/comedi/drivers/mpc8260cpm.c
+Removing drivers/staging/comedi/drivers/addi_apci_3300.c
+Removing drivers/staging/comedi/drivers/addi_apci_3001.c
+Removing drivers/staging/comedi/drivers/addi_apci_2016.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
+Removing driverResolved 'drivers/iio/adc/Kconfig' using previous resolution.
+Resolved 'drivers/iio/adc/Makefile' using previous resolution.
+Resolved 'drivers/staging/Kconfig' using previous resolution.
+Resolved 'drivers/staging/Makefile' using previous resolution.
+Resolved 'drivers/staging/dgrp/dgrp_tty.c' using previous resolution.
+Resolved 'drivers/staging/fwserial/fwserial.c' using previous resolution.
+s/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
+Removing drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
+Auto-merging drivers/staging/Makefile
+CONFLICT (content): Merge conflict in drivers/staging/Makefile
+Auto-merging drivers/staging/Kconfig
+CONFLICT (content): Merge conflict in drivers/staging/Kconfig
+Auto-merging drivers/ipack/ipack.c
+Auto-merging drivers/ipack/devices/scc2698.h
+Auto-merging drivers/ipack/devices/ipoctal.h
+Auto-merging drivers/ipack/devices/ipoctal.c
+Auto-merging drivers/ipack/devices/Kconfig
+Auto-merging drivers/ipack/carriers/tpci200.h
+Auto-merging drivers/ipack/carriers/tpci200.c
+Auto-merging drivers/ipack/Makefile
+Auto-merging drivers/iio/adc/max1363.c
+Auto-merging drivers/iio/adc/ad7887.c
+Auto-merging drivers/iio/adc/ad7298.c
+Auto-merging drivers/iio/adc/Makefile
+CONFLICT (content): Merge conflict in drivers/iio/adc/Makefile
+Auto-merging drivers/iio/adc/Kconfig
+CONFLICT (content): Merge conflict in drivers/iio/adc/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/telephony/ixj.txt
+Removing Documentation/telephony/00-INDEX
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 01c8984] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 24 +
+ Documentation/telephony/00-INDEX | 4 -
+ Documentation/telephony/ixj.txt | 394 -
+ MAINTAINERS | 9 +
+ arch/arm/mach-omap2/board-overo.c | 1 -
+ arch/arm/mach-omap2/drm.c | 7 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/iio/Kconfig | 13 +-
+ drivers/iio/Makefile | 8 +-
+ drivers/iio/accel/Kconfig | 2 +-
+ drivers/iio/accel/hid-sensor-accel-3d.c | 21 +-
+ drivers/iio/adc/Kconfig | 43 +
+ drivers/iio/adc/Makefile | 5 +-
+ drivers/iio/adc/ad7266.c | 3 +-
+ .../iio/adc/ad7298_core.c => iio/adc/ad7298.c} | 201 +-
+ drivers/iio/adc/ad7476.c | 2 +-
+ .../iio/adc/ad7887_core.c => iio/adc/ad7887.c} | 217 +-
+ drivers/iio/adc/ad_sigma_delta.c | 2 +-
+ drivers/iio/adc/at91_adc.c | 6 +-
+ .../iio/adc/max1363_core.c => iio/adc/max1363.c} | 330 +-
+ drivers/iio/buffer_cb.c | 113 +
+ drivers/iio/common/hid-sensors/Kconfig | 2 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 6 +-
+ drivers/iio/dac/Kconfig | 12 +-
+ drivers/iio/dac/Makefile | 1 +
+ drivers/iio/dac/ad5449.c | 376 +
+ drivers/iio/dac/ad5686.c | 2 +-
+ drivers/iio/gyro/Kconfig | 9 +
+ drivers/iio/gyro/Makefile | 1 +
+ drivers/iio/gyro/adis16136.c | 581 ++
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 21 +-
+ drivers/iio/imu/Kconfig | 27 +
+ drivers/iio/imu/Makefile | 10 +
+ drivers/iio/imu/adis.c | 440 +
+ drivers/iio/imu/adis16480.c | 925 ++
+ drivers/iio/imu/adis_buffer.c | 176 +
+ drivers/iio/imu/adis_trigger.c | 89 +
+ drivers/iio/industrialio-buffer.c | 386 +-
+ drivers/iio/industrialio-core.c | 105 +-
+ drivers/iio/industrialio-event.c | 11 +-
+ drivers/iio/inkern.c | 6 +-
+ drivers/iio/light/adjd_s311.c | 3 +-
+ drivers/iio/light/hid-sensor-als.c | 20 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 21 +-
+ drivers/ipack/Kconfig | 24 +
+ drivers/{staging => }/ipack/Makefile | 2 +-
+ drivers/ipack/carriers/Kconfig | 7 +
+ .../ipack/bridges => ipack/carriers}/Makefile | 0
+ .../ipack/bridges => ipack/carriers}/tpci200.c | 321 +-
+ .../ipack/bridges => ipack/carriers}/tpci200.h | 33 +-
+ drivers/{staging => }/ipack/devices/Kconfig | 1 -
+ drivers/{staging => }/ipack/devices/Makefile | 0
+ drivers/{staging => }/ipack/devices/ipoctal.c | 127 +-
+ drivers/{staging => }/ipack/devices/ipoctal.h | 7 +-
+ drivers/{staging => }/ipack/devices/scc2698.h | 7 +-
+ drivers/{staging => }/ipack/ipack.c | 64 +-
+ drivers/staging/Kconfig | 6 -
+ drivers/staging/Makefile | 3 -
+ drivers/staging/android/Makefile | 2 +
+ drivers/staging/android/binder.c | 471 +-
+ drivers/staging/android/binder_trace.h | 327 +
+ drivers/staging/android/logger.c | 21 +
+ drivers/staging/bcm/Adapter.h | 8 +-
+ drivers/staging/bcm/Bcmchar.c | 149 +-
+ drivers/staging/bcm/Bcmnet.c | 6 +-
+ drivers/staging/bcm/CmHost.c | 90 +-
+ drivers/staging/bcm/CmHost.h | 189 +-
+ drivers/staging/bcm/HandleControlPacket.c | 2 +-
+ drivers/staging/bcm/HostMIBSInterface.h | 384 +-
+ drivers/staging/bcm/InterfaceAdapter.h | 142 +-
+ drivers/staging/bcm/InterfaceDld.c | 4 +-
+ drivers/staging/bcm/InterfaceIdleMode.c | 2 +-
+ drivers/staging/bcm/InterfaceIdleMode.h | 5 +-
+ drivers/staging/bcm/InterfaceInit.c | 25 +-
+ drivers/staging/bcm/InterfaceInit.h | 4 +-
+ drivers/staging/bcm/InterfaceIsr.c | 6 +-
+ drivers/staging/bcm/InterfaceIsr.h | 4 +-
+ drivers/staging/bcm/InterfaceMisc.c | 124 +-
+ drivers/staging/bcm/InterfaceMisc.h | 6 +-
+ drivers/staging/bcm/InterfaceRx.c | 16 +-
+ drivers/staging/bcm/InterfaceRx.h | 2 +-
+ drivers/staging/bcm/InterfaceTx.c | 14 +-
+ drivers/staging/bcm/Ioctl.h | 482 +-
+ drivers/staging/bcm/LeakyBucket.c | 6 +-
+ drivers/staging/bcm/Misc.c | 236 +-
+ drivers/staging/bcm/Prototypes.h | 36 +-
+ drivers/staging/bcm/Transmit.c | 2 +-
+ drivers/staging/bcm/cntrl_SignalingInterface.h | 256 +-
+ drivers/staging/bcm/hostmibs.c | 12 +-
+ drivers/staging/bcm/nvm.c | 94 +-
+ drivers/staging/bcm/vendorspecificextn.c | 6 +-
+ drivers/staging/bcm/vendorspecificextn.h | 6 +-
+ drivers/staging/ccg/ccg.c | 8 +-
+ drivers/staging/ced1401/ced_ioc.c | 37 +-
+ drivers/staging/ced1401/usb1401.c | 36 +-
+ drivers/staging/ced1401/usb1401.h | 2 +-
+ drivers/staging/ced1401/userspace/use1401.c | 8 +-
+ drivers/staging/comedi/Kconfig | 45 +-
+ drivers/staging/comedi/comedi.h | 65 +-
+ drivers/staging/comedi/comedi_compat32.c | 1 -
+ drivers/staging/comedi/comedi_fops.c | 5 +-
+ drivers/staging/comedi/comedidev.h | 70 +-
+ drivers/staging/comedi/drivers.c | 144 +-
+ drivers/staging/comedi/drivers/8255.c | 27 +-
+ drivers/staging/comedi/drivers/8255_pci.c | 26 +-
+ drivers/staging/comedi/drivers/Makefile | 2 -
+ .../comedi/drivers/addi-data/APCI1710_82x54.c | 205 +-
+ .../comedi/drivers/addi-data/APCI1710_82x54.h | 73 -
+ .../comedi/drivers/addi-data/APCI1710_Chrono.c | 245 +-
+ .../comedi/drivers/addi-data/APCI1710_Chrono.h | 74 -
+ .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 44 +-
+ .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 46 -
+ .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 886 +-
+ .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 271 -
+ .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 39 +-
+ .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 47 -
+ .../comedi/drivers/addi-data/APCI1710_Pwm.c | 278 +-
+ .../comedi/drivers/addi-data/APCI1710_Pwm.h | 76 -
+ .../comedi/drivers/addi-data/APCI1710_Ssi.c | 41 +-
+ .../comedi/drivers/addi-data/APCI1710_Ssi.h | 43 -
+ .../comedi/drivers/addi-data/APCI1710_Tor.c | 50 +-
+ .../comedi/drivers/addi-data/APCI1710_Tor.h | 57 -
+ .../comedi/drivers/addi-data/APCI1710_Ttl.c | 38 +-
+ .../comedi/drivers/addi-data/APCI1710_Ttl.h | 44 -
+ .../comedi/drivers/addi-data/addi_amcc_s5933.h | 469 -
+ .../staging/comedi/drivers/addi-data/addi_common.c | 2036 +---
+ .../staging/comedi/drivers/addi-data/addi_common.h | 32 -
+ .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1367 +--
+ .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 69 +-
+ .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 71 -
+ .../comedi/drivers/addi-data/hwdrv_apci035.c | 116 +-
+ .../comedi/drivers/addi-data/hwdrv_apci035.h | 109 -
+ .../comedi/drivers/addi-data/hwdrv_apci1032.c | 287 -
+ .../comedi/drivers/addi-data/hwdrv_apci1032.h | 64 -
+ .../comedi/drivers/addi-data/hwdrv_apci1500.c | 197 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1500.h | 165 -
+ .../comedi/drivers/addi-data/hwdrv_apci1516.c | 542 -
+ .../comedi/drivers/addi-data/hwdrv_apci1516.h | 65 -
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 469 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.h | 121 -
+ .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 57 +-
+ .../comedi/drivers/addi-data/hwdrv_apci16xx.h | 79 -
+ .../comedi/drivers/addi-data/hwdrv_apci2016.c | 460 -
+ .../comedi/drivers/addi-data/hwdrv_apci2016.h | 72 -
+ .../comedi/drivers/addi-data/hwdrv_apci2032.c | 333 +-
+ .../comedi/drivers/addi-data/hwdrv_apci2032.h | 83 -
+ .../comedi/drivers/addi-data/hwdrv_apci2200.c | 392 +-
+ .../comedi/drivers/addi-data/hwdrv_apci2200.h | 61 -
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 1768 ++--
+ .../comedi/drivers/addi-data/hwdrv_apci3120.h | 249 -
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 3417 +++----
+ .../comedi/drivers/addi-data/hwdrv_apci3200.h | 191 -
+ .../comedi/drivers/addi-data/hwdrv_apci3501.c | 320 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3501.h | 98 -
+ .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 414 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3xxx.h | 48 -
+ drivers/staging/comedi/drivers/addi_apci_035.c | 72 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 396 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 72 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 348 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 69 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 72 +-
+ drivers/staging/comedi/drivers/addi_apci_1710.c | 153 +-
+ drivers/staging/comedi/drivers/addi_apci_2016.c | 9 -
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 66 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 64 +-
+ drivers/staging/comedi/drivers/addi_apci_3001.c | 9 -
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 273 +-
+ drivers/staging/comedi/drivers/addi_apci_3200.c | 119 +-
+ drivers/staging/comedi/drivers/addi_apci_3300.c | 5 -
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 70 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 794 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 23 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 15 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c | 27 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 81 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 494 +-
+ drivers/staging/comedi/drivers/adq12b.c | 46 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 73 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 24 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 25 +-
+ drivers/staging/comedi/drivers/aio_aio12_8.c | 8 +-
+ drivers/staging/comedi/drivers/aio_iiro_16.c | 19 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 1468 ++-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 72 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 23 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 93 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 157 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 69 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 106 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 3041 +++---
+ drivers/staging/comedi/drivers/cb_pcidda.c | 681 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 121 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 25 +-
+ drivers/staging/comedi/drivers/comedi_bond.c | 8 +-
+ drivers/staging/comedi/drivers/comedi_fc.c | 2 +-
+ drivers/staging/comedi/drivers/comedi_fc.h | 44 +
+ drivers/staging/comedi/drivers/comedi_parport.c | 35 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 71 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 15 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 23 +-
+ drivers/staging/comedi/drivers/das08.c | 39 +-
+ drivers/staging/comedi/drivers/das08_cs.c | 9 +-
+ drivers/staging/comedi/drivers/das16.c | 78 +-
+ drivers/staging/comedi/drivers/das16m1.c | 80 +-
+ drivers/staging/comedi/drivers/das1800.c | 66 +-
+ drivers/staging/comedi/drivers/das6402.c | 16 +-
+ drivers/staging/comedi/drivers/das800.c | 79 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 80 +-
+ drivers/staging/comedi/drivers/dt2801.c | 14 +-
+ drivers/staging/comedi/drivers/dt2811.c | 13 +-
+ drivers/staging/comedi/drivers/dt2814.c | 54 +-
+ drivers/staging/comedi/drivers/dt2815.c | 9 +-
+ drivers/staging/comedi/drivers/dt282x.c | 115 +-
+ drivers/staging/comedi/drivers/dt3000.c | 620 +-
+ drivers/staging/comedi/drivers/dt9812.c | 27 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 27 +-
+ drivers/staging/comedi/drivers/fl512.c | 10 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 515 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 22 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 51 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 658 +-
+ drivers/staging/comedi/drivers/jr3_pci.h | 12 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 60 +-
+ drivers/staging/comedi/drivers/me4000.c | 42 +-
+ drivers/staging/comedi/drivers/me_daq.c | 595 +-
+ drivers/staging/comedi/drivers/mpc624.c | 10 +-
+ drivers/staging/comedi/drivers/mpc8260cpm.c | 164 -
+ drivers/staging/comedi/drivers/multiq3.c | 11 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 64 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 164 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 586 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 24 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 64 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 13 +-
+ drivers/staging/comedi/drivers/ni_atmio.c | 11 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 58 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 14 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 114 +-
+ drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 336 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 29 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 85 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 62 +-
+ drivers/staging/comedi/drivers/ni_tio.h | 4 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c | 60 +-
+ drivers/staging/comedi/drivers/pcl711.c | 51 +-
+ drivers/staging/comedi/drivers/pcl726.c | 10 +-
+ drivers/staging/comedi/drivers/pcl812.c | 85 +-
+ drivers/staging/comedi/drivers/pcl816.c | 71 +-
+ drivers/staging/comedi/drivers/pcl818.c | 80 +-
+ drivers/staging/comedi/drivers/pcm3724.c | 44 +-
+ drivers/staging/comedi/drivers/pcm_common.c | 34 +-
+ drivers/staging/comedi/drivers/pcmad.c | 10 +-
+ drivers/staging/comedi/drivers/pcmda12.c | 34 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 124 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 25 +-
+ drivers/staging/comedi/drivers/poc.c | 15 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 95 +-
+ drivers/staging/comedi/drivers/rtd520.c | 950 +-
+ drivers/staging/comedi/drivers/rtd520.h | 267 +-
+ drivers/staging/comedi/drivers/rti800.c | 13 +-
+ drivers/staging/comedi/drivers/rti802.c | 9 +-
+ drivers/staging/comedi/drivers/s526.c | 8 +-
+ drivers/staging/comedi/drivers/s626.c | 129 +-
+ drivers/staging/comedi/drivers/serial2002.c | 44 +-
+ drivers/staging/comedi/drivers/skel.c | 610 +-
+ drivers/staging/comedi/drivers/ssv_dnp.c | 26 +-
+ drivers/staging/comedi/drivers/unioxx5.c | 44 +-
+ drivers/staging/comedi/drivers/usbdux.c | 125 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 211 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 116 +-
+ drivers/staging/comedi/drivers/vmk80xx.c | 20 +-
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 6 +-
+ drivers/staging/comedi/proc.c | 1 -
+ drivers/staging/crystalhd/crystalhd_cmds.c | 8 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 14 +-
+ drivers/staging/crystalhd/crystalhd_misc.c | 2 +-
+ drivers/staging/csr/Makefile | 3 +-
+ drivers/staging/csr/bh.c | 19 +-
+ drivers/staging/csr/csr_framework_ext.c | 97 -
+ drivers/staging/csr/csr_framework_ext.h | 213 -
+ drivers/staging/csr/csr_framework_ext_types.h | 41 +-
+ drivers/staging/csr/csr_lib.h | 188 -
+ drivers/staging/csr/csr_log.h | 172 +-
+ drivers/staging/csr/csr_log_configure.h | 105 +-
+ drivers/staging/csr/csr_log_text.h | 8 -
+ drivers/staging/csr/csr_macro.h | 75 -
+ drivers/staging/csr/csr_msg_transport.h | 8 -
+ drivers/staging/csr/csr_msgconv.c | 1 -
+ drivers/staging/csr/csr_msgconv.h | 9 -
+ drivers/staging/csr/csr_panic.c | 20 -
+ drivers/staging/csr/csr_panic.h | 53 -
+ drivers/staging/csr/csr_prim_defs.h | 7 -
+ drivers/staging/csr/csr_result.h | 8 -
+ drivers/staging/csr/csr_sched.h | 215 +-
+ drivers/staging/csr/csr_sdio.h | 8 -
+ .../staging/csr/csr_serialize_primitive_types.c | 1 -
+ drivers/staging/csr/csr_time.c | 9 +-
+ drivers/staging/csr/csr_time.h | 82 +-
+ drivers/staging/csr/csr_wifi_common.h | 8 -
+ drivers/staging/csr/csr_wifi_fsm.h | 8 -
+ drivers/staging/csr/csr_wifi_fsm_event.h | 8 -
+ drivers/staging/csr/csr_wifi_fsm_types.h | 10 -
+ drivers/staging/csr/csr_wifi_hip_card.h | 9 -
+ drivers/staging/csr/csr_wifi_hip_card_sdio.c | 162 -
+ drivers/staging/csr/csr_wifi_hip_card_sdio.h | 8 -
+ drivers/staging/csr/csr_wifi_hip_chiphelper.h | 64 -
+ .../staging/csr/csr_wifi_hip_chiphelper_private.h | 8 -
+ drivers/staging/csr/csr_wifi_hip_conversions.h | 8 -
+ drivers/staging/csr/csr_wifi_hip_download.c | 18 -
+ drivers/staging/csr/csr_wifi_hip_dump.c | 32 +-
+ drivers/staging/csr/csr_wifi_hip_send.c | 2 -
+ drivers/staging/csr/csr_wifi_hip_signals.h | 17 +-
+ drivers/staging/csr/csr_wifi_hip_sigs.h | 8 -
+ drivers/staging/csr/csr_wifi_hip_ta_sampling.h | 9 -
+ drivers/staging/csr/csr_wifi_hip_unifi.h | 10 +-
+ .../staging/csr/csr_wifi_hip_unifi_signal_names.c | 45 +-
+ drivers/staging/csr/csr_wifi_hip_unifi_udi.h | 9 -
+ drivers/staging/csr/csr_wifi_hip_unifihw.h | 8 -
+ drivers/staging/csr/csr_wifi_hip_unifiversion.h | 8 -
+ drivers/staging/csr/csr_wifi_hip_xbv.c | 2 +-
+ drivers/staging/csr/csr_wifi_hip_xbv.h | 8 -
+ drivers/staging/csr/csr_wifi_hostio_prim.h | 9 -
+ drivers/staging/csr/csr_wifi_lib.h | 9 -
+ drivers/staging/csr/csr_wifi_msgconv.h | 9 -
+ .../staging/csr/csr_wifi_nme_ap_converter_init.h | 8 -
+ drivers/staging/csr/csr_wifi_nme_ap_lib.h | 28 -
+ drivers/staging/csr/csr_wifi_nme_ap_prim.h | 9 -
+ drivers/staging/csr/csr_wifi_nme_ap_sef.h | 10 -
+ drivers/staging/csr/csr_wifi_nme_ap_serialize.h | 9 -
+ drivers/staging/csr/csr_wifi_nme_converter_init.h | 8 -
+ drivers/staging/csr/csr_wifi_nme_lib.h | 63 -
+ drivers/staging/csr/csr_wifi_nme_prim.h | 9 -
+ drivers/staging/csr/csr_wifi_nme_serialize.h | 8 -
+ drivers/staging/csr/csr_wifi_nme_task.h | 11 -
+ drivers/staging/csr/csr_wifi_private_common.h | 8 -
+ drivers/staging/csr/csr_wifi_result.h | 8 -
+ .../staging/csr/csr_wifi_router_converter_init.h | 8 -
+ .../csr/csr_wifi_router_ctrl_converter_init.h | 8 -
+ drivers/staging/csr/csr_wifi_router_ctrl_lib.h | 10 -
+ drivers/staging/csr/csr_wifi_router_ctrl_prim.h | 9 -
+ drivers/staging/csr/csr_wifi_router_ctrl_sef.c | 67 +-
+ drivers/staging/csr/csr_wifi_router_ctrl_sef.h | 7 -
+ .../staging/csr/csr_wifi_router_ctrl_serialize.h | 8 -
+ .../csr/csr_wifi_router_free_upstream_contents.c | 46 +-
+ drivers/staging/csr/csr_wifi_router_lib.h | 10 -
+ drivers/staging/csr/csr_wifi_router_prim.h | 9 -
+ drivers/staging/csr/csr_wifi_router_sef.h | 8 -
+ drivers/staging/csr/csr_wifi_router_serialize.h | 8 -
+ drivers/staging/csr/csr_wifi_router_task.h | 8 -
+ drivers/staging/csr/csr_wifi_sme_ap_lib.h | 9 -
+ drivers/staging/csr/csr_wifi_sme_ap_prim.h | 8 -
+ drivers/staging/csr/csr_wifi_sme_converter_init.h | 8 -
+ drivers/staging/csr/csr_wifi_sme_lib.h | 10 -
+ drivers/staging/csr/csr_wifi_sme_prim.h | 9 -
+ drivers/staging/csr/csr_wifi_sme_sef.h | 213 +-
+ drivers/staging/csr/csr_wifi_sme_serialize.h | 336 +-
+ drivers/staging/csr/csr_wifi_sme_task.h | 16 +-
+ drivers/staging/csr/csr_wifi_vif_utils.h | 81 -
+ drivers/staging/csr/data_tx.c | 45 +-
+ drivers/staging/csr/drv.c | 101 +-
+ drivers/staging/csr/firmware.c | 15 -
+ drivers/staging/csr/inet.c | 10 +-
+ drivers/staging/csr/io.c | 102 +-
+ drivers/staging/csr/mlme.c | 3 -
+ drivers/staging/csr/monitor.c | 10 -
+ drivers/staging/csr/netdev.c | 88 +-
+ drivers/staging/csr/os.c | 18 +-
+ drivers/staging/csr/sdio_mmc.c | 28 -
+ drivers/staging/csr/sme_blocking.c | 307 +-
+ drivers/staging/csr/sme_native.c | 21 -
+ drivers/staging/csr/sme_sys.c | 17 +-
+ drivers/staging/csr/sme_userspace.h | 2 +-
+ drivers/staging/csr/sme_wext.c | 49 -
+ drivers/staging/csr/ul_int.c | 1 -
+ drivers/staging/csr/unifi_event.c | 8 -
+ drivers/staging/csr/unifi_os.h | 23 -
+ drivers/staging/csr/unifi_pdu_processing.c | 39 +-
+ drivers/staging/csr/unifi_priv.h | 7 +-
+ drivers/staging/csr/unifi_sme.c | 15 -
+ drivers/staging/csr/unifi_wext.h | 1 -
+ drivers/staging/cxt1e1/musycc.c | 2162 ++--
+ drivers/staging/cxt1e1/musycc.h | 236 +-
+ drivers/staging/cxt1e1/sbecrc.c | 105 +-
+ drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +-
+ drivers/staging/dgrp/dgrp_net_ops.c | 5 +-
+ drivers/staging/dgrp/dgrp_sysfs.c | 3 +-
+ drivers/staging/dgrp/dgrp_tty.c | 4 -
+ drivers/staging/et131x/README | 2 +-
+ drivers/staging/et131x/et131x.c | 1323 +--
+ drivers/staging/et131x/et131x.h | 4 -
+ drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 4 +-
+ drivers/staging/gdm72xx/gdm_qos.c | 33 +-
+ drivers/staging/gdm72xx/gdm_sdio.c | 29 +-
+ drivers/staging/gdm72xx/gdm_usb.c | 63 +-
+ drivers/staging/gdm72xx/gdm_wimax.c | 70 +-
+ drivers/staging/gdm72xx/netlink_k.c | 23 +-
+ drivers/staging/gdm72xx/sdio_boot.c | 100 +-
+ drivers/staging/gdm72xx/usb_boot.c | 49 +-
+ drivers/staging/iio/accel/Kconfig | 21 +-
+ drivers/staging/iio/accel/Makefile | 5 -
+ drivers/staging/iio/accel/adis16201.h | 89 +-
+ drivers/staging/iio/accel/adis16201_core.c | 476 +-
+ drivers/staging/iio/accel/adis16201_ring.c | 136 -
+ drivers/staging/iio/accel/adis16201_trigger.c | 71 -
+ drivers/staging/iio/accel/adis16203.h | 80 +-
+ drivers/staging/iio/accel/adis16203_core.c | 432 +-
+ drivers/staging/iio/accel/adis16203_ring.c | 136 -
+ drivers/staging/iio/accel/adis16203_trigger.c | 73 -
+ drivers/staging/iio/accel/adis16204.h | 79 +-
+ drivers/staging/iio/accel/adis16204_core.c | 462 +-
+ drivers/staging/iio/accel/adis16204_ring.c | 134 -
+ drivers/staging/iio/accel/adis16204_trigger.c | 73 -
+ drivers/staging/iio/accel/adis16209.h | 77 +-
+ drivers/staging/iio/accel/adis16209_core.c | 496 +-
+ drivers/staging/iio/accel/adis16209_ring.c | 134 -
+ drivers/staging/iio/accel/adis16209_trigger.c | 81 -
+ drivers/staging/iio/accel/adis16220.h | 20 +-
+ drivers/staging/iio/accel/adis16220_core.c | 288 +-
+ drivers/staging/iio/accel/adis16240.h | 85 +-
+ drivers/staging/iio/accel/adis16240_core.c | 481 +-
+ drivers/staging/iio/accel/adis16240_ring.c | 132 -
+ drivers/staging/iio/accel/adis16240_trigger.c | 82 -
+ drivers/staging/iio/accel/kxsd9.c | 10 +-
+ drivers/staging/iio/accel/lis3l02dq.h | 1 +
+ drivers/staging/iio/accel/lis3l02dq_core.c | 16 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 6 +-
+ drivers/staging/iio/accel/sca3000_core.c | 6 +-
+ drivers/staging/iio/adc/Kconfig | 61 +-
+ drivers/staging/iio/adc/Makefile | 14 -
+ drivers/staging/iio/adc/ad7192.c | 6 +-
+ drivers/staging/iio/adc/ad7280a.c | 8 +-
+ drivers/staging/iio/adc/ad7291.c | 6 +-
+ drivers/staging/iio/adc/ad7298.h | 75 -
+ drivers/staging/iio/adc/ad7298_ring.c | 113 -
+ drivers/staging/iio/adc/ad7606_par.c | 6 +-
+ drivers/staging/iio/adc/ad7606_ring.c | 2 +-
+ drivers/staging/iio/adc/ad7606_spi.c | 6 +-
+ drivers/staging/iio/adc/ad7780.c | 6 +-
+ drivers/staging/iio/adc/ad7793.c | 6 +-
+ drivers/staging/iio/adc/ad7816.c | 6 +-
+ drivers/staging/iio/adc/ad7887.h | 99 -
+ drivers/staging/iio/adc/ad7887_ring.c | 122 -
+ drivers/staging/iio/adc/ad799x_core.c | 6 +-
+ drivers/staging/iio/adc/ad799x_ring.c | 2 +-
+ drivers/staging/iio/adc/adt7310.c | 881 --
+ drivers/staging/iio/adc/adt7410.c | 460 +-
+ drivers/staging/iio/adc/lpc32xx_adc.c | 8 +-
+ drivers/staging/iio/adc/max1363.h | 177 -
+ drivers/staging/iio/adc/max1363_ring.c | 139 -
+ drivers/staging/iio/adc/mxs-lradc.c | 11 +-
+ drivers/staging/iio/adc/spear_adc.c | 6 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 6 +-
+ drivers/staging/iio/addac/adt7316-spi.c | 6 +-
+ drivers/staging/iio/addac/adt7316.c | 4 +-
+ drivers/staging/iio/cdc/ad7150.c | 18 +-
+ drivers/staging/iio/cdc/ad7152.c | 8 +-
+ drivers/staging/iio/cdc/ad7746.c | 8 +-
+ drivers/staging/iio/frequency/ad5930.c | 6 +-
+ drivers/staging/iio/frequency/ad9832.c | 6 +-
+ drivers/staging/iio/frequency/ad9834.c | 6 +-
+ drivers/staging/iio/frequency/ad9850.c | 6 +-
+ drivers/staging/iio/frequency/ad9852.c | 6 +-
+ drivers/staging/iio/frequency/ad9910.c | 6 +-
+ drivers/staging/iio/frequency/ad9951.c | 6 +-
+ drivers/staging/iio/gyro/Makefile | 1 -
+ drivers/staging/iio/gyro/adis16060_core.c | 12 +-
+ drivers/staging/iio/gyro/adis16080_core.c | 6 +-
+ drivers/staging/iio/gyro/adis16130_core.c | 6 +-
+ drivers/staging/iio/gyro/adis16260.h | 84 +-
+ drivers/staging/iio/gyro/adis16260_core.c | 496 +-
+ drivers/staging/iio/gyro/adis16260_ring.c | 136 -
+ drivers/staging/iio/gyro/adis16260_trigger.c | 75 -
+ drivers/staging/iio/gyro/adxrs450_core.c | 6 +-
+ drivers/staging/iio/iio_dummy_evgen.c | 2 +-
+ drivers/staging/iio/iio_hwmon.c | 6 +-
+ drivers/staging/iio/iio_simple_dummy.c | 2 +-
+ drivers/staging/iio/iio_simple_dummy_buffer.c | 5 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 10 +-
+ drivers/staging/iio/imu/adis16400.h | 12 +-
+ drivers/staging/iio/imu/adis16400_core.c | 161 +-
+ drivers/staging/iio/imu/adis16400_ring.c | 5 +-
+ drivers/staging/iio/light/isl29018.c | 53 +-
+ drivers/staging/iio/light/isl29028.c | 6 +-
+ drivers/staging/iio/light/tsl2563.c | 10 +-
+ drivers/staging/iio/light/tsl2583.c | 6 +-
+ drivers/staging/iio/light/tsl2x7x_core.c | 6 +-
+ drivers/staging/iio/magnetometer/ak8975.c | 6 +-
+ drivers/staging/iio/magnetometer/hmc5843.c | 8 +-
+ drivers/staging/iio/meter/ade7753.c | 6 +-
+ drivers/staging/iio/meter/ade7753.h | 2 -
+ drivers/staging/iio/meter/ade7754.c | 6 +-
+ drivers/staging/iio/meter/ade7754.h | 2 -
+ drivers/staging/iio/meter/ade7758.h | 3 -
+ drivers/staging/iio/meter/ade7758_core.c | 6 +-
+ drivers/staging/iio/meter/ade7758_ring.c | 2 +-
+ drivers/staging/iio/meter/ade7759.c | 6 +-
+ drivers/staging/iio/meter/ade7759.h | 2 -
+ drivers/staging/iio/meter/ade7854-i2c.c | 6 +-
+ drivers/staging/iio/meter/ade7854-spi.c | 6 +-
+ drivers/staging/iio/meter/ade7854.h | 2 -
+ drivers/staging/iio/resolver/ad2s1200.c | 6 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 8 +-
+ drivers/staging/iio/resolver/ad2s90.c | 6 +-
+ drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 6 +-
+ drivers/staging/iio/trigger/iio-trig-gpio.c | 6 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 6 +-
+ drivers/staging/imx-drm/Kconfig | 2 +-
+ drivers/staging/imx-drm/imx-drm-core.c | 2 +-
+ drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 2 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 67 +-
+ drivers/staging/imx-drm/ipuv3-crtc.c | 8 +-
+ drivers/staging/imx-drm/parallel-display.c | 16 +-
+ drivers/staging/ipack/Kconfig | 21 -
+ drivers/staging/ipack/TODO | 22 -
+ drivers/staging/ipack/bridges/Kconfig | 8 -
+ drivers/staging/ipack/ipack_ids.h | 32 -
+ drivers/staging/line6/Kconfig | 37 -
+ drivers/staging/line6/Makefile | 2 -
+ drivers/staging/line6/audio.c | 8 +-
+ drivers/staging/line6/capture.c | 13 +-
+ drivers/staging/line6/control.c | 995 --
+ drivers/staging/line6/control.h | 195 -
+ drivers/staging/line6/driver.c | 85 +-
+ drivers/staging/line6/driver.h | 10 +-
+ drivers/staging/line6/dumprequest.c | 135 -
+ drivers/staging/line6/dumprequest.h | 76 -
+ drivers/staging/line6/midi.c | 126 -
+ drivers/staging/line6/midi.h | 10 -
+ drivers/staging/line6/midibuf.c | 6 +-
+ drivers/staging/line6/pcm.c | 4 +-
+ drivers/staging/line6/pcm.h | 2 +-
+ drivers/staging/line6/playback.c | 17 +-
+ drivers/staging/line6/pod.c | 879 +-
+ drivers/staging/line6/pod.h | 105 +-
+ drivers/staging/line6/toneport.c | 8 +-
+ drivers/staging/line6/usbdefs.h | 10 +-
+ drivers/staging/line6/variax.c | 484 +-
+ drivers/staging/line6/variax.h | 60 -
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 12 +-
+ drivers/staging/media/lirc/lirc_parallel.c | 6 +-
+ drivers/staging/media/lirc/lirc_serial.c | 6 +-
+ drivers/staging/media/lirc/lirc_sir.c | 6 +-
+ drivers/staging/media/solo6x10/core.c | 4 +-
+ drivers/staging/net/pc300_drv.c | 6 +-
+ drivers/staging/nvec/Kconfig | 1 +
+ drivers/staging/nvec/nvec.c | 8 +-
+ drivers/staging/nvec/nvec_kbd.c | 6 +-
+ drivers/staging/nvec/nvec_paz00.c | 6 +-
+ drivers/staging/nvec/nvec_power.c | 6 +-
+ drivers/staging/nvec/nvec_ps2.c | 6 +-
+ drivers/staging/octeon/ethernet.c | 12 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 85 +-
+ drivers/staging/olpc_dcon/olpc_dcon.h | 2 +-
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 30 -
+ drivers/staging/omap-thermal/omap-bandgap.c | 67 +-
+ drivers/staging/omap-thermal/omap-bandgap.h | 9 -
+ drivers/staging/omap-thermal/omap-thermal-common.c | 69 +-
+ drivers/staging/omapdrm/Kconfig | 2 +-
+ drivers/staging/omapdrm/omap_connector.c | 8 +-
+ drivers/staging/omapdrm/omap_crtc.c | 8 +-
+ drivers/staging/omapdrm/omap_dmm_priv.h | 9 +-
+ drivers/staging/omapdrm/omap_dmm_tiler.c | 108 +-
+ drivers/staging/omapdrm/omap_dmm_tiler.h | 8 +-
+ drivers/staging/omapdrm/omap_drv.c | 73 +-
+ drivers/staging/omapdrm/omap_drv.h | 14 +-
+ drivers/staging/omapdrm/omap_encoder.c | 7 +-
+ drivers/staging/omapdrm/omap_fb.c | 25 +-
+ drivers/staging/omapdrm/omap_gem.c | 46 +-
+ drivers/staging/omapdrm/omap_gem_dmabuf.c | 4 +-
+ drivers/staging/omapdrm/omap_gem_helpers.c | 6 +-
+ drivers/staging/omapdrm/omap_plane.c | 42 +-
+ drivers/staging/ozwpan/ozevent.c | 2 +-
+ drivers/staging/ozwpan/ozhcd.c | 7 +-
+ drivers/staging/ozwpan/ozpd.c | 6 +-
+ drivers/staging/ozwpan/ozproto.c | 3 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211.h | 6 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 24 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_crypt.h | 2 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 38 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 18 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_module.c | 23 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 321 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 121 +-
+ drivers/staging/rtl8187se/r8180.h | 28 -
+ drivers/staging/rtl8187se/r8180_core.c | 496 +-
+ drivers/staging/rtl8187se/r8180_dm.h | 4 +-
+ drivers/staging/rtl8187se/r8180_rtl8225.h | 4 +-
+ drivers/staging/rtl8187se/r8180_rtl8225z2.c | 229 +-
+ drivers/staging/rtl8187se/r8180_wx.c | 2 -
+ drivers/staging/rtl8187se/r8185b_init.c | 239 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 15 +-
+ drivers/staging/rtl8192e/rtllib.h | 6 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 5 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 8 +-
+ drivers/staging/rtl8712/mlme_linux.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +-
+ drivers/staging/rts5139/Makefile | 22 +-
+ drivers/staging/rts5139/ms.c | 96 +-
+ drivers/staging/rts5139/ms.h | 18 +-
+ drivers/staging/rts5139/ms_mg.c | 104 +-
+ drivers/staging/rts5139/ms_mg.h | 14 +-
+ drivers/staging/rts5139/rts51x.c | 10 +-
+ drivers/staging/rts5139/rts51x_card.c | 80 +-
+ drivers/staging/rts5139/rts51x_card.h | 30 +-
+ drivers/staging/rts5139/rts51x_chip.c | 24 +-
+ drivers/staging/rts5139/rts51x_chip.h | 16 +-
+ drivers/staging/rts5139/rts51x_fop.c | 6 +-
+ drivers/staging/rts5139/rts51x_scsi.c | 238 +-
+ drivers/staging/rts5139/rts51x_scsi.h | 6 +-
+ drivers/staging/rts5139/sd.c | 36 +-
+ drivers/staging/rts5139/sd.h | 12 +-
+ drivers/staging/rts5139/sd_cprm.c | 124 +-
+ drivers/staging/rts5139/sd_cprm.h | 18 +-
+ drivers/staging/rts5139/xd.c | 58 +-
+ drivers/staging/rts5139/xd.h | 10 +-
+ drivers/staging/rts_pstor/Kconfig | 16 -
+ drivers/staging/rts_pstor/Makefile | 16 -
+ drivers/staging/rts_pstor/TODO | 9 -
+ drivers/staging/rts_pstor/debug.h | 43 -
+ drivers/staging/rts_pstor/general.c | 35 -
+ drivers/staging/rts_pstor/general.h | 31 -
+ drivers/staging/rts_pstor/ms.c | 4051 --------
+ drivers/staging/rts_pstor/ms.h | 225 -
+ drivers/staging/rts_pstor/rtsx.c | 1105 --
+ drivers/staging/rts_pstor/rtsx.h | 186 -
+ drivers/staging/rts_pstor/rtsx_card.c | 1233 ---
+ drivers/staging/rts_pstor/rtsx_card.h | 1093 --
+ drivers/staging/rts_pstor/rtsx_chip.c | 2264 -----
+ drivers/staging/rts_pstor/rtsx_chip.h | 989 --
+ drivers/staging/rts_pstor/rtsx_scsi.c | 3137 ------
+ drivers/staging/rts_pstor/rtsx_scsi.h | 142 -
+ drivers/staging/rts_pstor/rtsx_sys.h | 50 -
+ drivers/staging/rts_pstor/rtsx_transport.c | 769 --
+ drivers/staging/rts_pstor/rtsx_transport.h | 66 -
+ drivers/staging/rts_pstor/sd.c | 4570 ---------
+ drivers/staging/rts_pstor/sd.h | 300 -
+ drivers/staging/rts_pstor/spi.c | 812 --
+ drivers/staging/rts_pstor/spi.h | 65 -
+ drivers/staging/rts_pstor/trace.h | 93 -
+ drivers/staging/rts_pstor/xd.c | 2052 ----
+ drivers/staging/rts_pstor/xd.h | 188 -
+ drivers/staging/sbe-2t3e3/cpld.c | 2 +-
+ drivers/staging/sbe-2t3e3/main.c | 7 +-
+ drivers/staging/sbe-2t3e3/module.c | 19 +-
+ drivers/staging/sbe-2t3e3/netdev.c | 5 +-
+ drivers/staging/sep/sep_main.c | 6 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 287 +-
+ drivers/staging/silicom/bp_mod.c | 219 +-
+ drivers/staging/silicom/bp_proc.c | 85 +-
+ drivers/staging/silicom/bypasslib/bplibk.h | 9 -
+ drivers/staging/silicom/bypasslib/bypass.c | 1 -
+ drivers/staging/slicoss/slicoss.c | 166 +-
+ drivers/staging/sm7xxfb/sm7xxfb.c | 6 +-
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 106 +-
+ drivers/staging/telephony/Kconfig | 47 -
+ drivers/staging/telephony/Makefile | 7 -
+ drivers/staging/telephony/TODO | 10 -
+ drivers/staging/telephony/ixj-ver.h | 4 -
+ drivers/staging/telephony/ixj.c |10571 --------------------
+ drivers/staging/telephony/ixj.h | 1322 ---
+ drivers/staging/telephony/ixj_pcmcia.c | 187 -
+ drivers/staging/telephony/phonedev.c | 166 -
+ .../staging/tidspbridge/dynload/dload_internal.h | 8 +-
+ drivers/staging/tidspbridge/dynload/reloc.c | 6 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 6 +-
+ drivers/staging/usbip/stub_dev.c | 15 +-
+ drivers/staging/usbip/stub_rx.c | 5 +-
+ drivers/staging/usbip/stub_tx.c | 3 +-
+ drivers/staging/usbip/usbip_common.c | 40 +-
+ drivers/staging/usbip/usbip_common.h | 4 +-
+ drivers/staging/usbip/userspace/src/usbip_detach.c | 9 +
+ drivers/staging/usbip/vhci.h | 1 -
+ drivers/staging/usbip/vhci_hcd.c | 51 +-
+ drivers/staging/usbip/vhci_rx.c | 2 +-
+ drivers/staging/usbip/vhci_sysfs.c | 6 +-
+ drivers/staging/usbip/vhci_tx.c | 2 +-
+ drivers/staging/vme/devices/vme_pio2.h | 2 +-
+ drivers/staging/vme/devices/vme_pio2_core.c | 10 +-
+ drivers/staging/vme/devices/vme_pio2_gpio.c | 2 +-
+ drivers/staging/vme/devices/vme_user.c | 83 +-
+ drivers/staging/vt6655/device_main.c | 6 +-
+ drivers/staging/vt6655/hostap.c | 6 +-
+ drivers/staging/vt6655/rxtx.c | 2 +-
+ drivers/staging/vt6655/wcmd.c | 1 +
+ drivers/staging/vt6656/80211mgr.c | 2 +-
+ drivers/staging/vt6656/Makefile | 1 -
+ drivers/staging/vt6656/bssdb.c | 43 -
+ drivers/staging/vt6656/desc.h | 28 +-
+ drivers/staging/vt6656/device.h | 48 +-
+ drivers/staging/vt6656/dpc.c | 64 +-
+ drivers/staging/vt6656/firmware.c | 22 +-
+ drivers/staging/vt6656/hostap.c | 6 +-
+ drivers/staging/vt6656/int.h | 4 +-
+ drivers/staging/vt6656/ioctl.c | 648 --
+ drivers/staging/vt6656/ioctl.h | 54 -
+ drivers/staging/vt6656/iwctl.c | 510 +-
+ drivers/staging/vt6656/iwctl.h | 79 +-
+ drivers/staging/vt6656/key.c | 55 +-
+ drivers/staging/vt6656/key.h | 8 +-
+ drivers/staging/vt6656/mac.c | 6 +-
+ drivers/staging/vt6656/main_usb.c | 552 +-
+ drivers/staging/vt6656/mib.c | 1 -
+ drivers/staging/vt6656/mib.h | 1 -
+ drivers/staging/vt6656/rf.c | 3 +
+ drivers/staging/vt6656/rxtx.c | 36 +-
+ drivers/staging/vt6656/rxtx.h | 8 +-
+ drivers/staging/vt6656/tkip.c | 40 +-
+ drivers/staging/vt6656/ttype.h | 16 +-
+ drivers/staging/vt6656/upc.h | 162 -
+ drivers/staging/vt6656/usbpipe.c | 4 +-
+ drivers/staging/vt6656/wcmd.c | 44 +-
+ drivers/staging/vt6656/wmgr.c | 66 -
+ drivers/staging/vt6656/wmgr.h | 42 +-
+ drivers/staging/vt6656/wpa2.c | 2 +-
+ drivers/staging/vt6656/wpa2.h | 4 +-
+ drivers/staging/vt6656/wpactl.c | 664 +-
+ drivers/staging/vt6656/wpactl.h | 12 +-
+ drivers/staging/winbond/mds.c | 7 +-
+ drivers/staging/winbond/wb35rx_f.h | 12 +-
+ drivers/staging/winbond/wb35rx_s.h | 62 +-
+ drivers/staging/winbond/wbhal.h | 4 +-
+ drivers/staging/winbond/wbusb.c | 14 -
+ drivers/staging/wlags49_h2/ap_h2.c | 16 +-
+ drivers/staging/wlags49_h2/man/wlags49.4 | 2 +-
+ drivers/staging/wlags49_h2/wl_if.h | 133 +-
+ drivers/staging/wlags49_h2/wl_pci.c | 25 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 6 +-
+ drivers/staging/xgifb/TODO | 2 +-
+ drivers/staging/xgifb/XGI_main_26.c | 60 +-
+ drivers/staging/xgifb/vb_def.h | 9 +-
+ drivers/staging/xgifb/vb_init.c | 47 +-
+ drivers/staging/xgifb/vb_init.h | 1 -
+ drivers/staging/xgifb/vb_setmode.c | 898 +-
+ drivers/staging/xgifb/vb_struct.h | 36 +-
+ drivers/staging/xgifb/vb_table.h | 504 +-
+ drivers/staging/zram/zram_drv.c | 113 +-
+ drivers/staging/zram/zram_drv.h | 4 +-
+ drivers/staging/zram/zram_sysfs.c | 8 +-
+ drivers/vme/boards/vme_vmivme7805.c | 15 +-
+ drivers/vme/bridges/vme_ca91cx42.c | 15 +-
+ drivers/vme/bridges/vme_tsi148.c | 15 +-
+ include/linux/iio/buffer.h | 26 +-
+ include/linux/iio/consumer.h | 50 +
+ include/linux/iio/iio.h | 5 +
+ include/linux/iio/imu/adis.h | 280 +
+ include/linux/iio/machine.h | 2 +
+ include/linux/iio/types.h | 2 +
+ {drivers/staging/ipack => include/linux}/ipack.h | 100 +-
+ include/linux/platform_data/ad5449.h | 40 +
+ include/linux/platform_data/ad7298.h | 20 +
+ include/linux/platform_data/ad7887.h | 26 +
+ include/linux/platform_data/omap_drm.h | 1 +
+ 757 files changed, 27181 insertions(+), 81662 deletions(-)
+ delete mode 100644 Documentation/telephony/00-INDEX
+ delete mode 100644 Documentation/telephony/ixj.txt
+ rename drivers/{staging/iio/adc/ad7298_core.c => iio/adc/ad7298.c} (55%)
+ rename drivers/{staging/iio/adc/ad7887_core.c => iio/adc/ad7887.c} (50%)
+ rename drivers/{staging/iio/adc/max1363_core.c => iio/adc/max1363.c} (81%)
+ create mode 100644 drivers/iio/buffer_cb.c
+ create mode 100644 drivers/iio/dac/ad5449.c
+ create mode 100644 drivers/iio/gyro/adis16136.c
+ create mode 100644 drivers/iio/imu/Kconfig
+ create mode 100644 drivers/iio/imu/Makefile
+ create mode 100644 drivers/iio/imu/adis.c
+ create mode 100644 drivers/iio/imu/adis16480.c
+ create mode 100644 drivers/iio/imu/adis_buffer.c
+ create mode 100644 drivers/iio/imu/adis_trigger.c
+ create mode 100644 drivers/ipack/Kconfig
+ rename drivers/{staging => }/ipack/Makefile (83%)
+ create mode 100644 drivers/ipack/carriers/Kconfig
+ rename drivers/{staging/ipack/bridges => ipack/carriers}/Makefile (100%)
+ rename drivers/{staging/ipack/bridges => ipack/carriers}/tpci200.c (66%)
+ rename drivers/{staging/ipack/bridges => ipack/carriers}/tpci200.h (85%)
+ rename drivers/{staging => }/ipack/devices/Kconfig (99%)
+ rename drivers/{staging => }/ipack/devices/Makefile (100%)
+ rename drivers/{staging => }/ipack/devices/ipoctal.c (86%)
+ rename drivers/{staging => }/ipack/devices/ipoctal.h (82%)
+ rename drivers/{staging => }/ipack/devices/scc2698.h (97%)
+ rename drivers/{staging => }/ipack/ipack.c (90%)
+ create mode 100644 drivers/staging/android/binder_trace.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi_apci_2016.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3300.c
+ delete mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c
+ delete mode 100644 drivers/staging/csr/csr_lib.h
+ delete mode 100644 drivers/staging/csr/csr_panic.c
+ delete mode 100644 drivers/staging/csr/csr_panic.h
+ delete mode 100644 drivers/staging/iio/accel/adis16201_ring.c
+ delete mode 100644 drivers/staging/iio/accel/adis16201_trigger.c
+ delete mode 100644 drivers/staging/iio/accel/adis16203_ring.c
+ delete mode 100644 drivers/staging/iio/accel/adis16203_trigger.c
+ delete mode 100644 drivers/staging/iio/accel/adis16204_ring.c
+ delete mode 100644 drivers/staging/iio/accel/adis16204_trigger.c
+ delete mode 100644 drivers/staging/iio/accel/adis16209_ring.c
+ delete mode 100644 drivers/staging/iio/accel/adis16209_trigger.c
+ delete mode 100644 drivers/staging/iio/accel/adis16240_ring.c
+ delete mode 100644 drivers/staging/iio/accel/adis16240_trigger.c
+ delete mode 100644 drivers/staging/iio/adc/ad7298.h
+ delete mode 100644 drivers/staging/iio/adc/ad7298_ring.c
+ delete mode 100644 drivers/staging/iio/adc/ad7887.h
+ delete mode 100644 drivers/staging/iio/adc/ad7887_ring.c
+ delete mode 100644 drivers/staging/iio/adc/adt7310.c
+ delete mode 100644 drivers/staging/iio/adc/max1363.h
+ delete mode 100644 drivers/staging/iio/adc/max1363_ring.c
+ delete mode 100644 drivers/staging/iio/gyro/adis16260_ring.c
+ delete mode 100644 drivers/staging/iio/gyro/adis16260_trigger.c
+ delete mode 100644 drivers/staging/ipack/Kconfig
+ delete mode 100644 drivers/staging/ipack/TODO
+ delete mode 100644 drivers/staging/ipack/bridges/Kconfig
+ delete mode 100644 drivers/staging/ipack/ipack_ids.h
+ delete mode 100644 drivers/staging/line6/control.c
+ delete mode 100644 drivers/staging/line6/control.h
+ delete mode 100644 drivers/staging/line6/dumprequest.c
+ delete mode 100644 drivers/staging/line6/dumprequest.h
+ delete mode 100644 drivers/staging/rts_pstor/Kconfig
+ delete mode 100644 drivers/staging/rts_pstor/Makefile
+ delete mode 100644 drivers/staging/rts_pstor/TODO
+ delete mode 100644 drivers/staging/rts_pstor/debug.h
+ delete mode 100644 drivers/staging/rts_pstor/general.c
+ delete mode 100644 drivers/staging/rts_pstor/general.h
+ delete mode 100644 drivers/staging/rts_pstor/ms.c
+ delete mode 100644 drivers/staging/rts_pstor/ms.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_card.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_card.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_sys.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.h
+ delete mode 100644 drivers/staging/rts_pstor/sd.c
+ delete mode 100644 drivers/staging/rts_pstor/sd.h
+ delete mode 100644 drivers/staging/rts_pstor/spi.c
+ delete mode 100644 drivers/staging/rts_pstor/spi.h
+ delete mode 100644 drivers/staging/rts_pstor/trace.h
+ delete mode 100644 drivers/staging/rts_pstor/xd.c
+ delete mode 100644 drivers/staging/rts_pstor/xd.h
+ delete mode 100644 drivers/staging/telephony/Kconfig
+ delete mode 100644 drivers/staging/telephony/Makefile
+ delete mode 100644 drivers/staging/telephony/TODO
+ delete mode 100644 drivers/staging/telephony/ixj-ver.h
+ delete mode 100644 drivers/staging/telephony/ixj.c
+ delete mode 100644 drivers/staging/telephony/ixj.h
+ delete mode 100644 drivers/staging/telephony/ixj_pcmcia.c
+ delete mode 100644 drivers/staging/telephony/phonedev.c
+ delete mode 100644 drivers/staging/vt6656/ioctl.c
+ delete mode 100644 drivers/staging/vt6656/ioctl.h
+ delete mode 100644 drivers/staging/vt6656/upc.h
+ create mode 100644 include/linux/iio/imu/adis.h
+ rename {drivers/staging/ipack => include/linux}/ipack.h (66%)
+ create mode 100644 include/linux/platform_data/ad5449.h
+ create mode 100644 include/linux/platform_data/ad7298.h
+ create mode 100644 include/linux/platform_data/ad7887.h
+Merging char-misc/char-misc-next (962b686 Merge tag 'pull_req_20121122' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/extcon into char-misc-next)
+$ git merge char-misc/char-misc-next
+Resolved 'drivers/mfd/rtsx_pcr.c' using previous resolution.
+Resolved 'drivers/misc/atmel-ssc.c' using previous resolution.
+Resolved 'drivers/mmc/host/Kconfig' using previous resolution.
+Resolved 'drivers/mmc/host/rtsx_pci_sdmmc.c' using previous resolution.
+Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c
+CONFLICT (add/add): Merge conflict in drivers/mmc/host/rtsx_pci_sdmmc.c
+Auto-merging drivers/mmc/host/Makefile
+Auto-merging drivers/mmc/host/Kconfig
+CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig
+Auto-merging drivers/misc/pti.c
+Auto-merging drivers/misc/atmel-ssc.c
+CONFLICT (content): Merge conflict in drivers/misc/atmel-ssc.c
+Auto-merging drivers/mfd/rtsx_pcr.c
+CONFLICT (add/add): Merge conflict in drivers/mfd/rtsx_pcr.c
+Auto-merging drivers/char/virtio_console.c
+Auto-merging drivers/char/tpm/tpm_tis.c
+Auto-merging drivers/char/tpm/tpm_infineon.c
+Auto-merging drivers/char/tpm/tpm_ibmvtpm.c
+Auto-merging drivers/char/tpm/tpm_i2c_infineon.c
+Auto-merging drivers/char/ipmi/ipmi_si_intf.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c8e7cb7] Merge remote-tracking branch 'char-misc/char-misc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/uio-howto.tmpl | 56 ++
+ MAINTAINERS | 1 -
+ arch/arm/include/asm/io.h | 2 +-
+ arch/arm/mm/mmap.c | 2 +-
+ arch/ia64/include/asm/io.h | 2 +-
+ arch/ia64/kernel/efi.c | 2 +-
+ arch/sh/include/asm/io.h | 2 +-
+ arch/sh/mm/mmap.c | 2 +-
+ drivers/char/agp/ali-agp.c | 4 +-
+ drivers/char/agp/amd-k7-agp.c | 4 +-
+ drivers/char/agp/amd64-agp.c | 2 +-
+ drivers/char/agp/ati-agp.c | 4 +-
+ drivers/char/agp/efficeon-agp.c | 2 +-
+ drivers/char/agp/i460-agp.c | 2 +-
+ drivers/char/agp/intel-agp.c | 2 +-
+ drivers/char/agp/nvidia-agp.c | 2 +-
+ drivers/char/agp/sgi-agp.c | 2 +-
+ drivers/char/agp/sis-agp.c | 8 +-
+ drivers/char/agp/sworks-agp.c | 2 +-
+ drivers/char/agp/uninorth-agp.c | 4 +-
+ drivers/char/agp/via-agp.c | 4 +-
+ drivers/char/hpet.c | 5 +-
+ drivers/char/hw_random/atmel-rng.c | 2 +-
+ drivers/char/hw_random/bcm63xx-rng.c | 2 +-
+ drivers/char/hw_random/exynos-rng.c | 2 +-
+ drivers/char/hw_random/n2-drv.c | 4 +-
+ drivers/char/hw_random/pasemi-rng.c | 2 +-
+ drivers/char/hw_random/picoxcell-rng.c | 2 +-
+ drivers/char/hw_random/ppc4xx-rng.c | 2 +-
+ drivers/char/hw_random/timeriomem-rng.c | 2 +-
+ drivers/char/hw_random/virtio-rng.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 32 +-
+ drivers/char/mbcs.c | 2 +-
+ drivers/char/mem.c | 10 +-
+ drivers/char/pc8736x_gpio.c | 3 +-
+ drivers/char/ps3flash.c | 2 +-
+ drivers/char/sonypi.c | 14 +-
+ drivers/char/tb0219.c | 6 +-
+ drivers/char/tpm/tpm_i2c_infineon.c | 2 +-
+ drivers/char/tpm/tpm_ibmvtpm.c | 4 +-
+ drivers/char/tpm/tpm_infineon.c | 2 +-
+ drivers/char/tpm/tpm_tis.c | 4 +-
+ drivers/char/virtio_console.c | 2 +-
+ drivers/char/xilinx_hwicap/xilinx_hwicap.c | 14 +-
+ drivers/extcon/extcon-adc-jack.c | 6 +-
+ drivers/extcon/extcon-arizona.c | 7 +-
+ drivers/extcon/extcon-class.c | 2 +-
+ drivers/extcon/extcon-gpio.c | 6 +-
+ drivers/extcon/extcon-max77693.c | 42 +-
+ drivers/extcon/extcon-max8997.c | 34 +-
+ drivers/hv/Kconfig | 6 +
+ drivers/hv/Makefile | 1 +
+ drivers/hv/channel.c | 8 -
+ drivers/hv/channel_mgmt.c | 8 -
+ drivers/hv/hv_balloon.c | 1041 +++++++++++++++++++++++++
+ drivers/misc/ad525x_dpot-i2c.c | 6 +-
+ drivers/misc/ad525x_dpot-spi.c | 6 +-
+ drivers/misc/ad525x_dpot.c | 4 +-
+ drivers/misc/apds9802als.c | 6 +-
+ drivers/misc/apds990x.c | 6 +-
+ drivers/misc/atmel-ssc.c | 4 +-
+ drivers/misc/bh1770glc.c | 6 +-
+ drivers/misc/bh1780gli.c | 6 +-
+ drivers/misc/bmp085-i2c.c | 4 +-
+ drivers/misc/bmp085-spi.c | 4 +-
+ drivers/misc/bmp085.c | 2 +-
+ drivers/misc/cb710/core.c | 10 +-
+ drivers/misc/cs5535-mfgpt.c | 6 +-
+ drivers/misc/eeprom/at24.c | 4 +-
+ drivers/misc/eeprom/at25.c | 4 +-
+ drivers/misc/eeprom/eeprom_93xx46.c | 6 +-
+ drivers/misc/fsa9480.c | 6 +-
+ drivers/misc/hpilo.c | 21 +-
+ drivers/misc/ibmasm/module.c | 6 +-
+ drivers/misc/ioc4.c | 10 +-
+ drivers/misc/isl29003.c | 6 +-
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 6 +-
+ drivers/misc/lis3lv02d/lis3lv02d_spi.c | 6 +-
+ drivers/misc/mei/Makefile | 1 +
+ drivers/misc/mei/amthif.c | 722 +++++++++++++++++
+ drivers/misc/mei/hw.h | 36 +-
+ drivers/misc/mei/init.c | 368 ++++-----
+ drivers/misc/mei/interface.c | 91 +--
+ drivers/misc/mei/interrupt.c | 760 ++++++------------
+ drivers/misc/mei/iorw.c | 455 +++--------
+ drivers/misc/mei/main.c | 462 ++++-------
+ drivers/misc/mei/mei_dev.h | 155 +++-
+ drivers/misc/mei/wd.c | 15 +-
+ drivers/misc/pch_phub.c | 6 +-
+ drivers/misc/phantom.c | 10 +-
+ drivers/misc/pti.c | 8 +-
+ drivers/misc/spear13xx_pcie_gadget.c | 4 +-
+ drivers/misc/ti-st/st_core.c | 1 -
+ drivers/misc/ti-st/st_kim.c | 30 +-
+ drivers/misc/ti_dac7512.c | 6 +-
+ drivers/misc/tsl2550.c | 6 +-
+ drivers/mmc/host/Makefile | 2 +
+ drivers/parport/Kconfig | 16 +-
+ drivers/uio/Kconfig | 16 +
+ drivers/uio/Makefile | 1 +
+ drivers/uio/uio_aec.c | 2 +-
+ drivers/uio/uio_cif.c | 4 +-
+ drivers/uio/uio_dmem_genirq.c | 359 +++++++++
+ drivers/uio/uio_netx.c | 2 +-
+ drivers/uio/uio_pci_generic.c | 2 +-
+ drivers/uio/uio_pdrv.c | 1 +
+ drivers/uio/uio_pdrv_genirq.c | 3 +-
+ drivers/uio/uio_pruss.c | 6 +-
+ drivers/uio/uio_sercos3.c | 4 +-
+ drivers/w1/masters/Kconfig | 2 +-
+ drivers/w1/masters/ds2482.c | 13 +-
+ drivers/w1/masters/matrox_w1.c | 10 +-
+ drivers/w1/masters/mxc_w1.c | 28 +-
+ drivers/w1/masters/omap_hdq.c | 10 +-
+ drivers/w1/masters/w1-gpio.c | 65 +-
+ drivers/w1/w1.c | 7 -
+ drivers/xen/xen-selfballoon.c | 2 +-
+ include/linux/extcon.h | 50 +-
+ include/linux/mman.h | 2 +
+ include/linux/platform_data/uio_dmem_genirq.h | 26 +
+ mm/mmap.c | 14 +
+ mm/nommu.c | 15 +
+ tools/hv/hv_kvp_daemon.c | 40 +-
+ 123 files changed, 3449 insertions(+), 1928 deletions(-)
+ create mode 100644 drivers/hv/hv_balloon.c
+ create mode 100644 drivers/misc/mei/amthif.c
+ create mode 100644 drivers/uio/uio_dmem_genirq.c
+ create mode 100644 include/linux/platform_data/uio_dmem_genirq.h
+Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
+$ git merge tmem/linux-next
+Already up-to-date.
+Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+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 (e7125b5 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Resolved 'arch/arm/boot/dts/at91sam9260.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/at91sam9g20ek_common.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/spear1340.dtsi' using previous resolution.
+Auto-merging include/linux/platform_data/pinctrl-nomadik.h
+Auto-merging drivers/tty/serial/atmel_serial.c
+Auto-merging drivers/pinctrl/spear/pinctrl-spear320.c
+Auto-merging drivers/pinctrl/spear/pinctrl-spear310.c
+Auto-merging drivers/pinctrl/spear/pinctrl-spear300.c
+Auto-merging drivers/pinctrl/spear/pinctrl-spear1340.c
+Auto-merging drivers/pinctrl/spear/pinctrl-spear1310.c
+Auto-merging drivers/pinctrl/spear/pinctrl-spear.h
+Auto-merging drivers/pinctrl/spear/pinctrl-spear.c
+Auto-merging drivers/pinctrl/pinctrl-u300.c
+Auto-merging drivers/pinctrl/pinctrl-tegra.c
+Auto-merging drivers/pinctrl/pinctrl-sirf.c
+Auto-merging drivers/pinctrl/pinctrl-single.c
+Auto-merging drivers/pinctrl/pinctrl-mxs.c
+Auto-merging drivers/pinctrl/pinctrl-imx.c
+Auto-merging drivers/pinctrl/pinctrl-bcm2835.c
+Auto-merging drivers/pinctrl/mvebu/pinctrl-mvebu.c
+Auto-merging drivers/mtd/nand/atmel_nand.c
+Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+Auto-merging arch/arm/mach-u300/core.c
+Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
+Auto-merging arch/arm/mach-at91/at91sam9x5.c
+Auto-merging arch/arm/mach-at91/at91sam9rl.c
+Auto-merging arch/arm/mach-at91/at91sam9g45.c
+Auto-merging arch/arm/mach-at91/at91sam9263.c
+Auto-merging arch/arm/mach-at91/at91sam9261.c
+Auto-merging arch/arm/mach-at91/at91sam9260.c
+Auto-merging arch/arm/mach-at91/at91rm9200.c
+Auto-merging arch/arm/mach-at91/Kconfig
+Auto-merging arch/arm/boot/dts/spear320.dtsi
+Auto-merging arch/arm/boot/dts/spear310.dtsi
+Auto-merging arch/arm/boot/dts/spear1340.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear1340.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9260.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f16ec12] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/atmel-at91.txt | 6 +
+ Documentation/devicetree/bindings/gpio/gpio.txt | 36 +
+ .../devicetree/bindings/gpio/gpio_atmel.txt | 5 +
+ .../bindings/pinctrl/atmel,at91-pinctrl.txt | 141 ++
+ Documentation/gpio.txt | 42 +
+ Documentation/pinctrl.txt | 7 +-
+ MAINTAINERS | 6 +
+ arch/arm/Kconfig | 2 +
+ arch/arm/boot/dts/Makefile | 48 +-
+ arch/arm/boot/dts/animeo_ip.dts | 178 +++
+ arch/arm/boot/dts/at91rm9200.dtsi | 349 +++++
+ arch/arm/boot/dts/at91rm9200ek.dts | 79 +
+ arch/arm/boot/dts/at91sam9260.dtsi | 295 +++-
+ arch/arm/boot/dts/at91sam9263.dtsi | 299 +++-
+ arch/arm/boot/dts/at91sam9263ek.dts | 29 +
+ arch/arm/boot/dts/at91sam9g15.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9g15ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9g20ek_2mmc.dts | 26 +
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 30 +
+ arch/arm/boot/dts/at91sam9g25.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9g25ek.dts | 49 +-
+ arch/arm/boot/dts/at91sam9g35.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9g35ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 301 +++-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 225 ++-
+ arch/arm/boot/dts/at91sam9n12ek.dts | 22 +
+ arch/arm/boot/dts/at91sam9x25.dtsi | 49 +
+ arch/arm/boot/dts/at91sam9x25ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9x35.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9x35ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 270 +++-
+ arch/arm/boot/dts/at91sam9x5ek.dtsi | 101 ++
+ arch/arm/boot/dts/pm9g45.dts | 165 ++
+ arch/arm/boot/dts/spear1310-evb.dts | 4 +
+ arch/arm/boot/dts/spear1310.dtsi | 27 +
+ arch/arm/boot/dts/spear1340-evb.dts | 4 +
+ arch/arm/boot/dts/spear1340.dtsi | 26 +
+ arch/arm/boot/dts/spear310.dtsi | 22 +-
+ arch/arm/boot/dts/spear320-evb.dts | 4 +
+ arch/arm/boot/dts/spear320.dtsi | 23 +-
+ arch/arm/configs/at91_dt_defconfig | 1 +
+ arch/arm/mach-at91/Kconfig | 9 +
+ arch/arm/mach-at91/Makefile | 1 +
+ arch/arm/mach-at91/at91rm9200.c | 22 +-
+ arch/arm/mach-at91/at91rm9200_time.c | 63 +-
+ arch/arm/mach-at91/at91sam9260.c | 8 +-
+ arch/arm/mach-at91/at91sam9261.c | 4 +-
+ arch/arm/mach-at91/at91sam9263.c | 11 +-
+ arch/arm/mach-at91/at91sam9g45.c | 12 +-
+ arch/arm/mach-at91/at91sam9n12.c | 16 +-
+ arch/arm/mach-at91/at91sam9rl.c | 4 +-
+ arch/arm/mach-at91/at91sam9x5.c | 21 +-
+ arch/arm/mach-at91/board-dt.c | 2 -
+ arch/arm/mach-at91/board-rm9200-dt.c | 57 +
+ arch/arm/mach-at91/generic.h | 1 +
+ arch/arm/mach-at91/gpio.c | 190 +--
+ arch/arm/mach-at91/setup.c | 20 +-
+ arch/arm/mach-at91/soc.h | 12 +-
+ arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
+ arch/arm/mach-nomadik/cpu-8815.c | 2 +-
+ arch/arm/mach-nomadik/i2c-8815nhk.c | 3 +-
+ arch/arm/mach-u300/core.c | 5 +-
+ arch/arm/mach-u300/include/mach/irqs.h | 126 +-
+ arch/arm/mach-ux500/board-mop500-audio.c | 3 +-
+ arch/arm/mach-ux500/board-mop500-pins.c | 3 +-
+ arch/arm/mach-ux500/board-mop500.c | 2 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 6 +-
+ arch/arm/mach-ux500/devices-common.c | 3 +-
+ arch/arm/mach-ux500/devices-common.h | 8 +-
+ arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 102 --
+ drivers/gpio/gpiolib-of.c | 52 +
+ drivers/gpio/gpiolib.c | 76 +
+ drivers/mtd/nand/atmel_nand.c | 9 +
+ drivers/pinctrl/Kconfig | 47 +-
+ drivers/pinctrl/Makefile | 7 +-
+ drivers/pinctrl/core.c | 58 +
+ drivers/pinctrl/core.h | 2 +
+ drivers/pinctrl/devicetree.c | 11 +
+ drivers/pinctrl/mvebu/Kconfig | 24 +
+ drivers/pinctrl/mvebu/Makefile | 5 +
+ drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c | 0
+ drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c | 0
+ drivers/pinctrl/{ => mvebu}/pinctrl-dove.c | 0
+ drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c | 0
+ drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c | 1 -
+ drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h | 0
+ drivers/pinctrl/pinconf-generic.c | 1 +
+ drivers/pinctrl/pinctrl-at91.c | 1634 ++++++++++++++++++++
+ drivers/pinctrl/pinctrl-bcm2835.c | 2 +-
+ drivers/pinctrl/pinctrl-coh901.c | 175 ++-
+ drivers/pinctrl/pinctrl-exynos.c | 1 +
+ drivers/pinctrl/pinctrl-falcon.c | 2 +-
+ drivers/pinctrl/pinctrl-imx.c | 4 +-
+ drivers/pinctrl/pinctrl-lantiq.c | 23 +-
+ drivers/pinctrl/pinctrl-mxs.c | 2 +-
+ drivers/pinctrl/pinctrl-nomadik-db8500.c | 125 +-
+ drivers/pinctrl/pinctrl-nomadik-db8540.c | 16 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 152 +-
+ drivers/pinctrl/pinctrl-nomadik.h | 2 +-
+ drivers/pinctrl/pinctrl-pxa3xx.c | 12 +-
+ drivers/pinctrl/pinctrl-pxa3xx.h | 2 -
+ drivers/pinctrl/pinctrl-single.c | 88 +-
+ drivers/pinctrl/pinctrl-sirf.c | 52 +-
+ drivers/pinctrl/pinctrl-tegra.c | 24 +-
+ drivers/pinctrl/pinctrl-u300.c | 97 +-
+ drivers/pinctrl/pinctrl-xway.c | 2 +-
+ drivers/pinctrl/pinmux.c | 85 +-
+ drivers/pinctrl/spear/Kconfig | 11 +
+ drivers/pinctrl/spear/Makefile | 1 +
+ drivers/pinctrl/spear/pinctrl-plgpio.c | 758 +++++++++
+ drivers/pinctrl/spear/pinctrl-spear.c | 131 +-
+ drivers/pinctrl/spear/pinctrl-spear.h | 60 +
+ drivers/pinctrl/spear/pinctrl-spear1310.c | 264 ++++
+ drivers/pinctrl/spear/pinctrl-spear1340.c | 27 +
+ drivers/pinctrl/spear/pinctrl-spear300.c | 2 +
+ drivers/pinctrl/spear/pinctrl-spear310.c | 2 +
+ drivers/pinctrl/spear/pinctrl-spear320.c | 2 +
+ drivers/pinctrl/spear/pinctrl-spear3xx.c | 37 +
+ drivers/tty/serial/atmel_serial.c | 8 +
+ include/asm-generic/gpio.h | 47 +
+ include/linux/gpio.h | 21 +-
+ include/linux/pinctrl/pinconf-generic.h | 5 +-
+ include/linux/pinctrl/pinctrl.h | 19 +
+ include/linux/platform_data/pinctrl-coh901.h | 4 -
+ .../linux/platform_data/pinctrl-nomadik.h | 111 +-
+ 126 files changed, 7063 insertions(+), 1054 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
+ create mode 100644 arch/arm/boot/dts/animeo_ip.dts
+ create mode 100644 arch/arm/boot/dts/at91rm9200.dtsi
+ create mode 100644 arch/arm/boot/dts/at91rm9200ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi
+ create mode 100644 arch/arm/boot/dts/pm9g45.dts
+ create mode 100644 arch/arm/mach-at91/board-rm9200-dt.c
+ delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+ create mode 100644 drivers/pinctrl/mvebu/Kconfig
+ create mode 100644 drivers/pinctrl/mvebu/Makefile
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-dove.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c (99%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h (100%)
+ create mode 100644 drivers/pinctrl/pinctrl-at91.c
+ create mode 100644 drivers/pinctrl/spear/pinctrl-plgpio.c
+ rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (66%)
+Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
+$ git merge vhost/linux-next
+Resolved 'drivers/net/tun.c' using previous resolution.
+Auto-merging drivers/net/tun.c
+CONFLICT (content): Merge conflict in drivers/net/tun.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 26342b4] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging irqdomain/irqdomain/next (a0d271c Linux 3.6)
+$ git merge irqdomain/irqdomain/next
+Already up-to-date.
+Merging gpio/gpio/next (b53bc28 gpio: SPEAr: add spi chipselect control driver)
+$ git merge gpio/gpio/next
+Resolved 'drivers/gpio/gpio-em.c' using previous resolution.
+Auto-merging include/asm-generic/gpio.h
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/gpio-vt8500.c
+Auto-merging drivers/gpio/gpio-twl4030.c
+Auto-merging drivers/gpio/gpio-tegra.c
+Auto-merging drivers/gpio/gpio-tc3589x.c
+Auto-merging drivers/gpio/gpio-pch.c
+Auto-merging drivers/gpio/gpio-pca953x.c
+Auto-merging drivers/gpio/gpio-omap.c
+Auto-merging drivers/gpio/gpio-mvebu.c
+Auto-merging drivers/gpio/gpio-max730x.c
+Auto-merging drivers/gpio/gpio-em.c
+CONFLICT (content): Merge conflict in drivers/gpio/gpio-em.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8160363] Merge remote-tracking branch 'gpio/gpio/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/spear_spics.txt | 50 +++++
+ arch/arm/Kconfig | 1 +
+ arch/arm/plat-spear/Kconfig | 1 +
+ drivers/gpio/Kconfig | 22 ++
+ drivers/gpio/Makefile | 3 +
+ drivers/gpio/gpio-clps711x.c | 199 ++++++++++++++++++
+ drivers/gpio/gpio-da9055.c | 204 ++++++++++++++++++
+ drivers/gpio/gpio-em.c | 48 +----
+ drivers/gpio/gpio-max730x.c | 12 +-
+ drivers/gpio/gpio-mvebu.c | 9 +-
+ drivers/gpio/gpio-omap.c | 2 +-
+ drivers/gpio/gpio-pca953x.c | 55 ++++-
+ drivers/gpio/gpio-pch.c | 1 +
+ drivers/gpio/gpio-pl061.c | 59 ++----
+ drivers/gpio/gpio-spear-spics.c | 217 ++++++++++++++++++++
+ drivers/gpio/gpio-tc3589x.c | 20 +-
+ drivers/gpio/gpio-tegra.c | 43 ++--
+ drivers/gpio/gpio-twl4030.c | 35 ++--
+ drivers/gpio/gpio-vt8500.c | 2 +
+ drivers/gpio/gpiolib.c | 124 +++++++----
+ include/asm-generic/gpio.h | 5 +-
+ 21 files changed, 931 insertions(+), 181 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/spear_spics.txt
+ create mode 100644 drivers/gpio/gpio-clps711x.c
+ create mode 100644 drivers/gpio/gpio-da9055.c
+ create mode 100644 drivers/gpio/gpio-spear-spics.c
+Merging gpio-lw/for-next (12fff48 Merge branch 'devel' into for-next)
+$ git merge gpio-lw/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging arm-soc/for-next (d180b0b Merge branch 'next/fixes-non-critical' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging sound/soc/ux500/ux500_pcm.c
+Auto-merging sound/soc/tegra/tegra30_ahub.c
+Auto-merging include/linux/tegra-ahb.h
+Auto-merging include/linux/platform_data/mmc-omap.h
+CONFLICT (content): Merge conflict in include/linux/platform_data/mmc-omap.h
+Auto-merging include/linux/platform_data/leds-omap.h
+Auto-merging include/linux/platform_data/clocksource-nomadik-mtu.h
+Auto-merging include/linux/mfd/menelaus.h
+Auto-merging include/linux/irqchip/spear-shirq.h
+Auto-merging include/linux/dma/ipu-dma.h
+Auto-merging include/linux/clk/sunxi.h
+Auto-merging drivers/watchdog/omap_wdt.c
+Auto-merging drivers/usb/musb/tusb6010_omap.c
+Auto-merging drivers/usb/musb/musb_dsps.c
+Auto-merging drivers/usb/musb/am35x.c
+Auto-merging drivers/usb/host/ohci-omap3.c
+Auto-merging drivers/usb/host/ohci-omap.c
+Auto-merging drivers/usb/host/ohci-at91.c
+Auto-merging drivers/usb/host/ehci-orion.c
+CONFLICT (content): Merge conflict in drivers/usb/host/ehci-orion.c
+Auto-merging drivers/usb/host/ehci-omap.c
+Auto-merging drivers/usb/host/ehci-mxc.c
+Auto-merging drivers/usb/gadget/omap_udc.c
+Auto-merging drivers/usb/gadget/at91_udc.c
+Auto-merging drivers/uio/uio_pruss.c
+Auto-merging drivers/uio/Kconfig
+Auto-merging drivers/tty/serial/samsung.c
+Auto-merging drivers/tty/serial/atmel_serial.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/atmel_serial.c
+Auto-merging drivers/staging/nvec/nvec.c
+Auto-merging drivers/power/avs/smartreflex.c
+Auto-merging drivers/power/Makefile
+Auto-merging drivers/power/Kconfig
+CONFLICT (content): Merge conflict in drivers/power/Kconfig
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging drivers/pinctrl/Makefile
+Auto-merging drivers/pinctrl/Kconfig
+Auto-merging drivers/net/ethernet/cadence/at91_ether.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/at91_ether.c
+Auto-merging drivers/net/can/at91_can.c
+Auto-merging drivers/mtd/onenand/omap2.c
+Removing drivers/mtd/nand/spia.c
+Auto-merging drivers/mtd/nand/omap2.c
+Auto-merging drivers/mtd/nand/mxc_nand.c
+CONFLICT (content): Merge conflict in drivers/mtd/nand/mxc_nand.c
+Removing drivers/mtd/nand/autcpu12.c
+Auto-merging drivers/mtd/nand/Makefile
+Auto-merging drivers/mtd/nand/Kconfig
+Removing drivers/mtd/maps/cdb89712.c
+Auto-merging drivers/mtd/maps/Makefile
+Auto-merging drivers/mtd/maps/Kconfig
+Auto-merging drivers/mmc/host/omap_hsmmc.c
+Auto-merging drivers/mmc/host/omap.c
+Auto-merging drivers/mmc/host/mxcmmc.c
+Auto-merging drivers/mmc/host/atmel-mci.c
+Auto-merging drivers/mfd/omap-usb-tll.c
+Auto-merging drivers/mfd/omap-usb-host.c
+Auto-merging drivers/mfd/db8500-prcmu.c
+Auto-merging drivers/mfd/ab8500-core.c
+Auto-merging drivers/mfd/Makefile
+CONFLICT (content): Merge conflict in drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/media/rc/ir-rx51.c
+Auto-merging drivers/media/platform/soc_camera/omap1_camera.c
+Auto-merging drivers/media/platform/soc_camera/mx3_camera.c
+Auto-merging drivers/media/platform/soc_camera/mx2_camera.c
+Auto-merging drivers/media/platform/omap3isp/ispvideo.c
+Auto-merging drivers/media/platform/omap3isp/ispstat.h
+Auto-merging drivers/media/platform/omap3isp/isphist.c
+Auto-merging drivers/media/platform/omap/omap_vout.c
+Auto-merging drivers/leds/leds-ns2.c
+CONFLICT (content): Merge conflict in drivers/leds/leds-ns2.c
+Auto-merging drivers/irqchip/irq-versatile-fpga.c
+Auto-merging drivers/iommu/tegra-smmu.c
+Auto-merging drivers/input/touchscreen/atmel_tsadcc.c
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging drivers/hwmon/Makefile
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging drivers/gpio/gpio-pxa.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/crypto/tegra-aes.c
+Auto-merging drivers/crypto/Kconfig
+Auto-merging drivers/cpuidle/Kconfig
+Auto-merging drivers/clocksource/nomadik-mtu.c
+Removing arch/arm/plat-spear/shirq.c
+Removing arch/arm/plat-omap/sram.h
+Removing arch/arm/plat-omap/include/plat/usb.h
+Removing arch/arm/plat-omap/include/plat/uncompress.h
+Removing arch/arm/plat-omap/include/plat/sdrc.h
+Removing arch/arm/plat-omap/include/plat/prcm.h
+Removing arch/arm/plat-omap/include/plat/omap-secure.h
+Removing arch/arm/plat-omap/include/plat/multi.h
+Removing arch/arm/plat-omap/include/plat/fpga.h
+Removing arch/arm/plat-omap/include/plat/dma-44xx.h
+Auto-merging arch/arm/plat-omap/include/plat/debug-devices.h
+Removing arch/arm/plat-omap/include/plat/common.h
+Removing arch/arm/plat-omap/include/plat/clock.h
+Removing arch/arm/plat-omap/include/plat/clkdev_omap.h
+Auto-merging arch/arm/plat-omap/include/plat-omap/dma-omap.h
+Auto-merging arch/arm/plat-omap/fb.c
+CONFLICT (modify/delete): arch/arm/plat-omap/common.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/plat-omap/common.c left in tree.
+Removing arch/arm/plat-omap/clock.c
+Removing arch/arm/plat-nomadik/Makefile
+Removing arch/arm/plat-nomadik/Kconfig
+Removing arch/arm/plat-mxc/include/mach/uncompress.h
+Removing arch/arm/plat-mxc/include/mach/irqs.h
+Removing arch/arm/plat-mxc/include/mach/debug-macro.S
+Removing arch/arm/plat-mxc/Makefile
+Removing arch/arm/plat-mxc/Kconfig
+Removing arch/arm/mach-zynq/include/mach/timex.h
+Removing arch/arm/mach-zynq/include/mach/irqs.h
+Removing arch/arm/mach-zynq/include/mach/hardware.h
+Removing arch/arm/mach-vt8500/include/mach/restart.h
+Removing arch/arm/mach-vt8500/include/mach/i8042.h
+Removing arch/arm/mach-vt8500/include/mach/hardware.h
+Removing arch/arm/mach-vt8500/include/mach/entry-macro.S
+Auto-merging arch/arm/mach-ux500/devices-common.c
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
+Auto-merging arch/arm/mach-ux500/board-mop500-stuib.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-stuib.c
+Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
+Auto-merging arch/arm/mach-ux500/board-mop500-audio.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-audio.c
+Auto-merging arch/arm/mach-u300/core.c
+Auto-merging arch/arm/mach-tegra/sleep-tegra30.S
+Auto-merging arch/arm/mach-tegra/sleep-tegra20.S
+Auto-merging arch/arm/mach-tegra/irammap.h
+Auto-merging arch/arm/mach-tegra/iomap.h
+Removing arch/arm/mach-tegra/include/mach/irqs.h
+Removing arch/arm/mach-tegra/include/mach/dma.h
+Removing arch/arm/mach-tegra/include/mach/debug-macro.S
+Auto-merging arch/arm/mach-spear13xx/spear13xx.c
+CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear13xx.c
+Auto-merging arch/arm/mach-spear13xx/spear1310.c
+CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear1310.c
+Auto-merging arch/arm/mach-spear13xx/include/mach/spear.h
+Auto-merging arch/arm/mach-socfpga/core.h
+Removing arch/arm/mach-shmobile/setup-sh7377.c
+Removing arch/arm/mach-shmobile/setup-sh7367.c
+Removing arch/arm/mach-shmobile/pfc-sh7377.c
+Removing arch/arm/mach-shmobile/pfc-sh7367.c
+Removing arch/arm/mach-shmobile/intc-sh7377.c
+Removing arch/arm/mach-shmobile/intc-sh7367.c
+Removing arch/arm/mach-shmobile/include/mach/sh7377.h
+Removing arch/arm/mach-shmobile/include/mach/sh7367.h
+Removing arch/arm/mach-shmobile/clock-sh7377.c
+Removing arch/arm/mach-shmobile/clock-sh7367.c
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Removing arch/arm/mach-shmobile/board-g4evm.c
+Removing arch/arm/mach-shmobile/board-g3evm.c
+Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
+Removing arch/arm/mach-pxa/tavorevb3.c
+Removing arch/arm/mach-pxa/saarb.c
+Removing arch/arm/mach-pxa/pxa95x.c
+Removing arch/arm/mach-pxa/include/mach/pxa95x.h
+Removing arch/arm/mach-omap2/prcm.c
+Removing arch/arm/mach-omap2/powerdomain44xx.c
+Removing arch/arm/mach-omap2/powerdomain33xx.c
+Removing arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+Auto-merging arch/arm/mach-omap2/pmu.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_2430_data.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod.h
+Auto-merging arch/arm/mach-omap2/omap_device.h
+Auto-merging arch/arm/mach-omap2/omap_device.c
+Auto-merging arch/arm/mach-omap2/omap-pm-noop.c
+Auto-merging arch/arm/mach-omap2/include/mach/serial.h
+Removing arch/arm/mach-omap2/include/mach/gpio.h
+Auto-merging arch/arm/mach-omap2/gpmc.h
+Auto-merging arch/arm/mach-omap2/drm.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/drm.c
+Auto-merging arch/arm/mach-omap2/display.c
+Auto-merging arch/arm/mach-omap2/devices.c
+Auto-merging arch/arm/mach-omap2/cm3xxx.c
+Removing arch/arm/mach-omap2/clockdomain44xx.c
+Removing arch/arm/mach-omap2/clockdomain33xx.c
+Removing arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
+Removing arch/arm/mach-omap2/clock44xx_data.c
+Removing arch/arm/mach-omap2/clock3xxx_data.c
+Removing arch/arm/mach-omap2/clock33xx_data.c
+Removing arch/arm/mach-omap2/clock2430_data.c
+Removing arch/arm/mach-omap2/clock2420_data.c
+Auto-merging arch/arm/mach-omap2/board-rx51.c
+Auto-merging arch/arm/mach-omap2/board-overo.c
+Auto-merging arch/arm/mach-omap2/board-n8x0.c
+Removing arch/arm/mach-omap1/include/mach/gpio.h
+Auto-merging arch/arm/mach-omap1/board-nokia770.c
+Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
+CONFLICT (content): Merge conflict in arch/arm/mach-nomadik/board-nhk8815.c
+Auto-merging arch/arm/mach-mxs/mach-mxs.c
+Auto-merging arch/arm/mach-imx/ulpi.c
+Auto-merging arch/arm/mach-imx/tzic.c
+Auto-merging arch/arm/mach-imx/time.c
+Auto-merging arch/arm/mach-imx/system.c
+Auto-merging arch/arm/mach-imx/mx6q.h
+Auto-merging arch/arm/mach-imx/mach-imx6q.c
+Auto-merging arch/arm/mach-imx/irq-common.h
+Auto-merging arch/arm/mach-imx/iram_alloc.c
+Auto-merging arch/arm/mach-imx/iomux-v3.c
+Auto-merging arch/arm/mach-imx/iomux-v1.c
+Auto-merging arch/arm/mach-imx/iomux-mx51.h
+Auto-merging arch/arm/mach-imx/iomux-mx50.h
+Auto-merging arch/arm/mach-imx/iomux-mx35.h
+Auto-merging arch/arm/mach-imx/iomux-mx27.h
+Auto-merging arch/arm/mach-imx/iomux-mx25.h
+Auto-merging arch/arm/mach-imx/iomux-mx21.h
+Auto-merging arch/arm/mach-imx/iomux-mx1.h
+Removing arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
+Auto-merging arch/arm/mach-imx/hardware.h
+Auto-merging arch/arm/mach-imx/epit.c
+Auto-merging arch/arm/mach-imx/devices/platform-spi_imx.c
+Auto-merging arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
+Auto-merging arch/arm/mach-imx/devices/platform-pata_imx.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_w1.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_rtc.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_rnga.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_pwm.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_nand.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc-mmc.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc-ehci.c
+Auto-merging arch/arm/mach-imx/devices/platform-mx2-camera.c
+Auto-merging arch/arm/mach-imx/devices/platform-mx1-camera.c
+Auto-merging arch/arm/mach-imx/devices/platform-ipu-core.c
+Auto-merging arch/arm/mach-imx/devices/platform-imxdi_rtc.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx_udc.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx27-coda.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx21-hcd.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx2-wdt.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-uart.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-ssi.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-keypad.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-i2c.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-fb.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-dma.c
+Auto-merging arch/arm/mach-imx/devices/platform-gpio_keys.c
+Auto-merging arch/arm/mach-imx/devices/platform-gpio-mxc.c
+Auto-merging arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
+Auto-merging arch/arm/mach-imx/devices/platform-flexcan.c
+Auto-merging arch/arm/mach-imx/devices/platform-fec.c
+Auto-merging arch/arm/mach-imx/devices/platform-ahci-imx.c
+Auto-merging arch/arm/mach-imx/devices/devices.c
+Auto-merging arch/arm/mach-imx/devices/devices-common.h
+Auto-merging arch/arm/mach-imx/devices/Makefile
+Auto-merging arch/arm/mach-imx/devices/Kconfig
+Auto-merging arch/arm/mach-imx/cpufreq.c
+Auto-merging arch/arm/mach-imx/cpu.c
+Auto-merging arch/arm/mach-imx/common.h
+Auto-merging arch/arm/mach-imx/avic.c
+Auto-merging arch/arm/mach-imx/3ds_debugboard.c
+Removing arch/arm/mach-highbank/lluart.c
+Removing arch/arm/mach-exynos/dev-drm.c
+Auto-merging arch/arm/mach-davinci/devices-da8xx.c
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/devices-da8xx.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+Removing arch/arm/mach-clps711x/p720t.c
+Removing arch/arm/mach-clps711x/include/mach/irqs.h
+Removing arch/arm/mach-clps711x/include/mach/entry-macro.S
+Removing arch/arm/mach-clps711x/edb7211-mm.c
+Removing arch/arm/mach-clps711x/edb7211-arch.c
+Removing arch/arm/mach-clps711x/cdb89712.c
+Auto-merging arch/arm/mach-clps711x/board-fortunet.c
+Auto-merging arch/arm/mach-clps711x/board-clep7312.c
+Removing arch/arm/mach-clps711x/autcpu12.c
+Auto-merging arch/arm/mach-at91/setup.c
+Removing arch/arm/mach-at91/include/mach/at91_pit.h
+Auto-merging arch/arm/mach-at91/board.h
+Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
+Auto-merging arch/arm/mach-at91/board-dt.c
+Auto-merging arch/arm/mach-at91/board-csb337.c
+Auto-merging arch/arm/mach-at91/at91sam9x5.c
+Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9rl.c
+Auto-merging arch/arm/mach-at91/at91sam9n12.c
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+Auto-merging 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
+Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
+Auto-merging arch/arm/mach-at91/at91rm9200.c
+Auto-merging arch/arm/kernel/smp_twd.c
+Removing arch/arm/configs/usb-a9260_defconfig
+Auto-merging arch/arm/configs/u8500_defconfig
+CONFLICT (modify/delete): arch/arm/configs/stamp9g20_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/stamp9g20_defconfig left in tree.
+Removing arch/arm/configs/sam9_l9260_defconfig
+Removing arch/arm/configs/qil-a9260_defconfig
+Removing arch/arm/configs/g4evm_defconfig
+Removing arch/arm/configs/g3evm_defconfig
+Removing arch/arm/configs/fortunet_defconfig
+Removing arch/arm/configs/edb7211_defconfig
+Removing arch/arm/configs/cpu9g20_defconfig
+Removing arch/arm/configs/cpu9260_defconfig
+Removing arch/arm/configs/cam60_defconfig
+CONFLICT (modify/delete): arch/arm/configs/afeb9260_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/afeb9260_defconfig left in tree.
+Auto-merging arch/arm/boot/dts/tegra20-seaboard.dts
+Auto-merging arch/arm/boot/dts/spear600.dtsi
+Auto-merging arch/arm/boot/dts/spear320.dtsi
+Auto-merging arch/arm/boot/dts/spear310.dtsi
+Auto-merging arch/arm/boot/dts/spear300.dtsi
+Auto-merging arch/arm/boot/dts/spear13xx.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear13xx.dtsi
+Auto-merging arch/arm/boot/dts/spear1340.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear1340.dtsi
+Auto-merging arch/arm/boot/dts/snowball.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/snowball.dts
+Auto-merging arch/arm/boot/dts/sh7372-mackerel.dts
+Auto-merging arch/arm/boot/dts/omap4-panda-es.dts
+Auto-merging arch/arm/boot/dts/imx6q.dtsi
+Auto-merging arch/arm/boot/dts/imx28.dtsi
+Auto-merging arch/arm/boot/dts/imx28-cfa10049.dts
+Auto-merging arch/arm/boot/dts/dbx5x0.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/dbx5x0.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9g45.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9263.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Recorded preimage for 'arch/arm/mach-davinci/devices-da8xx.c'
+Resolved 'arch/arm/Kconfig.debug' using previous resolution.
+Resolved 'arch/arm/boot/dts/Makefile' using previous resolution.
+Resolved 'arch/arm/boot/dts/am33xx.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/at91sam9263.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/at91sam9g45.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/dbx5x0.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/snowball.dts' using previous resolution.
+Resolved 'arch/arm/boot/dts/spear1340.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/spear13xx.dtsi' using previous resolution.
+Resolved 'arch/arm/mach-nomadik/board-nhk8815.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/drm.c' using previous resolution.
+Resolved 'arch/arm/mach-spear13xx/spear1310.c' using previous resolution.
+Resolved 'arch/arm/mach-spear13xx/spear13xx.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/board-mop500-audio.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/board-mop500-stuib.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/board-mop500.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
+Resolved 'drivers/leds/leds-ns2.c' using previous resolution.
+Resolved 'drivers/mfd/Makefile' using previous resolution.
+Resolved 'drivers/mtd/nand/mxc_nand.c' using previous resolution.
+Resolved 'drivers/net/ethernet/cadence/at91_ether.c' using previous resolution.
+Resolved 'drivers/pinctrl/pinctrl-nomadik.c' using previous resolution.
+Resolved 'drivers/power/Kconfig' using previous resolution.
+Resolved 'drivers/tty/serial/atmel_serial.c' using previous resolution.
+Resolved 'drivers/usb/host/ehci-orion.c' using previous resolution.
+Resolved 'include/linux/platform_data/mmc-omap.h' using previous resolution.
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/am33xx.dtsi
+Auto-merging arch/arm/boot/dts/am335x-evm.dts
+Auto-merging arch/arm/boot/dts/am335x-bone.dts
+Auto-merging arch/arm/boot/dts/Makefile
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
+Removing arch/arm/boot/compressed/head-vt8500.S
+Auto-merging arch/arm/Kconfig.debug
+CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/usb/am33xx-usb.txt
+Auto-merging Documentation/devicetree/bindings/i2c/i2c-imx.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/configs/afeb9260_defconfig arch/arm/configs/stamp9g20_defconfig arch/arm/plat-omap/common.c
+arch/arm/configs/afeb9260_defconfig: needs merge
+arch/arm/configs/stamp9g20_defconfig: needs merge
+arch/arm/plat-omap/common.c: needs merge
+rm 'arch/arm/configs/afeb9260_defconfig'
+rm 'arch/arm/configs/stamp9g20_defconfig'
+rm 'arch/arm/plat-omap/common.c'
+$ git commit -v -a
+Recorded resolution for 'arch/arm/mach-davinci/devices-da8xx.c'.
+[master adc69b2] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/sunxi/README | 19 +
+ Documentation/bus-devices/ti-gpmc.txt | 122 +
+ .../bindings/arm/altera/socfpga-reset.txt | 11 +
+ .../bindings/arm/altera/socfpga-system.txt | 11 +
+ Documentation/devicetree/bindings/arm/arm-boards | 4 +
+ .../devicetree/bindings/arm/bcm/bcm11351.txt | 9 +
+ Documentation/devicetree/bindings/arm/calxeda.txt | 13 +-
+ Documentation/devicetree/bindings/arm/davinci.txt | 17 +
+ .../bindings/arm/exynos/power_domain.txt | 15 +-
+ Documentation/devicetree/bindings/arm/fsl.txt | 4 +
+ .../devicetree/bindings/arm/omap/counter.txt | 15 +
+ .../devicetree/bindings/arm/omap/timer.txt | 31 +
+ .../devicetree/bindings/arm/spear/shirq.txt | 48 +
+ .../devicetree/bindings/arm/vexpress-sysreg.txt | 50 +
+ Documentation/devicetree/bindings/arm/vexpress.txt | 98 +-
+ .../devicetree/bindings/ata/exynos-sata-phy.txt | 14 +
+ .../devicetree/bindings/ata/exynos-sata.txt | 17 +
+ .../devicetree/bindings/bus/omap-ocp2scp.txt | 18 +
+ .../devicetree/bindings/clock/imx25-clock.txt | 162 +
+ .../devicetree/bindings/clock/imx5-clock.txt | 191 ++
+ .../devicetree/bindings/clock/imx6q-clock.txt | 9 +-
+ .../devicetree/bindings/drm/exynos/hdmi.txt | 22 +
+ .../devicetree/bindings/drm/exynos/hdmiddc.txt | 12 +
+ .../devicetree/bindings/drm/exynos/hdmiphy.txt | 12 +
+ .../devicetree/bindings/drm/exynos/mixer.txt | 15 +
+ .../devicetree/bindings/gpio/gpio-poweroff.txt | 22 +
+ .../devicetree/bindings/gpio/leds-ns2.txt | 26 +
+ .../devicetree/bindings/hwmon/vexpress.txt | 23 +
+ Documentation/devicetree/bindings/i2c/i2c-imx.txt | 4 +-
+ .../devicetree/bindings/i2c/trivial-devices.txt | 2 +
+ .../bindings/input/touchscreen/bu21013.txt | 28 +
+ .../interrupt-controller/allwinner,sunxi-ic.txt | 104 +
+ .../devicetree/bindings/media/s5p-mfc.txt | 23 +
+ .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 39 +
+ .../bindings/pinctrl/samsung-pinctrl.txt | 119 +-
+ .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt | 19 +
+ .../bindings/timer/allwinner,sunxi-timer.txt | 17 +
+ .../bindings/timer/nvidia,tegra20-timer.txt | 21 +
+ .../bindings/timer/nvidia,tegra30-timer.txt | 23 +
+ .../devicetree/bindings/usb/am33xx-usb.txt | 21 +
+ .../devicetree/bindings/usb/ehci-orion.txt | 15 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ .../devicetree/bindings/watchdog/atmel-wdt.txt | 15 +
+ .../bindings/watchdog/brcm,bcm2835-pm-wdog.txt | 13 +
+ .../devicetree/bindings/watchdog/sunxi-wdt.txt | 13 +
+ Documentation/hwmon/vexpress | 34 +
+ MAINTAINERS | 13 +-
+ arch/arm/Kconfig | 51 +-
+ arch/arm/Kconfig.debug | 83 +-
+ arch/arm/Makefile | 4 +-
+ arch/arm/arm-soc-for-next-contents.txt | 169 +
+ arch/arm/boot/compressed/Makefile | 9 -
+ arch/arm/boot/compressed/head-vt8500.S | 46 -
+ arch/arm/boot/dts/Makefile | 46 +-
+ arch/arm/boot/dts/am335x-bone.dts | 50 +
+ arch/arm/boot/dts/am335x-evm.dts | 118 +
+ arch/arm/boot/dts/am335x-evmsk.dts | 250 ++
+ arch/arm/boot/dts/am33xx.dtsi | 157 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 6 +
+ arch/arm/boot/dts/at91sam9263.dtsi | 6 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 6 +
+ arch/arm/boot/dts/bcm11351-brt.dts | 30 +
+ arch/arm/boot/dts/bcm11351.dtsi | 50 +
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 15 +
+ arch/arm/boot/dts/bcm2835.dtsi | 28 +
+ arch/arm/boot/dts/ccu9540.dts | 72 +
+ arch/arm/boot/dts/cros5250-common.dtsi | 184 +
+ arch/arm/boot/dts/da850-enbw-cmc.dts | 30 +
+ arch/arm/boot/dts/da850-evm.dts | 28 +
+ arch/arm/boot/dts/da850.dtsi | 60 +
+ arch/arm/boot/dts/dbx5x0.dtsi | 56 +-
+ arch/arm/boot/dts/dove-cubox.dts | 10 +
+ arch/arm/boot/dts/dove.dtsi | 19 +-
+ arch/arm/boot/dts/ecx-2000.dts | 104 +
+ arch/arm/boot/dts/ecx-common.dtsi | 237 ++
+ arch/arm/boot/dts/evk-pro3.dts | 12 +
+ arch/arm/boot/dts/exynos4.dtsi | 54 +-
+ arch/arm/boot/dts/exynos4210-origen.dts | 70 +-
+ arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 334 +-
+ arch/arm/boot/dts/exynos4210-smdkv310.dts | 16 +
+ arch/arm/boot/dts/exynos4210-trats.dts | 87 +-
+ arch/arm/boot/dts/exynos4210.dtsi | 249 +-
+ arch/arm/boot/dts/exynos4212.dtsi | 28 +
+ arch/arm/boot/dts/exynos4412-smdk4412.dts | 45 +
+ arch/arm/boot/dts/exynos4412.dtsi | 28 +
+ arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 965 ++++++
+ arch/arm/boot/dts/exynos4x12.dtsi | 69 +
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 56 +-
+ arch/arm/boot/dts/exynos5250-snow.dts | 43 +
+ arch/arm/boot/dts/exynos5250.dtsi | 87 +-
+ arch/arm/boot/dts/exynos5440-ssdk5440.dts | 46 +
+ arch/arm/boot/dts/exynos5440.dtsi | 159 +
+ arch/arm/boot/dts/highbank.dts | 212 +-
+ arch/arm/boot/dts/href.dtsi | 273 ++
+ arch/arm/boot/dts/hrefprev60.dts | 48 +
+ arch/arm/boot/dts/hrefv60plus.dts | 217 +-
+ arch/arm/boot/dts/imx23-olinuxino.dts | 23 +-
+ arch/arm/boot/dts/imx23.dtsi | 13 +
+ arch/arm/boot/dts/imx25-karo-tx25.dts | 44 +
+ arch/arm/boot/dts/imx25.dtsi | 515 +++
+ arch/arm/boot/dts/imx27-3ds.dts | 4 -
+ arch/arm/boot/dts/imx27-apf27.dts | 89 +
+ arch/arm/boot/dts/imx27.dtsi | 9 +-
+ arch/arm/boot/dts/imx28-apf28.dts | 85 +
+ arch/arm/boot/dts/imx28-apf28dev.dts | 154 +
+ arch/arm/boot/dts/imx28-cfa10036.dts | 46 +
+ arch/arm/boot/dts/imx28-cfa10049.dts | 33 +
+ arch/arm/boot/dts/imx28-evk.dts | 13 +-
+ arch/arm/boot/dts/imx28-sps1.dts | 169 +
+ arch/arm/boot/dts/imx28.dtsi | 35 +
+ arch/arm/boot/dts/imx51-babbage.dts | 16 +
+ arch/arm/boot/dts/imx51.dtsi | 171 +-
+ arch/arm/boot/dts/imx53-qsb.dts | 62 +-
+ arch/arm/boot/dts/imx53.dtsi | 171 +-
+ arch/arm/boot/dts/imx6q-sabreauto.dts | 64 +
+ arch/arm/boot/dts/imx6q-sabresd.dts | 18 +
+ arch/arm/boot/dts/imx6q.dtsi | 154 +-
+ arch/arm/boot/dts/integratorap.dts | 5 +
+ arch/arm/boot/dts/integratorcp.dts | 5 +
+ arch/arm/boot/dts/kirkwood-6281.dtsi | 44 +
+ arch/arm/boot/dts/kirkwood-6282.dtsi | 45 +
+ arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 31 +
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 140 +
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 37 +
+ arch/arm/boot/dts/kirkwood-dreamplug.dts | 21 +
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 73 +
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 40 +
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 51 +
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 89 +
+ arch/arm/boot/dts/kirkwood-is2.dts | 30 +
+ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 17 +
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 106 +
+ arch/arm/boot/dts/kirkwood-mplcec4.dts | 178 +
+ arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 63 +
+ arch/arm/boot/dts/kirkwood-ns2.dts | 30 +
+ arch/arm/boot/dts/kirkwood-ns2lite.dts | 30 +
+ arch/arm/boot/dts/kirkwood-ns2max.dts | 49 +
+ arch/arm/boot/dts/kirkwood-ns2mini.dts | 49 +
+ arch/arm/boot/dts/kirkwood-nsa310.dts | 144 +
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 98 +
+ arch/arm/boot/dts/kirkwood-topkick.dts | 85 +
+ arch/arm/boot/dts/kirkwood-ts219-6281.dts | 31 +
+ arch/arm/boot/dts/kirkwood-ts219-6282.dts | 31 +
+ arch/arm/boot/dts/kirkwood.dtsi | 17 +-
+ arch/arm/boot/dts/lpc32xx.dtsi | 7 +
+ arch/arm/boot/dts/omap2.dtsi | 86 +
+ arch/arm/boot/dts/omap2420.dtsi | 16 +-
+ arch/arm/boot/dts/omap2430.dtsi | 19 +-
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 6 -
+ arch/arm/boot/dts/omap3-beagle.dts | 67 +
+ arch/arm/boot/dts/omap3.dtsi | 107 +-
+ arch/arm/boot/dts/omap4-panda-a4.dts | 17 +
+ .../dts/{omap4-pandaES.dts => omap4-panda-es.dts} | 9 +
+ arch/arm/boot/dts/omap4-panda.dts | 22 +
+ arch/arm/boot/dts/omap4-sdp-es23plus.dts | 17 +
+ arch/arm/boot/dts/omap4-sdp.dts | 22 +
+ .../dts/{omap4-var_som.dts => omap4-var-som.dts} | 0
+ arch/arm/boot/dts/omap4.dtsi | 105 +-
+ arch/arm/boot/dts/omap5-evm.dts | 13 +-
+ arch/arm/boot/dts/omap5.dtsi | 178 +-
+ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 55 +
+ arch/arm/boot/dts/orion5x.dtsi | 98 +
+ arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 67 +
+ .../boot/dts/{sh7377.dtsi => sh7372-mackerel.dts} | 13 +-
+ arch/arm/boot/dts/snowball.dts | 140 +-
+ arch/arm/boot/dts/socfpga.dtsi | 10 +
+ arch/arm/boot/dts/spear1310-evb.dts | 165 +-
+ arch/arm/boot/dts/spear1310.dtsi | 32 +-
+ arch/arm/boot/dts/spear1340-evb.dts | 253 +-
+ arch/arm/boot/dts/spear1340.dtsi | 61 +
+ arch/arm/boot/dts/spear13xx.dtsi | 72 +-
+ arch/arm/boot/dts/spear300-evb.dts | 20 +-
+ arch/arm/boot/dts/spear300.dtsi | 14 +-
+ arch/arm/boot/dts/spear310-evb.dts | 30 +-
+ arch/arm/boot/dts/spear310.dtsi | 18 +
+ arch/arm/boot/dts/spear320-evb.dts | 35 +-
+ arch/arm/boot/dts/spear320-hmi.dts | 305 ++
+ arch/arm/boot/dts/spear320.dtsi | 39 +-
+ arch/arm/boot/dts/spear3xx.dtsi | 5 +-
+ arch/arm/boot/dts/spear600-evb.dts | 46 +-
+ arch/arm/boot/dts/spear600.dtsi | 16 +
+ arch/arm/boot/dts/stuib.dtsi | 78 +
+ arch/arm/boot/dts/sun4i-cubieboard.dts | 38 +
+ arch/arm/boot/dts/sun4i.dtsi | 19 +
+ arch/arm/boot/dts/sun5i-olinuxino.dts | 30 +
+ arch/arm/boot/dts/sun5i.dtsi | 20 +
+ arch/arm/boot/dts/sunxi.dtsi | 80 +
+ arch/arm/boot/dts/tegra20-harmony.dts | 84 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 59 +-
+ arch/arm/boot/dts/tegra20-plutux.dts | 6 +
+ arch/arm/boot/dts/tegra20-seaboard.dts | 65 +-
+ arch/arm/boot/dts/tegra20-tamonten.dtsi | 147 +-
+ arch/arm/boot/dts/tegra20-tec.dts | 9 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts | 54 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 149 +-
+ arch/arm/boot/dts/tegra20-whistler.dts | 136 +-
+ arch/arm/boot/dts/tegra20.dtsi | 167 +
+ arch/arm/boot/dts/tegra30-cardhu-a02.dts | 6 +
+ arch/arm/boot/dts/tegra30-cardhu-a04.dts | 6 +
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 84 +-
+ arch/arm/boot/dts/tegra30.dtsi | 179 +
+ arch/arm/boot/dts/twl4030.dtsi | 27 +
+ arch/arm/boot/dts/twl6030.dtsi | 5 +
+ arch/arm/boot/dts/u9540.dts | 72 +
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 146 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi | 146 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 121 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 186 +-
+ arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 84 +-
+ arch/arm/boot/dts/vexpress-v2p-ca9.dts | 136 +-
+ arch/arm/configs/afeb9260_defconfig | 106 -
+ arch/arm/configs/ap4evb_defconfig | 1 -
+ arch/arm/configs/armadillo800eva_defconfig | 3 +-
+ arch/arm/configs/bcm2835_defconfig | 2 -
+ arch/arm/configs/bcm_defconfig | 114 +
+ arch/arm/configs/cam60_defconfig | 173 -
+ arch/arm/configs/clps711x_defconfig | 90 +
+ arch/arm/configs/cpu9260_defconfig | 116 -
+ arch/arm/configs/cpu9g20_defconfig | 116 -
+ arch/arm/configs/da8xx_omapl_defconfig | 3 +
+ arch/arm/configs/dove_defconfig | 24 +
+ arch/arm/configs/edb7211_defconfig | 27 -
+ arch/arm/configs/fortunet_defconfig | 28 -
+ arch/arm/configs/g3evm_defconfig | 57 -
+ arch/arm/configs/g4evm_defconfig | 57 -
+ arch/arm/configs/imx_v4_v5_defconfig | 5 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 5 +
+ arch/arm/configs/kirkwood_defconfig | 9 +
+ arch/arm/configs/kota2_defconfig | 1 -
+ arch/arm/configs/kzm9g_defconfig | 5 +-
+ arch/arm/configs/mackerel_defconfig | 19 +-
+ arch/arm/configs/marzen_defconfig | 18 +-
+ arch/arm/configs/mxs_defconfig | 6 +
+ arch/arm/configs/orion5x_defconfig | 36 +-
+ arch/arm/configs/qil-a9260_defconfig | 114 -
+ arch/arm/configs/sam9_l9260_defconfig | 148 -
+ arch/arm/configs/socfpga_defconfig | 5 +-
+ arch/arm/configs/stamp9g20_defconfig | 128 -
+ arch/arm/configs/tegra_defconfig | 21 +-
+ arch/arm/configs/u8500_defconfig | 1 +
+ arch/arm/configs/usb-a9260_defconfig | 105 -
+ arch/arm/include/asm/dma-mapping.h | 7 -
+ arch/arm/include/asm/hardware/sp810.h | 6 +-
+ arch/arm/include/debug/imx.S | 74 +
+ arch/arm/include/debug/sunxi.S | 27 +
+ arch/arm/include/debug/tegra.S | 223 ++
+ arch/arm/include/debug/vexpress.S | 11 +-
+ arch/arm/kernel/smp_twd.c | 6 +-
+ arch/arm/mach-at91/{include/mach => }/at91_aic.h | 0
+ arch/arm/mach-at91/{include/mach => }/at91_rstc.h | 0
+ arch/arm/mach-at91/{include/mach => }/at91_shdwc.h | 0
+ arch/arm/mach-at91/{include/mach => }/at91_tc.h | 0
+ arch/arm/mach-at91/at91rm9200.c | 2 +-
+ arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9260.c | 4 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9261.c | 4 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9263.c | 4 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam926x_time.c | 14 +-
+ arch/arm/mach-at91/at91sam9_alt_reset.S | 2 +-
+ arch/arm/mach-at91/at91sam9g45.c | 3 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45_reset.S | 3 +-
+ arch/arm/mach-at91/at91sam9n12.c | 2 +-
+ arch/arm/mach-at91/at91sam9rl.c | 4 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9x5.c | 2 +-
+ arch/arm/mach-at91/at91x40.c | 3 +-
+ arch/arm/mach-at91/at91x40_time.c | 3 +-
+ arch/arm/mach-at91/board-1arm.c | 4 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c | 5 +-
+ arch/arm/mach-at91/board-cam60.c | 4 +-
+ arch/arm/mach-at91/board-carmeva.c | 4 +-
+ arch/arm/mach-at91/board-cpu9krea.c | 4 +-
+ arch/arm/mach-at91/board-cpuat91.c | 4 +-
+ arch/arm/mach-at91/board-csb337.c | 4 +-
+ arch/arm/mach-at91/board-csb637.c | 4 +-
+ arch/arm/mach-at91/board-dt.c | 5 +-
+ arch/arm/mach-at91/board-eb01.c | 5 +-
+ arch/arm/mach-at91/board-eb9200.c | 5 +-
+ 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 | 4 +-
+ arch/arm/mach-at91/board-gsia18s.c | 8 +-
+ arch/arm/mach-at91/board-kafa.c | 4 +-
+ arch/arm/mach-at91/board-kb9202.c | 4 +-
+ arch/arm/mach-at91/board-neocore926.c | 4 +-
+ arch/arm/mach-at91/board-pcontrol-g20.c | 6 +-
+ arch/arm/mach-at91/board-picotux200.c | 4 +-
+ arch/arm/mach-at91/board-qil-a9260.c | 6 +-
+ arch/arm/mach-at91/board-rm9200dk.c | 4 +-
+ arch/arm/mach-at91/board-rm9200ek.c | 4 +-
+ arch/arm/mach-at91/board-rsi-ews.c | 4 +-
+ arch/arm/mach-at91/board-sam9-l9260.c | 4 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 6 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 6 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 6 +-
+ arch/arm/mach-at91/board-sam9g20ek.c | 4 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 6 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 7 +-
+ arch/arm/mach-at91/board-snapper9260.c | 4 +-
+ arch/arm/mach-at91/board-stamp9g20.c | 4 +-
+ arch/arm/mach-at91/board-usb-a926x.c | 6 +-
+ arch/arm/mach-at91/board-yl-9200.c | 4 +-
+ arch/arm/mach-at91/{include/mach => }/board.h | 55 -
+ arch/arm/mach-at91/{include/mach => }/gsia18s.h | 0
+ arch/arm/mach-at91/include/mach/at91_pit.h | 32 -
+ arch/arm/mach-at91/include/mach/atmel-mci.h | 7 -
+ arch/arm/mach-at91/include/mach/hardware.h | 3 -
+ arch/arm/mach-at91/irq.c | 2 +-
+ arch/arm/mach-at91/leds.c | 2 +-
+ arch/arm/mach-at91/pm.c | 6 +-
+ arch/arm/mach-at91/setup.c | 2 +-
+ arch/arm/mach-at91/{include/mach => }/stamp9g20.h | 0
+ arch/arm/mach-bcm/Kconfig | 19 +
+ arch/arm/mach-bcm/Makefile | 13 +
+ arch/arm/mach-bcm/board_bcm.c | 57 +
+ arch/arm/mach-bcm2835/Makefile.boot | 4 +-
+ arch/arm/mach-bcm2835/bcm2835.c | 50 +-
+ arch/arm/mach-bcm2835/include/mach/gpio.h | 1 +
+ arch/arm/mach-clps711x/Kconfig | 2 -
+ arch/arm/mach-clps711x/Makefile | 12 +-
+ arch/arm/mach-clps711x/Makefile.boot | 1 -
+ arch/arm/mach-clps711x/autcpu12.c | 92 -
+ arch/arm/mach-clps711x/board-autcpu12.c | 179 +
+ arch/arm/mach-clps711x/board-cdb89712.c | 147 +
+ .../mach-clps711x/{clep7312.c => board-clep7312.c} | 4 +-
+ arch/arm/mach-clps711x/board-edb7211.c | 180 +
+ .../mach-clps711x/{fortunet.c => board-fortunet.c} | 2 +
+ arch/arm/mach-clps711x/board-p720t.c | 232 ++
+ arch/arm/mach-clps711x/cdb89712.c | 63 -
+ arch/arm/mach-clps711x/common.c | 181 +-
+ arch/arm/mach-clps711x/common.h | 7 +-
+ arch/arm/mach-clps711x/edb7211-arch.c | 66 -
+ arch/arm/mach-clps711x/edb7211-mm.c | 82 -
+ arch/arm/mach-clps711x/include/mach/autcpu12.h | 23 +-
+ arch/arm/mach-clps711x/include/mach/clps711x.h | 27 +
+ arch/arm/mach-clps711x/include/mach/entry-macro.S | 51 -
+ arch/arm/mach-clps711x/include/mach/hardware.h | 67 +-
+ arch/arm/mach-clps711x/include/mach/irqs.h | 50 -
+ arch/arm/mach-clps711x/include/mach/syspld.h | 9 +-
+ arch/arm/mach-clps711x/p720t.c | 181 -
+ arch/arm/mach-cns3xxx/Kconfig | 1 -
+ arch/arm/mach-davinci/Kconfig | 8 +
+ arch/arm/mach-davinci/Makefile | 1 +
+ arch/arm/mach-davinci/board-da850-evm.c | 34 +-
+ 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 | 4 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 7 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
+ arch/arm/mach-davinci/common.c | 2 -
+ arch/arm/mach-davinci/da850.c | 17 +-
+ arch/arm/mach-davinci/da8xx-dt.c | 66 +
+ arch/arm/mach-davinci/devices-da8xx.c | 77 +-
+ arch/arm/mach-davinci/devices-tnetv107x.c | 2 +-
+ arch/arm/mach-davinci/dm355.c | 6 -
+ arch/arm/mach-davinci/dm365.c | 6 -
+ arch/arm/mach-davinci/dm644x.c | 6 -
+ arch/arm/mach-davinci/dm646x.c | 6 -
+ arch/arm/mach-davinci/include/mach/common.h | 2 -
+ arch/arm/mach-davinci/include/mach/da8xx.h | 3 +
+ arch/arm/mach-davinci/include/mach/serial.h | 3 +-
+ arch/arm/mach-davinci/include/mach/sram.h | 3 +
+ arch/arm/mach-davinci/include/mach/uncompress.h | 6 +
+ arch/arm/mach-davinci/serial.c | 39 +-
+ arch/arm/mach-davinci/sram.c | 23 +-
+ arch/arm/mach-davinci/time.c | 4 +-
+ arch/arm/mach-davinci/usb.c | 6 -
+ arch/arm/mach-dove/include/mach/pm.h | 2 +-
+ arch/arm/mach-dove/irq.c | 14 +-
+ arch/arm/mach-exynos/Kconfig | 12 +-
+ arch/arm/mach-exynos/Makefile | 3 +-
+ arch/arm/mach-exynos/clock-exynos4.c | 9 +-
+ arch/arm/mach-exynos/clock-exynos5.c | 67 +-
+ arch/arm/mach-exynos/common.c | 134 +-
+ arch/arm/mach-exynos/cpuidle.c | 36 +
+ arch/arm/mach-exynos/dev-audio.c | 2 +-
+ arch/arm/mach-exynos/dev-drm.c | 29 -
+ arch/arm/mach-exynos/dev-ohci.c | 2 +-
+ arch/arm/mach-exynos/dev-uart.c | 24 -
+ arch/arm/mach-exynos/include/mach/irqs.h | 13 +-
+ arch/arm/mach-exynos/include/mach/map.h | 8 +-
+ arch/arm/mach-exynos/include/mach/regs-clock.h | 19 +
+ arch/arm/mach-exynos/include/mach/regs-pmu.h | 4 +-
+ arch/arm/mach-exynos/mach-exynos4-dt.c | 4 +
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 99 +-
+ arch/arm/mach-exynos/mach-nuri.c | 10 +-
+ arch/arm/mach-exynos/mach-origen.c | 11 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 5 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 9 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 8 +-
+ arch/arm/mach-exynos/mct.c | 11 +-
+ arch/arm/mach-exynos/pm.c | 9 +
+ arch/arm/mach-exynos/pm_domains.c | 93 +-
+ arch/arm/mach-exynos/setup-i2c0.c | 2 +-
+ arch/arm/mach-highbank/Kconfig | 2 +-
+ arch/arm/mach-highbank/Makefile | 1 -
+ arch/arm/mach-highbank/core.h | 10 +-
+ arch/arm/mach-highbank/highbank.c | 33 +-
+ arch/arm/mach-highbank/hotplug.c | 6 +-
+ arch/arm/mach-highbank/lluart.c | 34 -
+ arch/arm/mach-highbank/platsmp.c | 7 +-
+ arch/arm/mach-highbank/pm.c | 3 -
+ arch/arm/mach-highbank/sysregs.h | 19 +
+ arch/arm/mach-highbank/system.c | 2 -
+ arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c | 2 +-
+ .../include/mach => mach-imx}/3ds_debugboard.h | 0
+ arch/arm/mach-imx/Kconfig | 110 +-
+ arch/arm/mach-imx/Makefile | 23 +
+ arch/arm/{plat-mxc => mach-imx}/avic.c | 5 +-
+ .../include/mach => mach-imx}/board-mx31lilly.h | 0
+ .../include/mach => mach-imx}/board-mx31lite.h | 0
+ .../include/mach => mach-imx}/board-mx31moboard.h | 0
+ .../include/mach => mach-imx}/board-pcm038.h | 0
+ arch/arm/mach-imx/clk-imx1.c | 17 +-
+ arch/arm/mach-imx/clk-imx21.c | 18 +-
+ arch/arm/mach-imx/clk-imx25.c | 145 +-
+ arch/arm/mach-imx/clk-imx27.c | 58 +-
+ arch/arm/mach-imx/clk-imx31.c | 21 +-
+ arch/arm/mach-imx/clk-imx35.c | 13 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c | 59 +-
+ arch/arm/mach-imx/clk-imx6q.c | 46 +-
+ arch/arm/mach-imx/clk-pllv1.c | 4 +-
+ arch/arm/mach-imx/clk-pllv3.c | 72 +-
+ arch/arm/mach-imx/clk.h | 3 +-
+ .../{plat-mxc/include/mach => mach-imx}/common.h | 2 +
+ arch/arm/mach-imx/cpu-imx25.c | 5 +-
+ arch/arm/mach-imx/cpu-imx27.c | 2 +-
+ arch/arm/mach-imx/cpu-imx31.c | 7 +-
+ arch/arm/mach-imx/cpu-imx35.c | 5 +-
+ arch/arm/mach-imx/cpu-imx5.c | 3 +-
+ arch/arm/{plat-mxc => mach-imx}/cpu.c | 3 +-
+ arch/arm/mach-imx/cpu_op-mx51.c | 3 +-
+ arch/arm/{plat-mxc => mach-imx}/cpufreq.c | 3 +-
+ arch/arm/{plat-mxc => mach-imx}/cpuidle.c | 0
+ .../{plat-mxc/include/mach => mach-imx}/cpuidle.h | 0
+ arch/arm/mach-imx/devices-imx1.h | 3 +-
+ arch/arm/mach-imx/devices-imx21.h | 3 +-
+ arch/arm/mach-imx/devices-imx25.h | 3 +-
+ arch/arm/mach-imx/devices-imx27.h | 7 +-
+ arch/arm/mach-imx/devices-imx31.h | 3 +-
+ arch/arm/mach-imx/devices-imx35.h | 3 +-
+ arch/arm/mach-imx/devices-imx50.h | 3 +-
+ arch/arm/mach-imx/devices-imx51.h | 3 +-
+ arch/arm/{plat-mxc => mach-imx}/devices/Kconfig | 3 +
+ arch/arm/{plat-mxc => mach-imx}/devices/Makefile | 3 +
+ .../mach => mach-imx/devices}/devices-common.h | 18 +-
+ arch/arm/{plat-mxc => mach-imx/devices}/devices.c | 4 +-
+ .../devices/platform-ahci-imx.c | 5 +-
+ .../{plat-mxc => mach-imx}/devices/platform-fec.c | 5 +-
+ .../devices/platform-flexcan.c | 4 +-
+ .../devices/platform-fsl-usb2-udc.c | 5 +-
+ .../devices/platform-gpio-mxc.c | 2 +-
+ .../devices/platform-gpio_keys.c | 5 +-
+ .../devices/platform-imx-dma.c | 23 +-
+ .../devices/platform-imx-fb.c | 16 +-
+ .../devices/platform-imx-i2c.c | 32 +-
+ .../devices/platform-imx-keypad.c | 4 +-
+ .../devices/platform-imx-ssi.c | 4 +-
+ .../devices/platform-imx-uart.c | 4 +-
+ .../devices/platform-imx2-wdt.c | 5 +-
+ .../devices/platform-imx21-hcd.c | 4 +-
+ .../devices/platform-imx27-coda.c | 4 +-
+ .../devices/platform-imx_udc.c | 4 +-
+ .../devices/platform-imxdi_rtc.c | 5 +-
+ .../devices/platform-ipu-core.c | 5 +-
+ .../devices/platform-mx1-camera.c | 4 +-
+ .../devices/platform-mx2-camera.c | 33 +-
+ .../devices/platform-mxc-ehci.c | 5 +-
+ .../devices/platform-mxc-mmc.c | 20 +-
+ .../devices/platform-mxc_nand.c | 25 +-
+ .../devices/platform-mxc_pwm.c | 4 +-
+ .../devices/platform-mxc_rnga.c | 4 +-
+ .../devices/platform-mxc_rtc.c | 13 +-
+ .../devices/platform-mxc_w1.c | 4 +-
+ .../devices/platform-pata_imx.c | 4 +-
+ .../devices/platform-sdhci-esdhc-imx.c | 5 +-
+ .../devices/platform-spi_imx.c | 4 +-
+ arch/arm/mach-imx/ehci-imx25.c | 4 +-
+ arch/arm/mach-imx/ehci-imx27.c | 4 +-
+ arch/arm/mach-imx/ehci-imx31.c | 4 +-
+ arch/arm/mach-imx/ehci-imx35.c | 4 +-
+ arch/arm/mach-imx/ehci-imx5.c | 4 +-
+ arch/arm/{plat-mxc => mach-imx}/epit.c | 6 +-
+ .../include/mach => mach-imx}/eukrea-baseboards.h | 0
+ arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +-
+ arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +-
+ arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 +-
+ arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 +-
+ .../{plat-mxc/include/mach => mach-imx}/hardware.h | 26 +-
+ arch/arm/mach-imx/hotplug.c | 3 +-
+ arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h | 0
+ arch/arm/mach-imx/imx25-dt.c | 48 +
+ arch/arm/mach-imx/imx27-dt.c | 11 +-
+ arch/arm/mach-imx/imx31-dt.c | 5 +-
+ arch/arm/mach-imx/imx51-dt.c | 31 +-
+ arch/arm/mach-imx/include/mach/dma-mx1-mx2.h | 10 -
+ arch/arm/mach-imx/iomux-imx31.c | 5 +-
+ .../include/mach => mach-imx}/iomux-mx1.h | 2 +-
+ .../include/mach => mach-imx}/iomux-mx21.h | 4 +-
+ .../include/mach => mach-imx}/iomux-mx25.h | 2 +-
+ .../include/mach => mach-imx}/iomux-mx27.h | 4 +-
+ .../include/mach => mach-imx}/iomux-mx2x.h | 0
+ .../include/mach => mach-imx}/iomux-mx3.h | 0
+ .../include/mach => mach-imx}/iomux-mx35.h | 2 +-
+ .../include/mach => mach-imx}/iomux-mx50.h | 2 +-
+ .../include/mach => mach-imx}/iomux-mx51.h | 2 +-
+ arch/arm/{plat-mxc => mach-imx}/iomux-v1.c | 5 +-
+ .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h | 0
+ arch/arm/{plat-mxc => mach-imx}/iomux-v3.c | 5 +-
+ .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/iram.h | 0
+ arch/arm/{plat-mxc => mach-imx}/iram_alloc.c | 3 +-
+ arch/arm/{plat-mxc => mach-imx}/irq-common.c | 0
+ arch/arm/{plat-mxc => mach-imx}/irq-common.h | 3 +
+ arch/arm/mach-imx/lluart.c | 31 +-
+ arch/arm/mach-imx/mach-apf9328.c | 7 +-
+ arch/arm/mach-imx/mach-armadillo5x0.c | 9 +-
+ arch/arm/mach-imx/mach-bug.c | 7 +-
+ arch/arm/mach-imx/mach-cpuimx27.c | 11 +-
+ arch/arm/mach-imx/mach-cpuimx35.c | 9 +-
+ arch/arm/mach-imx/mach-cpuimx51sd.c | 9 +-
+ arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 10 +-
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 58 +-
+ arch/arm/mach-imx/mach-imx27ipcam.c | 6 +-
+ arch/arm/mach-imx/mach-imx27lite.c | 6 +-
+ arch/arm/mach-imx/mach-imx53.c | 34 +-
+ arch/arm/mach-imx/mach-imx6q.c | 41 +-
+ arch/arm/mach-imx/mach-kzm_arm11_01.c | 7 +-
+ arch/arm/mach-imx/mach-mx1ads.c | 7 +-
+ arch/arm/mach-imx/mach-mx21ads.c | 6 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c | 8 +-
+ arch/arm/mach-imx/mach-mx27_3ds.c | 10 +-
+ arch/arm/mach-imx/mach-mx27ads.c | 6 +-
+ arch/arm/mach-imx/mach-mx31_3ds.c | 12 +-
+ arch/arm/mach-imx/mach-mx31ads.c | 5 +-
+ arch/arm/mach-imx/mach-mx31lilly.c | 11 +-
+ arch/arm/mach-imx/mach-mx31lite.c | 11 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 14 +-
+ arch/arm/mach-imx/mach-mx35_3ds.c | 8 +-
+ arch/arm/mach-imx/mach-mx50_rdp.c | 7 +-
+ arch/arm/mach-imx/mach-mx51_3ds.c | 9 +-
+ arch/arm/mach-imx/mach-mx51_babbage.c | 7 +-
+ arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
+ arch/arm/mach-imx/mach-pca100.c | 8 +-
+ arch/arm/mach-imx/mach-pcm037.c | 8 +-
+ arch/arm/mach-imx/mach-pcm037_eet.c | 5 +-
+ arch/arm/mach-imx/mach-pcm038.c | 13 +-
+ arch/arm/mach-imx/mach-pcm043.c | 9 +-
+ arch/arm/mach-imx/mach-qong.c | 6 +-
+ arch/arm/mach-imx/mach-scb9328.c | 7 +-
+ arch/arm/mach-imx/mach-vpr200.c | 7 +-
+ arch/arm/mach-imx/mm-imx1.c | 9 +-
+ arch/arm/mach-imx/mm-imx21.c | 14 +-
+ arch/arm/mach-imx/mm-imx25.c | 12 +-
+ arch/arm/mach-imx/mm-imx27.c | 14 +-
+ arch/arm/mach-imx/mm-imx3.c | 13 +-
+ arch/arm/mach-imx/mm-imx5.c | 32 +-
+ arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h | 0
+ arch/arm/mach-imx/mx31lilly-db.c | 9 +-
+ arch/arm/mach-imx/mx31lite-db.c | 9 +-
+ arch/arm/mach-imx/mx31moboard-devboard.c | 9 +-
+ arch/arm/mach-imx/mx31moboard-marxbot.c | 9 +-
+ arch/arm/mach-imx/mx31moboard-smartbot.c | 11 +-
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h | 0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h | 4 -
+ arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h | 0
+ arch/arm/mach-imx/pcm970-baseboard.c | 7 +-
+ arch/arm/mach-imx/platsmp.c | 5 +-
+ arch/arm/mach-imx/pm-imx27.c | 3 +-
+ arch/arm/mach-imx/pm-imx3.c | 7 +-
+ arch/arm/mach-imx/pm-imx5.c | 7 +-
+ arch/arm/mach-imx/pm-imx6q.c | 5 +-
+ arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c | 0
+ arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S | 0
+ arch/arm/{plat-mxc => mach-imx}/system.c | 5 +-
+ arch/arm/{plat-mxc => mach-imx}/time.c | 5 +-
+ arch/arm/{plat-mxc => mach-imx}/tzic.c | 6 +-
+ arch/arm/{plat-mxc => mach-imx}/ulpi.c | 2 +-
+ .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h | 0
+ arch/arm/mach-integrator/Kconfig | 2 +
+ arch/arm/mach-integrator/common.h | 8 +-
+ arch/arm/mach-integrator/core.c | 141 +-
+ arch/arm/mach-integrator/include/mach/irqs.h | 109 +-
+ arch/arm/mach-integrator/include/mach/platform.h | 1 -
+ arch/arm/mach-integrator/integrator_ap.c | 163 +-
+ arch/arm/mach-integrator/integrator_cp.c | 121 +-
+ arch/arm/mach-integrator/pci_v3.c | 32 +-
+ arch/arm/mach-ixp4xx/common-pci.c | 1 +
+ arch/arm/mach-ixp4xx/common.c | 13 +-
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
+ arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
+ arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 +-
+ arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +-
+ arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 +-
+ arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 12 +-
+ arch/arm/mach-kirkwood/Kconfig | 70 +
+ arch/arm/mach-kirkwood/Makefile | 9 +
+ arch/arm/mach-kirkwood/board-dnskw.c | 54 -
+ arch/arm/mach-kirkwood/board-dockstar.c | 29 -
+ arch/arm/mach-kirkwood/board-dreamplug.c | 30 -
+ arch/arm/mach-kirkwood/board-dt.c | 34 +-
+ arch/arm/mach-kirkwood/board-goflexnet.c | 37 -
+ arch/arm/mach-kirkwood/board-ib62x0.c | 41 -
+ arch/arm/mach-kirkwood/board-iconnect.c | 26 -
+ arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 28 -
+ arch/arm/mach-kirkwood/board-km_kirkwood.c | 13 -
+ arch/arm/mach-kirkwood/board-lsxl.c | 83 -
+ arch/arm/mach-kirkwood/board-mplcec4.c | 44 +
+ arch/arm/mach-kirkwood/board-ns2.c | 86 +
+ arch/arm/mach-kirkwood/board-nsa310.c | 101 +
+ arch/arm/mach-kirkwood/board-openblocks_a6.c | 70 +
+ arch/arm/mach-kirkwood/board-ts219.c | 29 -
+ arch/arm/mach-kirkwood/board-usi_topkick.c | 81 +
+ arch/arm/mach-kirkwood/common.c | 12 +-
+ arch/arm/mach-kirkwood/common.h | 37 +-
+ arch/arm/mach-kirkwood/cpuidle.c | 2 +-
+ arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
+ arch/arm/mach-kirkwood/irq.c | 1 +
+ arch/arm/mach-kirkwood/lacie_v2-common.c | 1 +
+ arch/arm/mach-kirkwood/mpp.c | 4 +-
+ arch/arm/mach-kirkwood/netspace_v2-setup.c | 4 +-
+ arch/arm/mach-kirkwood/openrd-setup.c | 14 +-
+ arch/arm/mach-kirkwood/pcie.c | 42 +-
+ arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +-
+ arch/arm/mach-kirkwood/t5325-setup.c | 6 +-
+ arch/arm/mach-kirkwood/ts41x-setup.c | 3 +-
+ arch/arm/mach-kirkwood/tsx1x-common.c | 7 +-
+ arch/arm/mach-lpc32xx/clock.c | 8 +
+ arch/arm/mach-lpc32xx/include/mach/platform.h | 1 +
+ arch/arm/mach-lpc32xx/irq.c | 23 +-
+ arch/arm/mach-mmp/Kconfig | 4 +
+ arch/arm/mach-mxs/mach-mxs.c | 56 +
+ arch/arm/mach-mxs/timer.c | 10 +-
+ arch/arm/mach-nomadik/Kconfig | 2 +-
+ arch/arm/mach-nomadik/board-nhk8815.c | 7 +-
+ arch/arm/mach-nomadik/include/mach/irqs.h | 2 +-
+ arch/arm/mach-omap1/Makefile | 3 +-
+ arch/arm/mach-omap1/board-ams-delta.c | 1 -
+ arch/arm/mach-omap1/board-fsample.c | 12 +-
+ arch/arm/mach-omap1/board-generic.c | 1 -
+ arch/arm/mach-omap1/board-h2-mmc.c | 5 +-
+ arch/arm/mach-omap1/board-h2.c | 9 +-
+ arch/arm/mach-omap1/board-h3-mmc.c | 3 +-
+ arch/arm/mach-omap1/board-h3.c | 8 +-
+ arch/arm/mach-omap1/board-htcherald.c | 3 +-
+ arch/arm/mach-omap1/board-innovator.c | 30 +-
+ arch/arm/mach-omap1/board-nokia770.c | 5 +-
+ arch/arm/mach-omap1/board-osk.c | 3 +-
+ arch/arm/mach-omap1/board-palmte.c | 6 +-
+ arch/arm/mach-omap1/board-palmtt.c | 8 +-
+ arch/arm/mach-omap1/board-palmz71.c | 6 +-
+ arch/arm/mach-omap1/board-perseus2.c | 12 +-
+ arch/arm/mach-omap1/board-sx1-mmc.c | 3 +-
+ arch/arm/mach-omap1/board-sx1.c | 6 +-
+ arch/arm/mach-omap1/board-voiceblue.c | 3 +-
+ arch/arm/mach-omap1/clock.c | 507 ++-
+ arch/arm/mach-omap1/clock.h | 178 +-
+ arch/arm/mach-omap1/clock_data.c | 16 +-
+ arch/arm/mach-omap1/common.h | 7 +-
+ arch/arm/mach-omap1/devices.c | 35 +-
+ arch/arm/mach-omap1/dma.c | 9 +-
+ arch/arm/mach-omap1/dma.h | 83 +
+ arch/arm/mach-omap1/flash.c | 2 +-
+ arch/arm/mach-omap1/fpga.c | 4 +-
+ arch/arm/mach-omap1/fpga.h | 52 +
+ arch/arm/mach-omap1/gpio15xx.c | 2 +
+ arch/arm/mach-omap1/gpio16xx.c | 2 +
+ arch/arm/mach-omap1/gpio7xx.c | 2 +
+ arch/arm/mach-omap1/i2c.c | 64 +-
+ arch/arm/mach-omap1/id.c | 2 +-
+ arch/arm/mach-omap1/include/mach/debug-macro.S | 2 +-
+ arch/arm/mach-omap1/include/mach/entry-macro.S | 2 -
+ arch/arm/mach-omap1/include/mach/gpio.h | 3 -
+ arch/arm/mach-omap1/include/mach/hardware.h | 9 +-
+ arch/arm/mach-omap1/include/mach/memory.h | 2 +-
+ arch/arm/mach-omap1/include/mach/omap1510.h | 113 +
+ arch/arm/mach-omap1/include/mach/serial.h | 53 +
+ arch/arm/mach-omap1/include/mach/soc.h | 229 ++
+ .../include/plat => mach-omap1/include/mach}/tc.h | 0
+ arch/arm/mach-omap1/include/mach/uncompress.h | 121 +-
+ arch/arm/mach-omap1/io.c | 5 +-
+ arch/arm/mach-omap1/iomap.h | 3 -
+ arch/arm/mach-omap1/irq.c | 2 +-
+ arch/arm/mach-omap1/lcd_dma.c | 4 +-
+ arch/arm/mach-omap1/mcbsp.c | 5 +-
+ arch/arm/mach-omap1/mmc.h | 18 +
+ arch/arm/mach-omap1/opp_data.c | 2 +-
+ arch/arm/mach-omap1/pm.c | 10 +-
+ arch/arm/mach-omap1/pm_bus.c | 3 +-
+ arch/arm/mach-omap1/reset.c | 41 +-
+ arch/arm/mach-omap1/serial.c | 1 -
+ arch/arm/mach-omap1/sleep.S | 2 +
+ arch/arm/mach-omap1/soc.h | 4 +
+ arch/arm/mach-omap1/sram-init.c | 76 +
+ arch/arm/mach-omap1/sram.h | 7 +
+ arch/arm/mach-omap1/timer32k.c | 1 +
+ arch/arm/mach-omap1/usb.c | 6 +-
+ arch/arm/mach-omap2/Kconfig | 9 +-
+ arch/arm/mach-omap2/Makefile | 130 +-
+ arch/arm/mach-omap2/am33xx.h | 1 +
+ arch/arm/mach-omap2/am35xx-emac.c | 2 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 6 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 8 +-
+ arch/arm/mach-omap2/board-3630sdp.c | 5 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 163 +-
+ arch/arm/mach-omap2/board-am3517crane.c | 3 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 4 +-
+ arch/arm/mach-omap2/board-apollon.c | 6 +-
+ arch/arm/mach-omap2/board-cm-t35.c | 28 +-
+ arch/arm/mach-omap2/board-cm-t3517.c | 8 +-
+ arch/arm/mach-omap2/board-devkit8000.c | 13 +-
+ arch/arm/mach-omap2/board-flash.c | 52 +-
+ arch/arm/mach-omap2/board-flash.h | 8 +-
+ arch/arm/mach-omap2/board-generic.c | 37 +-
+ arch/arm/mach-omap2/board-h4.c | 10 +-
+ arch/arm/mach-omap2/board-igep0020.c | 13 +-
+ arch/arm/mach-omap2/board-ldp.c | 11 +-
+ arch/arm/mach-omap2/board-n8x0.c | 11 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 18 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 13 +-
+ arch/arm/mach-omap2/board-omap3logic.c | 11 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 6 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 5 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c | 13 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 75 +-
+ arch/arm/mach-omap2/board-overo.c | 13 +-
+ arch/arm/mach-omap2/board-rm680.c | 15 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 7 +-
+ arch/arm/mach-omap2/board-rx51.c | 12 +-
+ arch/arm/mach-omap2/board-ti8168evm.c | 7 +-
+ arch/arm/mach-omap2/board-zoom-debugboard.c | 4 +-
+ arch/arm/mach-omap2/board-zoom-display.c | 3 +-
+ arch/arm/mach-omap2/board-zoom-peripherals.c | 3 +-
+ arch/arm/mach-omap2/board-zoom.c | 12 +-
+ .../arm/mach-omap2/{include/mach => }/board-zoom.h | 0
+ arch/arm/mach-omap2/cclock2420_data.c | 1950 +++++++++++
+ arch/arm/mach-omap2/cclock2430_data.c | 2065 +++++++++++
+ arch/arm/mach-omap2/cclock33xx_data.c | 961 ++++++
+ arch/arm/mach-omap2/cclock3xxx_data.c | 3595 +++++++++++++++++++
+ arch/arm/mach-omap2/cclock44xx_data.c | 1987 +++++++++++
+ arch/arm/mach-omap2/clkt2xxx_apll.c | 92 +-
+ arch/arm/mach-omap2/clkt2xxx_dpll.c | 12 +-
+ arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 49 +-
+ arch/arm/mach-omap2/clkt2xxx_osc.c | 15 +-
+ arch/arm/mach-omap2/clkt2xxx_sys.c | 9 +-
+ arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 85 +-
+ arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 13 +-
+ arch/arm/mach-omap2/clkt_clksel.c | 196 +-
+ arch/arm/mach-omap2/clkt_dpll.c | 30 +-
+ arch/arm/mach-omap2/clkt_iclk.c | 32 +-
+ arch/arm/mach-omap2/clock.c | 470 ++-
+ arch/arm/mach-omap2/clock.h | 452 ++-
+ arch/arm/mach-omap2/clock2420_data.c | 1990 -----------
+ arch/arm/mach-omap2/clock2430.c | 12 +-
+ arch/arm/mach-omap2/clock2430_data.c | 2089 -----------
+ arch/arm/mach-omap2/clock2xxx.c | 19 +-
+ arch/arm/mach-omap2/clock2xxx.h | 48 +-
+ arch/arm/mach-omap2/clock33xx_data.c | 1112 ------
+ arch/arm/mach-omap2/clock34xx.c | 55 +-
+ arch/arm/mach-omap2/clock3517.c | 28 +-
+ arch/arm/mach-omap2/clock36xx.c | 24 +-
+ arch/arm/mach-omap2/clock36xx.h | 2 +-
+ arch/arm/mach-omap2/clock3xxx.c | 8 +-
+ arch/arm/mach-omap2/clock3xxx.h | 6 +-
+ arch/arm/mach-omap2/clock3xxx_data.c | 3617 --------------------
+ arch/arm/mach-omap2/clock44xx_data.c | 3402 ------------------
+ arch/arm/mach-omap2/clock_common_data.c | 22 +-
+ arch/arm/mach-omap2/clockdomain.c | 92 +-
+ arch/arm/mach-omap2/clockdomain.h | 5 +-
+ arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 339 --
+ arch/arm/mach-omap2/clockdomain33xx.c | 74 -
+ arch/arm/mach-omap2/clockdomain44xx.c | 151 -
+ arch/arm/mach-omap2/clockdomains2420_data.c | 1 +
+ arch/arm/mach-omap2/clockdomains2430_data.c | 1 +
+ arch/arm/mach-omap2/clockdomains3xxx_data.c | 1 +
+ arch/arm/mach-omap2/cm-regbits-24xx.h | 7 +
+ arch/arm/mach-omap2/cm-regbits-34xx.h | 31 +
+ arch/arm/mach-omap2/cm.h | 30 +-
+ arch/arm/mach-omap2/cm2xxx.c | 381 +++
+ arch/arm/mach-omap2/cm2xxx.h | 70 +
+ arch/arm/mach-omap2/cm2xxx_3xxx.h | 126 +-
+ arch/arm/mach-omap2/cm33xx.c | 58 +-
+ arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} | 371 +-
+ arch/arm/mach-omap2/cm3xxx.h | 91 +
+ arch/arm/mach-omap2/cm_common.c | 140 +
+ arch/arm/mach-omap2/cminst44xx.c | 142 +-
+ arch/arm/mach-omap2/cminst44xx.h | 2 +
+ arch/arm/mach-omap2/common-board-devices.c | 46 -
+ arch/arm/mach-omap2/common-board-devices.h | 1 -
+ arch/arm/mach-omap2/common.c | 187 +-
+ arch/arm/mach-omap2/common.h | 150 +-
+ arch/arm/mach-omap2/control.c | 18 +-
+ arch/arm/mach-omap2/control.h | 3 +
+ arch/arm/mach-omap2/cpuidle34xx.c | 1 -
+ arch/arm/mach-omap2/devices.c | 34 +-
+ arch/arm/mach-omap2/display.c | 9 +-
+ arch/arm/mach-omap2/dma.c | 11 +-
+ arch/arm/mach-omap2/dma.h | 131 +
+ arch/arm/mach-omap2/dpll3xxx.c | 185 +-
+ arch/arm/mach-omap2/dpll44xx.c | 23 +-
+ arch/arm/mach-omap2/drm.c | 4 +-
+ arch/arm/mach-omap2/dsp.c | 2 +-
+ arch/arm/mach-omap2/dss-common.c | 276 ++
+ arch/arm/mach-omap2/dss-common.h | 14 +
+ arch/arm/mach-omap2/gpio.c | 6 +-
+ arch/arm/mach-omap2/gpmc-nand.c | 85 +-
+ arch/arm/mach-omap2/gpmc-nand.h | 27 +
+ arch/arm/mach-omap2/gpmc-onenand.c | 343 +-
+ arch/arm/mach-omap2/gpmc-onenand.h | 24 +
+ arch/arm/mach-omap2/gpmc-smc91x.c | 45 +-
+ arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +-
+ arch/arm/mach-omap2/gpmc.c | 837 +++--
+ .../{plat-omap/include/plat => mach-omap2}/gpmc.h | 168 +-
+ arch/arm/mach-omap2/hdq1w.c | 8 +-
+ arch/arm/mach-omap2/hdq1w.h | 2 +-
+ arch/arm/mach-omap2/hsmmc.c | 8 +-
+ arch/arm/mach-omap2/hwspinlock.c | 4 +-
+ arch/arm/mach-omap2/i2c.c | 73 +-
+ arch/arm/mach-omap2/i2c.h | 42 +
+ arch/arm/mach-omap2/id.c | 32 +-
+ arch/arm/mach-omap2/include/mach/debug-macro.S | 2 +-
+ arch/arm/mach-omap2/include/mach/gpio.h | 3 -
+ .../plat => mach-omap2/include/mach}/serial.h | 20 -
+ arch/arm/mach-omap2/include/mach/uncompress.h | 175 +-
+ arch/arm/mach-omap2/io.c | 119 +-
+ arch/arm/mach-omap2/mcbsp.c | 9 +-
+ arch/arm/mach-omap2/mmc.h | 23 +
+ arch/arm/mach-omap2/msdi.c | 11 +-
+ arch/arm/mach-omap2/mux.c | 3 +-
+ arch/arm/mach-omap2/omap-headsmp.S | 38 +
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 10 +-
+ arch/arm/{plat-omap => mach-omap2}/omap-pm-noop.c | 5 +-
+ .../include/plat => mach-omap2}/omap-pm.h | 0
+ arch/arm/mach-omap2/omap-secure.c | 1 -
+ arch/arm/mach-omap2/omap-secure.h | 7 +
+ arch/arm/mach-omap2/omap-smp.c | 41 +-
+ arch/arm/mach-omap2/omap2-restart.c | 65 +
+ arch/arm/mach-omap2/omap3-restart.c | 36 +
+ arch/arm/mach-omap2/omap4-common.c | 69 +-
+ arch/arm/{plat-omap => mach-omap2}/omap_device.c | 5 +-
+ .../include/plat => mach-omap2}/omap_device.h | 2 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 126 +-
+ .../include/plat => mach-omap2}/omap_hwmod.h | 1 -
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 13 +-
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 12 +-
+ .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 3 +-
+ .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 9 +-
+ .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 4 +-
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 21 +-
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 10 +-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 55 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 16 +-
+ arch/arm/mach-omap2/omap_hwmod_common_data.c | 2 +-
+ arch/arm/mach-omap2/omap_hwmod_common_data.h | 2 +-
+ arch/arm/mach-omap2/omap_opp_data.h | 11 +-
+ arch/arm/mach-omap2/omap_phy_internal.c | 36 +-
+ arch/arm/mach-omap2/omap_twl.c | 74 +-
+ arch/arm/mach-omap2/opp.c | 2 +-
+ arch/arm/mach-omap2/opp3xxx_data.c | 1 +
+ arch/arm/mach-omap2/opp4xxx_data.c | 98 +-
+ arch/arm/mach-omap2/pm-debug.c | 5 +-
+ arch/arm/mach-omap2/pm.c | 37 +-
+ arch/arm/mach-omap2/pm.h | 19 +
+ arch/arm/mach-omap2/pm24xx.c | 17 +-
+ arch/arm/mach-omap2/pm34xx.c | 15 +-
+ arch/arm/mach-omap2/pm44xx.c | 8 +-
+ arch/arm/mach-omap2/pmu.c | 5 +-
+ arch/arm/mach-omap2/powerdomain.c | 2 -
+ arch/arm/mach-omap2/powerdomain.h | 2 -
+ arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 242 --
+ arch/arm/mach-omap2/powerdomain33xx.c | 229 --
+ arch/arm/mach-omap2/powerdomain44xx.c | 285 --
+ arch/arm/mach-omap2/powerdomains2xxx_data.c | 1 +
+ arch/arm/mach-omap2/prcm-common.h | 22 -
+ arch/arm/mach-omap2/prcm.c | 188 -
+ arch/arm/mach-omap2/prcm_mpu44xx.c | 17 +
+ arch/arm/mach-omap2/prcm_mpu44xx.h | 9 +-
+ arch/arm/mach-omap2/prm-regbits-24xx.h | 8 +-
+ arch/arm/mach-omap2/prm-regbits-34xx.h | 13 +-
+ arch/arm/mach-omap2/prm.h | 77 +-
+ arch/arm/mach-omap2/prm2xxx.c | 139 +
+ arch/arm/mach-omap2/prm2xxx.h | 134 +
+ arch/arm/mach-omap2/prm2xxx_3xxx.c | 332 +-
+ arch/arm/mach-omap2/prm2xxx_3xxx.h | 285 +-
+ arch/arm/mach-omap2/prm33xx.c | 204 +-
+ arch/arm/mach-omap2/prm3xxx.c | 417 +++
+ arch/arm/mach-omap2/prm3xxx.h | 162 +
+ arch/arm/mach-omap2/prm44xx.c | 356 +-
+ arch/arm/mach-omap2/prm44xx.h | 2 +
+ arch/arm/mach-omap2/prm_common.c | 118 +-
+ arch/arm/mach-omap2/prminst44xx.h | 2 +
+ arch/arm/mach-omap2/scrm44xx.h | 2 +
+ arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h | 2 +-
+ arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 2 +-
+ arch/arm/mach-omap2/sdram-nokia.c | 4 +-
+ arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h | 2 +-
+ .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 2 +-
+ arch/arm/mach-omap2/sdrc.c | 13 +-
+ arch/arm/mach-omap2/sdrc.h | 148 +-
+ arch/arm/mach-omap2/sdrc2xxx.c | 7 +-
+ arch/arm/mach-omap2/serial.c | 13 +-
+ arch/arm/mach-omap2/serial.h | 1 +
+ arch/arm/mach-omap2/sleep34xx.S | 7 +-
+ arch/arm/mach-omap2/soc.h | 464 ++-
+ arch/arm/mach-omap2/sr_device.c | 17 +-
+ arch/arm/mach-omap2/sram.c | 305 ++
+ arch/arm/mach-omap2/sram.h | 83 +
+ arch/arm/mach-omap2/sram242x.S | 4 +-
+ arch/arm/mach-omap2/sram243x.S | 4 +-
+ arch/arm/mach-omap2/sram34xx.S | 2 +-
+ arch/arm/mach-omap2/ti81xx.h | 9 +
+ arch/arm/mach-omap2/timer.c | 272 +-
+ arch/arm/mach-omap2/twl-common.c | 3 -
+ arch/arm/mach-omap2/usb-host.c | 6 +-
+ arch/arm/mach-omap2/usb-musb.c | 8 +-
+ arch/arm/mach-omap2/usb-tusb6010.c | 184 +-
+ arch/arm/mach-omap2/usb.h | 82 +
+ arch/arm/mach-omap2/vc.c | 453 ++-
+ arch/arm/mach-omap2/vc.h | 8 +-
+ arch/arm/mach-omap2/vc3xxx_data.c | 22 +
+ arch/arm/mach-omap2/vc44xx_data.c | 28 +
+ arch/arm/mach-omap2/voltage.h | 44 +-
+ arch/arm/mach-omap2/voltagedomains3xxx_data.c | 5 +
+ arch/arm/mach-omap2/voltagedomains44xx_data.c | 25 +-
+ arch/arm/mach-omap2/vp.c | 19 +-
+ arch/arm/mach-omap2/vp.h | 7 +
+ arch/arm/mach-omap2/vp3xxx_data.c | 10 +
+ arch/arm/mach-omap2/vp44xx_data.c | 15 +
+ arch/arm/mach-omap2/wd_timer.c | 40 +-
+ arch/arm/mach-omap2/wd_timer.h | 2 +-
+ arch/arm/mach-orion5x/Kconfig | 14 +-
+ arch/arm/mach-orion5x/Makefile | 4 +-
+ arch/arm/mach-orion5x/board-dt.c | 79 +
+ arch/arm/mach-orion5x/common.c | 4 +-
+ arch/arm/mach-orion5x/common.h | 9 +
+ arch/arm/mach-orion5x/edmini_v2-setup.c | 88 +-
+ arch/arm/mach-pxa/Kconfig | 34 -
+ arch/arm/mach-pxa/Makefile | 3 -
+ arch/arm/mach-pxa/clock.h | 2 +-
+ arch/arm/mach-pxa/devices.c | 8 +-
+ arch/arm/mach-pxa/include/mach/hardware.h | 28 -
+ arch/arm/mach-pxa/include/mach/irqs.h | 1 -
+ arch/arm/mach-pxa/include/mach/pxa3xx.h | 1 -
+ arch/arm/mach-pxa/include/mach/pxa95x.h | 7 -
+ arch/arm/mach-pxa/pxa25x.c | 6 +
+ arch/arm/mach-pxa/pxa3xx-ulpi.c | 13 +-
+ arch/arm/mach-pxa/pxa95x.c | 295 --
+ arch/arm/mach-pxa/saarb.c | 115 -
+ arch/arm/mach-pxa/tavorevb3.c | 136 -
+ arch/arm/mach-s3c24xx/Kconfig | 2 +-
+ arch/arm/mach-s3c24xx/clock-s3c2443.c | 6 -
+ arch/arm/mach-s3c64xx/Kconfig | 2 +
+ arch/arm/mach-s3c64xx/clock.c | 20 +-
+ arch/arm/mach-s3c64xx/common.c | 1 -
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 141 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 29 +-
+ arch/arm/mach-s5p64x0/common.c | 2 -
+ arch/arm/mach-s5pv210/common.c | 2 -
+ arch/arm/mach-s5pv210/mach-goni.c | 1 -
+ arch/arm/mach-shmobile/Kconfig | 31 +-
+ arch/arm/mach-shmobile/Makefile | 8 -
+ arch/arm/mach-shmobile/board-ap4evb.c | 139 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 46 +-
+ arch/arm/mach-shmobile/board-g3evm.c | 343 --
+ arch/arm/mach-shmobile/board-g4evm.c | 384 ---
+ arch/arm/mach-shmobile/board-kzm9g.c | 14 +-
+ arch/arm/mach-shmobile/board-mackerel.c | 88 +-
+ arch/arm/mach-shmobile/board-marzen.c | 211 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 34 +
+ arch/arm/mach-shmobile/clock-r8a7779.c | 23 +-
+ arch/arm/mach-shmobile/clock-sh7367.c | 355 --
+ arch/arm/mach-shmobile/clock-sh7372.c | 106 +-
+ arch/arm/mach-shmobile/clock-sh7377.c | 366 --
+ arch/arm/mach-shmobile/include/mach/common.h | 18 -
+ arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 +-
+ arch/arm/mach-shmobile/include/mach/sh7367.h | 332 --
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 8 +-
+ arch/arm/mach-shmobile/include/mach/sh7377.h | 360 --
+ arch/arm/mach-shmobile/intc-sh7367.c | 413 ---
+ arch/arm/mach-shmobile/intc-sh7377.c | 592 ----
+ arch/arm/mach-shmobile/pfc-r8a7779.c | 16 +-
+ arch/arm/mach-shmobile/pfc-sh7367.c | 1727 ----------
+ arch/arm/mach-shmobile/pfc-sh7377.c | 1688 ---------
+ arch/arm/mach-shmobile/setup-r8a7740.c | 24 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 77 +
+ arch/arm/mach-shmobile/setup-sh7367.c | 481 ---
+ arch/arm/mach-shmobile/setup-sh7372.c | 26 +-
+ arch/arm/mach-shmobile/setup-sh7377.c | 549 ---
+ arch/arm/mach-socfpga/Kconfig | 1 +
+ arch/arm/mach-socfpga/Makefile | 1 +
+ .../include/mach/irqs.h => mach-socfpga/core.h} | 22 +-
+ arch/arm/mach-socfpga/headsmp.S | 25 +
+ arch/arm/mach-socfpga/platsmp.c | 116 +
+ arch/arm/mach-socfpga/socfpga.c | 54 +-
+ arch/arm/mach-spear13xx/include/mach/spear.h | 8 -
+ arch/arm/mach-spear13xx/spear1310.c | 16 +-
+ arch/arm/mach-spear13xx/spear13xx.c | 2 -
+ arch/arm/mach-spear3xx/include/mach/irqs.h | 10 +-
+ arch/arm/mach-spear3xx/spear300.c | 103 -
+ arch/arm/mach-spear3xx/spear310.c | 202 --
+ arch/arm/mach-spear3xx/spear320.c | 205 +-
+ arch/arm/mach-spear3xx/spear3xx.c | 4 +
+ arch/arm/mach-sunxi/Kconfig | 9 +
+ arch/arm/mach-sunxi/Makefile | 1 +
+ arch/arm/mach-sunxi/Makefile.boot | 1 +
+ arch/arm/mach-sunxi/sunxi.c | 95 +
+ arch/arm/mach-sunxi/sunxi.h | 20 +
+ arch/arm/mach-tegra/Kconfig | 51 -
+ arch/arm/mach-tegra/Makefile | 13 +-
+ arch/arm/mach-tegra/apbio.c | 5 +-
+ arch/arm/mach-tegra/board-dt-tegra20.c | 27 +-
+ arch/arm/mach-tegra/board-dt-tegra30.c | 28 +-
+ arch/arm/mach-tegra/clock.c | 2 -
+ arch/arm/mach-tegra/common.c | 33 +-
+ arch/arm/mach-tegra/cpu-tegra.c | 3 -
+ arch/arm/mach-tegra/cpuidle-tegra20.c | 66 +
+ arch/arm/mach-tegra/cpuidle-tegra30.c | 188 +
+ arch/arm/mach-tegra/cpuidle.c | 85 +-
+ arch/arm/mach-tegra/cpuidle.h | 32 +
+ arch/arm/mach-tegra/flowctrl.c | 50 +-
+ arch/arm/mach-tegra/flowctrl.h | 8 +
+ arch/arm/mach-tegra/fuse.c | 52 +-
+ arch/arm/mach-tegra/fuse.h | 16 +
+ arch/arm/mach-tegra/headsmp.S | 74 +-
+ arch/arm/mach-tegra/include/mach/debug-macro.S | 100 -
+ arch/arm/mach-tegra/include/mach/dma.h | 54 -
+ arch/arm/mach-tegra/include/mach/irqs.h | 182 -
+ arch/arm/mach-tegra/include/mach/powergate.h | 2 +
+ arch/arm/mach-tegra/include/mach/uncompress.h | 67 +-
+ arch/arm/mach-tegra/io.c | 3 +-
+ arch/arm/mach-tegra/{include/mach => }/iomap.h | 16 -
+ arch/arm/mach-tegra/{include/mach => }/irammap.h | 9 -
+ arch/arm/mach-tegra/irq.c | 3 +-
+ arch/arm/mach-tegra/pcie.c | 5 +-
+ arch/arm/mach-tegra/platsmp.c | 3 +-
+ arch/arm/mach-tegra/pm.c | 216 ++
+ arch/arm/mach-tegra/pm.h | 35 +
+ arch/arm/mach-tegra/pmc.c | 2 +-
+ arch/arm/mach-tegra/powergate.c | 2 +-
+ arch/arm/mach-tegra/reset.c | 11 +-
+ arch/arm/mach-tegra/reset.h | 9 +
+ .../mach-tegra/{sleep-t20.S => sleep-tegra20.S} | 2 -
+ .../mach-tegra/{sleep-t30.S => sleep-tegra30.S} | 68 +-
+ arch/arm/mach-tegra/sleep.S | 80 +-
+ arch/arm/mach-tegra/sleep.h | 39 +-
+ arch/arm/mach-tegra/tegra20_clocks.c | 3 +-
+ arch/arm/mach-tegra/tegra20_clocks_data.c | 13 +-
+ arch/arm/mach-tegra/tegra20_speedo.c | 109 +
+ arch/arm/mach-tegra/tegra2_emc.c | 2 -
+ arch/arm/mach-tegra/tegra30_clocks.c | 215 +-
+ arch/arm/mach-tegra/tegra30_clocks.h | 1 +
+ arch/arm/mach-tegra/tegra30_clocks_data.c | 51 +-
+ arch/arm/mach-tegra/tegra30_speedo.c | 292 ++
+ arch/arm/mach-tegra/tegra_cpu_car.h | 37 +
+ arch/arm/mach-tegra/timer.c | 78 +-
+ arch/arm/mach-u300/core.c | 2 -
+ arch/arm/mach-ux500/Kconfig | 2 +-
+ arch/arm/mach-ux500/board-mop500-audio.c | 19 +-
+ arch/arm/mach-ux500/board-mop500-pins.c | 425 ++-
+ arch/arm/mach-ux500/board-mop500-sdi.c | 2 +-
+ arch/arm/mach-ux500/board-mop500.c | 156 +-
+ arch/arm/mach-ux500/board-mop500.h | 10 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 116 +-
+ arch/arm/mach-ux500/cpu.c | 3 +
+ arch/arm/mach-ux500/devices-common.c | 1 +
+ arch/arm/mach-ux500/devices-db8500.c | 4 +-
+ arch/arm/mach-ux500/devices-db8500.h | 1 +
+ arch/arm/mach-ux500/include/mach/irqs.h | 2 +-
+ arch/arm/mach-ux500/include/mach/msp.h | 2 +-
+ arch/arm/mach-ux500/timer.c | 5 +-
+ arch/arm/mach-ux500/usb.c | 4 +-
+ arch/arm/mach-versatile/core.c | 2 +-
+ arch/arm/mach-vexpress/Kconfig | 4 +-
+ arch/arm/mach-vexpress/Makefile | 2 +-
+ arch/arm/mach-vexpress/ct-ca9x4.c | 41 +-
+ arch/arm/mach-vexpress/include/mach/motherboard.h | 81 -
+ arch/arm/mach-vexpress/platsmp.c | 3 +-
+ arch/arm/mach-vexpress/reset.c | 141 +
+ arch/arm/mach-vexpress/v2m.c | 349 +-
+ arch/arm/mach-vt8500/Kconfig | 12 +
+ arch/arm/mach-vt8500/common.h | 3 +
+ arch/arm/mach-vt8500/include/mach/entry-macro.S | 26 -
+ arch/arm/mach-vt8500/include/mach/hardware.h | 12 -
+ arch/arm/mach-vt8500/include/mach/i8042.h | 18 -
+ arch/arm/mach-vt8500/include/mach/restart.h | 17 -
+ arch/arm/mach-vt8500/irq.c | 108 +-
+ arch/arm/mach-vt8500/timer.c | 2 +-
+ arch/arm/mach-vt8500/vt8500.c | 3 +-
+ arch/arm/mach-zynq/include/mach/hardware.h | 18 -
+ arch/arm/mach-zynq/include/mach/irqs.h | 21 -
+ arch/arm/mach-zynq/include/mach/timex.h | 23 -
+ arch/arm/plat-mxc/Kconfig | 89 -
+ arch/arm/plat-mxc/Makefile | 24 -
+ arch/arm/plat-mxc/devices/platform-mx2-emma.c | 40 +
+ arch/arm/plat-mxc/include/mach/debug-macro.S | 51 -
+ arch/arm/plat-mxc/include/mach/irqs.h | 21 -
+ arch/arm/plat-mxc/include/mach/uncompress.h | 132 -
+ arch/arm/plat-nomadik/Kconfig | 29 -
+ arch/arm/plat-nomadik/Makefile | 5 -
+ arch/arm/plat-omap/Makefile | 4 +-
+ arch/arm/plat-omap/clock.c | 544 ---
+ arch/arm/plat-omap/common.c | 46 -
+ arch/arm/plat-omap/counter_32k.c | 3 -
+ arch/arm/plat-omap/debug-devices.c | 3 +-
+ arch/arm/plat-omap/debug-leds.c | 25 +-
+ arch/arm/plat-omap/dma.c | 132 +-
+ arch/arm/plat-omap/dmtimer.c | 190 +-
+ arch/arm/plat-omap/fb.c | 1 -
+ arch/arm/plat-omap/i2c.c | 174 +-
+ .../include/{plat/dma.h => plat-omap/dma-omap.h} | 201 +-
+ arch/arm/plat-omap/include/plat/clkdev_omap.h | 51 -
+ arch/arm/plat-omap/include/plat/clock.h | 309 --
+ arch/arm/plat-omap/include/plat/common.h | 42 -
+ arch/arm/plat-omap/include/plat/counter-32k.h | 1 +
+ arch/arm/plat-omap/include/plat/cpu.h | 468 +--
+ .../include/plat}/debug-devices.h | 7 -
+ arch/arm/plat-omap/include/plat/dma-44xx.h | 147 -
+ arch/arm/plat-omap/include/plat/dmtimer.h | 75 +-
+ arch/arm/plat-omap/include/plat/fpga.h | 193 --
+ arch/arm/plat-omap/include/plat/i2c.h | 30 +-
+ arch/arm/plat-omap/include/plat/multi.h | 120 -
+ arch/arm/plat-omap/include/plat/omap-secure.h | 14 -
+ arch/arm/plat-omap/include/plat/prcm.h | 37 -
+ arch/arm/plat-omap/include/plat/sdrc.h | 157 -
+ arch/arm/plat-omap/include/plat/sram.h | 97 +-
+ arch/arm/plat-omap/include/plat/uncompress.h | 204 --
+ arch/arm/plat-omap/include/plat/usb.h | 179 -
+ arch/arm/plat-omap/sram.c | 366 +-
+ arch/arm/plat-omap/sram.h | 6 -
+ arch/arm/plat-orion/irq.c | 6 +-
+ arch/arm/plat-pxa/Makefile | 1 -
+ arch/arm/plat-pxa/include/plat/mfp.h | 4 +-
+ arch/arm/plat-samsung/adc.c | 48 +-
+ arch/arm/plat-samsung/clock.c | 75 +-
+ arch/arm/plat-samsung/devs.c | 5 +-
+ arch/arm/plat-samsung/include/plat/cpu.h | 8 +
+ arch/arm/plat-samsung/include/plat/devs.h | 2 -
+ arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +
+ arch/arm/plat-samsung/include/plat/mfc.h | 11 +
+ arch/arm/plat-samsung/s5p-dev-mfc.c | 34 +
+ arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +-
+ arch/arm/plat-spear/Makefile | 2 +-
+ arch/arm/plat-spear/shirq.c | 118 -
+ arch/arm/plat-versatile/Kconfig | 11 +-
+ arch/arm/plat-versatile/Makefile | 1 -
+ arch/avr32/mach-at32ap/include/mach/board.h | 8 -
+ drivers/amba/tegra-ahb.c | 1 +
+ drivers/ata/pata_at91.c | 2 +-
+ drivers/char/hw_random/Kconfig | 8 +-
+ drivers/char/hw_random/ixp4xx-rng.c | 5 +-
+ drivers/char/hw_random/omap-rng.c | 2 -
+ drivers/clk/Kconfig | 16 +-
+ drivers/clk/Makefile | 2 +
+ drivers/clk/clk-bcm2835.c | 2 +-
+ drivers/clk/clk-fixed-rate.c | 2 +-
+ drivers/clk/clk-prima2.c | 84 +-
+ drivers/clk/clk-sunxi.c | 30 +
+ drivers/clk/clk-twl6040.c | 126 +
+ drivers/clk/clk.c | 20 +-
+ drivers/clk/spear/clk-vco-pll.c | 2 +-
+ drivers/clk/spear/spear1310_clock.c | 1 +
+ drivers/clk/ux500/clk-prcmu.c | 55 +
+ drivers/clk/ux500/clk.h | 6 +
+ drivers/clk/ux500/u8500_clk.c | 16 +-
+ drivers/clk/versatile/Makefile | 2 +
+ drivers/clk/versatile/clk-vexpress-osc.c | 146 +
+ drivers/clk/versatile/clk-vexpress.c | 142 +
+ drivers/clocksource/Kconfig | 20 +-
+ drivers/clocksource/Makefile | 2 +
+ .../timer.c => drivers/clocksource/nomadik-mtu.c | 19 +-
+ drivers/clocksource/sunxi_timer.c | 170 +
+ drivers/cpuidle/Kconfig | 10 +
+ drivers/cpuidle/Makefile | 2 +
+ drivers/cpuidle/cpuidle-calxeda.c | 161 +
+ drivers/crypto/Kconfig | 2 +-
+ drivers/crypto/ixp4xx_crypto.c | 12 +-
+ drivers/crypto/omap-aes.c | 8 +-
+ drivers/crypto/omap-sham.c | 10 +-
+ drivers/crypto/tegra-aes.c | 2 -
+ drivers/crypto/ux500/cryp/cryp_core.c | 3 +-
+ drivers/dma/imx-dma.c | 137 +-
+ drivers/dma/imx-sdma.c | 1 -
+ drivers/dma/ipu/ipu_idmac.c | 3 +-
+ drivers/dma/ipu/ipu_irq.c | 3 +-
+ drivers/dma/omap-dma.c | 5 +-
+ drivers/dma/ste_dma40.c | 3 +-
+ drivers/dma/ste_dma40_ll.c | 2 +-
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-pxa.c | 2 +-
+ drivers/gpio/gpio-samsung.c | 68 +-
+ drivers/hwmon/Kconfig | 8 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/vexpress.c | 229 ++
+ drivers/i2c/busses/i2c-imx.c | 40 +-
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
+ drivers/iommu/tegra-smmu.c | 4 +-
+ drivers/irqchip/Kconfig | 9 +-
+ drivers/irqchip/Makefile | 5 +-
+ drivers/irqchip/irq-sunxi.c | 150 +
+ .../irqchip/irq-versatile-fpga.c | 54 +-
+ drivers/irqchip/spear-shirq.c | 316 ++
+ drivers/leds/Kconfig | 4 +-
+ drivers/leds/leds-ns2.c | 78 +-
+ drivers/media/platform/omap/omap_vout.c | 2 +-
+ drivers/media/platform/omap/omap_vout_vrfb.c | 4 +-
+ drivers/media/platform/omap3isp/isphist.c | 2 +
+ drivers/media/platform/omap3isp/ispstat.h | 2 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 1 -
+ drivers/media/platform/soc_camera/mx2_camera.c | 134 +-
+ drivers/media/platform/soc_camera/mx3_camera.c | 2 +-
+ drivers/media/platform/soc_camera/omap1_camera.c | 3 +-
+ drivers/media/rc/ir-rx51.c | 1 -
+ drivers/mfd/Kconfig | 6 +
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/ab8500-core.c | 13 +-
+ drivers/mfd/db8500-prcmu.c | 16 +-
+ drivers/mfd/menelaus.c | 2 +-
+ drivers/mfd/omap-usb-host.c | 5 +-
+ drivers/mfd/omap-usb-tll.c | 2 +-
+ drivers/mfd/omap-usb.h | 2 +
+ drivers/mfd/vexpress-config.c | 277 ++
+ drivers/mfd/vexpress-sysreg.c | 552 +++
+ drivers/mmc/host/atmel-mci.c | 2 +-
+ drivers/mmc/host/mxcmmc.c | 31 +-
+ drivers/mmc/host/omap.c | 35 +-
+ drivers/mmc/host/omap_hsmmc.c | 4 +-
+ drivers/mtd/maps/Kconfig | 7 -
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/cdb89712.c | 278 --
+ drivers/mtd/nand/Kconfig | 15 +-
+ drivers/mtd/nand/Makefile | 2 -
+ drivers/mtd/nand/autcpu12.c | 237 --
+ drivers/mtd/nand/mxc_nand.c | 96 +-
+ drivers/mtd/nand/omap2.c | 129 +-
+ drivers/mtd/nand/spia.c | 176 -
+ drivers/mtd/onenand/omap2.c | 47 +-
+ drivers/net/can/at91_can.c | 3 +-
+ drivers/net/wan/ixp4xx_hss.c | 2 +-
+ drivers/pcmcia/at91_cf.c | 2 +-
+ drivers/pcmcia/omap_cf.c | 2 +-
+ drivers/pinctrl/Kconfig | 5 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/mvebu/pinctrl-dove.c | 22 +-
+ drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 568 +--
+ drivers/pinctrl/pinctrl-exynos.c | 477 ++-
+ drivers/pinctrl/pinctrl-exynos.h | 170 +-
+ drivers/pinctrl/pinctrl-exynos5440.c | 919 +++++
+ drivers/pinctrl/pinctrl-nomadik.c | 3 +-
+ drivers/pinctrl/pinctrl-samsung.c | 207 +-
+ drivers/pinctrl/pinctrl-samsung.h | 30 +-
+ drivers/power/Kconfig | 2 +
+ drivers/power/Makefile | 1 +
+ drivers/power/avs/smartreflex.c | 54 +-
+ drivers/power/reset/Kconfig | 15 +
+ drivers/power/reset/Makefile | 1 +
+ drivers/power/reset/gpio-poweroff.c | 129 +
+ drivers/rtc/rtc-at91rm9200.c | 2 +-
+ .../at91_rtc.h => drivers/rtc/rtc-at91rm9200.h | 0
+ drivers/rtc/rtc-at91sam9.c | 2 +-
+ drivers/rtc/rtc-mxc.c | 34 +-
+ drivers/sh/clk/cpg.c | 85 +
+ drivers/spi/spi-atmel.c | 2 +-
+ drivers/staging/nvec/nvec.c | 1 -
+ .../tidspbridge/include/dspbridge/host_os.h | 1 -
+ drivers/tty/serial/atmel_serial.c | 3 +-
+ drivers/tty/serial/samsung.c | 3 +-
+ drivers/uio/Kconfig | 1 +
+ drivers/uio/uio_pruss.c | 24 +-
+ drivers/usb/gadget/at91_udc.c | 2 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 2 +-
+ drivers/usb/gadget/omap_udc.c | 4 +-
+ drivers/usb/host/ehci-mxc.c | 1 -
+ drivers/usb/host/ehci-omap.c | 3 +-
+ drivers/usb/host/ehci-orion.c | 38 +-
+ drivers/usb/host/ohci-at91.c | 2 +-
+ drivers/usb/host/ohci-omap.c | 5 +-
+ drivers/usb/host/ohci-omap3.c | 1 -
+ drivers/usb/musb/am35x.c | 3 +-
+ drivers/usb/musb/musb_dsps.c | 3 +-
+ drivers/usb/musb/omap2430.h | 2 +-
+ drivers/usb/musb/tusb6010_omap.c | 9 +-
+ drivers/video/atmel_lcdfb.c | 2 +-
+ drivers/video/clps711xfb.c | 156 +-
+ drivers/video/imxfb.c | 38 +-
+ drivers/video/mx3fb.c | 3 +-
+ drivers/video/omap/lcd_inn1510.c | 7 +-
+ drivers/video/omap/lcdc.c | 2 +-
+ drivers/video/omap/omapfb_main.c | 2 +-
+ drivers/video/omap/sossi.c | 2 +-
+ drivers/watchdog/at91sam9_wdt.c | 11 +
+ drivers/watchdog/imx2_wdt.c | 1 -
+ drivers/watchdog/omap_wdt.c | 26 +-
+ include/linux/clk-provider.h | 16 +-
+ .../mach/timex.h => include/linux/clk/sunxi.h | 14 +-
+ .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +-
+ .../shirq.h => include/linux/irqchip/spear-shirq.h | 49 +-
+ include/linux/irqchip/sunxi.h | 27 +
+ .../linux/irqchip/versatile-fpga.h | 0
+ include/linux/mfd/db8500-prcmu.h | 4 +-
+ include/linux/mfd/dbx500-prcmu.h | 10 +
+ .../include/plat => include/linux/mfd}/menelaus.h | 2 -
+ include/linux/platform_data/asoc-imx-ssi.h | 2 +
+ include/linux/platform_data/atmel.h | 73 +
+ .../linux/platform_data/clocksource-nomadik-mtu.h | 2 +-
+ include/linux/platform_data/crypto-ux500.h | 2 +-
+ include/linux/platform_data/dma-imx.h | 4 +-
+ .../linux/platform_data/dma-ste-dma40.h | 0
+ include/linux/platform_data/gpio-omap.h | 1 -
+ .../linux/platform_data/leds-omap.h | 2 -
+ .../linux/platform_data/mmc-omap.h | 48 +-
+ include/linux/platform_data/mtd-nand-omap2.h | 46 +-
+ include/linux/platform_data/mtd-onenand-omap2.h | 28 +-
+ include/linux/platform_data/omap-wd-timer.h | 38 +
+ include/linux/platform_data/uio_pruss.h | 3 +-
+ include/linux/platform_data/usb-omap.h | 80 +
+ include/linux/power/smartreflex.h | 14 +-
+ include/linux/sh_clk.h | 9 +
+ include/linux/sunxi_timer.h | 24 +
+ .../include/mach => include/linux}/tegra-ahb.h | 6 +-
+ include/linux/vexpress.h | 121 +
+ sound/soc/fsl/imx-pcm-fiq.c | 1 -
+ sound/soc/fsl/imx-ssi.c | 1 -
+ sound/soc/omap/am3517evm.c | 2 -
+ sound/soc/omap/n810.c | 1 -
+ sound/soc/omap/omap-pcm.c | 9 +-
+ sound/soc/omap/osk5912.c | 1 -
+ sound/soc/omap/sdp3430.c | 2 -
+ sound/soc/tegra/tegra30_ahub.c | 1 -
+ sound/soc/tegra/tegra_pcm.h | 2 -
+ sound/soc/ux500/ux500_pcm.c | 3 +-
+ 1346 files changed, 49035 insertions(+), 40051 deletions(-)
+ create mode 100644 Documentation/arm/sunxi/README
+ create mode 100644 Documentation/bus-devices/ti-gpmc.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm11351.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/davinci.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/omap/counter.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/omap/timer.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/spear/shirq.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
+ create mode 100644 Documentation/devicetree/bindings/ata/exynos-sata-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/ata/exynos-sata.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx25-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx5-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-poweroff.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/leds-ns2.txt
+ create mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21013.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-ic.txt
+ create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sunxi-timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/ehci-orion.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+ create mode 100644 Documentation/hwmon/vexpress
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
+ create mode 100644 arch/arm/boot/dts/am335x-evmsk.dts
+ create mode 100644 arch/arm/boot/dts/bcm11351-brt.dts
+ create mode 100644 arch/arm/boot/dts/bcm11351.dtsi
+ create mode 100644 arch/arm/boot/dts/ccu9540.dts
+ create mode 100644 arch/arm/boot/dts/cros5250-common.dtsi
+ create mode 100644 arch/arm/boot/dts/da850-enbw-cmc.dts
+ create mode 100644 arch/arm/boot/dts/da850-evm.dts
+ create mode 100644 arch/arm/boot/dts/da850.dtsi
+ create mode 100644 arch/arm/boot/dts/ecx-2000.dts
+ create mode 100644 arch/arm/boot/dts/ecx-common.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4212.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4412-smdk4412.dts
+ create mode 100644 arch/arm/boot/dts/exynos4412.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4x12.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5250-snow.dts
+ create mode 100644 arch/arm/boot/dts/exynos5440-ssdk5440.dts
+ create mode 100644 arch/arm/boot/dts/exynos5440.dtsi
+ create mode 100644 arch/arm/boot/dts/href.dtsi
+ create mode 100644 arch/arm/boot/dts/hrefprev60.dts
+ create mode 100644 arch/arm/boot/dts/imx25-karo-tx25.dts
+ create mode 100644 arch/arm/boot/dts/imx25.dtsi
+ create mode 100644 arch/arm/boot/dts/imx27-apf27.dts
+ create mode 100644 arch/arm/boot/dts/imx28-apf28.dts
+ create mode 100644 arch/arm/boot/dts/imx28-apf28dev.dts
+ create mode 100644 arch/arm/boot/dts/imx28-sps1.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-sabreauto.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-6281.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-6282.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-is2.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-mplcec4.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-ns2.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-ns2lite.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-ns2max.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-ns2mini.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-nsa310.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-topkick.dts
+ create mode 100644 arch/arm/boot/dts/omap3-beagle.dts
+ create mode 100644 arch/arm/boot/dts/omap4-panda-a4.dts
+ rename arch/arm/boot/dts/{omap4-pandaES.dts => omap4-panda-es.dts} (70%)
+ create mode 100644 arch/arm/boot/dts/omap4-sdp-es23plus.dts
+ rename arch/arm/boot/dts/{omap4-var_som.dts => omap4-var-som.dts} (100%)
+ create mode 100644 arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+ create mode 100644 arch/arm/boot/dts/orion5x.dtsi
+ create mode 100644 arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
+ rename arch/arm/boot/dts/{sh7377.dtsi => sh7372-mackerel.dts} (59%)
+ create mode 100644 arch/arm/boot/dts/spear320-hmi.dts
+ create mode 100644 arch/arm/boot/dts/stuib.dtsi
+ create mode 100644 arch/arm/boot/dts/sun4i-cubieboard.dts
+ create mode 100644 arch/arm/boot/dts/sun4i.dtsi
+ create mode 100644 arch/arm/boot/dts/sun5i-olinuxino.dts
+ create mode 100644 arch/arm/boot/dts/sun5i.dtsi
+ create mode 100644 arch/arm/boot/dts/sunxi.dtsi
+ create mode 100644 arch/arm/boot/dts/u9540.dts
+ delete mode 100644 arch/arm/configs/afeb9260_defconfig
+ create mode 100644 arch/arm/configs/bcm_defconfig
+ delete mode 100644 arch/arm/configs/cam60_defconfig
+ create mode 100644 arch/arm/configs/clps711x_defconfig
+ delete mode 100644 arch/arm/configs/cpu9260_defconfig
+ delete mode 100644 arch/arm/configs/cpu9g20_defconfig
+ delete mode 100644 arch/arm/configs/edb7211_defconfig
+ delete mode 100644 arch/arm/configs/fortunet_defconfig
+ delete mode 100644 arch/arm/configs/g3evm_defconfig
+ delete mode 100644 arch/arm/configs/g4evm_defconfig
+ delete mode 100644 arch/arm/configs/qil-a9260_defconfig
+ delete mode 100644 arch/arm/configs/sam9_l9260_defconfig
+ delete mode 100644 arch/arm/configs/stamp9g20_defconfig
+ delete mode 100644 arch/arm/configs/usb-a9260_defconfig
+ create mode 100644 arch/arm/include/debug/imx.S
+ create mode 100644 arch/arm/include/debug/sunxi.S
+ create mode 100644 arch/arm/include/debug/tegra.S
+ rename arch/arm/mach-at91/{include/mach => }/at91_aic.h (100%)
+ rename arch/arm/mach-at91/{include/mach => }/at91_rstc.h (100%)
+ rename arch/arm/mach-at91/{include/mach => }/at91_shdwc.h (100%)
+ rename arch/arm/mach-at91/{include/mach => }/at91_tc.h (100%)
+ rename arch/arm/mach-at91/{include/mach => }/board.h (69%)
+ rename arch/arm/mach-at91/{include/mach => }/gsia18s.h (100%)
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91_pit.h
+ rename arch/arm/mach-at91/{include/mach => }/stamp9g20.h (100%)
+ create mode 100644 arch/arm/mach-bcm/Kconfig
+ create mode 100644 arch/arm/mach-bcm/Makefile
+ create mode 100644 arch/arm/mach-bcm/board_bcm.c
+ create mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-clps711x/autcpu12.c
+ create mode 100644 arch/arm/mach-clps711x/board-autcpu12.c
+ create mode 100644 arch/arm/mach-clps711x/board-cdb89712.c
+ rename arch/arm/mach-clps711x/{clep7312.c => board-clep7312.c} (95%)
+ create mode 100644 arch/arm/mach-clps711x/board-edb7211.c
+ rename arch/arm/mach-clps711x/{fortunet.c => board-fortunet.c} (96%)
+ create mode 100644 arch/arm/mach-clps711x/board-p720t.c
+ delete mode 100644 arch/arm/mach-clps711x/cdb89712.c
+ delete mode 100644 arch/arm/mach-clps711x/edb7211-arch.c
+ delete mode 100644 arch/arm/mach-clps711x/edb7211-mm.c
+ delete mode 100644 arch/arm/mach-clps711x/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-clps711x/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-clps711x/p720t.c
+ create mode 100644 arch/arm/mach-davinci/da8xx-dt.c
+ delete mode 100644 arch/arm/mach-exynos/dev-drm.c
+ delete mode 100644 arch/arm/mach-highbank/lluart.c
+ rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%)
+ rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (95%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (96%)
+ rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (67%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%)
+ create mode 100644 arch/arm/mach-imx/imx25-dt.c
+ delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%)
+ rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (86%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/system.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/time.c (99%)
+ rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%)
+ create mode 100644 arch/arm/mach-kirkwood/board-mplcec4.c
+ create mode 100644 arch/arm/mach-kirkwood/board-ns2.c
+ create mode 100644 arch/arm/mach-kirkwood/board-nsa310.c
+ create mode 100644 arch/arm/mach-kirkwood/board-openblocks_a6.c
+ create mode 100644 arch/arm/mach-kirkwood/board-usi_topkick.c
+ create mode 100644 arch/arm/mach-omap1/dma.h
+ create mode 100644 arch/arm/mach-omap1/fpga.h
+ delete mode 100644 arch/arm/mach-omap1/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-omap1/include/mach/serial.h
+ create mode 100644 arch/arm/mach-omap1/include/mach/soc.h
+ rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/tc.h (100%)
+ create mode 100644 arch/arm/mach-omap1/mmc.h
+ create mode 100644 arch/arm/mach-omap1/soc.h
+ create mode 100644 arch/arm/mach-omap1/sram-init.c
+ create mode 100644 arch/arm/mach-omap1/sram.h
+ rename arch/arm/mach-omap2/{include/mach => }/board-zoom.h (100%)
+ create mode 100644 arch/arm/mach-omap2/cclock2420_data.c
+ create mode 100644 arch/arm/mach-omap2/cclock2430_data.c
+ create mode 100644 arch/arm/mach-omap2/cclock33xx_data.c
+ create mode 100644 arch/arm/mach-omap2/cclock3xxx_data.c
+ create mode 100644 arch/arm/mach-omap2/cclock44xx_data.c
+ delete mode 100644 arch/arm/mach-omap2/clock2420_data.c
+ delete mode 100644 arch/arm/mach-omap2/clock2430_data.c
+ delete mode 100644 arch/arm/mach-omap2/clock33xx_data.c
+ delete mode 100644 arch/arm/mach-omap2/clock3xxx_data.c
+ delete mode 100644 arch/arm/mach-omap2/clock44xx_data.c
+ delete mode 100644 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
+ delete mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
+ delete mode 100644 arch/arm/mach-omap2/clockdomain44xx.c
+ create mode 100644 arch/arm/mach-omap2/cm2xxx.c
+ create mode 100644 arch/arm/mach-omap2/cm2xxx.h
+ rename arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (67%)
+ create mode 100644 arch/arm/mach-omap2/cm3xxx.h
+ create mode 100644 arch/arm/mach-omap2/cm_common.c
+ create mode 100644 arch/arm/mach-omap2/dma.h
+ create mode 100644 arch/arm/mach-omap2/dss-common.c
+ create mode 100644 arch/arm/mach-omap2/dss-common.h
+ create mode 100644 arch/arm/mach-omap2/gpmc-nand.h
+ create mode 100644 arch/arm/mach-omap2/gpmc-onenand.h
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc.h (56%)
+ create mode 100644 arch/arm/mach-omap2/i2c.h
+ delete mode 100644 arch/arm/mach-omap2/include/mach/gpio.h
+ rename arch/arm/{plat-omap/include/plat => mach-omap2/include/mach}/serial.h (87%)
+ create mode 100644 arch/arm/mach-omap2/mmc.h
+ rename arch/arm/{plat-omap => mach-omap2}/omap-pm-noop.c (98%)
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap-pm.h (100%)
+ create mode 100644 arch/arm/mach-omap2/omap2-restart.c
+ create mode 100644 arch/arm/mach-omap2/omap3-restart.c
+ rename arch/arm/{plat-omap => mach-omap2}/omap_device.c (99%)
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_device.h (99%)
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_hwmod.h (99%)
+ delete mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+ delete mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
+ delete mode 100644 arch/arm/mach-omap2/powerdomain44xx.c
+ delete mode 100644 arch/arm/mach-omap2/prcm.c
+ create mode 100644 arch/arm/mach-omap2/prm2xxx.c
+ create mode 100644 arch/arm/mach-omap2/prm2xxx.h
+ create mode 100644 arch/arm/mach-omap2/prm3xxx.c
+ create mode 100644 arch/arm/mach-omap2/prm3xxx.h
+ create mode 100644 arch/arm/mach-omap2/serial.h
+ create mode 100644 arch/arm/mach-omap2/sram.c
+ create mode 100644 arch/arm/mach-omap2/sram.h
+ create mode 100644 arch/arm/mach-omap2/usb.h
+ create mode 100644 arch/arm/mach-orion5x/board-dt.c
+ delete mode 100644 arch/arm/mach-pxa/include/mach/pxa95x.h
+ delete mode 100644 arch/arm/mach-pxa/pxa95x.c
+ delete mode 100644 arch/arm/mach-pxa/saarb.c
+ delete mode 100644 arch/arm/mach-pxa/tavorevb3.c
+ delete mode 100644 arch/arm/mach-shmobile/board-g3evm.c
+ delete mode 100644 arch/arm/mach-shmobile/board-g4evm.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-sh7377.c
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7367.h
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7377.h
+ delete mode 100644 arch/arm/mach-shmobile/intc-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/intc-sh7377.c
+ delete mode 100644 arch/arm/mach-shmobile/pfc-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/pfc-sh7377.c
+ delete mode 100644 arch/arm/mach-shmobile/setup-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/setup-sh7377.c
+ rename arch/arm/{mach-vt8500/include/mach/irqs.h => mach-socfpga/core.h} (61%)
+ create mode 100644 arch/arm/mach-socfpga/headsmp.S
+ create mode 100644 arch/arm/mach-socfpga/platsmp.c
+ create mode 100644 arch/arm/mach-sunxi/Kconfig
+ create mode 100644 arch/arm/mach-sunxi/Makefile
+ create mode 100644 arch/arm/mach-sunxi/Makefile.boot
+ create mode 100644 arch/arm/mach-sunxi/sunxi.c
+ create mode 100644 arch/arm/mach-sunxi/sunxi.h
+ create mode 100644 arch/arm/mach-tegra/cpuidle-tegra20.c
+ create mode 100644 arch/arm/mach-tegra/cpuidle-tegra30.c
+ create mode 100644 arch/arm/mach-tegra/cpuidle.h
+ delete mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-tegra/include/mach/dma.h
+ delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
+ rename arch/arm/mach-tegra/{include/mach => }/iomap.h (93%)
+ rename arch/arm/mach-tegra/{include/mach => }/irammap.h (73%)
+ create mode 100644 arch/arm/mach-tegra/pm.c
+ create mode 100644 arch/arm/mach-tegra/pm.h
+ rename arch/arm/mach-tegra/{sleep-t20.S => sleep-tegra20.S} (98%)
+ rename arch/arm/mach-tegra/{sleep-t30.S => sleep-tegra30.S} (63%)
+ create mode 100644 arch/arm/mach-tegra/tegra20_speedo.c
+ create mode 100644 arch/arm/mach-tegra/tegra30_speedo.c
+ create mode 100644 arch/arm/mach-vexpress/reset.c
+ create mode 100644 arch/arm/mach-vt8500/Kconfig
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h
+ delete mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-zynq/include/mach/timex.h
+ delete mode 100644 arch/arm/plat-mxc/Kconfig
+ delete mode 100644 arch/arm/plat-mxc/Makefile
+ create mode 100644 arch/arm/plat-mxc/devices/platform-mx2-emma.c
+ delete mode 100644 arch/arm/plat-mxc/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h
+ delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h
+ delete mode 100644 arch/arm/plat-nomadik/Kconfig
+ delete mode 100644 arch/arm/plat-nomadik/Makefile
+ delete mode 100644 arch/arm/plat-omap/clock.c
+ delete mode 100644 arch/arm/plat-omap/common.c
+ rename arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} (60%)
+ delete mode 100644 arch/arm/plat-omap/include/plat/clkdev_omap.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/clock.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/common.h
+ create mode 100644 arch/arm/plat-omap/include/plat/counter-32k.h
+ rename arch/arm/{mach-omap2 => plat-omap/include/plat}/debug-devices.h (54%)
+ delete mode 100644 arch/arm/plat-omap/include/plat/dma-44xx.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/fpga.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/multi.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/prcm.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/sdrc.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/usb.h
+ delete mode 100644 arch/arm/plat-omap/sram.h
+ delete mode 100644 arch/arm/plat-spear/shirq.c
+ create mode 100644 drivers/clk/clk-sunxi.c
+ create mode 100644 drivers/clk/clk-twl6040.c
+ create mode 100644 drivers/clk/versatile/clk-vexpress-osc.c
+ create mode 100644 drivers/clk/versatile/clk-vexpress.c
+ rename arch/arm/plat-nomadik/timer.c => drivers/clocksource/nomadik-mtu.c (93%)
+ create mode 100644 drivers/clocksource/sunxi_timer.c
+ create mode 100644 drivers/cpuidle/cpuidle-calxeda.c
+ create mode 100644 drivers/hwmon/vexpress.c
+ create mode 100644 drivers/irqchip/irq-sunxi.c
+ rename arch/arm/plat-versatile/fpga-irq.c => drivers/irqchip/irq-versatile-fpga.c (83%)
+ create mode 100644 drivers/irqchip/spear-shirq.c
+ create mode 100644 drivers/mfd/omap-usb.h
+ create mode 100644 drivers/mfd/vexpress-config.c
+ create mode 100644 drivers/mfd/vexpress-sysreg.c
+ delete mode 100644 drivers/mtd/maps/cdb89712.c
+ delete mode 100644 drivers/mtd/nand/autcpu12.c
+ delete mode 100644 drivers/mtd/nand/spia.c
+ create mode 100644 drivers/pinctrl/pinctrl-exynos5440.c
+ create mode 100644 drivers/power/reset/Kconfig
+ create mode 100644 drivers/power/reset/Makefile
+ create mode 100644 drivers/power/reset/gpio-poweroff.c
+ rename arch/arm/mach-at91/include/mach/at91_rtc.h => drivers/rtc/rtc-at91rm9200.h (100%)
+ rename arch/arm/plat-mxc/include/mach/timex.h => include/linux/clk/sunxi.h (65%)
+ rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%)
+ rename arch/arm/plat-spear/include/plat/shirq.h => include/linux/irqchip/spear-shirq.h (60%)
+ create mode 100644 include/linux/irqchip/sunxi.h
+ rename arch/arm/plat-versatile/include/plat/fpga-irq.h => include/linux/irqchip/versatile-fpga.h (100%)
+ rename {arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%)
+ rename arch/arm/plat-nomadik/include/plat/mtu.h => include/linux/platform_data/clocksource-nomadik-mtu.h (71%)
+ rename arch/arm/plat-nomadik/include/plat/ste_dma40.h => include/linux/platform_data/dma-ste-dma40.h (100%)
+ rename arch/arm/plat-omap/include/plat/led.h => include/linux/platform_data/leds-omap.h (91%)
+ rename arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h (80%)
+ create mode 100644 include/linux/platform_data/omap-wd-timer.h
+ create mode 100644 include/linux/platform_data/usb-omap.h
+ create mode 100644 include/linux/sunxi_timer.h
+ rename {arch/arm/mach-tegra/include/mach => include/linux}/tegra-ahb.h (86%)
+ create mode 100644 include/linux/vexpress.h
+$ git am -3 ../patches/0001-OMAP-common.c-remove-init-call-to-vram-fixup.patch
+Applying: OMAP: common.c: remove init call to vram fixup
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm/mach-omap2/common.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 1d389bf] Merge remote-tracking branch 'arm-soc/for-next'
+Merging bcm2835/for-next (d7f292e Merge branch 'for-3.8/defconfig' into for-next)
+$ git merge bcm2835/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
+$ git merge cortex/for-next
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm/mm/alignment.c
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/kernel/ptrace.c
+Auto-merging arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/include/asm/cputype.h
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/assembler.h | 13 ++-
+ arch/arm/include/asm/cp15.h | 11 ++-
+ arch/arm/include/asm/cputype.h | 3 +
+ arch/arm/include/asm/glue-cache.h | 25 ++++++
+ arch/arm/include/asm/glue-df.h | 8 ++
+ arch/arm/include/asm/glue-proc.h | 9 ++
+ arch/arm/include/asm/irqflags.h | 22 +++--
+ arch/arm/include/asm/processor.h | 7 ++
+ arch/arm/include/asm/ptrace.h | 8 ++
+ arch/arm/include/asm/system_info.h | 1 +
+ arch/arm/include/uapi/asm/ptrace.h | 36 ++++++--
+ arch/arm/kernel/asm-offsets.c | 3 +
+ arch/arm/kernel/entry-common.S | 4 +
+ arch/arm/kernel/entry-header.S | 148 +++++++++++++++++++++++++++++++++
+ arch/arm/kernel/entry-v7m.S | 134 ++++++++++++++++++++++++++++++
+ arch/arm/kernel/head-common.S | 9 +-
+ arch/arm/kernel/head-nommu.S | 9 +-
+ arch/arm/kernel/process.c | 4 +
+ arch/arm/kernel/ptrace.c | 3 +
+ arch/arm/kernel/setup.c | 13 ++-
+ arch/arm/kernel/traps.c | 2 +
+ arch/arm/mm/alignment.c | 2 +
+ arch/arm/mm/mmu.c | 17 ++++
+ arch/arm/mm/nommu.c | 2 +
+ arch/arm/mm/proc-v7m.S | 161 ++++++++++++++++++++++++++++++++++++
+ 25 files changed, 632 insertions(+), 22 deletions(-)
+ create mode 100644 arch/arm/kernel/entry-v7m.S
+ create mode 100644 arch/arm/mm/proc-v7m.S
+Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
+$ git merge ixp4xx/next
+Merge made by the 'recursive' strategy.
+Merging msm/for-next (a0d271c Linux 3.6)
+$ git merge msm/for-next
+Already up-to-date.
+Merging renesas/next (6cee927 Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards3', 'heads/soc4' and 'heads/maintainers'; commit 'ab6f6d85210c4d0265cf48e9958c04e08595055a' into next)
+$ git merge renesas/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging samsung/for-next (d1a8169 Merge branch 'next/cleanup-samsung-3' into for-next)
+$ git merge samsung/for-next
+Resolved 'arch/arm/boot/dts/Makefile' using previous resolution.
+Resolved 'arch/arm/boot/dts/exynos5250-smdk5250.dts' using previous resolution.
+Resolved 'arch/arm/boot/dts/exynos5250.dtsi' using previous resolution.
+Resolved 'arch/arm/mach-exynos/mach-exynos5-dt.c' using previous resolution.
+Auto-merging arch/arm/plat-s3c24xx/dma.c
+Auto-merging arch/arm/mach-s3c24xx/Kconfig
+Auto-merging arch/arm/mach-exynos/mach-exynos5-dt.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-exynos5-dt.c
+Removing arch/arm/mach-exynos/include/mach/regs-mem.h
+Removing arch/arm/mach-exynos/include/mach/dwmci.h
+Removing arch/arm/mach-exynos/dev-dwmci.c
+Auto-merging arch/arm/mach-exynos/common.c
+Auto-merging arch/arm/boot/dts/exynos5250.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5250.dtsi
+Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5250-smdk5250.dts
+Auto-merging arch/arm/boot/dts/Makefile
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 222d6b5] Merge remote-tracking branch 'samsung/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig.debug | 11 +++
+ arch/arm/boot/dts/exynos4.dtsi | 6 ++
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 14 +++
+ arch/arm/boot/dts/exynos5250.dtsi | 32 +++++-
+ arch/arm/mach-exynos/Kconfig | 5 -
+ arch/arm/mach-exynos/Makefile | 1 -
+ arch/arm/mach-exynos/clock-exynos5.c | 117 ++++++++++++++++++++++
+ arch/arm/mach-exynos/common.c | 7 ++
+ arch/arm/mach-exynos/cpuidle.c | 3 +-
+ arch/arm/mach-exynos/dev-audio.c | 12 ---
+ arch/arm/mach-exynos/dev-dwmci.c | 75 --------------
+ arch/arm/mach-exynos/hotplug.c | 45 ++++++++-
+ arch/arm/mach-exynos/include/mach/dwmci.h | 20 ----
+ arch/arm/mach-exynos/include/mach/map.h | 2 +
+ arch/arm/mach-exynos/include/mach/regs-audss.h | 7 +-
+ arch/arm/mach-exynos/include/mach/regs-mem.h | 23 -----
+ arch/arm/mach-exynos/mach-exynos4-dt.c | 1 +
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 6 ++
+ arch/arm/mach-exynos/platsmp.c | 30 ++++--
+ arch/arm/mach-exynos/pm.c | 7 ++
+ arch/arm/mach-s3c24xx/Kconfig | 1 +
+ arch/arm/mach-s3c24xx/clock-s3c2440.c | 1 +
+ arch/arm/mach-s3c64xx/clock.c | 126 +++++++++++++++---------
+ arch/arm/mach-s3c64xx/dev-audio.c | 11 ---
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 20 +++-
+ arch/arm/mach-s5p64x0/clock-s5p6440.c | 49 ++++++---
+ arch/arm/mach-s5p64x0/clock-s5p6450.c | 61 ++++++++----
+ arch/arm/mach-s5p64x0/dev-audio.c | 12 ---
+ arch/arm/mach-s5pc100/clock.c | 48 +++++----
+ arch/arm/mach-s5pc100/dev-audio.c | 16 ---
+ arch/arm/mach-s5pv210/dev-audio.c | 16 ---
+ arch/arm/plat-s3c24xx/dma.c | 9 +-
+ arch/arm/plat-samsung/Kconfig | 6 ++
+ arch/arm/plat-samsung/Makefile | 1 +
+ arch/arm/plat-samsung/include/plat/devs.h | 1 -
+ arch/arm/plat-samsung/include/plat/map-s5p.h | 2 +
+ arch/arm/plat-samsung/include/plat/pm.h | 2 +
+ arch/arm/plat-samsung/setup-camif.c | 70 +++++++++++++
+ drivers/pinctrl/pinctrl-samsung.c | 2 +-
+ 39 files changed, 565 insertions(+), 313 deletions(-)
+ delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c
+ delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h
+ delete mode 100644 arch/arm/mach-exynos/include/mach/regs-mem.h
+ create mode 100644 arch/arm/plat-samsung/setup-camif.c
+Merging tegra/for-next (3c8d1fc Merge branch 'for-3.8/fixes-for-rc1' into for-next)
+$ git merge tegra/for-next
+Auto-merging drivers/amba/tegra-ahb.c
+Auto-merging arch/arm/mach-tegra/tegra30_clocks.c
+Auto-merging arch/arm/mach-tegra/common.c
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-tegra/common.c | 2 +-
+ arch/arm/mach-tegra/tegra30_clocks.c | 4 +---
+ drivers/amba/tegra-ahb.c | 2 ++
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+Merging kvmtool/master (6f09dab kvm tools: add support for ARMv7 processors)
+$ git merge kvmtool/master
+Merge made by the 'recursive' strategy.
+ tools/kvm/Makefile | 45 ++++-
+ tools/kvm/arm/aarch32/cortex-a15.c | 98 ++++++++++
+ tools/kvm/arm/aarch32/include/kvm/barrier.h | 10 +
+ tools/kvm/arm/aarch32/include/kvm/kvm-arch.h | 30 +++
+ tools/kvm/arm/aarch32/kvm-cpu.c | 111 +++++++++++
+ tools/kvm/arm/aarch32/smp-pen.S | 35 ++++
+ tools/kvm/arm/fdt.c | 266 ++++++++++++++++++++++++++
+ tools/kvm/arm/gic.c | 92 +++++++++
+ tools/kvm/arm/include/arm-common/gic.h | 34 ++++
+ tools/kvm/arm/include/arm-common/kvm-arch.h | 34 ++++
+ tools/kvm/arm/include/kvm/kvm-cpu-arch.h | 46 +++++
+ tools/kvm/arm/ioport.c | 5 +
+ tools/kvm/arm/irq.c | 17 ++
+ tools/kvm/arm/kvm-cpu.c | 107 +++++++++++
+ tools/kvm/arm/kvm.c | 69 +++++++
+ tools/kvm/arm/smp.c | 21 ++
+ tools/kvm/builtin-balloon.c | 4 +-
+ tools/kvm/builtin-run.c | 20 +-
+ tools/kvm/builtin-setup.c | 4 -
+ tools/kvm/devices.c | 86 +++++++++
+ tools/kvm/disk/core.c | 2 +
+ tools/kvm/hw/pci-shmem.c | 12 +-
+ tools/kvm/hw/rtc.c | 30 +--
+ tools/kvm/hw/serial.c | 10 +-
+ tools/kvm/hw/vesa.c | 12 +-
+ tools/kvm/include/kvm/devices.h | 27 +++
+ tools/kvm/include/kvm/fdt.h | 26 +++
+ tools/kvm/include/kvm/irq.h | 2 +-
+ tools/kvm/include/kvm/kvm.h | 20 +-
+ tools/kvm/include/kvm/mutex.h | 20 +-
+ tools/kvm/include/kvm/parse-options.h | 22 +--
+ tools/kvm/include/kvm/pci.h | 2 -
+ tools/kvm/include/kvm/qcow.h | 2 +-
+ tools/kvm/include/kvm/rbtree-interval.h | 3 +-
+ tools/kvm/include/kvm/threadpool.h | 4 +-
+ tools/kvm/include/kvm/uip.h | 10 +-
+ tools/kvm/include/kvm/virtio-mmio.h | 1 +
+ tools/kvm/include/kvm/virtio-pci.h | 2 +
+ tools/kvm/include/linux/stddef.h | 6 -
+ tools/kvm/ioeventfd.c | 2 +
+ tools/kvm/kvm-ipc.c | 2 +
+ tools/kvm/kvm.c | 56 +++++-
+ tools/kvm/net/uip/buf.c | 4 +-
+ tools/kvm/net/uip/core.c | 6 +-
+ tools/kvm/net/uip/tcp.c | 9 +-
+ tools/kvm/net/uip/udp.c | 5 +-
+ tools/kvm/pci.c | 43 ++---
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 13 +-
+ tools/kvm/powerpc/irq.c | 10 +-
+ tools/kvm/powerpc/kvm.c | 2 +-
+ tools/kvm/powerpc/spapr_pci.c | 4 +-
+ tools/kvm/ui/sdl.c | 2 +
+ tools/kvm/ui/vnc.c | 2 +
+ tools/kvm/util/rbtree-interval.c | 6 +-
+ tools/kvm/util/threadpool.c | 10 +-
+ tools/kvm/virtio/9p.c | 10 +-
+ tools/kvm/virtio/balloon.c | 10 +-
+ tools/kvm/virtio/blk.c | 9 +-
+ tools/kvm/virtio/console.c | 14 +-
+ tools/kvm/virtio/mmio.c | 13 +-
+ tools/kvm/virtio/net.c | 18 +-
+ tools/kvm/virtio/pci.c | 22 ++-
+ tools/kvm/virtio/rng.c | 16 +-
+ tools/kvm/virtio/scsi.c | 3 +-
+ tools/kvm/x86/include/kvm/kvm-arch.h | 11 +-
+ tools/kvm/x86/ioport.c | 22 +++
+ tools/kvm/x86/irq.c | 4 +-
+ tools/kvm/x86/kvm.c | 7 +
+ 68 files changed, 1494 insertions(+), 188 deletions(-)
+ create mode 100644 tools/kvm/arm/aarch32/cortex-a15.c
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/barrier.h
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/arm/aarch32/kvm-cpu.c
+ create mode 100644 tools/kvm/arm/aarch32/smp-pen.S
+ create mode 100644 tools/kvm/arm/fdt.c
+ create mode 100644 tools/kvm/arm/gic.c
+ create mode 100644 tools/kvm/arm/include/arm-common/gic.h
+ create mode 100644 tools/kvm/arm/include/arm-common/kvm-arch.h
+ create mode 100644 tools/kvm/arm/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/arm/ioport.c
+ create mode 100644 tools/kvm/arm/irq.c
+ create mode 100644 tools/kvm/arm/kvm-cpu.c
+ create mode 100644 tools/kvm/arm/kvm.c
+ create mode 100644 tools/kvm/arm/smp.c
+ create mode 100644 tools/kvm/devices.c
+ create mode 100644 tools/kvm/include/kvm/devices.h
+ create mode 100644 tools/kvm/include/kvm/fdt.h
+Merging dma-mapping/dma-mapping-next (2b8836a Merge branch 'dma-fixes-for-v3.7' into HEAD)
+$ git merge dma-mapping/dma-mapping-next
+Auto-merging arch/arm/include/asm/dma-mapping.h
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/dma-mapping.h | 1 +
+ mm/dmapool.c | 31 +++++++------------------------
+ 2 files changed, 8 insertions(+), 24 deletions(-)
+Merging pwm/for-next (9685ac4 pwm: Export of_pwm_xlate_with_flags())
+$ git merge pwm/for-next
+Resolved 'drivers/pwm/pwm-tiecap.c' using previous resolution.
+Resolved 'drivers/pwm/pwm-tiehrpwm.c' using previous resolution.
+CONFLICT (modify/delete): drivers/pwm/pwm-twl6030.c deleted in pwm/for-next and modified in HEAD. Version HEAD of drivers/pwm/pwm-twl6030.c left in tree.
+Auto-merging drivers/pwm/pwm-tiehrpwm.c
+CONFLICT (content): Merge conflict in drivers/pwm/pwm-tiehrpwm.c
+Auto-merging drivers/pwm/pwm-tiecap.c
+CONFLICT (content): Merge conflict in drivers/pwm/pwm-tiecap.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/pwm/pwm-twl6030.c
+drivers/pwm/pwm-twl6030.c: needs merge
+rm 'drivers/pwm/pwm-twl6030.c'
+$ git commit -v -a
+[master 20d3c25] Merge remote-tracking branch 'pwm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/pwm/pwm-tiecap.txt | 23 ++
+ .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 23 ++
+ .../devicetree/bindings/pwm/pwm-tipwmss.txt | 31 ++
+ Documentation/devicetree/bindings/pwm/pwm.txt | 17 +-
+ .../devicetree/bindings/pwm/spear-pwm.txt | 18 +
+ .../devicetree/bindings/pwm/ti,twl-pwm.txt | 17 +
+ .../devicetree/bindings/pwm/ti,twl-pwmled.txt | 17 +
+ .../devicetree/bindings/pwm/vt8500-pwm.txt | 17 +
+ drivers/pwm/Kconfig | 39 ++-
+ drivers/pwm/Makefile | 5 +-
+ drivers/pwm/core.c | 29 ++
+ drivers/pwm/pwm-spear.c | 276 +++++++++++++++
+ drivers/pwm/pwm-tiecap.c | 48 ++-
+ drivers/pwm/pwm-tiehrpwm.c | 62 +++-
+ drivers/pwm/pwm-tipwmss.c | 139 ++++++++
+ drivers/pwm/pwm-tipwmss.h | 39 +++
+ drivers/pwm/pwm-twl-led.c | 344 +++++++++++++++++++
+ drivers/pwm/pwm-twl.c | 359 ++++++++++++++++++++
+ drivers/pwm/pwm-twl6030.c | 184 ----------
+ drivers/pwm/pwm-vt8500.c | 98 ++++--
+ include/linux/pwm.h | 3 +
+ 21 files changed, 1570 insertions(+), 218 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiecap.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/spear-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/ti,twl-pwmled.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/vt8500-pwm.txt
+ create mode 100644 drivers/pwm/pwm-spear.c
+ create mode 100644 drivers/pwm/pwm-tipwmss.c
+ create mode 100644 drivers/pwm/pwm-tipwmss.h
+ create mode 100644 drivers/pwm/pwm-twl-led.c
+ create mode 100644 drivers/pwm/pwm-twl.c
+ delete mode 100644 drivers/pwm/pwm-twl6030.c
+Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
+$ git merge dma-buf/for-next
+Auto-merging drivers/base/dma-buf.c
+Merge made by the 'recursive' strategy.
+ drivers/base/dma-buf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging userns/for-next (98f842e proc: Usable inode numbers for the namespace file descriptors.)
+$ git merge userns/for-next
+Resolved 'include/net/net_namespace.h' using previous resolution.
+Resolved 'kernel/nsproxy.c' using previous resolution.
+Auto-merging security/yama/yama_lsm.c
+Auto-merging net/core/net_namespace.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/nsproxy.c
+CONFLICT (content): Merge conflict in kernel/nsproxy.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cgroup.c
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/net/net_namespace.h
+CONFLICT (content): Merge conflict in include/net/net_namespace.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/cred.h
+Auto-merging fs/proc/base.c
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/fuse/dev.c
+Auto-merging drivers/staging/android/binder.c
+Auto-merging arch/um/drivers/mconsole_kern.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5e1c21e] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/mips/kernel/mips-mt-fpaff.c | 4 +-
+ arch/powerpc/platforms/cell/spufs/sched.c | 2 +-
+ arch/um/drivers/mconsole_kern.c | 2 +-
+ drivers/staging/android/binder.c | 3 +-
+ fs/attr.c | 11 +-
+ fs/autofs4/autofs_i.h | 8 +-
+ fs/autofs4/dev-ioctl.c | 4 +-
+ fs/autofs4/inode.c | 24 ++--
+ fs/autofs4/waitq.c | 5 +-
+ fs/exec.c | 9 +-
+ fs/fuse/dev.c | 4 +-
+ fs/fuse/dir.c | 20 +--
+ fs/fuse/fuse_i.h | 4 +-
+ fs/fuse/inode.c | 23 ++--
+ fs/hppfs/hppfs.c | 2 +-
+ fs/mount.h | 3 +
+ fs/namespace.c | 211 ++++++++++++++++++++++++-----
+ fs/open.c | 2 +-
+ fs/pnode.h | 1 +
+ fs/proc/Makefile | 1 +
+ fs/proc/array.c | 2 +-
+ fs/proc/base.c | 169 +----------------------
+ fs/proc/generic.c | 26 ++--
+ fs/proc/inode.c | 6 +-
+ fs/proc/internal.h | 1 +
+ fs/proc/namespaces.c | 185 ++++++++++++++++++++++---
+ fs/proc/root.c | 17 +--
+ fs/proc/self.c | 59 ++++++++
+ fs/sysfs/mount.c | 1 +
+ include/linux/cred.h | 2 -
+ include/linux/fs.h | 2 +
+ include/linux/ipc_namespace.h | 9 +-
+ include/linux/mnt_namespace.h | 3 +-
+ include/linux/nsproxy.h | 2 +-
+ include/linux/pid_namespace.h | 11 +-
+ include/linux/proc_fs.h | 26 +++-
+ include/linux/user_namespace.h | 10 ++
+ include/linux/utsname.h | 7 +-
+ include/net/net_namespace.h | 2 +
+ init/Kconfig | 2 -
+ init/main.c | 1 -
+ init/version.c | 2 +
+ ipc/msgutil.c | 2 +
+ ipc/namespace.c | 32 ++++-
+ kernel/cgroup.c | 2 +-
+ kernel/events/core.c | 2 +-
+ kernel/exit.c | 12 --
+ kernel/fork.c | 69 +++++++---
+ kernel/nsproxy.c | 36 ++---
+ kernel/pid.c | 47 +++++--
+ kernel/pid_namespace.c | 112 +++++++++++----
+ kernel/ptrace.c | 10 +-
+ kernel/sched/core.c | 10 +-
+ kernel/signal.c | 2 +-
+ kernel/sysctl_binary.c | 2 +-
+ kernel/user.c | 2 +
+ kernel/user_namespace.c | 147 +++++++++++++++++---
+ kernel/utsname.c | 33 ++++-
+ net/core/net_namespace.c | 31 ++++-
+ security/yama/yama_lsm.c | 12 +-
+ 60 files changed, 998 insertions(+), 453 deletions(-)
+ create mode 100644 fs/proc/self.c
+Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (541880d do_coredump(): get rid of pt_regs argument)
+$ git merge signal/for-next
+Recorded preimage for 'arch/microblaze/include/asm/Kbuild'
+Resolved 'arch/arm/kernel/process.c' using previous resolution.
+Resolved 'arch/cris/include/asm/signal.h' using previous resolution.
+Resolved 'arch/powerpc/kernel/entry_64.S' using previous resolution.
+Resolved 'arch/xtensa/Kconfig' using previous resolution.
+Auto-merging kernel/signal.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/auditsc.c
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/sched.h
+Auto-merging fs/exec.c
+Auto-merging drivers/staging/gdm72xx/gdm_usb.c
+Auto-merging arch/xtensa/Kconfig
+CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
+Auto-merging arch/x86/syscalls/syscall_32.tbl
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/Kconfig
+Removing arch/sh/kernel/sys_sh64.c
+Auto-merging arch/s390/kernel/entry64.S
+Auto-merging arch/s390/kernel/entry.h
+Auto-merging arch/s390/kernel/entry.S
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/kernel/entry_64.S
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S
+Auto-merging arch/powerpc/include/asm/unistd.h
+Removing arch/openrisc/kernel/sys_or32.c
+Auto-merging arch/mips/kernel/scall64-n32.S
+Auto-merging arch/mips/kernel/mips_ksyms.c
+Auto-merging arch/mips/include/asm/processor.h
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/microblaze/kernel/process.c
+Auto-merging arch/microblaze/kernel/entry.S
+Auto-merging arch/microblaze/kernel/entry-nommu.S
+Auto-merging arch/microblaze/include/asm/unistd.h
+Removing arch/microblaze/include/asm/syscalls.h
+Auto-merging arch/microblaze/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild
+Removing arch/hexagon/kernel/syscall.c
+Auto-merging arch/cris/include/asm/unistd.h
+Auto-merging arch/cris/include/asm/signal.h
+CONFLICT (content): Merge conflict in arch/cris/include/asm/signal.h
+Auto-merging arch/c6x/kernel/entry.S
+Auto-merging arch/blackfin/include/asm/unistd.h
+Removing arch/avr32/kernel/sys_avr32.c
+Auto-merging arch/avr32/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/kernel/process.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/kernel/calls.S
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/microblaze/include/asm/Kbuild'.
+[master c7ffc8d] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 14 ++
+ arch/alpha/include/asm/ptrace.h | 1 +
+ arch/alpha/include/asm/signal.h | 3 -
+ arch/alpha/include/asm/unistd.h | 3 +
+ arch/alpha/kernel/binfmt_loader.c | 4 +-
+ arch/alpha/kernel/entry.S | 51 ++-----
+ arch/alpha/kernel/process.c | 62 ++------
+ arch/alpha/kernel/signal.c | 16 +-
+ arch/alpha/kernel/systbls.S | 6 +-
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/signal.h | 1 -
+ arch/arm/include/asm/unistd.h | 3 +
+ arch/arm/kernel/calls.S | 6 +-
+ arch/arm/kernel/entry-common.S | 16 --
+ arch/arm/kernel/process.c | 11 +-
+ arch/arm/kernel/sys_arm.c | 31 ----
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/syscalls.h | 6 -
+ arch/arm64/include/asm/unistd.h | 3 +
+ arch/arm64/include/asm/unistd32.h | 4 +-
+ arch/arm64/kernel/process.c | 9 +-
+ arch/arm64/kernel/sys.c | 11 --
+ arch/arm64/kernel/sys_compat.c | 11 --
+ arch/avr32/Kconfig | 2 +
+ arch/avr32/include/asm/processor.h | 3 -
+ arch/avr32/include/asm/signal.h | 2 -
+ arch/avr32/include/asm/unistd.h | 4 +
+ arch/avr32/kernel/Makefile | 2 +-
+ arch/avr32/kernel/entry-avr32b.S | 14 +-
+ arch/avr32/kernel/process.c | 115 +++-----------
+ arch/avr32/kernel/sys_avr32.c | 24 ---
+ arch/avr32/kernel/syscall-stubs.S | 24 ---
+ arch/avr32/kernel/syscall_table.S | 8 +-
+ arch/blackfin/Kconfig | 2 +
+ arch/blackfin/include/asm/processor.h | 2 -
+ arch/blackfin/include/asm/unistd.h | 2 +
+ arch/blackfin/kernel/entry.S | 55 +------
+ arch/blackfin/kernel/process.c | 98 +++---------
+ arch/blackfin/kernel/signal.c | 4 +-
+ arch/blackfin/mach-common/entry.S | 57 +------
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/syscalls.h | 4 -
+ arch/c6x/include/uapi/asm/unistd.h | 2 +-
+ arch/c6x/kernel/entry.S | 24 +--
+ arch/c6x/kernel/process.c | 25 +---
+ arch/cris/Kconfig | 3 +
+ arch/cris/arch-v10/kernel/entry.S | 17 ++-
+ arch/cris/arch-v10/kernel/process.c | 121 +++------------
+ arch/cris/arch-v32/kernel/entry.S | 22 +--
+ arch/cris/arch-v32/kernel/process.c | 118 +++------------
+ arch/cris/include/asm/processor.h | 2 -
+ arch/cris/include/asm/signal.h | 5 -
+ arch/cris/include/asm/unistd.h | 4 +
+ arch/cris/kernel/crisksyms.c | 1 -
+ arch/frv/include/asm/unistd.h | 3 +
+ arch/frv/kernel/process.c | 45 +-----
+ arch/h8300/Kconfig | 2 +
+ arch/h8300/include/asm/processor.h | 2 -
+ arch/h8300/include/asm/ptrace.h | 3 +
+ arch/h8300/include/asm/signal.h | 2 -
+ arch/h8300/include/asm/unistd.h | 4 +
+ arch/h8300/kernel/entry.S | 9 ++
+ arch/h8300/kernel/h8300_ksyms.c | 1 -
+ arch/h8300/kernel/process.c | 100 ++-----------
+ arch/h8300/kernel/sys_h8300.c | 26 ----
+ arch/h8300/kernel/syscalls.S | 9 --
+ arch/hexagon/Kconfig | 2 +
+ arch/hexagon/include/asm/processor.h | 1 -
+ arch/hexagon/include/asm/syscall.h | 8 -
+ arch/hexagon/include/uapi/asm/ptrace.h | 4 +
+ arch/hexagon/include/uapi/asm/unistd.h | 2 +
+ arch/hexagon/kernel/Makefile | 3 +-
+ arch/hexagon/kernel/process.c | 100 ++++---------
+ arch/hexagon/kernel/signal.c | 4 +-
+ arch/hexagon/kernel/syscall.c | 89 -----------
+ arch/hexagon/kernel/vm_entry.S | 4 +
+ arch/ia64/Kconfig | 2 +
+ arch/ia64/include/asm/processor.h | 16 --
+ arch/ia64/include/asm/signal.h | 2 -
+ arch/ia64/include/asm/unistd.h | 1 +
+ arch/ia64/kernel/entry.S | 53 ++++---
+ arch/ia64/kernel/head.S | 13 --
+ arch/ia64/kernel/process.c | 161 ++++++++------------
+ arch/ia64/kernel/smpboot.c | 5 -
+ arch/m32r/Kconfig | 2 +
+ arch/m32r/include/asm/processor.h | 5 -
+ arch/m32r/include/asm/ptrace.h | 2 +
+ arch/m32r/include/asm/signal.h | 4 -
+ arch/m32r/include/asm/unistd.h | 4 +
+ arch/m32r/kernel/entry.S | 9 ++
+ arch/m32r/kernel/m32r_ksyms.c | 1 -
+ arch/m32r/kernel/process.c | 126 +++-------------
+ arch/m32r/kernel/sys_m32r.c | 21 ---
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/signal.h | 8 +-
+ arch/m68k/include/asm/unistd.h | 3 +-
+ arch/m68k/kernel/entry.S | 30 ++--
+ arch/m68k/kernel/process.c | 87 ++++-------
+ arch/m68k/kernel/signal.c | 3 +-
+ arch/m68k/kernel/syscalltable.S | 6 +-
+ arch/microblaze/Kconfig | 3 +
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/processor.h | 8 +-
+ arch/microblaze/include/asm/syscalls.h | 16 --
+ arch/microblaze/include/asm/unistd.h | 6 +
+ arch/microblaze/kernel/entry-nommu.S | 20 +--
+ arch/microblaze/kernel/entry.S | 55 +------
+ arch/microblaze/kernel/process.c | 75 +++-------
+ arch/microblaze/kernel/signal.c | 2 +-
+ arch/microblaze/kernel/sys_microblaze.c | 53 -------
+ arch/microblaze/kernel/syscall_table.S | 6 +-
+ arch/mips/Kconfig | 2 +
+ arch/mips/include/asm/processor.h | 2 -
+ arch/mips/include/asm/ptrace.h | 6 +
+ arch/mips/include/asm/signal.h | 2 -
+ arch/mips/include/asm/unistd.h | 1 +
+ arch/mips/kernel/entry.S | 6 +
+ arch/mips/kernel/linux32.c | 23 +--
+ arch/mips/kernel/mips_ksyms.c | 2 -
+ arch/mips/kernel/process.c | 64 +++-----
+ arch/mips/kernel/scall64-n32.S | 2 +-
+ arch/mips/kernel/scall64-o32.S | 2 +-
+ arch/mips/kernel/syscall.c | 57 +------
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/signal.h | 4 -
+ arch/mn10300/include/asm/unistd.h | 4 +-
+ arch/mn10300/kernel/entry.S | 7 +-
+ arch/mn10300/kernel/process.c | 33 +---
+ arch/openrisc/Kconfig | 2 +
+ arch/openrisc/include/asm/processor.h | 2 -
+ arch/openrisc/include/asm/syscalls.h | 7 +
+ arch/openrisc/include/uapi/asm/unistd.h | 4 +
+ arch/openrisc/kernel/Makefile | 2 +-
+ arch/openrisc/kernel/entry.S | 55 +++----
+ arch/openrisc/kernel/process.c | 164 +++++++-------------
+ arch/openrisc/kernel/signal.c | 6 +-
+ arch/openrisc/kernel/sys_or32.c | 57 -------
+ arch/parisc/Kconfig | 3 +
+ arch/parisc/include/asm/processor.h | 1 -
+ arch/parisc/include/asm/signal.h | 2 -
+ arch/parisc/include/asm/unistd.h | 4 +
+ arch/parisc/kernel/entry.S | 241 +++---------------------------
+ arch/parisc/kernel/process.c | 142 +++---------------
+ arch/parisc/kernel/sys_parisc32.c | 22 ---
+ arch/parisc/kernel/syscall_table.S | 2 +-
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/include/asm/signal.h | 2 -
+ arch/powerpc/include/asm/syscalls.h | 9 --
+ arch/powerpc/include/asm/unistd.h | 4 +-
+ arch/powerpc/kernel/entry_32.S | 5 -
+ arch/powerpc/kernel/entry_64.S | 8 +-
+ arch/powerpc/kernel/process.c | 64 ++------
+ arch/s390/Kconfig | 2 +
+ arch/s390/include/asm/signal.h | 2 -
+ arch/s390/include/asm/unistd.h | 4 +-
+ arch/s390/kernel/entry.S | 32 +---
+ arch/s390/kernel/entry.h | 4 -
+ arch/s390/kernel/entry64.S | 26 +---
+ arch/s390/kernel/process.c | 53 ++-----
+ arch/score/Kconfig | 3 +
+ arch/score/include/asm/processor.h | 1 -
+ arch/score/include/asm/syscalls.h | 2 -
+ arch/score/include/asm/unistd.h | 4 +
+ arch/score/kernel/entry.S | 30 +---
+ arch/score/kernel/process.c | 57 ++-----
+ arch/score/kernel/signal.c | 7 +-
+ arch/score/kernel/sys_score.c | 89 -----------
+ arch/sh/Kconfig | 2 +
+ arch/sh/include/asm/processor_32.h | 5 -
+ arch/sh/include/asm/processor_64.h | 5 -
+ arch/sh/include/asm/syscalls_32.h | 14 --
+ arch/sh/include/asm/syscalls_64.h | 17 ---
+ arch/sh/include/asm/unistd.h | 4 +
+ arch/sh/kernel/Makefile | 3 +-
+ arch/sh/kernel/cpu/sh5/entry.S | 19 +++
+ arch/sh/kernel/entry-common.S | 13 ++
+ arch/sh/kernel/process_32.c | 134 +++--------------
+ arch/sh/kernel/process_64.c | 127 +++-------------
+ arch/sh/kernel/signal_64.c | 6 +-
+ arch/sh/kernel/sys_sh32.c | 24 ---
+ arch/sh/kernel/sys_sh64.c | 50 -------
+ arch/sparc/Kconfig | 2 +
+ arch/sparc/include/asm/processor_32.h | 1 -
+ arch/sparc/include/asm/processor_64.h | 11 +-
+ arch/sparc/include/asm/ptrace.h | 10 +-
+ arch/sparc/include/asm/signal.h | 2 -
+ arch/sparc/include/asm/switch_to_64.h | 2 +-
+ arch/sparc/include/asm/syscalls.h | 2 -
+ arch/sparc/include/asm/thread_info_64.h | 25 ++--
+ arch/sparc/include/asm/uaccess_64.h | 4 +-
+ arch/sparc/include/asm/unistd.h | 1 +
+ arch/sparc/kernel/entry.S | 51 +++----
+ arch/sparc/kernel/etrap_64.S | 8 +-
+ arch/sparc/kernel/process_32.c | 158 ++++++--------------
+ arch/sparc/kernel/process_64.c | 148 ++++--------------
+ arch/sparc/kernel/sys_sparc32.c | 36 -----
+ arch/sparc/kernel/sys_sparc_32.c | 24 ---
+ arch/sparc/kernel/sys_sparc_64.c | 22 ---
+ arch/sparc/kernel/syscalls.S | 30 ++--
+ arch/sparc/kernel/systbls_64.S | 2 +-
+ arch/sparc/kernel/traps_64.c | 4 +-
+ arch/sparc/mm/init_64.c | 2 +-
+ arch/tile/Kconfig | 2 +
+ arch/tile/include/asm/compat.h | 15 +-
+ arch/tile/include/asm/elf.h | 1 +
+ arch/tile/include/asm/processor.h | 6 +-
+ arch/tile/include/asm/switch_to.h | 5 +-
+ arch/tile/include/asm/syscalls.h | 13 +-
+ arch/tile/include/asm/unistd.h | 2 +
+ arch/tile/kernel/compat.c | 4 +-
+ arch/tile/kernel/compat_signal.c | 10 +-
+ arch/tile/kernel/entry.S | 11 --
+ arch/tile/kernel/intvec_32.S | 29 ++--
+ arch/tile/kernel/intvec_64.S | 30 ++--
+ arch/tile/kernel/process.c | 171 ++++++---------------
+ arch/tile/kernel/signal.c | 9 +-
+ arch/tile/kernel/sys.c | 8 +-
+ arch/tile/mm/fault.c | 5 +-
+ arch/um/kernel/exec.c | 3 +-
+ arch/um/kernel/process.c | 5 +-
+ arch/um/kernel/syscall.c | 23 ---
+ arch/unicore32/include/uapi/asm/unistd.h | 1 +
+ arch/unicore32/kernel/entry.S | 6 -
+ arch/unicore32/kernel/process.c | 11 +-
+ arch/unicore32/kernel/sys.c | 14 --
+ arch/x86/Kconfig | 1 +
+ arch/x86/ia32/ia32_aout.c | 5 +-
+ arch/x86/ia32/ia32entry.S | 7 +-
+ arch/x86/ia32/sys_ia32.c | 11 --
+ arch/x86/include/asm/processor.h | 2 -
+ arch/x86/include/asm/signal.h | 2 -
+ arch/x86/include/asm/sys_ia32.h | 2 -
+ arch/x86/include/asm/syscalls.h | 9 --
+ arch/x86/include/asm/unistd.h | 3 +
+ arch/x86/kernel/cpu/common.c | 9 --
+ arch/x86/kernel/entry_32.S | 18 ---
+ arch/x86/kernel/entry_64.S | 22 ++-
+ arch/x86/kernel/process.c | 30 ----
+ arch/x86/kernel/process_32.c | 12 +-
+ arch/x86/kernel/process_64.c | 10 +-
+ arch/x86/syscalls/syscall_32.tbl | 6 +-
+ arch/x86/um/Kconfig | 1 +
+ arch/x86/um/shared/sysdep/syscalls.h | 2 -
+ arch/x86/um/sys_call_table_32.c | 3 -
+ arch/x86/um/syscalls_32.c | 15 --
+ arch/xtensa/Kconfig | 1 +
+ arch/xtensa/include/asm/signal.h | 1 -
+ arch/xtensa/include/asm/syscall.h | 2 -
+ arch/xtensa/include/asm/unistd.h | 1 +
+ arch/xtensa/include/uapi/asm/unistd.h | 2 +-
+ arch/xtensa/kernel/process.c | 12 +-
+ drivers/staging/gdm72xx/gdm_usb.c | 4 +-
+ fs/binfmt_aout.c | 5 +-
+ fs/binfmt_elf.c | 5 +-
+ fs/binfmt_elf_fdpic.c | 6 +-
+ fs/binfmt_em86.c | 4 +-
+ fs/binfmt_flat.c | 5 +-
+ fs/binfmt_misc.c | 4 +-
+ fs/binfmt_script.c | 4 +-
+ fs/binfmt_som.c | 5 +-
+ fs/coredump.c | 4 +-
+ fs/exec.c | 37 ++---
+ fs/file.c | 6 -
+ fs/fs_struct.c | 24 ---
+ include/asm-generic/signal.h | 2 -
+ include/asm-generic/syscalls.h | 20 ---
+ include/linux/binfmts.h | 4 +-
+ include/linux/compat.h | 4 -
+ include/linux/coredump.h | 4 +-
+ include/linux/fdtable.h | 1 -
+ include/linux/fs_struct.h | 1 -
+ include/linux/ptrace.h | 13 ++
+ include/linux/sched.h | 7 +-
+ include/linux/syscalls.h | 16 +-
+ kernel/auditsc.c | 102 +++----------
+ kernel/exit.c | 92 ------------
+ kernel/fork.c | 64 ++++++--
+ kernel/signal.c | 15 +-
+ 278 files changed, 1383 insertions(+), 4234 deletions(-)
+ delete mode 100644 arch/avr32/kernel/sys_avr32.c
+ delete mode 100644 arch/hexagon/kernel/syscall.c
+ delete mode 100644 arch/microblaze/include/asm/syscalls.h
+ delete mode 100644 arch/openrisc/kernel/sys_or32.c
+ delete mode 100644 arch/sh/kernel/sys_sh64.c
+Merging clk/clk-next (1f61e5f clk: clock multiplexers may register out of order)
+$ git merge clk/clk-next
+Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
+Auto-merging include/linux/clk-provider.h
+Auto-merging drivers/mfd/db8500-prcmu.c
+Auto-merging drivers/clk/ux500/u8500_clk.c
+Auto-merging drivers/clk/spear/spear1310_clock.c
+Auto-merging drivers/clk/clk-wm831x.c
+Auto-merging drivers/clk/clk-bcm2835.c
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 263b582] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/clock/imx23-clock.txt | 2 +-
+ .../devicetree/bindings/clock/imx28-clock.txt | 4 +-
+ arch/arm/mach-integrator/impd1.c | 69 +-----
+ arch/arm/mach-ux500/cpu-db8500.c | 6 -
+ drivers/clk/clk-bcm2835.c | 8 +-
+ drivers/clk/clk-twl6040.c | 4 +-
+ drivers/clk/clk-vt8500.c | 18 ++
+ drivers/clk/clk-wm831x.c | 34 +--
+ drivers/clk/clk.c | 121 ++++++++--
+ drivers/clk/mxs/clk-imx23.c | 6 +-
+ drivers/clk/mxs/clk-imx28.c | 10 +-
+ drivers/clk/spear/clk-aux-synth.c | 3 +-
+ drivers/clk/spear/clk.c | 3 +
+ drivers/clk/spear/spear1310_clock.c | 106 +++++----
+ drivers/clk/spear/spear1340_clock.c | 237 ++++++++++++--------
+ drivers/clk/spear/spear3xx_clock.c | 154 ++++++++-----
+ drivers/clk/spear/spear6xx_clock.c | 13 +-
+ drivers/clk/ux500/Makefile | 3 +
+ drivers/clk/ux500/abx500-clk.c | 73 ++++++
+ drivers/clk/ux500/clk-prcmu.c | 17 ++
+ drivers/clk/ux500/clk.h | 6 +
+ drivers/clk/ux500/u8500_clk.c | 21 +-
+ drivers/clk/versatile/Makefile | 1 +
+ drivers/clk/versatile/clk-icst.c | 66 +++++-
+ drivers/clk/versatile/clk-icst.h | 14 +-
+ drivers/clk/versatile/clk-impd1.c | 97 ++++++++
+ drivers/clk/versatile/clk-integrator.c | 55 ++---
+ drivers/clk/versatile/clk-realview.c | 65 ++----
+ drivers/cpufreq/db8500-cpufreq.c | 101 +++++----
+ drivers/mfd/db8500-prcmu.c | 82 +++++--
+ include/linux/clk-provider.h | 2 +
+ include/linux/platform_data/clk-integrator.h | 2 +
+ 32 files changed, 901 insertions(+), 502 deletions(-)
+ create mode 100644 drivers/clk/ux500/abx500-clk.c
+ create mode 100644 drivers/clk/versatile/clk-impd1.c
+Merging random/dev (ec8f02da random: prime last_data value per fips requirements)
+$ git merge random/dev
+Merge made by the 'recursive' strategy.
+ drivers/char/random.c | 40 +++++++++++++++++++++++++++-------------
+ 1 file changed, 27 insertions(+), 13 deletions(-)
+Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
+$ git merge lzo-update/lzo-update
+Removing lib/lzo/lzo1x_decompress.c
+Auto-merging crypto/testmgr.h
+Merge made by the 'recursive' strategy.
+ crypto/testmgr.h | 38 ++---
+ include/linux/lzo.h | 15 +-
+ lib/decompress_unlzo.c | 2 +-
+ lib/lzo/Makefile | 2 +-
+ lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++----------------
+ lib/lzo/lzo1x_decompress.c | 255 -----------------------------
+ lib/lzo/lzo1x_decompress_safe.c | 237 +++++++++++++++++++++++++++
+ lib/lzo/lzodefs.h | 34 +++-
+ 8 files changed, 488 insertions(+), 430 deletions(-)
+ delete mode 100644 lib/lzo/lzo1x_decompress.c
+ create mode 100644 lib/lzo/lzo1x_decompress_safe.c
+Merging drop-experimental/linux-next (9387123 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
+$ git merge drop-experimental/linux-next
+Resolved 'drivers/net/ethernet/intel/Kconfig' using previous resolution.
+Resolved 'drivers/ptp/Kconfig' using previous resolution.
+Resolved 'net/dsa/Kconfig' using previous resolution.
+Auto-merging net/tipc/Kconfig
+Auto-merging net/sctp/Kconfig
+Auto-merging net/mac80211/Kconfig
+Auto-merging net/dsa/Kconfig
+CONFLICT (content): Merge conflict in net/dsa/Kconfig
+Auto-merging init/Kconfig
+Auto-merging fs/xfs/Kconfig
+Auto-merging drivers/ptp/Kconfig
+CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
+Auto-merging drivers/net/usb/Kconfig
+Auto-merging drivers/net/ethernet/ti/Kconfig
+Auto-merging drivers/net/ethernet/intel/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
+Auto-merging drivers/mtd/nand/Kconfig
+Auto-merging drivers/mmc/host/Kconfig
+Auto-merging drivers/cpufreq/Kconfig.arm
+Auto-merging crypto/Kconfig
+Auto-merging arch/x86/um/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/ia64/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6122959] Merge remote-tracking branch 'drop-experimental/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/CodingStyle | 10 +-----
+ Documentation/DocBook/kernel-hacking.tmpl | 7 ----
+ Documentation/DocBook/kgdb.tmpl | 6 ++--
+ Documentation/intel_txt.txt | 2 +-
+ Documentation/zh_CN/CodingStyle | 7 ----
+ arch/alpha/Kconfig | 3 +-
+ arch/cris/arch-v32/drivers/Kconfig | 4 +--
+ arch/ia64/Kconfig | 8 ++---
+ arch/ia64/kvm/Kconfig | 2 +-
+ arch/ia64/xen/Kconfig | 2 +-
+ arch/powerpc/platforms/ps3/Kconfig | 2 +-
+ arch/s390/Kconfig | 4 +--
+ arch/s390/kvm/Kconfig | 2 +-
+ arch/um/Kconfig.net | 2 +-
+ arch/um/Kconfig.um | 8 ++---
+ arch/x86/Kconfig | 22 ++++++------
+ arch/x86/um/Kconfig | 3 +-
+ crypto/Kconfig | 15 +++-----
+ drivers/cpufreq/Kconfig.arm | 4 +--
+ drivers/cpufreq/Kconfig.x86 | 6 ++--
+ drivers/gpu/drm/udl/Kconfig | 2 +-
+ drivers/i2c/muxes/Kconfig | 2 --
+ drivers/ide/Kconfig | 8 ++---
+ drivers/lguest/Kconfig | 2 +-
+ drivers/media/Kconfig | 7 ++--
+ drivers/media/pci/cx25821/Kconfig | 2 +-
+ drivers/media/platform/s5p-fimc/Kconfig | 1 -
+ drivers/media/platform/s5p-tv/Kconfig | 3 +-
+ drivers/media/usb/pvrusb2/Kconfig | 8 ++---
+ drivers/mmc/core/Kconfig | 3 +-
+ drivers/mmc/host/Kconfig | 20 +++++------
+ drivers/mtd/Kconfig | 2 +-
+ drivers/mtd/chips/Kconfig | 2 +-
+ drivers/mtd/devices/Kconfig | 4 +--
+ drivers/mtd/nand/Kconfig | 7 ++--
+ drivers/net/Kconfig | 9 +++--
+ drivers/net/ethernet/8390/Kconfig | 21 +++++------
+ drivers/net/ethernet/atheros/Kconfig | 8 ++---
+ drivers/net/ethernet/dec/tulip/Kconfig | 4 +--
+ drivers/net/ethernet/i825xx/Kconfig | 12 +++----
+ drivers/net/ethernet/intel/Kconfig | 5 ---
+ drivers/net/ethernet/natsemi/Kconfig | 3 --
+ drivers/net/ethernet/packetengines/Kconfig | 4 +--
+ drivers/net/ethernet/realtek/Kconfig | 4 +--
+ drivers/net/ethernet/silan/Kconfig | 6 ++--
+ drivers/net/ethernet/ti/Kconfig | 4 +--
+ drivers/net/team/Kconfig | 3 +-
+ drivers/net/usb/Kconfig | 16 ++++-----
+ drivers/net/wan/Kconfig | 8 ++---
+ drivers/pcmcia/Kconfig | 4 +--
+ drivers/rpmsg/Kconfig | 3 +-
+ drivers/sbus/char/Kconfig | 7 ++--
+ drivers/virtio/Kconfig | 8 ++---
+ fs/ceph/Kconfig | 4 +--
+ fs/ecryptfs/Kconfig | 4 +--
+ fs/nilfs2/Kconfig | 3 +-
+ fs/xfs/Kconfig | 4 +--
+ init/Kconfig | 54 +++++++---------------------
+ kernel/gcov/Kconfig | 2 +-
+ net/9p/Kconfig | 2 +-
+ net/Kconfig | 5 ++-
+ net/ceph/Kconfig | 4 +--
+ net/dccp/Kconfig | 4 +--
+ net/dccp/ccids/Kconfig | 5 ++-
+ net/decnet/Kconfig | 4 +--
+ net/decnet/netfilter/Kconfig | 2 +-
+ net/ieee802154/Kconfig | 3 +-
+ net/ipv4/Kconfig | 11 +-----
+ net/ipv4/netfilter/Kconfig | 4 +--
+ net/ipv6/Kconfig | 24 ++++++-------
+ net/l2tp/Kconfig | 4 +--
+ net/lapb/Kconfig | 3 +-
+ net/mac80211/Kconfig | 2 +-
+ net/mac802154/Kconfig | 2 +-
+ net/netfilter/Kconfig | 24 +++++--------
+ net/rds/Kconfig | 4 +--
+ net/rxrpc/Kconfig | 2 +-
+ net/sctp/Kconfig | 4 +--
+ net/sunrpc/Kconfig | 2 +-
+ net/tipc/Kconfig | 4 +--
+ net/wanrouter/Kconfig | 1 -
+ net/x25/Kconfig | 3 +-
+ net/xfrm/Kconfig | 16 ++++-----
+ tools/lguest/lguest.txt | 8 ++---
+ 84 files changed, 206 insertions(+), 333 deletions(-)
+Merging scsi-post-merge/merge-base:master ()
+Merging vfs/for-next (a77cfcb fix off-by-one in argument passed by iterate_fd() to callbacks)
+$ git merge vfs/for-next
+Auto-merging fs/file.c
+Merge made by the 'recursive' strategy.
+ fs/cifs/readdir.c | 5 ++++-
+ fs/file.c | 14 ++++++++------
+ fs/namei.c | 5 +++++
+ fs/nfs/dir.c | 7 ++++---
+ 4 files changed, 21 insertions(+), 10 deletions(-)
+Merging akpm-current/current (064904e drivers/rtc/rtc-tps65910.c: fix invalid pointer access on _remove())
+$ git merge akpm-current/current
+Merge made by the 'recursive' strategy.
+ drivers/mtd/mtdcore.c | 6 ++----
+ drivers/rtc/rtc-tps65910.c | 6 +++---
+ include/linux/gfp.h | 13 +++++--------
+ include/trace/events/gfpflags.h | 1 -
+ mm/memory-failure.c | 8 ++++++++
+ mm/page_alloc.c | 40 +++++++++++++++++++++++++++------------
+ mm/sparse.c | 10 ++++------
+ mm/vmscan.c | 27 +++++++++++++++++---------
+ 8 files changed, 68 insertions(+), 43 deletions(-)
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/akpm/master:akpm
+From ../next
+ * [new branch] akpm/master -> akpm
+$ git fetch --no-tags ../next refs/heads/akpm/master-base:akpm-base
+From ../next
+ * [new branch] akpm/master-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: thp: fix update_mmu_cache_pmd() calls
+Applying: CRIS: Fix I/O macros
+Applying: vfs: d_obtain_alias() needs to use "/" as default name.
+Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: arch/x86/tools/insn_sanity.c: identify source of messages
+Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
+Applying: olpc: fix olpc-xo1-sci.c build errors
+Applying: x86: convert update_mmu_cache() and update_mmu_cache_pmd() to functions
+Applying: x86: fix the argument passed to sync_global_pgds()
+Applying: x86: make 'mem=' option to work for efi platform
+Applying: audit: create explicit AUDIT_SECCOMP event type
+Applying: audit: catch possible NULL audit buffers
+Applying: ceph: fix dentry reference leak in ceph_encode_fh()
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: drivers/video: add support for the Solomon SSD1307 OLED Controller
+Applying: drivers-video-add-support-for-the-solomon-ssd1307-oled-controller-checkpatch-fixes
+Applying: drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
+Applying: irq: tsk->comm is an array
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: Coccinelle: Add api/d_find_alias.cocci.
+Applying: h8300: select generic atomic64_t support
+Applying: drivers/message/fusion/mptscsih.c: missing break
+Applying: wait: add wait_event_lock_irq() interface
+Applying: loop: limit the number of requests in the bio list
+Applying: vfs: increment iversion when a file is truncated
+Applying: fs: change return values from -EACCES to -EPERM
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
+Applying: mm/page_alloc.c: remove duplicate check
+Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
+Applying: mm: show migration types in show_mem
+Applying: mm, memcg: make mem_cgroup_out_of_memory() static
+Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
+Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
+Applying: mm-use-is_enabledconfig_compaction-instead-of-compaction_build-fix
+Applying: thp: clean up __collapse_huge_page_isolate
+Applying: thp-clean-up-__collapse_huge_page_isolate v2
+Applying: mm: introduce mm_find_pmd()
+Applying: mm-introduce-mm_find_pmd-fix
+Applying: thp: introduce hugepage_vma_check()
+Applying: thp: cleanup: introduce mk_huge_pmd()
+Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
+Applying: memory-hotplug: skip HWPoisoned page when offlining pages
+Applying: memory-hotplug: update mce_bad_pages when removing the memory
+Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
+Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
+Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
+Applying: memory-hotplug: fix NR_FREE_PAGES mismatch's fix
+Applying: numa: convert static memory to dynamically allocated memory for per node device
+Applying: memory-hotplug: suppress "Device nodeX does not have a release() function" warning
+Applying: memory-hotplug, mm/sparse.c: clear the memory to store struct page
+Applying: memory-hotplug: allocate zone's pcp before onlining pages
+Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
+Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
+Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
+Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
+Applying: mm/memory_hotplug.c: update start_pfn in zone and pg_data when spanned_pages == 0.
+Applying: mm: add comment on storage key dirty bit semantics
+Applying: mm,vmscan: only evict file pages when we have plenty
+Applying: mmvmscan-only-evict-file-pages-when-we-have-plenty-fix
+Applying: mm: refactor reinsert of swap_info in sys_swapoff()
+Applying: mm: do not call frontswap_init() during swapoff
+Applying: mm, highmem: use PKMAP_NR() to calculate an index of pkmap
+Applying: mm, highmem: remove useless pool_lock
+Applying: mm, highmem: remove page_address_pool list
+Applying: mm-highmem-remove-page_address_pool-list-v2
+Applying: mm, highmem: get virtual address of the page using PKMAP_ADDR()
+Applying: mm: thp: set the accessed flag for old pages on access fault
+Applying: mm: memmap_init_zone() performance improvement
+Applying: Documentation/cgroups/memory.txt: s/mem_cgroup_charge/mem_cgroup_change_common/
+Applying: mm, oom: allow exiting threads to have access to memory reserves
+Applying: memcg: make it possible to use the stock for more than one page
+Applying: memcg: reclaim when more than one page needed
+Applying: memcg: change defines to an enum
+Applying: memcg: kmem accounting basic infrastructure
+Applying: mm: add a __GFP_KMEMCG flag
+Applying: memcg: kmem controller infrastructure
+Applying: memcg: replace __always_inline with plain inline
+Applying: mm: allocate kernel pages to the right memcg
+Applying: res_counter: return amount of charges after res_counter_uncharge()
+Applying: memcg: kmem accounting lifecycle management
+Applying: memcg: use static branches when code not in use
+Applying: memcg: allow a memcg with kmem charges to be destructed
+Applying: memcg: execute the whole memcg freeing in free_worker()
+Applying: fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
+Applying: memcg: add documentation about the kmem controller
+Applying: slab/slub: struct memcg_params
+Applying: slab: annotate on-slab caches nodelist locks
+Applying: slab/slub: consider a memcg parameter in kmem_create_cache
+Applying: memcg: allocate memory for memcg caches whenever a new memcg appears
+Applying: memcg: simplify ida initialization
+Applying: memcg: infrastructure to match an allocation to the right cache
+Applying: memcg: skip memcg kmem allocations in specified code regions
+Applying: memcg: remove test for current->mm in memcg_stop/resume_kmem_account
+Applying: sl[au]b: always get the cache from its page in kmem_cache_free()
+Applying: sl[au]b: allocate objects from memcg cache
+Applying: memcg: destroy memcg caches
+Applying: move include of workqueue.h to top of slab.h file
+Applying: memcg/sl[au]b: track all the memcg children of a kmem_cache
+Applying: memcg/sl[au]b: shrink dead caches
+Applying: memcg: get rid of once-per-second cache shrinking for dead memcgs
+Applying: memcg: aggregate memcg cache values in slabinfo
+Applying: slab: propagate tunable values
+Applying: slub: slub-specific propagation changes
+Applying: slub-slub-specific-propagation-changes-fix
+Applying: kmem: add slab-specific documentation about the kmem controller
+Applying: memcg: add comments clarifying aspects of cache attribute propagation
+Applying: slub: drop mutex before deleting sysfs entry
+Applying: dmapool: make DMAPOOL_DEBUG detect corruption of free marker
+Applying: dmapool-make-dmapool_debug-detect-corruption-of-free-marker-fix
+Applying: mm: hwpoison: fix action_result() to print out dirty/clean
+Applying: mm: print out information of file affected by memory error
+Applying: mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB
+Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix
+Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix
+Applying: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix
+Applying: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix fix
+Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix-fix-checkpatch-fixes
+Applying: selftests: add a test program for variable huge page sizes in mmap/shmget
+Applying: mm: augment vma rbtree with rb_subtree_gap
+Applying: mm: ensure safe rb_subtree_gap update when inserting new VMA
+Applying: mm: ensure safe rb_subtree_gap update when removing VMA
+Applying: mm: debug code to verify rb_subtree_gap updates are safe
+Applying: mm-augment-vma-rbtree-with-rb_subtree_gap-fix
+Applying: mm: check rb_subtree_gap correctness
+Applying: mm-check-rb_subtree_gap-correctness-fix
+Applying: mm: rearrange vm_area_struct for fewer cache misses
+Applying: mm-rearrange-vm_area_struct-for-fewer-cache-misses-checkpatch-fixes
+Applying: mm: vm_unmapped_area() lookup function
+Applying: mm-vm_unmapped_area-lookup-function-checkpatch-fixes
+Applying: mm: use vm_unmapped_area() on x86_64 architecture
+Applying: mm: fix cache coloring on x86_64 architecture
+Applying: mm: use vm_unmapped_area() in hugetlbfs
+Applying: mm: use vm_unmapped_area() in hugetlbfs on i386 architecture
+Applying: mm-use-vm_unmapped_area-in-hugetlbfs-on-i386-architecture-fix
+Applying: mm: use vm_unmapped_area() on mips architecture
+Applying: mm-use-vm_unmapped_area-on-mips-architecture-fix
+Applying: mm: use vm_unmapped_area() on arm architecture
+Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix
+Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix-fix
+Applying: mm: use vm_unmapped_area() on sh architecture
+Applying: mm-use-vm_unmapped_area-on-sh-architecture-fix
+Applying: mm-use-vm_unmapped_area-on-sh-architecture-fix2
+Applying: mm: use vm_unmapped_area() on sparc32 architecture
+Applying: mm-use-vm_unmapped_area-on-sparc32-architecture-fix
+Applying: mm-use-vm_unmapped_area-on-sparc32-architecture-fix-fix
+Applying: mm: use vm_unmapped_area() in hugetlbfs on tile architecture
+Applying: mm-use-vm_unmapped_area-in-hugetlbfs-on-tile-architecture-fix
+Applying: mm: use vm_unmapped_area() on sparc64 architecture
+Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix
+Applying: linux-next: build warning after merge of the final tree (akpm tree related)
+Applying: mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
+Applying: mm-use-vm_unmapped_area-in-hugetlbfs-on-sparc64-architecture-fix
+Applying: arch/sparc/kernel/sys_sparc_64.c: s/COLOUR/COLOR/
+Applying: mm: adjust address_space_operations.migratepage() return code
+Applying: mm: redefine address_space.assoc_mapping
+Applying: mm: introduce a common interface for balloon pages mobility
+Applying: mm: fix balloon_page_movable() page->flags check
+Applying: mm: introduce a common interface for balloon pages mobility fix
+Applying: mm: introduce compaction and migration for ballooned pages
+Applying: virtio_balloon: introduce migration primitives to balloon pages
+Applying: virtio: balloon: fix missing unlock on error in fill_balloon()
+Applying: virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix
+Applying: virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix-fix
+Applying: mm: introduce putback_movable_pages()
+Applying: mm: add vm event counters for balloon pages compaction
+Applying: mm/vmscan.c: try_to_freeze() returns boolean
+Applying: mm, mempolicy: remove duplicate code
+Applying: mm: cleanup register_node()
+Applying: mm, oom: change type of oom_score_adj to short
+Applying: mm, oom: fix race when specifying a thread as the oom origin
+Applying: mm: cma: skip watermarks check for already isolated blocks in split_free_page()
+Applying: mm: cma: skip watermarks check for already isolated blocks in split_free_page() fix
+Applying: mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix
+Applying: mm: cma: remove watermark hacks
+Applying: mm: cma: remove watermark hacks (fix)
+Applying: bootmem: remove not implemented function call, bootmem_arch_preferred_node()
+Applying: avr32, kconfig: remove HAVE_ARCH_BOOTMEM
+Applying: bootmem: remove alloc_arch_preferred_bootmem()
+Applying: bootmem: fix wrong call parameter for free_bootmem()
+Applying: bootmem-fix-wrong-call-parameter-for-free_bootmem-fix
+Applying: mm: cma: WARN if freed memory is still in use
+Applying: drivers/base/node.c: cleanup node_state_attr[]
+Applying: mm, memory-hotplug: dynamic configure movable memory and portion memory
+Applying: mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix
+Applying: memory_hotplug: handle empty zone when online_movable/online_kernel
+Applying: memory_hotplug: ensure every online node has NORMAL memory
+Applying: thp: huge zero page: basic preparation
+Applying: thp-huge-zero-page-basic-preparation-v6
+Applying: thp: zap_huge_pmd(): zap huge zero pmd
+Applying: thp: copy_huge_pmd(): copy huge zero page
+Applying: thp-copy_huge_pmd-copy-huge-zero-page-v6
+Applying: thp: copy_huge_pmd(): copy huge zero page v6 fix
+Applying: thp: do_huge_pmd_wp_page(): handle huge zero page
+Applying: thp-do_huge_pmd_wp_page-handle-huge-zero-page-v6
+Applying: thp: change_huge_pmd(): keep huge zero page write-protected
+Applying: thp: change split_huge_page_pmd() interface
+Applying: thp-change-split_huge_page_pmd-interface-v6
+Applying: thp: implement splitting pmd for huge zero page
+Applying: thp-implement-splitting-pmd-for-huge-zero-page-fix
+Applying: thp-implement-splitting-pmd-for-huge-zero-page-v6
+Applying: thp: setup huge zero page on non-write page fault
+Applying: thp-setup-huge-zero-page-on-non-write-page-fault-fix
+Applying: thp: lazy huge zero page allocation
+Applying: thp: implement refcounting for huge zero page
+Applying: thp, vmstat: implement HZP_ALLOC and HZP_ALLOC_FAILED events
+Applying: thp, vmstat: implement HZP_ALLOC and HZP_ALLOC_FAILED events
+Applying: thp: introduce sysfs knob to disable huge zero page
+Applying: mm: compaction: Fix compiler warning
+Applying: mm: use migrate_prep() instead of migrate_prep_local()
+Applying: mm: node_states: introduce N_MEMORY
+Applying: cpuset: use N_MEMORY instead N_HIGH_MEMORY
+Applying: procfs: use N_MEMORY instead N_HIGH_MEMORY
+Applying: memcontrol: use N_MEMORY instead N_HIGH_MEMORY
+Applying: oom: use N_MEMORY instead N_HIGH_MEMORY
+Applying: mm,migrate: use N_MEMORY instead N_HIGH_MEMORY
+Applying: mempolicy: use N_MEMORY instead N_HIGH_MEMORY
+Applying: hugetlb: use N_MEMORY instead N_HIGH_MEMORY
+Applying: vmstat: use N_MEMORY instead N_HIGH_MEMORY
+Applying: kthread: use N_MEMORY instead N_HIGH_MEMORY
+Applying: init: use N_MEMORY instead N_HIGH_MEMORY
+Applying: vmscan: use N_MEMORY instead N_HIGH_MEMORY
+Applying: page_alloc: use N_MEMORY instead N_HIGH_MEMORY change the node_states initialization
+Applying: hotplug: update nodemasks management
+Applying: res_counter: delete res_counter_write()
+Applying: mm: WARN_ON_ONCE if f_op->mmap() change vma's start address
+Applying: mm: add a reminder comment for __GFP_BITS_SHIFT
+Applying: mm, memcg: avoid unnecessary function call when memcg is disabled
+Applying: numa: add CONFIG_MOVABLE_NODE for movable-dedicated node
+Applying: numa-add-config_movable_node-for-movable-dedicated-node-fix
+Applying: memory_hotplug: allow online/offline memory to result movable node
+Applying: mm, oom: cleanup pagefault oom handler
+Applying: mm, oom: remove redundant sleep in pagefault oom handler
+Applying: mm, oom: remove statically defined arch functions of same name
+Applying: mm: introduce new field "managed_pages" to struct zone
+Applying: mm-introduce-new-field-managed_pages-to-struct-zone-fix
+Applying: mm: trace filemap add and del
+Applying: writeback: fix a typo in comment
+Applying: fs/buffer.c: do not inline exported function
+Applying: fs/buffer.c: remove redundant initialization in alloc_page_buffers()
+Applying: mm: provide more accurate estimation of pages occupied by memmap
+Applying: mm-provide-more-accurate-estimation-of-pages-occupied-by-memmap-fix
+Applying: drop_caches: add some documentation and info message
+Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
+Applying: swap: add a simple detector for inappropriate swapin readahead
+Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
+Applying: mm/memblock: reduce overhead in binary search
+Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
+Applying: mm/dmapool.c: fix null dev in dma_pool_create()
+Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
+Applying: Documentation/kernel-parameters.txt: update mem= option's spec according to its implementation
+Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
+Applying: scripts/tags.sh: add magic for declarations of popular kernel type
+Applying: Documentation: remove reference to feature-removal-schedule.txt
+Applying: kernel: remove reference to feature-removal-schedule.txt
+Applying: sound: remove reference to feature-removal-schedule.txt
+Applying: drivers: remove reference to feature-removal-schedule.txt
+Applying: Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS
+Applying: printk: boot_delay should only affect output
+Applying: MAINTAINERS: CHINESE MAINTAINERS mailing list is subscribers only
+Applying: MAINTAINERS: remove include/linux/ext3*
+Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
+Applying: backlight: 88pm860x_bl: fix checkpatch warning
+Applying: backlight: atmel-pwm-bl: fix checkpatch warning
+Applying: backlight: corgi_lcd: fix checkpatch error and warning
+Applying: backlight: da903x_bl: fix checkpatch warning
+Applying: backlight: generic_bl: fix checkpatch warning
+Applying: backlight: hp680_bl: fix checkpatch error and warning
+Applying: backlight: ili9320: fix checkpatch error and warning
+Applying: backlight: jornada720: fix checkpatch error and warning
+Applying: backlight: l4f00242t03: fix checkpatch warning
+Applying: backlight: lm3630: fix checkpatch warning
+Applying: backlight: locomolcd: fix checkpatch error and warning
+Applying: backlight: omap1: fix checkpatch warning
+Applying: backlight: pcf50633: fix checkpatch warning
+Applying: backlight: platform_lcd: fix checkpatch error
+Applying: backlight: tdo24m: fix checkpatch warning
+Applying: backlight: tosa: fix checkpatch error and warning
+Applying: backlight: vgg2432a4: fix checkpatch warning
+Applying: backlight: lms283gf05: use devm_gpio_request_one
+Applying: backlight: tosa: use devm_gpio_request_one
+Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
+Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
+Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
+Applying: drivers/video/backlight/da9052_bl.c: add missing const
+Applying: drivers/video/backlight/lms283gf05.c: add missing const
+Applying: drivers/video/backlight/tdo24m.c: add missing const
+Applying: drivers/video/backlight/vgg2432a4.c: add missing const
+Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
+Applying: drivers/video/backlight/88pm860x_bl.c: drop devm_kfree of devm_kzalloc'd data
+Applying: drivers/video/backlight/max8925_bl.c: drop devm_kfree of devm_kzalloc'd data
+Applying: drivers/video/backlight/lm3639_bl.c: fix up world writable sysfs file
+Applying: drivers/video/backlight/ep93xx_bl.c: fix section mismatch
+Applying: drivers/video/backlight/hp680_bl.c: add missing __devexit macros for remove
+Applying: drivers/video/backlight/ili9320.c: add missing __devexit macros for remove
+Applying: backlight: add of_find_backlight_by_node()
+Applying: backlight-add-of_find_backlight_by_node-function-fix
+Applying: backlight-add-of_find_backlight_by_node-function-fix-2
+Applying: drivers/video/backlight/pandora_bl.c: change TWL4030_MODULE_PWM0 to TWL_MODULE_PWM
+Applying: backlight: 88pm860x_bl: remove an unnecessary line continuation
+Applying: backlight-88pm860x_bl-remove-an-unnecessary-line-continuation-fix
+Applying: drivers/video/backlight/lcd.c: return ENXIO when ops functions cannot be called
+Applying: drivers/video/backlight/lms283gf05.c: use GPIOF_INIT flags when using devm_gpio_request_one()
+Applying: string: introduce helper to get base file name from given path
+Applying: lib: dynamic_debug: use kbasename()
+Applying: mm: use kbasename()
+Applying: procfs: use kbasename()
+Applying: proc_devtree: remove duplicated include from proc_devtree.c
+Applying: trace: use kbasename()
+Applying: drivers/of/fdt.c: re-use kernel's kbasename()
+Applying: sscanf: don't ignore field widths for numeric conversions
+Applying: percpu_rw_semaphore: reimplement to not block the readers unnecessarily
+Using index info to reconstruct a base tree...
+M include/linux/percpu-rwsem.h
+Falling back to patching base and 3-way merge...
+Auto-merging include/linux/percpu-rwsem.h
+CONFLICT (content): Merge conflict in include/linux/percpu-rwsem.h
+Failed to merge in the changes.
+Patch failed at 0316 percpu_rw_semaphore: reimplement to not block the readers unnecessarily
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To check out the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --continue
+Applying: percpu_rw_semaphore-reimplement-to-not-block-the-readers-unnecessari-lyfix
+Applying: percpu_rw_semaphore: kill ->writer_mutex, add ->write_ctr
+Applying: percpu_rw_semaphore: add lockdep annotations
+Applying: percpu_rw_semaphore: introduce CONFIG_PERCPU_RWSEM
+Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
+Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
+Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
+Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
+Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
+Applying: checkpatch: warn on unnecessary line continuations
+Applying: checkpatch: warn about using CONFIG_EXPERIMENTAL
+Applying: checkpatch: remove reference to feature-removal-schedule.txt
+Applying: checkpatch: consolidate if (foo) bar(foo) checks and add debugfs_remove
+Applying: checkpatch: allow control over line length warning, default remains 80
+Applying: checkpatch: extend line continuation test
+Applying: checkpatch: Add --strict messages for blank lines around braces
+Applying: epoll: support for disabling items, and a self-test app
+Applying: binfmt_elf: fix corner case kfree of uninitialized data
+Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
+Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
+Applying: rtc: omap: kicker mechanism support
+Applying: ARM: davinci: remove rtc kicker release
+Applying: rtc: omap: dt support
+Applying: rtc: omap: depend on am33xx
+Applying: rtc: omap: add runtime pm support
+Applying: drivers/rtc/rtc-imxdi: support for i.MX53
+Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
+Applying: drivers/rtc/rtc-vt8500.c: convert to use devm_kzalloc
+Applying: drivers/rtc/rtc-test.c: avoid calling platform_device_put() twice
+Applying: rtc-avoid-calling-platform_device_put-twice-in-test_init-fix
+Applying: rtc: rtc-spear: use devm_*() routines
+Applying: rtc-rtc-spear-use-devm_-routines-fix
+Applying: rtc: rtc-spear: Add clk_{un}prepare() support
+Applying: rtc: rtc-spear: Provide flag for no support of UIE mode
+Applying: drivers/rtc/rtc-tps65910.c: rename irq to match device
+Applying: rtc: rtc-davinci: return correct error code if rtc_device_register() fails
+Applying: rtc: rtc-davinci: use devm_kzalloc()
+Applying: rtc: add NXP PCF8523 support
+Applying: rtc-add-nxp-pcf8523-support-v2
+Applying: drivers/rtc/rtc-s3c.c: remove unnecessary err_nores label
+Applying: drivers/rtc/rtc-s3c.c: convert to use devm_* API
+Applying: drivers/rtc/rtc-dev.c: remove unused code from rtc-dev.c
+Applying: hfsplus: avoid crash on failed block map free
+Applying: hfsplus: add osx.* prefix for handling namespace of Mac OS X extended attributes
+Applying: hfsplus-add-osx-prefix-for-handling-namespace-of-mac-os-x-extended-attributes-checkpatch-fixes
+Applying: hfsplus: add on-disk layout declarations related to attributes tree
+Applying: hfsplus: add functionality of manipulating by records in attributes tree
+Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
+Applying: hfsplus-rework-functionality-of-getting-setting-and-deleting-of-extended-attributes-fix
+Applying: hfsplus: add support of manipulation by attributes file
+Applying: hfsplus: rework processing errors in hfsplus_free_extents()
+Applying: fat: notify when discard is not supported
+Applying: fat: provide option for setting timezone offset
+Applying: fat: ix mount option parsing
+Applying: fs/fat: strip "cp" prefix from codepage in display
+Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
+Applying: Documentation: fix Documentation/security/00-INDEX
+Applying: kstrto*: add documentation
+Applying: simple_strto*: annotate function as obsolete
+Applying: ptrace: introduce PTRACE_O_EXITKILL
+Applying: proc: don't show nonexistent capabilities
+Applying: procfs: add VmFlags field in smaps output
+Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
+Applying: /proc/pid/status: add "Seccomp" field
+Applying: proc: pid/status: show all supplementary groups
+Applying: fork: unshare: remove dead code
+Applying: exec: do not leave bprm->interp on stack
+Applying: exec: use -ELOOP for max recursion depth
+Applying: ipc: remove forced assignment of selected message
+Applying: ipc: add sysctl to specify desired next object id
+Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
+Applying: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
+Applying: Documentation: update sysctl/kernel.txt
+Applying: ipc: message queue receive cleanup
+Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
+Applying: ipc: introduce message queue copy feature
+Applying: ipc: remove redundant MSG_COPY check
+Applying: ipc: cleanup do_msgrcv() around MSG_COPY feature
+Applying: selftests: IPC message queue copy feature test
+Applying: test: IPC message queue copy feature test update
+Applying: ipc: simplify free_copy() call
+Applying: ipc: convert prepare_copy() from macro to function
+Applying: ipc-convert-prepare_copy-from-macro-to-function-fix
+Applying: ipc: simplify message copying
+Applying: ipc: add more comments to message copying related code
+Applying: Documentation/sysctl/kernel.txt: document /proc/sys/shmall
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: pidns: remove unused is_container_init()
+Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
+Applying: Documentation/sparse.txt: document context annotations for lock checking
+Applying: aoe: describe the behavior of the "err" character device
+Applying: aoe: print warning regarding a common reason for dropped transmits
+Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
+Applying: aoe: avoid using skb member after dev_queue_xmit
+Applying: aoe: update cap on outstanding commands based on config query response
+Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
+Applying: aoe: support larger I/O requests via aoe_maxsectors module param
+Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
+Applying: aoe: cleanup: remove unused ata_scnt function
+Applying: aoe: whitespace cleanup
+Applying: aoe: update driver-internal version number to 60
+Applying: aoe: provide ATA identify device content to user on request
+Applying: aoe: improve network congestion handling
+Applying: aoe: err device: include MAC addresses for unexpected responses
+Applying: aoe: manipulate aoedev network stats under lock
+Applying: aoe: use high-resolution RTTs with fallback to low-res
+Applying: aoe: commands in retransmit queue use new destination on failure
+Applying: aoe: update driver-internal version to 64+
+Applying: aoe: copy fallback timing information on destination failover
+Applying: aoe: remove vestigial request queue allocation
+Applying: aoe: increase default cap on outstanding AoE commands in the network
+Applying: aoe: cleanup: correct comment for aoetgt nout
+Applying: aoe: remove call to request handler from I/O completion
+Applying: aoe: make error messages more specific in static minor allocation
+Applying: aoe: initialize sysminor to avoid compiler warning
+Applying: aoe: return real minor number for static minors
+Applying: random32: rename random32 to prandom
+Applying: prandom: introduce prandom_bytes() and prandom_bytes_state()
+Applying: bnx2x: use prandom_bytes()
+Applying: mtd: nandsim: use prandom_bytes
+Applying: ubifs: use prandom_bytes
+Applying: mtd: mtd_nandecctest: use prandom_bytes instead of get_random_bytes()
+Applying: mtd: mtd_oobtest: convert to use prandom library
+Applying: mtd: mtd_pagetest: convert to use prandom library
+Applying: mtd: mtd_speedtest: use prandom_bytes
+Applying: mtd: mtd_subpagetest: convert to use prandom library
+Applying: mtd: mtd_stresstest: use prandom_bytes()
+Applying: Documentation/DMA-API-HOWTO.txt: fix typo
+Applying: vm selftests: print failure status instead of cause make error
+Applying: mqueue selftests: print failure status instead of cause make error
+Applying: cpu-hotplug selftests: print failure status instead of cause make error
+Applying: mem-hotplug selftests: print failure status instead of cause make error
+Applying: kcmp selftests: make run_tests fix
+Applying: kcmp selftests: print fail status instead of cause make error
+Applying: breakpoint selftests: print failure status instead of cause make error
+Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
+Applying: procfs: add ability to plug in auxiliary fdinfo providers
+Applying: fs, eventfd: add procfs fdinfo helper
+Applying: fs, epoll: add procfs fdinfo helper
+Applying: fs, epoll: drop enabled field from fdinfo output
+Applying: fdinfo: show sigmask for signalfd fd
+Applying: fs, exportfs: escape nil dereference if no s_export_op present
+Applying: fs, exportfs: add exportfs_encode_inode_fh() helper
+Applying: fs, notify: add procfs fdinfo helper
+Applying: fs, notify: Move bare fdinfo helpers to a header
+Applying: fs, notify: add missing space after prefix
+Applying: fs, notify: don't forget to provide fhandle for inode fanotify
+Applying: docs: add documentation about /proc/<pid>/fdinfo/<fd> output
+Applying: docs-add-documentation-about-proc-pid-fdinfo-fd-output-fix
+Applying: fs-notify-add-procfs-fdinfo-helper-v7-fix
+Applying: scatterlist: don't BUG when we can trivially return a proper error.
+Applying: scatterlist-dont-bug-when-we-can-trivially-return-a-proper-error-fix
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + dc9e382...cfb65da akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (cfb65da scatterlist-dont-bug-when-we-can-trivially-return-a-proper-error-fix)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/00-INDEX | 2 -
+ Documentation/ABI/README | 3 -
+ Documentation/DMA-API-HOWTO.txt | 9 +-
+ Documentation/DocBook/kernel-api.tmpl | 3 +
+ Documentation/backlight/lp855x-driver.txt | 10 +-
+ Documentation/cgroups/cpusets.txt | 2 +-
+ Documentation/cgroups/memory.txt | 72 +-
+ Documentation/cgroups/resource_counter.txt | 7 +-
+ .../devicetree/bindings/rtc/imxdi-rtc.txt | 17 +
+ Documentation/devicetree/bindings/rtc/rtc-omap.txt | 17 +
+ .../devicetree/bindings/video/ssd1307fb.txt | 24 +
+ Documentation/filesystems/proc.txt | 124 +-
+ Documentation/filesystems/vfat.txt | 9 +
+ Documentation/kernel-parameters.txt | 7 +-
+ Documentation/memory-hotplug.txt | 24 +-
+ Documentation/security/00-INDEX | 2 +
+ Documentation/sparse.txt | 18 +
+ Documentation/sysctl/kernel.txt | 32 +
+ Documentation/sysctl/vm.txt | 33 +-
+ Documentation/vm/transhuge.txt | 19 +-
+ MAINTAINERS | 4 +-
+ arch/Kconfig | 8 +
+ arch/alpha/include/asm/mman.h | 11 +
+ arch/arm/mach-davinci/devices-da8xx.c | 13 +-
+ arch/arm/mm/mmap.c | 132 +-
+ arch/arm64/include/asm/unistd.h | 1 +
+ arch/arm64/kernel/sys_compat.c | 15 -
+ arch/avr32/Kconfig | 3 -
+ arch/cris/include/asm/io.h | 39 +-
+ arch/h8300/Kconfig | 1 +
+ arch/mips/include/uapi/asm/mman.h | 11 +
+ arch/mips/mm/mmap.c | 111 +-
+ arch/parisc/include/uapi/asm/mman.h | 11 +
+ arch/powerpc/Kconfig | 4 +-
+ arch/powerpc/include/asm/machdep.h | 36 +-
+ arch/powerpc/include/asm/systbl.h | 2 +-
+ arch/powerpc/include/asm/unistd.h | 1 +
+ arch/powerpc/kernel/sys_ppc32.c | 17 +-
+ arch/powerpc/kernel/sysfs.c | 4 +-
+ arch/powerpc/mm/fault.c | 27 +-
+ arch/powerpc/platforms/cell/celleb_pci.c | 4 +-
+ arch/s390/include/asm/page.h | 3 +
+ arch/sh/Kconfig | 4 +-
+ arch/sh/mm/fault.c | 19 +-
+ arch/sh/mm/mmap.c | 137 +-
+ arch/sparc/Kconfig | 4 +-
+ arch/sparc/include/asm/unistd.h | 1 +
+ arch/sparc/kernel/sys_sparc32.c | 14 -
+ arch/sparc/kernel/sys_sparc_32.c | 27 +-
+ arch/sparc/kernel/sys_sparc_64.c | 150 +-
+ arch/sparc/mm/hugetlbpage.c | 124 +-
+ arch/tile/include/asm/compat.h | 2 -
+ arch/tile/include/asm/unistd.h | 1 +
+ arch/tile/kernel/compat.c | 18 -
+ arch/tile/mm/hugetlbpage.c | 139 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/e820.h | 2 +
+ arch/x86/include/asm/elf.h | 6 +-
+ arch/x86/include/asm/mman.h | 3 +
+ arch/x86/include/asm/pgtable.h | 12 +
+ arch/x86/include/asm/pgtable_32.h | 7 -
+ arch/x86/include/asm/pgtable_64.h | 3 -
+ arch/x86/include/asm/uv/uv.h | 2 +-
+ arch/x86/kernel/e820.c | 72 +-
+ arch/x86/kernel/sys_x86_64.c | 151 +-
+ arch/x86/kernel/vm86_32.c | 2 +-
+ arch/x86/mm/fault.c | 23 +-
+ arch/x86/mm/hugetlbpage.c | 130 +-
+ arch/x86/mm/init_64.c | 8 +-
+ arch/x86/mm/numa.c | 3 +-
+ arch/x86/platform/efi/efi.c | 15 +-
+ arch/x86/platform/iris/iris.c | 67 +-
+ arch/x86/platform/uv/tlb_uv.c | 10 +-
+ arch/x86/tools/insn_sanity.c | 10 +-
+ arch/x86/vdso/vma.c | 2 +-
+ arch/xtensa/include/uapi/asm/mman.h | 11 +
+ block/Kconfig | 1 +
+ drivers/base/memory.c | 42 +-
+ drivers/base/node.c | 86 +-
+ drivers/block/aoe/aoe.h | 32 +-
+ drivers/block/aoe/aoeblk.c | 66 +-
+ drivers/block/aoe/aoechr.c | 7 +-
+ drivers/block/aoe/aoecmd.c | 334 +++--
+ drivers/block/aoe/aoedev.c | 117 +-
+ drivers/block/aoe/aoemain.c | 2 +-
+ drivers/block/aoe/aoenet.c | 13 +-
+ drivers/block/loop.c | 10 +
+ drivers/firmware/dmi_scan.c | 78 +-
+ drivers/macintosh/smu.c | 2 +-
+ drivers/md/md.c | 2 +-
+ drivers/md/md.h | 26 -
+ drivers/md/raid1.c | 15 +-
+ drivers/md/raid10.c | 15 +-
+ drivers/md/raid5.c | 12 +-
+ drivers/message/fusion/mptscsih.c | 1 +
+ drivers/mtd/nand/nandsim.c | 5 +-
+ drivers/mtd/tests/mtd_nandecctest.c | 2 +-
+ drivers/mtd/tests/mtd_oobtest.c | 49 +-
+ drivers/mtd/tests/mtd_pagetest.c | 43 +-
+ drivers/mtd/tests/mtd_speedtest.c | 9 +-
+ drivers/mtd/tests/mtd_stresstest.c | 3 +-
+ drivers/mtd/tests/mtd_subpagetest.c | 42 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 +-
+ drivers/net/wireless/Kconfig | 6 +-
+ drivers/of/fdt.c | 10 +-
+ drivers/pcmcia/cs.c | 37 +-
+ drivers/rtc/Kconfig | 21 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-davinci.c | 21 +-
+ drivers/rtc/rtc-dev.c | 19 -
+ drivers/rtc/rtc-imxdi.c | 11 +
+ drivers/rtc/rtc-omap.c | 80 +-
+ drivers/rtc/rtc-pcf8523.c | 326 +++++
+ drivers/rtc/rtc-s3c.c | 48 +-
+ drivers/rtc/rtc-spear.c | 91 +-
+ drivers/rtc/rtc-test.c | 14 +-
+ drivers/rtc/rtc-tps65910.c | 2 +-
+ drivers/rtc/rtc-vt8500.c | 15 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 4 +-
+ drivers/staging/android/lowmemorykiller.c | 16 +-
+ drivers/usb/gadget/amd5536udc.c | 16 +-
+ drivers/video/Kconfig | 15 +
+ drivers/video/Makefile | 1 +
+ drivers/video/backlight/88pm860x_bl.c | 18 +-
+ drivers/video/backlight/atmel-pwm-bl.c | 7 +-
+ drivers/video/backlight/backlight.c | 29 +
+ drivers/video/backlight/corgi_lcd.c | 16 +-
+ drivers/video/backlight/da903x_bl.c | 15 +-
+ drivers/video/backlight/da9052_bl.c | 2 +-
+ drivers/video/backlight/ep93xx_bl.c | 4 +-
+ drivers/video/backlight/generic_bl.c | 4 +-
+ drivers/video/backlight/hp680_bl.c | 8 +-
+ drivers/video/backlight/ili9320.c | 16 +-
+ drivers/video/backlight/ili9320.h | 2 +-
+ drivers/video/backlight/jornada720_bl.c | 34 +-
+ drivers/video/backlight/jornada720_lcd.c | 3 +-
+ drivers/video/backlight/l4f00242t03.c | 3 +-
+ drivers/video/backlight/lcd.c | 8 +-
+ drivers/video/backlight/lm3630_bl.c | 2 +-
+ drivers/video/backlight/lm3639_bl.c | 2 +-
+ drivers/video/backlight/lms283gf05.c | 17 +-
+ drivers/video/backlight/locomolcd.c | 65 +-
+ drivers/video/backlight/lp855x_bl.c | 51 +-
+ drivers/video/backlight/max8925_bl.c | 11 +-
+ drivers/video/backlight/omap1_bl.c | 4 +-
+ drivers/video/backlight/pandora_bl.c | 8 +-
+ drivers/video/backlight/pcf50633-backlight.c | 8 +-
+ drivers/video/backlight/platform_lcd.c | 2 +-
+ drivers/video/backlight/s6e63m0.c | 2 +-
+ drivers/video/backlight/tdo24m.c | 33 +-
+ drivers/video/backlight/tosa_bl.c | 10 +-
+ drivers/video/backlight/tosa_lcd.c | 24 +-
+ drivers/video/backlight/vgg2432a4.c | 10 +-
+ drivers/video/console/softcursor.c | 3 +-
+ drivers/video/ssd1307fb.c | 396 +++++
+ drivers/virtio/virtio_balloon.c | 151 +-
+ fs/attr.c | 5 +
+ fs/autofs4/root.c | 2 +-
+ fs/binfmt_elf.c | 25 +-
+ fs/binfmt_em86.c | 1 -
+ fs/binfmt_misc.c | 11 +-
+ fs/binfmt_script.c | 8 +-
+ fs/block_dev.c | 9 +-
+ fs/btrfs/disk-io.c | 8 +-
+ fs/btrfs/file.c | 3 +-
+ fs/btrfs/ioctl.c | 2 +-
+ fs/buffer.c | 18 +-
+ fs/ceph/export.c | 4 +-
+ fs/dcache.c | 2 +-
+ fs/dlm/config.c | 2 +-
+ fs/drop_caches.c | 2 +
+ fs/eventfd.c | 20 +
+ fs/eventpoll.c | 68 +-
+ fs/exec.c | 25 +-
+ fs/exportfs/expfs.c | 19 +-
+ fs/fat/fat.h | 3 +-
+ fs/fat/inode.c | 55 +-
+ fs/fat/misc.c | 9 +-
+ fs/fs-writeback.c | 2 +-
+ fs/gfs2/glock.c | 2 +-
+ fs/gfs2/sys.c | 18 +-
+ fs/hfsplus/Makefile | 4 +-
+ fs/hfsplus/attributes.c | 399 +++++
+ fs/hfsplus/bfind.c | 93 +-
+ fs/hfsplus/bitmap.c | 13 +-
+ fs/hfsplus/bnode.c | 6 +-
+ fs/hfsplus/brec.c | 23 +-
+ fs/hfsplus/btree.c | 8 +
+ fs/hfsplus/catalog.c | 36 +-
+ fs/hfsplus/dir.c | 55 +-
+ fs/hfsplus/extents.c | 28 +-
+ fs/hfsplus/hfsplus_fs.h | 52 +-
+ fs/hfsplus/hfsplus_raw.h | 68 +-
+ fs/hfsplus/inode.c | 18 +-
+ fs/hfsplus/ioctl.c | 108 --
+ fs/hfsplus/super.c | 56 +-
+ fs/hfsplus/unicode.c | 7 +-
+ fs/hfsplus/xattr.c | 709 +++++++++
+ fs/hfsplus/xattr.h | 60 +
+ fs/hfsplus/xattr_security.c | 104 ++
+ fs/hfsplus/xattr_trusted.c | 63 +
+ fs/hfsplus/xattr_user.c | 63 +
+ fs/hugetlbfs/inode.c | 109 +-
+ fs/inode.c | 2 +-
+ fs/ncpfs/ioctl.c | 2 +-
+ fs/nilfs2/page.c | 2 +-
+ fs/notify/Makefile | 2 +-
+ fs/notify/fanotify/fanotify_user.c | 2 +
+ fs/notify/fdinfo.c | 150 ++
+ fs/notify/fdinfo.h | 27 +
+ fs/notify/inotify/inotify_user.c | 2 +
+ fs/ocfs2/file.c | 5 +-
+ fs/proc/array.c | 21 +-
+ fs/proc/base.c | 16 +-
+ fs/proc/fd.c | 2 +
+ fs/proc/kcore.c | 2 +-
+ fs/proc/proc_devtree.c | 6 +-
+ fs/proc/task_mmu.c | 59 +-
+ fs/signalfd.c | 18 +
+ fs/splice.c | 5 +-
+ fs/ubifs/debug.c | 8 +-
+ fs/udf/file.c | 2 +-
+ include/linux/audit.h | 3 +-
+ include/linux/backlight.h | 10 +
+ include/linux/balloon_compaction.h | 280 ++++
+ include/linux/binfmts.h | 3 +-
+ include/linux/bootmem.h | 4 +-
+ include/linux/compat.h | 3 +
+ include/linux/compiler.h | 2 +
+ include/linux/cpuset.h | 2 +-
+ include/linux/exportfs.h | 2 +
+ include/linux/fs.h | 6 +-
+ include/linux/gfp.h | 11 +-
+ include/linux/huge_mm.h | 22 +-
+ include/linux/hugetlb.h | 7 +-
+ include/linux/init.h | 40 +-
+ include/linux/ipc_namespace.h | 1 +
+ include/linux/kernel.h | 47 +-
+ include/linux/loop.h | 3 +
+ include/linux/memcontrol.h | 218 ++-
+ include/linux/memory.h | 2 +
+ include/linux/memory_hotplug.h | 13 +-
+ include/linux/migrate.h | 19 +
+ include/linux/mm.h | 39 +
+ include/linux/mm_types.h | 19 +-
+ include/linux/mmzone.h | 50 +-
+ include/linux/msg.h | 6 +-
+ include/linux/node.h | 3 +-
+ include/linux/nodemask.h | 5 +
+ include/linux/oom.h | 21 +-
+ include/linux/page-isolation.h | 10 +-
+ include/linux/pagemap.h | 16 +
+ include/linux/percpu-rwsem.h | 91 +-
+ include/linux/platform_data/lp855x.h | 9 +-
+ include/linux/proc_fs.h | 3 +
+ include/linux/ptrace.h | 2 +
+ include/linux/random.h | 19 +-
+ include/linux/res_counter.h | 17 +-
+ include/linux/rmap.h | 3 +
+ include/linux/sched.h | 14 +-
+ include/linux/shm.h | 15 +
+ include/linux/slab.h | 48 +
+ include/linux/slab_def.h | 3 +
+ include/linux/slub_def.h | 9 +-
+ include/linux/string.h | 11 +
+ include/linux/thread_info.h | 2 +
+ include/linux/types.h | 1 +
+ include/linux/vm_event_item.h | 9 +-
+ include/linux/wait.h | 166 +++
+ include/linux/writeback.h | 9 +-
+ include/trace/events/filemap.h | 79 +
+ include/trace/events/gfpflags.h | 1 +
+ include/trace/events/oom.h | 4 +-
+ include/trace/events/task.h | 8 +-
+ include/uapi/asm-generic/mman-common.h | 11 +
+ include/uapi/asm-generic/mman.h | 2 +
+ include/uapi/linux/audit.h | 1 +
+ include/uapi/linux/eventpoll.h | 1 +
+ include/uapi/linux/msg.h | 1 +
+ include/uapi/linux/ptrace.h | 5 +-
+ include/uapi/linux/xattr.h | 13 +-
+ init/Kconfig | 3 +-
+ init/main.c | 2 +-
+ ipc/compat.c | 46 +-
+ ipc/ipc_sysctl.c | 32 +
+ ipc/msg.c | 123 +-
+ ipc/msgutil.c | 43 +
+ ipc/sem.c | 250 +++-
+ ipc/shm.c | 3 +-
+ ipc/util.c | 16 +-
+ ipc/util.h | 2 +
+ kernel/audit.c | 4 +
+ kernel/audit_tree.c | 26 +-
+ kernel/audit_watch.c | 2 +
+ kernel/auditsc.c | 20 +-
+ kernel/cgroup.c | 1 -
+ kernel/compat.c | 17 +
+ kernel/cpuset.c | 32 +-
+ kernel/fork.c | 11 +-
+ kernel/irq/manage.c | 2 +-
+ kernel/kthread.c | 2 +-
+ kernel/module.c | 3 -
+ kernel/pid.c | 15 -
+ kernel/printk.c | 40 +-
+ kernel/ptrace.c | 3 +
+ kernel/res_counter.c | 42 +-
+ kernel/time.c | 4 +-
+ kernel/timeconst.pl | 2 +-
+ kernel/trace/trace_uprobe.c | 8 +-
+ kernel/watchdog.c | 10 +-
+ lib/Kconfig | 3 +
+ lib/Makefile | 1 +
+ lib/cpumask.c | 2 +-
+ lib/dynamic_debug.c | 9 +-
+ lib/interval_tree_test_main.c | 7 +-
+ lib/kstrtox.c | 64 +
+ lib/percpu-rwsem.c | 165 +++
+ lib/random32.c | 97 +-
+ lib/rbtree_test.c | 6 +-
+ lib/scatterlist.c | 3 +-
+ lib/vsprintf.c | 104 +-
+ mm/Kconfig | 23 +
+ mm/Makefile | 3 +-
+ mm/balloon_compaction.c | 304 ++++
+ mm/bootmem.c | 73 +-
+ mm/compaction.c | 135 +-
+ mm/dmapool.c | 29 +-
+ mm/filemap.c | 5 +
+ mm/highmem.c | 29 +-
+ mm/huge_memory.c | 518 +++++--
+ mm/hugetlb.c | 28 +-
+ mm/internal.h | 53 +
+ mm/ksm.c | 21 +-
+ mm/memblock.c | 5 +
+ mm/memcontrol.c | 1547 +++++++++++++++++---
+ mm/memory-failure.c | 28 +-
+ mm/memory.c | 29 +-
+ mm/memory_hotplug.c | 415 +++++-
+ mm/mempolicy.c | 35 +-
+ mm/migrate.c | 102 +-
+ mm/mmap.c | 517 +++++--
+ mm/mprotect.c | 2 +-
+ mm/mremap.c | 2 +-
+ mm/nobootmem.c | 22 +
+ mm/oom_kill.c | 138 +-
+ mm/page-writeback.c | 11 +-
+ mm/page_alloc.c | 343 +++--
+ mm/page_cgroup.c | 5 +-
+ mm/page_isolation.c | 27 +-
+ mm/pagewalk.c | 2 +-
+ mm/rmap.c | 59 +-
+ mm/shmem.c | 1 +
+ mm/slab.c | 94 +-
+ mm/slab.h | 137 +-
+ mm/slab_common.c | 118 +-
+ mm/slob.c | 2 +-
+ mm/slub.c | 154 +-
+ mm/sparse.c | 25 +-
+ mm/swap_state.c | 6 +
+ mm/swapfile.c | 31 +-
+ mm/truncate.c | 8 +-
+ mm/vmalloc.c | 4 +-
+ mm/vmscan.c | 32 +-
+ mm/vmstat.c | 21 +-
+ scripts/checkpatch.pl | 94 +-
+ scripts/coccinelle/api/d_find_alias.cocci | 80 +
+ scripts/pnmtologo.c | 8 +-
+ scripts/tags.sh | 41 +-
+ sound/Kconfig | 3 -
+ sound/sound_core.c | 3 +-
+ tools/testing/selftests/Makefile | 2 +-
+ tools/testing/selftests/breakpoints/Makefile | 2 +-
+ tools/testing/selftests/cpu-hotplug/Makefile | 2 +-
+ tools/testing/selftests/epoll/Makefile | 11 +
+ tools/testing/selftests/epoll/test_epoll.c | 364 +++++
+ tools/testing/selftests/ipc/Makefile | 25 +
+ tools/testing/selftests/ipc/msgque.c | 246 ++++
+ tools/testing/selftests/kcmp/Makefile | 6 +-
+ tools/testing/selftests/kcmp/kcmp_test.c | 6 +-
+ tools/testing/selftests/memory-hotplug/Makefile | 2 +-
+ tools/testing/selftests/mqueue/Makefile | 4 +-
+ tools/testing/selftests/vm/Makefile | 6 +-
+ tools/testing/selftests/vm/thuge-gen.c | 254 ++++
+ 383 files changed, 12494 insertions(+), 4008 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt
+ create mode 100644 Documentation/devicetree/bindings/video/ssd1307fb.txt
+ create mode 100644 drivers/rtc/rtc-pcf8523.c
+ create mode 100644 drivers/video/ssd1307fb.c
+ create mode 100644 fs/hfsplus/attributes.c
+ create mode 100644 fs/hfsplus/xattr.c
+ create mode 100644 fs/hfsplus/xattr.h
+ create mode 100644 fs/hfsplus/xattr_security.c
+ create mode 100644 fs/hfsplus/xattr_trusted.c
+ create mode 100644 fs/hfsplus/xattr_user.c
+ create mode 100644 fs/notify/fdinfo.c
+ create mode 100644 fs/notify/fdinfo.h
+ create mode 100644 include/linux/balloon_compaction.h
+ create mode 100644 include/trace/events/filemap.h
+ create mode 100644 lib/percpu-rwsem.c
+ create mode 100644 mm/balloon_compaction.c
+ create mode 100644 scripts/coccinelle/api/d_find_alias.cocci
+ create mode 100644 tools/testing/selftests/epoll/Makefile
+ create mode 100644 tools/testing/selftests/epoll/test_epoll.c
+ create mode 100644 tools/testing/selftests/ipc/Makefile
+ create mode 100644 tools/testing/selftests/ipc/msgque.c
+ create mode 100644 tools/testing/selftests/vm/thuge-gen.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..a4f16dc
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,6 @@
+Importing i2c based on 2844a48706e54ddda4a04269dba4250b42f449de
+Unchanged quilt series i2c
+Importing jdelvare-hwmon based on 2844a48706e54ddda4a04269dba4250b42f449de
+Unchanged quilt series jdelvare-hwmon
+Importing device-mapper based on v3.7-rc1
+Unchanged quilt series device-mapper
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..154dca6
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20121130
