summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-03-22 15:53:10 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-03-22 15:53:10 +1100
commit2db42b73ac619eb622ab0a1a1afe23b4a0203e2d (patch)
treeb666f1d73b887a27f9e1379314dc1205dc76ca1e
parentbcc94e162326c90edc1e72dfbf0874869ee53caf (diff)
Add linux-next specific files for 20130322next-20130322
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s224
-rw-r--r--Next/Trees226
-rw-r--r--Next/merge.log6563
-rw-r--r--Next/quilt-import.log4
-rw-r--r--localversion-next1
5 files changed, 7018 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..39abb2c2b56c
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,224 @@
+Name SHA1
+---- ----
+origin 0a7e453103b9718d357688b83bb968ee108cc874
+fixes 9d3f2523e14356d4f5a63b799b17f4ec3d93cb01
+kbuild-current 6dbe51c251a327e012439c4772097a13df43c5b8
+arc-current 367f3fcd9296977bc4689546f55c5f4a9c680e8d
+arm-current 112ccff716ae74ffa5f30266b29c4d72aab4074b
+m68k-current 561839598e61f03c9175183ea066b2b7fa58ce85
+powerpc-merge af81d7878c641629f2693ae3fdaf74b4af14dfca
+sparc 10b38669d64c757cfd927e3820292c580ed70aae
+net ae5fc98728c8bbbd6d7cab0b9781671fc4419c1b
+ipsec 85dfb745ee40232876663ae206cba35f24ab2a40
+sound-current 55a63d4da3b8850480a1c5b222f77c739e30e346
+pci-current 249bfb83cf8ba658955f0245ac3981d941f746ee
+wireless 36ef0b473fbf43d5db23eea4616cc1d18cec245f
+driver-core.current e5110f411d2ee35bf8d202ccca2e89c633060dca
+tty.current 8b5c913f7ee6464849570bacb6bcd9ef0eaf7dce
+usb.current fc98ab873aa3dbe783ce56a2ffdbbe7c7609521a
+staging.current 27ca0391fb717eecb9b9ca29ad4b9e8d7a84aba5
+char-misc.current 347e0899b1c75d907f01ac883ca38d37fe9bfa42
+input-current 4b7d293c64fde133cc2b669d0d7637b8a4c6d62f
+md-current 238f5908bd48f9e2f4668e0289e88cba969d710c
+audit-current c158a35c8a681cf68d36f22f058f9f5466386c71
+crypto-current 246bbedb9aaf27e2207501d93a869023a439fce5
+ide bf6b4388c61cf88c6faa19cc45390fd36be8fb66
+dwmw2 63662139e519ce06090b2759cf4a1d291b9cc0e2
+sh-current 44033109e99cf584d6285226ed521098f5ef7250
+irqdomain-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+devicetree-current ab28698d33af05abab0bcf8021eafe38f7434f24
+spi-current d3601e56cf64a3f2df6f6380cccb3644274406e2
+gpio-current e97f9b5277afeabb54892ebc6f68500098467ba1
+rr-fixes b7d44d9487a11e835de10908f4ab30b4290c0b7f
+mfd-fixes 037154105e3767324db7c34bf8f540a12cb61d70
+vfio-fixes 25e9789ddd9d14a8971f4a421d04f282719ab733
+asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced
+arc 191db3fdaad2d4c4effdcda705427b573d13254b
+arm 8d9c644a5e2cb3d61f5a0c9335db36d82d7b75cd
+arm-perf a937536b868b8369b98967929045f1df54234323
+davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625
+xilinx 42ead3a591aeadb2722753aecf59f2ae63719075
+arm64 0359b0e2d0bbd28289c38ebe779b5f1c61f8ccc8
+blackfin f656c240ae07c48ddf8552e83b64692121044c42
+c6x 93bbd0c087eb299e0fe11c59d340932180c082b5
+cris 77c8006d8df4d5bafeb1d15eafa0886ae96e9b17
+hexagon e1858b2a21cd84a855945a4747fb2db41b250c22
+ia64 dadbee10eb5c7170c4ecbc9e012e3a0841daad71
+m68k 561839598e61f03c9175183ea066b2b7fa58ce85
+m68knommu b46ab88da333642ab0da7f2fd0ac968876adbc9d
+metag 2b8660ed3bfe95523561e6d6a6f1ce91389006b1
+microblaze 01cc2cb1c9ee0eb0b813cc3a4404220d11160493
+mips 306d20eb3162dc437cdb291e217b41db26dccc4e
+openrisc 6af609515d788bd4c94116344f00601b058f75a6
+parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1
+powerpc 9e2d59ad580d590134285f361a0e80f0e98c0207
+4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d
+mpc5xxx cb1dc320320243e9db8289e77c4242e4c3910d85
+galak 3dfd44c5f1b1a2f8d0f180d9b0fd0267ca854ef7
+s390 635640a52874ded886539a8cc20a39c558a321c8
+sh 37284bd93103ae36b5ea274a985d688fb16f7a38
+sparc-next d6d88bae97d2e1c44ef9e2ae3f22de82fa6e11c5
+tile 01921d7ed3c919c0e6c4147ff37f752f4b54b1fa
+unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2
+xtensa 9cf81c759b7db1db593b2ca60b74ec350d5f9205
+btrfs 6aec51f7d1db54c0e4c36f051dc77b52edadda85
+ceph d6c0dd6b0c196979fa7b34c1d99432fcb1b7e1df
+cifs f853c616883a8de966873a1dab283f1369e275a1
+configfs b930c26416c4ea6855726fd977145ccea9afbdda
+ecryptfs f6161aa153581da4a3867a2d1a7caf4be19b6ec9
+ext3 c288d2969627be7ffc90904ac8c6aae0295fbf9f
+ext4 2b405bfa84063bfa35621d2d6879f52693c614b0
+f2fs 111d2495a8a8fbd8e3bb0f1c1c60f977b1386249
+fuse 634734b63ac39e137a1c623ba74f3e062b6577db
+gfs2 26217f50b084f4bc48f2712d41c9e65819bfd97c
+jfs 9d48017bce890b19e3bba649850bdbc8a6f95903
+logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c
+nfs cde24c5a8d2632ad11144019d673794d2eb0e16c
+nfsd 6dbe51c251a327e012439c4772097a13df43c5b8
+ocfs2 4538df64655dcfe17b33080b219dc783161a262e
+omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84
+squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa
+v9fs b6f4bee02f682d1c86ece297871b78ae01afaaf4
+ubifs 67e753ca41782913d805ff4a8a2b0f60b26b7915
+xfs 56cea2d088811b8cf7d2893e29bcf369a912de69
+vfs dcf787f39162ce32ca325b3e784aba2d2444619a
+pci f6161aa153581da4a3867a2d1a7caf4be19b6ec9
+hid 26c379191fa28c7375f4a40d741903adae71a997
+i2c 21ea3f44cb505ce419971da1d24e3ccdfac8009c
+jdelvare-hwmon c662b7afe9c164955bad44706e642c720d62f994
+hwmon-staging fbaa035babb4ca6ba4256a80fa8097a13fff2210
+v4l-dvb b9e7b1a8e702b3389e95aa2a33fe1bc228aa22a6
+kbuild 4382a9934be0835943e877efd28fd57e17f8291e
+kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb
+libata b186affe0c9d39e4d3152cd34bffea8fe1fa17f4
+infiniband ef4e359d9b9e2dc022f79840fd207796b524a893
+pstore c53026722b5e5aaaf434565ddbe4d918c7d2a80d
+pm b1993ac2b063147f50dc612a7306b1ce60593787
+idle deda402f5753f9017a18d856cef6ed71d9dfbc79
+apm fb9d78aca709b7a6389c79d6211fb384c69bb79f
+cpuidle d1c3ed669a2d452cacfb48c2d171a1f364dae2ed
+cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37
+thermal 043e4652bf3378883e7c0db38fa47fa8e2558f9c
+ieee1394 6dbe51c251a327e012439c4772097a13df43c5b8
+ubi f6161aa153581da4a3867a2d1a7caf4be19b6ec9
+dlm f11722834605a155022a8098ad7d8adacf44b22f
+swiotlb af51a9f1848ff50079a10def56a2c064f326af22
+scsi 6dbe51c251a327e012439c4772097a13df43c5b8
+target-updates 783e150f437ed1d1f6cf677f4d2211c6971b608d
+target-merge a937536b868b8369b98967929045f1df54234323
+ibft 935a9fee51c945b8942be2d7b4bae069167b4886
+isci 6734092e66011def7875bd67beef889d0fee1cc9
+slave-dma e40ac33abff5a28d568364f41370043b7322aa67
+dmaengine 7f3498666c7b44f979720404d9ba883c309e60ad
+net-next fe0e76f7e7107ca6dcb869da6d28dd2ba9be36b3
+ipsec-next 05600a799f6c67b139f2bc565e358b913b230cf5
+wireless-next 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4
+bluetooth 0227c7b56959cd8f5edd20b6a47db86fa553e91a
+mtd 35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9
+l2-mtd 91aabd25f4ab9f9ec40eedf6ebcbc99a7cc26cce
+crypto ca9fbfdd7aebfd8f1743cc5cbf80b94344fbde5e
+drm be88298b0a3f771a4802f20c5e66af74bfd1dff1
+drm-intel 81fa12a88d7cc7e03ea87758e1bfb45a13dc03ff
+sound f390dad4d8892114cdbc8f078563cef7687720fb
+sound-asoc d6f0a031139bbc3d65dd856bc404a6b48b63c358
+modules d70f82acf32affa78ae4957caa0fb2a550d2c6ea
+virtio cf994e0afae97382c0aa3cbc395805605d07a6e9
+input 38a46eb8cc0faec0345c27083fb26d1e7e02ccff
+input-mt 6f0c0580b70c89094b3422ba81118c7b959c7556
+cgroup 081aa458c38ba576bdd4265fc807fa95b48b9e79
+block 833dd2e58737c3011da019cbc64726e04016337f
+device-mapper fc60439830a2e4490490ced0c4cdca32ab73a166
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98
+mmc 0aacd23ff29a846c7eebbd9db8752fa360f34ad1
+kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c
+slab 7d557b3cb69398d83ceabad9cf147c93a3aa97fd
+uclinux 6dbe51c251a327e012439c4772097a13df43c5b8
+md 864e8cbba0b4371558fbdc1f11cb173c91d6a75a
+mfd 5096cd147a969d6d1bbc8da600d2d2812f3b25b0
+battery c6cc9fc9d42ec82da2c770f0bef1488dc467f29c
+fbdev a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565
+viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77
+omap_dss2 e7f5c9a16ea2648a3e85af8e34191026bf3dcb62
+regulator 10affc9a210b7930d393dd29f0995c1297852e0f
+security 921f3ac4c3f2fd46ae99195a1168383ca9b41ed1
+selinux c2d7b247f0c028d325a5da5b9611b60ba160f237
+lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02
+watchdog ebf590bbecc022887980035e66ded8ab73ca5cfa
+dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351
+iommu ae1915892b4774655a5dc01039ce94efdff4b3fc
+vfio dad9f8972e04cd081a028d8fb1249d746d97fc03
+osd 861d66601acda6d7a2038fb3c95f68009128003a
+jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193
+trivial c25a4a09c3fa3d4b058ac612d82ddfd172410fbb
+audit dcd6c92267155e70a94b3927bce681ce74b80d1f
+fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06
+edac b0769891ba7baa53f270dc70d71934748beb4c5b
+edac-amd 9713faecff3d071de1208b081d4943b002e9cb1c
+devicetree 02bbde7849e68e193cefaa1885fe0df0f03c9fcd
+dt-rh 1421954bf9b967d819db23c911f950a2ccd60eff
+spi 095c3752e673c0ba039a2f67fd867297fde75ae7
+spi-mb b66c7730027509620ced3c7ebc84e28f623ebe9a
+tip a2d66a370b34e6937961e6ae7fdf553bed40837a
+ftrace 22f45649ce08642ad7df238d5c25fa5c86bfdd31
+rcu 8d9eeaca8560e84bffe517d9f337725cc3cfbe5d
+cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee
+uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa
+kvm 2ae33b389601b86a3d0cfe2d09f5e3189d5322fd
+kvm-ppc 04b66839d312d3bdaff77f265eb7305347fa1fb7
+oprofile 44009105081b51417f311f4c3be0061870b6b8ed
+fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa
+xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495
+xen-two 849b022f891394b318ca2f571797076fa25a98b9
+xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59
+percpu 5479c78ac6f688ea5ea8c49b44cf90ea87b63931
+workqueues 30db5f11e7bcbad587dc759d5c93eb865f983379
+drivers-x86 e6e522461d358891050522ddb4fbfe9c253947b4
+hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49
+sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00
+regmap 7f8e176872a3096965bf8f182ff7141e608065b4
+hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a
+leds 96b5646649eefa3fc616624b7a6b361d1bb250db
+driver-core 8f46baaa7ec6cd0851794020b31958e64679dd26
+tty afa80ccb4c7d39702dfb0832ce02a054848191a8
+usb 417c765af914106f5e76c4e0181dd555fe6a89a0
+usb-gadget 4261b8f3538c1cae63e30110a164614ea2f10299
+staging 25eeb667599b192ea850a062d69383ee864c06ab
+char-misc 501ad1c49b3d8c7b7495ef044c698c22710fc27d
+bcon 06c6942645eb82a7f69ed0759e23b272c253cd3c
+tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+writeback ed84825b785ceb932af7dd5aa08614801721320b
+arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268
+hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad
+pinctrl 5c8d3f7be59e762c58d8c348c8ababb99d4f7301
+vhost 0e9ff68cfd66b15cc80e622c11eff64aae00cba5
+memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077
+remoteproc 6f0c0580b70c89094b3422ba81118c7b959c7556
+irqdomain 560aa5394d2db5437b2deb3bb897655f0fd99f61
+gpio 753c5983ddd38022a680a36f5d66b23b185c9b62
+gpio-lw c7886b18273b07042e25e8d3ba5c983837b84123
+gen-gpio a2523d3cdab76fbda28414fd82743815f3cc3df7
+mailbox adbf1b7e5af6916dbee91d5bb7e2d7f4a408e456
+arm-soc f96c489c3324d5b088fc27adc9a46decffe672a6
+bcm2835 4c4d4492e7a428f8cffbee491f2ac3232687afde
+cortex 6ebd4d038dbb626a43d87db3007e71f92f49d7b3
+ep93xx 7ec44295ef66efcac08433298661a18008883885
+imx-mxs 5e56049aa6d517358a041e2bf51913d6aa6f94a0
+ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200
+msm 5bc31f8813c1b2386fba3e5714ddf18ab429b0bc
+renesas 442d651d3764ba4203c6b766a1ddd3ac24a40410
+samsung 9daee5a39559ebf6eabdf75b297a9103340f0a6c
+tegra 250266f0b31d9b92e66092fcc6045cb93b04b118
+dma-mapping a937536b868b8369b98967929045f1df54234323
+pwm a32e1d1057b0f7c10df702cc2415432fa4a35c41
+dma-buf 6dbe51c251a327e012439c4772097a13df43c5b8
+userns 92f28d973cce45ef5823209aab3138eb45d8b349
+ktest 7328735cbf68b7cd4d7ef16e172013743cdc2bc4
+signal 99e621f796d7f0341a51e8cdf32b81663b10b448
+clk 04981724172062029c4986e1d90732ff3c574944
+random b980955236922ae6106774511c5c05003d3ad225
+lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95
+scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47
+akpm-current 112ccff716ae74ffa5f30266b29c4d72aab4074b
+akpm 889fc8ba21f58a4a39fa675bd7624c83222cf829
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..17f933f93521
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,226 @@
+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
+arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+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
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.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
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+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-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
+metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.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
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.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 git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/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
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-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
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-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
+drm-intel git git://people.freedesktop.org/~danvet/drm-intel#drm-intel-next-queued
+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-next.git#master
+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
+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
+fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/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
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#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
+bcon git git://git.kernel.org/pub/scm/linux/kernel/git/joern/bcon2.git#master
+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
+gen-gpio git git://github.com/Gnurou/linux.git#for_next
+mailbox git git://github.com/sumananna/mailbox.git#dbx500-prcmu-mailbox
+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
+imx-mxs git git://git.linaro.org/people/shawnguo/linux-2.6.git#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
+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
+scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master
+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 000000000000..37d4a954cf11
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,6563 @@
+$ date
+Friday 22 March 10:33:52 EST 2013
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 2ffdd7e Merge tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio
+Merging origin/master (0a7e453 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux)
+$ git merge origin/master
+Updating 2ffdd7e..0a7e453
+Fast-forward
+ MAINTAINERS | 2 +-
+ arch/powerpc/perf/power7-pmu.c | 13 ++
+ arch/x86/include/asm/kprobes.h | 1 +
+ arch/x86/kernel/cpu/perf_event_intel.c | 4 +
+ arch/x86/kernel/kprobes/core.c | 5 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 11 +-
+ drivers/gpu/drm/i915/intel_dp.c | 14 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 11 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 10 +-
+ drivers/gpu/drm/nouveau/core/core/object.c | 3 +-
+ .../gpu/drm/nouveau/core/include/subdev/therm.h | 2 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/base.c | 18 ++-
+ drivers/gpu/drm/nouveau/core/subdev/therm/ic.c | 6 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c | 67 +++++---
+ drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 3 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/temp.c | 30 ++--
+ drivers/gpu/drm/nouveau/nouveau_pm.c | 44 ++++--
+ drivers/gpu/drm/nouveau/nv50_display.c | 4 +-
+ drivers/gpu/drm/radeon/ni.c | 33 +++-
+ drivers/gpu/drm/radeon/radeon_benchmark.c | 21 ++-
+ drivers/gpu/drm/radeon/si.c | 1 +
+ drivers/md/dm-bufio.c | 2 +
+ drivers/md/dm-cache-metadata.c | 64 ++++++--
+ drivers/md/dm-cache-metadata.h | 2 +-
+ drivers/md/dm-cache-policy-cleaner.c | 7 +-
+ drivers/md/dm-cache-policy-internal.h | 2 +
+ drivers/md/dm-cache-policy-mq.c | 8 +-
+ drivers/md/dm-cache-policy.c | 8 +
+ drivers/md/dm-cache-policy.h | 2 +
+ drivers/md/dm-cache-target.c | 169 +++++++++++++--------
+ drivers/md/dm-thin.c | 11 +-
+ drivers/md/dm-verity.c | 39 ++++-
+ drivers/md/persistent-data/dm-btree-remove.c | 46 +++---
+ drivers/thermal/dove_thermal.c | 16 +-
+ drivers/thermal/exynos_thermal.c | 2 +-
+ drivers/thermal/kirkwood_thermal.c | 8 +-
+ drivers/thermal/rcar_thermal.c | 29 ++--
+ include/drm/drm_pciids.h | 13 +-
+ include/linux/hash.h | 3 +-
+ kernel/events/core.c | 8 +-
+ kernel/trace/ftrace.c | 4 +-
+ kernel/trace/trace.c | 59 +++++--
+ kernel/trace/trace.h | 6 +
+ kernel/trace/trace_irqsoff.c | 19 ++-
+ kernel/trace/trace_sched_wakeup.c | 18 ++-
+ tools/lib/traceevent/Makefile | 2 +-
+ tools/perf/Makefile | 8 +-
+ tools/perf/bench/bench.h | 24 +++
+ tools/perf/builtin-record.c | 6 +-
+ tools/perf/util/hist.h | 5 +-
+ tools/perf/util/strlist.c | 2 +-
+ 52 files changed, 632 insertions(+), 265 deletions(-)
+Merging fixes/master (9d3f252 Revert "KVM: allow host header to be included even for !CONFIG_KVM")
+$ git merge fixes/master
+Updating 0a7e453..9d3f252
+Fast-forward
+ include/linux/kvm_host.h | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+Merging kbuild-current/rc-fixes (6dbe51c Linux 3.9-rc1)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (367f3fc ARC: Fix the typo in event identifier flags used by ptrace)
+$ git merge arc-current/for-curr
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 3 ++-
+ arch/arc/include/asm/dma-mapping.h | 2 +-
+ arch/arc/include/asm/elf.h | 3 ---
+ arch/arc/include/asm/entry.h | 2 +-
+ arch/arc/include/asm/kgdb.h | 6 ++----
+ arch/arc/include/asm/ptrace.h | 2 +-
+ arch/arc/include/asm/syscalls.h | 2 --
+ arch/arc/include/uapi/asm/ptrace.h | 4 ++--
+ arch/arc/kernel/entry.S | 27 +--------------------------
+ arch/arc/kernel/kgdb.c | 1 +
+ arch/arc/kernel/setup.c | 4 +---
+ arch/arc/kernel/sys.c | 2 --
+ 12 files changed, 12 insertions(+), 46 deletions(-)
+Merging arm-current/fixes (112ccff Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (af81d78 powerpc: Rename USER_ESID_BITS* to ESID_BITS*)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (10b3866 Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (ae5fc98 net: fix *_DIAG_MAX constants)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ Documentation/networking/ipvs-sysctl.txt | 7 +
+ drivers/bluetooth/ath3k.c | 4 +
+ drivers/bluetooth/btusb.c | 2 +
+ drivers/net/ethernet/freescale/fec.c | 6 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 3 +
+ drivers/net/ethernet/lantiq_etop.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 22 +--
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 45 ++++-
+ drivers/net/ethernet/nxp/lpc_eth.c | 3 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 10 +
+ drivers/net/ethernet/renesas/sh_eth.h | 1 +
+ drivers/net/ethernet/ti/cpsw.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 4 +
+ drivers/net/wireless/ath/ath9k/link.c | 26 +--
+ drivers/net/wireless/iwlegacy/3945-mac.c | 22 ++-
+ drivers/net/wireless/mwifiex/cmdevt.c | 22 ++-
+ drivers/net/wireless/mwifiex/init.c | 8 +
+ drivers/net/wireless/mwifiex/main.h | 4 +-
+ drivers/net/wireless/mwifiex/scan.c | 8 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 10 +-
+ drivers/net/wireless/rtlwifi/usb.c | 1 +
+ include/linux/thermal.h | 2 +-
+ include/linux/udp.h | 1 +
+ include/net/flow_keys.h | 1 +
+ include/net/ip_vs.h | 12 ++
+ include/uapi/linux/packet_diag.h | 4 +-
+ include/uapi/linux/unix_diag.h | 4 +-
+ net/bluetooth/sco.c | 1 +
+ net/core/flow_dissector.c | 2 +
+ net/ipv4/ipconfig.c | 3 +-
+ net/ipv4/netfilter/Kconfig | 13 --
+ net/ipv4/udp.c | 7 +
+ net/ipv6/netfilter/ip6t_NPT.c | 2 +
+ net/ipv6/udp.c | 8 +
+ net/irda/af_irda.c | 6 +-
+ net/l2tp/l2tp_core.c | 206 ++++++++++-----------
+ net/l2tp/l2tp_core.h | 22 ++-
+ net/l2tp/l2tp_debugfs.c | 28 +--
+ net/l2tp/l2tp_ip.c | 6 +
+ net/l2tp/l2tp_ip6.c | 7 +
+ net/l2tp/l2tp_netlink.c | 72 +++----
+ net/l2tp/l2tp_ppp.c | 111 ++++-------
+ net/netfilter/ipvs/ip_vs_core.c | 14 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 7 +
+ net/netfilter/ipvs/ip_vs_proto_sctp.c | 16 +-
+ net/netfilter/nf_conntrack_proto_dccp.c | 12 +-
+ net/netfilter/nf_conntrack_proto_gre.c | 12 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 12 +-
+ net/netfilter/nf_conntrack_proto_udplite.c | 12 +-
+ net/netfilter/nfnetlink_queue_core.c | 2 +-
+ net/netlink/genetlink.c | 1 +
+ 52 files changed, 444 insertions(+), 376 deletions(-)
+Merging ipsec/master (85dfb74 af_key: initialize satype in key_notify_policy_flush())
+$ git merge ipsec/master
+Auto-merging net/key/af_key.c
+Merge made by the 'recursive' strategy.
+ net/key/af_key.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging sound-current/for-linus (55a63d4 ALSA: hda - Fix DAC assignment for independent HP)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ Documentation/sound/alsa/ALSA-Configuration.txt | 2 +-
+ Documentation/sound/alsa/seq_oss.html | 2 +-
+ sound/pci/hda/hda_codec.c | 2 +-
+ sound/pci/hda/hda_generic.c | 46 +++++++++
+ sound/pci/hda/hda_intel.c | 132 +++++++++++++++++++-----
+ sound/pci/hda/patch_cirrus.c | 4 +-
+ sound/pci/hda/patch_conexant.c | 16 ++-
+ sound/usb/mixer.c | 21 ++--
+ 8 files changed, 184 insertions(+), 41 deletions(-)
+Merging pci-current/for-linus (249bfb8 PCI/PM: Clean up PME state when removing a device)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (36ef0b47 rtlwifi: usb: add missing freeing of skbuff)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (e5110f4 sysfs: handle failure path correctly for readdir())
+$ git merge driver-core.current/driver-core-linus
+Merge made by the 'recursive' strategy.
+ fs/sysfs/dir.c | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+Merging tty.current/tty-linus (8b5c913 serial: 8250_pci: Add WCH CH352 quirk to avoid Xscale detection)
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/tty/serial/8250/8250_pci.c | 13 +++++++++++++
+ drivers/tty/serial/atmel_serial.c | 11 +++++------
+ 2 files changed, 18 insertions(+), 6 deletions(-)
+Merging usb.current/usb-linus (fc98ab8 USB: ti_usb_3410_5052: fix use-after-free in TIOCMIWAIT)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/class/cdc-acm.c | 22 +++++++++++++++++++---
+ drivers/usb/core/hcd-pci.c | 23 ++++++++++++++---------
+ drivers/usb/gadget/f_rndis.c | 3 +--
+ drivers/usb/gadget/g_ffs.c | 4 ++--
+ drivers/usb/gadget/net2272.c | 9 ++++++++-
+ drivers/usb/gadget/net2280.c | 8 +++++++-
+ drivers/usb/gadget/u_serial.c | 2 +-
+ drivers/usb/gadget/udc-core.c | 2 +-
+ drivers/usb/host/ehci-hcd.c | 1 +
+ drivers/usb/host/ehci-hub.c | 2 +-
+ drivers/usb/host/ehci-q.c | 13 +++++++++++++
+ drivers/usb/host/ehci-timer.c | 2 +-
+ drivers/usb/host/xhci.c | 3 ++-
+ drivers/usb/host/xhci.h | 4 ++--
+ drivers/usb/musb/da8xx.c | 2 +-
+ drivers/usb/musb/musb_gadget.c | 9 +++++++--
+ drivers/usb/serial/ark3116.c | 10 ++++++----
+ drivers/usb/serial/ch341.c | 11 ++++++-----
+ drivers/usb/serial/cypress_m8.c | 14 ++++++++------
+ drivers/usb/serial/f81232.c | 9 +++++----
+ drivers/usb/serial/ftdi_sio.c | 19 ++++++++-----------
+ drivers/usb/serial/garmin_gps.c | 7 +------
+ drivers/usb/serial/io_edgeport.c | 12 +++++++-----
+ drivers/usb/serial/io_ti.c | 13 +++++++------
+ drivers/usb/serial/mct_u232.c | 13 +++++++------
+ drivers/usb/serial/mos7840.c | 16 ++++++++++------
+ drivers/usb/serial/oti6858.c | 10 ++++++----
+ drivers/usb/serial/pl2303.c | 11 ++++++-----
+ drivers/usb/serial/quatech2.c | 12 +++++++-----
+ drivers/usb/serial/spcp8x5.c | 9 +++++----
+ drivers/usb/serial/ssu100.c | 12 +++++++-----
+ drivers/usb/serial/ti_usb_3410_5052.c | 10 ++++++----
+ drivers/usb/serial/usb-serial.c | 3 ++-
+ drivers/usb/storage/unusual_devs.h | 7 +++++++
+ include/linux/usb/serial.h | 2 ++
+ include/linux/usb/ulpi.h | 8 ++++++++
+ 36 files changed, 202 insertions(+), 115 deletions(-)
+Merging staging.current/staging-linus (27ca039 staging: zcache: fix typo "64_BIT")
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/zcache/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging char-misc.current/char-misc-linus (347e089 VMCI: Fix process-to-process DRGAMs.)
+$ git merge char-misc.current/char-misc-linus
+Merge made by the 'recursive' strategy.
+ drivers/extcon/extcon-max77693.c | 103 ++++++++++++++++++++++++++--------
+ drivers/extcon/extcon-max8997.c | 56 ++++++++++--------
+ drivers/misc/mei/hw-me.c | 29 +++++++---
+ drivers/misc/mei/init.c | 18 ++++++
+ drivers/misc/mei/mei_dev.h | 1 +
+ drivers/misc/mei/pci-me.c | 52 +++--------------
+ drivers/misc/vmw_vmci/vmci_datagram.c | 4 +-
+ include/linux/mfd/max77693-private.h | 23 ++++++++
+ 8 files changed, 186 insertions(+), 100 deletions(-)
+Merging input-current/for-linus (4b7d293 Input: mms114 - Fix regulator enable and disable paths)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (238f590 md: remove CONFIG_MULTICORE_RAID456 entirely)
+$ git merge md-current/for-linus
+Auto-merging drivers/md/raid5.c
+Merge made by the 'recursive' strategy.
+ arch/tile/configs/tilegx_defconfig | 1 -
+ arch/tile/configs/tilepro_defconfig | 1 -
+ drivers/md/md.c | 6 +-
+ drivers/md/md.h | 4 +-
+ drivers/md/raid5.c | 116 +++++++++++++++++++++++++-----------
+ drivers/md/raid5.h | 5 +-
+ 6 files changed, 86 insertions(+), 47 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 (246bbed Revert "crypto: caam - add IPsec ESN support")
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ drivers/crypto/caam/caamalg.c | 27 ++-------------------------
+ drivers/crypto/caam/compat.h | 1 -
+ drivers/crypto/talitos.c | 30 ++----------------------------
+ 3 files changed, 4 insertions(+), 54 deletions(-)
+Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe())
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+ drivers/ide/gayle.c | 15 +--------------
+ drivers/ide/tx4938ide.c | 13 +------------
+ drivers/ide/tx4939ide.c | 13 +------------
+ 3 files changed, 3 insertions(+), 38 deletions(-)
+Merging dwmw2/master (63662139 params: Fix potential memory leak in add_sysfs_param())
+$ git merge dwmw2/master
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/dell-laptop.c | 10 ++++++----
+ kernel/params.c | 5 ++++-
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+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 (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().)
+$ git merge spi-current/spi/merge
+Already up-to-date.
+Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging rr-fixes/fixes (b7d44d9 hw_random: free rng_buffer at module exit)
+$ git merge rr-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/char/hw_random/core.c | 9 +++++++++
+ drivers/char/virtio_console.c | 22 ++++++++++++++++------
+ 2 files changed, 25 insertions(+), 6 deletions(-)
+Merging mfd-fixes/master (0371541 mfd: twl4030-madc: Remove __exit_p annotation)
+$ git merge mfd-fixes/master
+Already up-to-date.
+Merging vfio-fixes/for-linus (25e9789 vfio: include <linux/slab.h> for kmalloc)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (191db3f ARC: remove #ifdef-ed out include of dead header)
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/kernel/asm-offsets.c | 2 +-
+ arch/arc/kernel/clk.c | 2 +-
+ arch/arc/kernel/disasm.c | 2 +-
+ arch/arc/kernel/irq.c | 2 +-
+ arch/arc/kernel/kprobes.c | 1 -
+ arch/arc/kernel/module.c | 4 ++--
+ arch/arc/kernel/setup.c | 3 +--
+ arch/arc/kernel/time.c | 1 -
+ arch/arc/kernel/traps.c | 6 +++---
+ arch/arc/mm/extable.c | 4 ++--
+ arch/arc/mm/fault.c | 1 -
+ arch/arc/mm/init.c | 3 ---
+ arch/arc/mm/ioremap.c | 2 +-
+ arch/arc/mm/tlb.c | 2 +-
+ 14 files changed, 14 insertions(+), 21 deletions(-)
+Merging arm/for-next (8d9c644 Merge branches 'devel-stable', 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 3 +-
+ arch/arm/Kconfig.debug | 11 ++
+ arch/arm/boot/compressed/Makefile | 3 +
+ arch/arm/boot/compressed/debug.S | 12 ++
+ arch/arm/boot/compressed/misc.c | 8 +-
+ arch/arm/include/asm/cp15.h | 16 ++-
+ arch/arm/include/asm/cputype.h | 61 +++++++---
+ arch/arm/include/asm/glue-df.h | 20 ++--
+ arch/arm/include/asm/kvm_arm.h | 4 +
+ arch/arm/include/asm/kvm_asm.h | 2 +-
+ arch/arm/include/asm/kvm_emulate.h | 107 +++++++++++++++--
+ arch/arm/include/asm/kvm_host.h | 42 +++++--
+ arch/arm/include/asm/kvm_mmu.h | 67 +++++++++++
+ arch/arm/include/asm/kvm_vgic.h | 1 -
+ arch/arm/include/debug/uncompress.h | 7 ++
+ arch/arm/include/uapi/asm/kvm.h | 12 +-
+ arch/arm/kernel/asm-offsets.c | 8 +-
+ arch/arm/kernel/entry-armv.S | 13 +--
+ arch/arm/kernel/head-common.S | 9 +-
+ arch/arm/kernel/head-nommu.S | 8 +-
+ arch/arm/kernel/process.c | 13 ++-
+ arch/arm/kernel/return_address.c | 5 +-
+ arch/arm/kernel/setup.c | 2 +-
+ arch/arm/kernel/smp_scu.c | 2 +-
+ arch/arm/kvm/Makefile | 2 +-
+ arch/arm/kvm/arm.c | 194 +------------------------------
+ arch/arm/kvm/coproc.c | 28 ++---
+ arch/arm/kvm/coproc.h | 4 +-
+ arch/arm/kvm/emulate.c | 75 ++++++++----
+ arch/arm/kvm/guest.c | 17 +++
+ arch/arm/kvm/handle_exit.c | 164 ++++++++++++++++++++++++++
+ arch/arm/kvm/interrupts.S | 13 ++-
+ arch/arm/kvm/mmio.c | 46 +++-----
+ arch/arm/kvm/mmu.c | 184 ++++++++++++++---------------
+ arch/arm/kvm/vgic.c | 2 +-
+ arch/arm/mach-exynos/mach-nuri.c | 2 +-
+ arch/arm/mach-imx/devices/devices.c | 2 +-
+ arch/arm/mach-integrator/integrator_ap.c | 6 +-
+ arch/arm/mach-integrator/integrator_cp.c | 7 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
+ arch/arm/mach-omap2/clock.c | 2 +-
+ arch/arm/mach-omap2/gpmc-onenand.c | 4 +-
+ arch/arm/mach-omap2/gpmc.c | 8 +-
+ arch/arm/mach-omap2/id.c | 4 +-
+ arch/arm/mach-omap2/omap-smp.c | 2 +-
+ arch/arm/mach-omap2/omap_device.c | 13 +--
+ arch/arm/mach-omap2/omap_hwmod.c | 4 +-
+ arch/arm/mach-omap2/pm-debug.c | 6 +-
+ arch/arm/mach-omap2/powerdomain.c | 2 +-
+ arch/arm/mach-omap2/timer.c | 2 +-
+ arch/arm/mach-tegra/board-harmony-pcie.c | 6 +-
+ arch/arm/mach-tegra/tegra2_emc.c | 2 +-
+ arch/arm/mach-ux500/cpu.c | 5 +-
+ arch/arm/mm/Kconfig | 9 +-
+ arch/arm/mm/alignment.c | 2 +
+ arch/arm/mm/mmu.c | 17 +++
+ arch/arm/plat-omap/dmtimer.c | 12 +-
+ 57 files changed, 788 insertions(+), 496 deletions(-)
+ create mode 100644 arch/arm/boot/compressed/debug.S
+ create mode 100644 arch/arm/include/debug/uncompress.h
+ create mode 100644 arch/arm/kvm/handle_exit.c
+Merging arm-perf/for-next/perf (a937536 Linux 3.9-rc3)
+$ 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 (42ead3a arm: zynq: timer: Set clock_event cpumask)
+$ git merge xilinx/arm-next
+Resolved 'arch/arm/mach-zynq/common.c' using previous resolution.
+Auto-merging arch/arm/mach-zynq/common.c
+CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e133c1c] Merge remote-tracking branch 'xilinx/arm-next'
+$ git diff -M --stat --summary HEAD^..
+Merging arm64/upstream (0359b0e arm64: head: match all affinity levels in the pen of the secondaries)
+$ git merge arm64/upstream
+Merge made by the 'recursive' strategy.
+ arch/arm64/include/asm/cputype.h | 30 +++++++++++
+ arch/arm64/include/asm/smp_plat.h | 30 +++++++++++
+ arch/arm64/kernel/early_printk.c | 35 +++++++++++++
+ arch/arm64/kernel/head.S | 4 +-
+ arch/arm64/kernel/setup.c | 12 +++++
+ arch/arm64/kernel/smp.c | 102 +++++++++++++++++++++++++++++++++-----
+ 6 files changed, 200 insertions(+), 13 deletions(-)
+ create mode 100644 arch/arm64/include/asm/smp_plat.h
+Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (dadbee1 [IA64] Fix build error for numa_clear_node() under IA64)
+$ git merge ia64/next
+Merge made by the 'recursive' strategy.
+ arch/ia64/Kconfig | 2 +-
+ arch/ia64/include/asm/futex.h | 5 ++---
+ arch/ia64/include/asm/mca.h | 1 +
+ arch/ia64/include/asm/numa.h | 5 ++---
+ arch/ia64/kernel/fsys.S | 49 +------------------------------------------
+ arch/ia64/kernel/iosapic.c | 34 ++++++++++++++++++++++++++++--
+ arch/ia64/kernel/irq.c | 8 +++++++
+ arch/ia64/kernel/mca.c | 37 ++++++++++++++++++++------------
+ arch/ia64/kernel/mca_drv.c | 2 +-
+ arch/ia64/kernel/palinfo.c | 6 ++----
+ arch/ia64/kvm/vtlb.c | 2 +-
+ arch/ia64/mm/ioremap.c | 14 ++++++++-----
+ arch/ia64/mm/numa.c | 5 +++++
+ arch/ia64/sn/kernel/tiocx.c | 5 ++++-
+ 14 files changed, 93 insertions(+), 82 deletions(-)
+Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (b46ab88 m68k: clean up unused "config ROMVECSIZE")
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.machine | 9 ---------
+ 1 file changed, 9 deletions(-)
+Merging metag/for-next (2b8660e memblock: Kill ARCH_POPULATES_NODE_MAP once more)
+$ git merge metag/for-next
+Auto-merging arch/microblaze/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/metag/Kconfig | 4 ++
+ arch/metag/Makefile | 2 +
+ arch/metag/include/asm/metag_mem.h | 3 +
+ arch/metag/kernel/cachepart.c | 16 +++--
+ arch/metag/kernel/head.S | 8 +++
+ arch/metag/kernel/perf/perf_event.c | 74 +++++++++++++++--------
+ arch/metag/kernel/smp.c | 115 ++++++++++++++++++++++++++++++++++++
+ arch/metag/mm/Kconfig | 3 -
+ arch/metag/oprofile/Makefile | 17 ++++++
+ arch/metag/oprofile/backtrace.c | 63 ++++++++++++++++++++
+ arch/metag/oprofile/backtrace.h | 6 ++
+ arch/metag/oprofile/common.c | 66 +++++++++++++++++++++
+ arch/microblaze/Kconfig | 3 -
+ 13 files changed, 346 insertions(+), 34 deletions(-)
+ create mode 100644 arch/metag/oprofile/Makefile
+ create mode 100644 arch/metag/oprofile/backtrace.c
+ create mode 100644 arch/metag/oprofile/backtrace.h
+ create mode 100644 arch/metag/oprofile/common.c
+Merging microblaze/next (01cc2cb microblaze: intc: set the default irq_domain)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/kernel/intc.c | 2 ++
+ arch/microblaze/pci/pci-common.c | 1 -
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging mips/mips-for-linux-next (306d20e Merge branches 'next/3.9-fixes', 'next/kvm' and 'next/micromips' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Auto-merging arch/mips/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/mips/Kbuild | 4 +
+ arch/mips/Kconfig | 25 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 5 +-
+ arch/mips/bcm63xx/nvram.c | 7 +-
+ arch/mips/bcm63xx/setup.c | 2 +-
+ arch/mips/configs/malta_kvm_defconfig | 2267 ++++++++++++++++++++
+ arch/mips/configs/malta_kvm_guest_defconfig | 2237 +++++++++++++++++++
+ arch/mips/include/asm/kvm.h | 55 +
+ arch/mips/include/asm/kvm_host.h | 667 ++++++
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 4 +-
+ arch/mips/include/asm/mach-generic/spaces.h | 9 +-
+ .../include/asm/mach-sead3/cpu-feature-overrides.h | 4 -
+ arch/mips/include/asm/mipsregs.h | 227 +-
+ arch/mips/include/asm/mmu_context.h | 6 +
+ arch/mips/include/asm/processor.h | 5 +
+ arch/mips/include/asm/signal.h | 2 +-
+ arch/mips/include/asm/uaccess.h | 11 +-
+ arch/mips/include/asm/uasm.h | 66 +-
+ arch/mips/include/uapi/asm/inst.h | 449 ++++
+ arch/mips/kernel/Makefile | 25 +-
+ arch/mips/kernel/asm-offsets.c | 66 +
+ arch/mips/kernel/binfmt_elfo32.c | 4 +
+ arch/mips/kernel/cevt-r4k.c | 4 +
+ arch/mips/kernel/cpu-probe.c | 7 +-
+ arch/mips/kernel/linux32.c | 2 +-
+ arch/mips/kernel/proc.c | 2 +-
+ arch/mips/kernel/smp.c | 1 +
+ arch/mips/kernel/traps.c | 7 +-
+ arch/mips/kvm/00README.txt | 31 +
+ arch/mips/kvm/Kconfig | 49 +
+ arch/mips/kvm/Makefile | 13 +
+ arch/mips/kvm/kvm_cb.c | 14 +
+ arch/mips/kvm/kvm_locore.S | 650 ++++++
+ arch/mips/kvm/kvm_mips.c | 966 +++++++++
+ arch/mips/kvm/kvm_mips_comm.h | 23 +
+ arch/mips/kvm/kvm_mips_commpage.c | 37 +
+ arch/mips/kvm/kvm_mips_dyntrans.c | 149 ++
+ arch/mips/kvm/kvm_mips_emul.c | 1829 ++++++++++++++++
+ arch/mips/kvm/kvm_mips_int.c | 243 +++
+ arch/mips/kvm/kvm_mips_int.h | 49 +
+ arch/mips/kvm/kvm_mips_opcode.h | 24 +
+ arch/mips/kvm/kvm_mips_stats.c | 82 +
+ arch/mips/kvm/kvm_tlb.c | 932 ++++++++
+ arch/mips/kvm/kvm_trap_emul.c | 482 +++++
+ arch/mips/kvm/trace.h | 46 +
+ arch/mips/lib/bitops.c | 16 +-
+ arch/mips/lib/csum_partial.S | 4 +-
+ arch/mips/mm/Makefile | 4 +-
+ arch/mips/mm/c-r4k.c | 6 +-
+ arch/mips/mm/cache.c | 1 +
+ arch/mips/mm/tlb-r4k.c | 2 +
+ arch/mips/mm/uasm-micromips.c | 220 ++
+ arch/mips/mm/uasm-mips.c | 196 ++
+ arch/mips/mm/uasm.c | 326 +--
+ arch/mips/mti-malta/Platform | 6 +-
+ arch/mips/mti-malta/malta-time.c | 13 +
+ include/linux/compat.h | 4 +-
+ include/linux/signal.h | 4 +-
+ mm/bootmem.c | 1 +
+ virt/kvm/kvm_main.c | 2 +-
+ 60 files changed, 12238 insertions(+), 356 deletions(-)
+ create mode 100644 arch/mips/configs/malta_kvm_defconfig
+ create mode 100644 arch/mips/configs/malta_kvm_guest_defconfig
+ create mode 100644 arch/mips/include/asm/kvm.h
+ create mode 100644 arch/mips/include/asm/kvm_host.h
+ create mode 100644 arch/mips/kvm/00README.txt
+ create mode 100644 arch/mips/kvm/Kconfig
+ create mode 100644 arch/mips/kvm/Makefile
+ create mode 100644 arch/mips/kvm/kvm_cb.c
+ create mode 100644 arch/mips/kvm/kvm_locore.S
+ create mode 100644 arch/mips/kvm/kvm_mips.c
+ create mode 100644 arch/mips/kvm/kvm_mips_comm.h
+ create mode 100644 arch/mips/kvm/kvm_mips_commpage.c
+ create mode 100644 arch/mips/kvm/kvm_mips_dyntrans.c
+ create mode 100644 arch/mips/kvm/kvm_mips_emul.c
+ create mode 100644 arch/mips/kvm/kvm_mips_int.c
+ create mode 100644 arch/mips/kvm/kvm_mips_int.h
+ create mode 100644 arch/mips/kvm/kvm_mips_opcode.h
+ create mode 100644 arch/mips/kvm/kvm_mips_stats.c
+ create mode 100644 arch/mips/kvm/kvm_tlb.c
+ create mode 100644 arch/mips/kvm/kvm_trap_emul.c
+ create mode 100644 arch/mips/kvm/trace.h
+ create mode 100644 arch/mips/mm/uasm-micromips.c
+ create mode 100644 arch/mips/mm/uasm-mips.c
+Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging powerpc/next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal)
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (cb1dc32 powerpc/mpc512x: create SoC devices for more nodes)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+Merging galak/next (3dfd44c powerpc/fsl-booke: Update T4240 device config node in device tree)
+$ git merge galak/next
+Auto-merging arch/powerpc/platforms/Kconfig.cputype
+Auto-merging arch/powerpc/kernel/cputable.c
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/powerpc/fsl/cpus.txt | 22 ++
+ arch/powerpc/Kconfig | 6 -
+ arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 1 +
+ arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 1 +
+ arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi | 65 +++
+ arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi | 41 ++
+ arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi | 41 ++
+ arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi | 41 ++
+ arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi | 41 ++
+ arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi | 109 +++++
+ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 438 +++++++++++++++++++++
+ arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 128 ++++++
+ arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 12 +-
+ arch/powerpc/boot/dts/t4240qds.dts | 224 +++++++++++
+ arch/powerpc/configs/corenet64_smp_defconfig | 45 ++-
+ arch/powerpc/configs/mpc85xx_defconfig | 39 +-
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 31 ++
+ arch/powerpc/include/asm/cputable.h | 2 +-
+ arch/powerpc/include/asm/kvm_asm.h | 4 +
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 16 +
+ arch/powerpc/kernel/cputable.c | 9 +-
+ arch/powerpc/kernel/epapr_hcalls.S | 2 +
+ arch/powerpc/kernel/exceptions-64e.S | 47 +++
+ arch/powerpc/kernel/idle_book3e.S | 32 +-
+ arch/powerpc/mm/tlb_nohash.c | 18 +-
+ arch/powerpc/platforms/85xx/Kconfig | 17 +
+ arch/powerpc/platforms/85xx/Makefile | 1 +
+ arch/powerpc/platforms/85xx/corenet_ds.c | 5 +-
+ arch/powerpc/platforms/85xx/t4240_qds.c | 98 +++++
+ arch/powerpc/platforms/Kconfig | 1 -
+ arch/powerpc/platforms/Kconfig.cputype | 2 +-
+ arch/powerpc/sysdev/fsl_pci.c | 29 +-
+ arch/powerpc/sysdev/fsl_pci.h | 13 +
+ arch/powerpc/sysdev/qe_lib/Kconfig | 2 +-
+ 39 files changed, 1555 insertions(+), 38 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/cpus.txt
+ create mode 100644 arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
+ create mode 100644 arch/powerpc/boot/dts/t4240qds.dts
+ create mode 100644 arch/powerpc/platforms/85xx/t4240_qds.c
+Merging s390/features (635640a s390/mm: speedup storage key initialization)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ Documentation/s390/s390dbf.txt | 3 +-
+ arch/s390/hypfs/hypfs_dbfs.c | 4 +-
+ arch/s390/include/asm/processor.h | 3 +-
+ arch/s390/kernel/Makefile | 17 ++-
+ arch/s390/kernel/dis.c | 9 +-
+ arch/s390/kernel/dumpstack.c | 236 +++++++++++++++++++++++++++++++++++
+ arch/s390/kernel/traps.c | 250 +-------------------------------------
+ arch/s390/kvm/trace.h | 2 +-
+ arch/s390/lib/uaccess_pt.c | 2 +-
+ arch/s390/mm/cmm.c | 8 +-
+ arch/s390/mm/init.c | 10 +-
+ arch/s390/mm/pageattr.c | 24 ++--
+ arch/s390/net/bpf_jit_comp.c | 3 +-
+ arch/s390/pci/pci.c | 3 +-
+ drivers/dma/Kconfig | 1 +
+ drivers/media/platform/Kconfig | 2 +-
+ drivers/s390/block/dasd_devmap.c | 3 +-
+ drivers/s390/block/scm_blk.c | 11 +-
+ drivers/s390/block/scm_drv.c | 2 +-
+ drivers/s390/char/monreader.c | 3 +-
+ drivers/s390/char/tty3270.c | 16 +--
+ drivers/s390/cio/chp.c | 22 +++-
+ drivers/s390/cio/chp.h | 2 +
+ drivers/s390/cio/chsc.c | 11 +-
+ drivers/s390/cio/css.c | 5 +-
+ drivers/s390/cio/device_ops.c | 22 ++--
+ drivers/spi/Kconfig | 3 +-
+ 27 files changed, 356 insertions(+), 321 deletions(-)
+ create mode 100644 arch/s390/kernel/dumpstack.c
+Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
+$ git merge sh/sh-latest
+Merge made by the 'recursive' strategy.
+ .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++
+ arch/sh/include/asm/hw_breakpoint.h | 12 +-
+ arch/sh/include/cpu-common/cpu/ubc.h | 17 +++
+ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++
+ arch/sh/kernel/cpu/sh2a/Makefile | 3 +-
+ arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++
+ arch/sh/kernel/hw_breakpoint.c | 8 ++
+ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++-
+ include/linux/serial_sci.h | 4 +
+ 9 files changed, 376 insertions(+), 16 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt
+ create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h
+ create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h
+ create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c
+Merging sparc-next/master (d6d88ba sparc64: Kill __ARCH_WANT_UNLOCKED_CTXSW)
+$ git merge sparc-next/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/Kconfig | 20 +-
+ arch/sparc/Makefile | 1 +
+ arch/sparc/include/asm/cmpxchg_64.h | 1 +
+ arch/sparc/include/asm/hibernate.h | 23 ++
+ arch/sparc/include/asm/leon_pci.h | 1 +
+ arch/sparc/include/asm/processor_64.h | 3 -
+ arch/sparc/kernel/Makefile | 3 +-
+ arch/sparc/kernel/asm-offsets.c | 15 +
+ arch/sparc/kernel/leon_pci.c | 2 +
+ arch/sparc/kernel/leon_pci_grpci1.c | 724 ++++++++++++++++++++++++++++++++++
+ arch/sparc/kernel/leon_pci_grpci2.c | 5 +
+ arch/sparc/mm/init_64.c | 2 -
+ arch/sparc/power/Makefile | 3 +
+ arch/sparc/power/hibernate.c | 42 ++
+ arch/sparc/power/hibernate_asm.S | 131 ++++++
+ 15 files changed, 969 insertions(+), 7 deletions(-)
+ create mode 100644 arch/sparc/include/asm/hibernate.h
+ create mode 100644 arch/sparc/kernel/leon_pci_grpci1.c
+ create mode 100644 arch/sparc/power/Makefile
+ create mode 100644 arch/sparc/power/hibernate.c
+ create mode 100644 arch/sparc/power/hibernate_asm.S
+Merging tile/master (01921d7 tile: remove two outdated Kconfig entries)
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/Kconfig | 12 +++---------
+ arch/tile/include/asm/atomic.h | 21 ++++++++++++++++++++
+ arch/tile/include/asm/ptrace.h | 3 ++-
+ arch/tile/include/asm/syscall.h | 6 ++++++
+ arch/tile/include/asm/syscalls.h | 6 ------
+ arch/tile/include/asm/thread_info.h | 8 ++++++++
+ arch/tile/include/uapi/asm/unistd.h | 2 ++
+ arch/tile/kernel/intvec_32.S | 10 ++++++++--
+ arch/tile/kernel/intvec_64.S | 24 +++++++++++++++++------
+ arch/tile/kernel/ptrace.c | 39 +++++++++++++++++++------------------
+ 10 files changed, 88 insertions(+), 43 deletions(-)
+Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (9cf81c7 xtensa: add accept4 syscall)
+$ git merge xtensa/for_next
+Already up-to-date.
+Merging btrfs/next (6aec51f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-linus-3.9)
+$ git merge btrfs/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ceph/master (d6c0dd6 libceph: fix decoding of pgids)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (f853c61 cifs: ignore everything in SPNEGO blob after mechTypes)
+$ git merge cifs/for-next
+Auto-merging fs/cifs/cifsfs.c
+Merge made by the 'recursive' strategy.
+ fs/cifs/asn1.c | 53 +++++------------------------------------------------
+ fs/cifs/cifsfs.c | 24 ++++++++++++++++++++++++
+ fs/cifs/cifsfs.h | 4 ++++
+ fs/cifs/file.c | 6 +++++-
+ fs/cifs/inode.c | 10 ++++------
+ fs/cifs/netmisc.c | 2 +-
+ 6 files changed, 43 insertions(+), 56 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 (f6161aa Linux 3.9-rc2)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (c288d29 ext2: Fix BUG_ON in evict() on inode deletion)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (2b405bf ext4: fix data=journal fast mount/umount hang)
+$ git merge ext4/dev
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/move_extent.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/extents.c
+Merge made by the 'recursive' strategy.
+ fs/ext4/ext4.h | 8 +-
+ fs/ext4/extents.c | 105 ++++++++++++++++++-----
+ fs/ext4/extents_status.c | 212 +++++++++++++++++++++++++++++++++++++++++++++--
+ fs/ext4/extents_status.h | 9 ++
+ fs/ext4/ialloc.c | 4 +-
+ fs/ext4/inode.c | 182 ++++++++++++++++++++++++++++++++++++++--
+ fs/ext4/mballoc.c | 23 ++---
+ fs/ext4/move_extent.c | 43 ++++++----
+ fs/ext4/page-io.c | 12 ++-
+ fs/ext4/resize.c | 4 +-
+ fs/ext4/super.c | 4 +-
+ fs/jbd2/transaction.c | 15 ++--
+ 12 files changed, 540 insertions(+), 81 deletions(-)
+Merging f2fs/dev (111d249 f2fs: fix typo in comments)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/super.c
+Merge made by the 'recursive' strategy.
+ fs/f2fs/checkpoint.c | 12 +++--
+ fs/f2fs/data.c | 72 +++++++++++++-------------
+ fs/f2fs/dir.c | 3 ++
+ fs/f2fs/f2fs.h | 21 +++++---
+ fs/f2fs/file.c | 10 ++--
+ fs/f2fs/gc.c | 2 +-
+ fs/f2fs/inode.c | 6 ++-
+ fs/f2fs/namei.c | 2 +-
+ fs/f2fs/node.c | 133 +++++++++++++++++++++++++-----------------------
+ fs/f2fs/recovery.c | 33 +++++++-----
+ fs/f2fs/segment.h | 3 +-
+ fs/f2fs/super.c | 24 ++++++---
+ fs/f2fs/xattr.c | 18 ++++---
+ include/linux/f2fs_fs.h | 17 ++++---
+ 14 files changed, 201 insertions(+), 155 deletions(-)
+Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master (26217f5 GFS2: Fix unlock of fcntl locks during withdrawn state)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/dlm/plock.c | 18 ++++-
+ fs/gfs2/bmap.c | 2 +-
+ fs/gfs2/file.c | 5 +-
+ fs/gfs2/glock.c | 13 ----
+ fs/gfs2/glock.h | 1 -
+ fs/gfs2/incore.h | 1 +
+ fs/gfs2/inode.c | 188 ++++++++++++++++++-----------------------------------
+ fs/gfs2/lock_dlm.c | 39 +++++------
+ fs/gfs2/rgrp.c | 26 +++-----
+ fs/gfs2/rgrp.h | 2 +-
+ fs/gfs2/super.c | 2 +-
+ 11 files changed, 117 insertions(+), 180 deletions(-)
+Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/jfs_imap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Auto-merging fs/logfs/super.c
+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 (cde24c5 SUNRPC: Report network/connection errors correctly for SOFTCONN rpc tasks)
+$ git merge nfs/linux-next
+Auto-merging net/sunrpc/xprtsock.c
+Merge made by the 'recursive' strategy.
+ fs/nfs/blocklayout/blocklayoutdm.c | 4 +-
+ fs/nfs/idmap.c | 13 +++---
+ fs/nfs/nfs4filelayout.c | 1 -
+ fs/nfs/nfs4proc.c | 16 +-------
+ fs/nfs/pnfs.c | 81 +++++++++++++++++++++++++++++++++-----
+ fs/nfs/pnfs.h | 6 +++
+ net/sunrpc/clnt.c | 24 ++++++-----
+ net/sunrpc/xprtsock.c | 8 ++--
+ 8 files changed, 107 insertions(+), 46 deletions(-)
+Merging nfsd/nfsd-next (6dbe51c Linux 3.9-rc1)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/dlm/dlmrecovery.c
+Auto-merging fs/ocfs2/dlm/dlmmaster.c
+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 | 8 +++++++-
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ 4 files changed, 25 insertions(+), 33 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 (b6f4bee fs/9p: Fix atomic_open)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (67e753c UBIFS: make space fixup work in the remount case)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/ubifs/super.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+Merging xfs/for-next (56cea2d xfs: take inode version into account in XFS_LITINO)
+$ git merge xfs/for-next
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging fs/xfs/xfs_buf.c
+Merge made by the 'recursive' strategy.
+ fs/xfs/xfs_alloc.c | 2 +-
+ fs/xfs/xfs_attr_leaf.c | 6 +-
+ fs/xfs/xfs_bmap.c | 10679 +++++++++++++++++++++++------------------------
+ fs/xfs/xfs_buf.c | 4 +-
+ fs/xfs/xfs_dinode.h | 6 +-
+ fs/xfs/xfs_error.c | 2 +-
+ fs/xfs/xfs_ialloc.c | 2 +-
+ fs/xfs/xfs_inode.h | 5 +-
+ fs/xfs/xfs_iomap.c | 2 +-
+ fs/xfs/xfs_log.c | 2 +-
+ fs/xfs/xfs_mount.h | 1 -
+ fs/xfs/xfs_vnodeops.c | 2 +-
+ 12 files changed, 5290 insertions(+), 5423 deletions(-)
+Merging vfs/for-next (dcf787f constify path_get/path_put and fs_struct.c stuff)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (f6161aa Linux 3.9-rc2)
+$ git merge pci/next
+Already up-to-date.
+Merging hid/for-next (26c3791 Merge branch 'for-3.10/upstream' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-driver-hid-roccat-isku | 12 +-
+ .../ABI/testing/sysfs-driver-hid-roccat-konepure | 105 +++++++
+ drivers/hid/Kconfig | 100 +++----
+ drivers/hid/Makefile | 4 +-
+ drivers/hid/hid-apple.c | 1 -
+ drivers/hid/hid-axff.c | 6 +-
+ drivers/hid/hid-core.c | 28 +-
+ drivers/hid/hid-dr.c | 8 +-
+ drivers/hid/hid-emsff.c | 6 +-
+ drivers/hid/hid-gaff.c | 10 +-
+ drivers/hid/hid-holtekff.c | 4 +-
+ drivers/hid/hid-ids.h | 2 +
+ drivers/hid/hid-kye.c | 4 +-
+ drivers/hid/hid-lenovo-tpkbd.c | 4 +-
+ drivers/hid/hid-lg2ff.c | 6 +-
+ drivers/hid/hid-lg3ff.c | 6 +-
+ drivers/hid/hid-lg4ff.c | 18 +-
+ drivers/hid/hid-lgff.c | 8 +-
+ drivers/hid/hid-logitech-dj.c | 53 +---
+ drivers/hid/hid-logitech-dj.h | 1 -
+ drivers/hid/hid-magicmouse.c | 1 -
+ drivers/hid/hid-multitouch.c | 55 ++--
+ drivers/hid/hid-ntrig.c | 10 +-
+ drivers/hid/hid-picolcd.h | 4 +-
+ drivers/hid/hid-picolcd_backlight.c | 4 +-
+ drivers/hid/hid-picolcd_cir.c | 2 -
+ drivers/hid/hid-picolcd_core.c | 8 +-
+ drivers/hid/hid-picolcd_debugfs.c | 2 -
+ drivers/hid/hid-picolcd_fb.c | 12 +-
+ drivers/hid/hid-picolcd_lcd.c | 4 +-
+ drivers/hid/hid-picolcd_leds.c | 4 +-
+ drivers/hid/hid-pl.c | 6 +-
+ drivers/hid/hid-prodikeys.c | 3 +-
+ drivers/hid/hid-roccat-isku.c | 17 +-
+ drivers/hid/hid-roccat-isku.h | 4 +-
+ drivers/hid/hid-roccat-konepure.c | 304 +++++++++++++++++++++
+ drivers/hid/hid-roccat-konepure.h | 72 +++++
+ drivers/hid/hid-roccat.c | 2 +-
+ drivers/hid/hid-sensor-hub.c | 12 +-
+ drivers/hid/hid-sjoy.c | 6 +-
+ drivers/hid/hid-speedlink.c | 2 -
+ drivers/hid/hid-steelseries.c | 16 +-
+ drivers/hid/hid-thingm.c | 1 -
+ drivers/hid/hid-tmff.c | 6 +-
+ drivers/hid/hid-zpff.c | 6 +-
+ drivers/hid/i2c-hid/i2c-hid.c | 32 +++
+ drivers/hid/usbhid/hid-core.c | 35 ++-
+ drivers/hid/usbhid/hid-pidff.c | 80 +++---
+ drivers/hid/usbhid/hiddev.c | 8 +-
+ drivers/hid/usbhid/usbhid.h | 3 -
+ include/linux/hid.h | 99 ++++++-
+ 51 files changed, 877 insertions(+), 329 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-konepure
+ create mode 100644 drivers/hid/hid-roccat-konepure.c
+ create mode 100644 drivers/hid/hid-roccat-konepure.h
+Merging i2c/i2c/for-next (21ea3f4 i2c: core: Pick i2c bus number from dt alias if present)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ drivers/i2c/i2c-core.c | 45 ++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 34 insertions(+), 11 deletions(-)
+Merging jdelvare-hwmon/master (c662b7a hwmon: (lm75) Add support for the Dallas/Maxim DS7505)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/lm75 | 15 ++++----
+ drivers/hwmon/Kconfig | 2 +-
+ drivers/hwmon/lm75.c | 92 ++++++++++++++++++++++++++++++++++++++++++++----
+ 3 files changed, 94 insertions(+), 15 deletions(-)
+Merging hwmon-staging/hwmon-next (fbaa035 hwmon: (max6697) Use is_visible and sysfs_create_group)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/hwmon/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hwmon/ntc_thermistor.txt | 29 +
+ Documentation/hwmon/adt7410 | 47 +-
+ Documentation/hwmon/ltc2978 | 143 +-
+ Documentation/hwmon/nct6775 | 188 +
+ drivers/hwmon/Kconfig | 34 +
+ drivers/hwmon/Makefile | 3 +
+ drivers/hwmon/abituguru.c | 11 +-
+ drivers/hwmon/abituguru3.c | 10 +-
+ drivers/hwmon/ad7314.c | 3 +-
+ drivers/hwmon/adm1021.c | 11 +-
+ drivers/hwmon/adm1026.c | 53 +-
+ drivers/hwmon/adm1029.c | 9 +-
+ drivers/hwmon/adm9240.c | 9 +-
+ drivers/hwmon/ads7871.c | 42 +-
+ drivers/hwmon/adt7310.c | 123 +
+ drivers/hwmon/adt7410.c | 442 +-
+ drivers/hwmon/adt7411.c | 10 +-
+ drivers/hwmon/adt7x10.c | 511 +++
+ drivers/hwmon/adt7x10.h | 37 +
+ drivers/hwmon/applesmc.c | 2 +-
+ drivers/hwmon/asb100.c | 23 +-
+ drivers/hwmon/asc7621.c | 56 +-
+ drivers/hwmon/coretemp.c | 3 +-
+ drivers/hwmon/da9052-hwmon.c | 14 +-
+ drivers/hwmon/da9055-hwmon.c | 4 +-
+ drivers/hwmon/dme1737.c | 68 +-
+ drivers/hwmon/f71805f.c | 3 +-
+ drivers/hwmon/fam15h_power.c | 4 +-
+ drivers/hwmon/fschmd.c | 9 +-
+ drivers/hwmon/gl518sm.c | 5 +-
+ drivers/hwmon/gpio-fan.c | 2 +-
+ drivers/hwmon/ibmaem.c | 21 +-
+ drivers/hwmon/ibmpex.c | 17 +-
+ drivers/hwmon/ina2xx.c | 16 +-
+ drivers/hwmon/it87.c | 24 +-
+ drivers/hwmon/k8temp.c | 4 +-
+ drivers/hwmon/lm78.c | 10 +-
+ drivers/hwmon/lm80.c | 5 +-
+ drivers/hwmon/lm85.c | 4 +-
+ drivers/hwmon/lm93.c | 74 +-
+ drivers/hwmon/ltc4151.c | 12 +-
+ drivers/hwmon/ltc4215.c | 46 +-
+ drivers/hwmon/ltc4245.c | 116 +-
+ drivers/hwmon/ltc4261.c | 38 +-
+ drivers/hwmon/max6697.c | 209 +-
+ drivers/hwmon/mc13783-adc.c | 13 +-
+ drivers/hwmon/nct6775.c | 4229 ++++++++++++++++++++
+ drivers/hwmon/ntc_thermistor.c | 353 +-
+ drivers/hwmon/pc87360.c | 25 +-
+ drivers/hwmon/pc87427.c | 13 +-
+ drivers/hwmon/pmbus/Kconfig | 4 +-
+ drivers/hwmon/pmbus/ltc2978.c | 170 +-
+ drivers/hwmon/s3c-hwmon.c | 19 +-
+ drivers/hwmon/sch56xx-common.c | 12 +-
+ drivers/hwmon/sis5595.c | 5 +-
+ drivers/hwmon/thmc50.c | 7 +-
+ drivers/hwmon/tmp102.c | 4 +-
+ drivers/hwmon/tmp401.c | 5 +-
+ drivers/hwmon/tmp421.c | 7 +-
+ drivers/hwmon/via686a.c | 47 +-
+ drivers/hwmon/vt1211.c | 23 +-
+ drivers/hwmon/vt8231.c | 5 +-
+ drivers/hwmon/w83627ehf.c | 31 +-
+ drivers/hwmon/w83781d.c | 36 +-
+ drivers/hwmon/w83791d.c | 4 +-
+ drivers/hwmon/w83792d.c | 13 +-
+ drivers/hwmon/w83793.c | 8 +-
+ drivers/hwmon/w83795.c | 9 +-
+ include/linux/platform_data/ntc_thermistor.h | 10 +-
+ 69 files changed, 6290 insertions(+), 1266 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt
+ create mode 100644 Documentation/hwmon/nct6775
+ create mode 100644 drivers/hwmon/adt7310.c
+ create mode 100644 drivers/hwmon/adt7x10.c
+ create mode 100644 drivers/hwmon/adt7x10.h
+ create mode 100644 drivers/hwmon/nct6775.c
+Merging v4l-dvb/master (b9e7b1a Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Resolved 'drivers/media/platform/Kconfig' using previous resolution.
+Removing drivers/media/usb/gspca/autogain_functions.h
+Auto-merging drivers/media/platform/Kconfig
+CONFLICT (content): Merge conflict in drivers/media/platform/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 74ba71c] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/media/v4l/io.xml | 6 +
+ MAINTAINERS | 30 +-
+ drivers/media/common/siano/smscoreapi.c | 3 +-
+ drivers/media/dvb-core/dmxdev.c | 3 +-
+ drivers/media/dvb-core/dvb_frontend.c | 331 +++---
+ drivers/media/dvb-frontends/mb86a20s.c | 296 +++--
+ drivers/media/dvb-frontends/mb86a20s.h | 8 +-
+ drivers/media/dvb-frontends/stv090x.c | 22 +-
+ drivers/media/i2c/adp1653.c | 4 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 4 +-
+ drivers/media/i2c/tda7432.c | 276 ++---
+ drivers/media/i2c/tvaudio.c | 2 +-
+ drivers/media/media-device.c | 102 +-
+ drivers/media/media-devnode.c | 31 +-
+ drivers/media/pci/bt8xx/bttv-cards.c | 19 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 1144 ++++++++-----------
+ drivers/media/pci/bt8xx/bttv-i2c.c | 8 +
+ drivers/media/pci/bt8xx/bttv-input.c | 30 +-
+ drivers/media/pci/bt8xx/bttv.h | 3 +
+ drivers/media/pci/bt8xx/bttvp.h | 36 +-
+ drivers/media/pci/cx25821/cx25821-audio-upstream.c | 21 +-
+ drivers/media/pci/ivtv/ivtvfb.c | 3 +-
+ drivers/media/platform/Kconfig | 2 +-
+ drivers/media/platform/blackfin/bfin_capture.c | 1 +
+ drivers/media/platform/davinci/vpbe_display.c | 1 +
+ drivers/media/platform/davinci/vpif_capture.c | 1 +
+ drivers/media/platform/davinci/vpif_display.c | 1 +
+ drivers/media/platform/s3c-camif/camif-capture.c | 16 +-
+ drivers/media/platform/s5p-fimc/fimc-capture.c | 1 +
+ drivers/media/platform/s5p-fimc/fimc-lite.c | 1 +
+ drivers/media/platform/s5p-g2d/g2d.c | 31 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 2 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 12 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 12 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 103 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 112 +-
+ drivers/media/platform/soc_camera/atmel-isi.c | 1 +
+ drivers/media/platform/soc_camera/mx2_camera.c | 1 +
+ drivers/media/platform/soc_camera/mx3_camera.c | 1 +
+ drivers/media/platform/soc_camera/omap1_camera.c | 6 +-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 1 +
+ drivers/media/platform/timblogiw.c | 2 +-
+ drivers/media/platform/vivi.c | 1 +
+ drivers/media/radio/radio-isa.c | 4 +-
+ drivers/media/radio/radio-rtrack2.c | 5 +-
+ drivers/media/radio/radio-si4713.c | 4 +-
+ drivers/media/rc/Kconfig | 2 +-
+ drivers/media/rc/ir-rx51.c | 4 +-
+ drivers/media/tuners/tuner-xc2028.c | 3 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 1178 ++++++++------------
+ drivers/media/usb/cx231xx/cx231xx-audio.c | 8 +-
+ drivers/media/usb/cx231xx/cx231xx-avcore.c | 85 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 59 +-
+ drivers/media/usb/cx231xx/cx231xx-core.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 5 -
+ drivers/media/usb/cx231xx/cx231xx-vbi.c | 25 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 590 +++-------
+ drivers/media/usb/cx231xx/cx231xx.h | 55 +-
+ drivers/media/usb/dvb-usb-v2/af9015.c | 39 +-
+ drivers/media/usb/dvb-usb-v2/af9015.h | 2 +
+ drivers/media/usb/dvb-usb-v2/af9035.c | 46 +-
+ drivers/media/usb/dvb-usb-v2/af9035.h | 2 +
+ drivers/media/usb/dvb-usb-v2/anysee.c | 46 +-
+ drivers/media/usb/dvb-usb-v2/anysee.h | 3 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 4 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 38 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 5 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +
+ drivers/media/usb/dvb-usb/cinergyT2-fe.c | 3 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 8 +-
+ drivers/media/usb/dvb-usb/m920x.c | 4 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 123 +-
+ drivers/media/usb/em28xx/em28xx-core.c | 17 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 88 +-
+ drivers/media/usb/em28xx/em28xx-i2c.c | 398 ++++---
+ drivers/media/usb/em28xx/em28xx-input.c | 5 +-
+ drivers/media/usb/em28xx/em28xx-reg.h | 25 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 279 +++--
+ drivers/media/usb/em28xx/em28xx.h | 216 ++--
+ drivers/media/usb/gspca/autogain_functions.h | 183 ---
+ drivers/media/usb/gspca/benq.c | 2 +-
+ drivers/media/usb/gspca/conex.c | 12 +-
+ drivers/media/usb/gspca/cpia1.c | 33 +-
+ drivers/media/usb/gspca/etoms.c | 10 +-
+ drivers/media/usb/gspca/gl860/gl860.c | 224 ++--
+ drivers/media/usb/gspca/gspca.c | 229 +---
+ drivers/media/usb/gspca/gspca.h | 62 +-
+ drivers/media/usb/gspca/jeilinj.c | 2 +-
+ drivers/media/usb/gspca/konica.c | 28 +-
+ drivers/media/usb/gspca/m5602/m5602_bridge.h | 27 +-
+ drivers/media/usb/gspca/m5602/m5602_core.c | 22 +-
+ drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 404 ++-----
+ drivers/media/usb/gspca/m5602/m5602_mt9m111.h | 2 +
+ drivers/media/usb/gspca/m5602/m5602_ov7660.c | 308 ++---
+ drivers/media/usb/gspca/m5602/m5602_ov7660.h | 3 +
+ drivers/media/usb/gspca/m5602/m5602_ov9650.c | 469 ++------
+ drivers/media/usb/gspca/m5602/m5602_ov9650.h | 2 +
+ drivers/media/usb/gspca/m5602/m5602_po1030.c | 471 ++------
+ drivers/media/usb/gspca/m5602/m5602_po1030.h | 2 +
+ drivers/media/usb/gspca/m5602/m5602_s5k4aa.c | 352 ++----
+ drivers/media/usb/gspca/m5602/m5602_s5k4aa.h | 2 +
+ drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 291 ++---
+ drivers/media/usb/gspca/m5602/m5602_s5k83a.h | 9 +-
+ drivers/media/usb/gspca/m5602/m5602_sensor.h | 3 +
+ drivers/media/usb/gspca/mr97310a.c | 8 +-
+ drivers/media/usb/gspca/ov519.c | 81 +-
+ drivers/media/usb/gspca/ov534.c | 2 +-
+ drivers/media/usb/gspca/pac207.c | 2 +-
+ drivers/media/usb/gspca/pac7302.c | 7 +-
+ drivers/media/usb/gspca/pac7311.c | 5 +-
+ drivers/media/usb/gspca/pac_common.h | 2 +-
+ drivers/media/usb/gspca/sn9c2028.c | 4 +-
+ drivers/media/usb/gspca/sonixb.c | 22 -
+ drivers/media/usb/gspca/sonixj.c | 556 +++------
+ drivers/media/usb/gspca/spca1528.c | 4 +-
+ drivers/media/usb/gspca/spca500.c | 36 +-
+ drivers/media/usb/gspca/spca501.c | 44 +-
+ drivers/media/usb/gspca/spca505.c | 42 +-
+ drivers/media/usb/gspca/spca508.c | 41 +-
+ drivers/media/usb/gspca/spca561.c | 70 +-
+ drivers/media/usb/gspca/sq905.c | 2 +-
+ drivers/media/usb/gspca/sq905c.c | 6 +-
+ drivers/media/usb/gspca/sq930x.c | 4 +-
+ drivers/media/usb/gspca/stv0680.c | 14 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx.c | 17 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c | 8 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 14 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 2 +
+ drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 10 +-
+ drivers/media/usb/gspca/sunplus.c | 27 +-
+ drivers/media/usb/gspca/vc032x.c | 9 +-
+ drivers/media/usb/gspca/w996Xcf.c | 5 +-
+ drivers/media/usb/gspca/zc3xx.c | 3 +-
+ drivers/media/usb/hdpvr/hdpvr-core.c | 1 +
+ drivers/media/usb/pwc/pwc-if.c | 1 +
+ drivers/media/usb/s2255/s2255drv.c | 439 ++++----
+ drivers/media/usb/stk1160/stk1160-v4l.c | 1 +
+ drivers/media/usb/stkwebcam/stk-webcam.c | 309 ++---
+ drivers/media/usb/stkwebcam/stk-webcam.h | 8 +-
+ drivers/media/usb/tlg2300/pd-common.h | 26 +-
+ drivers/media/usb/tlg2300/pd-main.c | 16 +-
+ drivers/media/usb/tlg2300/pd-radio.c | 225 ++--
+ drivers/media/usb/tlg2300/pd-video.c | 290 ++---
+ drivers/media/usb/uvc/uvc_queue.c | 1 +
+ drivers/media/v4l2-core/Kconfig | 1 +
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 34 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 8 +-
+ drivers/staging/media/as102/Makefile | 2 +-
+ include/media/media-devnode.h | 1 +
+ include/media/v4l2-chip-ident.h | 8 +
+ include/media/videobuf2-core.h | 1 +
+ include/uapi/linux/v4l2-controls.h | 9 +
+ include/uapi/linux/videodev2.h | 1 +
+ 155 files changed, 4781 insertions(+), 6879 deletions(-)
+ delete mode 100644 drivers/media/usb/gspca/autogain_functions.h
+Merging kbuild/for-next (4382a99 Merge branch 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+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 (b186aff pata_samsung_cf: use module_platform_driver_probe())
+$ git merge libata/NEXT
+Auto-merging drivers/ata/libata-acpi.c
+Merge made by the 'recursive' strategy.
+ drivers/ata/Kconfig | 13 +++++++------
+ drivers/ata/ahci.c | 2 ++
+ drivers/ata/ata_piix.c | 4 ++++
+ drivers/ata/libata-acpi.c | 2 +-
+ drivers/ata/pata_samsung_cf.c | 13 +------------
+ drivers/ata/sata_fsl.c | 3 +--
+ 6 files changed, 16 insertions(+), 21 deletions(-)
+Merging infiniband/for-next (ef4e359 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'misc', 'mlx4', 'qib' and 'srp' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging pstore/master (c530267 pstore: Replace calls to kmalloc and memcpy with kmemdup)
+$ git merge pstore/master
+Merge made by the 'recursive' strategy.
+ fs/pstore/ram.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging pm/linux-next (b1993ac Merge branch 'acpica-next' into linux-next)
+$ git merge pm/linux-next
+Removing drivers/clk/x86/clk-lpss.h
+Removing drivers/clk/x86/clk-lpss.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-devices-lpss_ltr | 44 +++
+ Documentation/ABI/testing/sysfs-firmware-acpi | 26 ++
+ drivers/acpi/Kconfig | 3 +-
+ drivers/acpi/Makefile | 1 +
+ drivers/acpi/acpi_lpss.c | 292 ++++++++++++++
+ drivers/acpi/acpi_memhotplug.c | 309 ++-------------
+ drivers/acpi/acpi_platform.c | 40 +-
+ drivers/acpi/acpica/Makefile | 1 +
+ drivers/acpi/acpica/acglobal.h | 4 +-
+ drivers/acpi/acpica/aclocal.h | 16 +
+ drivers/acpi/acpica/acmacros.h | 6 +-
+ drivers/acpi/acpica/acnamesp.h | 25 +-
+ drivers/acpi/acpica/acutils.h | 3 +-
+ drivers/acpi/acpica/dsutils.c | 10 +-
+ drivers/acpi/acpica/evevent.c | 12 +-
+ drivers/acpi/acpica/evgpe.c | 6 +-
+ drivers/acpi/acpica/evsci.c | 4 +-
+ drivers/acpi/acpica/evxface.c | 21 +-
+ drivers/acpi/acpica/evxfevnt.c | 12 +
+ drivers/acpi/acpica/exprep.c | 4 +-
+ drivers/acpi/acpica/exutils.c | 4 +-
+ drivers/acpi/acpica/hwacpi.c | 20 +-
+ drivers/acpi/acpica/nsconvert.c | 443 ++++++++++++++++++++++
+ drivers/acpi/acpica/nspredef.c | 141 ++++---
+ drivers/acpi/acpica/nsprepkg.c | 10 +-
+ drivers/acpi/acpica/nsrepair.c | 381 +++++++------------
+ drivers/acpi/acpica/nsrepair2.c | 16 +-
+ drivers/acpi/acpica/nsutils.c | 8 +-
+ drivers/acpi/acpica/psargs.c | 2 +-
+ drivers/acpi/acpica/rscalc.c | 6 +
+ drivers/acpi/acpica/rsdump.c | 8 +
+ drivers/acpi/acpica/rslist.c | 8 +
+ drivers/acpi/acpica/rsxface.c | 8 +-
+ drivers/acpi/acpica/utaddress.c | 4 +-
+ drivers/acpi/acpica/utcache.c | 18 +-
+ drivers/acpi/acpica/utexcep.c | 26 +-
+ drivers/acpi/acpica/utglobal.c | 2 +
+ drivers/acpi/container.c | 150 +-------
+ drivers/acpi/internal.h | 19 +
+ drivers/acpi/scan.c | 393 +++++++++++++++----
+ drivers/acpi/sysfs.c | 66 ++++
+ drivers/clk/x86/Makefile | 2 +-
+ drivers/clk/x86/clk-lpss.c | 99 -----
+ drivers/clk/x86/clk-lpss.h | 36 --
+ drivers/clk/x86/clk-lpt.c | 40 +-
+ drivers/cpufreq/cpufreq.c | 52 +--
+ drivers/cpufreq/cpufreq_conservative.c | 14 +-
+ include/acpi/acexcep.h | 461 +++++++++++++----------
+ include/acpi/acoutput.h | 53 ++-
+ include/acpi/acpi_bus.h | 19 +
+ include/acpi/acpixf.h | 2 +-
+ include/acpi/actbl2.h | 47 +++
+ include/acpi/actbl3.h | 55 ++-
+ include/acpi/actypes.h | 1 -
+ include/linux/platform_data/clk-lpss.h | 18 +
+ 55 files changed, 2119 insertions(+), 1352 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-lpss_ltr
+ create mode 100644 drivers/acpi/acpi_lpss.c
+ create mode 100644 drivers/acpi/acpica/nsconvert.c
+ delete mode 100644 drivers/clk/x86/clk-lpss.c
+ delete mode 100644 drivers/clk/x86/clk-lpss.h
+ create mode 100644 include/linux/platform_data/clk-lpss.h
+Merging idle/next (deda402 tools/power turbostat: additional Haswell CPU-id)
+$ git merge idle/next
+Merge made by the 'recursive' strategy.
+ drivers/idle/intel_idle.c | 1 +
+ tools/power/x86/turbostat/turbostat.c | 3 +++
+ 2 files changed, 4 insertions(+)
+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 cpuidle/cpuidle-next (d1c3ed6 Linux 3.8-rc2)
+$ git merge cpuidle/cpuidle-next
+Already up-to-date.
+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 (043e465 thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.)
+$ git merge thermal/next
+Already up-to-date.
+Merging ieee1394/for-next (6dbe51c Linux 3.9-rc1)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (f6161aa Linux 3.9-rc2)
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging scsi/for-next (6dbe51c Linux 3.9-rc1)
+$ git merge scsi/for-next
+Already up-to-date.
+Merging target-updates/for-next (783e150 target: Change default sense key of NOT_READY)
+$ git merge target-updates/for-next
+Merge made by the 'recursive' strategy.
+ drivers/scsi/qla2xxx/qla_target.c | 19 -------------------
+ drivers/scsi/qla2xxx/qla_target.h | 1 -
+ drivers/target/iscsi/iscsi_target_auth.c | 28 +---------------------------
+ drivers/target/iscsi/iscsi_target_nego.c | 14 ++++++--------
+ drivers/target/target_core_transport.c | 9 +++++++--
+ drivers/target/tcm_fc/tfc_sess.c | 9 +--------
+ 6 files changed, 15 insertions(+), 65 deletions(-)
+Merging target-merge/for-next-merge (a937536 Linux 3.9-rc3)
+$ 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 (e40ac33 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ Documentation/dmatest.txt | 81 ++++
+ drivers/dma/at_hdmac.c | 4 +-
+ drivers/dma/coh901318.c | 4 +-
+ drivers/dma/dmaengine.c | 2 +-
+ drivers/dma/dmatest.c | 887 +++++++++++++++++++++++++++++++++++-------
+ drivers/dma/dw_dmac.c | 28 +-
+ drivers/dma/dw_dmac_regs.h | 1 +
+ drivers/dma/imx-dma.c | 7 +-
+ drivers/dma/imx-sdma.c | 4 +-
+ drivers/dma/ioat/dma.h | 2 +-
+ drivers/dma/ioat/dma_v3.c | 15 +-
+ drivers/dma/ipu/ipu_idmac.c | 6 +-
+ drivers/dma/of-dma.c | 14 +-
+ drivers/dma/pch_dma.c | 2 +-
+ drivers/dma/pl330.c | 10 +-
+ drivers/dma/tegra20-apb-dma.c | 22 +-
+ drivers/dma/timb_dma.c | 2 +-
+ drivers/dma/txx9dmac.c | 8 +-
+ include/linux/dmaengine.h | 4 +-
+ include/linux/of_dma.h | 4 +-
+ 20 files changed, 905 insertions(+), 202 deletions(-)
+ create mode 100644 Documentation/dmatest.txt
+Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock)
+$ git merge dmaengine/next
+Resolved 'drivers/dma/ioat/dma_v3.c' using previous resolution.
+Auto-merging drivers/dma/ioat/dma_v3.c
+CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4a3e27e] Merge remote-tracking branch 'dmaengine/next'
+$ git diff -M --stat --summary HEAD^..
+Merging net-next/master (fe0e76f sh_eth: fix unused variable warning)
+$ git merge net-next/master
+Removing include/net/caif/caif_shm.h
+Auto-merging drivers/net/wireless/rtlwifi/usb.c
+Auto-merging drivers/net/wireless/mwifiex/sta_ioctl.c
+Auto-merging drivers/net/wireless/mwifiex/main.h
+Auto-merging drivers/net/wireless/mwifiex/init.c
+Auto-merging drivers/net/wireless/mwifiex/cmdevt.c
+Removing drivers/net/wireless/iwlwifi/pcie/cfg.h
+Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-2000.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-1000.c
+Auto-merging drivers/net/wireless/iwlegacy/3945-mac.c
+Removing drivers/net/wireless/ath/wil6210/dbg_hexdump.h
+Auto-merging drivers/net/ethernet/ti/cpsw.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+Removing drivers/net/caif/caif_shmcore.c
+Removing drivers/net/caif/caif_shm_u5500.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-net-mesh | 8 +
+ Documentation/devicetree/bindings/net/cpsw.txt | 16 +-
+ Documentation/networking/ip-sysctl.txt | 53 +-
+ MAINTAINERS | 2 +-
+ arch/arm/boot/dts/am33xx.dtsi | 2 +-
+ arch/arm/net/bpf_jit_32.c | 5 +-
+ arch/powerpc/net/bpf_jit_comp.c | 12 +-
+ arch/sparc/net/bpf_jit_comp.c | 6 +-
+ arch/x86/net/bpf_jit_comp.c | 9 +-
+ drivers/bcma/core.c | 8 +-
+ drivers/bcma/main.c | 5 +
+ drivers/connector/cn_proc.c | 25 +
+ drivers/infiniband/hw/cxgb4/cm.c | 68 +-
+ drivers/infiniband/hw/cxgb4/device.c | 34 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 14 +-
+ drivers/infiniband/hw/cxgb4/mem.c | 155 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 15 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 113 +-
+ drivers/infiniband/hw/cxgb4/t4.h | 11 +-
+ drivers/isdn/capi/capidrv.c | 3 +-
+ drivers/isdn/hisax/fsm.c | 2 +-
+ drivers/isdn/hisax/hfc_sx.c | 2 +-
+ drivers/net/caif/Kconfig | 7 -
+ drivers/net/caif/Makefile | 4 -
+ drivers/net/caif/caif_shm_u5500.c | 128 --
+ drivers/net/caif/caif_shmcore.c | 747 --------
+ drivers/net/ethernet/adi/bfin_mac.c | 6 +-
+ drivers/net/ethernet/aeroflex/greth.c | 24 +-
+ drivers/net/ethernet/amd/7990.c | 2 -
+ drivers/net/ethernet/amd/a2065.c | 1 -
+ drivers/net/ethernet/amd/am79c961a.c | 1 -
+ drivers/net/ethernet/amd/ariadne.c | 1 -
+ drivers/net/ethernet/amd/atarilance.c | 6 +-
+ drivers/net/ethernet/amd/au1000_eth.c | 1 -
+ drivers/net/ethernet/amd/declance.c | 2 -
+ drivers/net/ethernet/amd/mvme147.c | 4 +-
+ drivers/net/ethernet/amd/ni65.c | 2 +-
+ drivers/net/ethernet/amd/pcnet32.c | 1 -
+ drivers/net/ethernet/amd/sun3lance.c | 7 +-
+ drivers/net/ethernet/amd/sunlance.c | 9 +-
+ drivers/net/ethernet/apple/macmace.c | 16 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 6 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 3 -
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 73 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 84 +-
+ drivers/net/ethernet/broadcom/bgmac.h | 1 +
+ drivers/net/ethernet/broadcom/bnx2.c | 5 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 45 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 329 +++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 28 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 29 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 87 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 252 ++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 101 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 270 ++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 77 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 20 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 327 +++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 13 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 9 +-
+ drivers/net/ethernet/broadcom/sb1250-mac.c | 5 +-
+ drivers/net/ethernet/broadcom/tg3.c | 389 ++--
+ drivers/net/ethernet/broadcom/tg3.h | 18 +-
+ drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 5 +-
+ drivers/net/ethernet/cadence/at91_ether.c | 33 +-
+ drivers/net/ethernet/cadence/macb.c | 13 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.c | 5 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 55 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 778 +++++++-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 89 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 256 ++-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 -
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 53 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 98 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 1 +
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 35 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 8 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 24 +
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 14 +-
+ drivers/net/ethernet/cirrus/cs89x0.c | 20 +-
+ drivers/net/ethernet/cirrus/ep93xx_eth.c | 13 +-
+ drivers/net/ethernet/davicom/dm9000.c | 17 +-
+ drivers/net/ethernet/dec/tulip/xircom_cb.c | 9 +-
+ drivers/net/ethernet/dlink/dl2k.c | 7 +-
+ drivers/net/ethernet/emulex/benet/be.h | 2 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 31 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 10 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 11 +-
+ drivers/net/ethernet/emulex/benet/be_hw.h | 2 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 60 +-
+ drivers/net/ethernet/emulex/benet/be_roce.c | 2 +-
+ drivers/net/ethernet/emulex/benet/be_roce.h | 2 +-
+ drivers/net/ethernet/faraday/ftgmac100.c | 22 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 8 +-
+ drivers/net/ethernet/freescale/fec.c | 32 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 17 +-
+ drivers/net/ethernet/freescale/gianfar.c | 159 +-
+ drivers/net/ethernet/freescale/gianfar.h | 8 +-
+ drivers/net/ethernet/freescale/gianfar_ethtool.c | 3 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 -
+ drivers/net/ethernet/i825xx/82596.c | 8 +-
+ drivers/net/ethernet/i825xx/lib82596.c | 6 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +-
+ drivers/net/ethernet/ibm/emac/mal.c | 9 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 6 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 6 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 7 -
+ drivers/net/ethernet/intel/e1000e/80003es2lan.c | 131 +-
+ drivers/net/ethernet/intel/e1000e/82571.c | 38 +-
+ drivers/net/ethernet/intel/e1000e/82571.h | 2 +
+ drivers/net/ethernet/intel/e1000e/defines.h | 25 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 18 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 177 +-
+ drivers/net/ethernet/intel/e1000e/hw.h | 4 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 195 +-
+ drivers/net/ethernet/intel/e1000e/mac.c | 10 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 268 ++-
+ drivers/net/ethernet/intel/e1000e/nvm.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/param.c | 62 +-
+ drivers/net/ethernet/intel/e1000e/phy.c | 130 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 2 -
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 7 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 42 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 83 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 32 +
+ drivers/net/ethernet/marvell/mvneta.c | 14 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 27 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 76 -
+ drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 5 +-
+ drivers/net/ethernet/micrel/ks8695net.c | 20 +-
+ drivers/net/ethernet/micrel/ks8851_mll.c | 32 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 +-
+ drivers/net/ethernet/natsemi/jazzsonic.c | 12 +-
+ drivers/net/ethernet/natsemi/macsonic.c | 12 +-
+ drivers/net/ethernet/natsemi/sonic.c | 1 -
+ drivers/net/ethernet/natsemi/xtsonic.c | 12 +-
+ drivers/net/ethernet/neterion/s2io.c | 6 +-
+ drivers/net/ethernet/netx-eth.c | 2 -
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 20 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 1 -
+ drivers/net/ethernet/nxp/lpc_eth.c | 2 -
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 21 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 5 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 5 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 220 ++-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 1 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 163 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 26 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 33 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 53 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 14 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 7 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 21 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 5 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 255 ++-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 -
+ drivers/net/ethernet/rdc/r6040.c | 12 +-
+ drivers/net/ethernet/realtek/8139too.c | 2 -
+ drivers/net/ethernet/realtek/atp.c | 2 -
+ drivers/net/ethernet/renesas/sh_eth.c | 72 +-
+ drivers/net/ethernet/renesas/sh_eth.h | 1 -
+ drivers/net/ethernet/s6gmac.c | 15 +-
+ drivers/net/ethernet/seeq/ether3.c | 22 +-
+ drivers/net/ethernet/seeq/sgiseeq.c | 2 -
+ drivers/net/ethernet/sfc/efx.c | 267 ++-
+ drivers/net/ethernet/sfc/efx.h | 14 +-
+ drivers/net/ethernet/sfc/enum.h | 12 +-
+ drivers/net/ethernet/sfc/ethtool.c | 4 +-
+ drivers/net/ethernet/sfc/falcon.c | 17 +-
+ drivers/net/ethernet/sfc/filter.c | 249 ++-
+ drivers/net/ethernet/sfc/mcdi_pcol.h | 1 +
+ drivers/net/ethernet/sfc/net_driver.h | 97 +-
+ drivers/net/ethernet/sfc/nic.c | 94 +-
+ drivers/net/ethernet/sfc/ptp.c | 116 +-
+ drivers/net/ethernet/sfc/rx.c | 793 ++++----
+ drivers/net/ethernet/sfc/siena.c | 25 +-
+ drivers/net/ethernet/sgi/meth.c | 5 +-
+ drivers/net/ethernet/sis/sis900.c | 7 +-
+ drivers/net/ethernet/smsc/smc9194.c | 2 -
+ drivers/net/ethernet/smsc/smc91x.c | 2 -
+ drivers/net/ethernet/smsc/smsc911x.c | 2 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +-
+ drivers/net/ethernet/sun/sunbmac.c | 4 +-
+ drivers/net/ethernet/sun/sunhme.c | 13 +-
+ drivers/net/ethernet/sun/sunqe.c | 5 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 5 +-
+ drivers/net/ethernet/ti/cpsw.c | 159 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 2 +-
+ drivers/net/ethernet/ti/tlan.c | 4 +-
+ drivers/net/ethernet/toshiba/spider_net.c | 3 +-
+ drivers/net/ethernet/tundra/tsi108_eth.c | 21 +-
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 27 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 25 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 1 -
+ drivers/net/fddi/defxx.c | 9 +-
+ drivers/net/ieee802154/mrf24j40.c | 15 +-
+ drivers/net/irda/ali-ircc.c | 6 +-
+ drivers/net/irda/au1k_ir.c | 18 +-
+ drivers/net/irda/bfin_sir.c | 3 +-
+ drivers/net/irda/nsc-ircc.c | 6 +-
+ drivers/net/irda/pxaficp_ir.c | 4 +-
+ drivers/net/irda/smsc-ircc2.c | 17 +-
+ drivers/net/irda/via-ircc.c | 6 +-
+ drivers/net/irda/w83977af_ir.c | 7 +-
+ drivers/net/phy/lxt.c | 2 +-
+ drivers/net/phy/marvell.c | 127 ++
+ drivers/net/phy/mdio-gpio.c | 12 +-
+ drivers/net/phy/mdio-octeon.c | 13 +-
+ drivers/net/phy/micrel.c | 41 +-
+ drivers/net/phy/phy.c | 16 +
+ drivers/net/phy/vitesse.c | 3 +-
+ drivers/net/team/Kconfig | 12 +
+ drivers/net/team/Makefile | 1 +
+ drivers/net/team/team.c | 25 +-
+ drivers/net/team/team_mode_broadcast.c | 14 +-
+ drivers/net/team/team_mode_random.c | 71 +
+ drivers/net/team/team_mode_roundrobin.c | 36 +-
+ drivers/net/tun.c | 2 -
+ drivers/net/vxlan.c | 298 +++-
+ drivers/net/wireless/ath/ath5k/ath5k.h | 3 +-
+ drivers/net/wireless/ath/ath5k/eeprom.c | 6 +-
+ drivers/net/wireless/ath/ath5k/eeprom.h | 3 -
+ drivers/net/wireless/ath/ath5k/phy.c | 20 +-
+ drivers/net/wireless/ath/ath5k/reset.c | 4 +-
+ drivers/net/wireless/ath/ath6kl/Kconfig | 9 +
+ drivers/net/wireless/ath/ath6kl/Makefile | 5 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 15 +-
+ drivers/net/wireless/ath/ath6kl/core.h | 3 -
+ drivers/net/wireless/ath/ath6kl/debug.c | 72 +-
+ drivers/net/wireless/ath/ath6kl/debug.h | 11 +-
+ drivers/net/wireless/ath/ath6kl/hif.c | 3 +
+ drivers/net/wireless/ath/ath6kl/htc_mbox.c | 21 +-
+ drivers/net/wireless/ath/ath6kl/htc_pipe.c | 15 +-
+ drivers/net/wireless/ath/ath6kl/init.c | 116 +-
+ drivers/net/wireless/ath/ath6kl/main.c | 41 +-
+ drivers/net/wireless/ath/ath6kl/sdio.c | 16 +-
+ drivers/net/wireless/ath/ath6kl/target.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/trace.c | 23 +
+ drivers/net/wireless/ath/ath6kl/trace.h | 332 ++++
+ drivers/net/wireless/ath/ath6kl/txrx.c | 5 +-
+ drivers/net/wireless/ath/ath6kl/usb.c | 38 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 6 +
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 17 +
+ .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 49 +-
+ drivers/net/wireless/ath/ath9k/calib.c | 4 +-
+ drivers/net/wireless/ath/ath9k/common.h | 2 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 5 +
+ drivers/net/wireless/ath/ath9k/debug.h | 2 +
+ drivers/net/wireless/ath/ath9k/hw.c | 188 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 1 -
+ drivers/net/wireless/ath/carl9170/tx.c | 69 +-
+ drivers/net/wireless/ath/wil6210/Makefile | 4 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 33 +-
+ drivers/net/wireless/ath/wil6210/dbg_hexdump.h | 20 -
+ drivers/net/wireless/ath/wil6210/debugfs.c | 58 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c | 25 +-
+ drivers/net/wireless/ath/wil6210/main.c | 60 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 3 -
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 3 -
+ drivers/net/wireless/ath/wil6210/txrx.c | 7 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 17 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 154 +-
+ drivers/net/wireless/ath/wil6210/wmi.h | 363 +++-
+ drivers/net/wireless/b43/Kconfig | 6 +-
+ drivers/net/wireless/b43/b43.h | 6 +
+ drivers/net/wireless/b43/dma.c | 9 +-
+ drivers/net/wireless/b43/main.c | 7 +-
+ drivers/net/wireless/b43/phy_ht.c | 610 ++++++-
+ drivers/net/wireless/b43/phy_ht.h | 77 +-
+ drivers/net/wireless/b43legacy/dma.c | 8 +-
+ drivers/net/wireless/brcm80211/Kconfig | 5 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 7 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 30 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 33 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 42 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 34 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 39 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 28 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 382 ++++
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h | 25 +
+ .../net/wireless/brcm80211/brcmfmac/tracepoint.c | 22 +
+ .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 87 +
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 37 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +-
+ drivers/net/wireless/brcm80211/brcmsmac/Makefile | 4 +
+ drivers/net/wireless/brcm80211/brcmsmac/led.c | 126 ++
+ drivers/net/wireless/brcm80211/brcmsmac/led.h | 36 +
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 +
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 4 +
+ drivers/net/wireless/brcm80211/brcmsmac/main.c | 11 +-
+ drivers/net/wireless/brcm80211/brcmutil/utils.c | 25 +
+ .../net/wireless/brcm80211/include/brcmu_utils.h | 27 +
+ drivers/net/wireless/iwlegacy/3945-mac.c | 2 +-
+ drivers/net/wireless/iwlegacy/3945.c | 4 +-
+ drivers/net/wireless/iwlegacy/3945.h | 4 -
+ drivers/net/wireless/iwlegacy/4965-mac.c | 33 +-
+ drivers/net/wireless/iwlegacy/common.c | 17 +-
+ drivers/net/wireless/iwlegacy/common.h | 9 +-
+ drivers/net/wireless/iwlwifi/Kconfig | 11 +-
+ drivers/net/wireless/iwlwifi/Makefile | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/agn.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/calib.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/calib.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/commands.h | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 26 +-
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/testmode.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 13 +-
+ drivers/net/wireless/iwlwifi/dvm/ucode.c | 2 +-
+ .../wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} | 1 -
+ .../wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} | 1 -
+ .../wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} | 1 -
+ .../wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} | 1 -
+ .../wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} | 63 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 49 +-
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-debug.c | 13 +-
+ drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 14 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.h | 17 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-read.c | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-read.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-io.c | 19 +-
+ drivers/net/wireless/iwlwifi/iwl-modparams.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 15 +-
+ drivers/net/wireless/iwlwifi/iwl-notif-wait.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 51 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-phy-db.c | 11 +-
+ drivers/net/wireless/iwlwifi/iwl-phy-db.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-test.c | 11 +-
+ drivers/net/wireless/iwlwifi/iwl-test.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-testmode.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/binding.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 347 ++++
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 260 ++-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 138 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 319 ++++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 53 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 12 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 14 +-
+ drivers/net/wireless/iwlwifi/mvm/led.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 45 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 57 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 17 +-
+ drivers/net/wireless/iwlwifi/mvm/nvm.c | 11 +-
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 12 +-
+ drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/quota.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 14 +-
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 91 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/cfg.h | 115 --
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 4 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 25 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 6 +-
+ drivers/net/wireless/mac80211_hwsim.c | 3 +-
+ drivers/net/wireless/mwifiex/Makefile | 1 +
+ drivers/net/wireless/mwifiex/cfg80211.c | 218 ++-
+ drivers/net/wireless/mwifiex/cmdevt.c | 2 +-
+ drivers/net/wireless/mwifiex/ethtool.c | 70 +
+ drivers/net/wireless/mwifiex/fw.h | 72 +-
+ drivers/net/wireless/mwifiex/init.c | 6 +-
+ drivers/net/wireless/mwifiex/ioctl.h | 23 +
+ drivers/net/wireless/mwifiex/main.c | 15 +-
+ drivers/net/wireless/mwifiex/main.h | 9 +
+ drivers/net/wireless/mwifiex/pcie.c | 156 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 79 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 10 +-
+ drivers/net/wireless/mwifiex/txrx.c | 2 +
+ drivers/net/wireless/mwifiex/util.c | 5 +-
+ drivers/net/wireless/mwl8k.c | 111 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
+ drivers/net/wireless/ray_cs.c | 6 +-
+ drivers/net/wireless/rndis_wlan.c | 5 +-
+ drivers/net/wireless/rt2x00/Kconfig | 7 +
+ drivers/net/wireless/rt2x00/rt2800.h | 103 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 857 ++++++++-
+ drivers/net/wireless/rt2x00/rt2800pci.c | 116 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 63 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 10 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 8 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 10 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.h | 9 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 20 +-
+ drivers/net/wireless/rtlwifi/usb.c | 3 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 3 -
+ drivers/net/wireless/ti/wlcore/main.c | 3 +-
+ drivers/nfc/microread/mei.c | 2 +-
+ drivers/scsi/csiostor/Makefile | 3 +-
+ drivers/scsi/csiostor/csio_hw.c | 559 ++----
+ drivers/scsi/csiostor/csio_hw.h | 47 +-
+ drivers/scsi/csiostor/csio_hw_chip.h | 175 ++
+ drivers/scsi/csiostor/csio_hw_t4.c | 403 +++++
+ drivers/scsi/csiostor/csio_hw_t5.c | 397 +++++
+ drivers/scsi/csiostor/csio_init.c | 48 +-
+ drivers/scsi/csiostor/csio_init.h | 29 +-
+ drivers/scsi/csiostor/csio_lnode.h | 2 +-
+ drivers/scsi/csiostor/csio_rnode.c | 10 +-
+ drivers/scsi/csiostor/csio_rnode.h | 2 +-
+ drivers/scsi/csiostor/csio_wr.c | 60 +-
+ drivers/ssb/driver_chipcommon.c | 2 +-
+ drivers/ssb/driver_chipcommon_pmu.c | 41 +-
+ drivers/ssb/driver_mipscore.c | 25 +-
+ drivers/ssb/driver_pcicore.c | 15 +-
+ drivers/ssb/embedded.c | 5 +-
+ drivers/ssb/main.c | 51 +-
+ drivers/ssb/pci.c | 97 +-
+ drivers/ssb/pcmcia.c | 46 +-
+ drivers/ssb/scan.c | 31 +-
+ drivers/ssb/sprom.c | 4 +-
+ drivers/ssb/ssb_private.h | 19 +-
+ include/linux/cn_proc.h | 4 +
+ include/linux/filter.h | 11 +
+ include/linux/ieee80211.h | 52 +-
+ include/linux/if_team.h | 25 +-
+ include/linux/micrel_phy.h | 1 +
+ include/linux/netdev_features.h | 9 +-
+ include/linux/netdevice.h | 27 +-
+ include/linux/openvswitch.h | 13 +-
+ include/linux/phy.h | 10 +
+ include/linux/platform_data/cpsw.h | 2 +-
+ include/linux/rtnetlink.h | 9 +
+ include/linux/skbuff.h | 38 +
+ include/linux/socket.h | 1 +
+ include/linux/ssb/ssb.h | 6 +-
+ include/linux/tcp.h | 21 +-
+ include/linux/vm_sockets.h | 23 +
+ include/net/caif/caif_shm.h | 26 -
+ include/net/cfg80211.h | 126 +-
+ include/net/inet_connection_sock.h | 5 +-
+ include/net/ip6_tunnel.h | 20 +
+ include/net/ipip.h | 3 -
+ include/net/ipv6.h | 20 +-
+ include/net/mac80211.h | 29 +-
+ include/net/request_sock.h | 8 +-
+ include/net/tcp.h | 144 +-
+ include/uapi/linux/cn_proc.h | 10 +-
+ include/uapi/linux/filter.h | 3 +-
+ include/uapi/linux/if_packet.h | 2 +
+ include/uapi/linux/neighbour.h | 3 +
+ include/uapi/linux/netlink_diag.h | 42 +
+ include/uapi/linux/nfc.h | 16 +
+ include/uapi/linux/nl80211.h | 117 +-
+ include/uapi/linux/pkt_sched.h | 1 +
+ include/uapi/linux/snmp.h | 2 +
+ include/uapi/linux/tcp.h | 26 -
+ include/uapi/linux/vm_sockets.h | 23 +-
+ kernel/signal.c | 2 +
+ net/Kconfig | 1 +
+ net/batman-adv/Kconfig | 14 +
+ net/batman-adv/Makefile | 1 +
+ net/batman-adv/bat_iv_ogm.c | 5 +
+ net/batman-adv/debugfs.c | 18 +
+ net/batman-adv/distributed-arp-table.c | 22 +-
+ net/batman-adv/main.c | 6 +
+ net/batman-adv/main.h | 12 +-
+ net/batman-adv/network-coding.c | 1821 +++++++++++++++++++
+ net/batman-adv/network-coding.h | 123 ++
+ net/batman-adv/originator.c | 6 +
+ net/batman-adv/packet.h | 33 +
+ net/batman-adv/routing.c | 49 +-
+ net/batman-adv/send.c | 5 +
+ net/batman-adv/soft-interface.c | 14 +
+ net/batman-adv/sysfs.c | 16 +-
+ net/batman-adv/translation-table.c | 29 +-
+ net/batman-adv/types.h | 136 ++
+ net/batman-adv/unicast.c | 6 +-
+ net/bridge/br_fdb.c | 14 +-
+ net/bridge/br_multicast.c | 2 +-
+ net/bridge/br_netlink.c | 5 +-
+ net/caif/caif_dev.c | 9 +-
+ net/caif/caif_socket.c | 22 +-
+ net/caif/caif_usb.c | 4 +-
+ net/caif/cfcnfg.c | 19 +-
+ net/caif/cfctrl.c | 14 +-
+ net/caif/cffrml.c | 4 +-
+ net/caif/cfmuxl.c | 4 +-
+ net/caif/cfpkt_skbuff.c | 8 +-
+ net/caif/cfrfml.c | 4 +-
+ net/caif/cfserl.c | 4 +-
+ net/caif/cfsrvl.c | 13 +-
+ net/caif/chnl_net.c | 6 +-
+ net/can/af_can.c | 30 +-
+ net/core/dev.c | 72 +-
+ net/core/ethtool.c | 1 +
+ net/core/filter.c | 5 +
+ net/core/flow.c | 42 +-
+ net/core/flow_dissector.c | 68 +
+ net/core/netpoll.c | 3 +-
+ net/core/rtnetlink.c | 83 +-
+ net/core/skbuff.c | 49 +-
+ net/core/sock.c | 2 -
+ net/dcb/dcbevent.c | 1 +
+ net/dccp/ipv4.c | 5 +-
+ net/dccp/ipv6.c | 5 +-
+ net/ipv4/af_inet.c | 9 +-
+ net/ipv4/devinet.c | 70 +-
+ net/ipv4/inet_connection_sock.c | 2 +-
+ net/ipv4/inet_diag.c | 4 +-
+ net/ipv4/inet_lro.c | 5 +-
+ net/ipv4/ip_gre.c | 16 +-
+ net/ipv4/ipip.c | 14 +-
+ net/ipv4/proc.c | 2 +
+ net/ipv4/syncookies.c | 3 +-
+ net/ipv4/sysctl_net_ipv4.c | 18 +-
+ net/ipv4/tcp.c | 268 +--
+ net/ipv4/tcp_input.c | 606 ++-----
+ net/ipv4/tcp_ipv4.c | 108 +-
+ net/ipv4/tcp_minisocks.c | 44 +-
+ net/ipv4/tcp_output.c | 367 ++--
+ net/ipv4/tcp_timer.c | 21 +-
+ net/ipv4/tcp_westwood.c | 2 +-
+ net/ipv4/udp.c | 115 +-
+ net/ipv6/addrconf.c | 70 +-
+ net/ipv6/addrlabel.c | 6 -
+ net/ipv6/af_inet6.c | 6 +-
+ net/ipv6/datagram.c | 20 +-
+ net/ipv6/icmp.c | 2 +-
+ net/ipv6/inet6_connection_sock.c | 10 +-
+ net/ipv6/ip6_flowlabel.c | 11 +-
+ net/ipv6/ip6_gre.c | 17 +-
+ net/ipv6/ip6_offload.c | 4 +-
+ net/ipv6/ip6_tunnel.c | 15 +-
+ net/ipv6/ndisc.c | 2 -
+ net/ipv6/raw.c | 9 +-
+ net/ipv6/sit.c | 2 +
+ net/ipv6/syncookies.c | 3 +-
+ net/ipv6/tcp_ipv6.c | 56 +-
+ net/ipv6/udp.c | 13 +-
+ net/ipv6/udp_offload.c | 8 +-
+ net/mac80211/cfg.c | 151 +-
+ net/mac80211/debugfs_sta.c | 31 +
+ net/mac80211/driver-ops.h | 7 +-
+ net/mac80211/ht.c | 52 +-
+ net/mac80211/ibss.c | 29 +-
+ net/mac80211/ieee80211_i.h | 26 +-
+ net/mac80211/iface.c | 14 +-
+ net/mac80211/key.c | 103 +-
+ net/mac80211/key.h | 5 +-
+ net/mac80211/main.c | 55 +-
+ net/mac80211/mesh.c | 59 +-
+ net/mac80211/mesh.h | 12 -
+ net/mac80211/mesh_plink.c | 37 +-
+ net/mac80211/mlme.c | 100 +-
+ net/mac80211/offchannel.c | 2 +-
+ net/mac80211/pm.c | 117 +-
+ net/mac80211/rc80211_minstrel.c | 204 ++-
+ net/mac80211/rc80211_minstrel.h | 31 +-
+ net/mac80211/rc80211_minstrel_debugfs.c | 12 +-
+ net/mac80211/rc80211_minstrel_ht.c | 79 +-
+ net/mac80211/rc80211_minstrel_ht.h | 6 +-
+ net/mac80211/rx.c | 61 +-
+ net/mac80211/sta_info.c | 11 +-
+ net/mac80211/sta_info.h | 2 -
+ net/mac80211/trace.h | 11 +-
+ net/mac80211/util.c | 73 +-
+ net/mac80211/vht.c | 212 ++-
+ net/netlink/Kconfig | 10 +
+ net/netlink/Makefile | 3 +
+ net/netlink/af_netlink.c | 59 +-
+ net/netlink/af_netlink.h | 62 +
+ net/netlink/diag.c | 188 ++
+ net/nfc/llcp/commands.c | 205 ++-
+ net/nfc/llcp/llcp.c | 112 +-
+ net/nfc/llcp/llcp.h | 36 +-
+ net/nfc/llcp/sock.c | 130 +-
+ net/nfc/netlink.c | 172 ++
+ net/nfc/nfc.h | 14 +
+ net/openvswitch/datapath.c | 13 +-
+ net/openvswitch/datapath.h | 2 +-
+ net/openvswitch/vport-internal_dev.c | 13 +-
+ net/openvswitch/vport.h | 4 +-
+ net/packet/af_packet.c | 109 +-
+ net/packet/internal.h | 3 +-
+ net/rfkill/rfkill-regulator.c | 2 +-
+ net/sched/sch_htb.c | 31 +-
+ net/vmw_vsock/vmci_transport.c | 16 +-
+ net/vmw_vsock/vmci_transport.h | 3 +
+ net/wireless/ap.c | 62 -
+ net/wireless/core.c | 73 +-
+ net/wireless/core.h | 22 +-
+ net/wireless/mesh.c | 15 +-
+ net/wireless/mlme.c | 230 +--
+ net/wireless/nl80211.c | 1885 +++++++++++++-------
+ net/wireless/nl80211.h | 68 -
+ net/wireless/rdev-ops.h | 20 +-
+ net/wireless/reg.c | 6 +-
+ net/wireless/sme.c | 26 +-
+ net/wireless/sysfs.c | 25 +-
+ net/wireless/trace.h | 46 +
+ net/xfrm/xfrm_policy.c | 23 +-
+ tools/Makefile | 11 +-
+ tools/net/Makefile | 15 +
+ tools/net/bpf_jit_disasm.c | 199 +++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/net/Makefile | 19 +
+ tools/testing/selftests/net/psock_fanout.c | 394 ++++
+ tools/testing/selftests/net/run_afpackettests | 16 +
+ tools/testing/selftests/net/run_netsocktests | 12 +
+ tools/testing/selftests/net/socket.c | 92 +
+ 639 files changed, 22151 insertions(+), 10041 deletions(-)
+ delete mode 100644 drivers/net/caif/caif_shm_u5500.c
+ delete mode 100644 drivers/net/caif/caif_shmcore.c
+ create mode 100644 drivers/net/team/team_mode_random.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/trace.c
+ create mode 100644 drivers/net/wireless/ath/ath6kl/trace.h
+ delete mode 100644 drivers/net/wireless/ath/wil6210/dbg_hexdump.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.h
+ rename drivers/net/wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} (99%)
+ rename drivers/net/wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} (99%)
+ rename drivers/net/wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} (99%)
+ rename drivers/net/wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} (99%)
+ rename drivers/net/wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} (58%)
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
+ delete mode 100644 drivers/net/wireless/iwlwifi/pcie/cfg.h
+ create mode 100644 drivers/net/wireless/mwifiex/ethtool.c
+ create mode 100644 drivers/scsi/csiostor/csio_hw_chip.h
+ create mode 100644 drivers/scsi/csiostor/csio_hw_t4.c
+ create mode 100644 drivers/scsi/csiostor/csio_hw_t5.c
+ create mode 100644 include/linux/vm_sockets.h
+ delete mode 100644 include/net/caif/caif_shm.h
+ create mode 100644 include/uapi/linux/netlink_diag.h
+ create mode 100644 net/batman-adv/network-coding.c
+ create mode 100644 net/batman-adv/network-coding.h
+ create mode 100644 net/netlink/Kconfig
+ create mode 100644 net/netlink/af_netlink.h
+ create mode 100644 net/netlink/diag.c
+ create mode 100644 tools/net/Makefile
+ create mode 100644 tools/net/bpf_jit_disasm.c
+ create mode 100644 tools/testing/selftests/net/Makefile
+ create mode 100644 tools/testing/selftests/net/psock_fanout.c
+ create mode 100644 tools/testing/selftests/net/run_afpackettests
+ create mode 100644 tools/testing/selftests/net/run_netsocktests
+ create mode 100644 tools/testing/selftests/net/socket.c
+Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table)
+$ git merge ipsec-next/master
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 1 +
+ include/uapi/linux/xfrm.h | 3 +++
+ net/ipv4/ipcomp.c | 1 +
+ net/ipv4/xfrm4_mode_tunnel.c | 8 ++++++--
+ net/ipv6/xfrm6_mode_tunnel.c | 7 +++++--
+ net/xfrm/xfrm_state.c | 1 +
+ net/xfrm/xfrm_user.c | 17 +++++++++++++++--
+ 7 files changed, 32 insertions(+), 6 deletions(-)
+Merging wireless-next/master (0d4e671 ath6kl: fix size_t printf warnings)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (0227c7b Bluetooth: fix error return code in rfcomm_add_listener())
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/sco.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btmrvl_sdio.c | 8 +-
+ include/net/bluetooth/bluetooth.h | 12 +-
+ include/net/bluetooth/hci.h | 21 +-
+ include/net/bluetooth/hci_core.h | 28 +-
+ include/net/bluetooth/rfcomm.h | 6 -
+ net/bluetooth/a2mp.c | 6 +-
+ net/bluetooth/af_bluetooth.c | 15 +-
+ net/bluetooth/bnep/sock.c | 4 +-
+ net/bluetooth/cmtp/sock.c | 4 +-
+ net/bluetooth/hci_conn.c | 4 +-
+ net/bluetooth/hci_core.c | 727 +++++++++++++++++++++++++++++++-------
+ net/bluetooth/hci_event.c | 605 ++++++-------------------------
+ net/bluetooth/hci_sock.c | 9 +-
+ net/bluetooth/hci_sysfs.c | 4 +-
+ net/bluetooth/hidp/core.c | 4 +
+ net/bluetooth/hidp/sock.c | 4 +-
+ net/bluetooth/l2cap_sock.c | 4 +-
+ net/bluetooth/mgmt.c | 680 ++++++++++++++++++++++++-----------
+ net/bluetooth/rfcomm/core.c | 167 +++++----
+ net/bluetooth/rfcomm/sock.c | 3 +-
+ net/bluetooth/sco.c | 3 +-
+ 21 files changed, 1329 insertions(+), 989 deletions(-)
+Merging mtd/master (35f8c76 Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (91aabd2 mtd: nand_ids: use size macros)
+$ git merge l2-mtd/master
+Auto-merging drivers/ssb/driver_mipscore.c
+Removing drivers/mtd/onenand/onenand_sim.c
+Removing drivers/mtd/nand/rtc_from4.c
+Removing drivers/mtd/nand/ppchameleonevb.c
+Removing drivers/mtd/nand/h1910.c
+Removing drivers/mtd/maps/tqm8xxl.c
+Removing drivers/mtd/maps/rpxlite.c
+Removing drivers/mtd/maps/mbx860.c
+Removing drivers/mtd/maps/ixp2000.c
+Removing drivers/mtd/maps/h720x-flash.c
+Removing drivers/mtd/maps/dmv182.c
+Removing drivers/mtd/maps/dilnetpc.c
+Removing drivers/mtd/maps/dbox2-flash.c
+Removing drivers/mtd/devices/docprobe.c
+Removing drivers/mtd/devices/docecc.c
+Removing drivers/mtd/devices/doc2001plus.c
+Removing drivers/mtd/devices/doc2001.c
+Removing drivers/mtd/devices/doc2000.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-mtd | 6 +-
+ .../devicetree/bindings/mtd/partition.txt | 36 +-
+ arch/arm/configs/lpc32xx_defconfig | 1 -
+ arch/arm/mach-pxa/Kconfig | 1 -
+ arch/cris/Kconfig | 1 -
+ arch/cris/arch-v32/drivers/Kconfig | 1 -
+ arch/m68k/include/asm/commproc.h | 17 -
+ drivers/bcma/driver_mips.c | 2 +-
+ drivers/mtd/Kconfig | 13 -
+ drivers/mtd/Makefile | 3 +-
+ drivers/mtd/chips/Kconfig | 1 -
+ drivers/mtd/devices/Kconfig | 64 --
+ drivers/mtd/devices/Makefile | 5 -
+ drivers/mtd/devices/bcm47xxsflash.c | 13 +-
+ drivers/mtd/devices/bcm47xxsflash.h | 59 +
+ drivers/mtd/devices/doc2000.c | 1178 --------------------
+ drivers/mtd/devices/doc2001.c | 824 --------------
+ drivers/mtd/devices/doc2001plus.c | 1080 ------------------
+ drivers/mtd/devices/docecc.c | 521 ---------
+ drivers/mtd/devices/docg3.c | 15 +-
+ drivers/mtd/devices/docprobe.c | 325 ------
+ drivers/mtd/devices/elm.c | 9 +-
+ drivers/mtd/devices/m25p80.c | 25 +-
+ drivers/mtd/devices/mtd_dataflash.c | 4 +-
+ drivers/mtd/maps/Kconfig | 77 --
+ drivers/mtd/maps/Makefile | 8 -
+ drivers/mtd/maps/bfin-async-flash.c | 3 +-
+ drivers/mtd/maps/ck804xrom.c | 3 +-
+ drivers/mtd/maps/dbox2-flash.c | 123 --
+ drivers/mtd/maps/dc21285.c | 3 +-
+ drivers/mtd/maps/dilnetpc.c | 496 ---------
+ drivers/mtd/maps/dmv182.c | 146 ---
+ drivers/mtd/maps/gpio-addr-flash.c | 3 +-
+ drivers/mtd/maps/h720x-flash.c | 120 --
+ drivers/mtd/maps/impa7.c | 7 +-
+ drivers/mtd/maps/intel_vr_nor.c | 4 +-
+ drivers/mtd/maps/ixp2000.c | 253 -----
+ drivers/mtd/maps/ixp4xx.c | 2 +-
+ drivers/mtd/maps/lantiq-flash.c | 3 +-
+ drivers/mtd/maps/mbx860.c | 98 --
+ drivers/mtd/maps/pci.c | 3 +-
+ drivers/mtd/maps/physmap.c | 17 +-
+ drivers/mtd/maps/physmap_of.c | 16 +-
+ drivers/mtd/maps/plat-ram.c | 2 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 4 +-
+ drivers/mtd/maps/rbtx4939-flash.c | 5 +-
+ drivers/mtd/maps/rpxlite.c | 64 --
+ drivers/mtd/maps/sa1100-flash.c | 2 +-
+ drivers/mtd/maps/solutionengine.c | 2 +-
+ drivers/mtd/maps/tqm8xxl.c | 249 -----
+ drivers/mtd/maps/tsunami_flash.c | 5 +-
+ drivers/mtd/mtdchar.c | 52 +-
+ drivers/mtd/mtdcore.c | 26 +-
+ drivers/mtd/mtdcore.h | 30 +-
+ drivers/mtd/mtdpart.c | 4 +-
+ drivers/mtd/nand/Kconfig | 30 -
+ drivers/mtd/nand/Makefile | 3 -
+ drivers/mtd/nand/atmel_nand.c | 15 +-
+ drivers/mtd/nand/cafe_nand.c | 6 -
+ drivers/mtd/nand/davinci_nand.c | 16 +-
+ drivers/mtd/nand/docg4.c | 13 +-
+ drivers/mtd/nand/fsmc_nand.c | 13 +-
+ drivers/mtd/nand/gpio.c | 8 +-
+ drivers/mtd/nand/h1910.c | 167 ---
+ drivers/mtd/nand/nand_base.c | 194 ++--
+ drivers/mtd/nand/nand_bbt.c | 25 -
+ drivers/mtd/nand/nand_ids.c | 242 ++--
+ drivers/mtd/nand/nandsim.c | 24 +-
+ drivers/mtd/nand/nuc900_nand.c | 9 -
+ drivers/mtd/nand/omap2.c | 5 +-
+ drivers/mtd/nand/orion_nand.c | 13 +-
+ drivers/mtd/nand/ppchameleonevb.c | 403 -------
+ drivers/mtd/nand/pxa3xx_nand.c | 2 +-
+ drivers/mtd/nand/rtc_from4.c | 624 -----------
+ drivers/mtd/nand/sh_flctl.c | 16 +-
+ drivers/mtd/nand/sm_common.c | 62 +-
+ drivers/mtd/nand/txx9ndfmc.c | 13 +-
+ drivers/mtd/ofpart.c | 7 +-
+ drivers/mtd/onenand/Kconfig | 7 -
+ drivers/mtd/onenand/Makefile | 3 -
+ drivers/mtd/onenand/onenand_sim.c | 564 ----------
+ drivers/pcmcia/m8xx_pcmcia.c | 140 ---
+ drivers/ssb/driver_mipscore.c | 2 +-
+ include/linux/mtd/mtd.h | 8 +-
+ include/linux/mtd/nand.h | 116 +-
+ include/linux/mtd/physmap.h | 2 +-
+ include/linux/mtd/plat-ram.h | 4 +-
+ include/linux/platform_data/elm.h | 2 +-
+ 88 files changed, 557 insertions(+), 8235 deletions(-)
+ delete mode 100644 drivers/mtd/devices/doc2000.c
+ delete mode 100644 drivers/mtd/devices/doc2001.c
+ delete mode 100644 drivers/mtd/devices/doc2001plus.c
+ delete mode 100644 drivers/mtd/devices/docecc.c
+ delete mode 100644 drivers/mtd/devices/docprobe.c
+ delete mode 100644 drivers/mtd/maps/dbox2-flash.c
+ delete mode 100644 drivers/mtd/maps/dilnetpc.c
+ delete mode 100644 drivers/mtd/maps/dmv182.c
+ delete mode 100644 drivers/mtd/maps/h720x-flash.c
+ delete mode 100644 drivers/mtd/maps/ixp2000.c
+ delete mode 100644 drivers/mtd/maps/mbx860.c
+ delete mode 100644 drivers/mtd/maps/rpxlite.c
+ delete mode 100644 drivers/mtd/maps/tqm8xxl.c
+ delete mode 100644 drivers/mtd/nand/h1910.c
+ delete mode 100644 drivers/mtd/nand/ppchameleonevb.c
+ delete mode 100644 drivers/mtd/nand/rtc_from4.c
+ delete mode 100644 drivers/mtd/onenand/onenand_sim.c
+Merging crypto/master (ca9fbfd crypto: picoxcell - Use of_match_ptr() macro)
+$ git merge crypto/master
+Removing include/linux/platform_data/atmel-aes.h
+Auto-merging drivers/crypto/caam/caamalg.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/crypto/fsl-imx-sahara.txt | 15 +
+ Documentation/hw_random.txt | 2 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 14 +-
+ arch/x86/crypto/Makefile | 2 +-
+ arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 5 +-
+ crypto/Kconfig | 10 -
+ crypto/crypto_user.c | 4 +-
+ drivers/char/hw_random/exynos-rng.c | 3 +-
+ drivers/char/hw_random/mxc-rnga.c | 21 +-
+ drivers/crypto/Kconfig | 18 +-
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/atmel-aes.c | 471 ++++++---
+ drivers/crypto/atmel-sha-regs.h | 7 +-
+ drivers/crypto/atmel-sha.c | 586 +++++++++--
+ drivers/crypto/atmel-tdes-regs.h | 2 +
+ drivers/crypto/atmel-tdes.c | 394 ++++++-
+ drivers/crypto/bfin_crc.c | 6 +-
+ drivers/crypto/caam/Kconfig | 2 +-
+ drivers/crypto/caam/caamalg.c | 6 +
+ drivers/crypto/caam/ctrl.c | 3 +
+ drivers/crypto/caam/regs.h | 4 +-
+ drivers/crypto/omap-aes.c | 15 +-
+ drivers/crypto/omap-sham.c | 15 +-
+ drivers/crypto/picoxcell_crypto.c | 4 +-
+ drivers/crypto/sahara.c | 1070 ++++++++++++++++++++
+ drivers/crypto/ux500/hash/hash_core.c | 4 +-
+ include/linux/platform_data/atmel-aes.h | 22 -
+ include/linux/platform_data/crypto-atmel.h | 22 +
+ 28 files changed, 2352 insertions(+), 376 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt
+ create mode 100644 drivers/crypto/sahara.c
+ delete mode 100644 include/linux/platform_data/atmel-aes.h
+ create mode 100644 include/linux/platform_data/crypto-atmel.h
+Merging drm/drm-next (be88298 drm/tilcdc: only build on arm)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging drm-intel/drm-intel-next-queued (81fa12a drm/i915: Implement WaSwitchSolVfFArbitrationPriority)
+$ git merge drm-intel/drm-intel-next-queued
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_cache.c | 7 +-
+ drivers/gpu/drm/drm_prime.c | 8 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 423 +++++++++--------------------
+ drivers/gpu/drm/i915/i915_dma.c | 27 +-
+ drivers/gpu/drm/i915/i915_drv.c | 132 ++++-----
+ drivers/gpu/drm/i915/i915_drv.h | 30 +-
+ drivers/gpu/drm/i915/i915_gem.c | 78 +++---
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 79 ++----
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 18 +-
+ drivers/gpu/drm/i915/i915_irq.c | 249 ++++++++++++-----
+ drivers/gpu/drm/i915/i915_reg.h | 142 +++++-----
+ drivers/gpu/drm/i915/i915_suspend.c | 15 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 16 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 12 +-
+ drivers/gpu/drm/i915/intel_display.c | 194 +++++++------
+ drivers/gpu/drm/i915/intel_dp.c | 88 +++---
+ drivers/gpu/drm/i915/intel_drv.h | 7 +-
+ drivers/gpu/drm/i915/intel_fb.c | 4 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 114 ++++----
+ drivers/gpu/drm/i915/intel_lvds.c | 7 +-
+ drivers/gpu/drm/i915/intel_panel.c | 2 +-
+ drivers/gpu/drm/i915/intel_pm.c | 65 +++--
+ drivers/gpu/drm/i915/intel_sdvo.c | 50 ++--
+ drivers/video/fbmem.c | 7 +
+ include/linux/fb.h | 2 +
+ include/linux/pm.h | 13 +
+ kernel/power/console.c | 116 ++++++++
+ 29 files changed, 1035 insertions(+), 919 deletions(-)
+Merging sound/for-next (f390dad ALSA: hda - Enable "Headset Mic" name for some Dell Latitude devices)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/hda_generic.c
+Auto-merging sound/pci/hda/hda_codec.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/writing-an-alsa-driver.tmpl | 12 +-
+ Documentation/sound/alsa/HD-Audio.txt | 10 +-
+ include/linux/usb/audio-v2.h | 2 +
+ include/sound/control.h | 5 +-
+ include/sound/core.h | 26 +-
+ include/sound/pcm.h | 23 +-
+ sound/core/control.c | 41 +-
+ sound/core/device.c | 8 +-
+ sound/core/hwdep.c | 2 +-
+ sound/core/info.c | 41 +-
+ sound/core/init.c | 16 +-
+ sound/core/isadma.c | 2 +-
+ sound/core/jack.c | 6 +-
+ sound/core/memalloc.c | 20 +-
+ sound/core/memory.c | 4 +-
+ sound/core/pcm.c | 6 +-
+ sound/core/pcm_lib.c | 54 ++-
+ sound/core/pcm_memory.c | 19 +-
+ sound/core/pcm_misc.c | 28 +-
+ sound/core/pcm_native.c | 13 +
+ sound/core/rawmidi.c | 14 +-
+ sound/core/sound.c | 7 +-
+ sound/core/vmaster.c | 7 +-
+ sound/drivers/mpu401/mpu401_uart.c | 6 +-
+ sound/pci/ac97/ac97_codec.c | 16 +-
+ sound/pci/ac97/ac97_pcm.c | 10 +-
+ sound/pci/hda/hda_auto_parser.c | 24 +-
+ sound/pci/hda/hda_auto_parser.h | 2 +
+ sound/pci/hda/hda_beep.c | 39 +-
+ sound/pci/hda/hda_beep.h | 1 +
+ sound/pci/hda/hda_codec.c | 17 +-
+ sound/pci/hda/hda_generic.c | 364 +++++++++++++----
+ sound/pci/hda/hda_generic.h | 13 +-
+ sound/pci/hda/hda_local.h | 4 +
+ sound/pci/hda/patch_analog.c | 33 +-
+ sound/pci/hda/patch_conexant.c | 19 +-
+ sound/pci/hda/patch_hdmi.c | 198 ++++++----
+ sound/pci/hda/patch_realtek.c | 204 ++++++----
+ sound/pci/hda/patch_sigmatel.c | 39 +-
+ sound/pci/rme9652/hdspm.c | 382 +++++++++++-------
+ sound/sound_core.c | 22 +-
+ sound/usb/caiaq/audio.c | 459 +++++++++++-----------
+ sound/usb/caiaq/audio.h | 4 +-
+ sound/usb/caiaq/control.c | 67 ++--
+ sound/usb/caiaq/control.h | 2 +-
+ sound/usb/caiaq/device.c | 248 ++++++------
+ sound/usb/caiaq/device.h | 18 +-
+ sound/usb/caiaq/input.c | 328 ++++++++--------
+ sound/usb/caiaq/input.h | 6 +-
+ sound/usb/caiaq/midi.c | 63 +--
+ sound/usb/caiaq/midi.h | 5 +-
+ sound/usb/format.c | 20 +-
+ sound/usb/format.h | 2 +-
+ sound/usb/pcm.c | 7 +
+ sound/usb/quirks-table.h | 43 +-
+ sound/usb/quirks.c | 21 +-
+ sound/usb/stream.c | 2 +-
+ 57 files changed, 1814 insertions(+), 1240 deletions(-)
+Merging sound-asoc/for-next (d6f0a03 Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing include/sound/tegra_wm8903.h
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/sound/ak5386.txt | 19 +
+ .../devicetree/bindings/sound/ti,tas5086.txt | 32 ++
+ drivers/mfd/wm5102-tables.c | 10 +
+ include/linux/mfd/arizona/registers.h | 42 ++
+ include/linux/mfd/wm8994/pdata.h | 8 +
+ include/sound/max98090.h | 0
+ include/sound/soc-dapm.h | 2 +-
+ include/sound/soc.h | 21 +-
+ include/sound/tas5086.h | 7 +
+ include/sound/tegra_wm8903.h | 26 -
+ sound/soc/atmel/atmel_ssc_dai.c | 43 ++
+ sound/soc/codecs/Kconfig | 8 +
+ sound/soc/codecs/Makefile | 4 +
+ sound/soc/codecs/adau1373.c | 5 +-
+ sound/soc/codecs/ak4104.c | 55 +-
+ sound/soc/codecs/ak5386.c | 152 ++++++
+ sound/soc/codecs/arizona.c | 480 ++++++++++++++---
+ sound/soc/codecs/arizona.h | 31 +-
+ sound/soc/codecs/cs4271.c | 159 +++---
+ sound/soc/codecs/cs42l73.c | 6 +-
+ sound/soc/codecs/max98088.c | 30 +-
+ sound/soc/codecs/max98090.c | 45 +-
+ sound/soc/codecs/max98090.h | 0
+ sound/soc/codecs/si476x.c | 48 +-
+ sound/soc/codecs/tas5086.c | 591 +++++++++++++++++++++
+ sound/soc/codecs/wm5102.c | 95 ++--
+ sound/soc/codecs/wm5102.h | 6 +-
+ sound/soc/codecs/wm5110.c | 46 +-
+ sound/soc/codecs/wm5110.h | 6 +-
+ sound/soc/codecs/wm8903.c | 4 +
+ sound/soc/codecs/wm8960.c | 10 +
+ sound/soc/codecs/wm8994.c | 45 +-
+ sound/soc/codecs/wm8994.h | 1 +
+ sound/soc/codecs/wm_adsp.c | 55 +-
+ sound/soc/codecs/wm_adsp.h | 2 +
+ sound/soc/codecs/wm_hubs.c | 9 +-
+ sound/soc/davinci/davinci-mcasp.c | 54 +-
+ sound/soc/davinci/davinci-pcm.c | 16 +-
+ sound/soc/davinci/davinci-pcm.h | 1 +
+ sound/soc/fsl/imx-audmux.c | 3 +-
+ sound/soc/fsl/imx-pcm-fiq.c | 2 +-
+ sound/soc/fsl/imx-ssi.c | 7 +-
+ sound/soc/fsl/pcm030-audio-fabric.c | 2 +-
+ sound/soc/omap/omap-dmic.c | 16 +-
+ sound/soc/omap/omap-mcpdm.c | 80 ++-
+ sound/soc/omap/omap3pandora.c | 8 +-
+ sound/soc/samsung/Kconfig | 5 +-
+ sound/soc/sh/fsi.c | 14 +-
+ sound/soc/soc-core.c | 112 +++-
+ sound/soc/soc-dapm.c | 15 +-
+ sound/soc/spear/spear_pcm.c | 16 +-
+ sound/soc/tegra/tegra_alc5632.c | 15 +-
+ sound/soc/tegra/tegra_asoc_utils.c | 4 -
+ sound/soc/tegra/tegra_wm8753.c | 15 +-
+ sound/soc/tegra/tegra_wm8903.c | 179 +++----
+ sound/soc/tegra/tegra_wm9712.c | 5 -
+ sound/soc/tegra/trimslice.c | 56 +-
+ 57 files changed, 2135 insertions(+), 593 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/ak5386.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ti,tas5086.txt
+ mode change 100755 => 100644 include/sound/max98090.h
+ create mode 100644 include/sound/tas5086.h
+ delete mode 100644 include/sound/tegra_wm8903.h
+ create mode 100644 sound/soc/codecs/ak5386.c
+ mode change 100755 => 100644 sound/soc/codecs/max98090.c
+ mode change 100755 => 100644 sound/soc/codecs/max98090.h
+ create mode 100644 sound/soc/codecs/tas5086.c
+Merging modules/modules-next (d70f82a genksyms: pass symbol-prefix instead of arch)
+$ git merge modules/modules-next
+Auto-merging arch/metag/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 2 +-
+ arch/Kconfig | 6 ++++++
+ arch/blackfin/Kconfig | 5 +----
+ arch/h8300/Kconfig | 5 +----
+ arch/metag/Kconfig | 5 +----
+ drivers/mtd/chips/gen_probe.c | 8 +++++---
+ include/asm-generic/unistd.h | 12 ++++--------
+ include/asm-generic/vmlinux.lds.h | 8 +-------
+ include/linux/export.h | 20 ++++++++++++++------
+ include/linux/kernel.h | 7 -------
+ include/linux/module.h | 4 ++--
+ kernel/modsign_certificate.S | 13 +++----------
+ kernel/module.c | 5 +++--
+ scripts/Makefile.build | 3 ++-
+ scripts/Makefile.lib | 7 -------
+ scripts/genksyms/genksyms.c | 18 +++++++-----------
+ scripts/link-vmlinux.sh | 5 ++---
+ scripts/mod/modpost.c | 39 +++++++++++++++++----------------------
+ 18 files changed, 70 insertions(+), 102 deletions(-)
+Merging virtio/virtio-next (cf994e0 tools/virtio: remove virtqueue_add_buf() from tests.)
+$ git merge virtio/virtio-next
+Auto-merging net/9p/trans_virtio.c
+Auto-merging drivers/net/caif/Makefile
+Auto-merging drivers/net/caif/Kconfig
+Auto-merging drivers/char/virtio_console.c
+Auto-merging drivers/char/hw_random/virtio-rng.c
+Removing Documentation/virtual/virtio-spec.txt
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/00-INDEX | 3 -
+ Documentation/virtual/virtio-spec.txt | 3210 -------------------------------
+ block/blk-integrity.c | 2 +-
+ block/blk-merge.c | 2 +-
+ drivers/Makefile | 2 +-
+ drivers/block/virtio_blk.c | 148 +-
+ drivers/char/hw_random/virtio-rng.c | 2 +-
+ drivers/char/virtio_console.c | 6 +-
+ drivers/lguest/Kconfig | 5 +-
+ drivers/net/caif/Kconfig | 14 +
+ drivers/net/caif/Makefile | 3 +
+ drivers/net/caif/caif_virtio.c | 784 ++++++++
+ drivers/net/virtio_net.c | 62 +-
+ drivers/rpmsg/virtio_rpmsg_bus.c | 8 +-
+ drivers/scsi/virtio_scsi.c | 112 +-
+ drivers/vhost/Kconfig | 8 +
+ drivers/vhost/Kconfig.tcm | 1 +
+ drivers/vhost/Makefile | 2 +
+ drivers/vhost/test.c | 4 +-
+ drivers/vhost/vringh.c | 1007 ++++++++++
+ drivers/virtio/virtio_balloon.c | 6 +-
+ drivers/virtio/virtio_ring.c | 297 ++-
+ include/linux/scatterlist.h | 16 +
+ include/linux/virtio.h | 20 +
+ include/linux/virtio_caif.h | 24 +
+ include/linux/virtio_ring.h | 57 +
+ include/linux/vringh.h | 225 +++
+ include/uapi/linux/virtio_ids.h | 1 +
+ net/9p/trans_virtio.c | 48 +-
+ tools/lguest/lguest.txt | 2 +-
+ tools/virtio/Makefile | 10 +-
+ tools/virtio/asm/barrier.h | 14 +
+ tools/virtio/linux/bug.h | 10 +
+ tools/virtio/linux/err.h | 26 +
+ tools/virtio/linux/export.h | 5 +
+ tools/virtio/linux/irqreturn.h | 1 +
+ tools/virtio/linux/kernel.h | 112 ++
+ tools/virtio/linux/module.h | 1 +
+ tools/virtio/linux/printk.h | 4 +
+ tools/virtio/linux/ratelimit.h | 4 +
+ tools/virtio/linux/scatterlist.h | 189 ++
+ tools/virtio/linux/types.h | 28 +
+ tools/virtio/linux/uaccess.h | 50 +
+ tools/virtio/linux/uio.h | 3 +
+ tools/virtio/linux/virtio.h | 171 +-
+ tools/virtio/linux/virtio_config.h | 6 +
+ tools/virtio/linux/virtio_ring.h | 1 +
+ tools/virtio/linux/vringh.h | 1 +
+ tools/virtio/uapi/linux/uio.h | 1 +
+ tools/virtio/uapi/linux/virtio_config.h | 1 +
+ tools/virtio/uapi/linux/virtio_ring.h | 4 +
+ tools/virtio/virtio_test.c | 13 +-
+ tools/virtio/vringh_test.c | 741 +++++++
+ 53 files changed, 3806 insertions(+), 3671 deletions(-)
+ delete mode 100644 Documentation/virtual/virtio-spec.txt
+ create mode 100644 drivers/net/caif/caif_virtio.c
+ create mode 100644 drivers/vhost/vringh.c
+ create mode 100644 include/linux/virtio_caif.h
+ create mode 100644 include/linux/vringh.h
+ create mode 100644 tools/virtio/asm/barrier.h
+ create mode 100644 tools/virtio/linux/bug.h
+ create mode 100644 tools/virtio/linux/err.h
+ create mode 100644 tools/virtio/linux/export.h
+ create mode 100644 tools/virtio/linux/irqreturn.h
+ create mode 100644 tools/virtio/linux/kernel.h
+ create mode 100644 tools/virtio/linux/printk.h
+ create mode 100644 tools/virtio/linux/ratelimit.h
+ create mode 100644 tools/virtio/linux/scatterlist.h
+ create mode 100644 tools/virtio/linux/types.h
+ create mode 100644 tools/virtio/linux/uaccess.h
+ create mode 100644 tools/virtio/linux/uio.h
+ create mode 100644 tools/virtio/linux/virtio_config.h
+ create mode 100644 tools/virtio/linux/virtio_ring.h
+ create mode 100644 tools/virtio/linux/vringh.h
+ create mode 100644 tools/virtio/uapi/linux/uio.h
+ create mode 100644 tools/virtio/uapi/linux/virtio_config.h
+ create mode 100644 tools/virtio/uapi/linux/virtio_ring.h
+ create mode 100644 tools/virtio/vringh_test.c
+Merging input/next (38a46eb Input: mc13783_ts - use module_platform_driver_probe())
+$ git merge input/next
+Auto-merging drivers/usb/class/cdc-acm.c
+Merge made by the 'recursive' strategy.
+ .../bindings/input/ps2keyb-mouse-apbps2.txt | 16 +
+ .../bindings/input/touchscreen/auo_pixcir_ts.txt | 30 +
+ drivers/base/devres.c | 74 +
+ drivers/input/keyboard/amikbd.c | 14 +-
+ drivers/input/keyboard/davinci_keyscan.c | 12 +-
+ drivers/input/keyboard/nomadik-ske-keypad.c | 12 +-
+ drivers/input/keyboard/tegra-kbc.c | 9 +-
+ drivers/input/misc/Kconfig | 10 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/ims-pcu.c | 1900 ++++++++++++++++++++
+ drivers/input/misc/twl4030-pwrbutton.c | 12 +-
+ drivers/input/mouse/amimouse.c | 14 +-
+ drivers/input/serio/Kconfig | 10 +
+ drivers/input/serio/Makefile | 1 +
+ drivers/input/serio/apbps2.c | 230 +++
+ drivers/input/serio/at32psif.c | 13 +-
+ drivers/input/serio/q40kbd.c | 13 +-
+ drivers/input/touchscreen/atmel-wm97xx.c | 12 +-
+ drivers/input/touchscreen/auo-pixcir-ts.c | 226 ++-
+ drivers/input/touchscreen/mc13783_ts.c | 12 +-
+ drivers/input/touchscreen/wm9712.c | 28 +-
+ drivers/input/touchscreen/wm97xx-core.c | 11 +
+ drivers/usb/class/cdc-acm.c | 13 +
+ drivers/usb/class/cdc-acm.h | 1 +
+ include/linux/device.h | 4 +
+ include/linux/input/auo-pixcir-ts.h | 4 +-
+ include/uapi/linux/input.h | 5 +
+ 27 files changed, 2480 insertions(+), 207 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/ps2keyb-mouse-apbps2.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/auo_pixcir_ts.txt
+ create mode 100644 drivers/input/misc/ims-pcu.c
+ create mode 100644 drivers/input/serio/apbps2.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 (081aa45 cgroup: consolidate cgroup_attach_task() and cgroup_attach_proc())
+$ git merge cgroup/for-next
+Resolved 'include/linux/res_counter.h' using previous resolution.
+Auto-merging include/linux/res_counter.h
+CONFLICT (content): Merge conflict in include/linux/res_counter.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ef2e208] Merge remote-tracking branch 'cgroup/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cgroups/cgroups.txt | 1 +
+ Documentation/cgroups/devices.txt | 70 ++++++-
+ block/blk-cgroup.h | 2 -
+ include/linux/cgroup.h | 47 ++++-
+ include/linux/cpuset.h | 1 -
+ include/linux/res_counter.h | 2 +-
+ kernel/cgroup.c | 396 ++++++++++++--------------------------
+ kernel/cpuset.c | 36 ++--
+ security/device_cgroup.c | 256 +++++++++++++++++++-----
+ 9 files changed, 455 insertions(+), 356 deletions(-)
+Merging block/for-next (833dd2e Merge branch 'for-3.9/drivers' into for-next)
+$ git merge block/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging device-mapper/master (fc60439 Correct the documented requirement on the return code from dm cache policy lookup functions stated in the policy module header file.)
+$ git merge device-mapper/master
+Auto-merging drivers/md/dm-cache-policy.h
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-cache-policy.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 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 (0aacd23 mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings)
+$ git merge mmc/mmc-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +-
+ arch/arm/boot/dts/tegra20-harmony.dts | 4 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 2 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
+ arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts | 2 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 2 +-
+ arch/arm/boot/dts/tegra20-whistler.dts | 1 +
+ arch/arm/boot/dts/tegra30-beaver.dts | 2 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
+ drivers/mmc/host/dw_mmc-exynos.c | 2 +-
+ drivers/mmc/host/sdhci-tegra.c | 114 ++++++-----------------------
+ 12 files changed, 36 insertions(+), 101 deletions(-)
+Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (7d557b3 slub: correctly bootstrap boot caches)
+$ git merge slab/for-next
+Auto-merging mm/slub.c
+Auto-merging mm/slab.c
+Removing include/linux/kmalloc_sizes.h
+Merge made by the 'recursive' strategy.
+ fs/proc/stat.c | 2 +-
+ include/linux/kmalloc_sizes.h | 45 ---
+ include/linux/slab.h | 231 +++++++++----
+ include/linux/slab_def.h | 48 +--
+ include/linux/slub_def.h | 136 +-------
+ mm/slab.c | 789 ++++++++++++++++++------------------------
+ mm/slab.h | 43 ++-
+ mm/slab_common.c | 165 ++++++++-
+ mm/slub.c | 188 ++--------
+ 9 files changed, 745 insertions(+), 902 deletions(-)
+ delete mode 100644 include/linux/kmalloc_sizes.h
+Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (864e8cb md/raid10: Allow skipping recovery when clean arrays are assembled)
+$ git merge md/for-next
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/bitmap.c
+Merge made by the 'recursive' strategy.
+ Documentation/md.txt | 16 +-
+ drivers/md/bitmap.c | 4 +-
+ drivers/md/md.c | 49 ++++--
+ drivers/md/md.h | 8 +
+ drivers/md/raid10.c | 16 ++
+ drivers/md/raid5.c | 424 ++++++++++++++++++++++++++++++++++++++++++++++++---
+ drivers/md/raid5.h | 19 +++
+ 7 files changed, 485 insertions(+), 51 deletions(-)
+Merging mfd/master (5096cd1 mfd: cros_ec_spi: Warnings fix)
+$ git merge mfd/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/cros-ec-keyb.txt | 72 +
+ Documentation/devicetree/bindings/mfd/cros-ec.txt | 56 +
+ drivers/input/keyboard/Kconfig | 12 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/cros_ec_keyb.c | 334 +++++
+ drivers/input/keyboard/lpc32xx-keys.c | 11 +-
+ drivers/input/keyboard/omap4-keypad.c | 16 +-
+ drivers/input/keyboard/tca8418_keypad.c | 7 +-
+ drivers/input/matrix-keymap.c | 19 +
+ drivers/mfd/Kconfig | 28 +
+ drivers/mfd/Makefile | 3 +
+ drivers/mfd/cros_ec.c | 196 +++
+ drivers/mfd/cros_ec_i2c.c | 201 +++
+ drivers/mfd/cros_ec_spi.c | 375 ++++++
+ include/linux/input/matrix_keypad.h | 19 +
+ include/linux/mfd/cros_ec.h | 170 +++
+ include/linux/mfd/cros_ec_commands.h | 1369 ++++++++++++++++++++
+ 17 files changed, 2871 insertions(+), 18 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/cros-ec-keyb.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/cros-ec.txt
+ create mode 100644 drivers/input/keyboard/cros_ec_keyb.c
+ create mode 100644 drivers/mfd/cros_ec.c
+ create mode 100644 drivers/mfd/cros_ec_i2c.c
+ create mode 100644 drivers/mfd/cros_ec_spi.c
+ create mode 100644 include/linux/mfd/cros_ec.h
+ create mode 100644 include/linux/mfd/cros_ec_commands.h
+Merging battery/master (c6cc9fc s3c-adc-battery: Fix possible NULL pointer dereference)
+$ git merge battery/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/power_supply/tps65090.txt | 23 +
+ drivers/mfd/ab8500-core.c | 544 +++--
+ drivers/mfd/ab8500-debugfs.c | 2559 +++++++++++++++-----
+ drivers/mfd/ab8500-gpadc.c | 559 ++++-
+ drivers/mfd/ab8500-sysctrl.c | 98 +-
+ drivers/power/Kconfig | 14 +-
+ drivers/power/Makefile | 4 +-
+ drivers/power/ab8500_bmdata.c | 96 +-
+ drivers/power/ab8500_btemp.c | 75 +-
+ drivers/power/ab8500_charger.c | 699 ++++--
+ drivers/power/ab8500_fg.c | 497 +++-
+ drivers/power/abx500_chargalg.c | 455 +++-
+ drivers/power/pm2301_charger.c | 371 ++-
+ drivers/power/pm2301_charger.h | 23 +-
+ drivers/power/s3c_adc_battery.c | 7 +-
+ drivers/power/test_power.c | 31 +-
+ drivers/power/tps65090-charger.c | 315 +++
+ include/linux/mfd/abx500.h | 21 +-
+ include/linux/mfd/abx500/ab8500-bm.h | 60 +-
+ include/linux/mfd/abx500/ab8500-gpadc.h | 74 +-
+ include/linux/mfd/abx500/ab8500-sysctrl.h | 6 +
+ include/linux/mfd/abx500/ab8500.h | 3 +
+ include/linux/mfd/abx500/ux500_chargalg.h | 7 +
+ include/linux/mfd/tps65090.h | 5 +
+ include/linux/pm2301_charger.h | 2 +-
+ 25 files changed, 5211 insertions(+), 1337 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power_supply/tps65090.txt
+ create mode 100644 drivers/power/tps65090-charger.c
+Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
+$ 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 (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (10affc9 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ drivers/regulator/88pm8607.c | 36 +------
+ drivers/regulator/core.c | 166 ++++++++++++++++++++++++++++-----
+ drivers/regulator/fan53555.c | 4 +-
+ drivers/regulator/lp8788-ldo.c | 98 ++++---------------
+ drivers/regulator/max8649.c | 39 ++------
+ drivers/regulator/max8925-regulator.c | 5 +-
+ drivers/regulator/max8998.c | 9 +-
+ drivers/regulator/palmas-regulator.c | 46 ++++-----
+ drivers/regulator/s5m8767.c | 2 +-
+ drivers/regulator/tps6586x-regulator.c | 6 +-
+ include/linux/regulator/consumer.h | 14 +--
+ include/linux/regulator/driver.h | 7 +-
+ 12 files changed, 219 insertions(+), 213 deletions(-)
+Merging security/next (921f3ac tomoyo: use DEFINE_SRCU() to define tomoyo_ss)
+$ git merge security/next
+Merge made by the 'recursive' strategy.
+ security/tomoyo/tomoyo.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 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 (ebf590bb watchdog: Convert to devm_ioremap_resource())
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/ath79_wdt.c | 8 +--
+ drivers/watchdog/davinci_wdt.c | 9 ++-
+ drivers/watchdog/s3c2410_wdt.c | 7 +--
+ drivers/watchdog/shwdt.c | 7 ++-
+ drivers/watchdog/sp5100_tco.c | 126 ++---------------------------------------
+ drivers/watchdog/sp5100_tco.h | 2 +-
+ 6 files changed, 21 insertions(+), 138 deletions(-)
+Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (ae19158 iommu: OMAP: build only on OMAP2+)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/Kconfig | 2 +-
+ drivers/iommu/amd_iommu_init.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging vfio/next (dad9f89 VFIO-AER: Vfio-pci driver changes for supporting AER)
+$ git merge vfio/next
+Auto-merging drivers/vfio/pci/vfio_pci_intrs.c
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci.c | 44 ++++++++++++++++++++++++-
+ drivers/vfio/pci/vfio_pci_intrs.c | 64 +++++++++++++++++++++++++++++++++++++
+ drivers/vfio/pci/vfio_pci_private.h | 1 +
+ drivers/vfio/vfio.c | 30 ++++++++++++++++-
+ include/linux/vfio.h | 3 ++
+ include/uapi/linux/vfio.h | 1 +
+ 6 files changed, 141 insertions(+), 2 deletions(-)
+Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
+$ git merge osd/linux-next
+Already up-to-date.
+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 (c25a4a0 doc: Remove text on tracepoint samples)
+$ git merge trivial/for-next
+Auto-merging drivers/power/pm2301_charger.c
+Auto-merging drivers/isdn/i4l/isdn_tty.c
+Auto-merging drivers/gpu/drm/radeon/radeon_irq_kms.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/crypto/caam/ctrl.c
+Auto-merging drivers/ata/sata_fsl.c
+Auto-merging arch/s390/kvm/trace.h
+Auto-merging arch/arc/kernel/disasm.c
+CONFLICT (modify/delete): Documentation/virtual/virtio-spec.txt deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of Documentation/virtual/virtio-spec.txt left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/virtual/virtio-spec.txt
+Documentation/virtual/virtio-spec.txt: needs merge
+rm 'Documentation/virtual/virtio-spec.txt'
+$ git commit -v -a
+[master 42be7d8] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/trace/tracepoints.txt | 15 ---------------
+ arch/arc/kernel/disasm.c | 2 +-
+ arch/arc/plat-arcfpga/Kconfig | 2 +-
+ arch/arm/kernel/topology.c | 2 +-
+ arch/arm/mach-mvebu/irq-armada-370-xp.c | 2 +-
+ arch/blackfin/include/asm/bfin_sport3.h | 2 +-
+ arch/powerpc/kernel/nvram_64.c | 3 +--
+ arch/powerpc/kvm/book3s_pr.c | 2 +-
+ arch/s390/kernel/irq.c | 2 +-
+ arch/s390/kvm/trace.h | 2 +-
+ drivers/ata/sata_fsl.c | 2 +-
+ drivers/clk/mvebu/clk-core.c | 4 ++--
+ drivers/crypto/caam/ctrl.c | 2 +-
+ drivers/gpu/drm/i915/intel_dp.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +-
+ drivers/hv/hv.c | 5 ++---
+ drivers/i2c/busses/i2c-puv3.c | 2 +-
+ drivers/isdn/i4l/isdn_tty.c | 1 -
+ drivers/media/usb/dvb-usb/opera1.c | 2 +-
+ drivers/net/ethernet/sfc/Kconfig | 2 +-
+ drivers/net/ethernet/ti/cpts.c | 2 +-
+ drivers/power/pm2301_charger.c | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +-
+ drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
+ drivers/tty/serial/icom.c | 3 +--
+ drivers/tty/vt/consolemap.c | 3 +--
+ drivers/usb/misc/uss720.c | 2 +-
+ drivers/usb/storage/isd200.c | 3 +--
+ drivers/video/goldfishfb.c | 2 +-
+ fs/befs/btree.c | 3 +--
+ fs/ufs/util.c | 3 +--
+ include/linux/iio/gyro/itg3200.h | 2 +-
+ include/net/sctp/sctp.h | 2 +-
+ include/trace/events/timer.h | 10 +++++-----
+ kernel/.gitignore | 1 +
+ mm/hugetlb.c | 4 ++--
+ net/sctp/protocol.c | 2 +-
+ sound/pci/mixart/mixart.c | 2 +-
+ 38 files changed, 43 insertions(+), 65 deletions(-)
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging edac/linux_next (b076989 i5100_edac: convert to use simple_open())
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/amd64_edac.c | 15 +++++++++------
+ drivers/edac/edac_mc.c | 6 +++---
+ drivers/edac/edac_mc_sysfs.c | 17 +++++------------
+ include/linux/edac.h | 7 ++-----
+ 4 files changed, 19 insertions(+), 26 deletions(-)
+Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add")
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (1421954 documentation/devicetree: Fix a typo in exynos-dw-mshc.txt)
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging spi/spi/next (095c375 spi: Document cs_gpios and cs_gpio in kernel-doc)
+$ git merge spi/spi/next
+Already up-to-date.
+Merging spi-mb/spi-next (b66c773 spi/bcm63xx: use devm_ioremap_resource())
+$ git merge spi-mb/spi-next
+Auto-merging drivers/spi/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/brcm,bcm2835-spi.txt | 22 +
+ drivers/spi/Kconfig | 11 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-bcm2835.c | 456 +++++++++++++++++++++
+ drivers/spi/spi-bcm63xx.c | 79 +---
+ drivers/spi/spi-pxa2xx-pci.c | 6 +-
+ drivers/spi/spi-pxa2xx.c | 5 +
+ drivers/spi/spi-tegra20-slink.c | 25 +-
+ 8 files changed, 525 insertions(+), 80 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt
+ create mode 100644 drivers/spi/spi-bcm2835.c
+Merging tip/auto-latest (a2d66a370 Merge branch 'x86/platform')
+$ git merge tip/auto-latest
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/perf_event.h
+Auto-merging arch/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/x86/Kconfig | 89 +++++++-------
+ arch/x86/boot/compressed/head_64.S | 2 +-
+ arch/x86/include/asm/context_tracking.h | 21 ----
+ arch/x86/include/asm/hypervisor.h | 16 ++-
+ arch/x86/kernel/cpu/Makefile | 3 +-
+ arch/x86/kernel/kvm.c | 8 +-
+ arch/x86/kernel/traps.c | 68 ++++++-----
+ arch/x86/lguest/Kconfig | 3 +-
+ arch/x86/mm/fault.c | 8 +-
+ arch/x86/platform/uv/uv_time.c | 3 +-
+ arch/x86/xen/Kconfig | 2 +-
+ drivers/hv/Kconfig | 2 +-
+ drivers/misc/Kconfig | 2 +-
+ include/linux/clockchips.h | 5 +
+ include/linux/context_tracking.h | 24 +++-
+ include/linux/perf_event.h | 18 +--
+ include/linux/sched.h | 198 +-------------------------------
+ init/Kconfig | 1 +
+ init/main.c | 2 +-
+ kernel/events/core.c | 15 +++
+ kernel/fork.c | 2 +-
+ kernel/printk.c | 2 +-
+ kernel/sched/core.c | 20 +++-
+ kernel/sched/cputime.c | 154 +++++++++++++------------
+ kernel/sched/fair.c | 6 +-
+ kernel/sched/sched.h | 162 +++++++++++++++++++++++++-
+ kernel/time/tick-broadcast.c | 129 ++++++++++++---------
+ kernel/time/tick-common.c | 1 +
+ kernel/time/tick-internal.h | 3 +-
+ 29 files changed, 499 insertions(+), 470 deletions(-)
+Merging ftrace/for-next (22f4564 tracing: Update debugfs README file)
+$ git merge ftrace/for-next
+Resolved 'kernel/trace/ftrace.c' using previous resolution.
+Auto-merging kernel/trace/trace_output.c
+Auto-merging kernel/trace/ring_buffer.c
+Auto-merging kernel/trace/ftrace.c
+CONFLICT (content): Merge conflict in kernel/trace/ftrace.c
+Auto-merging kernel/trace/blktrace.c
+Auto-merging kernel/trace/Kconfig
+Auto-merging include/linux/kernel.h
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2621d5b] Merge remote-tracking branch 'ftrace/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 7 +
+ Documentation/trace/ftrace.txt | 2097 ++++++++++++++++++++++----------
+ include/linux/ftrace.h | 6 +-
+ include/linux/ftrace_event.h | 109 +-
+ include/linux/kernel.h | 70 +-
+ include/linux/ring_buffer.h | 6 +
+ include/linux/trace_clock.h | 1 +
+ include/trace/ftrace.h | 47 +-
+ kernel/trace/Kconfig | 49 +
+ kernel/trace/blktrace.c | 4 +-
+ kernel/trace/ftrace.c | 73 +-
+ kernel/trace/ring_buffer.c | 500 +++++++-
+ kernel/trace/trace.c | 2204 ++++++++++++++++++++++++----------
+ kernel/trace/trace.h | 144 ++-
+ kernel/trace/trace_branch.c | 8 +-
+ kernel/trace/trace_clock.c | 10 +
+ kernel/trace/trace_entries.h | 23 +-
+ kernel/trace/trace_events.c | 1421 +++++++++++++++++-----
+ kernel/trace/trace_events_filter.c | 34 +-
+ kernel/trace/trace_export.c | 4 +-
+ kernel/trace/trace_functions.c | 207 +++-
+ kernel/trace/trace_functions_graph.c | 12 +-
+ kernel/trace/trace_irqsoff.c | 85 +-
+ kernel/trace/trace_kdb.c | 12 +-
+ kernel/trace/trace_mmiotrace.c | 12 +-
+ kernel/trace/trace_output.c | 119 +-
+ kernel/trace/trace_output.h | 4 +-
+ kernel/trace/trace_sched_switch.c | 8 +-
+ kernel/trace/trace_sched_wakeup.c | 87 +-
+ kernel/trace/trace_selftest.c | 51 +-
+ kernel/trace/trace_stack.c | 74 +-
+ kernel/trace/trace_syscalls.c | 90 +-
+ 32 files changed, 5672 insertions(+), 1906 deletions(-)
+Merging rcu/rcu/next (8d9eeac Merge branches 'doc.2013.03.12a', 'fixes.2013.03.13a' and 'idlenocb.2013.03.18b' into HEAD)
+$ git merge rcu/rcu/next
+Auto-merging init/Kconfig
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/checklist.txt | 26 +-
+ Documentation/RCU/lockdep.txt | 5 +
+ Documentation/RCU/rcubarrier.txt | 15 +-
+ Documentation/RCU/stallwarn.txt | 33 +-
+ Documentation/RCU/whatisRCU.txt | 4 +-
+ Documentation/kernel-parameters.txt | 35 ++-
+ include/linux/list_bl.h | 5 +
+ include/linux/rculist_bl.h | 2 +-
+ include/linux/rcupdate.h | 1 +
+ include/trace/events/rcu.h | 55 ++++
+ init/Kconfig | 71 ++++-
+ kernel/rcutree.c | 260 ++++++++++++----
+ kernel/rcutree.h | 41 ++-
+ kernel/rcutree_plugin.h | 601 +++++++++++++-----------------------
+ kernel/rcutree_trace.c | 2 -
+ 15 files changed, 638 insertions(+), 518 deletions(-)
+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 (2ae33b3 Merge remote-tracking branch 'upstream/master' into queue)
+$ git merge kvm/linux-next
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging include/linux/kvm_host.h
+Auto-merging arch/powerpc/kvm/book3s_pr.c
+Auto-merging arch/arm/kvm/arm.c
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 8 +
+ arch/arm/kvm/arm.c | 15 +-
+ arch/ia64/kvm/kvm-ia64.c | 25 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 4 +-
+ arch/powerpc/kvm/book3s_pr.c | 2 +-
+ arch/powerpc/kvm/booke.c | 2 +-
+ arch/powerpc/kvm/powerpc.c | 13 +-
+ arch/s390/include/asm/pgtable.h | 2 +
+ arch/s390/include/uapi/asm/Kbuild | 1 +
+ arch/s390/include/uapi/asm/virtio-ccw.h | 21 ++
+ arch/s390/kvm/Kconfig | 1 +
+ arch/s390/kvm/Makefile | 2 +-
+ arch/s390/kvm/diag.c | 26 ++
+ arch/s390/kvm/gaccess.h | 429 ++++++--------------------------
+ arch/s390/kvm/intercept.c | 10 +-
+ arch/s390/kvm/interrupt.c | 245 ++++++------------
+ arch/s390/kvm/kvm-s390.c | 11 +-
+ arch/s390/kvm/priv.c | 89 +++----
+ arch/s390/mm/pgtable.c | 107 ++++++--
+ arch/x86/include/asm/kvm_host.h | 7 +-
+ arch/x86/include/asm/vmx.h | 11 +
+ arch/x86/include/uapi/asm/vmx.h | 5 +-
+ arch/x86/kernel/kvmclock.c | 9 +-
+ arch/x86/kvm/lapic.c | 48 +++-
+ arch/x86/kvm/lapic.h | 11 +
+ arch/x86/kvm/mmu.c | 89 ++++---
+ arch/x86/kvm/mmu.h | 7 +-
+ arch/x86/kvm/svm.c | 18 +-
+ arch/x86/kvm/vmx.c | 265 ++++++++++++--------
+ arch/x86/kvm/x86.c | 125 ++++++----
+ drivers/s390/kvm/virtio_ccw.c | 16 +-
+ include/linux/kvm_host.h | 50 +++-
+ include/uapi/linux/kvm.h | 3 +
+ virt/kvm/eventfd.c | 24 +-
+ virt/kvm/kvm_main.c | 53 ++--
+ 36 files changed, 823 insertions(+), 933 deletions(-)
+ create mode 100644 arch/s390/include/uapi/asm/virtio-ccw.h
+Merging kvm-ppc/kvm-ppc-next (04b6683 KVM: x86: correctly initialize the CS base on reset)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+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 fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/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 (849b022 Merge branch 'stable/for-linus-3.9-take-two' into linux-next)
+$ git merge xen-two/linux-next
+Auto-merging arch/x86/xen/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/xen/interface.h | 11 ++-
+ arch/x86/include/asm/xen/page.h | 3 +
+ arch/x86/xen/Kconfig | 8 ++
+ arch/x86/xen/enlighten.c | 76 ++++++++++++-----
+ arch/x86/xen/irq.c | 5 +-
+ arch/x86/xen/mmu.c | 158 ++++++++++++++++++++++++++++++++---
+ arch/x86/xen/mmu.h | 2 +
+ arch/x86/xen/p2m.c | 2 +-
+ arch/x86/xen/setup.c | 59 ++++++++++---
+ arch/x86/xen/smp.c | 39 ++++++---
+ arch/x86/xen/xen-head.S | 10 ++-
+ drivers/xen/balloon.c | 14 ++--
+ drivers/xen/cpu_hotplug.c | 4 +-
+ drivers/xen/events.c | 9 +-
+ drivers/xen/gntdev.c | 3 +-
+ drivers/xen/grant-table.c | 64 +++++++++++++-
+ drivers/xen/privcmd.c | 2 +-
+ drivers/xen/xenbus/xenbus_client.c | 3 +-
+ 18 files changed, 401 insertions(+), 71 deletions(-)
+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 (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (30db5f1 Merge branch 'master' into for-next)
+$ git merge workqueues/for-next
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/cpuset.c
+Auto-merging kernel/cgroup.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/device.h
+Merge made by the 'recursive' strategy.
+ arch/sh/drivers/pci/pcie-sh7786.c | 2 +-
+ drivers/base/base.h | 2 +
+ drivers/base/bus.c | 73 +-
+ drivers/base/core.c | 2 +-
+ include/linux/async.h | 13 +-
+ include/linux/cpumask.h | 15 +
+ include/linux/device.h | 2 +
+ include/linux/sched.h | 2 +-
+ include/linux/workqueue.h | 161 ++-
+ kernel/async.c | 40 +-
+ kernel/cgroup.c | 4 +-
+ kernel/cpuset.c | 16 +-
+ kernel/kthread.c | 2 +-
+ kernel/sched/core.c | 9 +-
+ kernel/workqueue.c | 2513 +++++++++++++++++++++++--------------
+ kernel/workqueue_internal.h | 9 +-
+ 16 files changed, 1860 insertions(+), 1005 deletions(-)
+Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it)
+$ git merge drivers-x86/linux-next
+Resolved 'drivers/platform/x86/chromeos_laptop.c' using previous resolution.
+Auto-merging drivers/platform/x86/chromeos_laptop.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/chromeos_laptop.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 68caee8] Merge remote-tracking branch 'drivers-x86/linux-next'
+$ git diff -M --stat --summary HEAD^..
+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 (7f8e176 Merge remote-tracking branch 'regmap/topic/range' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h | 12 +++--
+ drivers/base/regmap/regcache-lzo.c | 6 +--
+ drivers/base/regmap/regcache-rbtree.c | 67 ++++++++++++-------------
+ drivers/base/regmap/regcache.c | 43 +++++++++-------
+ drivers/base/regmap/regmap-debugfs.c | 94 ++++++++++++++++++++++++++++++++---
+ drivers/base/regmap/regmap-irq.c | 3 +-
+ drivers/base/regmap/regmap.c | 64 +++++++++++++++++-------
+ include/trace/events/regmap.h | 48 ++++++++++++++++++
+ 8 files changed, 250 insertions(+), 87 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 (96b5646 leds: leds-ns2: fix oops at module removal)
+$ git merge leds/for-next
+Auto-merging drivers/leds/trigger/ledtrig-transient.c
+Auto-merging drivers/leds/trigger/ledtrig-timer.c
+Auto-merging drivers/leds/trigger/ledtrig-oneshot.c
+Auto-merging drivers/leds/trigger/ledtrig-heartbeat.c
+Auto-merging drivers/leds/trigger/ledtrig-gpio.c
+Auto-merging drivers/leds/trigger/ledtrig-default-on.c
+Auto-merging drivers/leds/trigger/ledtrig-cpu.c
+Auto-merging drivers/leds/trigger/ledtrig-backlight.c
+Merge made by the 'recursive' strategy.
+ Documentation/leds/00-INDEX | 2 +
+ Documentation/leds/leds-lp5562.txt | 135 ++++++
+ Documentation/leds/leds-lp55xx.txt | 46 +-
+ drivers/leds/Kconfig | 115 +----
+ drivers/leds/Makefile | 11 +-
+ drivers/leds/leds-atmel-pwm.c | 4 +-
+ drivers/leds/leds-bd2802.c | 4 +-
+ drivers/leds/leds-lm355x.c | 2 +
+ drivers/leds/leds-lm3642.c | 2 +
+ drivers/leds/leds-lp5521.c | 3 +-
+ drivers/leds/leds-lp5562.c | 593 ++++++++++++++++++++++++
+ drivers/leds/leds-lp55xx-common.c | 6 +-
+ drivers/leds/leds-lt3593.c | 5 +-
+ drivers/leds/leds-ns2.c | 44 +-
+ drivers/leds/leds-pwm.c | 50 +-
+ drivers/leds/leds-renesas-tpu.c | 3 +-
+ drivers/leds/leds-tca6507.c | 4 +-
+ drivers/leds/leds-wm8350.c | 5 +-
+ drivers/leds/trigger/Kconfig | 111 +++++
+ drivers/leds/trigger/Makefile | 10 +
+ drivers/leds/{ => trigger}/ledtrig-backlight.c | 2 +-
+ drivers/leds/trigger/ledtrig-camera.c | 57 +++
+ drivers/leds/{ => trigger}/ledtrig-cpu.c | 2 +-
+ drivers/leds/{ => trigger}/ledtrig-default-on.c | 2 +-
+ drivers/leds/{ => trigger}/ledtrig-gpio.c | 2 +-
+ drivers/leds/{ => trigger}/ledtrig-heartbeat.c | 2 +-
+ drivers/leds/{ => trigger}/ledtrig-ide-disk.c | 0
+ drivers/leds/{ => trigger}/ledtrig-oneshot.c | 2 +-
+ drivers/leds/{ => trigger}/ledtrig-timer.c | 1 -
+ drivers/leds/{ => trigger}/ledtrig-transient.c | 2 +-
+ include/linux/leds.h | 33 +-
+ include/linux/mmc/host.h | 2 -
+ include/linux/platform_data/leds-lp55xx.h | 13 +-
+ 33 files changed, 1102 insertions(+), 173 deletions(-)
+ create mode 100644 Documentation/leds/leds-lp5562.txt
+ create mode 100644 drivers/leds/leds-lp5562.c
+ create mode 100644 drivers/leds/trigger/Kconfig
+ create mode 100644 drivers/leds/trigger/Makefile
+ rename drivers/leds/{ => trigger}/ledtrig-backlight.c (99%)
+ create mode 100644 drivers/leds/trigger/ledtrig-camera.c
+ rename drivers/leds/{ => trigger}/ledtrig-cpu.c (99%)
+ rename drivers/leds/{ => trigger}/ledtrig-default-on.c (98%)
+ rename drivers/leds/{ => trigger}/ledtrig-gpio.c (99%)
+ rename drivers/leds/{ => trigger}/ledtrig-heartbeat.c (99%)
+ rename drivers/leds/{ => trigger}/ledtrig-ide-disk.c (100%)
+ rename drivers/leds/{ => trigger}/ledtrig-oneshot.c (99%)
+ rename drivers/leds/{ => trigger}/ledtrig-timer.c (99%)
+ rename drivers/leds/{ => trigger}/ledtrig-transient.c (99%)
+Merging driver-core/driver-core-next (8f46baa base: core: WARN() about bogus permissions on device attributes)
+$ git merge driver-core/driver-core-next
+Auto-merging include/linux/device.h
+Auto-merging drivers/base/core.c
+Auto-merging drivers/base/bus.c
+Merge made by the 'recursive' strategy.
+ drivers/base/bus.c | 8 ++++----
+ drivers/base/core.c | 9 ++++++++-
+ include/linux/device.h | 12 +++---------
+ 3 files changed, 15 insertions(+), 14 deletions(-)
+Merging tty/tty-next (2be818a Revert "USB: quatech2: only write to the tty if the port is open.")
+$ git merge tty/tty-next
+Auto-merging drivers/usb/serial/usb-serial.c
+Auto-merging drivers/usb/serial/ti_usb_3410_5052.c
+Auto-merging drivers/usb/serial/quatech2.c
+Auto-merging drivers/usb/serial/mos7840.c
+Auto-merging drivers/usb/serial/io_edgeport.c
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging drivers/isdn/i4l/isdn_tty.c
+Merge made by the 'recursive' strategy.
+ arch/ia64/hp/sim/simserial.c | 16 +-
+ arch/um/drivers/chan_kern.c | 6 +-
+ arch/um/drivers/line.c | 8 +-
+ drivers/isdn/capi/capi.c | 7 +-
+ drivers/isdn/gigaset/interface.c | 6 +-
+ drivers/isdn/i4l/isdn_tty.c | 3 -
+ drivers/mmc/card/sdio_uart.c | 13 +-
+ drivers/net/caif/caif_serial.c | 1 -
+ drivers/net/ppp/ppp_async.c | 2 +-
+ drivers/net/ppp/ppp_synctty.c | 2 +-
+ drivers/net/usb/hso.c | 20 +-
+ drivers/s390/char/sclp_tty.c | 9 +-
+ drivers/s390/char/sclp_vt220.c | 8 +-
+ drivers/staging/fwserial/fwserial.c | 10 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 7 +-
+ drivers/tty/amiserial.c | 14 +-
+ drivers/tty/cyclades.c | 10 +-
+ drivers/tty/ehv_bytechan.c | 6 +-
+ drivers/tty/hvc/hvsi.c | 7 +-
+ drivers/tty/ipwireless/hardware.c | 3 +-
+ drivers/tty/moxa.c | 19 +-
+ drivers/tty/mxser.c | 4 +
+ drivers/tty/n_gsm.c | 10 +-
+ drivers/tty/n_tty.c | 172 +++++++++--------
+ drivers/tty/nozomi.c | 15 +-
+ drivers/tty/pty.c | 1 -
+ drivers/tty/rocket.c | 26 +--
+ drivers/tty/serial/68328serial.c | 9 +-
+ drivers/tty/serial/arc_uart.c | 2 +-
+ drivers/tty/serial/bfin_uart.c | 23 ---
+ drivers/tty/serial/crisv10.c | 168 +++++++---------
+ drivers/tty/serial/crisv10.h | 14 --
+ drivers/tty/serial/ifx6x60.c | 80 +-------
+ drivers/tty/serial/jsm/jsm_tty.c | 6 -
+ drivers/tty/serial/max3100.c | 20 +-
+ drivers/tty/serial/max310x.c | 24 ++-
+ drivers/tty/serial/mrst_max3110.c | 19 +-
+ drivers/tty/serial/msm_serial_hs.c | 2 -
+ drivers/tty/serial/msm_smd_tty.c | 14 +-
+ drivers/tty/serial/pch_uart.c | 103 +++++++---
+ drivers/tty/serial/serial-tegra.c | 9 +-
+ drivers/tty/serial/sunsab.c | 2 +-
+ drivers/tty/serial/sunzilog.c | 2 +-
+ drivers/tty/serial/vt8500_serial.c | 7 +-
+ drivers/tty/synclink.c | 3 -
+ drivers/tty/sysrq.c | 38 ++--
+ drivers/tty/tty_io.c | 170 ++++++++++++-----
+ drivers/tty/tty_ioctl.c | 120 ++++++++----
+ drivers/tty/tty_ldisc.c | 326 ++++++++++++++++----------------
+ drivers/tty/tty_port.c | 111 ++++++++---
+ drivers/usb/class/cdc-acm.c | 31 +--
+ drivers/usb/serial/digi_acceleport.c | 17 +-
+ drivers/usb/serial/io_edgeport.c | 28 +--
+ drivers/usb/serial/keyspan.c | 43 +----
+ drivers/usb/serial/keyspan_pda.c | 6 +-
+ drivers/usb/serial/mos7720.c | 8 +-
+ drivers/usb/serial/mos7840.c | 7 +-
+ drivers/usb/serial/option.c | 9 +-
+ drivers/usb/serial/quatech2.c | 17 +-
+ drivers/usb/serial/sierra.c | 8 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 7 +-
+ drivers/usb/serial/usb-serial.c | 10 +-
+ include/linux/tty.h | 41 +++-
+ include/linux/tty_ldisc.h | 132 ++++++-------
+ net/irda/ircomm/ircomm_tty_attach.c | 6 +-
+ 65 files changed, 954 insertions(+), 1093 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 0090516 Merge remote-tracking branch 'driver-core/driver-core-next'
+Merging 20130319 version of tty
+$ git merge -m 20130319/tty afa80ccb4c7d39702dfb0832ce02a054848191a8
+Auto-merging drivers/tty/serial/vt8500_serial.c
+Merge made by the 'recursive' strategy.
+ drivers/tty/amiserial.c | 14 +---
+ drivers/tty/ipwireless/hardware.c | 3 +-
+ drivers/tty/pty.c | 1 -
+ drivers/tty/serial/pch_uart.c | 103 +++++++++++++++++++-------
+ drivers/tty/serial/serial-tegra.c | 9 ++-
+ drivers/tty/serial/vt8500_serial.c | 7 +-
+ drivers/tty/sysrq.c | 38 +++++-----
+ drivers/tty/tty_io.c | 144 ++++++++++++++++++++++++-------------
+ 8 files changed, 204 insertions(+), 115 deletions(-)
+Merging usb/usb-next (417c765 USB: EHCI: fix up incorrect merge resolution)
+$ git merge usb/usb-next
+Auto-merging drivers/usb/serial/usb-serial.c
+Auto-merging drivers/usb/serial/quatech2.c
+Auto-merging drivers/usb/serial/mos7840.c
+Auto-merging drivers/usb/class/cdc-acm.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/ehci-omap.txt | 32 ++
+ .../devicetree/bindings/usb/ohci-omap3.txt | 15 +
+ drivers/staging/Kconfig | 2 -
+ drivers/staging/Makefile | 1 -
+ drivers/usb/chipidea/usbmisc_imx6q.c | 4 +-
+ drivers/usb/class/cdc-acm.c | 8 -
+ drivers/usb/host/Kconfig | 3 +-
+ drivers/usb/host/Makefile | 1 +
+ drivers/usb/host/ehci-hcd.c | 10 +-
+ drivers/usb/host/ehci-hub.c | 20 +-
+ drivers/usb/host/ehci-mv.c | 2 +-
+ drivers/usb/host/ehci-mxc.c | 8 +-
+ drivers/usb/host/ehci-omap.c | 331 +++++++++------------
+ drivers/usb/host/ehci-orion.c | 4 +-
+ drivers/usb/host/ehci-s5p.c | 11 +-
+ drivers/usb/host/ehci-sh.c | 4 +-
+ drivers/usb/host/ehci-timer.c | 61 ++--
+ drivers/usb/host/ohci-omap3.c | 24 +-
+ drivers/usb/misc/sisusbvga/sisusb.c | 2 +-
+ drivers/usb/misc/usb3503.c | 13 +-
+ drivers/usb/otg/isp1301_omap.c | 4 +-
+ drivers/usb/otg/twl4030-usb.c | 4 +-
+ drivers/usb/otg/twl6030-usb.c | 4 +-
+ drivers/usb/phy/mv_u3d_phy.c | 2 +-
+ drivers/usb/serial/mos7840.c | 3 +-
+ drivers/usb/serial/quatech2.c | 7 +-
+ drivers/usb/serial/usb-serial.c | 14 +-
+ drivers/usb/storage/onetouch.c | 4 +-
+ include/linux/usb.h | 4 +-
+ 29 files changed, 291 insertions(+), 311 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/ehci-omap.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/ohci-omap3.txt
+Merging usb-gadget/next (4261b8f usb: host: ehci-tegra: fix PHY error handling)
+$ git merge usb-gadget/next
+Recorded preimage for 'drivers/usb/gadget/net2272.c'
+Recorded preimage for 'drivers/usb/gadget/net2280.c'
+Removing drivers/usb/phy/samsung-usbphy.c
+Auto-merging drivers/usb/phy/phy.c
+Auto-merging drivers/usb/phy/phy-twl4030-usb.c
+Auto-merging drivers/usb/phy/phy-nop.c
+Auto-merging drivers/usb/phy/phy-mxs-usb.c
+Auto-merging drivers/usb/phy/phy-mv-usb.c
+Auto-merging drivers/usb/phy/phy-mv-u3d-usb.c
+Auto-merging drivers/usb/phy/phy-isp1301-omap.c
+Auto-merging drivers/usb/phy/phy-gpio-vbus-usb.c
+Auto-merging drivers/usb/phy/phy-fsm-usb.c
+Auto-merging drivers/usb/phy/phy-fsl-usb.c
+Removing drivers/usb/phy/isp1301.c
+Removing drivers/usb/otg/ab8500-usb.c
+Removing drivers/usb/otg/Makefile
+Removing drivers/usb/otg/Kconfig
+Auto-merging drivers/usb/musb/musb_gadget.c
+Auto-merging drivers/usb/musb/da8xx.c
+Auto-merging drivers/usb/host/ehci-s5p.c
+Auto-merging drivers/usb/host/ehci-mv.c
+Auto-merging drivers/usb/host/Kconfig
+Auto-merging drivers/usb/gadget/udc-core.c
+Auto-merging drivers/usb/gadget/net2280.c
+CONFLICT (content): Merge conflict in drivers/usb/gadget/net2280.c
+Auto-merging drivers/usb/gadget/net2272.c
+CONFLICT (content): Merge conflict in drivers/usb/gadget/net2272.c
+Auto-merging drivers/power/Kconfig
+Auto-merging drivers/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/usb/gadget/net2272.c'.
+Recorded resolution for 'drivers/usb/gadget/net2280.c'.
+[master bc08c3c] Merge remote-tracking branch 'usb-gadget/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/usb/omap-usb.txt | 40 +-
+ .../devicetree/bindings/usb/samsung-usbphy.txt | 76 +-
+ .../devicetree/bindings/usb/usb-nop-xceiv.txt | 34 +
+ arch/arm/mach-tegra/Kconfig | 8 +-
+ drivers/Makefile | 2 +-
+ drivers/power/Kconfig | 2 +-
+ drivers/power/pda_power.c | 14 +-
+ drivers/usb/Kconfig | 2 -
+ drivers/usb/Makefile | 4 +-
+ drivers/usb/chipidea/udc.c | 27 +-
+ drivers/usb/dwc3/Kconfig | 1 -
+ drivers/usb/dwc3/core.c | 201 ++++-
+ drivers/usb/dwc3/core.h | 72 +-
+ drivers/usb/dwc3/debugfs.c | 52 +-
+ drivers/usb/dwc3/dwc3-exynos.c | 98 ++-
+ drivers/usb/dwc3/dwc3-omap.c | 245 +++---
+ drivers/usb/dwc3/dwc3-pci.c | 38 +
+ drivers/usb/dwc3/ep0.c | 33 +-
+ drivers/usb/dwc3/gadget.c | 321 +++++--
+ drivers/usb/gadget/Kconfig | 4 -
+ drivers/usb/gadget/amd5536udc.c | 16 +-
+ drivers/usb/gadget/amd5536udc.h | 1 -
+ drivers/usb/gadget/at91_udc.c | 14 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 44 +-
+ drivers/usb/gadget/atmel_usba_udc.h | 6 -
+ drivers/usb/gadget/bcm63xx_udc.c | 23 -
+ drivers/usb/gadget/dummy_hcd.c | 17 -
+ drivers/usb/gadget/f_uvc.c | 262 +++---
+ drivers/usb/gadget/f_uvc.h | 12 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 18 +-
+ drivers/usb/gadget/fsl_udc_core.c | 83 +-
+ drivers/usb/gadget/fusb300_udc.c | 35 +-
+ drivers/usb/gadget/goku_udc.c | 20 +-
+ drivers/usb/gadget/goku_udc.h | 3 +-
+ drivers/usb/gadget/imx_udc.c | 16 +-
+ drivers/usb/gadget/lpc32xx_udc.c | 51 +-
+ drivers/usb/gadget/m66592-udc.c | 17 -
+ drivers/usb/gadget/mv_u3d_core.c | 21 +-
+ drivers/usb/gadget/mv_udc_core.c | 84 +-
+ drivers/usb/gadget/net2272.c | 19 +-
+ drivers/usb/gadget/net2280.c | 17 +-
+ drivers/usb/gadget/omap_udc.c | 21 +-
+ drivers/usb/gadget/pch_udc.c | 17 +-
+ drivers/usb/gadget/pxa25x_udc.c | 16 -
+ drivers/usb/gadget/pxa27x_udc.c | 41 +-
+ drivers/usb/gadget/r8a66597-udc.c | 14 +-
+ drivers/usb/gadget/s3c-hsotg.c | 78 +-
+ drivers/usb/gadget/s3c-hsudc.c | 16 -
+ drivers/usb/gadget/s3c2410_udc.c | 15 -
+ drivers/usb/gadget/udc-core.c | 89 +-
+ drivers/usb/gadget/uvc.h | 3 +-
+ drivers/usb/gadget/uvc_v4l2.c | 23 +-
+ drivers/usb/gadget/uvc_video.c | 14 +-
+ drivers/usb/host/Kconfig | 2 +-
+ drivers/usb/host/ehci-msm.c | 2 +-
+ drivers/usb/host/ehci-mv.c | 19 +-
+ drivers/usb/host/ehci-s5p.c | 2 +-
+ drivers/usb/host/ehci-tegra.c | 12 +-
+ drivers/usb/host/ohci-exynos.c | 2 +-
+ drivers/usb/musb/Kconfig | 6 +-
+ drivers/usb/musb/am35x.c | 8 +-
+ drivers/usb/musb/blackfin.c | 6 +-
+ drivers/usb/musb/cppi_dma.c | 17 +-
+ drivers/usb/musb/da8xx.c | 8 +-
+ drivers/usb/musb/davinci.c | 4 +-
+ drivers/usb/musb/musb_core.c | 58 +-
+ drivers/usb/musb/musb_dsps.c | 12 +-
+ drivers/usb/musb/musb_gadget.c | 150 +---
+ drivers/usb/musb/musb_host.c | 2 +-
+ drivers/usb/musb/musb_virthub.c | 4 +-
+ drivers/usb/musb/omap2430.c | 31 +-
+ drivers/usb/musb/tusb6010.c | 14 +-
+ drivers/usb/musb/ux500.c | 107 +++
+ drivers/usb/musb/ux500_dma.c | 20 +-
+ drivers/usb/otg/Kconfig | 141 ----
+ drivers/usb/otg/Makefile | 24 -
+ drivers/usb/otg/ab8500-usb.c | 596 -------------
+ drivers/usb/phy/Kconfig | 180 +++-
+ drivers/usb/phy/Makefile | 35 +-
+ drivers/usb/phy/isp1301.c | 71 --
+ drivers/usb/phy/phy-ab8500-usb.c | 733 ++++++++++++++++
+ drivers/usb/{otg/fsl_otg.c => phy/phy-fsl-usb.c} | 34 +-
+ drivers/usb/{otg/fsl_otg.h => phy/phy-fsl-usb.h} | 0
+ drivers/usb/{otg/otg_fsm.c => phy/phy-fsm-usb.c} | 4 +-
+ drivers/usb/{otg/otg_fsm.h => phy/phy-fsm-usb.h} | 0
+ .../{otg/gpio_vbus.c => phy/phy-gpio-vbus-usb.c} | 9 +-
+ .../{otg/isp1301_omap.c => phy/phy-isp1301-omap.c} | 6 +-
+ drivers/usb/phy/phy-isp1301.c | 162 ++++
+ drivers/usb/{otg/msm_otg.c => phy/phy-msm-usb.c} | 0
+ drivers/usb/phy/{mv_u3d_phy.c => phy-mv-u3d-usb.c} | 2 +-
+ drivers/usb/phy/{mv_u3d_phy.h => phy-mv-u3d-usb.h} | 0
+ drivers/usb/{otg/mv_otg.c => phy/phy-mv-usb.c} | 2 +-
+ drivers/usb/{otg/mv_otg.h => phy/phy-mv-usb.h} | 0
+ drivers/usb/{otg/mxs-phy.c => phy/phy-mxs-usb.c} | 41 +-
+ drivers/usb/{otg/nop-usb-xceiv.c => phy/phy-nop.c} | 143 +++-
+ .../phy/{omap-control-usb.c => phy-omap-control.c} | 0
+ drivers/usb/phy/{omap-usb2.c => phy-omap-usb2.c} | 0
+ drivers/usb/phy/{omap-usb3.c => phy-omap-usb3.c} | 0
+ drivers/usb/phy/{rcar-phy.c => phy-rcar-usb.c} | 0
+ drivers/usb/phy/phy-samsung-usb.c | 236 ++++++
+ drivers/usb/phy/phy-samsung-usb.h | 327 ++++++++
+ drivers/usb/phy/phy-samsung-usb2.c | 509 +++++++++++
+ drivers/usb/phy/phy-samsung-usb3.c | 349 ++++++++
+ .../usb/phy/{tegra_usb_phy.c => phy-tegra-usb.c} | 0
+ .../{otg/twl4030-usb.c => phy/phy-twl4030-usb.c} | 125 +--
+ .../{otg/twl6030-usb.c => phy/phy-twl6030-usb.c} | 0
+ .../ulpi_viewport.c => phy/phy-ulpi-viewport.c} | 0
+ drivers/usb/{otg/ulpi.c => phy/phy-ulpi.c} | 0
+ drivers/usb/{otg/otg.c => phy/phy.c} | 62 +-
+ drivers/usb/phy/samsung-usbphy.c | 928 ---------------------
+ drivers/usb/renesas_usbhs/fifo.c | 1 -
+ drivers/usb/renesas_usbhs/fifo.h | 2 -
+ drivers/usb/renesas_usbhs/mod_gadget.c | 18 +-
+ drivers/usb/usb-common.c | 47 ++
+ include/linux/platform_data/dwc3-omap.h | 4 -
+ include/linux/usb/ch9.h | 9 +
+ include/linux/usb/dwc3-omap.h | 6 +-
+ include/linux/usb/gadget.h | 11 +
+ include/linux/usb/musb-ux500.h | 31 +
+ include/linux/usb/nop-usb-xceiv.h | 5 +
+ include/linux/usb/otg.h | 9 +-
+ include/linux/usb/phy.h | 33 +-
+ 122 files changed, 4355 insertions(+), 3426 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt
+ delete mode 100644 drivers/usb/otg/Kconfig
+ delete mode 100644 drivers/usb/otg/Makefile
+ delete mode 100644 drivers/usb/otg/ab8500-usb.c
+ delete mode 100644 drivers/usb/phy/isp1301.c
+ create mode 100644 drivers/usb/phy/phy-ab8500-usb.c
+ rename drivers/usb/{otg/fsl_otg.c => phy/phy-fsl-usb.c} (97%)
+ rename drivers/usb/{otg/fsl_otg.h => phy/phy-fsl-usb.h} (100%)
+ rename drivers/usb/{otg/otg_fsm.c => phy/phy-fsm-usb.c} (99%)
+ rename drivers/usb/{otg/otg_fsm.h => phy/phy-fsm-usb.h} (100%)
+ rename drivers/usb/{otg/gpio_vbus.c => phy/phy-gpio-vbus-usb.c} (98%)
+ rename drivers/usb/{otg/isp1301_omap.c => phy/phy-isp1301-omap.c} (99%)
+ create mode 100644 drivers/usb/phy/phy-isp1301.c
+ rename drivers/usb/{otg/msm_otg.c => phy/phy-msm-usb.c} (100%)
+ rename drivers/usb/phy/{mv_u3d_phy.c => phy-mv-u3d-usb.c} (99%)
+ rename drivers/usb/phy/{mv_u3d_phy.h => phy-mv-u3d-usb.h} (100%)
+ rename drivers/usb/{otg/mv_otg.c => phy/phy-mv-usb.c} (99%)
+ rename drivers/usb/{otg/mv_otg.h => phy/phy-mv-usb.h} (100%)
+ rename drivers/usb/{otg/mxs-phy.c => phy/phy-mxs-usb.c} (84%)
+ rename drivers/usb/{otg/nop-usb-xceiv.c => phy/phy-nop.c} (55%)
+ rename drivers/usb/phy/{omap-control-usb.c => phy-omap-control.c} (100%)
+ rename drivers/usb/phy/{omap-usb2.c => phy-omap-usb2.c} (100%)
+ rename drivers/usb/phy/{omap-usb3.c => phy-omap-usb3.c} (100%)
+ rename drivers/usb/phy/{rcar-phy.c => phy-rcar-usb.c} (100%)
+ create mode 100644 drivers/usb/phy/phy-samsung-usb.c
+ create mode 100644 drivers/usb/phy/phy-samsung-usb.h
+ create mode 100644 drivers/usb/phy/phy-samsung-usb2.c
+ create mode 100644 drivers/usb/phy/phy-samsung-usb3.c
+ rename drivers/usb/phy/{tegra_usb_phy.c => phy-tegra-usb.c} (100%)
+ rename drivers/usb/{otg/twl4030-usb.c => phy/phy-twl4030-usb.c} (89%)
+ rename drivers/usb/{otg/twl6030-usb.c => phy/phy-twl6030-usb.c} (100%)
+ rename drivers/usb/{otg/ulpi_viewport.c => phy/phy-ulpi-viewport.c} (100%)
+ rename drivers/usb/{otg/ulpi.c => phy/phy-ulpi.c} (100%)
+ rename drivers/usb/{otg/otg.c => phy/phy.c} (89%)
+ delete mode 100644 drivers/usb/phy/samsung-usbphy.c
+ create mode 100644 include/linux/usb/musb-ux500.h
+Merging staging/staging-next (25eeb66 zram: fix zram_bvec_read duplicate dump failure message and stat accumulation)
+$ git merge staging/staging-next
+Auto-merging drivers/staging/zcache/Kconfig
+Removing drivers/staging/vt6656/ttype.h
+Removing drivers/staging/omap-thermal/omap5-thermal.c
+Auto-merging drivers/staging/omap-thermal/omap4-thermal-data.c
+Removing drivers/staging/ccg/usbstring.c
+Removing drivers/staging/ccg/u_serial.h
+Removing drivers/staging/ccg/u_serial.c
+Removing drivers/staging/ccg/u_ether.h
+Removing drivers/staging/ccg/u_ether.c
+Removing drivers/staging/ccg/sysfs-class-ccg_usb
+Removing drivers/staging/ccg/storage_common.c
+Removing drivers/staging/ccg/rndis.h
+Removing drivers/staging/ccg/rndis.c
+Removing drivers/staging/ccg/ndis.h
+Removing drivers/staging/ccg/gadget_chips.h
+Removing drivers/staging/ccg/f_rndis.c
+Removing drivers/staging/ccg/f_mass_storage.c
+Removing drivers/staging/ccg/f_fs.c
+Removing drivers/staging/ccg/f_acm.c
+Removing drivers/staging/ccg/epautoconf.c
+Removing drivers/staging/ccg/config.c
+Removing drivers/staging/ccg/composite.h
+Removing drivers/staging/ccg/composite.c
+Removing drivers/staging/ccg/ccg.c
+Removing drivers/staging/ccg/TODO
+Removing drivers/staging/ccg/Makefile
+Removing drivers/staging/ccg/Kconfig
+Auto-merging drivers/staging/Makefile
+Auto-merging drivers/staging/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 12 +
+ drivers/staging/Kconfig | 4 +
+ drivers/staging/Makefile | 2 +
+ drivers/staging/android/Kconfig | 29 +-
+ drivers/staging/android/Makefile | 2 +
+ drivers/staging/android/ashmem.c | 66 +-
+ drivers/staging/android/ashmem.h | 7 +
+ drivers/staging/android/logger.c | 196 +-
+ drivers/staging/android/logger.h | 40 +-
+ drivers/staging/android/lowmemorykiller.c | 5 +-
+ drivers/staging/android/sw_sync.c | 263 +
+ drivers/staging/android/sw_sync.h | 58 +
+ drivers/staging/android/sync.c | 1016 +++
+ drivers/staging/android/sync.h | 426 +
+ drivers/staging/android/trace/sync.h | 82 +
+ drivers/staging/bcm/Bcmchar.c | 2 +-
+ drivers/staging/bcm/InterfaceDld.c | 32 +-
+ drivers/staging/bcm/PHSModule.c | 1906 +++--
+ drivers/staging/bcm/nvm.c | 14 +-
+ drivers/staging/ccg/Kconfig | 25 -
+ drivers/staging/ccg/Makefile | 2 -
+ drivers/staging/ccg/TODO | 6 -
+ drivers/staging/ccg/ccg.c | 1292 ----
+ drivers/staging/ccg/composite.c | 1688 ----
+ drivers/staging/ccg/composite.h | 395 -
+ drivers/staging/ccg/config.c | 158 -
+ drivers/staging/ccg/epautoconf.c | 393 -
+ drivers/staging/ccg/f_acm.c | 814 --
+ drivers/staging/ccg/f_fs.c | 2456 ------
+ drivers/staging/ccg/f_mass_storage.c | 3135 --------
+ drivers/staging/ccg/f_rndis.c | 918 ---
+ drivers/staging/ccg/gadget_chips.h | 150 -
+ drivers/staging/ccg/ndis.h | 47 -
+ drivers/staging/ccg/rndis.c | 1175 ---
+ drivers/staging/ccg/rndis.h | 222 -
+ drivers/staging/ccg/storage_common.c | 893 ---
+ drivers/staging/ccg/sysfs-class-ccg_usb | 158 -
+ drivers/staging/ccg/u_ether.c | 986 ---
+ drivers/staging/ccg/u_ether.h | 154 -
+ drivers/staging/ccg/u_serial.c | 1339 ----
+ drivers/staging/ccg/u_serial.h | 65 -
+ drivers/staging/ccg/usbstring.c | 71 -
+ drivers/staging/comedi/Kconfig | 12 +-
+ drivers/staging/comedi/comedi_fops.c | 12 +-
+ drivers/staging/comedi/comedi_pci.c | 36 +-
+ drivers/staging/comedi/comedidev.h | 16 +-
+ drivers/staging/comedi/drivers.c | 5 +-
+ drivers/staging/comedi/drivers/8255_pci.c | 172 +-
+ drivers/staging/comedi/drivers/Makefile | 1 +
+ .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 +-
+ .../staging/comedi/drivers/addi-data/addi_common.c | 31 +-
+ .../staging/comedi/drivers/addi-data/addi_common.h | 2 -
+ drivers/staging/comedi/drivers/addi_apci_035.c | 19 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 13 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 19 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 63 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 19 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 69 +-
+ drivers/staging/comedi/drivers/addi_apci_1710.c | 62 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 13 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 13 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 52 +-
+ drivers/staging/comedi/drivers/addi_apci_3200.c | 49 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 13 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 225 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 63 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 95 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c | 344 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 14 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 19 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 142 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 18 +-
+ drivers/staging/comedi/drivers/adv_pci1724.c | 411 +
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 166 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 26 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 19 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 20 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 21 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 22 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 95 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 928 ++-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 90 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 14 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 14 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 19 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 17 +-
+ drivers/staging/comedi/drivers/das08.h | 1 -
+ drivers/staging/comedi/drivers/das08_cs.c | 1 -
+ drivers/staging/comedi/drivers/das08_pci.c | 13 +-
+ drivers/staging/comedi/drivers/das16.c | 2 +-
+ drivers/staging/comedi/drivers/das16m1.c | 2 +-
+ drivers/staging/comedi/drivers/das1800.c | 2 +-
+ drivers/staging/comedi/drivers/dt3000.c | 97 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 13 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 16 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 14 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 13 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 19 +-
+ drivers/staging/comedi/drivers/me4000.c | 148 +-
+ drivers/staging/comedi/drivers/me_daq.c | 62 +-
+ drivers/staging/comedi/drivers/mite.c | 9 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 82 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 383 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 144 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 62 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 2 +-
+ drivers/staging/comedi/drivers/ni_atmio.c | 12 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 12 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 345 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 68 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 2055 +++--
+ drivers/staging/comedi/drivers/ni_stc.h | 4 -
+ drivers/staging/comedi/drivers/pcl816.c | 2 +-
+ drivers/staging/comedi/drivers/rtd520.c | 51 +-
+ drivers/staging/comedi/drivers/s626.c | 15 +-
+ drivers/staging/comedi/drivers/skel.c | 117 +-
+ drivers/staging/comedi/drivers/usbdux.c | 406 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 2 +-
+ drivers/staging/csr/csr_time.c | 8 +-
+ drivers/staging/csr/drv.c | 4 +-
+ drivers/staging/csr/netdev.c | 2 +-
+ drivers/staging/csr/sdio_mmc.c | 3 +-
+ drivers/staging/csr/sme_native.c | 2 +-
+ drivers/staging/csr/sme_wext.c | 3 -
+ drivers/staging/csr/unifi_pdu_processing.c | 4 +-
+ drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +-
+ drivers/staging/dgrp/dgrp_mon_ops.c | 2 +-
+ drivers/staging/dgrp/dgrp_net_ops.c | 4 +-
+ drivers/staging/dgrp/dgrp_ports_ops.c | 2 +-
+ drivers/staging/dgrp/dgrp_specproc.c | 6 +-
+ drivers/staging/dwc2/Kconfig | 42 +
+ drivers/staging/dwc2/Makefile | 23 +
+ drivers/staging/dwc2/core.c | 2678 +++++++
+ drivers/staging/dwc2/core.h | 658 ++
+ drivers/staging/dwc2/core_intr.c | 505 ++
+ drivers/staging/dwc2/hcd.c | 2951 +++++++
+ drivers/staging/dwc2/hcd.h | 737 ++
+ drivers/staging/dwc2/hcd_ddma.c | 1196 +++
+ drivers/staging/dwc2/hcd_intr.c | 2079 +++++
+ drivers/staging/dwc2/hcd_queue.c | 675 ++
+ drivers/staging/dwc2/hw.h | 811 ++
+ drivers/staging/dwc2/pci.c | 198 +
+ drivers/staging/et131x/et131x.c | 4 +-
+ drivers/staging/gdm72xx/gdm_qos.c | 47 +-
+ drivers/staging/gdm72xx/netlink_k.c | 1 +
+ drivers/staging/gdm72xx/sdio_boot.c | 1 +
+ drivers/staging/line6/pod.c | 3 +-
+ drivers/staging/netlogic/Kconfig | 7 +
+ drivers/staging/netlogic/Makefile | 1 +
+ drivers/staging/netlogic/TODO | 12 +
+ drivers/staging/netlogic/platform_net.c | 223 +
+ drivers/staging/netlogic/platform_net.h | 46 +
+ drivers/staging/netlogic/xlr_net.c | 1114 +++
+ drivers/staging/netlogic/xlr_net.h | 1099 +++
+ drivers/staging/omap-thermal/Kconfig | 2 +-
+ drivers/staging/omap-thermal/Makefile | 4 +-
+ drivers/staging/omap-thermal/TODO | 4 -
+ drivers/staging/omap-thermal/omap-bandgap.c | 854 +-
+ drivers/staging/omap-thermal/omap-bandgap.h | 442 +-
+ drivers/staging/omap-thermal/omap-thermal-common.c | 4 +-
+ .../{omap4-thermal.c => omap4-thermal-data.c} | 14 +-
+ drivers/staging/omap-thermal/omap4xxx-bandgap.h | 175 +
+ drivers/staging/omap-thermal/omap5-thermal-data.c | 354 +
+ drivers/staging/omap-thermal/omap5-thermal.c | 297 -
+ drivers/staging/omap-thermal/omap5xxx-bandgap.h | 199 +
+ drivers/staging/omap-thermal/omap_bandgap.txt | 36 +-
+ drivers/staging/rtl8712/rtl8712_led.c | 8 +-
+ drivers/staging/rtl8712/rtl871x_recv.h | 108 -
+ drivers/staging/sep/sep_main.c | 9 +-
+ drivers/staging/sep/sep_trace_events.h | 11 +-
+ drivers/staging/silicom/bp_mod.c | 10 +-
+ drivers/staging/silicom/bypasslib/bypass.c | 94 +-
+ drivers/staging/slicoss/slicoss.c | 132 +-
+ drivers/staging/sm7xxfb/sm7xxfb.c | 10 +-
+ drivers/staging/usbip/stub_dev.c | 6 +-
+ drivers/staging/usbip/userspace/libsrc/names.c | 532 +-
+ drivers/staging/usbip/userspace/libsrc/names.h | 3 +-
+ .../staging/usbip/userspace/libsrc/usbip_common.c | 28 +-
+ .../staging/usbip/userspace/libsrc/usbip_common.h | 11 +-
+ .../staging/usbip/userspace/libsrc/vhci_driver.c | 40 +-
+ drivers/staging/usbip/userspace/src/usbip_detach.c | 2 +-
+ .../staging/usbip/userspace/src/usbip_network.c | 2 +-
+ .../staging/usbip/userspace/src/usbip_network.h | 4 +-
+ drivers/staging/usbip/userspace/src/usbipd.c | 4 +-
+ drivers/staging/usbip/vhci_hcd.c | 5 +-
+ drivers/staging/vt6655/80211hdr.h | 44 +-
+ drivers/staging/vt6655/80211mgr.c | 1122 +--
+ drivers/staging/vt6655/80211mgr.h | 640 +-
+ drivers/staging/vt6655/IEEE11h.c | 104 +-
+ drivers/staging/vt6655/IEEE11h.h | 6 +-
+ drivers/staging/vt6655/aes_ccmp.c | 566 +-
+ drivers/staging/vt6655/baseband.c | 4810 ++++++------
+ drivers/staging/vt6655/baseband.h | 56 +-
+ drivers/staging/vt6655/bssdb.c | 2648 +++----
+ drivers/staging/vt6655/bssdb.h | 396 +-
+ drivers/staging/vt6655/card.c | 2792 +++----
+ drivers/staging/vt6655/card.h | 130 +-
+ drivers/staging/vt6655/channel.c | 730 +-
+ drivers/staging/vt6655/channel.h | 14 +-
+ drivers/staging/vt6655/country.h | 238 +-
+ drivers/staging/vt6655/datarate.c | 456 +-
+ drivers/staging/vt6655/datarate.h | 42 +-
+ drivers/staging/vt6655/desc.h | 482 +-
+ drivers/staging/vt6655/device.h | 902 +--
+ drivers/staging/vt6655/device_cfg.h | 24 +-
+ drivers/staging/vt6655/device_main.c | 4882 ++++++------
+ drivers/staging/vt6655/dpc.c | 2440 +++---
+ drivers/staging/vt6655/dpc.h | 8 +-
+ drivers/staging/vt6655/hostap.c | 666 +-
+ drivers/staging/vt6655/iocmd.h | 200 +-
+ drivers/staging/vt6655/ioctl.c | 16 +-
+ drivers/staging/vt6655/ioctl.h | 12 +-
+ drivers/staging/vt6655/iowpa.h | 42 +-
+ drivers/staging/vt6655/iwctl.c | 2170 +++---
+ drivers/staging/vt6655/iwctl.h | 200 +-
+ drivers/staging/vt6655/key.c | 1160 +--
+ drivers/staging/vt6655/key.h | 168 +-
+ drivers/staging/vt6655/mac.c | 1632 ++--
+ drivers/staging/vt6655/mac.h | 836 +-
+ drivers/staging/vt6655/mib.c | 698 +-
+ drivers/staging/vt6655/mib.h | 502 +-
+ drivers/staging/vt6655/michael.c | 166 +-
+ drivers/staging/vt6655/michael.h | 6 +-
+ drivers/staging/vt6655/power.c | 468 +-
+ drivers/staging/vt6655/power.h | 30 +-
+ drivers/staging/vt6655/rc4.c | 78 +-
+ drivers/staging/vt6655/rc4.h | 6 +-
+ drivers/staging/vt6655/rf.c | 1456 ++--
+ drivers/staging/vt6655/rf.h | 22 +-
+ drivers/staging/vt6655/rxtx.c | 5652 +++++++-------
+ drivers/staging/vt6655/rxtx.h | 52 +-
+ drivers/staging/vt6655/srom.c | 254 +-
+ drivers/staging/vt6655/srom.h | 58 +-
+ drivers/staging/vt6655/tcrc.c | 156 +-
+ drivers/staging/vt6655/tether.c | 46 +-
+ drivers/staging/vt6655/tether.h | 34 +-
+ drivers/staging/vt6655/tkip.c | 328 +-
+ drivers/staging/vt6655/tkip.h | 12 +-
+ drivers/staging/vt6655/ttype.h | 12 +-
+ drivers/staging/vt6655/upc.h | 136 +-
+ drivers/staging/vt6655/vntwifi.c | 906 +--
+ drivers/staging/vt6655/vntwifi.h | 258 +-
+ drivers/staging/vt6655/wcmd.c | 1734 ++---
+ drivers/staging/vt6655/wcmd.h | 108 +-
+ drivers/staging/vt6655/wctl.c | 246 +-
+ drivers/staging/vt6655/wctl.h | 70 +-
+ drivers/staging/vt6655/wmgr.c | 8154 ++++++++++----------
+ drivers/staging/vt6655/wmgr.h | 514 +-
+ drivers/staging/vt6655/wpa.c | 334 +-
+ drivers/staging/vt6655/wpa.h | 22 +-
+ drivers/staging/vt6655/wpa2.c | 504 +-
+ drivers/staging/vt6655/wpa2.h | 28 +-
+ drivers/staging/vt6655/wpactl.c | 868 +--
+ drivers/staging/vt6655/wpactl.h | 2 +-
+ drivers/staging/vt6655/wroute.c | 256 +-
+ drivers/staging/vt6655/wroute.h | 2 +-
+ drivers/staging/vt6656/80211hdr.h | 122 +-
+ drivers/staging/vt6656/80211mgr.c | 108 +-
+ drivers/staging/vt6656/80211mgr.h | 309 +-
+ drivers/staging/vt6656/TODO | 2 +-
+ drivers/staging/vt6656/aes_ccmp.c | 104 +-
+ drivers/staging/vt6656/aes_ccmp.h | 4 +-
+ drivers/staging/vt6656/baseband.c | 48 +-
+ drivers/staging/vt6656/baseband.h | 7 +-
+ drivers/staging/vt6656/bssdb.c | 25 +-
+ drivers/staging/vt6656/bssdb.h | 108 +-
+ drivers/staging/vt6656/card.c | 64 +-
+ drivers/staging/vt6656/card.h | 9 +-
+ drivers/staging/vt6656/channel.c | 14 +-
+ drivers/staging/vt6656/channel.h | 7 +-
+ drivers/staging/vt6656/control.h | 1 -
+ drivers/staging/vt6656/datarate.c | 37 +-
+ drivers/staging/vt6656/datarate.h | 10 +-
+ drivers/staging/vt6656/desc.h | 230 +-
+ drivers/staging/vt6656/device.h | 23 +-
+ drivers/staging/vt6656/device_cfg.h | 2 -
+ drivers/staging/vt6656/dpc.c | 122 +-
+ drivers/staging/vt6656/dpc.h | 1 -
+ drivers/staging/vt6656/firmware.c | 2 +-
+ drivers/staging/vt6656/firmware.h | 1 -
+ drivers/staging/vt6656/hostap.c | 12 +-
+ drivers/staging/vt6656/int.c | 16 +-
+ drivers/staging/vt6656/int.h | 39 +-
+ drivers/staging/vt6656/iocmd.h | 2 -
+ drivers/staging/vt6656/iwctl.c | 24 +-
+ drivers/staging/vt6656/key.c | 14 +-
+ drivers/staging/vt6656/key.h | 23 +-
+ drivers/staging/vt6656/mac.c | 52 +-
+ drivers/staging/vt6656/mac.h | 1 -
+ drivers/staging/vt6656/main_usb.c | 18 +-
+ drivers/staging/vt6656/mib.c | 36 +-
+ drivers/staging/vt6656/mib.h | 269 +-
+ drivers/staging/vt6656/michael.c | 40 +-
+ drivers/staging/vt6656/michael.h | 8 +-
+ drivers/staging/vt6656/power.c | 3 +-
+ drivers/staging/vt6656/rc4.c | 22 +-
+ drivers/staging/vt6656/rc4.h | 8 +-
+ drivers/staging/vt6656/rf.c | 8 +-
+ drivers/staging/vt6656/rf.h | 1 -
+ drivers/staging/vt6656/rndis.h | 78 +-
+ drivers/staging/vt6656/rxtx.c | 386 +-
+ drivers/staging/vt6656/rxtx.h | 655 +-
+ drivers/staging/vt6656/srom.h | 58 +-
+ drivers/staging/vt6656/tcrc.c | 12 +-
+ drivers/staging/vt6656/tcrc.h | 8 +-
+ drivers/staging/vt6656/tether.c | 14 +-
+ drivers/staging/vt6656/tether.h | 33 +-
+ drivers/staging/vt6656/tkip.c | 14 +-
+ drivers/staging/vt6656/tkip.h | 11 +-
+ drivers/staging/vt6656/tmacro.h | 14 +-
+ drivers/staging/vt6656/ttype.h | 55 -
+ drivers/staging/vt6656/usbpipe.h | 1 -
+ drivers/staging/vt6656/wcmd.c | 7 +-
+ drivers/staging/vt6656/wcmd.h | 6 +-
+ drivers/staging/vt6656/wctl.c | 6 +-
+ drivers/staging/vt6656/wctl.h | 1 -
+ drivers/staging/vt6656/wmgr.c | 118 +-
+ drivers/staging/vt6656/wmgr.h | 1 -
+ drivers/staging/vt6656/wpa.c | 29 +-
+ drivers/staging/vt6656/wpa.h | 5 +-
+ drivers/staging/vt6656/wpa2.c | 40 +-
+ drivers/staging/vt6656/wpa2.h | 5 +-
+ drivers/staging/vt6656/wpactl.c | 20 +-
+ drivers/staging/wlan-ng/prism2sta.c | 51 +-
+ drivers/staging/zcache/Kconfig | 8 +
+ drivers/staging/zcache/Makefile | 1 +
+ drivers/staging/zcache/TODO | 6 +-
+ drivers/staging/zcache/debug.c | 71 +
+ drivers/staging/zcache/debug.h | 231 +
+ drivers/staging/zcache/zcache-main.c | 431 +-
+ drivers/staging/zram/zram_drv.c | 5 +-
+ 331 files changed, 53383 insertions(+), 52678 deletions(-)
+ create mode 100644 drivers/staging/android/sw_sync.c
+ create mode 100644 drivers/staging/android/sw_sync.h
+ create mode 100644 drivers/staging/android/sync.c
+ create mode 100644 drivers/staging/android/sync.h
+ create mode 100644 drivers/staging/android/trace/sync.h
+ delete mode 100644 drivers/staging/ccg/Kconfig
+ delete mode 100644 drivers/staging/ccg/Makefile
+ delete mode 100644 drivers/staging/ccg/TODO
+ delete mode 100644 drivers/staging/ccg/ccg.c
+ delete mode 100644 drivers/staging/ccg/composite.c
+ delete mode 100644 drivers/staging/ccg/composite.h
+ delete mode 100644 drivers/staging/ccg/config.c
+ delete mode 100644 drivers/staging/ccg/epautoconf.c
+ delete mode 100644 drivers/staging/ccg/f_acm.c
+ delete mode 100644 drivers/staging/ccg/f_fs.c
+ delete mode 100644 drivers/staging/ccg/f_mass_storage.c
+ delete mode 100644 drivers/staging/ccg/f_rndis.c
+ delete mode 100644 drivers/staging/ccg/gadget_chips.h
+ delete mode 100644 drivers/staging/ccg/ndis.h
+ delete mode 100644 drivers/staging/ccg/rndis.c
+ delete mode 100644 drivers/staging/ccg/rndis.h
+ delete mode 100644 drivers/staging/ccg/storage_common.c
+ delete mode 100644 drivers/staging/ccg/sysfs-class-ccg_usb
+ delete mode 100644 drivers/staging/ccg/u_ether.c
+ delete mode 100644 drivers/staging/ccg/u_ether.h
+ delete mode 100644 drivers/staging/ccg/u_serial.c
+ delete mode 100644 drivers/staging/ccg/u_serial.h
+ delete mode 100644 drivers/staging/ccg/usbstring.c
+ create mode 100644 drivers/staging/comedi/drivers/adv_pci1724.c
+ create mode 100644 drivers/staging/dwc2/Kconfig
+ create mode 100644 drivers/staging/dwc2/Makefile
+ create mode 100644 drivers/staging/dwc2/core.c
+ create mode 100644 drivers/staging/dwc2/core.h
+ create mode 100644 drivers/staging/dwc2/core_intr.c
+ create mode 100644 drivers/staging/dwc2/hcd.c
+ create mode 100644 drivers/staging/dwc2/hcd.h
+ create mode 100644 drivers/staging/dwc2/hcd_ddma.c
+ create mode 100644 drivers/staging/dwc2/hcd_intr.c
+ create mode 100644 drivers/staging/dwc2/hcd_queue.c
+ create mode 100644 drivers/staging/dwc2/hw.h
+ create mode 100644 drivers/staging/dwc2/pci.c
+ create mode 100644 drivers/staging/netlogic/Kconfig
+ create mode 100644 drivers/staging/netlogic/Makefile
+ create mode 100644 drivers/staging/netlogic/TODO
+ create mode 100644 drivers/staging/netlogic/platform_net.c
+ create mode 100644 drivers/staging/netlogic/platform_net.h
+ create mode 100644 drivers/staging/netlogic/xlr_net.c
+ create mode 100644 drivers/staging/netlogic/xlr_net.h
+ rename drivers/staging/omap-thermal/{omap4-thermal.c => omap4-thermal-data.c} (97%)
+ create mode 100644 drivers/staging/omap-thermal/omap4xxx-bandgap.h
+ create mode 100644 drivers/staging/omap-thermal/omap5-thermal-data.c
+ delete mode 100644 drivers/staging/omap-thermal/omap5-thermal.c
+ create mode 100644 drivers/staging/omap-thermal/omap5xxx-bandgap.h
+ delete mode 100644 drivers/staging/vt6656/ttype.h
+ create mode 100644 drivers/staging/zcache/debug.c
+ create mode 100644 drivers/staging/zcache/debug.h
+Merging char-misc/char-misc-next (501ad1c FIX: softingcs conversion to module_pcmcia_driver macro)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c
+Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c
+Auto-merging drivers/misc/mei/mei_dev.h
+Auto-merging drivers/misc/mei/init.c
+Auto-merging drivers/misc/mei/hw-me.c
+Auto-merging drivers/char/hw_random/mxc-rnga.c
+Merge made by the 'recursive' strategy.
+ drivers/ata/pata_pcmcia.c | 14 +-
+ drivers/bluetooth/bluecard_cs.c | 15 +-
+ drivers/bluetooth/bt3c_cs.c | 15 +-
+ drivers/bluetooth/btuart_cs.c | 15 +-
+ drivers/bluetooth/dtl1_cs.c | 15 +-
+ drivers/char/applicom.c | 4 +-
+ drivers/char/hw_random/mxc-rnga.c | 13 +-
+ drivers/char/hw_random/tx4939-rng.c | 13 +-
+ drivers/hv/Makefile | 2 +-
+ drivers/hv/channel_mgmt.c | 11 +
+ drivers/hv/hv_balloon.c | 482 +++++++++++++++++++++++++----
+ drivers/hv/hv_snapshot.c | 287 +++++++++++++++++
+ drivers/hv/hv_util.c | 10 +
+ drivers/ipack/carriers/tpci200.c | 14 +-
+ drivers/ipack/ipack.c | 36 ++-
+ drivers/isdn/hardware/avm/avm_cs.c | 14 +-
+ drivers/isdn/hisax/avma1_cs.c | 14 +-
+ drivers/isdn/hisax/elsa_cs.c | 14 +-
+ drivers/isdn/hisax/sedlbauer_cs.c | 14 +-
+ drivers/isdn/hisax/teles_cs.c | 14 +-
+ drivers/memory/emif.c | 12 +-
+ drivers/memory/tegra30-mc.c | 2 +
+ drivers/misc/Makefile | 1 -
+ drivers/misc/apds990x.c | 3 -
+ drivers/misc/arm-charlcd.c | 13 +-
+ drivers/misc/atmel_pwm.c | 12 +-
+ drivers/misc/ep93xx_pwm.c | 13 +-
+ drivers/misc/mei/amthif.c | 11 +-
+ drivers/misc/mei/hw-me.c | 48 ++-
+ drivers/misc/mei/hw-me.h | 6 -
+ drivers/misc/mei/init.c | 16 +
+ drivers/misc/mei/interrupt.c | 50 +--
+ drivers/misc/mei/mei_dev.h | 27 +-
+ drivers/misc/vmw_vmci/Kconfig | 2 +-
+ drivers/mmc/host/sdricoh_cs.c | 20 +-
+ drivers/net/arcnet/com20020_cs.c | 14 +-
+ drivers/net/can/sja1000/ems_pcmcia.c | 13 +-
+ drivers/net/can/sja1000/peak_pcmcia.c | 13 +-
+ drivers/net/can/softing/softing_cs.c | 16 +-
+ drivers/net/ethernet/3com/3c574_cs.c | 14 +-
+ drivers/net/ethernet/3com/3c589_cs.c | 14 +-
+ drivers/net/ethernet/8390/axnet_cs.c | 14 +-
+ drivers/net/ethernet/8390/pcnet_cs.c | 14 +-
+ drivers/net/ethernet/amd/nmclan_cs.c | 14 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 14 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 14 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 16 +-
+ drivers/net/wireless/airo_cs.c | 14 +-
+ drivers/net/wireless/atmel_cs.c | 14 +-
+ drivers/net/wireless/b43/pcmcia.c | 4 +
+ drivers/net/wireless/hostap/hostap_cs.c | 15 +-
+ drivers/net/wireless/libertas/if_cs.c | 25 +-
+ drivers/net/wireless/orinoco/orinoco_cs.c | 16 +-
+ drivers/net/wireless/orinoco/spectrum_cs.c | 16 +-
+ drivers/net/wireless/wl3501_cs.c | 14 +-
+ drivers/parport/parport_cs.c | 14 +-
+ drivers/scsi/pcmcia/aha152x_stub.c | 14 +-
+ drivers/scsi/pcmcia/fdomain_stub.c | 14 +-
+ drivers/scsi/pcmcia/nsp_cs.c | 17 +-
+ drivers/scsi/pcmcia/qlogic_stub.c | 13 +-
+ drivers/scsi/pcmcia/sym53c500_cs.c | 16 +-
+ drivers/tty/serial/8250/serial_cs.c | 14 +-
+ drivers/usb/host/sl811_cs.c | 15 +-
+ drivers/w1/masters/mxc_w1.c | 6 +-
+ drivers/w1/slaves/Kconfig | 10 +
+ drivers/w1/slaves/w1_ds2408.c | 25 +-
+ include/linux/hyperv.h | 69 +++++
+ include/linux/ipack.h | 42 ++-
+ include/pcmcia/ds.h | 12 +
+ include/uapi/linux/connector.h | 5 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.c | 15 +-
+ sound/pcmcia/vx/vxpocket.c | 14 +-
+ tools/hv/hv_kvp_daemon.c | 16 +-
+ tools/hv/hv_vss_daemon.c | 220 +++++++++++++
+ 74 files changed, 1319 insertions(+), 772 deletions(-)
+ create mode 100644 drivers/hv/hv_snapshot.c
+ create mode 100644 tools/hv/hv_vss_daemon.c
+Merging bcon/master (06c6942 blockconsole: Mark a local work struct static)
+$ git merge bcon/master
+Resolved 'drivers/block/Kconfig' using previous resolution.
+Auto-merging kernel/printk.c
+Auto-merging init/do_mounts.c
+Auto-merging include/linux/console.h
+Auto-merging drivers/net/netconsole.c
+Auto-merging drivers/block/Makefile
+Auto-merging drivers/block/Kconfig
+CONFLICT (content): Merge conflict in drivers/block/Kconfig
+Auto-merging block/partitions/check.h
+Auto-merging block/partitions/check.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0fd2a94] Merge remote-tracking branch 'bcon/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/blockconsole.txt | 94 ++++
+ Documentation/block/blockconsole/bcon_tail | 82 ++++
+ Documentation/block/blockconsole/mkblockconsole | 29 ++
+ block/partitions/Makefile | 1 +
+ block/partitions/blockconsole.c | 22 +
+ block/partitions/check.c | 3 +
+ block/partitions/check.h | 3 +
+ drivers/block/Kconfig | 6 +
+ drivers/block/Makefile | 1 +
+ drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++
+ drivers/net/netconsole.c | 2 +-
+ include/linux/blockconsole.h | 7 +
+ include/linux/console.h | 1 +
+ include/linux/mount.h | 2 +-
+ init/do_mounts.c | 2 +-
+ kernel/printk.c | 5 +-
+ 16 files changed, 873 insertions(+), 5 deletions(-)
+ create mode 100644 Documentation/block/blockconsole.txt
+ create mode 100755 Documentation/block/blockconsole/bcon_tail
+ create mode 100755 Documentation/block/blockconsole/mkblockconsole
+ create mode 100644 block/partitions/blockconsole.c
+ create mode 100644 drivers/block/blockconsole.c
+ create mode 100644 include/linux/blockconsole.h
+Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
+$ git merge tmem/linux-next
+Already up-to-date.
+Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
+$ 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 (5c8d3f7 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/pinctrl-at91.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/gpio/gpio.txt | 6 +-
+ .../devicetree/bindings/pinctrl/pinctrl-single.txt | 107 ++-
+ Documentation/pinctrl.txt | 112 +++
+ arch/arm/boot/dts/spear1310.dtsi | 4 +-
+ arch/arm/boot/dts/spear1340.dtsi | 4 +-
+ arch/arm/boot/dts/spear310.dtsi | 4 +-
+ arch/arm/boot/dts/spear320.dtsi | 4 +-
+ drivers/gpio/gpio-pl061.c | 117 ++-
+ drivers/gpio/gpiolib-of.c | 20 +-
+ drivers/pinctrl/Kconfig | 1 +
+ drivers/pinctrl/core.c | 39 +-
+ drivers/pinctrl/devicetree.c | 4 +-
+ drivers/pinctrl/mvebu/pinctrl-mvebu.c | 8 +-
+ drivers/pinctrl/pinconf-generic.c | 14 +
+ drivers/pinctrl/pinconf.c | 4 +-
+ drivers/pinctrl/pinconf.h | 10 +-
+ drivers/pinctrl/pinctrl-abx500.c | 9 +-
+ drivers/pinctrl/pinctrl-at91.c | 6 +-
+ drivers/pinctrl/pinctrl-bcm2835.c | 6 +-
+ drivers/pinctrl/pinctrl-exynos5440.c | 6 +-
+ drivers/pinctrl/pinctrl-falcon.c | 2 +-
+ drivers/pinctrl/pinctrl-imx.c | 6 +-
+ drivers/pinctrl/pinctrl-lantiq.c | 4 +-
+ drivers/pinctrl/pinctrl-mxs.c | 6 +-
+ drivers/pinctrl/pinctrl-nomadik-stn8815.c | 2 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 6 +-
+ drivers/pinctrl/pinctrl-pxa3xx.c | 4 +-
+ drivers/pinctrl/pinctrl-samsung.c | 6 +-
+ drivers/pinctrl/pinctrl-single.c | 515 ++++++++++-
+ drivers/pinctrl/pinctrl-sirf.c | 4 +-
+ drivers/pinctrl/pinctrl-sunxi.c | 978 ++++++++++++++++-----
+ drivers/pinctrl/pinctrl-tegra.c | 6 +-
+ drivers/pinctrl/pinctrl-u300.c | 6 +-
+ drivers/pinctrl/pinctrl-xway.c | 2 +-
+ drivers/pinctrl/pinmux.c | 5 +
+ drivers/pinctrl/spear/pinctrl-spear.c | 4 +-
+ include/linux/pinctrl/pinctrl.h | 6 +-
+ 37 files changed, 1672 insertions(+), 375 deletions(-)
+Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency)
+$ git merge vhost/linux-next
+Resolved 'drivers/vhost/Makefile' using previous resolution.
+Auto-merging drivers/vhost/Makefile
+CONFLICT (content): Merge conflict in drivers/vhost/Makefile
+Auto-merging drivers/vhost/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f31b8b0] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/vhost/Kconfig | 1 +
+ drivers/vhost/Kconfig.blk | 10 +
+ drivers/vhost/Makefile | 2 +
+ drivers/vhost/blk.c | 727 ++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/vhost/blk.h | 8 +
+ 5 files changed, 748 insertions(+)
+ create mode 100644 drivers/vhost/Kconfig.blk
+ create mode 100644 drivers/vhost/blk.c
+ create mode 100644 drivers/vhost/blk.h
+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 (560aa53 irqdomain: document the simple domain first_irq)
+$ git merge irqdomain/irqdomain/next
+Merge made by the 'recursive' strategy.
+ kernel/irq/irqdomain.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging gpio/gpio/next (753c598 gpio/em: Add Device Tree support)
+$ git merge gpio/gpio/next
+Merge made by the 'recursive' strategy.
+ drivers/gpio/gpio-em.c | 45 ++++++++++++++++++++++++++--
+ drivers/gpio/gpio-omap.c | 75 +++++++++++++++++++++--------------------------
+ drivers/gpio/gpio-tegra.c | 11 ++++---
+ 3 files changed, 81 insertions(+), 50 deletions(-)
+Merging gpio-lw/for-next (c7886b1 gpio: em: Use irq_domain_add_simple() to fix runtime error)
+$ git merge gpio-lw/for-next
+Already up-to-date.
+Merging gen-gpio/for_next (a2523d3 blackfin: force use of gpiolib)
+$ git merge gen-gpio/for_next
+Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
+Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
+CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
+Auto-merging arch/powerpc/platforms/Kconfig
+Auto-merging arch/powerpc/platforms/85xx/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/blackfin/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f8b878b] Merge remote-tracking branch 'gen-gpio/for_next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/plat-orion/Makefile | 2 +-
+ arch/avr32/Kconfig | 2 +-
+ arch/blackfin/Kconfig | 4 ++--
+ arch/m68k/Kconfig.cpu | 3 +--
+ arch/mips/Kconfig | 7 +------
+ arch/mips/loongson/common/Makefile | 2 +-
+ arch/mips/txx9/generic/setup.c | 2 +-
+ arch/openrisc/Kconfig | 2 +-
+ arch/powerpc/platforms/40x/Kconfig | 1 -
+ arch/powerpc/platforms/44x/Kconfig | 1 -
+ arch/powerpc/platforms/85xx/Kconfig | 1 -
+ arch/powerpc/platforms/86xx/Kconfig | 3 ---
+ arch/powerpc/platforms/8xx/Kconfig | 1 -
+ arch/powerpc/platforms/Kconfig | 4 ----
+ arch/sh/boards/mach-sdk7786/Makefile | 2 +-
+ arch/sh/boards/mach-x3proto/Makefile | 2 +-
+ arch/sh/kernel/cpu/sh2a/Makefile | 2 +-
+ arch/sh/kernel/cpu/sh3/Makefile | 2 +-
+ arch/sh/kernel/cpu/sh4a/Makefile | 2 +-
+ arch/unicore32/Kconfig | 3 +--
+ arch/xtensa/configs/iss_defconfig | 1 -
+ arch/xtensa/configs/s6105_defconfig | 1 -
+ 22 files changed, 15 insertions(+), 35 deletions(-)
+Merging mailbox/dbx500-prcmu-mailbox (adbf1b7 mailbox: call request_irq after mbox queues are allocated)
+$ git merge mailbox/dbx500-prcmu-mailbox
+Auto-merging drivers/mailbox/mailbox-omap2.c
+Auto-merging drivers/mailbox/mailbox-omap1.c
+Removing arch/arm/plat-omap/mailbox.c
+Removing arch/arm/plat-omap/include/plat/mailbox.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mailbox/dbx500-mailbox.txt | 27 +
+ arch/arm/configs/omap1_defconfig | 3 +-
+ arch/arm/mach-omap1/Makefile | 4 -
+ arch/arm/mach-omap2/Makefile | 3 -
+ arch/arm/mach-omap2/devices.c | 13 +-
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 12 +
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 11 +
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 11 +
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 +
+ arch/arm/plat-omap/Kconfig | 16 -
+ arch/arm/plat-omap/Makefile | 3 -
+ arch/arm/plat-omap/include/plat/mailbox.h | 105 ----
+ arch/arm/plat-omap/mailbox.c | 435 --------------
+ drivers/cpufreq/highbank-cpufreq.c | 2 +-
+ drivers/mailbox/Kconfig | 41 ++
+ drivers/mailbox/Makefile | 5 +
+ drivers/mailbox/mailbox-dbx500.c | 648 +++++++++++++++++++++
+ .../mailbox.c => drivers/mailbox/mailbox-omap1.c | 90 ++-
+ .../mailbox.c => drivers/mailbox/mailbox-omap2.c | 330 +++++------
+ drivers/mailbox/mailbox.c | 552 ++++++++++++++++++
+ drivers/mailbox/mailbox_internal.h | 70 +++
+ drivers/mailbox/pl320-ipc.c | 2 +-
+ drivers/remoteproc/Kconfig | 3 +-
+ drivers/remoteproc/omap_remoteproc.c | 36 +-
+ drivers/staging/tidspbridge/Kconfig | 3 +-
+ drivers/staging/tidspbridge/core/_tiomap.h | 2 +-
+ drivers/staging/tidspbridge/core/chnl_sm.c | 8 +-
+ drivers/staging/tidspbridge/core/io_sm.c | 5 +-
+ drivers/staging/tidspbridge/core/tiomap3430.c | 6 +-
+ drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 6 +-
+ drivers/staging/tidspbridge/core/tiomap_io.c | 9 +-
+ .../tidspbridge/include/dspbridge/host_os.h | 2 +-
+ include/linux/mailbox.h | 52 +-
+ include/linux/pl320-ipc.h | 17 +
+ include/linux/platform_data/mailbox-dbx500.h | 12 +
+ include/linux/platform_data/mailbox-omap.h | 53 ++
+ 36 files changed, 1766 insertions(+), 844 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mailbox/dbx500-mailbox.txt
+ delete mode 100644 arch/arm/plat-omap/include/plat/mailbox.h
+ delete mode 100644 arch/arm/plat-omap/mailbox.c
+ create mode 100644 drivers/mailbox/mailbox-dbx500.c
+ rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (64%)
+ rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (50%)
+ create mode 100644 drivers/mailbox/mailbox.c
+ create mode 100644 drivers/mailbox/mailbox_internal.h
+ create mode 100644 include/linux/pl320-ipc.h
+ create mode 100644 include/linux/platform_data/mailbox-dbx500.h
+ create mode 100644 include/linux/platform_data/mailbox-omap.h
+Merging arm-soc/for-next (f96c489 Merge branch 'clksrc/cleanup' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging drivers/net/ethernet/smsc/smsc911x.c
+Removing arch/arm/plat-spear/Makefile
+Removing arch/arm/plat-spear/Kconfig
+Removing arch/arm/plat-samsung/time.c
+Auto-merging arch/arm/plat-samsung/samsung-time.c
+Removing arch/arm/plat-samsung/include/plat/s5p-time.h
+Removing arch/arm/plat-samsung/include/plat/s3c244x.h
+Removing arch/arm/plat-samsung/include/plat/s3c2443.h
+Removing arch/arm/plat-samsung/include/plat/s3c2416.h
+Removing arch/arm/plat-samsung/include/plat/s3c2412.h
+Removing arch/arm/plat-samsung/include/plat/s3c2410.h
+Removing arch/arm/plat-samsung/include/plat/irq.h
+Auto-merging arch/arm/plat-orion/Makefile
+Removing arch/arm/mach-spear6xx/include/mach/uncompress.h
+Removing arch/arm/mach-spear6xx/include/mach/timex.h
+Removing arch/arm/mach-spear6xx/include/mach/spear.h
+Removing arch/arm/mach-spear6xx/include/mach/misc_regs.h
+Removing arch/arm/mach-spear6xx/include/mach/hardware.h
+Removing arch/arm/mach-spear6xx/include/mach/generic.h
+Removing arch/arm/mach-spear6xx/include/mach/debug-macro.S
+Removing arch/arm/mach-spear6xx/Makefile.boot
+Removing arch/arm/mach-spear6xx/Makefile
+Removing arch/arm/mach-spear6xx/Kconfig
+Removing arch/arm/mach-spear3xx/include/mach/uncompress.h
+Removing arch/arm/mach-spear3xx/include/mach/timex.h
+Removing arch/arm/mach-spear3xx/include/mach/spear.h
+Removing arch/arm/mach-spear3xx/include/mach/irqs.h
+Removing arch/arm/mach-spear3xx/include/mach/hardware.h
+Removing arch/arm/mach-spear3xx/include/mach/generic.h
+Removing arch/arm/mach-spear3xx/include/mach/debug-macro.S
+Removing arch/arm/mach-spear3xx/Makefile.boot
+Removing arch/arm/mach-spear3xx/Makefile
+Removing arch/arm/mach-spear3xx/Kconfig
+Removing arch/arm/mach-spear13xx/include/mach/uncompress.h
+Removing arch/arm/mach-spear13xx/include/mach/timex.h
+Removing arch/arm/mach-spear13xx/include/mach/spear.h
+Removing arch/arm/mach-spear13xx/include/mach/irqs.h
+Removing arch/arm/mach-spear13xx/include/mach/hardware.h
+Removing arch/arm/mach-spear13xx/include/mach/debug-macro.S
+Removing arch/arm/mach-spear13xx/Makefile
+Removing arch/arm/mach-spear13xx/Kconfig
+Auto-merging arch/arm/mach-spear/time.c
+Auto-merging arch/arm/mach-spear/spear6xx.c
+Auto-merging arch/arm/mach-spear/spear3xx.c
+Auto-merging arch/arm/mach-spear/spear320.c
+Auto-merging arch/arm/mach-spear/spear310.c
+Auto-merging arch/arm/mach-spear/spear300.c
+Auto-merging arch/arm/mach-spear/spear13xx.c
+Auto-merging arch/arm/mach-spear/spear1340.c
+Auto-merging arch/arm/mach-spear/spear1310.c
+Auto-merging arch/arm/mach-spear/restart.c
+Auto-merging arch/arm/mach-spear/platsmp.c
+Auto-merging arch/arm/mach-spear/include/mach/misc_regs.h
+Auto-merging arch/arm/mach-spear/include/mach/irqs.h
+Auto-merging arch/arm/mach-spear/generic.h
+Removing arch/arm/mach-shmobile/hotplug.c
+Auto-merging arch/arm/mach-shmobile/headsmp-scu.S
+Removing arch/arm/mach-s3c24xx/irq-s3c244x.c
+Removing arch/arm/mach-s3c24xx/irq-s3c2440.c
+Removing arch/arm/mach-s3c24xx/irq-s3c2412.c
+Removing arch/arm/mach-s3c24xx/include/mach/regs-sdi.h
+Auto-merging arch/arm/mach-s3c24xx/common-smdk.h
+Auto-merging arch/arm/mach-omap2/timer.c
+Removing arch/arm/mach-nomadik/include/mach/uncompress.h
+Removing arch/arm/mach-nomadik/include/mach/timex.h
+Removing arch/arm/mach-nomadik/include/mach/irqs.h
+Removing arch/arm/mach-nomadik/Makefile.boot
+Removing arch/arm/mach-l7200/include/mach/debug-macro.S
+Removing arch/arm/mach-h720x/include/mach/uncompress.h
+Removing arch/arm/mach-h720x/include/mach/timex.h
+Removing arch/arm/mach-h720x/include/mach/isa-dma.h
+Removing arch/arm/mach-h720x/include/mach/irqs.h
+Removing arch/arm/mach-h720x/include/mach/hardware.h
+Removing arch/arm/mach-h720x/include/mach/h7202-regs.h
+Removing arch/arm/mach-h720x/include/mach/h7201-regs.h
+Removing arch/arm/mach-h720x/include/mach/entry-macro.S
+Removing arch/arm/mach-h720x/include/mach/debug-macro.S
+Removing arch/arm/mach-h720x/include/mach/boards.h
+Removing arch/arm/mach-h720x/h7202-eval.c
+Removing arch/arm/mach-h720x/h7201-eval.c
+Removing arch/arm/mach-h720x/cpu-h7202.c
+Removing arch/arm/mach-h720x/cpu-h7201.c
+Removing arch/arm/mach-h720x/common.h
+Removing arch/arm/mach-h720x/common.c
+Removing arch/arm/mach-h720x/Makefile.boot
+Removing arch/arm/mach-h720x/Makefile
+Removing arch/arm/mach-h720x/Kconfig
+Auto-merging arch/arm/mach-gemini/reset.c
+Removing arch/arm/mach-cns3xxx/include/mach/uncompress.h
+Removing arch/arm/mach-cns3xxx/include/mach/timex.h
+Removing arch/arm/mach-cns3xxx/include/mach/irqs.h
+Auto-merging arch/arm/mach-cns3xxx/cns3xxx.h
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+Removing arch/arm/configs/h7202_defconfig
+Removing arch/arm/configs/h7201_defconfig
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 67 +-
+ arch/arm/Kconfig.debug | 17 +
+ arch/arm/Makefile | 6 +-
+ arch/arm/arm-soc-for-next-contents.txt | 71 +
+ arch/arm/boot/dts/Makefile | 3 +
+ arch/arm/boot/dts/armada-370-mirabox.dts | 11 +
+ arch/arm/boot/dts/at91rm9200.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9263ek.dts | 2 -
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 -
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 -
+ arch/arm/boot/dts/at91sam9n12ek.dts | 2 -
+ arch/arm/boot/dts/at91sam9x5.dtsi | 60 +
+ arch/arm/boot/dts/at91sam9x5cm.dtsi | 20 +
+ arch/arm/boot/dts/at91sam9x5ek.dtsi | 8 -
+ arch/arm/boot/dts/atlas6-evb.dts | 78 +
+ arch/arm/boot/dts/atlas6.dtsi | 668 +++++
+ arch/arm/boot/dts/dbx5x0.dtsi | 7 +-
+ arch/arm/boot/dts/dove.dtsi | 5 +
+ arch/arm/boot/dts/href.dtsi | 1 +
+ arch/arm/boot/dts/hrefprev60.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-6282.dtsi | 6 +
+ arch/arm/boot/dts/mpa1600.dts | 69 +
+ arch/arm/boot/dts/r8a7779-marzen-reference.dts | 47 +
+ arch/arm/boot/dts/r8a7779.dtsi | 98 +
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 77 +
+ arch/arm/boot/dts/snowball.dts | 4 +
+ arch/arm/boot/dts/stuib.dtsi | 2 +-
+ arch/arm/configs/armadillo800eva_defconfig | 8 +-
+ arch/arm/configs/at91_dt_defconfig | 2 +-
+ arch/arm/configs/at91sam9260_defconfig | 2 +-
+ arch/arm/configs/at91sam9g20_defconfig | 2 +-
+ arch/arm/configs/at91sam9g45_defconfig | 2 +-
+ arch/arm/configs/cns3420vb_defconfig | 3 +
+ arch/arm/configs/dove_defconfig | 2 +
+ arch/arm/configs/h7201_defconfig | 27 -
+ arch/arm/configs/h7202_defconfig | 47 -
+ arch/arm/configs/kirkwood_defconfig | 2 +
+ arch/arm/configs/kzm9g_defconfig | 2 -
+ arch/arm/configs/mackerel_defconfig | 4 +
+ arch/arm/configs/marzen_defconfig | 4 +
+ arch/arm/configs/multi_v7_defconfig | 9 +
+ arch/arm/configs/nhk8815_defconfig | 42 +-
+ arch/arm/configs/spear3xx_defconfig | 2 +
+ arch/arm/configs/spear6xx_defconfig | 1 +
+ arch/arm/configs/u8500_defconfig | 4 +-
+ arch/arm/include/asm/smp_twd.h | 8 -
+ .../mach/debug-macro.S => include/debug/cns3xxx.S} | 0
+ .../mach/debug-macro.S => include/debug/nomadik.S} | 0
+ arch/arm/kernel/smp_twd.c | 17 +-
+ arch/arm/mach-at91/Kconfig | 398 +--
+ arch/arm/mach-at91/Kconfig.non_dt | 399 +++
+ arch/arm/mach-at91/Makefile | 4 +-
+ arch/arm/mach-at91/at91rm9200.c | 1 +
+ arch/arm/mach-at91/at91sam9261.c | 2 +
+ arch/arm/mach-at91/at91sam9261_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9263.c | 1 +
+ arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45.c | 2 +
+ arch/arm/mach-at91/at91sam9g45_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9rl.c | 1 +
+ arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
+ .../{board-rm9200-dt.c => board-dt-rm9200.c} | 0
+ arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0
+ arch/arm/mach-cns3xxx/Kconfig | 12 +
+ arch/arm/mach-cns3xxx/Makefile | 8 +-
+ arch/arm/mach-cns3xxx/cns3420vb.c | 6 +-
+ arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h | 7 +-
+ arch/arm/mach-cns3xxx/core.c | 121 +-
+ arch/arm/mach-cns3xxx/devices.c | 5 +-
+ arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 -
+ arch/arm/mach-cns3xxx/include/mach/timex.h | 12 -
+ arch/arm/mach-cns3xxx/include/mach/uncompress.h | 53 -
+ arch/arm/mach-cns3xxx/pcie.c | 2 +-
+ arch/arm/mach-cns3xxx/pm.c | 4 +-
+ arch/arm/mach-cns3xxx/{include/mach => }/pm.h | 0
+ arch/arm/mach-exynos/Kconfig | 2 +-
+ arch/arm/mach-exynos/common.c | 1 +
+ arch/arm/mach-exynos/mach-universal_c210.c | 6 +-
+ arch/arm/mach-gemini/Makefile | 2 +-
+ arch/arm/mach-gemini/board-nas4220b.c | 1 +
+ arch/arm/mach-gemini/board-rut1xx.c | 2 +
+ arch/arm/mach-gemini/board-wbd111.c | 1 +
+ arch/arm/mach-gemini/board-wbd222.c | 1 +
+ arch/arm/mach-gemini/common.h | 2 +
+ arch/arm/mach-gemini/gpio.c | 19 +-
+ arch/arm/mach-gemini/include/mach/hardware.h | 2 +-
+ arch/arm/mach-gemini/irq.c | 4 +-
+ arch/arm/mach-gemini/mm.c | 22 +-
+ .../mach-gemini/{include/mach/system.h => reset.c} | 2 +-
+ arch/arm/mach-h720x/Kconfig | 40 -
+ arch/arm/mach-h720x/Makefile | 16 -
+ arch/arm/mach-h720x/Makefile.boot | 2 -
+ arch/arm/mach-h720x/common.c | 268 --
+ arch/arm/mach-h720x/common.h | 30 -
+ arch/arm/mach-h720x/cpu-h7201.c | 57 -
+ arch/arm/mach-h720x/cpu-h7202.c | 225 --
+ arch/arm/mach-h720x/h7201-eval.c | 38 -
+ arch/arm/mach-h720x/h7202-eval.c | 81 -
+ arch/arm/mach-h720x/include/mach/boards.h | 53 -
+ arch/arm/mach-h720x/include/mach/debug-macro.S | 40 -
+ arch/arm/mach-h720x/include/mach/entry-macro.S | 57 -
+ arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 -
+ arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 --
+ arch/arm/mach-h720x/include/mach/hardware.h | 190 --
+ arch/arm/mach-h720x/include/mach/irqs.h | 116 -
+ arch/arm/mach-h720x/include/mach/isa-dma.h | 19 -
+ arch/arm/mach-h720x/include/mach/timex.h | 15 -
+ arch/arm/mach-h720x/include/mach/uncompress.h | 36 -
+ arch/arm/mach-highbank/highbank.c | 5 +-
+ arch/arm/mach-imx/mach-imx6q.c | 5 +-
+ arch/arm/mach-l7200/include/mach/debug-macro.S | 38 -
+ arch/arm/mach-mxs/mach-mxs.c | 24 +-
+ arch/arm/mach-nomadik/Kconfig | 24 +-
+ arch/arm/mach-nomadik/Makefile.boot | 4 -
+ arch/arm/mach-nomadik/cpu-8815.c | 1 -
+ arch/arm/mach-nomadik/include/mach/irqs.h | 79 -
+ arch/arm/mach-nomadik/include/mach/timex.h | 6 -
+ arch/arm/mach-nomadik/include/mach/uncompress.h | 60 -
+ arch/arm/mach-omap2/timer.c | 2 +-
+ arch/arm/mach-orion5x/pci.c | 7 +-
+ arch/arm/mach-prima2/Kconfig | 10 +-
+ arch/arm/mach-prima2/common.c | 21 +
+ arch/arm/mach-s3c24xx/Kconfig | 7 +
+ arch/arm/mach-s3c24xx/Makefile | 6 +-
+ arch/arm/mach-s3c24xx/bast-irq.c | 2 -
+ arch/arm/mach-s3c24xx/clock-s3c2410.c | 1 -
+ arch/arm/mach-s3c24xx/clock-s3c2412.c | 1 -
+ arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 -
+ arch/arm/mach-s3c24xx/clock-s3c2443.c | 1 -
+ arch/arm/mach-s3c24xx/common-smdk.c | 3 +-
+ .../include/plat => mach-s3c24xx}/common-smdk.h | 3 +-
+ arch/arm/mach-s3c24xx/common.c | 7 +-
+ arch/arm/mach-s3c24xx/common.h | 93 +-
+ arch/arm/mach-s3c24xx/dma-s3c2410.c | 1 -
+ arch/arm/mach-s3c24xx/dma-s3c2412.c | 1 -
+ arch/arm/mach-s3c24xx/dma-s3c2440.c | 1 -
+ arch/arm/mach-s3c24xx/dma-s3c2443.c | 1 -
+ arch/arm/mach-s3c24xx/include/mach/irqs.h | 58 +-
+ arch/arm/mach-s3c24xx/include/mach/regs-sdi.h | 127 -
+ arch/arm/mach-s3c24xx/irq-pm.c | 7 +-
+ arch/arm/mach-s3c24xx/irq-s3c2412.c | 215 --
+ arch/arm/mach-s3c24xx/irq-s3c2440.c | 128 -
+ arch/arm/mach-s3c24xx/irq-s3c244x.c | 142 --
+ arch/arm/mach-s3c24xx/irq.c | 272 +-
+ arch/arm/mach-s3c24xx/mach-amlm5900.c | 5 +-
+ arch/arm/mach-s3c24xx/mach-anubis.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-bast.c | 4 +-
+ arch/arm/mach-s3c24xx/mach-gta02.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-h1940.c | 5 +-
+ arch/arm/mach-s3c24xx/mach-jive.c | 8 +-
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-n30.c | 7 +-
+ arch/arm/mach-s3c24xx/mach-nexcoder.c | 8 +-
+ arch/arm/mach-s3c24xx/mach-osiris.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-otom.c | 5 +-
+ arch/arm/mach-s3c24xx/mach-qt2410.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-rx1950.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-rx3715.c | 11 +-
+ arch/arm/mach-s3c24xx/mach-smdk2410.c | 7 +-
+ arch/arm/mach-s3c24xx/mach-smdk2413.c | 19 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 +-
+ arch/arm/mach-s3c24xx/mach-smdk2440.c | 11 +-
+ arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-tct_hammer.c | 4 +-
+ arch/arm/mach-s3c24xx/mach-vr1000.c | 4 +-
+ arch/arm/mach-s3c24xx/mach-vstms.c | 9 +-
+ arch/arm/mach-s3c24xx/pm-s3c2412.c | 9 +-
+ arch/arm/mach-s3c24xx/s3c2410.c | 1 -
+ arch/arm/mach-s3c24xx/s3c2412.c | 1 -
+ arch/arm/mach-s3c24xx/s3c2416.c | 1 -
+ arch/arm/mach-s3c24xx/s3c2440.c | 1 -
+ arch/arm/mach-s3c24xx/s3c2442.c | 1 -
+ arch/arm/mach-s3c24xx/s3c2443.c | 1 -
+ arch/arm/mach-s3c24xx/s3c244x.c | 2 -
+ arch/arm/mach-s3c64xx/Kconfig | 2 +
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-smartq.c | 2 +
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 3 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 3 +-
+ arch/arm/mach-s3c64xx/mach-smdk6400.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 +-
+ arch/arm/mach-s5p64x0/Kconfig | 4 +-
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 6 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 6 +-
+ arch/arm/mach-s5pc100/Kconfig | 1 +
+ arch/arm/mach-s5pc100/common.h | 9 -
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 4 +-
+ arch/arm/mach-s5pv210/Kconfig | 2 +-
+ arch/arm/mach-s5pv210/common.h | 9 -
+ arch/arm/mach-s5pv210/mach-aquila.c | 6 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 6 +-
+ arch/arm/mach-s5pv210/mach-smdkc110.c | 6 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +-
+ arch/arm/mach-s5pv210/mach-torbreck.c | 6 +-
+ arch/arm/mach-shmobile/Kconfig | 29 +
+ arch/arm/mach-shmobile/Makefile | 9 +-
+ arch/arm/mach-shmobile/board-ag5evm.c | 172 +-
+ arch/arm/mach-shmobile/board-ap4evb.c | 91 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 265 +-
+ arch/arm/mach-shmobile/board-bonito.c | 52 +-
+ arch/arm/mach-shmobile/board-kota2.c | 208 +-
+ arch/arm/mach-shmobile/board-kzm9g-reference.c | 108 +
+ arch/arm/mach-shmobile/board-kzm9g.c | 170 +-
+ arch/arm/mach-shmobile/board-mackerel.c | 167 +-
+ arch/arm/mach-shmobile/board-marzen-reference.c | 75 +
+ arch/arm/mach-shmobile/board-marzen.c | 87 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 13 +
+ arch/arm/mach-shmobile/clock-r8a7779.c | 8 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c | 7 +-
+ .../{headsmp-sh73a0.S => headsmp-scu.S} | 15 +-
+ arch/arm/mach-shmobile/hotplug.c | 68 -
+ arch/arm/mach-shmobile/include/mach/common.h | 22 +-
+ arch/arm/mach-shmobile/include/mach/irqs.h | 5 +
+ arch/arm/mach-shmobile/include/mach/r8a7740.h | 74 -
+ arch/arm/mach-shmobile/include/mach/r8a7779.h | 324 ++-
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 29 -
+ arch/arm/mach-shmobile/include/mach/sh73a0.h | 363 +--
+ arch/arm/mach-shmobile/intc-r8a7779.c | 78 +-
+ arch/arm/mach-shmobile/intc-sh73a0.c | 125 -
+ arch/arm/mach-shmobile/setup-emev2.c | 4 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 104 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 162 +-
+ arch/arm/mach-shmobile/smp-emev2.c | 86 +-
+ arch/arm/mach-shmobile/smp-r8a7779.c | 129 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 36 +-
+ arch/arm/mach-spear/Kconfig | 103 +
+ arch/arm/mach-spear/Makefile | 26 +
+ .../{mach-spear13xx => mach-spear}/Makefile.boot | 0
+ .../include/mach => mach-spear}/generic.h | 30 +-
+ arch/arm/{mach-spear13xx => mach-spear}/headsmp.S | 0
+ arch/arm/{mach-spear13xx => mach-spear}/hotplug.c | 0
+ .../plat => mach-spear/include/mach}/debug-macro.S | 0
+ .../include/mach/irqs.h | 22 +-
+ .../include/mach/misc_regs.h | 2 +-
+ arch/arm/mach-spear/include/mach/spear.h | 95 +
+ .../plat => mach-spear/include/mach}/timex.h | 0
+ .../plat => mach-spear/include/mach}/uncompress.h | 0
+ arch/arm/{plat-spear => mach-spear}/pl080.c | 0
+ .../include/plat => mach-spear}/pl080.h | 0
+ arch/arm/{mach-spear13xx => mach-spear}/platsmp.c | 2 +-
+ arch/arm/{plat-spear => mach-spear}/restart.c | 5 +-
+ .../arm/{mach-spear13xx => mach-spear}/spear1310.c | 4 +-
+ .../arm/{mach-spear13xx => mach-spear}/spear1340.c | 5 +-
+ .../mach/dma.h => mach-spear/spear13xx-dma.h} | 0
+ .../arm/{mach-spear13xx => mach-spear}/spear13xx.c | 13 +-
+ arch/arm/{mach-spear3xx => mach-spear}/spear300.c | 4 +-
+ arch/arm/{mach-spear3xx => mach-spear}/spear310.c | 4 +-
+ arch/arm/{mach-spear3xx => mach-spear}/spear320.c | 7 +-
+ arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c | 17 +-
+ arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c | 25 +-
+ arch/arm/{plat-spear => mach-spear}/time.c | 2 +-
+ arch/arm/mach-spear13xx/Kconfig | 20 -
+ arch/arm/mach-spear13xx/Makefile | 10 -
+ arch/arm/mach-spear13xx/include/mach/debug-macro.S | 14 -
+ arch/arm/mach-spear13xx/include/mach/hardware.h | 1 -
+ arch/arm/mach-spear13xx/include/mach/irqs.h | 20 -
+ arch/arm/mach-spear13xx/include/mach/spear.h | 54 -
+ arch/arm/mach-spear13xx/include/mach/timex.h | 19 -
+ arch/arm/mach-spear13xx/include/mach/uncompress.h | 19 -
+ arch/arm/mach-spear3xx/Kconfig | 26 -
+ arch/arm/mach-spear3xx/Makefile | 15 -
+ arch/arm/mach-spear3xx/Makefile.boot | 3 -
+ arch/arm/mach-spear3xx/include/mach/debug-macro.S | 14 -
+ arch/arm/mach-spear3xx/include/mach/generic.h | 36 -
+ arch/arm/mach-spear3xx/include/mach/hardware.h | 1 -
+ arch/arm/mach-spear3xx/include/mach/irqs.h | 19 -
+ arch/arm/mach-spear3xx/include/mach/spear.h | 60 -
+ arch/arm/mach-spear3xx/include/mach/timex.h | 19 -
+ arch/arm/mach-spear3xx/include/mach/uncompress.h | 19 -
+ arch/arm/mach-spear6xx/Kconfig | 10 -
+ arch/arm/mach-spear6xx/Makefile | 6 -
+ arch/arm/mach-spear6xx/Makefile.boot | 3 -
+ arch/arm/mach-spear6xx/include/mach/debug-macro.S | 14 -
+ arch/arm/mach-spear6xx/include/mach/generic.h | 23 -
+ arch/arm/mach-spear6xx/include/mach/hardware.h | 1 -
+ arch/arm/mach-spear6xx/include/mach/misc_regs.h | 22 -
+ arch/arm/mach-spear6xx/include/mach/spear.h | 46 -
+ arch/arm/mach-spear6xx/include/mach/timex.h | 19 -
+ arch/arm/mach-spear6xx/include/mach/uncompress.h | 19 -
+ arch/arm/mach-ux500/board-mop500-regulators.c | 14 +
+ arch/arm/mach-ux500/board-mop500-regulators.h | 1 +
+ arch/arm/mach-ux500/board-mop500-sdi.c | 52 -
+ arch/arm/mach-ux500/board-mop500.c | 45 +
+ arch/arm/mach-ux500/cache-l2x0.c | 4 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 1 +
+ arch/arm/mach-ux500/timer.c | 3 +-
+ arch/arm/mach-vexpress/v2m.c | 6 +-
+ arch/arm/plat-orion/Makefile | 6 +-
+ arch/arm/plat-orion/pcie.c | 10 +-
+ arch/arm/plat-samsung/Kconfig | 2 +-
+ arch/arm/plat-samsung/Makefile | 3 +-
+ arch/arm/plat-samsung/include/plat/cpu.h | 14 +-
+ arch/arm/plat-samsung/include/plat/irq.h | 116 -
+ arch/arm/plat-samsung/include/plat/s3c2410.h | 31 -
+ arch/arm/plat-samsung/include/plat/s3c2412.h | 32 -
+ arch/arm/plat-samsung/include/plat/s3c2416.h | 37 -
+ arch/arm/plat-samsung/include/plat/s3c2443.h | 36 -
+ arch/arm/plat-samsung/include/plat/s3c244x.h | 42 -
+ arch/arm/plat-samsung/include/plat/s5p-time.h | 40 -
+ arch/arm/plat-samsung/include/plat/samsung-time.h | 53 +
+ .../plat-samsung/{s5p-time.c => samsung-time.c} | 138 +-
+ arch/arm/plat-samsung/time.c | 287 ---
+ arch/arm/plat-spear/Kconfig | 47 -
+ arch/arm/plat-spear/Makefile | 9 -
+ arch/avr32/mach-at32ap/at32ap700x.c | 6 +-
+ arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 13 +-
+ arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 13 +-
+ arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 11 +-
+ arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 14 +-
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 14 +-
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 14 +-
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 13 +-
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 13 +-
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 14 +-
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 14 +-
+ arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 17 +-
+ drivers/clk/spear/spear1310_clock.c | 64 +-
+ drivers/clk/spear/spear1340_clock.c | 63 +-
+ drivers/clk/spear/spear3xx_clock.c | 60 +-
+ drivers/clk/spear/spear6xx_clock.c | 31 +-
+ drivers/clk/ux500/u8500_clk.c | 3 +-
+ drivers/clocksource/bcm2835_timer.c | 12 +-
+ drivers/clocksource/clksrc-of.c | 5 +-
+ drivers/clocksource/tegra20_timer.c | 73 +-
+ drivers/clocksource/vt8500_timer.c | 16 +-
+ drivers/gpio/gpio-samsung.c | 9 +-
+ drivers/irqchip/Kconfig | 8 +
+ drivers/irqchip/Makefile | 2 +
+ drivers/irqchip/irq-renesas-intc-irqpin.c | 471 ++++
+ drivers/irqchip/irq-renesas-irqc.c | 307 +++
+ drivers/mmc/host/mmci.c | 9 +
+ drivers/mmc/host/s3cmci.c | 83 +-
+ drivers/mmc/host/sdhci-cns3xxx.c | 1 -
+ drivers/net/ethernet/smsc/smsc911x.c | 29 +-
+ drivers/pinctrl/pinctrl-exynos.c | 108 +
+ drivers/pinctrl/pinctrl-samsung.c | 2 +
+ drivers/pinctrl/pinctrl-samsung.h | 1 +
+ drivers/pinctrl/sh-pfc/Kconfig | 1 +
+ drivers/pinctrl/sh-pfc/core.c | 261 +-
+ drivers/pinctrl/sh-pfc/core.h | 54 +-
+ drivers/pinctrl/sh-pfc/gpio.c | 363 ++-
+ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 694 ++++-
+ drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 1648 ++++++++++--
+ drivers/pinctrl/sh-pfc/pfc-sh7203.c | 488 ++--
+ drivers/pinctrl/sh-pfc/pfc-sh7264.c | 460 ++--
+ drivers/pinctrl/sh-pfc/pfc-sh7269.c | 624 ++---
+ drivers/pinctrl/sh-pfc/pfc-sh7372.c | 323 ++-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 2664 ++++++++++++++------
+ drivers/pinctrl/sh-pfc/pfc-sh7720.c | 333 +--
+ drivers/pinctrl/sh-pfc/pfc-sh7722.c | 480 ++--
+ drivers/pinctrl/sh-pfc/pfc-sh7723.c | 642 ++---
+ drivers/pinctrl/sh-pfc/pfc-sh7724.c | 638 ++---
+ drivers/pinctrl/sh-pfc/pfc-sh7734.c | 55 +-
+ drivers/pinctrl/sh-pfc/pfc-sh7757.c | 620 ++---
+ drivers/pinctrl/sh-pfc/pfc-sh7785.c | 354 +--
+ drivers/pinctrl/sh-pfc/pfc-sh7786.c | 296 +--
+ drivers/pinctrl/sh-pfc/pfc-shx3.c | 148 +-
+ drivers/pinctrl/sh-pfc/pinctrl.c | 484 ++--
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 135 +-
+ drivers/video/atmel_lcdfb.c | 120 +-
+ drivers/video/mxsfb.c | 7 +-
+ include/linux/clocksource.h | 12 +-
+ include/linux/mxsfb.h | 7 +-
+ .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 +
+ include/linux/platform_data/irq-renesas-irqc.h | 27 +
+ include/video/atmel_lcdc.h | 4 +-
+ 372 files changed, 13630 insertions(+), 10737 deletions(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/atlas6-evb.dts
+ create mode 100644 arch/arm/boot/dts/atlas6.dtsi
+ create mode 100644 arch/arm/boot/dts/mpa1600.dts
+ create mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
+ create mode 100644 arch/arm/boot/dts/r8a7779.dtsi
+ create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+ delete mode 100644 arch/arm/configs/h7201_defconfig
+ delete mode 100644 arch/arm/configs/h7202_defconfig
+ rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%)
+ rename arch/arm/{mach-nomadik/include/mach/debug-macro.S => include/debug/nomadik.S} (100%)
+ create mode 100644 arch/arm/mach-at91/Kconfig.non_dt
+ rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
+ rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)
+ rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (99%)
+ delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h
+ rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%)
+ rename arch/arm/mach-gemini/{include/mach/system.h => reset.c} (91%)
+ delete mode 100644 arch/arm/mach-h720x/Kconfig
+ delete mode 100644 arch/arm/mach-h720x/Makefile
+ delete mode 100644 arch/arm/mach-h720x/Makefile.boot
+ delete mode 100644 arch/arm/mach-h720x/common.c
+ delete mode 100644 arch/arm/mach-h720x/common.h
+ delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c
+ delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c
+ delete mode 100644 arch/arm/mach-h720x/h7201-eval.c
+ delete mode 100644 arch/arm/mach-h720x/h7202-eval.c
+ delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h
+ delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h
+ delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h
+ delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h
+ delete mode 100644 arch/arm/mach-h720x/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-l7200/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-nomadik/Makefile.boot
+ delete mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-nomadik/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/common-smdk.h (86%)
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-sdi.h
+ delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2412.c
+ delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2440.c
+ delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c244x.c
+ create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c
+ create mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c
+ rename arch/arm/mach-shmobile/{headsmp-sh73a0.S => headsmp-scu.S} (85%)
+ delete mode 100644 arch/arm/mach-shmobile/hotplug.c
+ create mode 100644 arch/arm/mach-spear/Kconfig
+ create mode 100644 arch/arm/mach-spear/Makefile
+ rename arch/arm/{mach-spear13xx => mach-spear}/Makefile.boot (100%)
+ rename arch/arm/{mach-spear13xx/include/mach => mach-spear}/generic.h (57%)
+ rename arch/arm/{mach-spear13xx => mach-spear}/headsmp.S (100%)
+ rename arch/arm/{mach-spear13xx => mach-spear}/hotplug.c (100%)
+ rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/debug-macro.S (100%)
+ rename arch/arm/{mach-spear6xx => mach-spear}/include/mach/irqs.h (51%)
+ rename arch/arm/{mach-spear3xx => mach-spear}/include/mach/misc_regs.h (90%)
+ create mode 100644 arch/arm/mach-spear/include/mach/spear.h
+ rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/timex.h (100%)
+ rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/uncompress.h (100%)
+ rename arch/arm/{plat-spear => mach-spear}/pl080.c (100%)
+ rename arch/arm/{plat-spear/include/plat => mach-spear}/pl080.h (100%)
+ rename arch/arm/{mach-spear13xx => mach-spear}/platsmp.c (99%)
+ rename arch/arm/{plat-spear => mach-spear}/restart.c (90%)
+ rename arch/arm/{mach-spear13xx => mach-spear}/spear1310.c (95%)
+ rename arch/arm/{mach-spear13xx => mach-spear}/spear1340.c (99%)
+ rename arch/arm/{mach-spear13xx/include/mach/dma.h => mach-spear/spear13xx-dma.h} (100%)
+ rename arch/arm/{mach-spear13xx => mach-spear}/spear13xx.c (95%)
+ rename arch/arm/{mach-spear3xx => mach-spear}/spear300.c (98%)
+ rename arch/arm/{mach-spear3xx => mach-spear}/spear310.c (98%)
+ rename arch/arm/{mach-spear3xx => mach-spear}/spear320.c (97%)
+ rename arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c (88%)
+ rename arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c (93%)
+ rename arch/arm/{plat-spear => mach-spear}/time.c (99%)
+ delete mode 100644 arch/arm/mach-spear13xx/Kconfig
+ delete mode 100644 arch/arm/mach-spear13xx/Makefile
+ delete mode 100644 arch/arm/mach-spear13xx/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-spear13xx/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-spear13xx/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear.h
+ delete mode 100644 arch/arm/mach-spear13xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-spear13xx/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-spear3xx/Kconfig
+ delete mode 100644 arch/arm/mach-spear3xx/Makefile
+ delete mode 100644 arch/arm/mach-spear3xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-spear3xx/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-spear3xx/include/mach/generic.h
+ delete mode 100644 arch/arm/mach-spear3xx/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-spear3xx/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-spear3xx/include/mach/spear.h
+ delete mode 100644 arch/arm/mach-spear3xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-spear3xx/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-spear6xx/Kconfig
+ delete mode 100644 arch/arm/mach-spear6xx/Makefile
+ delete mode 100644 arch/arm/mach-spear6xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-spear6xx/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-spear6xx/include/mach/generic.h
+ delete mode 100644 arch/arm/mach-spear6xx/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-spear6xx/include/mach/misc_regs.h
+ delete mode 100644 arch/arm/mach-spear6xx/include/mach/spear.h
+ delete mode 100644 arch/arm/mach-spear6xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-spear6xx/include/mach/uncompress.h
+ delete mode 100644 arch/arm/plat-samsung/include/plat/irq.h
+ delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2410.h
+ delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2412.h
+ delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2416.h
+ delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2443.h
+ delete mode 100644 arch/arm/plat-samsung/include/plat/s3c244x.h
+ delete mode 100644 arch/arm/plat-samsung/include/plat/s5p-time.h
+ create mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h
+ rename arch/arm/plat-samsung/{s5p-time.c => samsung-time.c} (68%)
+ delete mode 100644 arch/arm/plat-samsung/time.c
+ delete mode 100644 arch/arm/plat-spear/Kconfig
+ delete mode 100644 arch/arm/plat-spear/Makefile
+ create mode 100644 drivers/irqchip/irq-renesas-intc-irqpin.c
+ create mode 100644 drivers/irqchip/irq-renesas-irqc.c
+ create mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h
+ create mode 100644 include/linux/platform_data/irq-renesas-irqc.h
+Merging bcm2835/for-next (4c4d449 Merge branch 'for-3.10/defconfig' into for-next)
+$ git merge bcm2835/for-next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Resolved 'arch/arm/Kconfig.debug' using previous resolution.
+Removing arch/arm/mach-bcm2835/include/mach/uncompress.h
+Removing arch/arm/mach-bcm2835/include/mach/timex.h
+Removing arch/arm/mach-bcm2835/include/mach/gpio.h
+Removing arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h
+Removing arch/arm/mach-bcm2835/Makefile.boot
+Auto-merging arch/arm/include/debug/bcm2835.S
+Auto-merging arch/arm/boot/dts/bcm2835.dtsi
+Auto-merging arch/arm/Kconfig.debug
+CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 02df150] Merge remote-tracking branch 'bcm2835/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 22 +----------
+ arch/arm/Kconfig.debug | 5 +++
+ arch/arm/boot/dts/bcm2835.dtsi | 17 +++++++++
+ arch/arm/configs/bcm2835_defconfig | 8 ++--
+ .../mach/debug-macro.S => include/debug/bcm2835.S} | 3 +-
+ arch/arm/mach-bcm2835/Kconfig | 15 ++++++++
+ arch/arm/mach-bcm2835/Makefile.boot | 1 -
+ arch/arm/mach-bcm2835/bcm2835.c | 6 ++-
+ arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h | 29 --------------
+ arch/arm/mach-bcm2835/include/mach/gpio.h | 1 -
+ arch/arm/mach-bcm2835/include/mach/timex.h | 26 -------------
+ arch/arm/mach-bcm2835/include/mach/uncompress.h | 44 ----------------------
+ 12 files changed, 49 insertions(+), 128 deletions(-)
+ rename arch/arm/{mach-bcm2835/include/mach/debug-macro.S => include/debug/bcm2835.S} (86%)
+ create mode 100644 arch/arm/mach-bcm2835/Kconfig
+ delete mode 100644 arch/arm/mach-bcm2835/Makefile.boot
+ delete mode 100644 arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h
+ delete mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-bcm2835/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-bcm2835/include/mach/uncompress.h
+Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n)
+$ git merge cortex/for-next
+Already up-to-date.
+Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-ep93xx/include/mach/uncompress.h | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+Merging imx-mxs/for-next (5e56049 Merge branches 'imx/fixes', 'imx/cleanup', 'imx/soc' and 'imx/dt' into for-next)
+$ git merge imx-mxs/for-next
+Recorded preimage for 'arch/arm/mach-imx/mach-imx6q.c'
+Removing include/linux/mxsfb.h
+Auto-merging drivers/pinctrl/pinctrl-imx.c
+Auto-merging drivers/net/ethernet/freescale/fec.h
+Auto-merging drivers/net/ethernet/freescale/fec.c
+Auto-merging arch/arm/mach-imx/mach-imx6q.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
+Auto-merging arch/arm/boot/dts/imx6qdl.dtsip
+Removing arch/arm/boot/dts/imx6q.dtsi
+Auto-merging arch/arm/boot/dts/imx6q-sabresd.dtsp
+Auto-merging arch/arm/boot/dts/imx6q-sabrelite.dtsp
+Auto-merging arch/arm/boot/dts/imx6q-sabreauto.dtsp
+Auto-merging arch/arm/boot/dts/imx6q-arm2.dtsp
+Auto-merging arch/arm/boot/dts/imx53.dtsip
+Auto-merging arch/arm/boot/dts/imx53-tqma53.dtsip
+Auto-merging arch/arm/boot/dts/imx53-smd.dtsp
+Auto-merging arch/arm/boot/dts/imx53-qsb.dtsp
+Removing arch/arm/boot/dts/imx53-mba53.dts
+Auto-merging arch/arm/boot/dts/imx53-evk.dtsp
+Auto-merging arch/arm/boot/dts/imx53-ard.dtsp
+Auto-merging arch/arm/boot/dts/imx51.dtsip
+Auto-merging arch/arm/boot/dts/imx51-babbage.dtsp
+Auto-merging arch/arm/boot/dts/imx51-apf51.dtsp
+Auto-merging arch/arm/boot/dts/imx31.dtsip
+Auto-merging arch/arm/boot/dts/imx31-bug.dtsp
+Auto-merging arch/arm/boot/dts/imx27.dtsip
+Auto-merging arch/arm/boot/dts/imx27-phytec-phycore.dtsp
+Auto-merging arch/arm/boot/dts/imx27-pdk.dtsp
+Auto-merging arch/arm/boot/dts/imx27-apf27.dtsp
+Auto-merging arch/arm/boot/dts/imx25.dtsip
+Auto-merging arch/arm/boot/dts/imx25-pdk.dtsp
+Auto-merging arch/arm/boot/dts/imx25-karo-tx25.dtsp
+Auto-merging arch/arm/boot/dts/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/mach-imx/mach-imx6q.c'.
+[master 3e40dcc] Merge remote-tracking branch 'imx-mxs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/clock/imx27-clock.txt | 117 +
+ Documentation/devicetree/bindings/fb/mxsfb.txt | 34 +
+ .../bindings/pinctrl/fsl,imx-pinctrl.txt | 6 +-
+ .../bindings/pinctrl/fsl,imx35-pinctrl.txt | 955 +--------
+ .../bindings/pinctrl/fsl,imx51-pinctrl.txt | 759 +------
+ .../bindings/pinctrl/fsl,imx53-pinctrl.txt | 1174 +---------
+ .../bindings/pinctrl/fsl,imx6q-pinctrl.txt | 1596 +-------------
+ .../devicetree/bindings/timer/fsl,imxgpt.txt | 18 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/imx23-evk.dts | 25 +
+ .../{imx25-karo-tx25.dts => imx25-karo-tx25.dtsp} | 2 +-
+ .../arm/boot/dts/{imx25-pdk.dts => imx25-pdk.dtsp} | 2 +-
+ arch/arm/boot/dts/{imx25.dtsi => imx25.dtsip} | 2 +-
+ .../boot/dts/{imx27-apf27.dts => imx27-apf27.dtsp} | 2 +-
+ .../arm/boot/dts/{imx27-pdk.dts => imx27-pdk.dtsp} | 2 +-
+ ...hytec-phycore.dts => imx27-phytec-phycore.dtsp} | 2 +-
+ arch/arm/boot/dts/{imx27.dtsi => imx27.dtsip} | 82 +-
+ arch/arm/boot/dts/imx28-apf28dev.dts | 25 +
+ arch/arm/boot/dts/imx28-apx4devkit.dts | 25 +
+ arch/arm/boot/dts/imx28-cfa10049.dts | 25 +
+ arch/arm/boot/dts/imx28-evk.dts | 25 +
+ arch/arm/boot/dts/imx28-m28evk.dts | 27 +
+ arch/arm/boot/dts/imx28.dtsi | 4 +-
+ .../arm/boot/dts/{imx31-bug.dts => imx31-bug.dtsp} | 2 +-
+ arch/arm/boot/dts/{imx31.dtsi => imx31.dtsip} | 18 +-
+ arch/arm/boot/dts/imx35-pinfunc.h | 970 +++++++++
+ .../boot/dts/{imx51-apf51.dts => imx51-apf51.dtsp} | 2 +-
+ arch/arm/boot/dts/imx51-apf51dev.dtsp | 97 +
+ .../dts/{imx51-babbage.dts => imx51-babbage.dtsp} | 16 +-
+ arch/arm/boot/dts/imx51-pinfunc.h | 773 +++++++
+ arch/arm/boot/dts/{imx51.dtsi => imx51.dtsip} | 272 +--
+ .../arm/boot/dts/{imx53-ard.dts => imx53-ard.dtsp} | 70 +-
+ .../arm/boot/dts/{imx53-evk.dts => imx53-evk.dtsp} | 18 +-
+ arch/arm/boot/dts/imx53-mba53.dts | 129 --
+ arch/arm/boot/dts/imx53-mba53.dtsp | 135 ++
+ arch/arm/boot/dts/imx53-pinfunc.h | 1189 ++++++++++
+ .../arm/boot/dts/{imx53-qsb.dts => imx53-qsb.dtsp} | 22 +-
+ .../arm/boot/dts/{imx53-smd.dts => imx53-smd.dtsp} | 16 +-
+ .../dts/{imx53-tqma53.dtsi => imx53-tqma53.dtsip} | 32 +-
+ arch/arm/boot/dts/{imx53.dtsi => imx53.dtsip} | 215 +-
+ arch/arm/boot/dts/{imx6dl.dtsi => imx6dl.dtsip} | 0
+ .../boot/dts/{imx6q-arm2.dts => imx6q-arm2.dtsp} | 8 +-
+ arch/arm/boot/dts/imx6q-pinfunc.h | 1529 +++++++++++++
+ .../{imx6q-sabreauto.dts => imx6q-sabreauto.dtsp} | 6 +-
+ .../{imx6q-sabrelite.dts => imx6q-sabrelite.dtsp} | 18 +-
+ .../dts/{imx6q-sabresd.dts => imx6q-sabresd.dtsp} | 39 +-
+ arch/arm/boot/dts/imx6q.dtsi | 296 ---
+ arch/arm/boot/dts/imx6q.dtsip | 340 +++
+ arch/arm/boot/dts/{imx6qdl.dtsi => imx6qdl.dtsip} | 9 +-
+ arch/arm/configs/mxs_defconfig | 5 +-
+ arch/arm/mach-imx/Kconfig | 4 +
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/anatop.c | 93 +
+ arch/arm/mach-imx/clk-imx27.c | 9 +
+ arch/arm/mach-imx/clk-imx6q.c | 73 +-
+ arch/arm/mach-imx/common.h | 12 +-
+ arch/arm/mach-imx/gpc.c | 23 +-
+ arch/arm/mach-imx/imx27-dt.c | 18 +-
+ arch/arm/mach-imx/mach-imx6q.c | 48 +-
+ arch/arm/mach-imx/pm-imx6q.c | 4 +-
+ arch/arm/mach-mxs/Kconfig | 2 +
+ arch/arm/mach-mxs/mach-mxs.c | 170 --
+ drivers/net/ethernet/freescale/fec.c | 18 +-
+ drivers/net/ethernet/freescale/fec.h | 1 +
+ drivers/pinctrl/pinctrl-imx.c | 120 +-
+ drivers/pinctrl/pinctrl-imx.h | 13 +-
+ drivers/pinctrl/pinctrl-imx35.c | 1524 +++----------
+ drivers/pinctrl/pinctrl-imx51.c | 1252 +++--------
+ drivers/pinctrl/pinctrl-imx53.c | 1579 ++------------
+ drivers/pinctrl/pinctrl-imx6q.c | 2263 +++-----------------
+ drivers/video/Kconfig | 2 +
+ drivers/video/mxsfb.c | 221 +-
+ include/linux/mxsfb.h | 52 -
+ 73 files changed, 7277 insertions(+), 11361 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/imx27-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/fsl,imxgpt.txt
+ rename arch/arm/boot/dts/{imx25-karo-tx25.dts => imx25-karo-tx25.dtsp} (96%)
+ rename arch/arm/boot/dts/{imx25-pdk.dts => imx25-pdk.dtsp} (96%)
+ rename arch/arm/boot/dts/{imx25.dtsi => imx25.dtsip} (99%)
+ rename arch/arm/boot/dts/{imx27-apf27.dts => imx27-apf27.dtsp} (98%)
+ rename arch/arm/boot/dts/{imx27-pdk.dts => imx27-pdk.dtsp} (96%)
+ rename arch/arm/boot/dts/{imx27-phytec-phycore.dts => imx27-phytec-phycore.dtsp} (98%)
+ rename arch/arm/boot/dts/{imx27.dtsi => imx27.dtsip} (70%)
+ rename arch/arm/boot/dts/{imx31-bug.dts => imx31-bug.dtsp} (96%)
+ rename arch/arm/boot/dts/{imx31.dtsi => imx31.dtsip} (86%)
+ create mode 100644 arch/arm/boot/dts/imx35-pinfunc.h
+ rename arch/arm/boot/dts/{imx51-apf51.dts => imx51-apf51.dtsp} (97%)
+ create mode 100644 arch/arm/boot/dts/imx51-apf51dev.dtsp
+ rename arch/arm/boot/dts/{imx51-babbage.dts => imx51-babbage.dtsp} (94%)
+ create mode 100644 arch/arm/boot/dts/imx51-pinfunc.h
+ rename arch/arm/boot/dts/{imx51.dtsi => imx51.dtsip} (61%)
+ rename arch/arm/boot/dts/{imx53-ard.dts => imx53-ard.dtsp} (55%)
+ rename arch/arm/boot/dts/{imx53-evk.dts => imx53-evk.dtsp} (82%)
+ delete mode 100644 arch/arm/boot/dts/imx53-mba53.dts
+ create mode 100644 arch/arm/boot/dts/imx53-mba53.dtsp
+ create mode 100644 arch/arm/boot/dts/imx53-pinfunc.h
+ rename arch/arm/boot/dts/{imx53-qsb.dts => imx53-qsb.dtsp} (89%)
+ rename arch/arm/boot/dts/{imx53-smd.dts => imx53-smd.dtsp} (88%)
+ rename arch/arm/boot/dts/{imx53-tqma53.dtsi => imx53-tqma53.dtsip} (75%)
+ rename arch/arm/boot/dts/{imx53.dtsi => imx53.dtsip} (69%)
+ rename arch/arm/boot/dts/{imx6dl.dtsi => imx6dl.dtsip} (100%)
+ rename arch/arm/boot/dts/{imx6q-arm2.dts => imx6q-arm2.dtsp} (90%)
+ create mode 100644 arch/arm/boot/dts/imx6q-pinfunc.h
+ rename arch/arm/boot/dts/{imx6q-sabreauto.dts => imx6q-sabreauto.dtsp} (88%)
+ rename arch/arm/boot/dts/{imx6q-sabrelite.dts => imx6q-sabrelite.dtsp} (87%)
+ rename arch/arm/boot/dts/{imx6q-sabresd.dts => imx6q-sabresd.dtsp} (65%)
+ delete mode 100644 arch/arm/boot/dts/imx6q.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6q.dtsip
+ rename arch/arm/boot/dts/{imx6qdl.dtsi => imx6qdl.dtsip} (99%)
+ create mode 100644 arch/arm/mach-imx/anatop.c
+ delete mode 100644 include/linux/mxsfb.h
+Merging ixp4xx/next (19f949f Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging msm/for-next (5bc31f8 Merge branch 'msm-defconfig' into for-next)
+$ git merge msm/for-next
+Removing arch/arm/mach-msm/include/mach/cpu.h
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/msm_defconfig | 154 +++++++++++++++++-------
+ arch/arm/mach-msm/board-halibut.c | 1 +
+ arch/arm/mach-msm/board-msm7x30.c | 1 +
+ arch/arm/mach-msm/board-qsd8x50.c | 1 +
+ arch/arm/mach-msm/board-trout.c | 1 +
+ arch/arm/mach-msm/devices-msm7x00.c | 31 +++++
+ arch/arm/mach-msm/devices-msm7x30.c | 31 +++++
+ arch/arm/mach-msm/devices-qsd8x50.c | 31 +++++
+ arch/arm/mach-msm/devices.h | 4 +
+ arch/arm/mach-msm/dma.c | 26 +++++
+ arch/arm/mach-msm/include/mach/cpu.h | 54 ---------
+ arch/arm/mach-msm/include/mach/dma.h | 26 -----
+ drivers/gpio/gpio-msm-v1.c | 220 ++++++++++++++++++++++++-----------
+ drivers/mmc/host/msm_sdcc.c | 1 -
+ 14 files changed, 385 insertions(+), 197 deletions(-)
+ delete mode 100644 arch/arm/mach-msm/include/mach/cpu.h
+Merging renesas/next (442d651 Merge branch 'heads/boards' into next)
+$ git merge renesas/next
+Removing arch/arm/boot/dts/sh73a0-reference.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 49 +++----
+ arch/arm/boot/dts/sh73a0-reference.dtsi | 24 ----
+ arch/arm/boot/dts/sh73a0.dtsi | 44 ++++++
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 45 ++++--
+ arch/arm/mach-shmobile/board-kzm9g-reference.c | 27 ++--
+ arch/arm/mach-shmobile/board-kzm9g.c | 78 +++++++---
+ arch/arm/mach-shmobile/board-mackerel.c | 113 ++++++++-------
+ arch/arm/mach-shmobile/clock-sh73a0.c | 23 ++-
+ drivers/clocksource/em_sti.c | 13 +-
+ drivers/clocksource/sh_cmt.c | 189 +++++++++++++++----------
+ drivers/clocksource/sh_mtu2.c | 2 +-
+ drivers/clocksource/sh_tmu.c | 2 +-
+ 12 files changed, 379 insertions(+), 230 deletions(-)
+ delete mode 100644 arch/arm/boot/dts/sh73a0-reference.dtsi
+Merging samsung/for-next (9daee5a Merge branch 'next/clk-exynos' into for-next)
+$ git merge samsung/for-next
+Auto-merging drivers/usb/host/ohci-exynos.c
+Auto-merging drivers/clocksource/exynos_mct.c
+Removing arch/arm/mach-s3c24xx/include/mach/entry-macro.S
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Removing arch/arm/mach-exynos/include/mach/regs-mct.h
+Removing arch/arm/mach-exynos/clock-exynos5.c
+Removing arch/arm/mach-exynos/clock-exynos4212.c
+Removing arch/arm/mach-exynos/clock-exynos4210.c
+Removing arch/arm/mach-exynos/clock-exynos4.h
+Removing arch/arm/mach-exynos/clock-exynos4.c
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/arm/firmware.txt | 88 ++
+ .../devicetree/bindings/arm/samsung-boards.txt | 10 +
+ .../devicetree/bindings/clock/exynos4-clock.txt | 215 +++
+ .../devicetree/bindings/clock/exynos5250-clock.txt | 171 ++
+ .../devicetree/bindings/clock/exynos5440-clock.txt | 61 +
+ .../devicetree/bindings/media/s5p-mfc.txt | 21 +
+ .../bindings/timer/samsung,exynos4210-mct.txt | 68 +
+ .../devicetree/bindings/usb/exynos-usb.txt | 40 +
+ arch/arm/Kconfig | 4 +-
+ arch/arm/boot/dts/Makefile | 3 +
+ arch/arm/boot/dts/cros5250-common.dtsi | 138 ++
+ arch/arm/boot/dts/exynos4.dtsi | 58 +
+ arch/arm/boot/dts/exynos4210-origen.dts | 18 +
+ arch/arm/boot/dts/exynos4210-smdkv310.dts | 18 +
+ arch/arm/boot/dts/exynos4210-trats.dts | 12 +
+ arch/arm/boot/dts/exynos4210.dtsi | 36 +
+ arch/arm/boot/dts/exynos4212.dtsi | 22 +
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 109 ++
+ arch/arm/boot/dts/exynos4412-origen.dts | 430 +++++
+ arch/arm/boot/dts/exynos4412-smdk4412.dts | 25 +
+ arch/arm/boot/dts/exynos4412.dtsi | 26 +
+ arch/arm/boot/dts/exynos4x12.dtsi | 6 +
+ arch/arm/boot/dts/exynos5250-arndale.dts | 129 ++
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 20 +
+ arch/arm/boot/dts/exynos5250-snow.dts | 11 +
+ arch/arm/boot/dts/exynos5250.dtsi | 148 ++
+ arch/arm/boot/dts/exynos5440-ssdk5440.dts | 19 +-
+ arch/arm/boot/dts/exynos5440.dtsi | 66 +-
+ arch/arm/common/Makefile | 2 +
+ arch/arm/common/firmware.c | 18 +
+ arch/arm/include/asm/firmware.h | 66 +
+ arch/arm/mach-exynos/Kconfig | 10 +-
+ arch/arm/mach-exynos/Makefile | 12 +-
+ arch/arm/mach-exynos/clock-exynos4.c | 1601 -------------------
+ arch/arm/mach-exynos/clock-exynos4.h | 35 -
+ arch/arm/mach-exynos/clock-exynos4210.c | 187 ---
+ arch/arm/mach-exynos/clock-exynos4212.c | 201 ---
+ arch/arm/mach-exynos/clock-exynos5.c | 1645 --------------------
+ arch/arm/mach-exynos/common.c | 120 +-
+ arch/arm/mach-exynos/common.h | 12 +-
+ arch/arm/mach-exynos/cpuidle.c | 58 +-
+ arch/arm/mach-exynos/dev-ohci.c | 2 +-
+ arch/arm/mach-exynos/exynos-smc.S | 22 +
+ arch/arm/mach-exynos/firmware.c | 70 +
+ arch/arm/mach-exynos/include/mach/irqs.h | 19 +-
+ arch/arm/mach-exynos/include/mach/map.h | 4 +-
+ arch/arm/mach-exynos/include/mach/regs-clock.h | 107 --
+ arch/arm/mach-exynos/include/mach/regs-mct.h | 53 -
+ arch/arm/mach-exynos/mach-armlex4210.c | 3 +-
+ arch/arm/mach-exynos/mach-exynos4-dt.c | 123 +-
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 141 +-
+ arch/arm/mach-exynos/mach-nuri.c | 5 +-
+ arch/arm/mach-exynos/mach-origen.c | 7 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 5 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 9 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 3 +-
+ arch/arm/mach-exynos/platsmp.c | 32 +-
+ arch/arm/mach-exynos/smc.h | 31 +
+ arch/arm/mach-s3c24xx/common.h | 1 +
+ arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 70 -
+ arch/arm/mach-s3c24xx/irq.c | 167 +-
+ arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-bast.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-h1940.c | 7 +-
+ arch/arm/mach-s3c24xx/mach-n30.c | 4 +-
+ arch/arm/mach-s3c24xx/mach-otom.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-vr1000.c | 2 +-
+ arch/arm/plat-samsung/Kconfig | 4 +-
+ arch/arm/plat-samsung/devs.c | 2 +-
+ arch/arm/plat-samsung/include/plat/cpu.h | 1 -
+ arch/arm/plat-samsung/include/plat/map-s5p.h | 1 +
+ arch/arm/plat-samsung/setup-mipiphy.c | 3 +
+ drivers/clk/Makefile | 1 +
+ drivers/clk/samsung/Makefile | 8 +
+ drivers/clk/samsung/clk-exynos4.c | 843 ++++++++++
+ drivers/clk/samsung/clk-exynos5250.c | 514 ++++++
+ drivers/clk/samsung/clk-exynos5440.c | 139 ++
+ drivers/clk/samsung/clk-pll.c | 499 ++++++
+ drivers/clk/samsung/clk-pll.h | 41 +
+ drivers/clk/samsung/clk.c | 273 ++++
+ drivers/clk/samsung/clk.h | 262 ++++
+ drivers/clocksource/Kconfig | 5 +
+ drivers/clocksource/Makefile | 1 +
+ .../mct.c => drivers/clocksource/exynos_mct.c | 209 ++-
+ drivers/irqchip/exynos-combiner.c | 80 +-
+ drivers/usb/host/ohci-exynos.c | 3 +-
+ .../{usb-exynos.h => usb-ohci-exynos.h} | 0
+ 90 files changed, 5261 insertions(+), 4466 deletions(-)
+ create mode 100644 Documentation/arm/firmware.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos4-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos5250-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos5440-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt
+ create mode 100644 arch/arm/boot/dts/exynos4412-odroidx.dts
+ create mode 100644 arch/arm/boot/dts/exynos4412-origen.dts
+ create mode 100644 arch/arm/boot/dts/exynos5250-arndale.dts
+ create mode 100644 arch/arm/common/firmware.c
+ create mode 100644 arch/arm/include/asm/firmware.h
+ delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c
+ delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h
+ delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c
+ delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c
+ delete mode 100644 arch/arm/mach-exynos/clock-exynos5.c
+ create mode 100644 arch/arm/mach-exynos/exynos-smc.S
+ create mode 100644 arch/arm/mach-exynos/firmware.c
+ delete mode 100644 arch/arm/mach-exynos/include/mach/regs-mct.h
+ create mode 100644 arch/arm/mach-exynos/smc.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/entry-macro.S
+ create mode 100644 drivers/clk/samsung/Makefile
+ create mode 100644 drivers/clk/samsung/clk-exynos4.c
+ create mode 100644 drivers/clk/samsung/clk-exynos5250.c
+ create mode 100644 drivers/clk/samsung/clk-exynos5440.c
+ create mode 100644 drivers/clk/samsung/clk-pll.c
+ create mode 100644 drivers/clk/samsung/clk-pll.h
+ create mode 100644 drivers/clk/samsung/clk.c
+ create mode 100644 drivers/clk/samsung/clk.h
+ rename arch/arm/mach-exynos/mct.c => drivers/clocksource/exynos_mct.c (65%)
+ rename include/linux/platform_data/{usb-exynos.h => usb-ohci-exynos.h} (100%)
+Merging tegra/for-next (250266f Merge branch 'for-3.10/dt' into for-next)
+$ git merge tegra/for-next
+Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution.
+Auto-merging drivers/clocksource/tegra20_timer.c
+CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c
+Auto-merging drivers/clk/tegra/clk-tegra20.c
+Auto-merging arch/arm/mach-tegra/tegra.c
+Auto-merging arch/arm/mach-tegra/board-harmony-pcie.c
+Removing arch/arm/mach-tegra/board-dt-tegra30.c
+Removing arch/arm/mach-tegra/board-dt-tegra114.c
+Auto-merging arch/arm/boot/dts/tegra30.dtsi
+Auto-merging arch/arm/boot/dts/tegra20.dtsi
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 910f531] Merge remote-tracking branch 'tegra/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 60 ++
+ arch/arm/Kconfig | 1 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 714 +++++++++++++++++++++
+ arch/arm/boot/dts/tegra114.dtsi | 242 ++++++-
+ arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 +
+ arch/arm/boot/dts/tegra20.dtsi | 55 +-
+ arch/arm/boot/dts/tegra30.dtsi | 5 +-
+ arch/arm/mach-tegra/Makefile | 5 +-
+ arch/arm/mach-tegra/board-dt-tegra114.c | 46 --
+ arch/arm/mach-tegra/board-dt-tegra30.c | 60 --
+ arch/arm/mach-tegra/board-harmony-pcie.c | 7 +-
+ arch/arm/mach-tegra/board.h | 4 +-
+ arch/arm/mach-tegra/common.c | 26 +-
+ arch/arm/mach-tegra/cpuidle-tegra30.c | 4 -
+ arch/arm/mach-tegra/fuse.c | 4 +
+ arch/arm/mach-tegra/fuse.h | 7 +
+ arch/arm/mach-tegra/headsmp.S | 3 -
+ arch/arm/mach-tegra/hotplug.c | 23 +-
+ arch/arm/mach-tegra/platsmp.c | 119 ++--
+ arch/arm/mach-tegra/pm.c | 19 -
+ arch/arm/mach-tegra/pmc.c | 152 ++++-
+ arch/arm/mach-tegra/pmc.h | 4 +
+ arch/arm/mach-tegra/reset-handler.S | 48 +-
+ arch/arm/mach-tegra/sleep.h | 10 +-
+ .../arm/mach-tegra/{board-dt-tegra20.c => tegra.c} | 45 +-
+ arch/arm/mach-tegra/tegra114_speedo.c | 104 +++
+ drivers/clk/tegra/clk-tegra20.c | 36 +-
+ drivers/clocksource/tegra20_timer.c | 4 +-
+ 28 files changed, 1450 insertions(+), 361 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt
+ delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c
+ delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c
+ rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (75%)
+ create mode 100644 arch/arm/mach-tegra/tegra114_speedo.c
+Merging dma-mapping/dma-mapping-next (a937536 Linux 3.9-rc3)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (a32e1d1 pwm_backlight: remove unnecessary ifdefs)
+$ git merge pwm/for-next
+Auto-merging drivers/video/backlight/pwm_bl.c
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/pwm_bl.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+Merging dma-buf/for-next (6dbe51c Linux 3.9-rc1)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (92f28d9 scm: Require CAP_SYS_ADMIN over the current pidns to spoof pids.)
+$ git merge userns/for-next
+Merge made by the 'recursive' strategy.
+ net/core/scm.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (99e621f syscalls.h: slightly reduce the jungles of macros)
+$ git merge signal/for-next
+Resolved 'arch/mips/kernel/linux32.c' using previous resolution.
+Resolved 'arch/tile/Kconfig' using previous resolution.
+Resolved 'arch/tile/kernel/compat.c' using previous resolution.
+Resolved 'include/asm-generic/unistd.h' using previous resolution.
+Auto-merging kernel/fork.c
+Auto-merging include/linux/compat.h
+Auto-merging include/asm-generic/unistd.h
+CONFLICT (content): Merge conflict in include/asm-generic/unistd.h
+Auto-merging fs/compat.c
+Removing arch/x86/ia32/ipc32.c
+Auto-merging arch/tile/kernel/compat.c
+CONFLICT (content): Merge conflict in arch/tile/kernel/compat.c
+Auto-merging arch/tile/Kconfig
+CONFLICT (content): Merge conflict in arch/tile/Kconfig
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/s390/Kconfig
+Removing arch/powerpc/include/uapi/asm/linkage.h
+Auto-merging arch/powerpc/include/asm/unistd.h
+Auto-merging arch/powerpc/include/asm/systbl.h
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/kernel/linux32.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/alpha/Kconfig
+Auto-merging arch/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 93369a4] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 3 -
+ arch/alpha/Kconfig | 1 -
+ arch/alpha/include/asm/linkage.h | 4 +-
+ arch/alpha/include/asm/unistd.h | 12 ---
+ arch/arm/include/asm/unistd.h | 8 --
+ arch/arm64/kernel/sys32.S | 7 --
+ arch/avr32/include/asm/unistd.h | 8 --
+ arch/blackfin/include/asm/unistd.h | 8 --
+ arch/cris/include/asm/unistd.h | 8 --
+ arch/frv/include/asm/unistd.h | 10 --
+ arch/h8300/include/asm/linkage.h | 2 -
+ arch/h8300/include/asm/unistd.h | 7 --
+ arch/ia64/include/asm/linkage.h | 4 +
+ arch/ia64/include/asm/unistd.h | 10 --
+ arch/m32r/include/asm/unistd.h | 10 --
+ arch/m68k/include/asm/unistd.h | 8 --
+ arch/microblaze/include/asm/unistd.h | 8 --
+ arch/mips/Kconfig | 1 -
+ arch/mips/include/asm/linkage.h | 3 +
+ arch/mips/include/asm/unistd.h | 8 --
+ arch/mips/kernel/linux32.c | 119 ----------------------
+ arch/mips/kernel/scall64-n32.S | 8 +-
+ arch/mips/kernel/scall64-o32.S | 6 +-
+ arch/mn10300/include/asm/unistd.h | 10 --
+ arch/parisc/include/asm/unistd.h | 8 --
+ arch/parisc/kernel/sys_parisc32.c | 41 --------
+ arch/parisc/kernel/syscall_table.S | 8 +-
+ arch/powerpc/Kconfig | 1 -
+ arch/powerpc/include/asm/linkage.h | 13 +++
+ arch/powerpc/include/asm/systbl.h | 10 +-
+ arch/powerpc/include/asm/unistd.h | 6 --
+ arch/powerpc/include/uapi/asm/linkage.h | 6 --
+ arch/powerpc/kernel/sys_ppc32.c | 109 --------------------
+ arch/s390/Kconfig | 1 -
+ arch/s390/include/asm/unistd.h | 8 --
+ arch/s390/kernel/compat_linux.c | 86 +---------------
+ arch/s390/kernel/compat_linux.h | 5 -
+ arch/s390/kernel/compat_wrapper.S | 64 ------------
+ arch/s390/kernel/sys_s390.c | 14 +--
+ arch/s390/kernel/syscalls.S | 18 ++--
+ arch/sh/include/asm/unistd.h | 8 --
+ arch/sparc/Kconfig | 1 -
+ arch/sparc/include/asm/unistd.h | 8 --
+ arch/sparc/kernel/sys32.S | 4 -
+ arch/sparc/kernel/sys_sparc32.c | 75 +-------------
+ arch/sparc/kernel/sys_sparc_64.c | 6 +-
+ arch/sparc/kernel/systbls_64.S | 8 +-
+ arch/tile/Kconfig | 1 -
+ arch/tile/kernel/compat.c | 6 --
+ arch/x86/ia32/Makefile | 3 -
+ arch/x86/ia32/ipc32.c | 54 ----------
+ arch/x86/ia32/sys_ia32.c | 37 -------
+ arch/x86/include/asm/sys_ia32.h | 12 ---
+ arch/x86/include/asm/syscalls.h | 4 +-
+ arch/x86/include/asm/unistd.h | 8 --
+ arch/x86/kernel/tls.c | 14 +--
+ arch/x86/syscalls/syscall_32.tbl | 10 +-
+ arch/x86/um/tls_32.c | 5 +-
+ arch/xtensa/include/asm/unistd.h | 8 --
+ fs/aio.c | 2 -
+ fs/compat.c | 121 ----------------------
+ fs/dcookies.c | 15 ++-
+ fs/eventpoll.c | 47 +++++++++
+ fs/notify/fanotify/fanotify_user.c | 17 +---
+ fs/open.c | 52 ++--------
+ fs/read_write.c | 68 +++++++++----
+ fs/read_write.h | 2 -
+ fs/signalfd.c | 31 ++++++
+ fs/splice.c | 22 ++++
+ fs/sync.c | 26 +----
+ include/asm-generic/unistd.h | 12 ---
+ include/linux/compat.h | 51 +++-------
+ include/linux/linkage.h | 21 ++++
+ include/linux/mm.h | 3 -
+ include/linux/syscalls.h | 156 +++++++++-------------------
+ ipc/compat.c | 174 ++++++++++++++++++--------------
+ ipc/sem.c | 123 +++++++++++++---------
+ ipc/syscall.c | 6 +-
+ kernel/compat.c | 19 ----
+ kernel/exit.c | 5 -
+ kernel/fork.c | 5 +-
+ kernel/sys.c | 14 +++
+ kernel/sys_ni.c | 3 +-
+ kernel/uid16.c | 55 ++--------
+ mm/fadvise.c | 18 +---
+ mm/nommu.c | 3 +-
+ mm/readahead.c | 9 +-
+ 87 files changed, 539 insertions(+), 1484 deletions(-)
+ create mode 100644 arch/powerpc/include/asm/linkage.h
+ delete mode 100644 arch/powerpc/include/uapi/asm/linkage.h
+ delete mode 100644 arch/x86/ia32/ipc32.c
+$ git am -3 ../patches/0001-cond_syscall-and-SYSCALL_ALIAS-merge-fixup.patch
+Applying: cond_syscall and SYSCALL_ALIAS merge fixup
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/linux/linkage.h
+$ git add -A .
+$ git commit -v -a --amend
+[master f72c621] Merge remote-tracking branch 'signal/for-next'
+Merging clk/clk-next (0498172 clk:SPEAr1340: Correct parent clock configuration)
+$ git merge clk/clk-next
+Auto-merging drivers/clk/spear/spear1340_clock.c
+Auto-merging drivers/clk/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/clk.txt | 4 +-
+ .../devicetree/bindings/clock/axi-clkgen.txt | 22 ++
+ drivers/clk/Kconfig | 8 +
+ drivers/clk/Makefile | 1 +
+ drivers/clk/clk-axi-clkgen.c | 331 +++++++++++++++++++++
+ drivers/clk/clk.c | 52 ++++
+ drivers/clk/mxs/clk.c | 1 +
+ drivers/clk/spear/spear1340_clock.c | 18 +-
+ drivers/clk/ux500/clk-prcmu.c | 134 +++++----
+ include/linux/clk-provider.h | 11 +
+ 10 files changed, 517 insertions(+), 65 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/axi-clkgen.txt
+ create mode 100644 drivers/clk/clk-axi-clkgen.c
+Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
+$ git merge random/dev
+Already up-to-date.
+Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
+$ git merge lzo-update/lzo-update
+Merge made by the 'recursive' strategy.
+ lib/lzo/lzo1x_decompress_safe.c | 4 ++++
+ lib/lzo/lzodefs.h | 6 ++++++
+ 2 files changed, 10 insertions(+)
+Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
+Merging akpm-current/current (112ccff Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging)
+$ git merge akpm-current/current
+Already up-to-date.
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: irq_work.h: fix warning when CONFIG_IRQ_WORK=n
+Applying: printk: Provide a wake_up_klogd() off-case
+Applying: printk-provide-a-wake_up_klogd-off-case-fix
+Applying: mm/hugetlb: fix total hugetlbfs pages count when using memory overcommit accouting
+Applying: mm-hugetlb-fix-total-hugetlbfs-pages-count-when-memory-overcommit-accouting-fix
+Applying: poweroff: change orderly_poweroff() to use schedule_work()
+Applying: mm: zone_end_pfn is too small
+Applying: drivers/rtc/rtc-da9052.c: fix for rtc device registration
+Applying: dma-debug: fix locking bug in check_unmap()
+Applying: dma-debug-fix-locking-bug-in-check_unmap-fix
+Applying: dma-debug: update DMA debug API to better handle multiple mappings of a buffer
+Applying: mqueue: sys_mq_open: do not call mnt_drop_write() if read-only
+Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg
+Applying: mips: define KVM_USER_MEM_SLOTS
+Applying: thinkpad-acpi: kill hotkey_thread_mutex
+Applying: kthread: introduce to_live_kthread()
+Applying: kthread: kill task_get_live_kthread()
+Applying: arch/x86/mm/init_64.c: fix build warning when CONFIG_MEMORY_HOTREMOVE=n
+Applying: sound: convert snd_info_register() to use proc_create_data()
+Applying: x86: make 'mem=' option to work for efi platform
+Applying: mm: remove free_area_cache use in powerpc architecture
+Applying: mm: use vm_unmapped_area() on powerpc architecture
+Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
+Applying: matroxfb: convert struct i2c_msg initialization to C99 format
+Applying: drivers/video/console/fbcon_cw.c: fix compiler warning in cw_update_attr
+Applying: drivers/video: add Hyper-V Synthetic Video Frame Buffer Driver
+Applying: drivers/video/exynos/exynos_mipi_dsi.c: convert to devm_ioremap_resource()
+Applying: cyber2000fb: avoid palette corruption at higher clocks
+Applying: timer_list: split timer_list_show_tickdevices()
+Applying: timer_list-split-timer_list_show_tickdevices-v4
+Applying: timer_list: convert timer list to be a proper seq_file
+Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3
+Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3-fix
+Applying: posix_cpu_timer: consolidate expiry time type
+Applying: posix_cpu_timers: consolidate timer list cleanups
+Applying: posix_cpu_timers: consolidate expired timers check
+Applying: selftests: add basic posix timers selftests
+Applying: mkcapflags.pl: convert to mkcapflags.sh
+Applying: headers_install.pl: convert to headers_install.sh
+Applying: scripts/decodecode: make faulting insn ptr more robust
+Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max
+Applying: ocfs2: delay inode update transactions after verifying the input flags
+Applying: kernel/sched/sched.h: fix warning
+Using index info to reconstruct a base tree...
+M kernel/sched/sched.h
+Falling back to patching base and 3-way merge...
+Auto-merging kernel/sched/sched.h
+Applying: debug_locks.h: make warning more verbose
+Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
+Applying: lglock: update lockdep annotations to report recursive local locks
+Applying: cciss: fix invalid use of sizeof in cciss_find_cfgtables()
+Applying: loop: cleanup partitions when detaching loop device
+Applying: loop-cleanup-partitions-when-detaching-loop-device-checkpatch-fixes
+Applying: loop-cleanup-partitions-when-detaching-loop-device-fix
+Applying: loop-cleanup-partitions-when-detaching-loop-device-fix-fix
+Applying: block: restore /proc/partitions to not display non-partitionable removable devices
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: fs: return EAGAIN when O_NONBLOCK write should block on frozen fs
+Applying: fs: fix hang with BSD accounting on frozen filesystem
+Applying: ocfs2: add freeze protection to ocfs2_file_splice_write()
+Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
+Applying: HWPOISON: check dirty flag to match against clean page
+Applying: mm: trace filemap add and del
+Applying: mm-trace-filemap-add-and-del-v2
+Applying: mm, show_mem: suppress page counts in non-blockable contexts
+Applying: mm/shmem.c: remove an ifdef
+Applying: vm: adjust ifdef for TINY_RCU
+Applying: mm: frontswap: lazy initialization to allow tmem backends to build/run as modules
+Applying: frontswap: make frontswap_init use a pointer for the ops
+Applying: mm: frontswap: cleanup code
+Applying: frontswap: get rid of swap_lock dependency
+Applying: mm: cleancache: lazy initialization to allow tmem backends to build/run as modules
+Applying: cleancache: Make cleancache_init use a pointer for the ops
+Applying: mm: cleancache: clean up cleancache_enabled
+Applying: xen: tmem: enable Xen tmem shim to be built/loaded as a module
+Applying: xen-tmem-enable-xen-tmem-shim-to-be-built-loaded-as-a-module-fix
+Applying: zcache/tmem: Better error checking on frontswap_register_ops return value.
+Applying: staging: zcache: enable ramster to be built/loaded as a module
+Applying: staging: zcache: enable zcache to be built/loaded as a module
+Applying: rmap: recompute pgoff for unmapping huge page
+Applying: memblock: add assertion for zero allocation alignment
+Applying: mm: walk_memory_range(): fix typo in comment
+Applying: direct-io: Fix boundary block handling
+Applying: mm/vmscan.c: minor cleanup for kswapd
+Applying: mm: introduce common help functions to deal with reserved/managed pages
+Applying: mm/alpha: use common help functions to free reserved pages
+Applying: mm/ARM: use common help functions to free reserved pages
+Applying: mm/avr32: use common help functions to free reserved pages
+Applying: mm/blackfin: use common help functions to free reserved pages
+Applying: mm/c6x: use common help functions to free reserved pages
+Applying: mm/cris: use common help functions to free reserved pages
+Applying: mm/FRV: use common help functions to free reserved pages
+Applying: mm/h8300: use common help functions to free reserved pages
+Applying: mm/IA64: use common help functions to free reserved pages
+Applying: mm/m32r: use common help functions to free reserved pages
+Applying: mm/m68k: use common help functions to free reserved pages
+Applying: mm/microblaze: use common help functions to free reserved pages
+Applying: mm/MIPS: use common help functions to free reserved pages
+Applying: mm/mn10300: use common help functions to free reserved pages
+Applying: mm/openrisc: use common help functions to free reserved pages
+Applying: mm/parisc: use common help functions to free reserved pages
+Applying: mm/ppc: use common help functions to free reserved pages
+Applying: mm/s390: use common help functions to free reserved pages
+Applying: mm/score: use common help functions to free reserved pages
+Applying: mm/SH: use common help functions to free reserved pages
+Applying: mm/SPARC: use common help functions to free reserved pages
+Applying: mm/um: use common help functions to free reserved pages
+Applying: mm/unicore32: use common help functions to free reserved pages
+Applying: mm/x86: use common help functions to free reserved pages
+Applying: mm/xtensa: use common help functions to free reserved pages
+Applying: mm/arc: use common help functions to free reserved pages
+Applying: mm/metag: use common help functions to free reserved pages
+Applying: mm,kexec: use common help functions to free reserved pages
+Applying: mm: introduce free_highmem_page() helper to free highmem pages into buddy system
+Applying: mm/ARM: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/FRV: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/metag: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/microblaze: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/MIPS: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/PPC: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/SPARC: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/um: use free_highmem_page() to free highmem pages into buddy system
+Applying: mm/x86: use free_highmem_page() to free highmem pages into buddy system
+Applying: memcg: keep prev's css alive for the whole mem_cgroup_iter
+Applying: memcg: rework mem_cgroup_iter to use cgroup iterators
+Applying: memcg: relax memcg iter caching
+Applying: memcg-relax-memcg-iter-caching-checkpatch-fixes
+Applying: memcg: simplify mem_cgroup_iter
+Applying: memcg: further simplify mem_cgroup_iter
+Applying: cgroup: remove css_get_next
+Applying: fs: don't compile in drop_caches.c when CONFIG_SYSCTL=n
+Applying: mm/hugetlb: add more arch-defined huge_pte functions
+Applying: mm: make snapshotting pages for stable writes a per-bio operation
+Applying: mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation-fix
+Applying: mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation-fix-fix
+Applying: mm, vmalloc: change iterating a vmlist to find_vm_area()
+Applying: mm, vmalloc: move get_vmalloc_info() to vmalloc.c
+Applying: mm, vmalloc: protect va->vm by vmap_area_lock
+Applying: mm, vmalloc: iterate vmap_area_list, instead of vmlist in vread/vwrite()
+Applying: mm, vmalloc: iterate vmap_area_list in get_vmalloc_info()
+Applying: mm, vmalloc: iterate vmap_area_list, instead of vmlist, in vmallocinfo()
+Applying: mm, vmalloc: export vmap_area_list, instead of vmlist
+Applying: mm, vmalloc: remove list management of vmlist after initializing vmalloc
+Applying: kexec, vmalloc: export additional vmalloc layer information
+Applying: kexec-vmalloc-export-additional-vmalloc-layer-information-fix
+Applying: mmap: find_vma: remove the WARN_ON_ONCE(!mm) check
+Applying: memcg: do not check for do_swap_account in mem_cgroup_{read,write,reset}
+Applying: mm: allow arch code to control the user page table ceiling
+Applying: arm: set the page table freeing ceiling to TASK_SIZE
+Applying: mm: remove free_area_cache
+Applying: include/linux/mmzone.h: cleanups
+Applying: include-linux-mmzoneh-cleanups-fix
+Applying: mm: memmap_init_zone() performance improvement
+Applying: drop_caches: add some documentation and info message
+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: memcg: debugging facility to access dangling memcgs
+Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
+Applying: mm: add vm event counters for balloon pages compaction
+Applying: kernel/watchdog.c: add comments to explain watchdog_disabled variable
+Applying: kernel/range.c: subtract_range: fix the broken phrase issued by printk
+Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
+Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock
+Applying: kernel/smp.c: cleanups
+Applying: printk/tracing: rework console tracing
+Applying: early_printk: consolidate random copies of identical code
+Applying: early_printk: consolidate random copies of identical code
+Applying: early_printk-consolidate-random-copies-of-identical-code-v3-fix
+Applying: include/linux/printk.h: include stdarg.h
+Applying: get_maintainer: use filename-only regex match for Tegra
+Applying: get_maintainer-use-filename-only-regex-match-for-tegra-fix
+Applying: drivers/video/backlight/ams369fg06.c: convert ams369fg06 to dev_pm_ops
+Applying: drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix
+Applying: drivers/video/backlight/platform_lcd.c: remove unnecessary ifdefs
+Applying: drivers/video/backlight/ep93xx_bl.c: remove incorrect __init annotation
+Applying: drivers/video/backlight/atmel-pwm-bl.c: use module_platform_driver_probe()
+Applying: drivers/video/backlight/atmel-pwm-bl.c: add __init annotation
+Applying: drivers/video/backlight/lp855x_bl.c: fix compiler warning in lp855x_probe
+Applying: drivers/video/backlight/jornada720_*.c: use dev_err()/dev_info() instead of pr_err()/pr_info()
+Applying: drivers/video/backlight/omap1_bl.c: use dev_info() instead of pr_info()
+Applying: drivers/video/backlight/generic_bl.c: use dev_info() instead of pr_info()
+Applying: drivers/video/backlight/adp8870_bl.c: add missing braces
+Applying: drivers/video/backlight/l4f00242t03.c: check return value of regulator_enable()
+Applying: drivers-video-backlight-l4f00242t03c-check-return-value-of-regulator_enable-fix
+Applying: backlight: ld9040: convert ld9040 to dev_pm_ops
+Applying: backlight: lms501kf03: convert lms501kf03 to dev_pm_ops
+Applying: backlight: s6e63m0: convert s6e63m0 to dev_pm_ops
+Applying: backlight: adp5520: convert adp5520_bl to dev_pm_ops
+Applying: backlight: adp8860: convert adp8860 to dev_pm_ops
+Applying: backlight: adp8870: convert adp8870 to dev_pm_ops
+Applying: backlight: corgi_lcd: convert corgi_lcd to dev_pm_ops
+Applying: backlight: ep93xx: convert ep93xx to dev_pm_ops
+Applying: backlight: hp680_bl: convert hp680bl to dev_pm_ops
+Applying: backlight: kb3886_bl: convert kb3886bl to dev_pm_ops
+Applying: backlight: lm3533_bl: convert lm3533_bl to dev_pm_ops
+Applying: backlight: locomolcd: convert locomolcd to dev_pm_ops
+Applying: backlight: ltv350qv: convert ltv350qv to dev_pm_ops
+Applying: backlight: tdo24m: convert tdo24m to dev_pm_ops
+Applying: drivers/video/backlight/Kconfig: fix typo "MACH_SAM9...EK" three times
+Applying: drivers/video/backlight/adp5520_bl.c: fix compiler warning in adp5520_show()
+Applying: video: backlight: add ili922x lcd driver
+Applying: backlight: da903x_bl: use BL_CORE_SUSPENDRESUME option
+Applying: drivers/video/backlight/lp855x_bl.c: use PAGE_SIZE for the sysfs read operation
+Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
+Applying: lib/int_sqrt.c: optimize square root algorithm
+Applying: argv_split(): teach it to handle mutable strings
+Applying: argv_split-teach-it-to-handle-mutable-strings-fix
+Applying: argv_split-teach-it-to-handle-mutable-strings-fix-2
+Applying: checkpatch: add check for reuse of krealloc arg
+Applying: checkpatch: Prefer seq_puts to seq_printf
+Applying: checkpatch: Complain about executable files
+Applying: epoll: trim epitem by one cache line
+Applying: epoll-trim-epitem-by-one-cache-line-on-x86_64-fix
+Applying: epoll: comment + BUILD_BUG_ON to prevent epitem bloat
+Applying: epoll: support for disabling items, and a self-test app
+Applying: epoll: stop comparing pointers with 0 in self-test app
+Applying: epoll: use RCU to protect wakeup_source in epitem
+Applying: epoll: lock ep->mtx in ep_free to silence lockdep
+Applying: epoll: cleanup: hoist out f_op->poll calls
+Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
+Applying: init: scream bloody murder if interrupts are enabled too early
+Applying: dmi_scan: refactor dmi_scan_machine(), {smbios,dmi}_present()
+Applying: dmi_scan: proper buf type in dmi_present()
+Applying: i2o: check copy_from_user() size parameter
+Applying: rtc: rtc-mv: add __init annotation
+Applying: rtc: rtc-davinci: add __exit annotation
+Applying: rtc: rtc-ds1302: add __exit annotation
+Applying: rtc: rtc-imxdi: add __init/__exit annotation
+Applying: rtc: rtc-nuc900: add __init/__exit annotation
+Applying: rtc: rtc-pcap: add __init/__exit annotation
+Applying: rtc: rtc-tegra: add __init/__exit annotation
+Applying: rtc: add devm_rtc_device_{register,unregister}()
+Applying: drivers/rtc/rtc-max77686.c: use module_platform_driver()
+Applying: drivers/rtc/rtc-max77686.c: add missing module author name
+Applying: drivers/rtc/rtc-max77686.c: use devm_kzalloc()
+Applying: drivers/rtc/rtc-max77686.c: fix indentation of bit definitions
+Applying: drivers/rtc/rtc-max77686.c: use dev_info()/dev_emerg() instead of pr_info()/pr_emerg()
+Applying: drivers/rtc/rtc-v3020.c: use gpio_request_array()
+Applying: drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register()
+Applying: rtc: rtc-ab3100: use module_platform_driver_probe()
+Applying: rtc: rtc-at32ap700x: use module_platform_driver_probe()
+Applying: rtc: rtc-at91rm9200: use module_platform_driver_probe()
+Applying: rtc: rtc-au1xxx: use module_platform_driver_probe()
+Applying: rtc: rtc-coh901331: use module_platform_driver_probe()
+Applying: rtc: rtc-davinci: use module_platform_driver_probe()
+Applying: rtc: rtc-ds1302: use module_platform_driver_probe()
+Applying: rtc: rtc-efi: use module_platform_driver_probe()
+Applying: rtc: rtc-generic: use module_platform_driver_probe()
+Applying: rtc: rtc-imxdi: use module_platform_driver_probe()
+Applying: rtc: rtc-mc13xxx: use module_platform_driver_probe()
+Applying: rtc: rtc-msm6242: use module_platform_driver_probe()
+Applying: rtc: rtc-mv: use module_platform_driver_probe()
+Applying: rtc: rtc-nuc900: use module_platform_driver_probe()
+Applying: rtc: rtc-omap: use module_platform_driver_probe()
+Applying: rtc: rtc-pcap: use module_platform_driver_probe()
+Applying: rtc: rtc-ps3: use module_platform_driver_probe()
+Applying: rtc: rtc-pxa: use module_platform_driver_probe()
+Applying: rtc: rtc-rp5c01: use module_platform_driver_probe()
+Applying: rtc: rtc-sh: use module_platform_driver_probe()
+Applying: rtc: rtc-starfire: use module_platform_driver_probe()
+Applying: rtc: rtc-sun4v: use module_platform_driver_probe()
+Applying: rtc: rtc-tegra: use module_platform_driver_probe()
+Applying: rtc: rtc-tx4939: use module_platform_driver_probe()
+Applying: rtc: rtc-88pm80x: use devm_rtc_device_register()
+Applying: rtc: rtc-coh90133: use devm_rtc_device_register()
+Applying: rtc: rtc-da9052: use devm_rtc_device_register()
+Applying: rtc: rtc-da9055: use devm_rtc_device_register()
+Applying: rtc: rtc-davinci: use devm_rtc_device_register()
+Applying: rtc: rtc-ds1511: use devm_rtc_device_register()
+Applying: rtc: rtc-ds1553: use devm_rtc_device_register()
+Applying: rtc: rtc-ds1742: use devm_rtc_device_register()
+Applying: rtc: rtc-ep93xx: use devm_rtc_device_register()
+Applying: rtc: rtc-imxdi: use devm_rtc_device_register()
+Applying: rtc: rtc-lp8788: use devm_rtc_device_register()
+Applying: rtc: rtc-lpc32xx: use devm_rtc_device_register()
+Applying: rtc: rtc-max77686: use devm_rtc_device_register()
+Applying: rtc: rtc-max8907: use devm_rtc_device_register()
+Applying: rtc: rtc-max8997: use devm_rtc_device_register()
+Applying: rtc: rtc-mv: use devm_rtc_device_register()
+Applying: rtc: rtc-mxc: use devm_rtc_device_register()
+Applying: rtc: rtc-palmas: use devm_rtc_device_register()
+Applying: rtc: rtc-pcf8523: use devm_rtc_device_register()
+Applying: rtc: rtc-s3c: use devm_rtc_device_register()
+Applying: rtc: rtc-snvs: use devm_rtc_device_register()
+Applying: rtc: rtc-spear: use devm_rtc_device_register()
+Applying: rtc: rtc-stk17ta8: use devm_rtc_device_register()
+Applying: rtc: rtc-tps6586x: use devm_rtc_device_register()
+Applying: rtc: rtc-tps65910: use devm_rtc_device_register()
+Applying: rtc: rtc-tps80031: use devm_rtc_device_register()
+Applying: rtc: rtc-tx4939: use devm_rtc_device_register()
+Applying: rtc: rtc-vt8500: use devm_rtc_device_register()
+Applying: rtc: rtc-wm831x: use devm_rtc_device_register()
+Applying: below is the warning reported with the gcc (gcc (GCC) 4.7.2 20121109 (Red
+Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue
+Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix
+Applying: drivers/rtc/rtc-tegra.c: protect suspend/resume callbacks with CONFIG_PM_SLEEP
+Applying: drivers/rtc/rtc-tegra.c: use struct dev_pm_ops for power management
+Applying: drivers/rtc/rtc-tegra.c: set irq name as device name
+Applying: drivers/rtc/rtc-tegra.c: use managed rtc_device_register()
+Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix
+Applying: rtc: rtc-palmas: use devm_request_threaded_irq()
+Applying: drivers/rtc/rtc-s3c.c: convert s3c_rtc to dev_pm_ops
+Applying: rtc: rtc-ds1307: use dev_dbg() instead of pr_debug()
+Applying: rtc: rtc-fm3130: use dev_dbg() instead of pr_debug()
+Applying: rtc: rtc-ab3100: use devm_rtc_device_register()
+Applying: rtc: rtc-au1xxx: use devm_rtc_device_register()
+Applying: rtc: rtc-bq32k: use devm_rtc_device_register()
+Applying: rtc: rtc-dm355evm: use devm_rtc_device_register()
+Applying: rtc: rtc-ds1302: use devm_rtc_device_register()
+Applying: rtc: rtc-ds1672: use devm_rtc_device_register()
+Applying: rtc: rtc-ds3234: use devm_rtc_device_register()
+Applying: rtc: rtc-efi: use devm_rtc_device_register()
+Applying: rtc: rtc-em3027: use devm_rtc_device_register()
+Applying: rtc: rtc-generic: use devm_rtc_device_register()
+Applying: rtc: hid-sensor-time: use devm_rtc_device_register()
+Applying: rtc: rtc-ls1x: use devm_rtc_device_register()
+Applying: rtc: rtc-m41t93: use devm_rtc_device_register()
+Applying: rtc: rtc-m41t94: use devm_rtc_device_register()
+Applying: rtc: rtc-m48t86: use devm_rtc_device_register()
+Applying: rtc: rtc-max6900: use devm_rtc_device_register()
+Applying: rtc: rtc-max6902: use devm_rtc_device_register()
+Applying: rtc: rtc-ps3: use devm_rtc_device_register()
+Applying: rtc: rtc-r9701: use devm_rtc_device_register()
+Applying: rtc: rtc-rc5t583: use devm_rtc_device_register()
+Applying: rtc: rtc-rs5c313: use devm_rtc_device_register()
+Applying: rtc: rtc-rv3029c2: use devm_rtc_device_register()
+Applying: rtc: rtc-rx4581: use devm_rtc_device_register()
+Applying: rtc: rtc-rx8581: use devm_rtc_device_register()
+Applying: rtc: rtc-starfire: use devm_rtc_device_register()
+Applying: rtc: rtc-sun4v: use devm_rtc_device_register()
+Applying: rtc: rtc-test: use devm_rtc_device_register()
+Applying: rtc: rtc-tile: use devm_rtc_device_register()
+Applying: rtc: rtc-wm8350: use devm_rtc_device_register()
+Applying: rtc: rtc-x1205: use devm_rtc_device_register()
+Applying: rtc: rtc-at91rm9200: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-mxc: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-pxa: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-rc5t583: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-sa1100: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-sh: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-wm8350: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-tps6586x: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-tps65910: switch to using SIMPLE_DEV_PM_OPS
+Applying: rtc: rtc-tps80031: switch to using SIMPLE_DEV_PM_OPS
+Applying: hfsplus: fix warnings in fs/hfsplus/bfind.c
+Applying: hfsplus-fix-warnings-in-fs-hfsplus-bfindc-in-function-hfs_find_1st_rec_by_cnid-fix
+Applying: fat: introduce 2 new values for the -o nfs mount option
+Applying: fat: move fat_i_pos_read to fat.h
+Applying: fat: introduce a helper fat_get_blknr_offset()
+Applying: fat: restructure export_operations
+Applying: fat (exportfs): rebuild inode if ilookup() fails
+Applying: fat (exportfs): rebuild directory-inode if fat_dget()
+Applying: Documentation: update nfs option in filesystem/vfat.txt
+Applying: ptrace: add ability to retrieve signals without removing from a queue (v4)
+Applying: selftest: add a test case for PTRACE_PEEKSIGINFO
+Applying: usermodehelper: export call_usermodehelper_exec() and call_usermodehelper_setup()
+Applying: usermodehelper-export-_exec-and-_setup-functions-fix
+Applying: kmod: split call to call_usermodehelper_fns()
+Applying: KEYS: split call to call_usermodehelper_fns()
+Applying: coredump: remove trailling whitespace
+Applying: usermodehelper: split remaining calls to call_usermodehelper_fns()
+Applying: kmod: remove call_usermodehelper_fns()
+Applying: coredump: only SIGKILL should interrupt the coredumping task
+Applying: coredump: ensure that SIGKILL always kills the dumping thread
+Applying: coredump: sanitize the setting of signal->group_exit_code
+Applying: coredump: introduce dump_interrupted()
+Applying: coredump: factor out the setting of PF_DUMPCORE
+Applying: coredump: change wait_for_dump_helpers() to use wait_event_interruptible()
+Applying: procfs: improve scaling in proc
+Applying: procfs-improve-scaling-in-proc-v5
+Applying: set_task_comm: kill the pointless memset() + wmb()
+Applying: kexec: fix wrong types of some local variables
+Applying: kexec: Use min() and min_t() to simplify logic
+Applying: kexec-use-min_t-to-simplify-logic-fix
+Applying: ipc: clamp with min()
+Applying: ipc: separate msg allocation from userspace copy
+Applying: ipc: tighten msg copy loops
+Applying: ipc: set EFAULT as default error in load_msg()
+Applying: ipc: remove msg handling from queue scan
+Applying: ipc: implement MSG_COPY as a new receive mode
+Applying: ipc: simplify msg list search
+Applying: ipc: refactor msg list search into separate function
+Applying: ipc: find_msg can be static
+Applying: ipc/msgutil.c: use linux/uaccess.h
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: kernel/pid.c: improve flow of a loop inside alloc_pidmap.
+Applying: kernel-pidc-improve-flow-of-a-loop-inside-alloc_pidmap-fix
+Applying: pid_namespace.c/.h: simplify defines
+Applying: pid_namespacec-h-simplify-defines-fix
+Applying: raid6test: use prandom_bytes()
+Applying: uuid: use prandom_bytes()
+Applying: x86: pageattr-test: remove srandom32 call
+Applying: x86: rename random32() to prandom_u32()
+Applying: lib/: rename random32() to prandom_u32()
+Applying: mm/: rename random32() to prandom_u32()
+Applying: kernel/: rename random32() to prandom_u32()
+Applying: drbd: rename random32() to prandom_u32()
+Applying: infiniband: rename random32() to prandom_u32()
+Applying: mmc: rename random32() to prandom_u32()
+Applying: video/uvesafb: rename random32() to prandom_u32()
+Applying: uwb: rename random32() to prandom_u32()
+Applying: lguest: rename random32() to prandom_u32()
+Applying: scsi: rename random32() to prandom_u32()
+Applying: scsi: fix the wrong position of the comment
+Applying: drivers/net: rename random32() to prandom_u32()
+Applying: drivers-net-rename-random32-to-prandom_u32-fix
+Applying: net/sunrpc: rename random32() to prandom_u32()
+Applying: net/sched: rename random32() to prandom_u32()
+Applying: net/netfilter: rename random32() to prandom_u32()
+Applying: net/core: rename random32() to prandom_u32()
+Applying: net/core: remove duplicate statements by do-while loop
+Applying: net: rename random32 to prandom
+Applying: remove unused random32() and srandom32()
+Applying: semaphore: use unlikely() for down's timeout
+Applying: semaphore: use `bool' type for semaphore_waiter's up
+Applying: drivers/memstick/host/r592.c: make r592_pm_ops static
+Applying: kernel/relay.c: remove unused function argument actor
+Applying: kernel/relay.c: move FIX_SIZE macro into relay.c
+Applying: mm: remove old aio use_mm() comment
+Applying: aio: remove dead code from aio.h
+Applying: gadget: remove only user of aio retry
+Applying: aio: remove retry-based AIO
+Applying: char: add aio_{read,write} to /dev/{null,zero}
+Applying: aio: kill return value of aio_complete()
+Applying: aio: add kiocb_cancel()
+Applying: aio: move private stuff out of aio.h
+Applying: aio: dprintk() -> pr_debug()
+Applying: aio: do fget() after aio_get_req()
+Applying: aio: make aio_put_req() lockless
+Applying: aio: refcounting cleanup
+Applying: wait: add wait_event_hrtimeout()
+Applying: aio: make aio_read_evt() more efficient, convert to hrtimers
+Applying: aio: use flush_dcache_page()
+Applying: aio: use cancellation list lazily
+Applying: aio: change reqs_active to include unreaped completions
+Applying: aio: kill batch allocation
+Applying: aio: kill struct aio_ring_info
+Applying: aio: give shared kioctx fields their own cachelines
+Applying: aio: reqs_active -> reqs_available
+Applying: aio: percpu reqs_available
+Applying: generic dynamic per cpu refcounting
+Applying: aio: percpu ioctx refcount
+Applying: aio: use xchg() instead of completion_lock
+Applying: aio: don't include aio.h in sched.h
+Applying: aio: kill ki_key
+Applying: aio: kill ki_retry
+Applying: block, aio: batch completion for bios/kiocbs
+Applying: virtio-blk: convert to batch completion
+Applying: mtip32xx: convert to batch completion
+Applying: aio: fix aio_read_events_ring() types
+Applying: aio: document, clarify aio_read_events() and shadow_tail
+Applying: aio: correct calculation of available events
+Applying: aio: fix kioctx not being freed after cancellation at exit time
+Applying: aio: fix ringbuffer calculation so we don't wrap
+Applying: Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
+Applying: kconfig-consolidate-config_debug_strict_user_copy_checks-fix
+Applying: kconfig menu: move Virtualization drivers near other virtualization options
+Applying: kernel/sys.c: make prctl(PR_SET_MM) generally available
+Applying: decompressor: add LZ4 decompressor module
+Applying: lib: add support for LZ4-compressed kernel
+Applying: arm: add support for LZ4-compressed kernel
+Applying: x86: add support for LZ4-compressed kernel
+Applying: lib: add lz4 compressor module
+Applying: crypto: add lz4 Cryptographic API
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 7113718...889fc8b akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (889fc8b crypto: add lz4 Cryptographic API)
+$ git merge --no-ff akpm/master
+Removing scripts/headers_install.pl
+Auto-merging lib/usercopy.c
+Removing fs/proc/mmu.c
+Removing arch/x86/kernel/cpu/mkcapflags.pl
+Removing arch/sparc/lib/usercopy.c
+Merge made by the 'recursive' strategy.
+ Documentation/cgroups/memory.txt | 16 +
+ Documentation/filesystems/vfat.txt | 26 +-
+ Documentation/sysctl/vm.txt | 33 +-
+ MAINTAINERS | 14 +-
+ arch/alpha/kernel/sys_nautilus.c | 5 +-
+ arch/alpha/mm/init.c | 24 +-
+ arch/alpha/mm/numa.c | 3 +-
+ arch/arc/mm/init.c | 23 +-
+ arch/arm/Kconfig | 1 +
+ arch/arm/boot/compressed/.gitignore | 1 +
+ arch/arm/boot/compressed/Makefile | 6 +-
+ arch/arm/boot/compressed/decompress.c | 4 +
+ arch/arm/boot/compressed/piggy.lz4.S | 6 +
+ arch/arm/include/asm/pgtable.h | 9 +
+ arch/arm/kernel/early_printk.c | 17 +-
+ arch/arm/mm/init.c | 50 +-
+ arch/arm/mm/mmap.c | 2 -
+ arch/arm64/mm/init.c | 26 +-
+ arch/arm64/mm/mmap.c | 2 -
+ arch/avr32/mm/init.c | 24 +-
+ arch/blackfin/kernel/early_printk.c | 2 -
+ arch/blackfin/mm/init.c | 22 +-
+ arch/c6x/mm/init.c | 30 +-
+ arch/cris/mm/init.c | 16 +-
+ arch/frv/mm/init.c | 38 +-
+ arch/h8300/mm/init.c | 30 +-
+ arch/ia64/include/asm/hugetlb.h | 1 +
+ arch/ia64/mm/contig.c | 2 +
+ arch/ia64/mm/discontig.c | 2 +
+ arch/ia64/mm/init.c | 23 +-
+ arch/m32r/mm/init.c | 26 +-
+ arch/m68k/mm/init.c | 24 +-
+ arch/metag/mm/init.c | 31 +-
+ arch/microblaze/include/asm/setup.h | 1 -
+ arch/microblaze/kernel/early_printk.c | 26 +-
+ arch/microblaze/mm/init.c | 34 +-
+ arch/mips/include/asm/hugetlb.h | 1 +
+ arch/mips/include/asm/kvm_host.h | 2 +-
+ arch/mips/kernel/early_printk.c | 12 +-
+ arch/mips/mm/init.c | 37 +-
+ arch/mips/mm/mmap.c | 2 -
+ arch/mips/sgi-ip27/ip27-memory.c | 4 +-
+ arch/mn10300/mm/init.c | 23 +-
+ arch/openrisc/mm/init.c | 27 +-
+ arch/parisc/Kconfig | 1 +
+ arch/parisc/Kconfig.debug | 14 -
+ arch/parisc/mm/init.c | 25 +-
+ arch/powerpc/include/asm/hugetlb.h | 1 +
+ arch/powerpc/include/asm/page_64.h | 3 +-
+ arch/powerpc/kernel/crash_dump.c | 5 +-
+ arch/powerpc/kernel/fadump.c | 5 +-
+ arch/powerpc/kernel/kvm.c | 7 +-
+ arch/powerpc/kernel/udbg.c | 6 +-
+ arch/powerpc/mm/hugetlbpage.c | 2 +-
+ arch/powerpc/mm/mem.c | 35 +-
+ arch/powerpc/mm/mmap_64.c | 2 -
+ arch/powerpc/mm/slice.c | 223 +--
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 5 +-
+ arch/powerpc/platforms/cell/spufs/file.c | 2 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/Kconfig.debug | 14 -
+ arch/s390/hypfs/inode.c | 1 +
+ arch/s390/include/asm/hugetlb.h | 56 +-
+ arch/s390/include/asm/pgtable.h | 95 +-
+ arch/s390/lib/Makefile | 1 -
+ arch/s390/mm/hugetlbpage.c | 2 +-
+ arch/s390/mm/init.c | 35 +-
+ arch/s390/mm/mmap.c | 4 -
+ arch/score/mm/init.c | 33 +-
+ arch/sh/include/asm/hugetlb.h | 1 +
+ arch/sh/kernel/sh_bios.c | 2 -
+ arch/sh/mm/init.c | 26 +-
+ arch/sparc/include/asm/hugetlb.h | 1 +
+ arch/sparc/kernel/leon_smp.c | 15 +-
+ arch/sparc/kernel/sys_sparc_64.c | 2 -
+ arch/sparc/lib/Makefile | 1 -
+ arch/sparc/lib/usercopy.c | 9 -
+ arch/sparc/mm/init_32.c | 49 +-
+ arch/sparc/mm/init_64.c | 28 +-
+ arch/tile/Kconfig | 8 +-
+ arch/tile/include/asm/hugetlb.h | 1 +
+ arch/tile/include/asm/uaccess.h | 7 +-
+ arch/tile/kernel/early_printk.c | 27 +-
+ arch/tile/lib/uaccess.c | 8 -
+ arch/tile/mm/mmap.c | 2 -
+ arch/tile/mm/pgtable.c | 7 +-
+ arch/um/kernel/early_printk.c | 8 +-
+ arch/um/kernel/mem.c | 26 +-
+ arch/unicore32/kernel/early_printk.c | 12 +-
+ arch/unicore32/mm/init.c | 31 +-
+ arch/unicore32/mm/ioremap.c | 17 +-
+ arch/x86/Kconfig | 2 +
+ arch/x86/Kconfig.debug | 14 -
+ arch/x86/boot/compressed/Makefile | 5 +-
+ arch/x86/boot/compressed/misc.c | 4 +
+ arch/x86/ia32/ia32_aout.c | 3 -
+ arch/x86/include/asm/e820.h | 2 +
+ arch/x86/include/asm/hugetlb.h | 1 +
+ arch/x86/kernel/cpu/Makefile | 4 +-
+ arch/x86/kernel/cpu/mkcapflags.pl | 48 -
+ arch/x86/kernel/cpu/mkcapflags.sh | 41 +
+ arch/x86/kernel/e820.c | 72 +-
+ arch/x86/kernel/early_printk.c | 21 +-
+ arch/x86/lib/usercopy_32.c | 6 -
+ arch/x86/mm/highmem_32.c | 1 -
+ arch/x86/mm/init.c | 5 +-
+ arch/x86/mm/init_32.c | 10 +-
+ arch/x86/mm/init_64.c | 7 +-
+ arch/x86/mm/ioremap.c | 7 +-
+ arch/x86/mm/mmap.c | 2 -
+ arch/x86/mm/pageattr-test.c | 5 +-
+ arch/x86/platform/efi/efi.c | 15 +-
+ arch/xtensa/mm/init.c | 21 +-
+ block/blk-core.c | 34 +-
+ block/blk-flush.c | 2 +-
+ block/blk.h | 3 +-
+ block/genhd.c | 2 +-
+ block/partition-generic.c | 1 +
+ block/scsi_ioctl.c | 1 +
+ crypto/Kconfig | 16 +
+ crypto/Makefile | 2 +
+ crypto/async_tx/raid6test.c | 9 +-
+ crypto/lz4.c | 105 ++
+ crypto/lz4hc.c | 105 ++
+ drivers/Kconfig | 4 +-
+ drivers/block/cciss.c | 2 +-
+ drivers/block/drbd/drbd_receiver.c | 5 +-
+ drivers/block/loop.c | 19 +-
+ drivers/block/mtip32xx/mtip32xx.c | 86 +-
+ drivers/block/mtip32xx/mtip32xx.h | 8 +-
+ drivers/block/swim3.c | 2 +-
+ drivers/block/virtio_blk.c | 31 +-
+ drivers/char/mem.c | 36 +
+ drivers/firmware/dmi_scan.c | 80 +-
+ drivers/gpu/drm/drm_fb_helper.c | 8 +
+ drivers/infiniband/hw/cxgb3/cxio_resource.c | 4 +-
+ drivers/infiniband/hw/cxgb4/id_table.c | 4 +-
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
+ drivers/infiniband/hw/mlx4/mad.c | 2 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +-
+ drivers/leds/leds-ot200.c | 14 +-
+ drivers/lguest/page_tables.c | 2 +-
+ drivers/md/dm.c | 2 +-
+ drivers/memstick/host/r592.c | 8 +-
+ drivers/message/i2o/i2o_config.c | 10 +
+ drivers/mmc/core/core.c | 4 +-
+ drivers/net/ethernet/broadcom/cnic.c | 4 +-
+ drivers/net/hamradio/baycom_epp.c | 2 +-
+ drivers/net/hamradio/hdlcdrv.c | 2 +-
+ drivers/net/hamradio/yam.c | 2 +-
+ drivers/net/team/team_mode_random.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +-
+ drivers/net/wireless/mwifiex/cfg80211.c | 4 +-
+ drivers/platform/x86/thinkpad_acpi.c | 10 -
+ drivers/rtc/class.c | 70 +
+ drivers/rtc/rtc-88pm80x.c | 3 +-
+ drivers/rtc/rtc-ab3100.c | 21 +-
+ drivers/rtc/rtc-at32ap700x.c | 12 +-
+ drivers/rtc/rtc-at91rm9200.c | 29 +-
+ drivers/rtc/rtc-au1xxx.c | 18 +-
+ drivers/rtc/rtc-bq32k.c | 5 +-
+ drivers/rtc/rtc-coh901331.c | 18 +-
+ drivers/rtc/rtc-da9052.c | 13 +-
+ drivers/rtc/rtc-da9055.c | 5 +-
+ drivers/rtc/rtc-davinci.c | 24 +-
+ drivers/rtc/rtc-dm355evm.c | 7 +-
+ drivers/rtc/rtc-ds1286.c | 3 +-
+ drivers/rtc/rtc-ds1302.c | 22 +-
+ drivers/rtc/rtc-ds1307.c | 70 +-
+ drivers/rtc/rtc-ds1511.c | 8 +-
+ drivers/rtc/rtc-ds1553.c | 6 +-
+ drivers/rtc/rtc-ds1672.c | 8 +-
+ drivers/rtc/rtc-ds1742.c | 8 +-
+ drivers/rtc/rtc-ds3234.c | 7 +-
+ drivers/rtc/rtc-efi.c | 19 +-
+ drivers/rtc/rtc-em3027.c | 7 +-
+ drivers/rtc/rtc-ep93xx.c | 11 +-
+ drivers/rtc/rtc-fm3130.c | 2 +-
+ drivers/rtc/rtc-generic.c | 21 +-
+ drivers/rtc/rtc-hid-sensor-time.c | 7 +-
+ drivers/rtc/rtc-imxdi.c | 23 +-
+ drivers/rtc/rtc-lp8788.c | 5 +-
+ drivers/rtc/rtc-lpc32xx.c | 5 +-
+ drivers/rtc/rtc-ls1x.c | 5 +-
+ drivers/rtc/rtc-m41t93.c | 9 +-
+ drivers/rtc/rtc-m41t94.c | 9 +-
+ drivers/rtc/rtc-m48t86.c | 11 +-
+ drivers/rtc/rtc-max6900.c | 9 +-
+ drivers/rtc/rtc-max6902.c | 7 +-
+ drivers/rtc/rtc-max77686.c | 63 +-
+ drivers/rtc/rtc-max8907.c | 7 +-
+ drivers/rtc/rtc-max8997.c | 10 +-
+ drivers/rtc/rtc-mc13xxx.c | 12 +-
+ drivers/rtc/rtc-msm6242.c | 13 +-
+ drivers/rtc/rtc-mv.c | 23 +-
+ drivers/rtc/rtc-mxc.c | 15 +-
+ drivers/rtc/rtc-nuc900.c | 19 +-
+ drivers/rtc/rtc-omap.c | 12 +-
+ drivers/rtc/rtc-palmas.c | 9 +-
+ drivers/rtc/rtc-pcap.c | 19 +-
+ drivers/rtc/rtc-pcf8523.c | 6 +-
+ drivers/rtc/rtc-ps3.c | 16 +-
+ drivers/rtc/rtc-pxa.c | 88 +-
+ drivers/rtc/rtc-r9701.c | 7 +-
+ drivers/rtc/rtc-rc5t583.c | 19 +-
+ drivers/rtc/rtc-rp5c01.c | 13 +-
+ drivers/rtc/rtc-rs5c313.c | 6 +-
+ drivers/rtc/rtc-rv3029c2.c | 16 +-
+ drivers/rtc/rtc-rx4581.c | 7 +-
+ drivers/rtc/rtc-rx8581.c | 8 +-
+ drivers/rtc/rtc-s3c.c | 32 +-
+ drivers/rtc/rtc-sa1100.c | 12 +-
+ drivers/rtc/rtc-sh.c | 22 +-
+ drivers/rtc/rtc-snvs.c | 6 +-
+ drivers/rtc/rtc-spear.c | 5 +-
+ drivers/rtc/rtc-starfire.c | 23 +-
+ drivers/rtc/rtc-stk17ta8.c | 6 +-
+ drivers/rtc/rtc-sun4v.c | 22 +-
+ drivers/rtc/rtc-tegra.c | 63 +-
+ drivers/rtc/rtc-test.c | 10 +-
+ drivers/rtc/rtc-tile.c | 9 +-
+ drivers/rtc/rtc-tps6586x.c | 9 +-
+ drivers/rtc/rtc-tps65910.c | 11 +-
+ drivers/rtc/rtc-tps80031.c | 11 +-
+ drivers/rtc/rtc-tx4939.c | 19 +-
+ drivers/rtc/rtc-v3020.c | 37 +-
+ drivers/rtc/rtc-vt8500.c | 8 +-
+ drivers/rtc/rtc-wm831x.c | 6 +-
+ drivers/rtc/rtc-wm8350.c | 19 +-
+ drivers/rtc/rtc-x1205.c | 14 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 4 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 11 +-
+ drivers/scsi/sg.c | 1 +
+ drivers/staging/android/logger.c | 1 +
+ drivers/staging/zcache/Kconfig | 6 +-
+ drivers/staging/zcache/ramster.h | 6 +-
+ drivers/staging/zcache/ramster/nodemanager.c | 9 +-
+ drivers/staging/zcache/ramster/ramster.c | 29 +-
+ drivers/staging/zcache/ramster/ramster.h | 2 +-
+ .../staging/zcache/ramster/ramster_nodemanager.h | 2 +
+ drivers/staging/zcache/tmem.c | 6 +-
+ drivers/staging/zcache/tmem.h | 8 +-
+ drivers/staging/zcache/zcache-main.c | 64 +-
+ drivers/staging/zcache/zcache.h | 2 +-
+ drivers/usb/gadget/amd5536udc.c | 4 +-
+ drivers/usb/gadget/inode.c | 42 +-
+ drivers/uwb/rsv.c | 4 +-
+ drivers/video/Kconfig | 9 +
+ drivers/video/Makefile | 1 +
+ drivers/video/backlight/Kconfig | 9 +-
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/adp5520_bl.c | 28 +-
+ drivers/video/backlight/adp8860_bl.c | 21 +-
+ drivers/video/backlight/adp8870_bl.c | 31 +-
+ drivers/video/backlight/ams369fg06.c | 21 +-
+ drivers/video/backlight/atmel-pwm-bl.c | 14 +-
+ drivers/video/backlight/corgi_lcd.c | 18 +-
+ drivers/video/backlight/da903x_bl.c | 30 +-
+ drivers/video/backlight/ep93xx_bl.c | 20 +-
+ drivers/video/backlight/generic_bl.c | 6 +-
+ drivers/video/backlight/hp680_bl.c | 18 +-
+ drivers/video/backlight/ili922x.c | 555 ++++++
+ drivers/video/backlight/jornada720_bl.c | 18 +-
+ drivers/video/backlight/jornada720_lcd.c | 21 +-
+ drivers/video/backlight/kb3886_bl.c | 18 +-
+ drivers/video/backlight/l4f00242t03.c | 27 +-
+ drivers/video/backlight/ld9040.c | 20 +-
+ drivers/video/backlight/lm3533_bl.c | 22 +-
+ drivers/video/backlight/lms501kf03.c | 22 +-
+ drivers/video/backlight/locomolcd.c | 16 +-
+ drivers/video/backlight/lp855x_bl.c | 7 +-
+ drivers/video/backlight/ltv350qv.c | 18 +-
+ drivers/video/backlight/omap1_bl.c | 4 +-
+ drivers/video/backlight/platform_lcd.c | 6 +-
+ drivers/video/backlight/s6e63m0.c | 20 +-
+ drivers/video/backlight/tdo24m.c | 18 +-
+ drivers/video/console/fbcon_cw.c | 3 +-
+ drivers/video/cyber2000fb.c | 3 +
+ drivers/video/exynos/exynos_mipi_dsi.c | 8 +-
+ drivers/video/hyperv_fb.c | 829 +++++++++
+ drivers/video/matrox/matroxfb_maven.c | 16 +-
+ drivers/video/uvesafb.c | 2 +-
+ drivers/xen/Kconfig | 4 +-
+ drivers/xen/tmem.c | 55 +-
+ drivers/xen/xen-selfballoon.c | 13 +-
+ fs/9p/vfs_addr.c | 1 +
+ fs/Makefile | 3 +-
+ fs/afs/write.c | 1 +
+ fs/aio.c | 1808 ++++++++------------
+ fs/binfmt_aout.c | 3 -
+ fs/binfmt_elf.c | 26 +-
+ fs/binfmt_elf_fdpic.c | 2 -
+ fs/bio.c | 52 +-
+ fs/block_dev.c | 9 +-
+ fs/btrfs/file.c | 4 +-
+ fs/btrfs/inode.c | 1 +
+ fs/buffer.c | 9 +-
+ fs/ceph/file.c | 1 +
+ fs/cifs/file.c | 3 +-
+ fs/compat.c | 1 +
+ fs/coredump.c | 85 +-
+ fs/direct-io.c | 24 +-
+ fs/drop_caches.c | 2 +
+ fs/ecryptfs/file.c | 1 +
+ fs/eventpoll.c | 168 +-
+ fs/exec.c | 14 +-
+ fs/ext2/inode.c | 1 +
+ fs/ext3/inode.c | 1 +
+ fs/ext3/super.c | 1 -
+ fs/ext4/file.c | 1 +
+ fs/ext4/indirect.c | 1 +
+ fs/ext4/inode.c | 1 +
+ fs/ext4/page-io.c | 1 +
+ fs/f2fs/data.c | 1 +
+ fs/fat/dir.c | 23 +
+ fs/fat/fat.h | 40 +-
+ fs/fat/file.c | 5 +
+ fs/fat/inode.c | 75 +-
+ fs/fat/nfs.c | 221 ++-
+ fs/fuse/cuse.c | 1 +
+ fs/fuse/dev.c | 1 +
+ fs/fuse/file.c | 4 +-
+ fs/gfs2/aops.c | 1 +
+ fs/gfs2/file.c | 1 +
+ fs/hfs/inode.c | 1 +
+ fs/hfsplus/bfind.c | 8 +-
+ fs/hfsplus/inode.c | 1 +
+ fs/jbd/commit.c | 4 +-
+ fs/jfs/inode.c | 1 +
+ fs/nilfs2/inode.c | 2 +-
+ fs/ntfs/file.c | 4 +-
+ fs/ntfs/inode.c | 1 +
+ fs/ocfs2/aops.h | 2 +
+ fs/ocfs2/dlmglue.c | 2 +-
+ fs/ocfs2/file.c | 7 +-
+ fs/ocfs2/inode.h | 2 +
+ fs/ocfs2/ioctl.c | 18 +-
+ fs/pipe.c | 1 +
+ fs/proc/Makefile | 2 +-
+ fs/proc/generic.c | 62 +-
+ fs/proc/inode.c | 176 +-
+ fs/proc/internal.h | 18 -
+ fs/proc/meminfo.c | 1 +
+ fs/proc/mmu.c | 60 -
+ fs/read_write.c | 35 +-
+ fs/reiserfs/inode.c | 1 +
+ fs/splice.c | 3 +-
+ fs/ubifs/file.c | 1 +
+ fs/udf/inode.c | 1 +
+ fs/xfs/xfs_aops.c | 1 +
+ fs/xfs/xfs_file.c | 4 +-
+ include/asm-generic/hugetlb.h | 40 +
+ include/asm-generic/pgtable.h | 10 +
+ include/linux/aio.h | 199 +--
+ include/linux/balloon_compaction.h | 7 +
+ include/linux/batch_complete.h | 23 +
+ include/linux/bio.h | 36 +-
+ include/linux/blk_types.h | 12 +-
+ include/linux/blkdev.h | 12 +-
+ include/linux/buffer_head.h | 1 +
+ include/linux/cgroup.h | 8 +-
+ include/linux/cleancache.h | 4 +-
+ include/linux/console.h | 1 +
+ include/linux/debug_locks.h | 2 +-
+ include/linux/decompress/unlz4.h | 10 +
+ include/linux/errno.h | 1 -
+ include/linux/exportfs.h | 11 +
+ include/linux/frontswap.h | 36 +-
+ include/linux/fs.h | 12 +
+ include/linux/hardirq.h | 5 +
+ include/linux/hyperv.h | 12 +
+ include/linux/irq_work.h | 2 +-
+ include/linux/kernel.h | 1 -
+ include/linux/kmod.h | 17 +-
+ include/linux/lockdep.h | 92 +-
+ include/linux/lz4.h | 87 +
+ include/linux/mm.h | 62 +-
+ include/linux/mm_types.h | 3 -
+ include/linux/mmzone.h | 22 +-
+ include/linux/net.h | 4 +-
+ include/linux/pagemap.h | 2 +-
+ include/linux/percpu-refcount.h | 114 ++
+ include/linux/pid_namespace.h | 5 +-
+ include/linux/posix-timers.h | 16 +-
+ include/linux/printk.h | 13 +
+ include/linux/proc_fs.h | 6 +-
+ include/linux/ramfs.h | 8 +-
+ include/linux/random.h | 7 -
+ include/linux/relay.h | 3 -
+ include/linux/rtc-pxa.h | 18 +
+ include/linux/rtc.h | 6 +
+ include/linux/sched.h | 5 +-
+ include/linux/vm_event_item.h | 7 +-
+ include/linux/vmalloc.h | 34 +-
+ include/linux/wait.h | 86 +
+ include/linux/writeback.h | 1 +
+ include/net/ip_vs.h | 8 +-
+ include/trace/events/filemap.h | 58 +
+ include/trace/events/printk.h | 25 +-
+ include/uapi/linux/eventpoll.h | 1 +
+ include/uapi/linux/fs.h | 1 -
+ include/uapi/linux/ptrace.h | 12 +
+ include/xen/tmem.h | 8 +
+ init/Kconfig | 34 +-
+ init/do_mounts_initrd.c | 8 +-
+ init/main.c | 13 +-
+ ipc/mqueue.c | 3 +-
+ ipc/msg.c | 82 +-
+ ipc/msgutil.c | 110 +-
+ ipc/sem.c | 250 ++-
+ kernel/acct.c | 3 +-
+ kernel/cgroup.c | 49 -
+ kernel/fork.c | 5 +-
+ kernel/kexec.c | 43 +-
+ kernel/kmod.c | 98 +-
+ kernel/kthread.c | 44 +-
+ kernel/lglock.c | 12 +-
+ kernel/pid.c | 11 +-
+ kernel/pid_namespace.c | 2 -
+ kernel/posix-cpu-timers.c | 390 ++---
+ kernel/printk.c | 116 +-
+ kernel/ptrace.c | 81 +
+ kernel/range.c | 3 +-
+ kernel/rcutree.c | 2 +-
+ kernel/relay.c | 15 +-
+ kernel/sched/sched.h | 1 +
+ kernel/semaphore.c | 8 +-
+ kernel/signal.c | 6 +-
+ kernel/smp.c | 102 +-
+ kernel/sys.c | 67 +-
+ kernel/sysctl.c | 1 -
+ kernel/test_kprobes.c | 2 +-
+ kernel/time/timer_list.c | 112 +-
+ kernel/watchdog.c | 15 +-
+ lib/Kconfig | 13 +
+ lib/Kconfig.debug | 18 +
+ lib/Makefile | 7 +-
+ lib/argv_split.c | 87 +-
+ lib/bust_spinlocks.c | 3 +-
+ lib/decompress.c | 5 +
+ lib/decompress_unlz4.c | 187 ++
+ lib/dma-debug.c | 45 +-
+ lib/fault-inject.c | 2 +-
+ lib/int_sqrt.c | 32 +-
+ lib/list_sort.c | 2 +-
+ lib/lz4/Makefile | 3 +
+ lib/lz4/lz4_compress.c | 443 +++++
+ lib/lz4/lz4_decompress.c | 326 ++++
+ lib/lz4/lz4defs.h | 156 ++
+ lib/lz4/lz4hc_compress.c | 539 ++++++
+ lib/percpu-refcount.c | 243 +++
+ lib/show_mem.c | 3 +
+ {arch/s390/lib => lib}/usercopy.c | 3 +-
+ lib/uuid.c | 8 +-
+ mm/balloon_compaction.c | 2 +
+ mm/bounce.c | 21 +-
+ mm/cleancache.c | 265 ++-
+ mm/dmapool.c | 5 +-
+ mm/filemap.c | 8 +-
+ mm/frontswap.c | 156 +-
+ mm/hugetlb.c | 31 +-
+ mm/memblock.c | 3 +
+ mm/memcontrol.c | 346 +++-
+ mm/memory-failure.c | 4 +-
+ mm/memory_hotplug.c | 2 +-
+ mm/migrate.c | 1 +
+ mm/mmap.c | 35 +-
+ mm/mmu_context.c | 3 -
+ mm/nommu.c | 7 +-
+ mm/page-writeback.c | 4 -
+ mm/page_alloc.c | 41 +-
+ mm/page_io.c | 1 +
+ mm/rmap.c | 3 +
+ mm/shmem.c | 6 +-
+ mm/swap.c | 1 +
+ mm/swapfile.c | 19 +-
+ mm/util.c | 1 -
+ mm/vmalloc.c | 218 ++-
+ mm/vmscan.c | 4 -
+ mm/vmstat.c | 9 +-
+ net/core/pktgen.c | 42 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 4 +-
+ net/netfilter/nf_conntrack_core.c | 4 +-
+ net/sched/sch_choke.c | 2 +-
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +-
+ scripts/Makefile.headersinst | 4 +-
+ scripts/Makefile.lib | 5 +
+ scripts/checkpatch.pl | 26 +-
+ scripts/decodecode | 8 +-
+ scripts/get_maintainer.pl | 2 +-
+ scripts/headers_install.pl | 63 -
+ scripts/headers_install.sh | 43 +
+ security/keys/internal.h | 2 +
+ security/keys/keyctl.c | 1 +
+ security/keys/request_key.c | 13 +-
+ sound/core/info.c | 8 +-
+ sound/core/pcm_native.c | 2 +-
+ tools/testing/selftests/Makefile | 3 +
+ tools/testing/selftests/epoll/Makefile | 11 +
+ tools/testing/selftests/epoll/test_epoll.c | 364 ++++
+ tools/testing/selftests/ptrace/Makefile | 10 +
+ tools/testing/selftests/ptrace/peeksiginfo.c | 214 +++
+ tools/testing/selftests/timers/Makefile | 8 +
+ tools/testing/selftests/timers/posix_timers.c | 221 +++
+ usr/Kconfig | 9 +
+ 507 files changed, 10533 insertions(+), 5654 deletions(-)
+ create mode 100644 arch/arm/boot/compressed/piggy.lz4.S
+ delete mode 100644 arch/sparc/lib/usercopy.c
+ delete mode 100644 arch/x86/kernel/cpu/mkcapflags.pl
+ create mode 100644 arch/x86/kernel/cpu/mkcapflags.sh
+ create mode 100644 crypto/lz4.c
+ create mode 100644 crypto/lz4hc.c
+ create mode 100644 drivers/video/backlight/ili922x.c
+ create mode 100644 drivers/video/hyperv_fb.c
+ delete mode 100644 fs/proc/mmu.c
+ create mode 100644 include/asm-generic/hugetlb.h
+ create mode 100644 include/linux/batch_complete.h
+ create mode 100644 include/linux/decompress/unlz4.h
+ create mode 100644 include/linux/lz4.h
+ create mode 100644 include/linux/percpu-refcount.h
+ create mode 100644 include/linux/rtc-pxa.h
+ create mode 100644 include/trace/events/filemap.h
+ create mode 100644 lib/decompress_unlz4.c
+ create mode 100644 lib/lz4/Makefile
+ create mode 100644 lib/lz4/lz4_compress.c
+ create mode 100644 lib/lz4/lz4_decompress.c
+ create mode 100644 lib/lz4/lz4defs.h
+ create mode 100644 lib/lz4/lz4hc_compress.c
+ create mode 100644 lib/percpu-refcount.c
+ rename {arch/s390/lib => lib}/usercopy.c (73%)
+ delete mode 100644 scripts/headers_install.pl
+ create mode 100644 scripts/headers_install.sh
+ create mode 100644 tools/testing/selftests/epoll/Makefile
+ create mode 100644 tools/testing/selftests/epoll/test_epoll.c
+ create mode 100644 tools/testing/selftests/ptrace/Makefile
+ create mode 100644 tools/testing/selftests/ptrace/peeksiginfo.c
+ create mode 100644 tools/testing/selftests/timers/Makefile
+ create mode 100644 tools/testing/selftests/timers/posix_timers.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..73a68740ab47
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,4 @@
+Importing jdelvare-hwmon based on 10b38669d64c757cfd927e3820292c580ed70aae
+Unchanged quilt series jdelvare-hwmon
+Importing device-mapper based on v3.9-rc3
+Unchanged quilt series device-mapper
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..d388a6432dc9
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20130322