Add linux-next specific files for 20130219
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..3176d05
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,218 @@
+Name SHA1
+---- ----
+origin e9cf59aeeea49ae84ffcf0e28699b46d705e85f0
+fixes d287b8750e47c1702dab0e37ac11012bb751ece0
+kbuild-current 02f3e53a131c8aa3fe3c954058f1add5beeae621
+arm-current 7c4e9ced424be4d36df6a3e3825763e97ee97607
+m68k-current 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39
+powerpc-merge eda8eebdd153c48a4e2a3a3ac3cd9e2e31f5c6b3
+sparc f741656d646f7a5b56ba86765205b954237e7956
+net 18cf0d0784b4a634472ed24d0d7ca1c721d93e90
+ipsec 6642f91c92da07369cf1e582503ea3ccb4a7f1a9
+sound-current 602b3e08f601f41aa1b9eed15017ef18b81f4772
+pci-current 249bfb83cf8ba658955f0245ac3981d941f746ee
+wireless d786f67e5c587a4de8245336cb64cf4dd06871a7
+driver-core.current 949db153b6466c6f7cad5a427ecea94985927311
+tty.current 949db153b6466c6f7cad5a427ecea94985927311
+usb.current 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39
+staging.current 949db153b6466c6f7cad5a427ecea94985927311
+char-misc.current 949db153b6466c6f7cad5a427ecea94985927311
+input-current 9937c026820baabd1e908a9c1e6bdc846293000a
+md-current 0ecfa11f08c79be05eb00bba537e764e6672774d
+audit-current c158a35c8a681cf68d36f22f058f9f5466386c71
+crypto-current a2c0911c09190125f52c9941b9d187f601c2f7be
+ide 9974e43d900af7979e0a571b8e0c9674c7399b79
+dwmw2 084a0ec1e3704d6c3714a665db755d581f797f67
+sh-current 44033109e99cf584d6285226ed521098f5ef7250
+irqdomain-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+devicetree-current ab28698d33af05abab0bcf8021eafe38f7434f24
+spi-current d3601e56cf64a3f2df6f6380cccb3644274406e2
+gpio-current bc1008cf7d243cf6ad87b1e16d3dbbd8c8d6f35c
+rr-fixes aded024a12b32fc1ed9a80639681daae2d07ec25
+asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced
+arc fc32781bfdb56dad883469b65e468e749ef35fe5
+arm 7ddcf4642a0519fa2b4c324775805b4de3d0d105
+arm-perf 5ef1240dcbc8db427172480f6abe85cb12113b28
+davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625
+xilinx 42ead3a591aeadb2722753aecf59f2ae63719075
+arm64 ec45d1cfd3cb65121fc52f39efc17d832f4f7b91
+blackfin 86794b43569c9b8936dff2e8eed503393379af6e
+c6x 93bbd0c087eb299e0fe11c59d340932180c082b5
+cris 77c8006d8df4d5bafeb1d15eafa0886ae96e9b17
+hexagon e1858b2a21cd84a855945a4747fb2db41b250c22
+ia64 c9500a763ce7a88d6b9648a12038d02ae6724d58
+m68k 561839598e61f03c9175183ea066b2b7fa58ce85
+m68knommu 8a67f216bacd9b0331210b968e54678276fe2a9c
+metag f1cbc24247f5cc7dc698d81d4963ec9a72681c50
+microblaze 711e5b4520986380700e6f095608021cf087170e
+mips 38ab365e254552c04da9e9aeb1b5a26e8a7af1b5
+openrisc ae6fef1790512edde8776ee2a158b1e13d085f61
+parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1
+powerpc 25e138149c19fa0680147b825be475f5fd57f155
+4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d
+mpc5xxx 790f9a4fb8462e779956df54c2eb9587ff30ca0d
+galak 64871ff6e8f19c99bc6b9a93e4f8926e1650e61e
+s390 e80cfc31d872b6b85b8966bce6ba80bee401a7dd
+sh 035688d9c64c61957dd272a1e773f27b0143704d
+sparc-next c4271c6e37c32105492cbbed35f45330cb327b94
+tile ecc46c516df87aec7be48cb9ef744d8332444fd8
+unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2
+xtensa 0ed93fe192dc8c1ecdb93f178e4ee868a5df2803
+btrfs fb8ec37f5160f8911837d8bf25cc00eb50c0dae3
+ceph 3ebc21f7bc2f9c0145bbbf0f12430b766a200f9f
+cifs 499288039f73bd8a7d871b57cb9582b15ab2a99b
+configfs b930c26416c4ea6855726fd977145ccea9afbdda
+ecryptfs 1101d58669a92ed9c9f4c7281404fb1e067a1e28
+ext3 712ddc52ffa1f5324cd8f682d9e5b047b91f34d3
+ext4 e75941777dcbe370c994d9823e0151ef0361b86e
+f2fs 7dd690c82029ed34aafdb58ce7463cdead69abb5
+fuse 23c153e54197171f30b889d9654929d74b6599d5
+gfs2 fd95e81cb1c74c9acd2356821faa9f24c2fec365
+jfs 9d48017bce890b19e3bba649850bdbc8a6f95903
+logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c
+nfs 5a12cca697aca5dfba42a7d4c3356acc0445a2b0
+nfsd 56edc86b5a72bdbc86358e57fb09165136baf0b8
+ocfs2 4538df64655dcfe17b33080b219dc783161a262e
+omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84
+squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa
+v9fs b6f4bee02f682d1c86ece297871b78ae01afaaf4
+ubifs a28ad42a4a0c6f302f488f26488b8b37c9b30024
+xfs 1e82379b018ceed0f0912327c60d73107dacbcb3
+vfs 3a142ed962958d3063f648738a3384ab90017100
+pci fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1
+hid 06d3141a8188c644c280f23d3265ed94b3c78f32
+i2c 58823c72f6b95414fa11cb8a0e5f1d0e548c2f34
+jdelvare-hwmon 54e37b8dbe9a398f74cef313404bd2f1deca7853
+hwmon-staging f8d9f79e601b9086f62bf1f07de385af4930d30e
+v4l-dvb eccaaad4b07a0c2c67b32be23e2067bdfc2fd24c
+kbuild ef247b8af97e87c404cd80ffd58f16309df85721
+kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb
+libata 44ec657be09e36091281674a5702f1c43ce22d94
+infiniband 8c2906695e0cb8f867ae09d962bc5b35636b76b0
+pstore ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6
+pm 10baf04e95fbf7eb6089410220a547211dd2ffa7
+idle ca62cf59ceef10ff2ebca0e7f764507186870270
+apm fb9d78aca709b7a6389c79d6211fb384c69bb79f
+cpuidle d1c3ed669a2d452cacfb48c2d171a1f364dae2ed
+cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37
+thermal 9d185d0417e518fd9cfce90ec2ad75f70771bbaa
+ieee1394 db2cad2f55078e90f84960b84b721291efa83d36
+ubi eab737722ed6a5638f6251e83f0d293c2ffe549f
+dlm f11722834605a155022a8098ad7d8adacf44b22f
+swiotlb af51a9f1848ff50079a10def56a2c064f326af22
+scsi 52cb5cbe9b8ed89db0f8c9eeec8410fcfb0887fd
+target-updates 71f41fe1fafae2e407ef19d8174207f7ff80b387
+target-merge d1c3ed669a2d452cacfb48c2d171a1f364dae2ed
+ibft 935a9fee51c945b8942be2d7b4bae069167b4886
+isci 6734092e66011def7875bd67beef889d0fee1cc9
+slave-dma 42cf20980cded7e0ecdd6dba74592d059c6a8bda
+dmaengine 7f3498666c7b44f979720404d9ba883c309e60ad
+net-next 8064b3cf750e71fdaf306abb4433a93d0f45f4c9
+ipsec-next 7cb8a93968e395e40a72a50da0b6114e752304b4
+wireless-next b53cf458ea20dd7f5e32611366f63728e40c9021
+bluetooth 9e97d14b4923da524d202f2e005d5d30b70db9d6
+mtd 0ce82b7f7b7373b16ecf7b5725e21e2975204500
+l2-mtd be0638d9e4795254e28e39eff61e38f47d240fd2
+crypto 7eb9c5df92361c55daab4d8d4e8468eb774e297b
+drm 3314fdf8b44bd4914050614fa2c56b7c587fabc2
+drm-intel 1a1b91bcd10123e3983f21627c27e9bcca710773
+sound e6e0ee507f630350d883bb3343e78cab30cad5e2
+sound-asoc 54759313ececcbd07e43fad75e0683e39a1f2a25
+modules d9d8d7ed498ec65bea72dd24be7b9cd35af0c200
+pekey 736c71ba3288ffb44b52ac59b1b5e3443dc48500
+virtio 8078db789a92b10ff6e2d713231b5367e014c53b
+input 005a69d632cd8694061c2dd27492fe874780b5ee
+input-mt 6f0c0580b70c89094b3422ba81118c7b959c7556
+cgroup 5d30b00ad6695c879ee1925c0aa85ad592bf1642
+block 2b03d00dc41084cd076f229ce88d8c3410ba2a89
+device-mapper 3152bf71ec895a56d27a7d6938d3e8391efb4288
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98
+mmc 63af0fe3835926ff141c58c100d232a0f5fc118a
+kgdb 58bcdf6847831913b41e9dfee1cbc579f939ef8b
+slab b1e0541674904db00e17ce646b0a1d54f59136a5
+uclinux b69f0859dc8e633c5d8c06845811588fe17e68b3
+md 106007154abfada940c979284570448094126eb2
+mfd ff7109fa632654eaef657186f2942f5b679023d6
+battery ac6324e7021dfa917ce4f9a836318c3e46fbb84e
+fbdev a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565
+viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77
+omap_dss2 e7f5c9a16ea2648a3e85af8e34191026bf3dcb62
+regulator 797cbe2a1078177d7ea4ad0f89ecc659deed9364
+security 5b2660326039a32b28766cb4c1a8b1bdcfadc375
+selinux c2d7b247f0c028d325a5da5b9611b60ba160f237
+lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02
+watchdog fbf57548ad8b4a986694349a33295635e9b5e4bd
+dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351
+iommu c2c25cf1d244d4afdb99e5f895e4567f07716945
+vfio 84237a826b261de7ddd3d09ee53ee68cb4138937
+osd 861d66601acda6d7a2038fb3c95f68009128003a
+jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193
+trivial df63447f1a4402d7d9c6a9cd1c39a6d6766452d1
+audit dcd6c92267155e70a94b3927bce681ce74b80d1f
+fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06
+edac 1c069100c1f5577ecde06b3a366b73f520854c4e
+edac-amd e7d2c215e56dc9fa0a01e26f2acfc3d73c889ba3
+devicetree 02bbde7849e68e193cefaa1885fe0df0f03c9fcd
+dt-rh 1421954bf9b967d819db23c911f950a2ccd60eff
+spi 095c3752e673c0ba039a2f67fd867297fde75ae7
+spi-mb a3496855d9f1948d1b977afe8bd922725ded05d5
+tip b2f7365cc87c4018ce386fba72eca04c006e8167
+ftrace 5ec8d0104fd81d86cb7386c228e73ae635f1d74d
+rcu 7a6b55e7108b3476d13ee9501ec69dbe1605d774
+cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee
+uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa
+kvm cbd29cb6e38af6119df2cdac0c58acf0e85c177e
+kvm-ppc 899f7b26bc4549cd5da8ac7688ed7e9d017f21b5
+oprofile 44009105081b51417f311f4c3be0061870b6b8ed
+fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa
+xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495
+xen-two 20fbb971ac1b4ddc60a25537398eb947e0bb3f4f
+xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59
+percpu 5479c78ac6f688ea5ea8c49b44cf90ea87b63931
+workqueues a4791ca4279d2f7540313a69b1a1512ef77340b0
+drivers-x86 6710c61d03d5bab8321208156113a31676967407
+hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49
+sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00
+regmap a2b37efc4e2aa76a5be29bbde8a2cd1c9c9066bc
+hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a
+leds 4b07c5d5123f76487c61cf9dc3f987d0b8c88a94
+driver-core 74fef7a8fd1d2bd94f925d6638bb4c3049e7c381
+tty 9e17df37d710f8998e9cb10a548304fe33d4a5c2
+usb e2ced16661b807b0a5db4f00000eaeb21da4b251
+staging 951348b377385475aa256c27e1c9e2564c9ec160
+char-misc 29e5507ae4ab34397f538f06b7070c81a4e4a2bf
+tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+writeback ed84825b785ceb932af7dd5aa08614801721320b
+arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268
+hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad
+pinctrl ade158eb53eed40f6090e9f7ee6ee3513ec1eec4
+vhost 0e9ff68cfd66b15cc80e622c11eff64aae00cba5
+memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077
+remoteproc 6f0c0580b70c89094b3422ba81118c7b959c7556
+irqdomain 560aa5394d2db5437b2deb3bb897655f0fd99f61
+gpio e9a65bb63e5fe45b9d0ecd1983749786858da14d
+gpio-lw c7886b18273b07042e25e8d3ba5c983837b84123
+arm-soc 84f4327a7f459b500314b17cfa03b5da199464bf
+bcm2835 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39
+cortex 6ebd4d038dbb626a43d87db3007e71f92f49d7b3
+ep93xx cf92d8632cc73503b62ff58c32bfbdb2459a1e60
+ixp4xx b94740b3b38fd8e37fcd3bb06a18ec2796061c7d
+msm a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+renesas ae48ed8ce7e5e04ae7f8f2093c9ba5d0136ce3d2
+samsung 786b27035d1348bdefbdd658a8ea6d0a2126e799
+tegra b76340f72bc7b343fa8a3850ce9f95f269aa8148
+dma-mapping ee06158e9cf9e5261da23ff39a0c372bb532fc77
+pwm 30f786170352b8264bc7b61c2482713e54accec8
+dma-buf 90b6e90cb03352a352015ca213ac9f4fab3308f3
+userns 139321c65c0584cd65c4c87a5eb3fdb4fdbd0e19
+ktest 7328735cbf68b7cd4d7ef16e172013743cdc2bc4
+signal 235b80226b986dabcbba844968f7807866bd0bfe
+clk fde8bc59c03c0ad1fa4f655e0ed5cc1f76d11e8b
+random 6133705494bb02953e1e2cc3018a4373981b3c97
+lzo-update ba32bf9f4149eeab14bb97ca2edd2f8d1619dfd8
+modem_shm c68dc8d45b3145942d6c7000cd3b9c504604ea10
+scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47
+akpm-current 4d918924509b26ac1eee5826fef597b9c5da4f62
+akpm 8b8117d31ddcf9d611cab1d87508f81111dacb1e
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..f2cca207
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,220 @@
+Trees included into this release:
+
+Name Type URL
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes
+arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+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
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://github.com/foss-for-synopsys-dwc-arc-processors/linux.git#arc-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
+pekey git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-modsign.git#devel-pekey
+virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+input-mt git git://github.com/rydberg/linux.git#for-next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/
+embedded git git://git.infradead.org/embedded-2.6.git#master
+firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+slab git git://github.com/penberg/linux.git#for-next
+uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next
+md git git://neil.brown.name/md#for-next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next
+battery git git://git.infradead.org/battery-2.6.git#master
+fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next
+viafb git git://github.com/schandinat/linux-2.6.git#viafb-next
+omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next
+selinux git git://git.infradead.org/users/eparis/selinux.git#master
+lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+osd git git://git.open-osd.org/linux-open-osd.git#linux-next
+jc_docs git git://git.lwn.net/linux-2.6.git#docs-next
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next
+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
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next
+writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next
+arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next
+hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map
+remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next
+irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next
+gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next
+gpio-lw git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next
+cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next
+ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next
+ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next
+msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next
+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
+modem_shm git git://github.com/sjurbren/modem-ipc.git#remoteproc-next
+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 0000000..a5fc739
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,16531 @@
+$ date
+Tuesday 19 February 09:55:27 EST 2013
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at f741656 Merge tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
+Merging origin/master (e9cf59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
+$ git merge origin/master
+Updating f741656..e9cf59a
+Fast-forward
+ drivers/input/input.c | 16 ++++++++++++++--
+ drivers/input/keyboard/lm8323.c | 2 +-
+ drivers/input/tablet/wacom_sys.c | 6 +++---
+ mm/page_alloc.c | 15 +++++++++------
+ 4 files changed, 27 insertions(+), 12 deletions(-)
+Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
+$ git merge kbuild-current/rc-fixes
+Merge made by the 'recursive' strategy.
+ scripts/kconfig/lxdialog/dialog.h | 1 -
+ 1 file changed, 1 deletion(-)
+Merging arm-current/fixes (7c4e9ce ARM: 7643/1: sched: correct update_sched_clock())
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/kernel/sched_clock.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging m68k-current/for-linus (836dc9e Linux 3.8-rc7)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (eda8eeb powerpc/mm: Fix hash computation function)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (f741656 Merge tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (18cf0d0 xfrm: release neighbor upon dst destruction)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ arch/arm/net/bpf_jit_32.c | 15 +++++++++++----
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
+ drivers/net/usb/cdc_ncm.c | 11 ++++++++---
+ drivers/net/xen-netback/interface.c | 3 +--
+ drivers/net/xen-netback/netback.c | 8 ++++----
+ include/net/sock.h | 2 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +++---
+ net/ipv6/xfrm6_policy.c | 2 ++
+ net/netfilter/nf_conntrack_helper.c | 4 +++-
+ net/netfilter/nf_conntrack_netlink.c | 3 +++
+ net/tipc/bcast.c | 1 +
+ 12 files changed, 39 insertions(+), 20 deletions(-)
+Merging ipsec/master (6642f91 dm9601: support dm9620 variant)
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (602b3e0 Merge tag 'asoc-v3.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/drivers/aloop.c | 5 ++++-
+ sound/pci/hda/patch_hdmi.c | 11 +++++++----
+ sound/soc/codecs/arizona.c | 11 ++++++++++-
+ sound/soc/codecs/tlv320aic3x.c | 4 ++--
+ sound/soc/codecs/wm2000.c | 31 ++++++++++++++++++++++++++++---
+ sound/soc/codecs/wm2200.c | 4 ++--
+ sound/soc/codecs/wm_adsp.c | 14 +++++++++++---
+ sound/soc/davinci/davinci-mcasp.c | 2 +-
+ sound/soc/dwc/designware_i2s.c | 4 ++++
+ sound/soc/samsung/s3c24xx-i2s.c | 2 +-
+ sound/soc/ux500/mop500.c | 2 +-
+ sound/usb/quirks-table.h | 2 +-
+ 12 files changed, 72 insertions(+), 20 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 (d786f67 mwl8k: fix band for supported channels)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (949db15 Linux 3.8-rc5)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (949db15 Linux 3.8-rc5)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (836dc9e Linux 3.8-rc7)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (949db15 Linux 3.8-rc5)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (949db15 Linux 3.8-rc5)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (9937c02 Input: wacom - fix wacom_set_report retry logic)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (0ecfa11 md: protect against crash upon fsync on ro array)
+$ git merge md-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/md/md.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+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 (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option)
+$ git merge dwmw2/master
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e0f5b00] Merge remote-tracking branch 'dwmw2/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/powerpc/Kconfig | 1 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/Kconfig.cpu | 4 ++++
+ arch/x86/Makefile | 1 +
+ 4 files changed, 7 insertions(+)
+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 (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging rr-fixes/fixes (aded024 virtio_console: Don't access uninitialized data.)
+$ git merge rr-fixes/fixes
+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/arc-next (fc32781 ARC: [plat-arcfpga] DT arc-uart bindings change: "baud" => "current-speed")
+$ git merge arc/arc-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arc/interrupts.txt | 24 +
+ MAINTAINERS | 6 +
+ arch/arc/Kbuild | 2 +
+ arch/arc/Kconfig | 458 +++++++
+ arch/arc/Kconfig.debug | 34 +
+ arch/arc/Makefile | 126 ++
+ arch/arc/boot/Makefile | 26 +
+ arch/arc/boot/dts/Makefile | 13 +
+ arch/arc/boot/dts/angel4.dts | 55 +
+ arch/arc/boot/dts/skeleton.dts | 10 +
+ arch/arc/boot/dts/skeleton.dtsi | 37 +
+ arch/arc/configs/fpga_defconfig | 61 +
+ arch/arc/include/asm/Kbuild | 49 +
+ arch/arc/include/asm/arcregs.h | 433 +++++++
+ arch/arc/include/asm/asm-offsets.h | 9 +
+ arch/arc/include/asm/atomic.h | 232 ++++
+ arch/arc/include/asm/barrier.h | 42 +
+ arch/arc/include/asm/bitops.h | 516 ++++++++
+ arch/arc/include/asm/bug.h | 37 +
+ arch/arc/include/asm/cache.h | 75 ++
+ arch/arc/include/asm/cacheflush.h | 67 +
+ arch/arc/include/asm/checksum.h | 101 ++
+ arch/arc/include/asm/clk.h | 22 +
+ arch/arc/include/asm/cmpxchg.h | 143 +++
+ arch/arc/include/asm/current.h | 32 +
+ arch/arc/include/asm/defines.h | 56 +
+ arch/arc/include/asm/delay.h | 68 +
+ arch/arc/include/asm/disasm.h | 116 ++
+ arch/arc/include/asm/dma-mapping.h | 221 ++++
+ arch/arc/include/asm/dma.h | 14 +
+ arch/arc/include/asm/elf.h | 97 ++
+ arch/arc/include/asm/entry.h | 724 +++++++++++
+ arch/arc/include/asm/exec.h | 15 +
+ arch/arc/include/asm/futex.h | 151 +++
+ arch/arc/include/asm/io.h | 105 ++
+ arch/arc/include/asm/irq.h | 25 +
+ arch/arc/include/asm/irqflags.h | 153 +++
+ arch/arc/include/asm/kdebug.h | 19 +
+ arch/arc/include/asm/kgdb.h | 61 +
+ arch/arc/include/asm/kprobes.h | 62 +
+ arch/arc/include/asm/linkage.h | 63 +
+ arch/arc/include/asm/mach_desc.h | 85 ++
+ arch/arc/include/asm/mmu.h | 23 +
+ arch/arc/include/asm/mmu_context.h | 213 ++++
+ arch/arc/include/asm/module.h | 28 +
+ arch/arc/include/asm/mutex.h | 18 +
+ arch/arc/include/asm/page.h | 109 ++
+ arch/arc/include/asm/perf_event.h | 13 +
+ arch/arc/include/asm/pgalloc.h | 134 ++
+ arch/arc/include/asm/pgtable.h | 405 ++++++
+ arch/arc/include/asm/processor.h | 151 +++
+ arch/arc/include/asm/prom.h | 14 +
+ arch/arc/include/asm/ptrace.h | 130 ++
+ arch/arc/include/asm/sections.h | 18 +
+ arch/arc/include/asm/segment.h | 24 +
+ arch/arc/include/asm/serial.h | 25 +
+ arch/arc/include/asm/setup.h | 37 +
+ arch/arc/include/asm/smp.h | 130 ++
+ arch/arc/include/asm/spinlock.h | 144 +++
+ arch/arc/include/asm/spinlock_types.h | 35 +
+ arch/arc/include/asm/string.h | 40 +
+ arch/arc/include/asm/switch_to.h | 41 +
+ arch/arc/include/asm/syscall.h | 72 ++
+ arch/arc/include/asm/syscalls.h | 29 +
+ arch/arc/include/asm/thread_info.h | 121 ++
+ arch/arc/include/asm/timex.h | 18 +
+ arch/arc/include/asm/tlb-mmu1.h | 104 ++
+ arch/arc/include/asm/tlb.h | 58 +
+ arch/arc/include/asm/tlbflush.h | 28 +
+ arch/arc/include/asm/uaccess.h | 751 +++++++++++
+ arch/arc/include/asm/unaligned.h | 29 +
+ arch/arc/include/asm/unwind.h | 163 +++
+ arch/arc/include/uapi/asm/Kbuild | 11 +
+ arch/arc/include/uapi/asm/byteorder.h | 18 +
+ arch/arc/include/uapi/asm/cachectl.h | 28 +
+ arch/arc/include/uapi/asm/page.h | 39 +
+ arch/arc/include/uapi/asm/ptrace.h | 48 +
+ arch/arc/include/uapi/asm/setup.h | 6 +
+ arch/arc/include/uapi/asm/sigcontext.h | 22 +
+ arch/arc/include/uapi/asm/signal.h | 27 +
+ arch/arc/include/uapi/asm/swab.h | 98 ++
+ arch/arc/include/uapi/asm/unistd.h | 34 +
+ arch/arc/kernel/Makefile | 33 +
+ arch/arc/kernel/arc_hostlink.c | 58 +
+ arch/arc/kernel/arcksyms.c | 56 +
+ arch/arc/kernel/asm-offsets.c | 64 +
+ arch/arc/kernel/clk.c | 21 +
+ arch/arc/kernel/ctx_sw.c | 109 ++
+ arch/arc/kernel/ctx_sw_asm.S | 58 +
+ arch/arc/kernel/devtree.c | 108 ++
+ arch/arc/kernel/disasm.c | 538 ++++++++
+ arch/arc/kernel/entry.S | 839 ++++++++++++
+ arch/arc/kernel/fpu.c | 55 +
+ arch/arc/kernel/head.S | 111 ++
+ arch/arc/kernel/irq.c | 273 ++++
+ arch/arc/kernel/kgdb.c | 205 +++
+ arch/arc/kernel/kprobes.c | 525 ++++++++
+ arch/arc/kernel/module.c | 145 +++
+ arch/arc/kernel/process.c | 235 ++++
+ arch/arc/kernel/ptrace.c | 158 +++
+ arch/arc/kernel/reset.c | 33 +
+ arch/arc/kernel/setup.c | 471 +++++++
+ arch/arc/kernel/signal.c | 360 ++++++
+ arch/arc/kernel/smp.c | 332 +++++
+ arch/arc/kernel/stacktrace.c | 254 ++++
+ arch/arc/kernel/sys.c | 18 +
+ arch/arc/kernel/time.c | 265 ++++
+ arch/arc/kernel/traps.c | 170 +++
+ arch/arc/kernel/troubleshoot.c | 322 +++++
+ arch/arc/kernel/unaligned.c | 245 ++++
+ arch/arc/kernel/unwind.c | 1329 ++++++++++++++++++++
+ arch/arc/kernel/vmlinux.lds.S | 163 +++
+ arch/arc/lib/Makefile | 9 +
+ arch/arc/lib/memcmp.S | 124 ++
+ arch/arc/lib/memcpy-700.S | 66 +
+ arch/arc/lib/memset.S | 59 +
+ arch/arc/lib/strchr-700.S | 123 ++
+ arch/arc/lib/strcmp.S | 96 ++
+ arch/arc/lib/strcpy-700.S | 70 ++
+ arch/arc/lib/strlen.S | 83 ++
+ arch/arc/mm/Makefile | 10 +
+ arch/arc/mm/cache_arc700.c | 768 +++++++++++
+ arch/arc/mm/dma.c | 94 ++
+ arch/arc/mm/extable.c | 63 +
+ arch/arc/mm/fault.c | 228 ++++
+ arch/arc/mm/init.c | 187 +++
+ arch/arc/mm/ioremap.c | 91 ++
+ arch/arc/mm/tlb.c | 645 ++++++++++
+ arch/arc/mm/tlbex.S | 408 ++++++
+ arch/arc/oprofile/Makefile | 9 +
+ arch/arc/oprofile/common.c | 26 +
+ arch/arc/plat-arcfpga/Kconfig | 84 ++
+ arch/arc/plat-arcfpga/Makefile | 12 +
+ arch/arc/plat-arcfpga/include/plat/irq.h | 31 +
+ arch/arc/plat-arcfpga/include/plat/memmap.h | 31 +
+ arch/arc/plat-arcfpga/include/plat/smp.h | 118 ++
+ arch/arc/plat-arcfpga/irq.c | 25 +
+ arch/arc/plat-arcfpga/platform.c | 226 ++++
+ arch/arc/plat-arcfpga/smp.c | 171 +++
+ arch/parisc/Kconfig | 1 +
+ include/asm-generic/checksum.h | 4 +
+ include/asm-generic/uaccess.h | 14 +-
+ init/Kconfig | 8 +
+ kernel/sysctl.c | 5 +
+ lib/checksum.c | 2 +
+ tools/perf/perf.h | 6 +
+ 146 files changed, 19530 insertions(+), 1 deletion(-)
+ create mode 100644 Documentation/devicetree/bindings/arc/interrupts.txt
+ create mode 100644 arch/arc/Kbuild
+ create mode 100644 arch/arc/Kconfig
+ create mode 100644 arch/arc/Kconfig.debug
+ create mode 100644 arch/arc/Makefile
+ create mode 100644 arch/arc/boot/Makefile
+ create mode 100644 arch/arc/boot/dts/Makefile
+ create mode 100644 arch/arc/boot/dts/angel4.dts
+ create mode 100644 arch/arc/boot/dts/skeleton.dts
+ create mode 100644 arch/arc/boot/dts/skeleton.dtsi
+ create mode 100644 arch/arc/configs/fpga_defconfig
+ create mode 100644 arch/arc/include/asm/Kbuild
+ create mode 100644 arch/arc/include/asm/arcregs.h
+ create mode 100644 arch/arc/include/asm/asm-offsets.h
+ create mode 100644 arch/arc/include/asm/atomic.h
+ create mode 100644 arch/arc/include/asm/barrier.h
+ create mode 100644 arch/arc/include/asm/bitops.h
+ create mode 100644 arch/arc/include/asm/bug.h
+ create mode 100644 arch/arc/include/asm/cache.h
+ create mode 100644 arch/arc/include/asm/cacheflush.h
+ create mode 100644 arch/arc/include/asm/checksum.h
+ create mode 100644 arch/arc/include/asm/clk.h
+ create mode 100644 arch/arc/include/asm/cmpxchg.h
+ create mode 100644 arch/arc/include/asm/current.h
+ create mode 100644 arch/arc/include/asm/defines.h
+ create mode 100644 arch/arc/include/asm/delay.h
+ create mode 100644 arch/arc/include/asm/disasm.h
+ create mode 100644 arch/arc/include/asm/dma-mapping.h
+ create mode 100644 arch/arc/include/asm/dma.h
+ create mode 100644 arch/arc/include/asm/elf.h
+ create mode 100644 arch/arc/include/asm/entry.h
+ create mode 100644 arch/arc/include/asm/exec.h
+ create mode 100644 arch/arc/include/asm/futex.h
+ create mode 100644 arch/arc/include/asm/io.h
+ create mode 100644 arch/arc/include/asm/irq.h
+ create mode 100644 arch/arc/include/asm/irqflags.h
+ create mode 100644 arch/arc/include/asm/kdebug.h
+ create mode 100644 arch/arc/include/asm/kgdb.h
+ create mode 100644 arch/arc/include/asm/kprobes.h
+ create mode 100644 arch/arc/include/asm/linkage.h
+ create mode 100644 arch/arc/include/asm/mach_desc.h
+ create mode 100644 arch/arc/include/asm/mmu.h
+ create mode 100644 arch/arc/include/asm/mmu_context.h
+ create mode 100644 arch/arc/include/asm/module.h
+ create mode 100644 arch/arc/include/asm/mutex.h
+ create mode 100644 arch/arc/include/asm/page.h
+ create mode 100644 arch/arc/include/asm/perf_event.h
+ create mode 100644 arch/arc/include/asm/pgalloc.h
+ create mode 100644 arch/arc/include/asm/pgtable.h
+ create mode 100644 arch/arc/include/asm/processor.h
+ create mode 100644 arch/arc/include/asm/prom.h
+ create mode 100644 arch/arc/include/asm/ptrace.h
+ create mode 100644 arch/arc/include/asm/sections.h
+ create mode 100644 arch/arc/include/asm/segment.h
+ create mode 100644 arch/arc/include/asm/serial.h
+ create mode 100644 arch/arc/include/asm/setup.h
+ create mode 100644 arch/arc/include/asm/smp.h
+ create mode 100644 arch/arc/include/asm/spinlock.h
+ create mode 100644 arch/arc/include/asm/spinlock_types.h
+ create mode 100644 arch/arc/include/asm/string.h
+ create mode 100644 arch/arc/include/asm/switch_to.h
+ create mode 100644 arch/arc/include/asm/syscall.h
+ create mode 100644 arch/arc/include/asm/syscalls.h
+ create mode 100644 arch/arc/include/asm/thread_info.h
+ create mode 100644 arch/arc/include/asm/timex.h
+ create mode 100644 arch/arc/include/asm/tlb-mmu1.h
+ create mode 100644 arch/arc/include/asm/tlb.h
+ create mode 100644 arch/arc/include/asm/tlbflush.h
+ create mode 100644 arch/arc/include/asm/uaccess.h
+ create mode 100644 arch/arc/include/asm/unaligned.h
+ create mode 100644 arch/arc/include/asm/unwind.h
+ create mode 100644 arch/arc/include/uapi/asm/Kbuild
+ create mode 100644 arch/arc/include/uapi/asm/byteorder.h
+ create mode 100644 arch/arc/include/uapi/asm/cachectl.h
+ create mode 100644 arch/arc/include/uapi/asm/page.h
+ create mode 100644 arch/arc/include/uapi/asm/ptrace.h
+ create mode 100644 arch/arc/include/uapi/asm/setup.h
+ create mode 100644 arch/arc/include/uapi/asm/sigcontext.h
+ create mode 100644 arch/arc/include/uapi/asm/signal.h
+ create mode 100644 arch/arc/include/uapi/asm/swab.h
+ create mode 100644 arch/arc/include/uapi/asm/unistd.h
+ create mode 100644 arch/arc/kernel/Makefile
+ create mode 100644 arch/arc/kernel/arc_hostlink.c
+ create mode 100644 arch/arc/kernel/arcksyms.c
+ create mode 100644 arch/arc/kernel/asm-offsets.c
+ create mode 100644 arch/arc/kernel/clk.c
+ create mode 100644 arch/arc/kernel/ctx_sw.c
+ create mode 100644 arch/arc/kernel/ctx_sw_asm.S
+ create mode 100644 arch/arc/kernel/devtree.c
+ create mode 100644 arch/arc/kernel/disasm.c
+ create mode 100644 arch/arc/kernel/entry.S
+ create mode 100644 arch/arc/kernel/fpu.c
+ create mode 100644 arch/arc/kernel/head.S
+ create mode 100644 arch/arc/kernel/irq.c
+ create mode 100644 arch/arc/kernel/kgdb.c
+ create mode 100644 arch/arc/kernel/kprobes.c
+ create mode 100644 arch/arc/kernel/module.c
+ create mode 100644 arch/arc/kernel/process.c
+ create mode 100644 arch/arc/kernel/ptrace.c
+ create mode 100644 arch/arc/kernel/reset.c
+ create mode 100644 arch/arc/kernel/setup.c
+ create mode 100644 arch/arc/kernel/signal.c
+ create mode 100644 arch/arc/kernel/smp.c
+ create mode 100644 arch/arc/kernel/stacktrace.c
+ create mode 100644 arch/arc/kernel/sys.c
+ create mode 100644 arch/arc/kernel/time.c
+ create mode 100644 arch/arc/kernel/traps.c
+ create mode 100644 arch/arc/kernel/troubleshoot.c
+ create mode 100644 arch/arc/kernel/unaligned.c
+ create mode 100644 arch/arc/kernel/unwind.c
+ create mode 100644 arch/arc/kernel/vmlinux.lds.S
+ create mode 100644 arch/arc/lib/Makefile
+ create mode 100644 arch/arc/lib/memcmp.S
+ create mode 100644 arch/arc/lib/memcpy-700.S
+ create mode 100644 arch/arc/lib/memset.S
+ create mode 100644 arch/arc/lib/strchr-700.S
+ create mode 100644 arch/arc/lib/strcmp.S
+ create mode 100644 arch/arc/lib/strcpy-700.S
+ create mode 100644 arch/arc/lib/strlen.S
+ create mode 100644 arch/arc/mm/Makefile
+ create mode 100644 arch/arc/mm/cache_arc700.c
+ create mode 100644 arch/arc/mm/dma.c
+ create mode 100644 arch/arc/mm/extable.c
+ create mode 100644 arch/arc/mm/fault.c
+ create mode 100644 arch/arc/mm/init.c
+ create mode 100644 arch/arc/mm/ioremap.c
+ create mode 100644 arch/arc/mm/tlb.c
+ create mode 100644 arch/arc/mm/tlbex.S
+ create mode 100644 arch/arc/oprofile/Makefile
+ create mode 100644 arch/arc/oprofile/common.c
+ create mode 100644 arch/arc/plat-arcfpga/Kconfig
+ create mode 100644 arch/arc/plat-arcfpga/Makefile
+ create mode 100644 arch/arc/plat-arcfpga/include/plat/irq.h
+ create mode 100644 arch/arc/plat-arcfpga/include/plat/memmap.h
+ create mode 100644 arch/arc/plat-arcfpga/include/plat/smp.h
+ create mode 100644 arch/arc/plat-arcfpga/irq.c
+ create mode 100644 arch/arc/plat-arcfpga/platform.c
+ create mode 100644 arch/arc/plat-arcfpga/smp.c
+Merging arm/for-next (7ddcf46 Merge branches 'devel-stable', 'fixes' and 'mmci' into for-next)
+$ git merge arm/for-next
+Removing arch/arm/mm/vmregion.h
+Removing arch/arm/mm/vmregion.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/psci.txt | 55 ++
+ Documentation/virtual/kvm/api.txt | 99 ++-
+ MAINTAINERS | 19 +-
+ arch/arm/Kconfig | 13 +
+ arch/arm/Makefile | 1 +
+ arch/arm/crypto/aes-armv4.S | 64 +-
+ arch/arm/crypto/sha1-armv4-large.S | 24 +-
+ arch/arm/include/asm/assembler.h | 10 +-
+ arch/arm/include/asm/cputype.h | 33 +
+ arch/arm/include/asm/cti.h | 10 +-
+ arch/arm/include/asm/hardware/coresight.h | 6 +-
+ arch/arm/include/asm/hw_breakpoint.h | 3 +
+ arch/arm/include/asm/idmap.h | 1 +
+ arch/arm/include/asm/kvm_arm.h | 214 +++++
+ arch/arm/include/asm/kvm_asm.h | 82 ++
+ arch/arm/include/asm/kvm_coproc.h | 47 ++
+ arch/arm/include/asm/kvm_emulate.h | 72 ++
+ arch/arm/include/asm/kvm_host.h | 161 ++++
+ arch/arm/include/asm/kvm_mmio.h | 56 ++
+ arch/arm/include/asm/kvm_mmu.h | 50 ++
+ arch/arm/include/asm/kvm_psci.h | 23 +
+ arch/arm/include/asm/mach/pci.h | 1 +
+ arch/arm/include/asm/memory.h | 8 +-
+ arch/arm/include/asm/opcodes-sec.h | 24 +
+ arch/arm/include/asm/opcodes.h | 1 +
+ arch/arm/include/asm/outercache.h | 1 +
+ arch/arm/include/asm/pgtable-3level-hwdef.h | 5 +
+ arch/arm/include/asm/pgtable-3level.h | 18 +
+ arch/arm/include/asm/pgtable.h | 7 +
+ arch/arm/include/asm/psci.h | 36 +
+ arch/arm/include/asm/spinlock.h | 16 +-
+ arch/arm/include/asm/virt.h | 4 +-
+ arch/arm/include/uapi/asm/kvm.h | 164 ++++
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/kernel/asm-offsets.c | 25 +
+ arch/arm/kernel/bios32.c | 9 +-
+ arch/arm/kernel/hw_breakpoint.c | 61 +-
+ arch/arm/kernel/perf_event.c | 16 +-
+ arch/arm/kernel/perf_event_cpu.c | 51 +-
+ arch/arm/kernel/perf_event_v6.c | 4 +-
+ arch/arm/kernel/perf_event_v7.c | 18 +-
+ arch/arm/kernel/perf_event_xscale.c | 2 +-
+ arch/arm/kernel/psci.c | 211 +++++
+ arch/arm/kernel/smp.c | 46 +-
+ arch/arm/kernel/vmlinux.lds.S | 6 +-
+ arch/arm/kvm/Kconfig | 56 ++
+ arch/arm/kvm/Makefile | 21 +
+ arch/arm/kvm/arm.c | 1015 +++++++++++++++++++++++
+ arch/arm/kvm/coproc.c | 1046 ++++++++++++++++++++++++
+ arch/arm/kvm/coproc.h | 153 ++++
+ arch/arm/kvm/coproc_a15.c | 162 ++++
+ arch/arm/kvm/emulate.c | 373 +++++++++
+ arch/arm/kvm/guest.c | 222 +++++
+ arch/arm/kvm/init.S | 114 +++
+ arch/arm/kvm/interrupts.S | 478 +++++++++++
+ arch/arm/kvm/interrupts_head.S | 441 ++++++++++
+ arch/arm/kvm/mmio.c | 153 ++++
+ arch/arm/kvm/mmu.c | 787 ++++++++++++++++++
+ arch/arm/kvm/psci.c | 108 +++
+ arch/arm/kvm/reset.c | 74 ++
+ arch/arm/kvm/trace.h | 235 ++++++
+ arch/arm/mach-versatile/core.c | 15 +-
+ arch/arm/mach-versatile/pci.c | 11 +-
+ arch/arm/mm/Kconfig | 10 +-
+ arch/arm/mm/Makefile | 2 +-
+ arch/arm/mm/context.c | 3 +
+ arch/arm/mm/idmap.c | 55 +-
+ arch/arm/mm/ioremap.c | 135 ++-
+ arch/arm/mm/mm.h | 12 +
+ arch/arm/mm/mmu.c | 58 +-
+ arch/arm/mm/proc-macros.S | 5 +
+ arch/arm/mm/proc-v6.S | 2 +-
+ arch/arm/mm/proc-v7-2level.S | 2 +-
+ arch/arm/mm/proc-v7-3level.S | 2 +-
+ arch/arm/mm/vmregion.c | 205 -----
+ arch/arm/mm/vmregion.h | 31 -
+ drivers/mmc/host/mmci.c | 306 ++++---
+ drivers/mmc/host/mmci.h | 3 +-
+ include/linux/clockchips.h | 9 +
+ include/uapi/linux/kvm.h | 9 +
+ kernel/time/Kconfig | 4 +
+ kernel/time/tick-broadcast.c | 30 +
+ 82 files changed, 7473 insertions(+), 652 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/psci.txt
+ create mode 100644 arch/arm/include/asm/kvm_arm.h
+ create mode 100644 arch/arm/include/asm/kvm_asm.h
+ create mode 100644 arch/arm/include/asm/kvm_coproc.h
+ create mode 100644 arch/arm/include/asm/kvm_emulate.h
+ create mode 100644 arch/arm/include/asm/kvm_host.h
+ create mode 100644 arch/arm/include/asm/kvm_mmio.h
+ create mode 100644 arch/arm/include/asm/kvm_mmu.h
+ create mode 100644 arch/arm/include/asm/kvm_psci.h
+ create mode 100644 arch/arm/include/asm/opcodes-sec.h
+ create mode 100644 arch/arm/include/asm/psci.h
+ create mode 100644 arch/arm/include/uapi/asm/kvm.h
+ create mode 100644 arch/arm/kernel/psci.c
+ create mode 100644 arch/arm/kvm/Kconfig
+ create mode 100644 arch/arm/kvm/Makefile
+ create mode 100644 arch/arm/kvm/arm.c
+ create mode 100644 arch/arm/kvm/coproc.c
+ create mode 100644 arch/arm/kvm/coproc.h
+ create mode 100644 arch/arm/kvm/coproc_a15.c
+ create mode 100644 arch/arm/kvm/emulate.c
+ create mode 100644 arch/arm/kvm/guest.c
+ create mode 100644 arch/arm/kvm/init.S
+ create mode 100644 arch/arm/kvm/interrupts.S
+ create mode 100644 arch/arm/kvm/interrupts_head.S
+ create mode 100644 arch/arm/kvm/mmio.c
+ create mode 100644 arch/arm/kvm/mmu.c
+ create mode 100644 arch/arm/kvm/psci.c
+ create mode 100644 arch/arm/kvm/reset.c
+ create mode 100644 arch/arm/kvm/trace.h
+ delete mode 100644 arch/arm/mm/vmregion.c
+ delete mode 100644 arch/arm/mm/vmregion.h
+Merging arm-perf/for-next/perf (5ef1240 Merge branches 'for-rmk/hw-breakpoint' and 'for-rmk/perf' into for-next/perf)
+$ git merge arm-perf/for-next/perf
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+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
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/zynq-7000.dtsi | 4 +-
+ arch/arm/mach-zynq/common.c | 6 +-
+ arch/arm/mach-zynq/common.h | 2 +-
+ arch/arm/mach-zynq/timer.c | 150 ++++++++++++++++++-------------------
+ drivers/tty/serial/xilinx_uartps.c | 34 +++++----
+ 5 files changed, 96 insertions(+), 100 deletions(-)
+Merging arm64/upstream (ec45d1c arm64: mm: update CONTEXTIDR register to contain PID of current process)
+$ git merge arm64/upstream
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/memory.txt | 2 +
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/Kconfig.debug | 17 +++
+ arch/arm64/include/asm/Kbuild | 2 +
+ arch/arm64/include/asm/atomic.h | 132 +++++++++++-----------
+ arch/arm64/include/asm/cmpxchg.h | 74 ++++++------
+ arch/arm64/include/asm/futex.h | 2 +-
+ arch/arm64/include/asm/io.h | 3 +
+ arch/arm64/include/asm/memory.h | 1 +
+ arch/arm64/include/asm/mmu.h | 1 +
+ arch/arm64/include/asm/mmu_context.h | 15 +++
+ arch/arm64/include/asm/perf_event.h | 7 +-
+ arch/arm64/include/asm/psci.h | 38 +++++++
+ arch/arm64/include/asm/ptrace.h | 10 ++
+ arch/arm64/include/asm/smp.h | 11 ++
+ arch/arm64/include/asm/spinlock.h | 78 ++++++-------
+ arch/arm64/include/uapi/asm/Kbuild | 3 +
+ arch/arm64/kernel/Makefile | 5 +-
+ arch/arm64/kernel/early_printk.c | 118 ++++++++++++++++++++
+ arch/arm64/kernel/head.S | 12 +-
+ arch/arm64/kernel/perf_event.c | 37 ++++++
+ arch/arm64/kernel/process.c | 4 +-
+ arch/arm64/kernel/psci.c | 211 +++++++++++++++++++++++++++++++++++
+ arch/arm64/kernel/setup.c | 11 ++
+ arch/arm64/kernel/signal32.c | 4 +-
+ arch/arm64/kernel/smp.c | 69 ++++++++----
+ arch/arm64/kernel/smp_psci.c | 52 +++++++++
+ arch/arm64/kernel/smp_spin_table.c | 66 +++++++++++
+ arch/arm64/mm/mmu.c | 42 +++++++
+ 29 files changed, 855 insertions(+), 173 deletions(-)
+ create mode 100644 arch/arm64/include/asm/psci.h
+ create mode 100644 arch/arm64/kernel/early_printk.c
+ create mode 100644 arch/arm64/kernel/psci.c
+ create mode 100644 arch/arm64/kernel/smp_psci.c
+ create mode 100644 arch/arm64/kernel/smp_spin_table.c
+Merging blackfin/for-linus (86794b4 blackfin: SEC: clean up SEC interrupt initialization)
+$ 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 (c9500a7 Merge branch 'pstore' into next)
+$ git merge ia64/next
+Resolved 'drivers/firmware/efivars.c' using previous resolution.
+Resolved 'init/Kconfig' using previous resolution.
+Auto-merging kernel/sysctl.c
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging include/linux/efi.h
+Auto-merging drivers/firmware/efivars.c
+CONFLICT (content): Merge conflict in drivers/firmware/efivars.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master dc72dbb] Merge remote-tracking branch 'ia64/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/pstore | 10 +--
+ MAINTAINERS | 11 +--
+ arch/ia64/Kconfig | 1 +
+ drivers/firmware/efivars.c | 180 +++++++++++++++++++++++++++++----------
+ fs/pstore/inode.c | 18 +++-
+ fs/pstore/platform.c | 35 ++++++--
+ include/linux/efi.h | 3 +-
+ include/linux/pstore.h | 6 ++
+ init/Kconfig | 7 ++
+ kernel/sysctl.c | 9 +-
+ 10 files changed, 209 insertions(+), 71 deletions(-)
+Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/dma-mapping.h | 5 -----
+ arch/m68k/kernel/Makefile | 4 +---
+ drivers/block/swim.c | 1 +
+ 3 files changed, 2 insertions(+), 8 deletions(-)
+Merging m68knommu/for-next (8a67f21 m68knommu: fix trap on execing /bin/init)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+Merging metag/for-next (f1cbc24 metag: cleanup metag_ksyms.c includes)
+$ git merge metag/for-next
+Resolved 'tools/perf/perf.h' using previous resolution.
+Auto-merging tools/perf/perf.h
+CONFLICT (content): Merge conflict in tools/perf/perf.h
+Auto-merging mm/page_alloc.c
+Auto-merging kernel/sysctl.c
+Auto-merging drivers/acpi/osl.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d0f6e66] Merge remote-tracking branch 'metag/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/00-INDEX | 2 +
+ .../devicetree/bindings/metag/meta-intc.txt | 82 ++
+ Documentation/kernel-parameters.txt | 4 +
+ Documentation/metag/00-INDEX | 4 +
+ Documentation/metag/kernel-ABI.txt | 256 ++++
+ MAINTAINERS | 12 +
+ arch/Kconfig | 16 +
+ arch/alpha/kernel/traps.c | 2 +-
+ arch/arm/kernel/traps.c | 2 +-
+ arch/arm64/kernel/traps.c | 2 +-
+ arch/avr32/kernel/traps.c | 2 +-
+ arch/hexagon/kernel/traps.c | 2 +-
+ arch/ia64/kernel/traps.c | 2 +-
+ arch/m68k/kernel/traps.c | 2 +-
+ arch/metag/Kconfig | 295 ++++
+ arch/metag/Kconfig.debug | 40 +
+ arch/metag/Kconfig.soc | 55 +
+ arch/metag/Makefile | 87 ++
+ arch/metag/boot/.gitignore | 4 +
+ arch/metag/boot/Makefile | 68 +
+ arch/metag/boot/dts/Makefile | 16 +
+ arch/metag/boot/dts/skeleton.dts | 10 +
+ arch/metag/boot/dts/skeleton.dtsi | 14 +
+ arch/metag/configs/meta1_defconfig | 41 +
+ arch/metag/configs/meta2_defconfig | 42 +
+ arch/metag/configs/meta2_smp_defconfig | 43 +
+ arch/metag/include/asm/Kbuild | 54 +
+ arch/metag/include/asm/atomic.h | 53 +
+ arch/metag/include/asm/atomic_lnkget.h | 234 ++++
+ arch/metag/include/asm/atomic_lock1.h | 160 +++
+ arch/metag/include/asm/barrier.h | 85 ++
+ arch/metag/include/asm/bitops.h | 132 ++
+ arch/metag/include/asm/bug.h | 12 +
+ arch/metag/include/asm/cache.h | 23 +
+ arch/metag/include/asm/cacheflush.h | 250 ++++
+ arch/metag/include/asm/cachepart.h | 42 +
+ arch/metag/include/asm/checksum.h | 92 ++
+ arch/metag/include/asm/clock.h | 51 +
+ arch/metag/include/asm/cmpxchg.h | 65 +
+ arch/metag/include/asm/cmpxchg_irq.h | 42 +
+ arch/metag/include/asm/cmpxchg_lnkget.h | 86 ++
+ arch/metag/include/asm/cmpxchg_lock1.h | 48 +
+ arch/metag/include/asm/core_reg.h | 35 +
+ arch/metag/include/asm/cpu.h | 14 +
+ arch/metag/include/asm/da.h | 43 +
+ arch/metag/include/asm/delay.h | 29 +
+ arch/metag/include/asm/div64.h | 12 +
+ arch/metag/include/asm/dma-mapping.h | 183 +++
+ arch/metag/include/asm/elf.h | 128 ++
+ arch/metag/include/asm/fixmap.h | 99 ++
+ arch/metag/include/asm/ftrace.h | 23 +
+ arch/metag/include/asm/global_lock.h | 100 ++
+ arch/metag/include/asm/gpio.h | 4 +
+ arch/metag/include/asm/highmem.h | 62 +
+ arch/metag/include/asm/hugetlb.h | 86 ++
+ arch/metag/include/asm/hwthread.h | 40 +
+ arch/metag/include/asm/io.h | 165 +++
+ arch/metag/include/asm/irq.h | 32 +
+ arch/metag/include/asm/irqflags.h | 93 ++
+ arch/metag/include/asm/l2cache.h | 258 ++++
+ arch/metag/include/asm/linkage.h | 7 +
+ arch/metag/include/asm/mach/arch.h | 86 ++
+ arch/metag/include/asm/metag_isa.h | 81 ++
+ arch/metag/include/asm/metag_mem.h | 1106 +++++++++++++++
+ arch/metag/include/asm/metag_regs.h | 1184 ++++++++++++++++
+ arch/metag/include/asm/mman.h | 11 +
+ arch/metag/include/asm/mmu.h | 77 ++
+ arch/metag/include/asm/mmu_context.h | 113 ++
+ arch/metag/include/asm/mmzone.h | 42 +
+ arch/metag/include/asm/module.h | 37 +
+ arch/metag/include/asm/page.h | 128 ++
+ arch/metag/include/asm/perf_event.h | 4 +
+ arch/metag/include/asm/pgalloc.h | 79 ++
+ arch/metag/include/asm/pgtable.h | 370 +++++
+ arch/metag/include/asm/processor.h | 202 +++
+ arch/metag/include/asm/prom.h | 23 +
+ arch/metag/include/asm/ptrace.h | 60 +
+ arch/metag/include/asm/setup.h | 8 +
+ arch/metag/include/asm/smp.h | 29 +
+ arch/metag/include/asm/sparsemem.h | 13 +
+ arch/metag/include/asm/spinlock.h | 22 +
+ arch/metag/include/asm/spinlock_lnkget.h | 249 ++++
+ arch/metag/include/asm/spinlock_lock1.h | 184 +++
+ arch/metag/include/asm/spinlock_types.h | 20 +
+ arch/metag/include/asm/stacktrace.h | 20 +
+ arch/metag/include/asm/string.h | 13 +
+ arch/metag/include/asm/switch.h | 21 +
+ arch/metag/include/asm/syscall.h | 104 ++
+ arch/metag/include/asm/syscalls.h | 39 +
+ arch/metag/include/asm/tbx.h | 1425 ++++++++++++++++++++
+ arch/metag/include/asm/tcm.h | 30 +
+ arch/metag/include/asm/thread_info.h | 155 +++
+ arch/metag/include/asm/tlb.h | 36 +
+ arch/metag/include/asm/tlbflush.h | 77 ++
+ arch/metag/include/asm/topology.h | 53 +
+ arch/metag/include/asm/traps.h | 48 +
+ arch/metag/include/asm/uaccess.h | 241 ++++
+ arch/metag/include/asm/unistd.h | 12 +
+ arch/metag/include/asm/user_gateway.h | 44 +
+ arch/metag/include/uapi/asm/Kbuild | 13 +
+ arch/metag/include/uapi/asm/byteorder.h | 1 +
+ arch/metag/include/uapi/asm/ptrace.h | 113 ++
+ arch/metag/include/uapi/asm/resource.h | 7 +
+ arch/metag/include/uapi/asm/sigcontext.h | 31 +
+ arch/metag/include/uapi/asm/siginfo.h | 8 +
+ arch/metag/include/uapi/asm/swab.h | 26 +
+ arch/metag/include/uapi/asm/unistd.h | 21 +
+ arch/metag/kernel/.gitignore | 1 +
+ arch/metag/kernel/Makefile | 39 +
+ arch/metag/kernel/asm-offsets.c | 14 +
+ arch/metag/kernel/cachepart.c | 124 ++
+ arch/metag/kernel/clock.c | 53 +
+ arch/metag/kernel/core_reg.c | 117 ++
+ arch/metag/kernel/da.c | 23 +
+ arch/metag/kernel/devtree.c | 97 ++
+ arch/metag/kernel/dma.c | 507 +++++++
+ arch/metag/kernel/ftrace.c | 126 ++
+ arch/metag/kernel/ftrace_stub.S | 76 ++
+ arch/metag/kernel/head.S | 57 +
+ arch/metag/kernel/irq.c | 323 +++++
+ arch/metag/kernel/kick.c | 101 ++
+ arch/metag/kernel/machines.c | 20 +
+ arch/metag/kernel/metag_ksyms.c | 48 +
+ arch/metag/kernel/module.c | 284 ++++
+ arch/metag/kernel/perf/Makefile | 3 +
+ arch/metag/kernel/perf/perf_event.c | 861 ++++++++++++
+ arch/metag/kernel/perf/perf_event.h | 106 ++
+ arch/metag/kernel/perf_callchain.c | 96 ++
+ arch/metag/kernel/process.c | 461 +++++++
+ arch/metag/kernel/ptrace.c | 380 ++++++
+ arch/metag/kernel/setup.c | 629 +++++++++
+ arch/metag/kernel/signal.c | 344 +++++
+ arch/metag/kernel/smp.c | 575 ++++++++
+ arch/metag/kernel/stacktrace.c | 187 +++
+ arch/metag/kernel/sys_metag.c | 180 +++
+ arch/metag/kernel/tbiunexp.S | 22 +
+ arch/metag/kernel/tcm.c | 151 +++
+ arch/metag/kernel/time.c | 15 +
+ arch/metag/kernel/topology.c | 77 ++
+ arch/metag/kernel/traps.c | 995 ++++++++++++++
+ arch/metag/kernel/user_gateway.S | 97 ++
+ arch/metag/kernel/vmlinux.lds.S | 71 +
+ arch/metag/lib/Makefile | 22 +
+ arch/metag/lib/ashldi3.S | 33 +
+ arch/metag/lib/ashrdi3.S | 33 +
+ arch/metag/lib/checksum.c | 168 +++
+ arch/metag/lib/clear_page.S | 17 +
+ arch/metag/lib/cmpdi2.S | 32 +
+ arch/metag/lib/copy_page.S | 20 +
+ arch/metag/lib/delay.c | 56 +
+ arch/metag/lib/div64.S | 108 ++
+ arch/metag/lib/divsi3.S | 100 ++
+ arch/metag/lib/ip_fast_csum.S | 32 +
+ arch/metag/lib/lshrdi3.S | 33 +
+ arch/metag/lib/memcpy.S | 185 +++
+ arch/metag/lib/memmove.S | 345 +++++
+ arch/metag/lib/memset.S | 86 ++
+ arch/metag/lib/modsi3.S | 38 +
+ arch/metag/lib/muldi3.S | 44 +
+ arch/metag/lib/ucmpdi2.S | 27 +
+ arch/metag/lib/usercopy.c | 1354 +++++++++++++++++++
+ arch/metag/mm/Kconfig | 153 +++
+ arch/metag/mm/Makefile | 19 +
+ arch/metag/mm/cache.c | 521 +++++++
+ arch/metag/mm/extable.c | 15 +
+ arch/metag/mm/fault.c | 239 ++++
+ arch/metag/mm/highmem.c | 133 ++
+ arch/metag/mm/hugetlbpage.c | 259 ++++
+ arch/metag/mm/init.c | 451 +++++++
+ arch/metag/mm/ioremap.c | 89 ++
+ arch/metag/mm/l2cache.c | 192 +++
+ arch/metag/mm/maccess.c | 68 +
+ arch/metag/mm/mmu-meta1.c | 157 +++
+ arch/metag/mm/mmu-meta2.c | 207 +++
+ arch/metag/mm/numa.c | 81 ++
+ arch/metag/tbx/Makefile | 21 +
+ arch/metag/tbx/tbicore.S | 136 ++
+ arch/metag/tbx/tbictx.S | 366 +++++
+ arch/metag/tbx/tbictxfpu.S | 190 +++
+ arch/metag/tbx/tbidefr.S | 175 +++
+ arch/metag/tbx/tbidspram.S | 161 +++
+ arch/metag/tbx/tbilogf.S | 48 +
+ arch/metag/tbx/tbipcx.S | 451 +++++++
+ arch/metag/tbx/tbiroot.S | 87 ++
+ arch/metag/tbx/tbisoft.S | 237 ++++
+ arch/metag/tbx/tbistring.c | 114 ++
+ arch/metag/tbx/tbitimer.S | 207 +++
+ arch/mips/kernel/traps.c | 2 +-
+ arch/parisc/kernel/traps.c | 2 +-
+ arch/powerpc/kernel/traps.c | 2 +-
+ arch/s390/kernel/traps.c | 2 +-
+ arch/sh/kernel/traps.c | 2 +-
+ arch/sparc/kernel/setup_64.c | 2 +-
+ arch/sparc/kernel/traps_32.c | 2 +-
+ arch/sparc/kernel/traps_64.c | 2 +-
+ arch/unicore32/kernel/traps.c | 2 +-
+ arch/x86/kernel/cpu/amd.c | 3 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/p5.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/winchip.c | 2 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 2 +-
+ arch/x86/kernel/dumpstack.c | 2 +-
+ arch/xtensa/kernel/traps.c | 2 +-
+ drivers/acpi/custom_method.c | 2 +-
+ drivers/acpi/osl.c | 2 +-
+ drivers/base/regmap/regmap-debugfs.c | 2 +-
+ drivers/clocksource/Kconfig | 5 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/metag_generic.c | 198 +++
+ drivers/irqchip/Makefile | 2 +
+ drivers/irqchip/irq-metag-ext.c | 868 ++++++++++++
+ drivers/irqchip/irq-metag.c | 343 +++++
+ fs/binfmt_elf.c | 4 +
+ include/asm-generic/io.h | 2 +
+ include/asm-generic/unistd.h | 9 +-
+ include/clocksource/metag_generic.h | 21 +
+ include/linux/irqchip/metag-ext.h | 33 +
+ include/linux/irqchip/metag.h | 24 +
+ include/linux/kernel.h | 6 +-
+ include/linux/mm.h | 2 +
+ include/uapi/linux/elf.h | 2 +
+ kernel/module.c | 33 +-
+ kernel/panic.c | 34 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sysctl.c | 2 +-
+ kernel/trace/ring_buffer.c | 6 +-
+ lib/Kconfig.debug | 4 +-
+ lib/bug.c | 3 +-
+ mm/memory.c | 2 +-
+ mm/page_alloc.c | 2 +-
+ mm/slab.c | 2 +-
+ mm/slub.c | 2 +-
+ scripts/checkstack.pl | 8 +-
+ scripts/genksyms/genksyms.c | 3 +-
+ scripts/recordmcount.c | 13 +
+ sound/soc/soc-core.c | 2 +-
+ tools/perf/perf.h | 6 +
+ 237 files changed, 26990 insertions(+), 76 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/metag/meta-intc.txt
+ create mode 100644 Documentation/metag/00-INDEX
+ create mode 100644 Documentation/metag/kernel-ABI.txt
+ create mode 100644 arch/metag/Kconfig
+ create mode 100644 arch/metag/Kconfig.debug
+ create mode 100644 arch/metag/Kconfig.soc
+ create mode 100644 arch/metag/Makefile
+ create mode 100644 arch/metag/boot/.gitignore
+ create mode 100644 arch/metag/boot/Makefile
+ create mode 100644 arch/metag/boot/dts/Makefile
+ create mode 100644 arch/metag/boot/dts/skeleton.dts
+ create mode 100644 arch/metag/boot/dts/skeleton.dtsi
+ create mode 100644 arch/metag/configs/meta1_defconfig
+ create mode 100644 arch/metag/configs/meta2_defconfig
+ create mode 100644 arch/metag/configs/meta2_smp_defconfig
+ create mode 100644 arch/metag/include/asm/Kbuild
+ create mode 100644 arch/metag/include/asm/atomic.h
+ create mode 100644 arch/metag/include/asm/atomic_lnkget.h
+ create mode 100644 arch/metag/include/asm/atomic_lock1.h
+ create mode 100644 arch/metag/include/asm/barrier.h
+ create mode 100644 arch/metag/include/asm/bitops.h
+ create mode 100644 arch/metag/include/asm/bug.h
+ create mode 100644 arch/metag/include/asm/cache.h
+ create mode 100644 arch/metag/include/asm/cacheflush.h
+ create mode 100644 arch/metag/include/asm/cachepart.h
+ create mode 100644 arch/metag/include/asm/checksum.h
+ create mode 100644 arch/metag/include/asm/clock.h
+ create mode 100644 arch/metag/include/asm/cmpxchg.h
+ create mode 100644 arch/metag/include/asm/cmpxchg_irq.h
+ create mode 100644 arch/metag/include/asm/cmpxchg_lnkget.h
+ create mode 100644 arch/metag/include/asm/cmpxchg_lock1.h
+ create mode 100644 arch/metag/include/asm/core_reg.h
+ create mode 100644 arch/metag/include/asm/cpu.h
+ create mode 100644 arch/metag/include/asm/da.h
+ create mode 100644 arch/metag/include/asm/delay.h
+ create mode 100644 arch/metag/include/asm/div64.h
+ create mode 100644 arch/metag/include/asm/dma-mapping.h
+ create mode 100644 arch/metag/include/asm/elf.h
+ create mode 100644 arch/metag/include/asm/fixmap.h
+ create mode 100644 arch/metag/include/asm/ftrace.h
+ create mode 100644 arch/metag/include/asm/global_lock.h
+ create mode 100644 arch/metag/include/asm/gpio.h
+ create mode 100644 arch/metag/include/asm/highmem.h
+ create mode 100644 arch/metag/include/asm/hugetlb.h
+ create mode 100644 arch/metag/include/asm/hwthread.h
+ create mode 100644 arch/metag/include/asm/io.h
+ create mode 100644 arch/metag/include/asm/irq.h
+ create mode 100644 arch/metag/include/asm/irqflags.h
+ create mode 100644 arch/metag/include/asm/l2cache.h
+ create mode 100644 arch/metag/include/asm/linkage.h
+ create mode 100644 arch/metag/include/asm/mach/arch.h
+ create mode 100644 arch/metag/include/asm/metag_isa.h
+ create mode 100644 arch/metag/include/asm/metag_mem.h
+ create mode 100644 arch/metag/include/asm/metag_regs.h
+ create mode 100644 arch/metag/include/asm/mman.h
+ create mode 100644 arch/metag/include/asm/mmu.h
+ create mode 100644 arch/metag/include/asm/mmu_context.h
+ create mode 100644 arch/metag/include/asm/mmzone.h
+ create mode 100644 arch/metag/include/asm/module.h
+ create mode 100644 arch/metag/include/asm/page.h
+ create mode 100644 arch/metag/include/asm/perf_event.h
+ create mode 100644 arch/metag/include/asm/pgalloc.h
+ create mode 100644 arch/metag/include/asm/pgtable.h
+ create mode 100644 arch/metag/include/asm/processor.h
+ create mode 100644 arch/metag/include/asm/prom.h
+ create mode 100644 arch/metag/include/asm/ptrace.h
+ create mode 100644 arch/metag/include/asm/setup.h
+ create mode 100644 arch/metag/include/asm/smp.h
+ create mode 100644 arch/metag/include/asm/sparsemem.h
+ create mode 100644 arch/metag/include/asm/spinlock.h
+ create mode 100644 arch/metag/include/asm/spinlock_lnkget.h
+ create mode 100644 arch/metag/include/asm/spinlock_lock1.h
+ create mode 100644 arch/metag/include/asm/spinlock_types.h
+ create mode 100644 arch/metag/include/asm/stacktrace.h
+ create mode 100644 arch/metag/include/asm/string.h
+ create mode 100644 arch/metag/include/asm/switch.h
+ create mode 100644 arch/metag/include/asm/syscall.h
+ create mode 100644 arch/metag/include/asm/syscalls.h
+ create mode 100644 arch/metag/include/asm/tbx.h
+ create mode 100644 arch/metag/include/asm/tcm.h
+ create mode 100644 arch/metag/include/asm/thread_info.h
+ create mode 100644 arch/metag/include/asm/tlb.h
+ create mode 100644 arch/metag/include/asm/tlbflush.h
+ create mode 100644 arch/metag/include/asm/topology.h
+ create mode 100644 arch/metag/include/asm/traps.h
+ create mode 100644 arch/metag/include/asm/uaccess.h
+ create mode 100644 arch/metag/include/asm/unistd.h
+ create mode 100644 arch/metag/include/asm/user_gateway.h
+ create mode 100644 arch/metag/include/uapi/asm/Kbuild
+ create mode 100644 arch/metag/include/uapi/asm/byteorder.h
+ create mode 100644 arch/metag/include/uapi/asm/ptrace.h
+ create mode 100644 arch/metag/include/uapi/asm/resource.h
+ create mode 100644 arch/metag/include/uapi/asm/sigcontext.h
+ create mode 100644 arch/metag/include/uapi/asm/siginfo.h
+ create mode 100644 arch/metag/include/uapi/asm/swab.h
+ create mode 100644 arch/metag/include/uapi/asm/unistd.h
+ create mode 100644 arch/metag/kernel/.gitignore
+ create mode 100644 arch/metag/kernel/Makefile
+ create mode 100644 arch/metag/kernel/asm-offsets.c
+ create mode 100644 arch/metag/kernel/cachepart.c
+ create mode 100644 arch/metag/kernel/clock.c
+ create mode 100644 arch/metag/kernel/core_reg.c
+ create mode 100644 arch/metag/kernel/da.c
+ create mode 100644 arch/metag/kernel/devtree.c
+ create mode 100644 arch/metag/kernel/dma.c
+ create mode 100644 arch/metag/kernel/ftrace.c
+ create mode 100644 arch/metag/kernel/ftrace_stub.S
+ create mode 100644 arch/metag/kernel/head.S
+ create mode 100644 arch/metag/kernel/irq.c
+ create mode 100644 arch/metag/kernel/kick.c
+ create mode 100644 arch/metag/kernel/machines.c
+ create mode 100644 arch/metag/kernel/metag_ksyms.c
+ create mode 100644 arch/metag/kernel/module.c
+ create mode 100644 arch/metag/kernel/perf/Makefile
+ create mode 100644 arch/metag/kernel/perf/perf_event.c
+ create mode 100644 arch/metag/kernel/perf/perf_event.h
+ create mode 100644 arch/metag/kernel/perf_callchain.c
+ create mode 100644 arch/metag/kernel/process.c
+ create mode 100644 arch/metag/kernel/ptrace.c
+ create mode 100644 arch/metag/kernel/setup.c
+ create mode 100644 arch/metag/kernel/signal.c
+ create mode 100644 arch/metag/kernel/smp.c
+ create mode 100644 arch/metag/kernel/stacktrace.c
+ create mode 100644 arch/metag/kernel/sys_metag.c
+ create mode 100644 arch/metag/kernel/tbiunexp.S
+ create mode 100644 arch/metag/kernel/tcm.c
+ create mode 100644 arch/metag/kernel/time.c
+ create mode 100644 arch/metag/kernel/topology.c
+ create mode 100644 arch/metag/kernel/traps.c
+ create mode 100644 arch/metag/kernel/user_gateway.S
+ create mode 100644 arch/metag/kernel/vmlinux.lds.S
+ create mode 100644 arch/metag/lib/Makefile
+ create mode 100644 arch/metag/lib/ashldi3.S
+ create mode 100644 arch/metag/lib/ashrdi3.S
+ create mode 100644 arch/metag/lib/checksum.c
+ create mode 100644 arch/metag/lib/clear_page.S
+ create mode 100644 arch/metag/lib/cmpdi2.S
+ create mode 100644 arch/metag/lib/copy_page.S
+ create mode 100644 arch/metag/lib/delay.c
+ create mode 100644 arch/metag/lib/div64.S
+ create mode 100644 arch/metag/lib/divsi3.S
+ create mode 100644 arch/metag/lib/ip_fast_csum.S
+ create mode 100644 arch/metag/lib/lshrdi3.S
+ create mode 100644 arch/metag/lib/memcpy.S
+ create mode 100644 arch/metag/lib/memmove.S
+ create mode 100644 arch/metag/lib/memset.S
+ create mode 100644 arch/metag/lib/modsi3.S
+ create mode 100644 arch/metag/lib/muldi3.S
+ create mode 100644 arch/metag/lib/ucmpdi2.S
+ create mode 100644 arch/metag/lib/usercopy.c
+ create mode 100644 arch/metag/mm/Kconfig
+ create mode 100644 arch/metag/mm/Makefile
+ create mode 100644 arch/metag/mm/cache.c
+ create mode 100644 arch/metag/mm/extable.c
+ create mode 100644 arch/metag/mm/fault.c
+ create mode 100644 arch/metag/mm/highmem.c
+ create mode 100644 arch/metag/mm/hugetlbpage.c
+ create mode 100644 arch/metag/mm/init.c
+ create mode 100644 arch/metag/mm/ioremap.c
+ create mode 100644 arch/metag/mm/l2cache.c
+ create mode 100644 arch/metag/mm/maccess.c
+ create mode 100644 arch/metag/mm/mmu-meta1.c
+ create mode 100644 arch/metag/mm/mmu-meta2.c
+ create mode 100644 arch/metag/mm/numa.c
+ create mode 100644 arch/metag/tbx/Makefile
+ create mode 100644 arch/metag/tbx/tbicore.S
+ create mode 100644 arch/metag/tbx/tbictx.S
+ create mode 100644 arch/metag/tbx/tbictxfpu.S
+ create mode 100644 arch/metag/tbx/tbidefr.S
+ create mode 100644 arch/metag/tbx/tbidspram.S
+ create mode 100644 arch/metag/tbx/tbilogf.S
+ create mode 100644 arch/metag/tbx/tbipcx.S
+ create mode 100644 arch/metag/tbx/tbiroot.S
+ create mode 100644 arch/metag/tbx/tbisoft.S
+ create mode 100644 arch/metag/tbx/tbistring.c
+ create mode 100644 arch/metag/tbx/tbitimer.S
+ create mode 100644 drivers/clocksource/metag_generic.c
+ create mode 100644 drivers/irqchip/irq-metag-ext.c
+ create mode 100644 drivers/irqchip/irq-metag.c
+ create mode 100644 include/clocksource/metag_generic.h
+ create mode 100644 include/linux/irqchip/metag-ext.h
+ create mode 100644 include/linux/irqchip/metag.h
+Merging microblaze/next (711e5b4 asm-generic: io: Fix ioread16/32be and iowrite16/32be)
+$ git merge microblaze/next
+Auto-merging include/asm-generic/io.h
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Makefile | 9 +-
+ arch/microblaze/boot/.gitignore | 3 +
+ arch/microblaze/include/asm/io.h | 2 +-
+ arch/microblaze/kernel/.gitignore | 1 +
+ arch/microblaze/kernel/cpu/cache.c | 148 ++++++++++++--------------
+ arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 21 ++--
+ arch/microblaze/kernel/cpu/cpuinfo.c | 13 ++-
+ arch/microblaze/kernel/cpu/pvr.c | 2 +-
+ arch/microblaze/kernel/dma.c | 6 +-
+ arch/microblaze/kernel/early_printk.c | 17 ++-
+ arch/microblaze/kernel/exceptions.c | 27 ++---
+ arch/microblaze/kernel/ftrace.c | 44 ++++----
+ arch/microblaze/kernel/heartbeat.c | 2 +-
+ arch/microblaze/kernel/intc.c | 4 +-
+ arch/microblaze/kernel/kgdb.c | 2 +-
+ arch/microblaze/kernel/microblaze_ksyms.c | 2 +-
+ arch/microblaze/kernel/module.c | 5 +-
+ arch/microblaze/kernel/process.c | 24 ++---
+ arch/microblaze/kernel/prom.c | 2 +-
+ arch/microblaze/kernel/prom_parse.c | 2 +-
+ arch/microblaze/kernel/ptrace.c | 2 +-
+ arch/microblaze/kernel/setup.c | 30 +++---
+ arch/microblaze/kernel/signal.c | 6 +-
+ arch/microblaze/kernel/stacktrace.c | 2 +-
+ arch/microblaze/kernel/sys_microblaze.c | 3 +-
+ arch/microblaze/kernel/traps.c | 8 +-
+ arch/microblaze/kernel/unwind.c | 2 +-
+ arch/microblaze/lib/ashldi3.c | 3 +-
+ arch/microblaze/lib/ashrdi3.c | 3 +-
+ arch/microblaze/lib/cmpdi2.c | 2 +-
+ arch/microblaze/lib/lshrdi3.c | 3 +-
+ arch/microblaze/lib/memcpy.c | 12 +--
+ arch/microblaze/lib/memmove.c | 11 +-
+ arch/microblaze/lib/memset.c | 2 +-
+ arch/microblaze/lib/muldi3.c | 2 +-
+ arch/microblaze/lib/uaccess_old.S | 9 +-
+ arch/microblaze/lib/ucmpdi2.c | 2 +-
+ arch/microblaze/mm/consistent.c | 7 +-
+ arch/microblaze/mm/fault.c | 10 +-
+ arch/microblaze/mm/highmem.c | 2 +-
+ arch/microblaze/mm/init.c | 32 +++---
+ arch/microblaze/mm/pgtable.c | 17 ++-
+ arch/microblaze/pci/indirect_pci.c | 2 +-
+ arch/microblaze/pci/iomap.c | 2 +-
+ arch/microblaze/pci/pci-common.c | 96 ++++++++---------
+ arch/microblaze/pci/xilinx_pci.c | 16 +--
+ include/asm-generic/io.h | 8 +-
+ 47 files changed, 299 insertions(+), 331 deletions(-)
+ create mode 100644 arch/microblaze/boot/.gitignore
+ create mode 100644 arch/microblaze/kernel/.gitignore
+Merging mips/mips-for-linux-next (ee4e689 Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/pnx8550/stb810/prom_init.c
+Removing arch/mips/pnx8550/stb810/irqmap.c
+Removing arch/mips/pnx8550/stb810/board_setup.c
+Removing arch/mips/pnx8550/stb810/Makefile
+Removing arch/mips/pnx8550/jbs/irqmap.c
+Removing arch/mips/pnx8550/jbs/init.c
+Removing arch/mips/pnx8550/jbs/board_setup.c
+Removing arch/mips/pnx8550/jbs/Makefile
+Removing arch/mips/pnx8550/common/time.c
+Removing arch/mips/pnx8550/common/setup.c
+Removing arch/mips/pnx8550/common/reset.c
+Removing arch/mips/pnx8550/common/prom.c
+Removing arch/mips/pnx8550/common/proc.c
+Removing arch/mips/pnx8550/common/platform.c
+Removing arch/mips/pnx8550/common/pci.c
+Removing arch/mips/pnx8550/common/int.c
+Removing arch/mips/pnx8550/common/Makefile
+Removing arch/mips/pnx8550/Platform
+Removing arch/mips/pnx8550/Makefile
+Auto-merging arch/mips/pmcs-msp71xx/msp_usb.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_time.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_setup.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_serial.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_prom.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_pci.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq_slp.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq_per.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq_cic.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq.c
+Removing arch/mips/pmc-sierra/Platform
+Removing arch/mips/pci/ops-pnx8550.c
+Removing arch/mips/pci/fixup-pnx8550.c
+Removing arch/mips/mti-sead3/sead3-memory.c
+Auto-merging arch/mips/kernel/traps.c
+Auto-merging arch/mips/include/asm/mach-ralink/war.h
+Removing arch/mips/include/asm/mach-pnx8550/usb.h
+Removing arch/mips/include/asm/mach-pnx8550/uart.h
+Removing arch/mips/include/asm/mach-pnx8550/pci.h
+Removing arch/mips/include/asm/mach-pnx8550/nand.h
+Removing arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h
+Removing arch/mips/include/asm/mach-pnx8550/int.h
+Removing arch/mips/include/asm/mach-pnx8550/glb.h
+Removing arch/mips/include/asm/mach-pnx8550/cm.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/war.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h
+Auto-merging arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
+Removing arch/mips/include/asm/mach-ath79/pci.h
+Removing arch/mips/configs/pnx8550_stb810_defconfig
+Removing arch/mips/configs/pnx8550_jbs_defconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mips/cpu_irq.txt | 47 +
+ .../devicetree/bindings/serial/lantiq_asc.txt | 16 +
+ arch/mips/Kbuild.platforms | 4 +-
+ arch/mips/Kconfig | 49 +-
+ arch/mips/Makefile | 2 +-
+ arch/mips/alchemy/Platform | 6 +-
+ arch/mips/alchemy/board-gpr.c | 12 +-
+ arch/mips/alchemy/board-mtx1.c | 8 +-
+ arch/mips/alchemy/common/dbdma.c | 14 +-
+ arch/mips/alchemy/common/gpiolib.c | 14 +-
+ arch/mips/alchemy/common/irq.c | 178 +--
+ arch/mips/alchemy/common/platform.c | 4 +-
+ arch/mips/alchemy/common/setup.c | 2 +-
+ arch/mips/alchemy/common/sleeper.S | 20 +-
+ arch/mips/alchemy/common/time.c | 2 +-
+ arch/mips/alchemy/common/usb.c | 2 +-
+ arch/mips/alchemy/devboards/bcsr.c | 2 +-
+ arch/mips/alchemy/devboards/db1000.c | 16 +-
+ arch/mips/alchemy/devboards/db1200.c | 28 +-
+ arch/mips/alchemy/devboards/db1300.c | 10 +-
+ arch/mips/alchemy/devboards/db1550.c | 18 +-
+ arch/mips/alchemy/devboards/pm.c | 2 +-
+ arch/mips/ar7/Platform | 6 +-
+ arch/mips/ar7/platform.c | 12 +-
+ arch/mips/ath79/clock.c | 2 +-
+ arch/mips/ath79/dev-common.c | 6 +-
+ arch/mips/ath79/dev-usb.c | 111 +-
+ arch/mips/ath79/dev-wmac.c | 8 +-
+ arch/mips/ath79/gpio.c | 48 +-
+ arch/mips/ath79/irq.c | 79 +-
+ arch/mips/ath79/mach-ap121.c | 2 +-
+ arch/mips/ath79/mach-ap81.c | 2 +-
+ arch/mips/ath79/mach-db120.c | 2 +-
+ arch/mips/ath79/mach-pb44.c | 6 +-
+ arch/mips/ath79/pci.c | 129 ++-
+ arch/mips/ath79/pci.h | 1 +
+ arch/mips/bcm47xx/Makefile | 2 +-
+ arch/mips/bcm47xx/nvram.c | 163 ++-
+ arch/mips/bcm47xx/setup.c | 6 +-
+ arch/mips/bcm47xx/sprom.c | 26 +-
+ arch/mips/bcm47xx/wgt634u.c | 40 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +-
+ arch/mips/boot/Makefile | 2 +-
+ arch/mips/boot/compressed/Makefile | 8 +-
+ arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 4 +-
+ arch/mips/boot/compressed/decompress.c | 4 +-
+ arch/mips/boot/compressed/head.S | 4 +-
+ arch/mips/boot/ecoff.h | 62 +-
+ arch/mips/boot/elf2ecoff.c | 8 +-
+ arch/mips/cavium-octeon/Kconfig | 9 +
+ arch/mips/cavium-octeon/Makefile | 3 +-
+ arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 10 +-
+ .../cavium-octeon/executive/cvmx-helper-board.c | 28 +-
+ .../cavium-octeon/executive/cvmx-helper-jtag.c | 4 +-
+ .../cavium-octeon/executive/cvmx-helper-rgmii.c | 22 +-
+ .../cavium-octeon/executive/cvmx-helper-sgmii.c | 4 +-
+ .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 8 +-
+ .../cavium-octeon/executive/cvmx-helper-util.c | 34 +-
+ .../cavium-octeon/executive/cvmx-helper-xaui.c | 4 +-
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +-
+ .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 6 +-
+ arch/mips/cavium-octeon/executive/cvmx-l2c.c | 66 +-
+ arch/mips/cavium-octeon/executive/cvmx-pko.c | 28 +-
+ arch/mips/cavium-octeon/executive/cvmx-spi.c | 70 +-
+ arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 16 +-
+ arch/mips/cavium-octeon/oct_ilm.c | 206 ++++
+ arch/mips/cavium-octeon/octeon-irq.c | 4 +-
+ arch/mips/cavium-octeon/octeon-memcpy.S | 22 +-
+ arch/mips/cavium-octeon/octeon-platform.c | 2 +-
+ arch/mips/cavium-octeon/octeon_3xxx.dts | 34 +-
+ arch/mips/cavium-octeon/octeon_68xx.dts | 34 +-
+ arch/mips/cavium-octeon/octeon_boot.h | 14 +-
+ arch/mips/cavium-octeon/setup.c | 8 +-
+ arch/mips/cavium-octeon/smp.c | 10 +-
+ arch/mips/cobalt/led.c | 2 +-
+ arch/mips/cobalt/mtd.c | 2 +-
+ arch/mips/cobalt/rtc.c | 2 +-
+ arch/mips/configs/pnx8550_jbs_defconfig | 98 --
+ arch/mips/configs/pnx8550_stb810_defconfig | 92 --
+ arch/mips/configs/rt305x_defconfig | 167 +++
+ arch/mips/dec/int-handler.S | 98 +-
+ arch/mips/dec/kn02xa-berr.c | 4 +-
+ arch/mips/dec/prom/call_o32.S | 2 +-
+ arch/mips/dec/prom/dectypes.h | 2 +-
+ arch/mips/dec/prom/init.c | 2 +-
+ arch/mips/dec/prom/memory.c | 2 +-
+ arch/mips/dec/setup.c | 4 +-
+ arch/mips/dec/wbflush.c | 6 +-
+ arch/mips/emma/markeins/irq.c | 2 +-
+ arch/mips/emma/markeins/platform.c | 2 +-
+ arch/mips/emma/markeins/setup.c | 2 +-
+ arch/mips/fw/arc/file.c | 4 +-
+ arch/mips/fw/arc/identify.c | 2 +-
+ arch/mips/fw/arc/memory.c | 2 +-
+ arch/mips/fw/arc/promlib.c | 2 +-
+ arch/mips/fw/lib/call_o32.S | 2 +-
+ arch/mips/fw/sni/sniprom.c | 16 +-
+ arch/mips/include/asm/abi.h | 8 +-
+ arch/mips/include/asm/addrspace.h | 6 +-
+ arch/mips/include/asm/asm.h | 98 +-
+ arch/mips/include/asm/atomic.h | 4 +-
+ arch/mips/include/asm/barrier.h | 10 +-
+ arch/mips/include/asm/bcache.h | 2 +-
+ arch/mips/include/asm/bitops.h | 22 +-
+ arch/mips/include/asm/bootinfo.h | 20 +-
+ arch/mips/include/asm/cacheops.h | 14 +-
+ arch/mips/include/asm/checksum.h | 2 +-
+ arch/mips/include/asm/cmpxchg.h | 6 +-
+ arch/mips/include/asm/compat-signal.h | 4 +-
+ arch/mips/include/asm/compat.h | 6 +-
+ arch/mips/include/asm/cpu-features.h | 34 +-
+ arch/mips/include/asm/cpu-info.h | 18 +-
+ arch/mips/include/asm/cpu.h | 35 +-
+ arch/mips/include/asm/dec/ioasic_addrs.h | 22 +-
+ arch/mips/include/asm/dec/kn01.h | 12 +-
+ arch/mips/include/asm/dec/kn02ca.h | 2 +-
+ arch/mips/include/asm/dec/prom.h | 2 +-
+ arch/mips/include/asm/dma-mapping.h | 2 +-
+ arch/mips/include/asm/dma.h | 112 +-
+ arch/mips/include/asm/elf.h | 30 +-
+ arch/mips/include/asm/emma/emma2rh.h | 112 +-
+ arch/mips/include/asm/emma/markeins.h | 2 +-
+ arch/mips/include/asm/fixmap.h | 4 +-
+ arch/mips/include/asm/floppy.h | 4 +-
+ arch/mips/include/asm/fpregdef.h | 10 +-
+ arch/mips/include/asm/fpu.h | 6 +-
+ arch/mips/include/asm/futex.h | 12 +-
+ arch/mips/include/asm/fw/arc/hinv.h | 10 +-
+ arch/mips/include/asm/fw/arc/types.h | 12 +-
+ arch/mips/include/asm/fw/cfe/cfe_api.h | 6 +-
+ arch/mips/include/asm/fw/cfe/cfe_error.h | 18 +-
+ arch/mips/include/asm/gcmpregs.h | 100 +-
+ arch/mips/include/asm/gic.h | 17 +-
+ arch/mips/include/asm/gio_device.h | 14 +-
+ arch/mips/include/asm/gt64120.h | 22 +-
+ arch/mips/include/asm/hazards.h | 8 +-
+ arch/mips/include/asm/highmem.h | 4 +-
+ arch/mips/include/asm/inst.h | 348 +-----
+ arch/mips/include/asm/io.h | 30 +-
+ arch/mips/include/asm/ip32/crime.h | 8 +-
+ arch/mips/include/asm/ip32/ip32_ints.h | 2 +-
+ arch/mips/include/asm/ip32/mace.h | 12 +-
+ arch/mips/include/asm/irq.h | 6 +-
+ arch/mips/include/asm/irq_cpu.h | 6 +
+ arch/mips/include/asm/isadep.h | 4 +-
+ arch/mips/include/asm/jazz.h | 166 +--
+ arch/mips/include/asm/jazzdma.h | 50 +-
+ arch/mips/include/asm/kmap_types.h | 2 +-
+ arch/mips/include/asm/kprobes.h | 2 +-
+ arch/mips/include/asm/lasat/eeprom.h | 12 +-
+ arch/mips/include/asm/lasat/lasat.h | 14 +-
+ arch/mips/include/asm/lasat/serial.h | 2 +-
+ arch/mips/include/asm/local.h | 6 +-
+ arch/mips/include/asm/m48t37.h | 2 +-
+ arch/mips/include/asm/mach-ar7/ar7.h | 18 +-
+ arch/mips/include/asm/mach-ar7/irq.h | 2 +-
+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 36 +-
+ arch/mips/include/asm/mach-ath79/ar933x_uart.h | 12 +-
+ .../include/asm/mach-ath79/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-ath79/irq.h | 23 +-
+ arch/mips/include/asm/mach-ath79/pci.h | 28 -
+ arch/mips/include/asm/mach-au1x00/au1000.h | 198 ++--
+ arch/mips/include/asm/mach-au1x00/au1000_dma.h | 10 +-
+ arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 16 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 22 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_psc.h | 8 +-
+ arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 20 +-
+ arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 2 +-
+ .../asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} | 13 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 2 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 2 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 24 +-
+ arch/mips/include/asm/mach-bcm63xx/irq.h | 2 +-
+ arch/mips/include/asm/mach-cavium-octeon/irq.h | 4 +-
+ .../asm/mach-cavium-octeon/kernel-entry-init.h | 36 +-
+ .../asm/mach-cobalt/cpu-feature-overrides.h | 4 +-
+ arch/mips/include/asm/mach-cobalt/mach-gt64120.h | 2 +-
+ arch/mips/include/asm/mach-db1x00/bcsr.h | 4 +-
+ arch/mips/include/asm/mach-db1x00/db1200.h | 2 +-
+ arch/mips/include/asm/mach-db1x00/db1300.h | 2 +-
+ arch/mips/include/asm/mach-emma2rh/irq.h | 2 +-
+ .../asm/mach-generic/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-generic/floppy.h | 4 +-
+ arch/mips/include/asm/mach-generic/ide.h | 4 +-
+ arch/mips/include/asm/mach-generic/irq.h | 4 +-
+ arch/mips/include/asm/mach-generic/spaces.h | 2 +-
+ .../mips/include/asm/mach-ip27/kernel-entry-init.h | 4 +-
+ arch/mips/include/asm/mach-ip27/mmzone.h | 2 +-
+ arch/mips/include/asm/mach-ip27/topology.h | 2 +-
+ .../include/asm/mach-ip28/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-ip28/spaces.h | 2 +-
+ arch/mips/include/asm/mach-ip32/dma-coherence.h | 2 +-
+ arch/mips/include/asm/mach-ip32/war.h | 2 +-
+ arch/mips/include/asm/mach-jazz/floppy.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/clock.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/dma.h | 10 +-
+ arch/mips/include/asm/mach-jz4740/gpio.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/irq.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/platform.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/timer.h | 2 +-
+ .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +-
+ arch/mips/include/asm/mach-lantiq/lantiq.h | 2 +
+ arch/mips/include/asm/mach-lantiq/war.h | 24 +-
+ arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 4 +-
+ arch/mips/include/asm/mach-lasat/mach-gt64120.h | 6 +-
+ .../asm/mach-loongson/cpu-feature-overrides.h | 8 +-
+ .../mips/include/asm/mach-loongson/cs5536/cs5536.h | 422 +++----
+ .../asm/mach-loongson/cs5536/cs5536_mfgpt.h | 2 +-
+ .../include/asm/mach-loongson/cs5536/cs5536_pci.h | 122 +-
+ .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 4 +-
+ arch/mips/include/asm/mach-loongson/gpio.h | 4 +-
+ arch/mips/include/asm/mach-loongson/loongson.h | 50 +-
+ arch/mips/include/asm/mach-loongson/machine.h | 4 +-
+ arch/mips/include/asm/mach-loongson/mem.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/irq.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/loongson1.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/platform.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/prom.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/regs-clk.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/regs-wdt.h | 4 +-
+ .../include/asm/mach-malta/cpu-feature-overrides.h | 8 +-
+ arch/mips/include/asm/mach-malta/irq.h | 2 +-
+ arch/mips/include/asm/mach-malta/mach-gt64120.h | 2 +-
+ .../cpu-feature-overrides.h | 0
+ .../msp71xx => mach-pmcs-msp71xx}/gpio.h | 0
+ .../msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h | 110 +-
+ .../msp_gpio_macros.h | 4 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_int.h | 4 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_pci.h | 46 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_prom.h | 8 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_regops.h | 2 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_regs.h | 416 +++----
+ .../msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h | 96 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_usb.h | 2 +-
+ .../msp71xx => mach-pmcs-msp71xx}/war.h | 4 +-
+ arch/mips/include/asm/mach-pnx833x/irq-mapping.h | 18 +-
+ arch/mips/include/asm/mach-pnx833x/pnx833x.h | 12 +-
+ arch/mips/include/asm/mach-pnx8550/cm.h | 43 -
+ arch/mips/include/asm/mach-pnx8550/glb.h | 86 --
+ arch/mips/include/asm/mach-pnx8550/int.h | 140 ---
+ .../include/asm/mach-pnx8550/kernel-entry-init.h | 262 -----
+ arch/mips/include/asm/mach-pnx8550/nand.h | 121 --
+ arch/mips/include/asm/mach-pnx8550/pci.h | 185 ---
+ arch/mips/include/asm/mach-pnx8550/uart.h | 30 -
+ arch/mips/include/asm/mach-pnx8550/usb.h | 32 -
+ arch/mips/include/asm/mach-powertv/asic.h | 8 +-
+ arch/mips/include/asm/mach-powertv/asic_regs.h | 4 +-
+ arch/mips/include/asm/mach-powertv/dma-coherence.h | 2 +-
+ arch/mips/include/asm/mach-powertv/interrupts.h | 62 +-
+ arch/mips/include/asm/mach-ralink/ralink_regs.h | 39 +
+ arch/mips/include/asm/mach-ralink/rt305x.h | 139 +++
+ .../asm/{mach-pnx8550 => mach-ralink}/war.h | 7 +-
+ arch/mips/include/asm/mach-rc32434/ddr.h | 2 +-
+ arch/mips/include/asm/mach-rc32434/dma.h | 12 +-
+ arch/mips/include/asm/mach-rc32434/dma_v.h | 4 +-
+ arch/mips/include/asm/mach-rc32434/eth.h | 6 +-
+ arch/mips/include/asm/mach-rc32434/gpio.h | 6 +-
+ arch/mips/include/asm/mach-rc32434/irq.h | 12 +-
+ arch/mips/include/asm/mach-rc32434/pci.h | 60 +-
+ arch/mips/include/asm/mach-rc32434/rb.h | 6 +-
+ arch/mips/include/asm/mach-rc32434/rc32434.h | 2 +-
+ arch/mips/include/asm/mach-rc32434/timer.h | 18 +-
+ .../include/asm/mach-sead3/cpu-feature-overrides.h | 8 +-
+ arch/mips/include/asm/mach-sead3/irq.h | 2 +-
+ arch/mips/include/asm/mach-sibyte/war.h | 4 +-
+ arch/mips/include/asm/mach-wrppmc/mach-gt64120.h | 16 +-
+ arch/mips/include/asm/mc146818-time.h | 4 +-
+ arch/mips/include/asm/mips-boards/bonito64.h | 106 +-
+ arch/mips/include/asm/mips-boards/generic.h | 70 +-
+ arch/mips/include/asm/mips-boards/launch.h | 10 +-
+ arch/mips/include/asm/mips-boards/malta.h | 10 +-
+ arch/mips/include/asm/mips-boards/maltaint.h | 8 +-
+ arch/mips/include/asm/mips-boards/piix4.h | 8 +-
+ arch/mips/include/asm/mips-boards/prom.h | 6 +-
+ arch/mips/include/asm/mips-boards/sead3int.h | 4 +-
+ arch/mips/include/asm/mips-boards/sim.h | 14 +-
+ arch/mips/include/asm/mipsmtregs.h | 8 +-
+ arch/mips/include/asm/mipsregs.h | 734 ++++++------
+ arch/mips/include/asm/mmu_context.h | 6 +-
+ arch/mips/include/asm/msc01_ic.h | 174 +--
+ arch/mips/include/asm/netlogic/common.h | 16 +-
+ arch/mips/include/asm/netlogic/haldefs.h | 2 +-
+ arch/mips/include/asm/netlogic/mips-extns.h | 83 +-
+ arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 4 +-
+ .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 2 +
+ arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 +-
+ arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 46 +-
+ arch/mips/include/asm/netlogic/xlp-hal/pic.h | 118 +-
+ arch/mips/include/asm/netlogic/xlp-hal/sys.h | 160 +--
+ arch/mips/include/asm/netlogic/xlp-hal/uart.h | 4 +-
+ arch/mips/include/asm/netlogic/xlr/fmn.h | 242 ++--
+ arch/mips/include/asm/netlogic/xlr/iomap.h | 88 +-
+ arch/mips/include/asm/netlogic/xlr/msidef.h | 18 +-
+ arch/mips/include/asm/netlogic/xlr/pic.h | 58 +-
+ arch/mips/include/asm/nile4.h | 38 +-
+ arch/mips/include/asm/octeon/cvmx-address.h | 50 +-
+ arch/mips/include/asm/octeon/cvmx-bootinfo.h | 14 +-
+ arch/mips/include/asm/octeon/cvmx-bootmem.h | 72 +-
+ arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 44 +-
+ arch/mips/include/asm/octeon/cvmx-config.h | 30 +-
+ arch/mips/include/asm/octeon/cvmx-fau.h | 162 +--
+ arch/mips/include/asm/octeon/cvmx-fpa.h | 32 +-
+ arch/mips/include/asm/octeon/cvmx-helper-board.h | 16 +-
+ arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx-helper-util.h | 18 +-
+ arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx-helper.h | 12 +-
+ arch/mips/include/asm/octeon/cvmx-ipd.h | 14 +-
+ arch/mips/include/asm/octeon/cvmx-l2c.h | 210 ++--
+ arch/mips/include/asm/octeon/cvmx-mdio.h | 40 +-
+ arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-pip.h | 62 +-
+ arch/mips/include/asm/octeon/cvmx-pko.h | 60 +-
+ arch/mips/include/asm/octeon/cvmx-pow.h | 122 +-
+ arch/mips/include/asm/octeon/cvmx-scratch.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-spi.h | 66 +-
+ arch/mips/include/asm/octeon/cvmx-spinlock.h | 78 +-
+ arch/mips/include/asm/octeon/cvmx-sysinfo.h | 16 +-
+ arch/mips/include/asm/octeon/cvmx-wqe.h | 104 +-
+ arch/mips/include/asm/octeon/cvmx.h | 48 +-
+ arch/mips/include/asm/octeon/octeon-feature.h | 10 +-
+ arch/mips/include/asm/octeon/octeon-model.h | 240 ++--
+ arch/mips/include/asm/octeon/octeon.h | 12 +-
+ arch/mips/include/asm/octeon/pci-octeon.h | 2 +-
+ arch/mips/include/asm/paccess.h | 2 +-
+ arch/mips/include/asm/page.h | 14 +-
+ arch/mips/include/asm/pci.h | 11 +-
+ arch/mips/include/asm/pci/bridge.h | 30 +-
+ arch/mips/include/asm/pgtable-32.h | 20 +-
+ arch/mips/include/asm/pgtable-64.h | 4 +-
+ arch/mips/include/asm/pgtable-bits.h | 42 +-
+ arch/mips/include/asm/pgtable.h | 4 +-
+ arch/mips/include/asm/processor.h | 46 +-
+ arch/mips/include/asm/r4kcache.h | 12 +-
+ arch/mips/include/asm/regdef.h | 66 +-
+ arch/mips/include/asm/rtlx.h | 2 +-
+ arch/mips/include/asm/seccomp.h | 2 +-
+ arch/mips/include/asm/sgi/gio.h | 16 +-
+ arch/mips/include/asm/sgi/hpc3.h | 82 +-
+ arch/mips/include/asm/sgi/ioc.h | 4 +-
+ arch/mips/include/asm/sgi/ip22.h | 6 +-
+ arch/mips/include/asm/sgi/mc.h | 26 +-
+ arch/mips/include/asm/sgi/pi1.h | 20 +-
+ arch/mips/include/asm/sgialib.h | 2 +-
+ arch/mips/include/asm/sgiarcs.h | 136 +--
+ arch/mips/include/asm/shmparam.h | 2 +-
+ arch/mips/include/asm/sibyte/bcm1480_int.h | 424 +++----
+ arch/mips/include/asm/sibyte/bcm1480_l2c.h | 138 +--
+ arch/mips/include/asm/sibyte/bcm1480_mc.h | 1192 ++++++++++----------
+ arch/mips/include/asm/sibyte/bcm1480_regs.h | 806 ++++++-------
+ arch/mips/include/asm/sibyte/bcm1480_scd.h | 276 ++---
+ arch/mips/include/asm/sibyte/bigsur.h | 20 +-
+ arch/mips/include/asm/sibyte/carmel.h | 52 +-
+ arch/mips/include/asm/sibyte/sb1250.h | 4 +-
+ arch/mips/include/asm/sibyte/sb1250_defs.h | 94 +-
+ arch/mips/include/asm/sibyte/sb1250_dma.h | 426 +++----
+ arch/mips/include/asm/sibyte/sb1250_genbus.h | 26 +-
+ arch/mips/include/asm/sibyte/sb1250_int.h | 274 ++---
+ arch/mips/include/asm/sibyte/sb1250_l2c.h | 92 +-
+ arch/mips/include/asm/sibyte/sb1250_ldt.h | 14 +-
+ arch/mips/include/asm/sibyte/sb1250_mac.h | 568 +++++-----
+ arch/mips/include/asm/sibyte/sb1250_mc.h | 712 ++++++------
+ arch/mips/include/asm/sibyte/sb1250_regs.h | 854 +++++++-------
+ arch/mips/include/asm/sibyte/sb1250_scd.h | 668 +++++------
+ arch/mips/include/asm/sibyte/sb1250_smbus.h | 158 +--
+ arch/mips/include/asm/sibyte/sb1250_syncser.h | 136 +--
+ arch/mips/include/asm/sibyte/sb1250_uart.h | 262 ++---
+ arch/mips/include/asm/sibyte/sentosa.h | 6 +-
+ arch/mips/include/asm/sibyte/swarm.h | 26 +-
+ arch/mips/include/asm/smp.h | 12 +-
+ arch/mips/include/asm/smtc.h | 4 +-
+ arch/mips/include/asm/sn/addrs.h | 54 +-
+ arch/mips/include/asm/sn/agent.h | 12 +-
+ arch/mips/include/asm/sn/arch.h | 8 +-
+ arch/mips/include/asm/sn/fru.h | 12 +-
+ arch/mips/include/asm/sn/gda.h | 24 +-
+ arch/mips/include/asm/sn/intr.h | 16 +-
+ arch/mips/include/asm/sn/io.h | 4 +-
+ arch/mips/include/asm/sn/ioc3.h | 8 +-
+ arch/mips/include/asm/sn/klconfig.h | 526 ++++-----
+ arch/mips/include/asm/sn/kldir.h | 182 +--
+ arch/mips/include/asm/sn/launch.h | 16 +-
+ arch/mips/include/asm/sn/mapped_kernel.h | 4 +-
+ arch/mips/include/asm/sn/nmi.h | 8 +-
+ arch/mips/include/asm/sn/sn0/addrs.h | 20 +-
+ arch/mips/include/asm/sn/sn0/arch.h | 22 +-
+ arch/mips/include/asm/sn/sn0/hub.h | 12 +-
+ arch/mips/include/asm/sn/sn0/hubio.h | 442 ++++----
+ arch/mips/include/asm/sn/sn0/hubmd.h | 214 ++--
+ arch/mips/include/asm/sn/sn0/hubni.h | 78 +-
+ arch/mips/include/asm/sn/sn0/hubpi.h | 184 +--
+ arch/mips/include/asm/sn/sn0/ip27.h | 28 +-
+ arch/mips/include/asm/sn/types.h | 4 +-
+ arch/mips/include/asm/sni.h | 104 +-
+ arch/mips/include/asm/sparsemem.h | 2 +-
+ arch/mips/include/asm/spinlock.h | 4 +-
+ arch/mips/include/asm/spinlock_types.h | 2 +-
+ arch/mips/include/asm/stackframe.h | 14 +-
+ arch/mips/include/asm/string.h | 8 +-
+ arch/mips/include/asm/switch_to.h | 4 +-
+ arch/mips/include/asm/thread_info.h | 2 +-
+ arch/mips/include/asm/time.h | 6 +-
+ arch/mips/include/asm/tlb.h | 2 +-
+ arch/mips/include/asm/topology.h | 2 +-
+ arch/mips/include/asm/traps.h | 2 +-
+ arch/mips/include/asm/txx9/jmr3927.h | 14 +-
+ arch/mips/include/asm/txx9/rbtx4927.h | 6 +-
+ arch/mips/include/asm/txx9/rbtx4938.h | 20 +-
+ arch/mips/include/asm/txx9/rbtx4939.h | 14 +-
+ arch/mips/include/asm/txx9/smsc_fdc37m81x.h | 54 +-
+ arch/mips/include/asm/txx9/tx3927.h | 16 +-
+ arch/mips/include/asm/txx9/tx4927.h | 18 +-
+ arch/mips/include/asm/txx9/tx4927pcic.h | 6 +-
+ arch/mips/include/asm/txx9/tx4938.h | 32 +-
+ arch/mips/include/asm/txx9/tx4939.h | 50 +-
+ arch/mips/include/asm/txx9tmr.h | 4 +-
+ arch/mips/include/asm/uaccess.h | 102 +-
+ arch/mips/include/asm/uasm.h | 2 +-
+ arch/mips/include/asm/user.h | 2 +-
+ arch/mips/include/asm/vr41xx/pci.h | 2 +-
+ arch/mips/include/asm/vr41xx/tb0287.h | 2 +-
+ arch/mips/include/asm/war.h | 46 +-
+ arch/mips/include/asm/xtalk/xtalk.h | 24 +-
+ arch/mips/include/asm/xtalk/xwidget.h | 8 +-
+ arch/mips/include/uapi/asm/Kbuild | 1 +
+ arch/mips/include/uapi/asm/break.h | 10 +-
+ arch/mips/include/uapi/asm/cachectl.h | 10 +-
+ arch/mips/include/uapi/asm/errno.h | 188 +--
+ arch/mips/include/uapi/asm/fcntl.h | 4 +-
+ arch/mips/include/uapi/asm/inst.h | 331 ++++++
+ arch/mips/include/uapi/asm/ioctls.h | 22 +-
+ arch/mips/include/uapi/asm/mman.h | 10 +-
+ arch/mips/include/uapi/asm/ptrace.h | 8 +-
+ arch/mips/include/uapi/asm/sembuf.h | 4 +-
+ arch/mips/include/uapi/asm/siginfo.h | 8 +-
+ arch/mips/include/uapi/asm/signal.h | 24 +-
+ arch/mips/include/uapi/asm/socket.h | 16 +-
+ arch/mips/include/uapi/asm/sockios.h | 2 +-
+ arch/mips/include/uapi/asm/stat.h | 2 +-
+ arch/mips/include/uapi/asm/statfs.h | 6 +-
+ arch/mips/include/uapi/asm/sysmips.h | 8 +-
+ arch/mips/include/uapi/asm/termbits.h | 158 +--
+ arch/mips/include/uapi/asm/termios.h | 12 +-
+ arch/mips/include/uapi/asm/unistd.h | 60 +-
+ arch/mips/jazz/Makefile | 2 +-
+ arch/mips/jazz/irq.c | 4 +-
+ arch/mips/jazz/jazzdma.c | 6 +-
+ arch/mips/jazz/setup.c | 20 +-
+ arch/mips/jz4740/board-qi_lb60.c | 8 +-
+ arch/mips/jz4740/clock-debugfs.c | 2 +-
+ arch/mips/jz4740/clock.c | 4 +-
+ arch/mips/jz4740/dma.c | 2 +-
+ arch/mips/jz4740/gpio.c | 2 +-
+ arch/mips/jz4740/irq.c | 2 +-
+ arch/mips/jz4740/irq.h | 2 +-
+ arch/mips/jz4740/platform.c | 12 +-
+ arch/mips/jz4740/pm.c | 2 +-
+ arch/mips/jz4740/prom.c | 2 +-
+ arch/mips/jz4740/reset.c | 2 +-
+ arch/mips/jz4740/setup.c | 2 +-
+ arch/mips/jz4740/time.c | 2 +-
+ arch/mips/jz4740/timer.c | 2 +-
+ arch/mips/kernel/Makefile | 36 +-
+ arch/mips/kernel/binfmt_elfn32.c | 10 +-
+ arch/mips/kernel/binfmt_elfo32.c | 10 +-
+ arch/mips/kernel/bmips_vec.S | 6 +-
+ arch/mips/kernel/branch.c | 10 +-
+ arch/mips/kernel/cevt-bcm1480.c | 4 +-
+ arch/mips/kernel/cevt-ds1287.c | 4 +-
+ arch/mips/kernel/cevt-gt641xx.c | 4 +-
+ arch/mips/kernel/cevt-r4k.c | 6 +-
+ arch/mips/kernel/cevt-sb1250.c | 4 +-
+ arch/mips/kernel/cevt-smtc.c | 2 +-
+ arch/mips/kernel/cevt-txx9.c | 6 +-
+ arch/mips/kernel/cpu-bugs64.c | 10 +-
+ arch/mips/kernel/cpu-probe.c | 130 ++-
+ arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 19 +-
+ arch/mips/kernel/crash.c | 2 +-
+ arch/mips/kernel/csrc-bcm1480.c | 2 +-
+ arch/mips/kernel/csrc-gic.c | 49 +
+ arch/mips/kernel/csrc-ioasic.c | 2 +-
+ arch/mips/kernel/csrc-powertv.c | 6 +-
+ arch/mips/kernel/csrc-sb1250.c | 2 +-
+ arch/mips/kernel/ftrace.c | 12 +-
+ arch/mips/kernel/genex.S | 14 +-
+ arch/mips/kernel/head.S | 4 +-
+ arch/mips/kernel/i8259.c | 2 +-
+ arch/mips/kernel/irq-gt641xx.c | 4 +-
+ arch/mips/kernel/irq-msc01.c | 6 +-
+ arch/mips/kernel/irq-rm7000.c | 4 +-
+ arch/mips/kernel/irq.c | 2 +-
+ arch/mips/kernel/irq_cpu.c | 50 +-
+ arch/mips/kernel/irq_txx9.c | 10 +-
+ arch/mips/kernel/kgdb.c | 6 +-
+ arch/mips/kernel/kprobes.c | 10 +-
+ arch/mips/kernel/linux32.c | 12 +-
+ arch/mips/kernel/mips_ksyms.c | 4 +-
+ arch/mips/kernel/module-rela.c | 6 +-
+ arch/mips/kernel/module.c | 10 +-
+ arch/mips/kernel/octeon_switch.S | 104 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 30 +-
+ arch/mips/kernel/proc.c | 25 +-
+ arch/mips/kernel/process.c | 4 +-
+ arch/mips/kernel/ptrace.c | 12 +-
+ arch/mips/kernel/ptrace32.c | 2 +-
+ arch/mips/kernel/r2300_fpu.S | 128 +--
+ arch/mips/kernel/r2300_switch.S | 2 +-
+ arch/mips/kernel/r4k_switch.S | 4 +-
+ arch/mips/kernel/relocate_kernel.S | 12 +-
+ arch/mips/kernel/rtlx.c | 18 +-
+ arch/mips/kernel/scall32-o32.S | 14 +-
+ arch/mips/kernel/scall64-64.S | 6 +-
+ arch/mips/kernel/scall64-n32.S | 10 +-
+ arch/mips/kernel/scall64-o32.S | 14 +-
+ arch/mips/kernel/setup.c | 101 +-
+ arch/mips/kernel/signal.c | 18 +-
+ arch/mips/kernel/signal32.c | 24 +-
+ arch/mips/kernel/signal_n32.c | 18 +-
+ arch/mips/kernel/smp-cmp.c | 2 +-
+ arch/mips/kernel/smp-mt.c | 4 +-
+ arch/mips/kernel/smtc-asm.S | 2 +-
+ arch/mips/kernel/smtc-proc.c | 6 +-
+ arch/mips/kernel/smtc.c | 20 +-
+ arch/mips/kernel/sync-r4k.c | 2 +-
+ arch/mips/kernel/syscall.c | 25 +-
+ arch/mips/kernel/time.c | 12 +-
+ arch/mips/kernel/traps.c | 32 +-
+ arch/mips/kernel/unaligned.c | 34 +-
+ arch/mips/kernel/vmlinux.lds.S | 8 +-
+ arch/mips/kernel/vpe.c | 98 +-
+ arch/mips/kernel/watch.c | 4 +-
+ arch/mips/lantiq/clk.c | 18 +-
+ arch/mips/lantiq/clk.h | 7 +-
+ arch/mips/lantiq/dts/danube.dtsi | 2 +-
+ arch/mips/lantiq/dts/easy50712.dts | 2 +-
+ arch/mips/lantiq/falcon/sysctrl.c | 4 +-
+ arch/mips/lantiq/irq.c | 105 +-
+ arch/mips/lantiq/prom.h | 2 +-
+ arch/mips/lantiq/xway/clk.c | 43 +
+ arch/mips/lantiq/xway/reset.c | 9 +
+ arch/mips/lantiq/xway/sysctrl.c | 15 +-
+ arch/mips/lasat/Makefile | 2 +-
+ arch/mips/lasat/ds1603.h | 2 +-
+ arch/mips/lasat/image/Makefile | 2 +-
+ arch/mips/lasat/image/head.S | 2 +-
+ arch/mips/lasat/picvue.c | 34 +-
+ arch/mips/lasat/picvue.h | 16 +-
+ arch/mips/lasat/serial.c | 2 +-
+ arch/mips/lasat/sysctl.c | 4 +-
+ arch/mips/lib/bitops.c | 4 +-
+ arch/mips/lib/csum_partial.S | 42 +-
+ arch/mips/lib/delay.c | 2 +-
+ arch/mips/lib/dump_tlb.c | 2 +-
+ arch/mips/lib/memcpy.S | 34 +-
+ arch/mips/lib/memset.S | 4 +-
+ arch/mips/lib/r3k_dump_tlb.c | 2 +-
+ arch/mips/lib/strncpy_user.S | 2 +-
+ arch/mips/lib/strnlen_user.S | 6 +-
+ arch/mips/lib/uncached.c | 2 +-
+ arch/mips/loongson/Makefile | 2 +-
+ arch/mips/loongson/common/bonito-irq.c | 6 +-
+ arch/mips/loongson/common/cmdline.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_acc.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_ehci.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_ide.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_isa.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 6 +-
+ arch/mips/loongson/common/cs5536/cs5536_ohci.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_pci.c | 4 +-
+ arch/mips/loongson/common/early_printk.c | 6 +-
+ arch/mips/loongson/common/env.c | 4 +-
+ arch/mips/loongson/common/gpio.c | 16 +-
+ arch/mips/loongson/common/init.c | 4 +-
+ arch/mips/loongson/common/irq.c | 6 +-
+ arch/mips/loongson/common/machtype.c | 20 +-
+ arch/mips/loongson/common/mem.c | 4 +-
+ arch/mips/loongson/common/pci.c | 34 +-
+ arch/mips/loongson/common/platform.c | 4 +-
+ arch/mips/loongson/common/reset.c | 10 +-
+ arch/mips/loongson/common/serial.c | 18 +-
+ arch/mips/loongson/common/setup.c | 6 +-
+ arch/mips/loongson/common/time.c | 6 +-
+ arch/mips/loongson/common/uart_base.c | 4 +-
+ arch/mips/loongson/fuloong-2e/irq.c | 12 +-
+ arch/mips/loongson/fuloong-2e/reset.c | 4 +-
+ arch/mips/loongson/lemote-2f/ec_kb3310b.h | 216 ++--
+ arch/mips/loongson/lemote-2f/irq.c | 20 +-
+ arch/mips/loongson/lemote-2f/machtype.c | 14 +-
+ arch/mips/loongson/lemote-2f/reset.c | 10 +-
+ arch/mips/loongson1/Platform | 2 +-
+ arch/mips/loongson1/common/clock.c | 4 +-
+ arch/mips/loongson1/common/irq.c | 4 +-
+ arch/mips/loongson1/common/platform.c | 6 +-
+ arch/mips/loongson1/common/prom.c | 4 +-
+ arch/mips/loongson1/common/reset.c | 4 +-
+ arch/mips/loongson1/common/setup.c | 4 +-
+ arch/mips/loongson1/ls1b/board.c | 4 +-
+ arch/mips/math-emu/Makefile | 1 -
+ arch/mips/math-emu/cp1emu.c | 8 +-
+ arch/mips/math-emu/dp_add.c | 2 +-
+ arch/mips/math-emu/dp_sqrt.c | 6 +-
+ arch/mips/math-emu/dp_sub.c | 2 +-
+ arch/mips/math-emu/ieee754.c | 18 +-
+ arch/mips/math-emu/ieee754dp.c | 2 +-
+ arch/mips/math-emu/ieee754int.h | 2 +-
+ arch/mips/math-emu/ieee754sp.c | 2 +-
+ arch/mips/math-emu/ieee754xcpt.c | 2 +-
+ arch/mips/math-emu/kernel_linkage.c | 2 +-
+ arch/mips/math-emu/sp_add.c | 2 +-
+ arch/mips/math-emu/sp_mul.c | 4 +-
+ arch/mips/math-emu/sp_sub.c | 2 +-
+ arch/mips/mm/Makefile | 6 +-
+ arch/mips/mm/c-octeon.c | 2 +-
+ arch/mips/mm/c-r3k.c | 8 +-
+ arch/mips/mm/c-r4k.c | 27 +-
+ arch/mips/mm/c-tx39.c | 12 +-
+ arch/mips/mm/cerr-sb1.c | 30 +-
+ arch/mips/mm/cex-gen.S | 6 +-
+ arch/mips/mm/cex-oct.S | 36 +-
+ arch/mips/mm/cex-sb1.S | 8 +-
+ arch/mips/mm/dma-default.c | 2 +-
+ arch/mips/mm/fault.c | 4 +-
+ arch/mips/mm/gup.c | 2 +-
+ arch/mips/mm/init.c | 4 +-
+ arch/mips/mm/ioremap.c | 4 +-
+ arch/mips/mm/page.c | 6 +-
+ arch/mips/mm/pgtable-64.c | 4 +-
+ arch/mips/mm/sc-ip22.c | 2 +-
+ arch/mips/mm/sc-r5k.c | 4 +-
+ arch/mips/mm/tlb-r4k.c | 2 +-
+ arch/mips/mm/tlbex.c | 33 +-
+ arch/mips/mm/uasm.c | 16 +-
+ arch/mips/mti-malta/malta-amon.c | 6 +-
+ arch/mips/mti-malta/malta-cmdline.c | 2 +-
+ arch/mips/mti-malta/malta-display.c | 6 +-
+ arch/mips/mti-malta/malta-init.c | 14 +-
+ arch/mips/mti-malta/malta-int.c | 40 +-
+ arch/mips/mti-malta/malta-memory.c | 4 +-
+ arch/mips/mti-malta/malta-pci.c | 6 +-
+ arch/mips/mti-malta/malta-platform.c | 2 +-
+ arch/mips/mti-malta/malta-setup.c | 4 +-
+ arch/mips/mti-malta/malta-smtc.c | 2 +-
+ arch/mips/mti-malta/malta-time.c | 83 +-
+ arch/mips/mti-sead3/Makefile | 10 +-
+ arch/mips/mti-sead3/leds-sead3.c | 5 +-
+ arch/mips/mti-sead3/sead3-console.c | 4 +-
+ arch/mips/mti-sead3/sead3-display.c | 2 +-
+ arch/mips/mti-sead3/sead3-i2c-drv.c | 28 +-
+ arch/mips/mti-sead3/sead3-init.c | 5 +-
+ arch/mips/mti-sead3/sead3-memory.c | 138 ---
+ arch/mips/mti-sead3/sead3-net.c | 4 +-
+ arch/mips/mti-sead3/sead3-pic32-bus.c | 6 +-
+ arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 58 +-
+ arch/mips/mti-sead3/sead3-setup.c | 27 +
+ arch/mips/mti-sead3/sead3-time.c | 8 +-
+ arch/mips/mti-sead3/sead3.dts | 26 +
+ arch/mips/netlogic/Platform | 4 +-
+ arch/mips/netlogic/common/irq.c | 43 +-
+ arch/mips/netlogic/common/smp.c | 8 +-
+ arch/mips/netlogic/common/smpboot.S | 20 +-
+ arch/mips/netlogic/common/time.c | 56 +
+ arch/mips/netlogic/dts/xlp_evp.dts | 2 +-
+ arch/mips/netlogic/xlp/nlm_hal.c | 4 +-
+ arch/mips/netlogic/xlp/usb-init.c | 2 +-
+ arch/mips/netlogic/xlp/wakeup.c | 35 +-
+ arch/mips/netlogic/xlr/fmn-config.c | 6 +-
+ arch/mips/netlogic/xlr/platform-flash.c | 12 +-
+ arch/mips/netlogic/xlr/platform.c | 12 +-
+ arch/mips/netlogic/xlr/setup.c | 4 +-
+ arch/mips/oprofile/common.c | 7 +-
+ arch/mips/oprofile/op_model_loongson2.c | 10 +-
+ arch/mips/oprofile/op_model_mipsxx.c | 38 +-
+ arch/mips/pci/Makefile | 5 +-
+ arch/mips/pci/fixup-cobalt.c | 28 +-
+ arch/mips/pci/fixup-emma2rh.c | 2 +-
+ arch/mips/pci/fixup-fuloong2e.c | 8 +-
+ arch/mips/pci/fixup-ip32.c | 14 +-
+ arch/mips/pci/fixup-lemote2f.c | 14 +-
+ arch/mips/pci/fixup-malta.c | 14 +-
+ arch/mips/pci/fixup-pmcmsp.c | 224 ++--
+ arch/mips/pci/fixup-pnx8550.c | 57 -
+ arch/mips/pci/fixup-sni.c | 68 +-
+ arch/mips/pci/fixup-tb0219.c | 2 +-
+ arch/mips/pci/fixup-tb0287.c | 2 +-
+ arch/mips/pci/fixup-wrppmc.c | 2 +-
+ arch/mips/pci/ops-bcm63xx.c | 16 +-
+ arch/mips/pci/ops-bonito64.c | 4 +-
+ arch/mips/pci/ops-gt64xxx_pci0.c | 24 +-
+ arch/mips/pci/ops-lantiq.c | 2 +-
+ arch/mips/pci/ops-loongson2.c | 2 +-
+ arch/mips/pci/ops-msc.c | 22 +-
+ arch/mips/pci/ops-nile4.c | 2 +-
+ arch/mips/pci/ops-pmcmsp.c | 450 ++++----
+ arch/mips/pci/ops-pnx8550.c | 282 -----
+ arch/mips/pci/ops-rc32434.c | 2 +-
+ arch/mips/pci/ops-sni.c | 8 +-
+ arch/mips/pci/ops-tx4927.c | 8 +-
+ arch/mips/pci/ops-vr41xx.c | 6 +-
+ arch/mips/pci/pci-alchemy.c | 6 +-
+ arch/mips/pci/pci-ar71xx.c | 194 ++--
+ arch/mips/pci/pci-ar724x.c | 304 +++--
+ arch/mips/pci/pci-bcm1480.c | 8 +-
+ arch/mips/pci/pci-bcm1480ht.c | 6 +-
+ arch/mips/pci/pci-bcm47xx.c | 2 +-
+ arch/mips/pci/pci-bcm63xx.c | 62 +-
+ arch/mips/pci/pci-bcm63xx.h | 2 +-
+ arch/mips/pci/pci-ip27.c | 8 +-
+ arch/mips/pci/pci-ip32.c | 6 +-
+ arch/mips/pci/pci-lantiq.c | 12 +-
+ arch/mips/pci/pci-lasat.c | 26 +-
+ arch/mips/pci/pci-octeon.c | 30 +-
+ arch/mips/pci/pci-rc32434.c | 6 +-
+ arch/mips/pci/pci-sb1250.c | 8 +-
+ arch/mips/pci/pci-vr41xx.c | 22 +-
+ arch/mips/pci/pci-vr41xx.h | 2 +-
+ arch/mips/pci/pci-xlp.c | 156 ++-
+ arch/mips/pci/pci-xlr.c | 34 +-
+ arch/mips/pci/pci.c | 19 +-
+ arch/mips/pci/pcie-octeon.c | 58 +-
+ arch/mips/pmc-sierra/Platform | 7 -
+ arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile | 0
+ arch/mips/pmcs-msp71xx/Platform | 7 +
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c | 0
+ .../msp71xx => pmcs-msp71xx}/gpio_extended.c | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c | 0
+ .../msp71xx => pmcs-msp71xx}/msp_hwbutton.c | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c | 4 +-
+ .../msp71xx => pmcs-msp71xx}/msp_irq_cic.c | 6 +-
+ .../msp71xx => pmcs-msp71xx}/msp_irq_per.c | 4 +-
+ .../msp71xx => pmcs-msp71xx}/msp_irq_slp.c | 4 +-
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c | 2 +-
+ .../msp71xx => pmcs-msp71xx}/msp_prom.c | 4 +-
+ .../msp71xx => pmcs-msp71xx}/msp_serial.c | 32 +-
+ .../msp71xx => pmcs-msp71xx}/msp_setup.c | 8 +-
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c | 0
+ .../msp71xx => pmcs-msp71xx}/msp_smtc.c | 0
+ .../msp71xx => pmcs-msp71xx}/msp_time.c | 2 +-
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c | 54 +-
+ arch/mips/pnx833x/Platform | 2 +-
+ arch/mips/pnx833x/common/interrupts.c | 110 +-
+ arch/mips/pnx833x/common/platform.c | 34 +-
+ arch/mips/pnx833x/common/prom.c | 2 +-
+ arch/mips/pnx833x/common/reset.c | 2 +-
+ arch/mips/pnx833x/common/setup.c | 2 +-
+ arch/mips/pnx833x/stb22x/board.c | 2 +-
+ arch/mips/pnx8550/Makefile | 3 -
+ arch/mips/pnx8550/Platform | 7 -
+ arch/mips/pnx8550/common/Makefile | 26 -
+ arch/mips/pnx8550/common/int.c | 236 ----
+ arch/mips/pnx8550/common/pci.c | 134 ---
+ arch/mips/pnx8550/common/platform.c | 162 ---
+ arch/mips/pnx8550/common/proc.c | 110 --
+ arch/mips/pnx8550/common/prom.c | 128 ---
+ arch/mips/pnx8550/common/reset.c | 40 -
+ arch/mips/pnx8550/common/setup.c | 142 ---
+ arch/mips/pnx8550/common/time.c | 151 ---
+ arch/mips/pnx8550/jbs/Makefile | 4 -
+ arch/mips/pnx8550/jbs/board_setup.c | 56 -
+ arch/mips/pnx8550/jbs/init.c | 53 -
+ arch/mips/pnx8550/jbs/irqmap.c | 35 -
+ arch/mips/pnx8550/stb810/Makefile | 4 -
+ arch/mips/pnx8550/stb810/board_setup.c | 41 -
+ arch/mips/pnx8550/stb810/irqmap.c | 22 -
+ arch/mips/pnx8550/stb810/prom_init.c | 46 -
+ arch/mips/power/cpu.c | 2 +-
+ arch/mips/power/hibernate.S | 2 +-
+ arch/mips/powertv/asic/asic-calliope.c | 10 +-
+ arch/mips/powertv/asic/asic-cronus.c | 6 +-
+ arch/mips/powertv/asic/asic-gaia.c | 2 +-
+ arch/mips/powertv/asic/asic-zeus.c | 6 +-
+ arch/mips/powertv/asic/asic_devices.c | 8 +-
+ arch/mips/powertv/asic/asic_int.c | 4 +-
+ arch/mips/powertv/asic/irq_asic.c | 4 +-
+ arch/mips/powertv/asic/prealloc-calliope.c | 10 +-
+ arch/mips/powertv/asic/prealloc-cronus.c | 12 +-
+ arch/mips/powertv/asic/prealloc-cronuslite.c | 8 +-
+ arch/mips/powertv/asic/prealloc-gaia.c | 382 +++----
+ arch/mips/powertv/asic/prealloc-zeus.c | 10 +-
+ arch/mips/powertv/init.c | 2 +-
+ arch/mips/powertv/ioremap.c | 4 +-
+ arch/mips/powertv/memory.c | 2 +-
+ arch/mips/powertv/powertv-usb.c | 46 +-
+ arch/mips/ralink/Kconfig | 32 +
+ arch/mips/ralink/Makefile | 15 +
+ arch/mips/ralink/Platform | 10 +
+ arch/mips/ralink/clk.c | 72 ++
+ arch/mips/ralink/common.h | 44 +
+ arch/mips/ralink/dts/Makefile | 1 +
+ arch/mips/ralink/dts/rt3050.dtsi | 106 ++
+ arch/mips/ralink/dts/rt3052_eval.dts | 52 +
+ arch/mips/ralink/early_printk.c | 44 +
+ arch/mips/ralink/irq.c | 180 +++
+ arch/mips/ralink/of.c | 107 ++
+ arch/mips/ralink/prom.c | 69 ++
+ arch/mips/ralink/reset.c | 44 +
+ arch/mips/ralink/rt305x.c | 242 ++++
+ arch/mips/rb532/devices.c | 12 +-
+ arch/mips/rb532/gpio.c | 8 +-
+ arch/mips/rb532/irq.c | 4 +-
+ arch/mips/sgi-ip22/ip22-eisa.c | 14 +-
+ arch/mips/sgi-ip22/ip22-gio.c | 14 +-
+ arch/mips/sgi-ip22/ip22-int.c | 36 +-
+ arch/mips/sgi-ip22/ip22-mc.c | 44 +-
+ arch/mips/sgi-ip22/ip22-nvram.c | 16 +-
+ arch/mips/sgi-ip22/ip22-platform.c | 8 +-
+ arch/mips/sgi-ip22/ip22-reset.c | 4 +-
+ arch/mips/sgi-ip22/ip28-berr.c | 16 +-
+ arch/mips/sgi-ip27/ip27-berr.c | 4 +-
+ arch/mips/sgi-ip27/ip27-hubio.c | 14 +-
+ arch/mips/sgi-ip27/ip27-init.c | 2 +-
+ arch/mips/sgi-ip27/ip27-irq.c | 6 +-
+ arch/mips/sgi-ip27/ip27-memory.c | 12 +-
+ arch/mips/sgi-ip27/ip27-nmi.c | 6 +-
+ arch/mips/sgi-ip27/ip27-reset.c | 2 +-
+ arch/mips/sgi-ip27/ip27-smp.c | 4 +-
+ arch/mips/sgi-ip27/ip27-timer.c | 6 +-
+ arch/mips/sgi-ip27/ip27-xtalk.c | 16 +-
+ arch/mips/sgi-ip32/ip32-irq.c | 8 +-
+ arch/mips/sibyte/Platform | 6 +-
+ arch/mips/sibyte/bcm1480/irq.c | 8 +-
+ arch/mips/sibyte/common/cfe.c | 10 +-
+ arch/mips/sibyte/common/sb_tbprof.c | 18 +-
+ arch/mips/sibyte/sb1250/bus_watcher.c | 6 +-
+ arch/mips/sibyte/sb1250/irq.c | 8 +-
+ arch/mips/sibyte/sb1250/setup.c | 18 +-
+ arch/mips/sibyte/swarm/platform.c | 4 +-
+ arch/mips/sibyte/swarm/rtc_xicor1241.c | 50 +-
+ arch/mips/sni/a20r.c | 44 +-
+ arch/mips/sni/eisa.c | 2 +-
+ arch/mips/sni/irq.c | 20 +-
+ arch/mips/sni/pcimt.c | 36 +-
+ arch/mips/sni/pcit.c | 40 +-
+ arch/mips/sni/rm200.c | 38 +-
+ arch/mips/sni/setup.c | 24 +-
+ arch/mips/sni/time.c | 30 +-
+ arch/mips/txx9/Platform | 4 +-
+ arch/mips/txx9/generic/irq_tx4927.c | 2 +-
+ arch/mips/txx9/generic/irq_tx4939.c | 4 +-
+ arch/mips/txx9/generic/mem_tx4927.c | 2 +-
+ arch/mips/txx9/generic/pci.c | 4 +-
+ arch/mips/txx9/generic/setup_tx3927.c | 2 +-
+ arch/mips/txx9/generic/setup_tx4927.c | 2 +-
+ arch/mips/txx9/generic/setup_tx4938.c | 2 +-
+ arch/mips/txx9/generic/setup_tx4939.c | 4 +-
+ arch/mips/txx9/generic/smsc_fdc37m81x.c | 48 +-
+ arch/mips/txx9/rbtx4927/irq.c | 2 +-
+ arch/mips/txx9/rbtx4927/prom.c | 2 +-
+ arch/mips/txx9/rbtx4927/setup.c | 2 +-
+ arch/mips/txx9/rbtx4938/setup.c | 8 +-
+ arch/mips/txx9/rbtx4939/setup.c | 4 +-
+ arch/mips/vr41xx/common/bcu.c | 4 +-
+ arch/mips/vr41xx/common/cmu.c | 16 +-
+ arch/mips/vr41xx/common/giu.c | 2 +-
+ arch/mips/vr41xx/common/icu.c | 8 +-
+ arch/mips/vr41xx/common/pmu.c | 2 +-
+ arch/mips/vr41xx/common/rtc.c | 2 +-
+ arch/mips/vr41xx/common/type.c | 2 +-
+ arch/mips/wrppmc/Platform | 2 +-
+ arch/mips/wrppmc/irq.c | 4 +-
+ arch/mips/wrppmc/serial.c | 2 +-
+ drivers/bcma/driver_gpio.c | 11 +
+ drivers/mtd/bcm47xxpart.c | 2 +-
+ drivers/net/ethernet/broadcom/b44.c | 4 +-
+ drivers/ssb/driver_chipcommon_pmu.c | 4 +-
+ drivers/ssb/driver_gpio.c | 22 +
+ drivers/tty/serial/Kconfig | 10 +-
+ include/linux/ssb/ssb_driver_gige.h | 6 +-
+ 872 files changed, 15562 insertions(+), 15916 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/cpu_irq.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/lantiq_asc.txt
+ create mode 100644 arch/mips/cavium-octeon/oct_ilm.c
+ delete mode 100644 arch/mips/configs/pnx8550_jbs_defconfig
+ delete mode 100644 arch/mips/configs/pnx8550_stb810_defconfig
+ create mode 100644 arch/mips/configs/rt305x_defconfig
+ delete mode 100644 arch/mips/include/asm/mach-ath79/pci.h
+ rename arch/mips/include/asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} (84%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/cpu-feature-overrides.h (100%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/gpio.h (100%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h (61%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_gpio_macros.h (99%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_int.h (91%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_pci.h (87%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_prom.h (96%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regops.h (99%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regs.h (65%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h (63%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_usb.h (99%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/war.h (91%)
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/cm.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/glb.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/int.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/nand.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/pci.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/uart.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/usb.h
+ create mode 100644 arch/mips/include/asm/mach-ralink/ralink_regs.h
+ create mode 100644 arch/mips/include/asm/mach-ralink/rt305x.h
+ rename arch/mips/include/asm/{mach-pnx8550 => mach-ralink}/war.h (83%)
+ create mode 100644 arch/mips/include/uapi/asm/inst.h
+ create mode 100644 arch/mips/kernel/csrc-gic.c
+ delete mode 100644 arch/mips/mti-sead3/sead3-memory.c
+ create mode 100644 arch/mips/mti-sead3/sead3.dts
+ delete mode 100644 arch/mips/pci/fixup-pnx8550.c
+ delete mode 100644 arch/mips/pci/ops-pnx8550.c
+ delete mode 100644 arch/mips/pmc-sierra/Platform
+ rename arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile (100%)
+ create mode 100644 arch/mips/pmcs-msp71xx/Platform
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio_extended.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_hwbutton.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c (97%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_cic.c (96%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_per.c (95%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_slp.c (94%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c (97%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_prom.c (99%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_serial.c (87%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_setup.c (95%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smtc.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_time.c (99%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c (87%)
+ delete mode 100644 arch/mips/pnx8550/Makefile
+ delete mode 100644 arch/mips/pnx8550/Platform
+ delete mode 100644 arch/mips/pnx8550/common/Makefile
+ delete mode 100644 arch/mips/pnx8550/common/int.c
+ delete mode 100644 arch/mips/pnx8550/common/pci.c
+ delete mode 100644 arch/mips/pnx8550/common/platform.c
+ delete mode 100644 arch/mips/pnx8550/common/proc.c
+ delete mode 100644 arch/mips/pnx8550/common/prom.c
+ delete mode 100644 arch/mips/pnx8550/common/reset.c
+ delete mode 100644 arch/mips/pnx8550/common/setup.c
+ delete mode 100644 arch/mips/pnx8550/common/time.c
+ delete mode 100644 arch/mips/pnx8550/jbs/Makefile
+ delete mode 100644 arch/mips/pnx8550/jbs/board_setup.c
+ delete mode 100644 arch/mips/pnx8550/jbs/init.c
+ delete mode 100644 arch/mips/pnx8550/jbs/irqmap.c
+ delete mode 100644 arch/mips/pnx8550/stb810/Makefile
+ delete mode 100644 arch/mips/pnx8550/stb810/board_setup.c
+ delete mode 100644 arch/mips/pnx8550/stb810/irqmap.c
+ delete mode 100644 arch/mips/pnx8550/stb810/prom_init.c
+ create mode 100644 arch/mips/ralink/Kconfig
+ create mode 100644 arch/mips/ralink/Makefile
+ create mode 100644 arch/mips/ralink/Platform
+ create mode 100644 arch/mips/ralink/clk.c
+ create mode 100644 arch/mips/ralink/common.h
+ create mode 100644 arch/mips/ralink/dts/Makefile
+ create mode 100644 arch/mips/ralink/dts/rt3050.dtsi
+ create mode 100644 arch/mips/ralink/dts/rt3052_eval.dts
+ create mode 100644 arch/mips/ralink/early_printk.c
+ create mode 100644 arch/mips/ralink/irq.c
+ create mode 100644 arch/mips/ralink/of.c
+ create mode 100644 arch/mips/ralink/prom.c
+ create mode 100644 arch/mips/ralink/reset.c
+ create mode 100644 arch/mips/ralink/rt305x.c
+$ git am -3 ../patches/0001-min_low_pfn-is-now-exported-by-generic-code.patch
+Applying: min_low_pfn is now exported by generic code
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/ia64/kernel/ia64_ksyms.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 2268c48] Merge remote-tracking branch 'mips/mips-for-linux-next'
+$ git reset --hard HEAD^
+HEAD is now at 84d0b72 Merge remote-tracking branch 'microblaze/next'
+Merging 20130215 version of mips
+$ git merge -m 20130215/mips 38ab365e254552c04da9e9aeb1b5a26e8a7af1b5
+Removing arch/mips/pnx8550/stb810/prom_init.c
+Removing arch/mips/pnx8550/stb810/irqmap.c
+Removing arch/mips/pnx8550/stb810/board_setup.c
+Removing arch/mips/pnx8550/stb810/Makefile
+Removing arch/mips/pnx8550/jbs/irqmap.c
+Removing arch/mips/pnx8550/jbs/init.c
+Removing arch/mips/pnx8550/jbs/board_setup.c
+Removing arch/mips/pnx8550/jbs/Makefile
+Removing arch/mips/pnx8550/common/time.c
+Removing arch/mips/pnx8550/common/setup.c
+Removing arch/mips/pnx8550/common/reset.c
+Removing arch/mips/pnx8550/common/prom.c
+Removing arch/mips/pnx8550/common/proc.c
+Removing arch/mips/pnx8550/common/platform.c
+Removing arch/mips/pnx8550/common/pci.c
+Removing arch/mips/pnx8550/common/int.c
+Removing arch/mips/pnx8550/common/Makefile
+Removing arch/mips/pnx8550/Platform
+Removing arch/mips/pnx8550/Makefile
+Auto-merging arch/mips/pmcs-msp71xx/msp_usb.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_time.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_setup.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_serial.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_prom.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_pci.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq_slp.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq_per.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq_cic.c
+Auto-merging arch/mips/pmcs-msp71xx/msp_irq.c
+Removing arch/mips/pmc-sierra/Platform
+Removing arch/mips/pci/ops-pnx8550.c
+Removing arch/mips/pci/fixup-pnx8550.c
+Removing arch/mips/mti-sead3/sead3-memory.c
+Auto-merging arch/mips/kernel/traps.c
+Removing arch/mips/include/asm/mach-pnx8550/war.h
+Removing arch/mips/include/asm/mach-pnx8550/usb.h
+Removing arch/mips/include/asm/mach-pnx8550/uart.h
+Removing arch/mips/include/asm/mach-pnx8550/pci.h
+Removing arch/mips/include/asm/mach-pnx8550/nand.h
+Removing arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h
+Removing arch/mips/include/asm/mach-pnx8550/int.h
+Removing arch/mips/include/asm/mach-pnx8550/glb.h
+Removing arch/mips/include/asm/mach-pnx8550/cm.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/war.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h
+Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h
+Removing arch/mips/configs/pnx8550_stb810_defconfig
+Removing arch/mips/configs/pnx8550_jbs_defconfig
+Merge made by the 'recursive' strategy.
+ arch/mips/Kbuild | 4 +
+ arch/mips/Kbuild.platforms | 3 +-
+ arch/mips/Kconfig | 44 +-
+ arch/mips/Makefile | 2 +-
+ arch/mips/alchemy/Platform | 6 +-
+ arch/mips/alchemy/board-gpr.c | 12 +-
+ arch/mips/alchemy/board-mtx1.c | 8 +-
+ arch/mips/alchemy/common/dbdma.c | 14 +-
+ arch/mips/alchemy/common/gpiolib.c | 14 +-
+ arch/mips/alchemy/common/irq.c | 178 +-
+ arch/mips/alchemy/common/platform.c | 4 +-
+ arch/mips/alchemy/common/setup.c | 2 +-
+ arch/mips/alchemy/common/sleeper.S | 20 +-
+ arch/mips/alchemy/common/time.c | 2 +-
+ arch/mips/alchemy/common/usb.c | 2 +-
+ arch/mips/alchemy/devboards/bcsr.c | 2 +-
+ arch/mips/alchemy/devboards/db1000.c | 16 +-
+ arch/mips/alchemy/devboards/db1200.c | 28 +-
+ arch/mips/alchemy/devboards/db1300.c | 10 +-
+ arch/mips/alchemy/devboards/db1550.c | 18 +-
+ arch/mips/alchemy/devboards/pm.c | 2 +-
+ arch/mips/ar7/Platform | 6 +-
+ arch/mips/ar7/platform.c | 12 +-
+ arch/mips/ath79/clock.c | 2 +-
+ arch/mips/ath79/mach-ap121.c | 2 +-
+ arch/mips/ath79/mach-ap81.c | 2 +-
+ arch/mips/ath79/mach-db120.c | 2 +-
+ arch/mips/ath79/mach-pb44.c | 6 +-
+ arch/mips/bcm47xx/Makefile | 2 +-
+ arch/mips/bcm47xx/nvram.c | 4 +-
+ arch/mips/bcm47xx/sprom.c | 4 +-
+ arch/mips/bcm47xx/wgt634u.c | 40 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +-
+ arch/mips/boot/Makefile | 2 +-
+ arch/mips/boot/compressed/Makefile | 8 +-
+ arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 4 +-
+ arch/mips/boot/compressed/decompress.c | 4 +-
+ arch/mips/boot/compressed/head.S | 4 +-
+ arch/mips/boot/ecoff.h | 62 +-
+ arch/mips/boot/elf2ecoff.c | 8 +-
+ arch/mips/cavium-octeon/Kconfig | 9 +
+ arch/mips/cavium-octeon/Makefile | 3 +-
+ arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 10 +-
+ .../cavium-octeon/executive/cvmx-helper-board.c | 28 +-
+ .../cavium-octeon/executive/cvmx-helper-jtag.c | 4 +-
+ .../cavium-octeon/executive/cvmx-helper-rgmii.c | 22 +-
+ .../cavium-octeon/executive/cvmx-helper-sgmii.c | 4 +-
+ .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 8 +-
+ .../cavium-octeon/executive/cvmx-helper-util.c | 34 +-
+ .../cavium-octeon/executive/cvmx-helper-xaui.c | 4 +-
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +-
+ .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 6 +-
+ arch/mips/cavium-octeon/executive/cvmx-l2c.c | 66 +-
+ arch/mips/cavium-octeon/executive/cvmx-pko.c | 28 +-
+ arch/mips/cavium-octeon/executive/cvmx-spi.c | 70 +-
+ arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 16 +-
+ arch/mips/cavium-octeon/oct_ilm.c | 206 ++
+ arch/mips/cavium-octeon/octeon-irq.c | 4 +-
+ arch/mips/cavium-octeon/octeon-memcpy.S | 22 +-
+ arch/mips/cavium-octeon/octeon-platform.c | 2 +-
+ arch/mips/cavium-octeon/octeon_3xxx.dts | 34 +-
+ arch/mips/cavium-octeon/octeon_68xx.dts | 34 +-
+ arch/mips/cavium-octeon/octeon_boot.h | 14 +-
+ arch/mips/cavium-octeon/setup.c | 8 +-
+ arch/mips/cavium-octeon/smp.c | 10 +-
+ arch/mips/cobalt/led.c | 2 +-
+ arch/mips/cobalt/mtd.c | 2 +-
+ arch/mips/cobalt/rtc.c | 2 +-
+ arch/mips/configs/malta_kvm_defconfig | 2267 ++++++++++++++++++++
+ arch/mips/configs/malta_kvm_guest_defconfig | 2237 +++++++++++++++++++
+ arch/mips/configs/pnx8550_jbs_defconfig | 98 -
+ arch/mips/configs/pnx8550_stb810_defconfig | 92 -
+ arch/mips/dec/int-handler.S | 98 +-
+ arch/mips/dec/kn02xa-berr.c | 4 +-
+ arch/mips/dec/prom/call_o32.S | 2 +-
+ arch/mips/dec/prom/dectypes.h | 2 +-
+ arch/mips/dec/prom/init.c | 2 +-
+ arch/mips/dec/prom/memory.c | 2 +-
+ arch/mips/dec/setup.c | 4 +-
+ arch/mips/dec/wbflush.c | 6 +-
+ arch/mips/emma/markeins/irq.c | 2 +-
+ arch/mips/emma/markeins/platform.c | 2 +-
+ arch/mips/emma/markeins/setup.c | 2 +-
+ arch/mips/fw/arc/file.c | 4 +-
+ arch/mips/fw/arc/identify.c | 2 +-
+ arch/mips/fw/arc/memory.c | 2 +-
+ arch/mips/fw/arc/promlib.c | 2 +-
+ arch/mips/fw/lib/call_o32.S | 2 +-
+ arch/mips/fw/sni/sniprom.c | 16 +-
+ arch/mips/include/asm/abi.h | 8 +-
+ arch/mips/include/asm/addrspace.h | 6 +-
+ arch/mips/include/asm/asm.h | 98 +-
+ arch/mips/include/asm/atomic.h | 4 +-
+ arch/mips/include/asm/barrier.h | 10 +-
+ arch/mips/include/asm/bcache.h | 2 +-
+ arch/mips/include/asm/bitops.h | 22 +-
+ arch/mips/include/asm/bootinfo.h | 20 +-
+ arch/mips/include/asm/cacheops.h | 14 +-
+ arch/mips/include/asm/checksum.h | 2 +-
+ arch/mips/include/asm/cmpxchg.h | 6 +-
+ arch/mips/include/asm/compat-signal.h | 4 +-
+ arch/mips/include/asm/compat.h | 6 +-
+ arch/mips/include/asm/cpu-features.h | 31 +-
+ arch/mips/include/asm/cpu-info.h | 18 +-
+ arch/mips/include/asm/cpu.h | 32 +-
+ arch/mips/include/asm/dec/ioasic_addrs.h | 22 +-
+ arch/mips/include/asm/dec/kn01.h | 12 +-
+ arch/mips/include/asm/dec/kn02ca.h | 2 +-
+ arch/mips/include/asm/dec/prom.h | 2 +-
+ arch/mips/include/asm/dma-mapping.h | 2 +-
+ arch/mips/include/asm/dma.h | 112 +-
+ arch/mips/include/asm/elf.h | 30 +-
+ arch/mips/include/asm/emma/emma2rh.h | 112 +-
+ arch/mips/include/asm/emma/markeins.h | 2 +-
+ arch/mips/include/asm/fixmap.h | 4 +-
+ arch/mips/include/asm/floppy.h | 4 +-
+ arch/mips/include/asm/fpregdef.h | 10 +-
+ arch/mips/include/asm/fpu.h | 6 +-
+ arch/mips/include/asm/futex.h | 12 +-
+ arch/mips/include/asm/fw/arc/hinv.h | 10 +-
+ arch/mips/include/asm/fw/arc/types.h | 12 +-
+ arch/mips/include/asm/fw/cfe/cfe_api.h | 6 +-
+ arch/mips/include/asm/fw/cfe/cfe_error.h | 18 +-
+ arch/mips/include/asm/gcmpregs.h | 100 +-
+ arch/mips/include/asm/gic.h | 16 +-
+ arch/mips/include/asm/gio_device.h | 14 +-
+ arch/mips/include/asm/gt64120.h | 22 +-
+ arch/mips/include/asm/hazards.h | 6 +-
+ arch/mips/include/asm/highmem.h | 4 +-
+ arch/mips/include/asm/inst.h | 348 +--
+ arch/mips/include/asm/io.h | 30 +-
+ arch/mips/include/asm/ip32/crime.h | 8 +-
+ arch/mips/include/asm/ip32/ip32_ints.h | 2 +-
+ arch/mips/include/asm/ip32/mace.h | 12 +-
+ arch/mips/include/asm/irq.h | 6 +-
+ arch/mips/include/asm/isadep.h | 4 +-
+ arch/mips/include/asm/jazz.h | 166 +-
+ arch/mips/include/asm/jazzdma.h | 50 +-
+ arch/mips/include/asm/kmap_types.h | 2 +-
+ arch/mips/include/asm/kprobes.h | 2 +-
+ arch/mips/include/asm/kvm.h | 55 +
+ arch/mips/include/asm/kvm_host.h | 667 ++++++
+ arch/mips/include/asm/lasat/eeprom.h | 12 +-
+ arch/mips/include/asm/lasat/lasat.h | 14 +-
+ arch/mips/include/asm/lasat/serial.h | 2 +-
+ arch/mips/include/asm/local.h | 6 +-
+ arch/mips/include/asm/m48t37.h | 2 +-
+ arch/mips/include/asm/mach-ar7/ar7.h | 18 +-
+ arch/mips/include/asm/mach-ar7/irq.h | 2 +-
+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 8 +-
+ arch/mips/include/asm/mach-ath79/ar933x_uart.h | 12 +-
+ .../include/asm/mach-ath79/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-au1x00/au1000.h | 198 +-
+ arch/mips/include/asm/mach-au1x00/au1000_dma.h | 10 +-
+ arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 16 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 22 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_psc.h | 8 +-
+ arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 20 +-
+ arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 2 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 2 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 2 +-
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 24 +-
+ arch/mips/include/asm/mach-bcm63xx/irq.h | 2 +-
+ arch/mips/include/asm/mach-cavium-octeon/irq.h | 4 +-
+ .../asm/mach-cavium-octeon/kernel-entry-init.h | 36 +-
+ .../asm/mach-cobalt/cpu-feature-overrides.h | 4 +-
+ arch/mips/include/asm/mach-cobalt/mach-gt64120.h | 2 +-
+ arch/mips/include/asm/mach-db1x00/bcsr.h | 4 +-
+ arch/mips/include/asm/mach-db1x00/db1200.h | 2 +-
+ arch/mips/include/asm/mach-db1x00/db1300.h | 2 +-
+ arch/mips/include/asm/mach-emma2rh/irq.h | 2 +-
+ .../asm/mach-generic/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-generic/floppy.h | 4 +-
+ arch/mips/include/asm/mach-generic/ide.h | 4 +-
+ arch/mips/include/asm/mach-generic/irq.h | 4 +-
+ arch/mips/include/asm/mach-generic/spaces.h | 11 +-
+ .../mips/include/asm/mach-ip27/kernel-entry-init.h | 4 +-
+ arch/mips/include/asm/mach-ip27/mmzone.h | 2 +-
+ arch/mips/include/asm/mach-ip27/topology.h | 2 +-
+ .../include/asm/mach-ip28/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-ip28/spaces.h | 2 +-
+ arch/mips/include/asm/mach-ip32/dma-coherence.h | 2 +-
+ arch/mips/include/asm/mach-ip32/war.h | 2 +-
+ arch/mips/include/asm/mach-jazz/floppy.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/clock.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/dma.h | 10 +-
+ arch/mips/include/asm/mach-jz4740/gpio.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/irq.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/platform.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/timer.h | 2 +-
+ .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +-
+ arch/mips/include/asm/mach-lantiq/war.h | 24 +-
+ arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 4 +-
+ arch/mips/include/asm/mach-lasat/mach-gt64120.h | 6 +-
+ .../asm/mach-loongson/cpu-feature-overrides.h | 8 +-
+ .../mips/include/asm/mach-loongson/cs5536/cs5536.h | 422 ++--
+ .../asm/mach-loongson/cs5536/cs5536_mfgpt.h | 2 +-
+ .../include/asm/mach-loongson/cs5536/cs5536_pci.h | 122 +-
+ .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 4 +-
+ arch/mips/include/asm/mach-loongson/gpio.h | 4 +-
+ arch/mips/include/asm/mach-loongson/loongson.h | 50 +-
+ arch/mips/include/asm/mach-loongson/machine.h | 4 +-
+ arch/mips/include/asm/mach-loongson/mem.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/irq.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/loongson1.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/platform.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/prom.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/regs-clk.h | 4 +-
+ arch/mips/include/asm/mach-loongson1/regs-wdt.h | 4 +-
+ .../include/asm/mach-malta/cpu-feature-overrides.h | 8 +-
+ arch/mips/include/asm/mach-malta/irq.h | 2 +-
+ arch/mips/include/asm/mach-malta/mach-gt64120.h | 2 +-
+ .../cpu-feature-overrides.h | 0
+ .../msp71xx => mach-pmcs-msp71xx}/gpio.h | 0
+ .../msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h | 110 +-
+ .../msp_gpio_macros.h | 4 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_int.h | 4 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_pci.h | 46 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_prom.h | 8 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_regops.h | 2 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_regs.h | 416 ++--
+ .../msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h | 96 +-
+ .../msp71xx => mach-pmcs-msp71xx}/msp_usb.h | 2 +-
+ .../msp71xx => mach-pmcs-msp71xx}/war.h | 4 +-
+ arch/mips/include/asm/mach-pnx833x/irq-mapping.h | 18 +-
+ arch/mips/include/asm/mach-pnx833x/pnx833x.h | 12 +-
+ arch/mips/include/asm/mach-pnx8550/cm.h | 43 -
+ arch/mips/include/asm/mach-pnx8550/glb.h | 86 -
+ arch/mips/include/asm/mach-pnx8550/int.h | 140 --
+ .../include/asm/mach-pnx8550/kernel-entry-init.h | 262 ---
+ arch/mips/include/asm/mach-pnx8550/nand.h | 121 --
+ arch/mips/include/asm/mach-pnx8550/pci.h | 185 --
+ arch/mips/include/asm/mach-pnx8550/uart.h | 30 -
+ arch/mips/include/asm/mach-pnx8550/usb.h | 32 -
+ arch/mips/include/asm/mach-pnx8550/war.h | 24 -
+ arch/mips/include/asm/mach-powertv/asic.h | 8 +-
+ arch/mips/include/asm/mach-powertv/asic_regs.h | 4 +-
+ arch/mips/include/asm/mach-powertv/dma-coherence.h | 2 +-
+ arch/mips/include/asm/mach-powertv/interrupts.h | 62 +-
+ arch/mips/include/asm/mach-rc32434/ddr.h | 2 +-
+ arch/mips/include/asm/mach-rc32434/dma.h | 12 +-
+ arch/mips/include/asm/mach-rc32434/dma_v.h | 4 +-
+ arch/mips/include/asm/mach-rc32434/eth.h | 6 +-
+ arch/mips/include/asm/mach-rc32434/gpio.h | 6 +-
+ arch/mips/include/asm/mach-rc32434/irq.h | 12 +-
+ arch/mips/include/asm/mach-rc32434/pci.h | 60 +-
+ arch/mips/include/asm/mach-rc32434/rb.h | 6 +-
+ arch/mips/include/asm/mach-rc32434/rc32434.h | 2 +-
+ arch/mips/include/asm/mach-rc32434/timer.h | 18 +-
+ .../include/asm/mach-sead3/cpu-feature-overrides.h | 8 +-
+ arch/mips/include/asm/mach-sead3/irq.h | 2 +-
+ arch/mips/include/asm/mach-sibyte/war.h | 4 +-
+ arch/mips/include/asm/mach-wrppmc/mach-gt64120.h | 16 +-
+ arch/mips/include/asm/mc146818-time.h | 4 +-
+ arch/mips/include/asm/mips-boards/bonito64.h | 106 +-
+ arch/mips/include/asm/mips-boards/generic.h | 44 +-
+ arch/mips/include/asm/mips-boards/launch.h | 10 +-
+ arch/mips/include/asm/mips-boards/malta.h | 10 +-
+ arch/mips/include/asm/mips-boards/maltaint.h | 8 +-
+ arch/mips/include/asm/mips-boards/piix4.h | 8 +-
+ arch/mips/include/asm/mips-boards/prom.h | 6 +-
+ arch/mips/include/asm/mips-boards/sead3int.h | 4 +-
+ arch/mips/include/asm/mips-boards/sim.h | 14 +-
+ arch/mips/include/asm/mipsmtregs.h | 8 +-
+ arch/mips/include/asm/mipsregs.h | 424 ++--
+ arch/mips/include/asm/mmu_context.h | 12 +-
+ arch/mips/include/asm/msc01_ic.h | 174 +-
+ arch/mips/include/asm/netlogic/common.h | 16 +-
+ arch/mips/include/asm/netlogic/haldefs.h | 2 +-
+ arch/mips/include/asm/netlogic/mips-extns.h | 4 +-
+ arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 4 +-
+ arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 +-
+ arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 46 +-
+ arch/mips/include/asm/netlogic/xlp-hal/pic.h | 106 +-
+ arch/mips/include/asm/netlogic/xlp-hal/sys.h | 160 +-
+ arch/mips/include/asm/netlogic/xlp-hal/uart.h | 4 +-
+ arch/mips/include/asm/netlogic/xlr/fmn.h | 242 +--
+ arch/mips/include/asm/netlogic/xlr/iomap.h | 88 +-
+ arch/mips/include/asm/netlogic/xlr/msidef.h | 18 +-
+ arch/mips/include/asm/netlogic/xlr/pic.h | 10 +-
+ arch/mips/include/asm/nile4.h | 38 +-
+ arch/mips/include/asm/octeon/cvmx-address.h | 50 +-
+ arch/mips/include/asm/octeon/cvmx-bootinfo.h | 14 +-
+ arch/mips/include/asm/octeon/cvmx-bootmem.h | 72 +-
+ arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 44 +-
+ arch/mips/include/asm/octeon/cvmx-config.h | 30 +-
+ arch/mips/include/asm/octeon/cvmx-fau.h | 162 +-
+ arch/mips/include/asm/octeon/cvmx-fpa.h | 32 +-
+ arch/mips/include/asm/octeon/cvmx-helper-board.h | 16 +-
+ arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx-helper-util.h | 18 +-
+ arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 +-
+ arch/mips/include/asm/octeon/cvmx-helper.h | 12 +-
+ arch/mips/include/asm/octeon/cvmx-ipd.h | 14 +-
+ arch/mips/include/asm/octeon/cvmx-l2c.h | 210 +-
+ arch/mips/include/asm/octeon/cvmx-mdio.h | 40 +-
+ arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-pip.h | 62 +-
+ arch/mips/include/asm/octeon/cvmx-pko.h | 60 +-
+ arch/mips/include/asm/octeon/cvmx-pow.h | 122 +-
+ arch/mips/include/asm/octeon/cvmx-scratch.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-spi.h | 66 +-
+ arch/mips/include/asm/octeon/cvmx-spinlock.h | 78 +-
+ arch/mips/include/asm/octeon/cvmx-sysinfo.h | 16 +-
+ arch/mips/include/asm/octeon/cvmx-wqe.h | 104 +-
+ arch/mips/include/asm/octeon/cvmx.h | 48 +-
+ arch/mips/include/asm/octeon/octeon-feature.h | 10 +-
+ arch/mips/include/asm/octeon/octeon-model.h | 240 +--
+ arch/mips/include/asm/octeon/octeon.h | 12 +-
+ arch/mips/include/asm/octeon/pci-octeon.h | 2 +-
+ arch/mips/include/asm/paccess.h | 2 +-
+ arch/mips/include/asm/page.h | 14 +-
+ arch/mips/include/asm/pci.h | 6 +-
+ arch/mips/include/asm/pci/bridge.h | 30 +-
+ arch/mips/include/asm/pgtable-32.h | 20 +-
+ arch/mips/include/asm/pgtable-64.h | 4 +-
+ arch/mips/include/asm/pgtable-bits.h | 42 +-
+ arch/mips/include/asm/pgtable.h | 4 +-
+ arch/mips/include/asm/processor.h | 51 +-
+ arch/mips/include/asm/r4kcache.h | 12 +-
+ arch/mips/include/asm/regdef.h | 66 +-
+ arch/mips/include/asm/rtlx.h | 2 +-
+ arch/mips/include/asm/seccomp.h | 2 +-
+ arch/mips/include/asm/sgi/gio.h | 16 +-
+ arch/mips/include/asm/sgi/hpc3.h | 82 +-
+ arch/mips/include/asm/sgi/ioc.h | 4 +-
+ arch/mips/include/asm/sgi/ip22.h | 6 +-
+ arch/mips/include/asm/sgi/mc.h | 26 +-
+ arch/mips/include/asm/sgi/pi1.h | 20 +-
+ arch/mips/include/asm/sgialib.h | 2 +-
+ arch/mips/include/asm/sgiarcs.h | 136 +-
+ arch/mips/include/asm/shmparam.h | 2 +-
+ arch/mips/include/asm/sibyte/bcm1480_int.h | 424 ++--
+ arch/mips/include/asm/sibyte/bcm1480_l2c.h | 138 +-
+ arch/mips/include/asm/sibyte/bcm1480_mc.h | 1192 +++++-----
+ arch/mips/include/asm/sibyte/bcm1480_regs.h | 806 +++----
+ arch/mips/include/asm/sibyte/bcm1480_scd.h | 276 +--
+ arch/mips/include/asm/sibyte/bigsur.h | 20 +-
+ arch/mips/include/asm/sibyte/carmel.h | 52 +-
+ arch/mips/include/asm/sibyte/sb1250.h | 4 +-
+ arch/mips/include/asm/sibyte/sb1250_defs.h | 94 +-
+ arch/mips/include/asm/sibyte/sb1250_dma.h | 426 ++--
+ arch/mips/include/asm/sibyte/sb1250_genbus.h | 26 +-
+ arch/mips/include/asm/sibyte/sb1250_int.h | 274 +--
+ arch/mips/include/asm/sibyte/sb1250_l2c.h | 92 +-
+ arch/mips/include/asm/sibyte/sb1250_ldt.h | 14 +-
+ arch/mips/include/asm/sibyte/sb1250_mac.h | 568 ++---
+ arch/mips/include/asm/sibyte/sb1250_mc.h | 712 +++---
+ arch/mips/include/asm/sibyte/sb1250_regs.h | 854 ++++----
+ arch/mips/include/asm/sibyte/sb1250_scd.h | 668 +++---
+ arch/mips/include/asm/sibyte/sb1250_smbus.h | 158 +-
+ arch/mips/include/asm/sibyte/sb1250_syncser.h | 136 +-
+ arch/mips/include/asm/sibyte/sb1250_uart.h | 262 +--
+ arch/mips/include/asm/sibyte/sentosa.h | 6 +-
+ arch/mips/include/asm/sibyte/swarm.h | 26 +-
+ arch/mips/include/asm/smp.h | 12 +-
+ arch/mips/include/asm/smtc.h | 4 +-
+ arch/mips/include/asm/sn/addrs.h | 54 +-
+ arch/mips/include/asm/sn/agent.h | 12 +-
+ arch/mips/include/asm/sn/arch.h | 8 +-
+ arch/mips/include/asm/sn/fru.h | 12 +-
+ arch/mips/include/asm/sn/gda.h | 24 +-
+ arch/mips/include/asm/sn/intr.h | 16 +-
+ arch/mips/include/asm/sn/io.h | 4 +-
+ arch/mips/include/asm/sn/ioc3.h | 8 +-
+ arch/mips/include/asm/sn/klconfig.h | 526 ++---
+ arch/mips/include/asm/sn/kldir.h | 182 +-
+ arch/mips/include/asm/sn/launch.h | 16 +-
+ arch/mips/include/asm/sn/mapped_kernel.h | 4 +-
+ arch/mips/include/asm/sn/nmi.h | 8 +-
+ arch/mips/include/asm/sn/sn0/addrs.h | 20 +-
+ arch/mips/include/asm/sn/sn0/arch.h | 22 +-
+ arch/mips/include/asm/sn/sn0/hub.h | 12 +-
+ arch/mips/include/asm/sn/sn0/hubio.h | 442 ++--
+ arch/mips/include/asm/sn/sn0/hubmd.h | 214 +-
+ arch/mips/include/asm/sn/sn0/hubni.h | 78 +-
+ arch/mips/include/asm/sn/sn0/hubpi.h | 184 +-
+ arch/mips/include/asm/sn/sn0/ip27.h | 28 +-
+ arch/mips/include/asm/sn/types.h | 4 +-
+ arch/mips/include/asm/sni.h | 104 +-
+ arch/mips/include/asm/sparsemem.h | 2 +-
+ arch/mips/include/asm/spinlock.h | 4 +-
+ arch/mips/include/asm/spinlock_types.h | 2 +-
+ arch/mips/include/asm/stackframe.h | 14 +-
+ arch/mips/include/asm/string.h | 8 +-
+ arch/mips/include/asm/switch_to.h | 4 +-
+ arch/mips/include/asm/thread_info.h | 2 +-
+ arch/mips/include/asm/time.h | 4 +-
+ arch/mips/include/asm/tlb.h | 2 +-
+ arch/mips/include/asm/topology.h | 2 +-
+ arch/mips/include/asm/traps.h | 2 +-
+ arch/mips/include/asm/txx9/jmr3927.h | 14 +-
+ arch/mips/include/asm/txx9/rbtx4927.h | 6 +-
+ arch/mips/include/asm/txx9/rbtx4938.h | 20 +-
+ arch/mips/include/asm/txx9/rbtx4939.h | 14 +-
+ arch/mips/include/asm/txx9/smsc_fdc37m81x.h | 54 +-
+ arch/mips/include/asm/txx9/tx3927.h | 16 +-
+ arch/mips/include/asm/txx9/tx4927.h | 18 +-
+ arch/mips/include/asm/txx9/tx4927pcic.h | 6 +-
+ arch/mips/include/asm/txx9/tx4938.h | 32 +-
+ arch/mips/include/asm/txx9/tx4939.h | 50 +-
+ arch/mips/include/asm/txx9tmr.h | 4 +-
+ arch/mips/include/asm/uaccess.h | 113 +-
+ arch/mips/include/asm/uasm.h | 2 +-
+ arch/mips/include/asm/user.h | 2 +-
+ arch/mips/include/asm/vr41xx/pci.h | 2 +-
+ arch/mips/include/asm/vr41xx/tb0287.h | 2 +-
+ arch/mips/include/asm/war.h | 46 +-
+ arch/mips/include/asm/xtalk/xtalk.h | 24 +-
+ arch/mips/include/asm/xtalk/xwidget.h | 8 +-
+ arch/mips/include/uapi/asm/Kbuild | 1 +
+ arch/mips/include/uapi/asm/break.h | 10 +-
+ arch/mips/include/uapi/asm/cachectl.h | 10 +-
+ arch/mips/include/uapi/asm/errno.h | 188 +-
+ arch/mips/include/uapi/asm/fcntl.h | 4 +-
+ arch/mips/include/uapi/asm/inst.h | 331 +++
+ arch/mips/include/uapi/asm/ioctls.h | 22 +-
+ arch/mips/include/uapi/asm/mman.h | 10 +-
+ arch/mips/include/uapi/asm/ptrace.h | 8 +-
+ arch/mips/include/uapi/asm/sembuf.h | 4 +-
+ arch/mips/include/uapi/asm/siginfo.h | 8 +-
+ arch/mips/include/uapi/asm/signal.h | 24 +-
+ arch/mips/include/uapi/asm/socket.h | 16 +-
+ arch/mips/include/uapi/asm/sockios.h | 2 +-
+ arch/mips/include/uapi/asm/stat.h | 2 +-
+ arch/mips/include/uapi/asm/statfs.h | 6 +-
+ arch/mips/include/uapi/asm/sysmips.h | 8 +-
+ arch/mips/include/uapi/asm/termbits.h | 158 +-
+ arch/mips/include/uapi/asm/termios.h | 12 +-
+ arch/mips/include/uapi/asm/unistd.h | 60 +-
+ arch/mips/jazz/Makefile | 2 +-
+ arch/mips/jazz/irq.c | 4 +-
+ arch/mips/jazz/jazzdma.c | 6 +-
+ arch/mips/jazz/setup.c | 20 +-
+ arch/mips/jz4740/board-qi_lb60.c | 8 +-
+ arch/mips/jz4740/clock-debugfs.c | 2 +-
+ arch/mips/jz4740/clock.c | 4 +-
+ arch/mips/jz4740/dma.c | 2 +-
+ arch/mips/jz4740/gpio.c | 2 +-
+ arch/mips/jz4740/irq.c | 2 +-
+ arch/mips/jz4740/irq.h | 2 +-
+ arch/mips/jz4740/platform.c | 12 +-
+ arch/mips/jz4740/pm.c | 2 +-
+ arch/mips/jz4740/prom.c | 2 +-
+ arch/mips/jz4740/reset.c | 2 +-
+ arch/mips/jz4740/setup.c | 2 +-
+ arch/mips/jz4740/time.c | 2 +-
+ arch/mips/jz4740/timer.c | 2 +-
+ arch/mips/kernel/Makefile | 4 +-
+ arch/mips/kernel/asm-offsets.c | 66 +
+ arch/mips/kernel/binfmt_elfn32.c | 10 +-
+ arch/mips/kernel/binfmt_elfo32.c | 14 +-
+ arch/mips/kernel/bmips_vec.S | 6 +-
+ arch/mips/kernel/branch.c | 10 +-
+ arch/mips/kernel/cevt-bcm1480.c | 4 +-
+ arch/mips/kernel/cevt-ds1287.c | 4 +-
+ arch/mips/kernel/cevt-gt641xx.c | 4 +-
+ arch/mips/kernel/cevt-r4k.c | 10 +-
+ arch/mips/kernel/cevt-sb1250.c | 4 +-
+ arch/mips/kernel/cevt-smtc.c | 2 +-
+ arch/mips/kernel/cevt-txx9.c | 6 +-
+ arch/mips/kernel/cpu-bugs64.c | 10 +-
+ arch/mips/kernel/cpu-probe.c | 118 +-
+ arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 19 +-
+ arch/mips/kernel/crash.c | 2 +-
+ arch/mips/kernel/csrc-bcm1480.c | 2 +-
+ arch/mips/kernel/csrc-ioasic.c | 2 +-
+ arch/mips/kernel/csrc-powertv.c | 6 +-
+ arch/mips/kernel/csrc-sb1250.c | 2 +-
+ arch/mips/kernel/ftrace.c | 12 +-
+ arch/mips/kernel/genex.S | 14 +-
+ arch/mips/kernel/head.S | 4 +-
+ arch/mips/kernel/i8259.c | 2 +-
+ arch/mips/kernel/irq-gt641xx.c | 4 +-
+ arch/mips/kernel/irq-msc01.c | 6 +-
+ arch/mips/kernel/irq-rm7000.c | 4 +-
+ arch/mips/kernel/irq.c | 2 +-
+ arch/mips/kernel/irq_cpu.c | 8 +-
+ arch/mips/kernel/irq_txx9.c | 10 +-
+ arch/mips/kernel/kgdb.c | 6 +-
+ arch/mips/kernel/kprobes.c | 10 +-
+ arch/mips/kernel/linux32.c | 12 +-
+ arch/mips/kernel/mips_ksyms.c | 4 +-
+ arch/mips/kernel/module-rela.c | 6 +-
+ arch/mips/kernel/module.c | 10 +-
+ arch/mips/kernel/octeon_switch.S | 104 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 30 +-
+ arch/mips/kernel/proc.c | 24 +-
+ arch/mips/kernel/process.c | 4 +-
+ arch/mips/kernel/ptrace.c | 12 +-
+ arch/mips/kernel/ptrace32.c | 2 +-
+ arch/mips/kernel/r2300_fpu.S | 128 +-
+ arch/mips/kernel/r2300_switch.S | 2 +-
+ arch/mips/kernel/r4k_switch.S | 4 +-
+ arch/mips/kernel/relocate_kernel.S | 12 +-
+ arch/mips/kernel/rtlx.c | 18 +-
+ arch/mips/kernel/scall32-o32.S | 14 +-
+ arch/mips/kernel/scall64-64.S | 6 +-
+ arch/mips/kernel/scall64-n32.S | 10 +-
+ arch/mips/kernel/scall64-o32.S | 14 +-
+ arch/mips/kernel/setup.c | 10 +-
+ arch/mips/kernel/signal.c | 18 +-
+ arch/mips/kernel/signal32.c | 24 +-
+ arch/mips/kernel/signal_n32.c | 18 +-
+ arch/mips/kernel/smp-cmp.c | 2 +-
+ arch/mips/kernel/smp-mt.c | 4 +-
+ arch/mips/kernel/smp.c | 1 +
+ arch/mips/kernel/smtc-asm.S | 2 +-
+ arch/mips/kernel/smtc-proc.c | 6 +-
+ arch/mips/kernel/smtc.c | 20 +-
+ arch/mips/kernel/sync-r4k.c | 2 +-
+ arch/mips/kernel/syscall.c | 25 +-
+ arch/mips/kernel/time.c | 12 +-
+ arch/mips/kernel/traps.c | 39 +-
+ arch/mips/kernel/unaligned.c | 34 +-
+ arch/mips/kernel/vmlinux.lds.S | 8 +-
+ arch/mips/kernel/vpe.c | 98 +-
+ arch/mips/kernel/watch.c | 4 +-
+ 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/lantiq/clk.c | 6 +-
+ arch/mips/lantiq/dts/danube.dtsi | 2 +-
+ arch/mips/lantiq/dts/easy50712.dts | 2 +-
+ arch/mips/lantiq/irq.c | 2 +-
+ arch/mips/lantiq/prom.h | 2 +-
+ arch/mips/lantiq/xway/dma.c | 5 +-
+ arch/mips/lantiq/xway/gptu.c | 8 +-
+ arch/mips/lasat/Makefile | 2 +-
+ arch/mips/lasat/ds1603.h | 2 +-
+ arch/mips/lasat/image/Makefile | 2 +-
+ arch/mips/lasat/image/head.S | 2 +-
+ arch/mips/lasat/picvue.c | 34 +-
+ arch/mips/lasat/picvue.h | 16 +-
+ arch/mips/lasat/serial.c | 2 +-
+ arch/mips/lasat/sysctl.c | 4 +-
+ arch/mips/lib/bitops.c | 4 +-
+ arch/mips/lib/csum_partial.S | 42 +-
+ arch/mips/lib/delay.c | 2 +-
+ arch/mips/lib/dump_tlb.c | 2 +-
+ arch/mips/lib/memcpy.S | 34 +-
+ arch/mips/lib/memset.S | 4 +-
+ arch/mips/lib/r3k_dump_tlb.c | 2 +-
+ arch/mips/lib/strncpy_user.S | 2 +-
+ arch/mips/lib/strnlen_user.S | 6 +-
+ arch/mips/lib/uncached.c | 2 +-
+ arch/mips/loongson/Makefile | 2 +-
+ arch/mips/loongson/common/bonito-irq.c | 6 +-
+ arch/mips/loongson/common/cmdline.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_acc.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_ehci.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_ide.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_isa.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 6 +-
+ arch/mips/loongson/common/cs5536/cs5536_ohci.c | 4 +-
+ arch/mips/loongson/common/cs5536/cs5536_pci.c | 4 +-
+ arch/mips/loongson/common/early_printk.c | 6 +-
+ arch/mips/loongson/common/env.c | 4 +-
+ arch/mips/loongson/common/gpio.c | 16 +-
+ arch/mips/loongson/common/init.c | 4 +-
+ arch/mips/loongson/common/irq.c | 6 +-
+ arch/mips/loongson/common/machtype.c | 20 +-
+ arch/mips/loongson/common/mem.c | 4 +-
+ arch/mips/loongson/common/pci.c | 34 +-
+ arch/mips/loongson/common/platform.c | 4 +-
+ arch/mips/loongson/common/reset.c | 10 +-
+ arch/mips/loongson/common/serial.c | 18 +-
+ arch/mips/loongson/common/setup.c | 6 +-
+ arch/mips/loongson/common/time.c | 6 +-
+ arch/mips/loongson/common/uart_base.c | 4 +-
+ arch/mips/loongson/fuloong-2e/irq.c | 12 +-
+ arch/mips/loongson/fuloong-2e/reset.c | 4 +-
+ arch/mips/loongson/lemote-2f/ec_kb3310b.h | 216 +-
+ arch/mips/loongson/lemote-2f/irq.c | 20 +-
+ arch/mips/loongson/lemote-2f/machtype.c | 14 +-
+ arch/mips/loongson/lemote-2f/reset.c | 10 +-
+ arch/mips/loongson1/Platform | 2 +-
+ arch/mips/loongson1/common/clock.c | 4 +-
+ arch/mips/loongson1/common/irq.c | 4 +-
+ arch/mips/loongson1/common/platform.c | 6 +-
+ arch/mips/loongson1/common/prom.c | 4 +-
+ arch/mips/loongson1/common/reset.c | 4 +-
+ arch/mips/loongson1/common/setup.c | 4 +-
+ arch/mips/loongson1/ls1b/board.c | 4 +-
+ arch/mips/math-emu/Makefile | 1 -
+ arch/mips/math-emu/cp1emu.c | 8 +-
+ arch/mips/math-emu/dp_add.c | 2 +-
+ arch/mips/math-emu/dp_sqrt.c | 6 +-
+ arch/mips/math-emu/dp_sub.c | 2 +-
+ arch/mips/math-emu/ieee754.c | 18 +-
+ arch/mips/math-emu/ieee754dp.c | 2 +-
+ arch/mips/math-emu/ieee754int.h | 2 +-
+ arch/mips/math-emu/ieee754sp.c | 2 +-
+ arch/mips/math-emu/ieee754xcpt.c | 2 +-
+ arch/mips/math-emu/kernel_linkage.c | 2 +-
+ arch/mips/math-emu/sp_add.c | 2 +-
+ arch/mips/math-emu/sp_mul.c | 4 +-
+ arch/mips/math-emu/sp_sub.c | 2 +-
+ arch/mips/mm/Makefile | 6 +-
+ arch/mips/mm/c-octeon.c | 2 +-
+ arch/mips/mm/c-r3k.c | 8 +-
+ arch/mips/mm/c-r4k.c | 32 +-
+ arch/mips/mm/c-tx39.c | 12 +-
+ arch/mips/mm/cache.c | 1 +
+ arch/mips/mm/cerr-sb1.c | 30 +-
+ arch/mips/mm/cex-gen.S | 6 +-
+ arch/mips/mm/cex-oct.S | 36 +-
+ arch/mips/mm/cex-sb1.S | 8 +-
+ arch/mips/mm/dma-default.c | 2 +-
+ arch/mips/mm/fault.c | 4 +-
+ arch/mips/mm/gup.c | 2 +-
+ arch/mips/mm/init.c | 4 +-
+ arch/mips/mm/ioremap.c | 4 +-
+ arch/mips/mm/page.c | 6 +-
+ arch/mips/mm/pgtable-64.c | 4 +-
+ arch/mips/mm/sc-ip22.c | 2 +-
+ arch/mips/mm/sc-r5k.c | 4 +-
+ arch/mips/mm/tlb-r4k.c | 4 +-
+ arch/mips/mm/tlbex.c | 32 +-
+ arch/mips/mm/uasm.c | 16 +-
+ arch/mips/mti-malta/Platform | 6 +-
+ arch/mips/mti-malta/malta-amon.c | 6 +-
+ arch/mips/mti-malta/malta-cmdline.c | 2 +-
+ arch/mips/mti-malta/malta-display.c | 6 +-
+ arch/mips/mti-malta/malta-init.c | 14 +-
+ arch/mips/mti-malta/malta-int.c | 40 +-
+ arch/mips/mti-malta/malta-memory.c | 4 +-
+ arch/mips/mti-malta/malta-pci.c | 6 +-
+ arch/mips/mti-malta/malta-platform.c | 2 +-
+ arch/mips/mti-malta/malta-setup.c | 4 +-
+ arch/mips/mti-malta/malta-smtc.c | 2 +-
+ arch/mips/mti-malta/malta-time.c | 21 +-
+ arch/mips/mti-sead3/Makefile | 10 +-
+ arch/mips/mti-sead3/leds-sead3.c | 5 +-
+ arch/mips/mti-sead3/sead3-console.c | 4 +-
+ arch/mips/mti-sead3/sead3-display.c | 2 +-
+ arch/mips/mti-sead3/sead3-i2c-drv.c | 28 +-
+ arch/mips/mti-sead3/sead3-init.c | 5 +-
+ arch/mips/mti-sead3/sead3-memory.c | 138 --
+ arch/mips/mti-sead3/sead3-net.c | 4 +-
+ arch/mips/mti-sead3/sead3-pic32-bus.c | 6 +-
+ arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 58 +-
+ arch/mips/mti-sead3/sead3-setup.c | 27 +
+ arch/mips/mti-sead3/sead3-time.c | 8 +-
+ arch/mips/mti-sead3/sead3.dts | 26 +
+ arch/mips/netlogic/Platform | 4 +-
+ arch/mips/netlogic/common/irq.c | 4 +-
+ arch/mips/netlogic/common/smpboot.S | 14 +-
+ arch/mips/netlogic/dts/xlp_evp.dts | 2 +-
+ arch/mips/netlogic/xlp/nlm_hal.c | 4 +-
+ arch/mips/netlogic/xlp/usb-init.c | 2 +-
+ arch/mips/netlogic/xlr/fmn-config.c | 4 +-
+ arch/mips/netlogic/xlr/platform-flash.c | 12 +-
+ arch/mips/netlogic/xlr/platform.c | 10 +-
+ arch/mips/netlogic/xlr/setup.c | 2 +-
+ arch/mips/oprofile/common.c | 6 +-
+ arch/mips/oprofile/op_model_loongson2.c | 10 +-
+ arch/mips/oprofile/op_model_mipsxx.c | 34 +-
+ arch/mips/pci/Makefile | 5 +-
+ arch/mips/pci/fixup-cobalt.c | 28 +-
+ arch/mips/pci/fixup-emma2rh.c | 2 +-
+ arch/mips/pci/fixup-fuloong2e.c | 8 +-
+ arch/mips/pci/fixup-ip32.c | 14 +-
+ arch/mips/pci/fixup-lemote2f.c | 14 +-
+ arch/mips/pci/fixup-malta.c | 14 +-
+ arch/mips/pci/fixup-pmcmsp.c | 224 +-
+ arch/mips/pci/fixup-pnx8550.c | 57 -
+ arch/mips/pci/fixup-sni.c | 68 +-
+ arch/mips/pci/fixup-tb0219.c | 2 +-
+ arch/mips/pci/fixup-tb0287.c | 2 +-
+ arch/mips/pci/fixup-wrppmc.c | 2 +-
+ arch/mips/pci/ops-bcm63xx.c | 16 +-
+ arch/mips/pci/ops-bonito64.c | 4 +-
+ arch/mips/pci/ops-gt64xxx_pci0.c | 24 +-
+ arch/mips/pci/ops-lantiq.c | 2 +-
+ arch/mips/pci/ops-loongson2.c | 2 +-
+ arch/mips/pci/ops-msc.c | 22 +-
+ arch/mips/pci/ops-nile4.c | 2 +-
+ arch/mips/pci/ops-pmcmsp.c | 450 ++--
+ arch/mips/pci/ops-pnx8550.c | 282 ---
+ arch/mips/pci/ops-rc32434.c | 2 +-
+ arch/mips/pci/ops-sni.c | 8 +-
+ arch/mips/pci/ops-tx4927.c | 8 +-
+ arch/mips/pci/ops-vr41xx.c | 6 +-
+ arch/mips/pci/pci-alchemy.c | 6 +-
+ arch/mips/pci/pci-ar724x.c | 20 +-
+ arch/mips/pci/pci-bcm1480.c | 8 +-
+ arch/mips/pci/pci-bcm1480ht.c | 6 +-
+ arch/mips/pci/pci-bcm47xx.c | 2 +-
+ arch/mips/pci/pci-bcm63xx.c | 62 +-
+ arch/mips/pci/pci-bcm63xx.h | 2 +-
+ arch/mips/pci/pci-ip27.c | 8 +-
+ arch/mips/pci/pci-ip32.c | 6 +-
+ arch/mips/pci/pci-lantiq.c | 12 +-
+ arch/mips/pci/pci-lasat.c | 26 +-
+ arch/mips/pci/pci-octeon.c | 30 +-
+ arch/mips/pci/pci-rc32434.c | 6 +-
+ arch/mips/pci/pci-sb1250.c | 8 +-
+ arch/mips/pci/pci-vr41xx.c | 22 +-
+ arch/mips/pci/pci-vr41xx.h | 2 +-
+ arch/mips/pci/pci-xlp.c | 32 +-
+ arch/mips/pci/pci-xlr.c | 34 +-
+ arch/mips/pci/pci.c | 4 +-
+ arch/mips/pci/pcie-octeon.c | 58 +-
+ arch/mips/pmc-sierra/Platform | 7 -
+ arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile | 0
+ arch/mips/pmcs-msp71xx/Platform | 7 +
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c | 0
+ .../msp71xx => pmcs-msp71xx}/gpio_extended.c | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c | 0
+ .../msp71xx => pmcs-msp71xx}/msp_hwbutton.c | 0
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c | 4 +-
+ .../msp71xx => pmcs-msp71xx}/msp_irq_cic.c | 6 +-
+ .../msp71xx => pmcs-msp71xx}/msp_irq_per.c | 4 +-
+ .../msp71xx => pmcs-msp71xx}/msp_irq_slp.c | 4 +-
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c | 2 +-
+ .../msp71xx => pmcs-msp71xx}/msp_prom.c | 4 +-
+ .../msp71xx => pmcs-msp71xx}/msp_serial.c | 32 +-
+ .../msp71xx => pmcs-msp71xx}/msp_setup.c | 8 +-
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c | 0
+ .../msp71xx => pmcs-msp71xx}/msp_smtc.c | 0
+ .../msp71xx => pmcs-msp71xx}/msp_time.c | 2 +-
+ .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c | 54 +-
+ arch/mips/pnx833x/Platform | 2 +-
+ arch/mips/pnx833x/common/interrupts.c | 110 +-
+ arch/mips/pnx833x/common/platform.c | 34 +-
+ arch/mips/pnx833x/common/prom.c | 2 +-
+ arch/mips/pnx833x/common/reset.c | 2 +-
+ arch/mips/pnx833x/common/setup.c | 2 +-
+ arch/mips/pnx833x/stb22x/board.c | 2 +-
+ arch/mips/pnx8550/Makefile | 3 -
+ arch/mips/pnx8550/Platform | 7 -
+ arch/mips/pnx8550/common/Makefile | 26 -
+ arch/mips/pnx8550/common/int.c | 236 --
+ arch/mips/pnx8550/common/pci.c | 134 --
+ arch/mips/pnx8550/common/platform.c | 162 --
+ arch/mips/pnx8550/common/proc.c | 110 -
+ arch/mips/pnx8550/common/prom.c | 128 --
+ arch/mips/pnx8550/common/reset.c | 40 -
+ arch/mips/pnx8550/common/setup.c | 142 --
+ arch/mips/pnx8550/common/time.c | 151 --
+ arch/mips/pnx8550/jbs/Makefile | 4 -
+ arch/mips/pnx8550/jbs/board_setup.c | 56 -
+ arch/mips/pnx8550/jbs/init.c | 53 -
+ arch/mips/pnx8550/jbs/irqmap.c | 35 -
+ arch/mips/pnx8550/stb810/Makefile | 4 -
+ arch/mips/pnx8550/stb810/board_setup.c | 41 -
+ arch/mips/pnx8550/stb810/irqmap.c | 22 -
+ arch/mips/pnx8550/stb810/prom_init.c | 46 -
+ arch/mips/power/cpu.c | 2 +-
+ arch/mips/power/hibernate.S | 2 +-
+ arch/mips/powertv/asic/asic-calliope.c | 10 +-
+ arch/mips/powertv/asic/asic-cronus.c | 6 +-
+ arch/mips/powertv/asic/asic-gaia.c | 2 +-
+ arch/mips/powertv/asic/asic-zeus.c | 6 +-
+ arch/mips/powertv/asic/asic_devices.c | 8 +-
+ arch/mips/powertv/asic/asic_int.c | 4 +-
+ arch/mips/powertv/asic/irq_asic.c | 4 +-
+ arch/mips/powertv/asic/prealloc-calliope.c | 10 +-
+ arch/mips/powertv/asic/prealloc-cronus.c | 12 +-
+ arch/mips/powertv/asic/prealloc-cronuslite.c | 8 +-
+ arch/mips/powertv/asic/prealloc-gaia.c | 382 ++--
+ arch/mips/powertv/asic/prealloc-zeus.c | 10 +-
+ arch/mips/powertv/init.c | 2 +-
+ arch/mips/powertv/ioremap.c | 4 +-
+ arch/mips/powertv/memory.c | 2 +-
+ arch/mips/powertv/powertv-usb.c | 46 +-
+ arch/mips/rb532/devices.c | 12 +-
+ arch/mips/rb532/gpio.c | 8 +-
+ arch/mips/rb532/irq.c | 4 +-
+ arch/mips/sgi-ip22/ip22-eisa.c | 14 +-
+ arch/mips/sgi-ip22/ip22-gio.c | 14 +-
+ arch/mips/sgi-ip22/ip22-int.c | 36 +-
+ arch/mips/sgi-ip22/ip22-mc.c | 44 +-
+ arch/mips/sgi-ip22/ip22-nvram.c | 16 +-
+ arch/mips/sgi-ip22/ip22-platform.c | 8 +-
+ arch/mips/sgi-ip22/ip22-reset.c | 4 +-
+ arch/mips/sgi-ip22/ip28-berr.c | 16 +-
+ arch/mips/sgi-ip27/ip27-berr.c | 4 +-
+ arch/mips/sgi-ip27/ip27-hubio.c | 14 +-
+ arch/mips/sgi-ip27/ip27-init.c | 2 +-
+ arch/mips/sgi-ip27/ip27-irq.c | 6 +-
+ arch/mips/sgi-ip27/ip27-memory.c | 12 +-
+ arch/mips/sgi-ip27/ip27-nmi.c | 6 +-
+ arch/mips/sgi-ip27/ip27-reset.c | 2 +-
+ arch/mips/sgi-ip27/ip27-smp.c | 4 +-
+ arch/mips/sgi-ip27/ip27-timer.c | 6 +-
+ arch/mips/sgi-ip27/ip27-xtalk.c | 16 +-
+ arch/mips/sgi-ip32/ip32-irq.c | 8 +-
+ arch/mips/sibyte/Platform | 6 +-
+ arch/mips/sibyte/bcm1480/irq.c | 8 +-
+ arch/mips/sibyte/common/cfe.c | 10 +-
+ arch/mips/sibyte/common/sb_tbprof.c | 18 +-
+ arch/mips/sibyte/sb1250/bus_watcher.c | 6 +-
+ arch/mips/sibyte/sb1250/irq.c | 8 +-
+ arch/mips/sibyte/sb1250/setup.c | 18 +-
+ arch/mips/sibyte/swarm/platform.c | 4 +-
+ arch/mips/sibyte/swarm/rtc_xicor1241.c | 50 +-
+ arch/mips/sni/a20r.c | 44 +-
+ arch/mips/sni/eisa.c | 2 +-
+ arch/mips/sni/irq.c | 20 +-
+ arch/mips/sni/pcimt.c | 36 +-
+ arch/mips/sni/pcit.c | 40 +-
+ arch/mips/sni/rm200.c | 38 +-
+ arch/mips/sni/setup.c | 24 +-
+ arch/mips/sni/time.c | 30 +-
+ arch/mips/txx9/Platform | 4 +-
+ arch/mips/txx9/generic/irq_tx4927.c | 2 +-
+ arch/mips/txx9/generic/irq_tx4939.c | 4 +-
+ arch/mips/txx9/generic/mem_tx4927.c | 2 +-
+ arch/mips/txx9/generic/pci.c | 4 +-
+ arch/mips/txx9/generic/setup_tx3927.c | 2 +-
+ arch/mips/txx9/generic/setup_tx4927.c | 2 +-
+ arch/mips/txx9/generic/setup_tx4938.c | 2 +-
+ arch/mips/txx9/generic/setup_tx4939.c | 4 +-
+ arch/mips/txx9/generic/smsc_fdc37m81x.c | 48 +-
+ arch/mips/txx9/rbtx4927/irq.c | 2 +-
+ arch/mips/txx9/rbtx4927/prom.c | 2 +-
+ arch/mips/txx9/rbtx4927/setup.c | 2 +-
+ arch/mips/txx9/rbtx4938/setup.c | 8 +-
+ arch/mips/txx9/rbtx4939/setup.c | 4 +-
+ arch/mips/vr41xx/common/bcu.c | 4 +-
+ arch/mips/vr41xx/common/cmu.c | 16 +-
+ arch/mips/vr41xx/common/giu.c | 2 +-
+ arch/mips/vr41xx/common/icu.c | 8 +-
+ arch/mips/vr41xx/common/pmu.c | 2 +-
+ arch/mips/vr41xx/common/rtc.c | 2 +-
+ arch/mips/vr41xx/common/type.c | 2 +-
+ arch/mips/wrppmc/Platform | 2 +-
+ arch/mips/wrppmc/irq.c | 4 +-
+ arch/mips/wrppmc/serial.c | 2 +-
+ drivers/tty/serial/Kconfig | 10 +-
+ mm/bootmem.c | 1 +
+ virt/kvm/kvm_main.c | 2 +-
+ 853 files changed, 23449 insertions(+), 15140 deletions(-)
+ create mode 100644 arch/mips/cavium-octeon/oct_ilm.c
+ create mode 100644 arch/mips/configs/malta_kvm_defconfig
+ create mode 100644 arch/mips/configs/malta_kvm_guest_defconfig
+ delete mode 100644 arch/mips/configs/pnx8550_jbs_defconfig
+ delete mode 100644 arch/mips/configs/pnx8550_stb810_defconfig
+ create mode 100644 arch/mips/include/asm/kvm.h
+ create mode 100644 arch/mips/include/asm/kvm_host.h
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/cpu-feature-overrides.h (100%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/gpio.h (100%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h (61%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_gpio_macros.h (99%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_int.h (91%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_pci.h (87%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_prom.h (96%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regops.h (99%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regs.h (65%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h (63%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_usb.h (99%)
+ rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/war.h (91%)
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/cm.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/glb.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/int.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/nand.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/pci.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/uart.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/usb.h
+ delete mode 100644 arch/mips/include/asm/mach-pnx8550/war.h
+ create mode 100644 arch/mips/include/uapi/asm/inst.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
+ delete mode 100644 arch/mips/mti-sead3/sead3-memory.c
+ create mode 100644 arch/mips/mti-sead3/sead3.dts
+ delete mode 100644 arch/mips/pci/fixup-pnx8550.c
+ delete mode 100644 arch/mips/pci/ops-pnx8550.c
+ delete mode 100644 arch/mips/pmc-sierra/Platform
+ rename arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile (100%)
+ create mode 100644 arch/mips/pmcs-msp71xx/Platform
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio_extended.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_hwbutton.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c (97%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_cic.c (96%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_per.c (95%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_slp.c (94%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c (97%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_prom.c (99%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_serial.c (87%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_setup.c (95%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smtc.c (100%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_time.c (99%)
+ rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c (87%)
+ delete mode 100644 arch/mips/pnx8550/Makefile
+ delete mode 100644 arch/mips/pnx8550/Platform
+ delete mode 100644 arch/mips/pnx8550/common/Makefile
+ delete mode 100644 arch/mips/pnx8550/common/int.c
+ delete mode 100644 arch/mips/pnx8550/common/pci.c
+ delete mode 100644 arch/mips/pnx8550/common/platform.c
+ delete mode 100644 arch/mips/pnx8550/common/proc.c
+ delete mode 100644 arch/mips/pnx8550/common/prom.c
+ delete mode 100644 arch/mips/pnx8550/common/reset.c
+ delete mode 100644 arch/mips/pnx8550/common/setup.c
+ delete mode 100644 arch/mips/pnx8550/common/time.c
+ delete mode 100644 arch/mips/pnx8550/jbs/Makefile
+ delete mode 100644 arch/mips/pnx8550/jbs/board_setup.c
+ delete mode 100644 arch/mips/pnx8550/jbs/init.c
+ delete mode 100644 arch/mips/pnx8550/jbs/irqmap.c
+ delete mode 100644 arch/mips/pnx8550/stb810/Makefile
+ delete mode 100644 arch/mips/pnx8550/stb810/board_setup.c
+ delete mode 100644 arch/mips/pnx8550/stb810/irqmap.c
+ delete mode 100644 arch/mips/pnx8550/stb810/prom_init.c
+$ git am -3 ../patches/0001-min_low_pfn-is-now-exported-by-generic-code.patch
+Applying: min_low_pfn is now exported by generic code
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/ia64/kernel/ia64_ksyms.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 91a9d32] 20130215/mips
+Merging openrisc/for-upstream (ae6fef17 openrisc: really pass correct arg to schedule_tail)
+$ git merge openrisc/for-upstream
+Merge made by the 'recursive' strategy.
+ arch/openrisc/Kconfig | 4 ----
+ arch/openrisc/include/asm/bitops.h | 1 +
+ arch/openrisc/include/asm/processor.h | 1 -
+ arch/openrisc/kernel/entry.S | 16 +++++++++++++---
+ arch/openrisc/kernel/head.S | 12 +++++-------
+ arch/openrisc/kernel/idle.c | 5 -----
+ arch/openrisc/mm/init.c | 17 ++++++++++++++---
+ 7 files changed, 33 insertions(+), 23 deletions(-)
+Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/hpux/fs.c | 3 +--
+ arch/parisc/include/asm/pgtable.h | 13 ++++++++++---
+ arch/parisc/kernel/cache.c | 18 ++++++++++++++++++
+ 3 files changed, 29 insertions(+), 5 deletions(-)
+Merging powerpc/next (25e1381 powerpc: Apply early paca fixups to boot_paca and the boot cpu's paca)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/kernel/traps.c
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/powerpc/cpu_features.txt | 10 +-
+ arch/powerpc/Kconfig | 4 +
+ arch/powerpc/Makefile | 22 +-
+ arch/powerpc/boot/dts/bluestone.dts | 8 +
+ arch/powerpc/boot/dts/virtex440-ml507.dts | 6 +
+ arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 -
+ arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 1 -
+ arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1 -
+ arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 -
+ arch/powerpc/configs/86xx/sbc8641d_defconfig | 1 -
+ arch/powerpc/configs/corenet32_smp_defconfig | 1 -
+ arch/powerpc/configs/corenet64_smp_defconfig | 1 -
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 -
+ arch/powerpc/configs/pasemi_defconfig | 31 +-
+ arch/powerpc/configs/ppc64_defconfig | 147 ++----
+ arch/powerpc/configs/ppc64e_defconfig | 107 +---
+ arch/powerpc/configs/ps3_defconfig | 15 +-
+ arch/powerpc/configs/pseries_defconfig | 91 ++--
+ arch/powerpc/crypto/Makefile | 9 +
+ arch/powerpc/crypto/sha1-powerpc-asm.S | 179 +++++++
+ arch/powerpc/crypto/sha1.c | 157 ++++++
+ arch/powerpc/include/asm/cputable.h | 118 ++---
+ arch/powerpc/include/asm/dbell.h | 30 +-
+ arch/powerpc/include/asm/debug.h | 15 +-
+ arch/powerpc/include/asm/eeh.h | 3 +
+ arch/powerpc/include/asm/exception-64s.h | 138 +++++-
+ arch/powerpc/include/asm/firmware.h | 3 +-
+ arch/powerpc/include/asm/hvcall.h | 9 +
+ arch/powerpc/include/asm/hw_breakpoint.h | 35 +-
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 3 +
+ arch/powerpc/include/asm/kvm_host.h | 1 +
+ arch/powerpc/include/asm/machdep.h | 4 +
+ arch/powerpc/include/asm/paca.h | 7 +-
+ arch/powerpc/include/asm/perf_event_server.h | 10 +-
+ arch/powerpc/include/asm/ppc-opcode.h | 3 +
+ arch/powerpc/include/asm/ppc4xx_ocm.h | 45 ++
+ arch/powerpc/include/asm/ppc_asm.h | 27 +-
+ arch/powerpc/include/asm/processor.h | 19 +-
+ arch/powerpc/include/asm/ps3.h | 2 +-
+ arch/powerpc/include/asm/reg.h | 13 +-
+ arch/powerpc/include/asm/sections.h | 3 +
+ arch/powerpc/include/asm/spinlock.h | 2 +-
+ arch/powerpc/include/uapi/asm/ptrace.h | 29 +-
+ arch/powerpc/kernel/Makefile | 8 +-
+ arch/powerpc/kernel/asm-offsets.c | 10 +
+ arch/powerpc/kernel/cpu_setup_power.S | 7 +
+ arch/powerpc/kernel/dbell.c | 4 +-
+ arch/powerpc/kernel/entry_64.S | 39 +-
+ arch/powerpc/kernel/exceptions-64e.S | 3 +-
+ arch/powerpc/kernel/exceptions-64s.S | 272 ++++++----
+ arch/powerpc/kernel/head_40x.S | 47 +-
+ arch/powerpc/kernel/head_64.S | 34 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 84 ++--
+ arch/powerpc/kernel/iommu.c | 7 +
+ arch/powerpc/kernel/irq.c | 11 +-
+ arch/powerpc/kernel/kgdb.c | 10 +-
+ arch/powerpc/kernel/module_64.c | 30 ++
+ arch/powerpc/kernel/of_platform.c | 7 +-
+ arch/powerpc/kernel/paca.c | 2 -
+ arch/powerpc/kernel/pci-common.c | 7 +-
+ arch/powerpc/kernel/process.c | 106 +++-
+ arch/powerpc/kernel/prom_init.c | 626 ++++++++++++------------
+ arch/powerpc/kernel/prom_init_check.sh | 2 +-
+ arch/powerpc/kernel/ptrace.c | 89 ++--
+ arch/powerpc/kernel/ptrace32.c | 8 +-
+ arch/powerpc/kernel/setup_64.c | 18 +-
+ arch/powerpc/kernel/signal.c | 5 +-
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kernel/traps.c | 6 +-
+ arch/powerpc/kernel/vmlinux.lds.S | 5 +
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 +
+ arch/powerpc/kvm/book3s_pr.c | 19 +
+ arch/powerpc/lib/Makefile | 6 +-
+ arch/powerpc/mm/Makefile | 2 +-
+ arch/powerpc/mm/fault.c | 4 +-
+ arch/powerpc/mm/mem.c | 11 +-
+ arch/powerpc/oprofile/Makefile | 2 +-
+ arch/powerpc/perf/core-book3s.c | 93 ++--
+ arch/powerpc/perf/e500-pmu.c | 2 +
+ arch/powerpc/platforms/44x/Kconfig | 8 +
+ arch/powerpc/platforms/82xx/pq2.c | 4 +-
+ arch/powerpc/platforms/85xx/Kconfig | 8 +
+ arch/powerpc/platforms/85xx/Makefile | 1 +
+ arch/powerpc/platforms/85xx/sgy_cts1000.c | 176 +++++++
+ arch/powerpc/platforms/Kconfig.cputype | 6 +
+ arch/powerpc/platforms/cell/celleb_scc_sio.c | 5 +-
+ arch/powerpc/platforms/cell/spu_callbacks.c | 13 +-
+ arch/powerpc/platforms/ps3/htab.c | 14 +-
+ arch/powerpc/platforms/pseries/Kconfig | 1 +
+ arch/powerpc/platforms/pseries/Makefile | 2 +-
+ arch/powerpc/platforms/pseries/eeh.c | 24 +-
+ arch/powerpc/platforms/pseries/firmware.c | 21 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 8 +
+ arch/powerpc/platforms/pseries/iommu.c | 104 ++--
+ arch/powerpc/platforms/pseries/pci.c | 3 +-
+ arch/powerpc/platforms/pseries/plpar_wrappers.h | 18 +
+ arch/powerpc/platforms/pseries/pseries_energy.c | 37 +-
+ arch/powerpc/platforms/pseries/setup.c | 20 +-
+ arch/powerpc/platforms/pseries/smp.c | 33 +-
+ arch/powerpc/platforms/wsp/Makefile | 2 +-
+ arch/powerpc/sysdev/Makefile | 3 +-
+ arch/powerpc/sysdev/mpic.c | 2 +-
+ arch/powerpc/sysdev/ppc4xx_ocm.c | 415 ++++++++++++++++
+ arch/powerpc/sysdev/xics/ics-rtas.c | 2 +-
+ arch/powerpc/xmon/Makefile | 2 +-
+ arch/powerpc/xmon/xmon.c | 21 +-
+ crypto/Kconfig | 7 +
+ drivers/macintosh/windfarm_pm112.c | 2 +-
+ drivers/macintosh/windfarm_pm72.c | 2 +-
+ drivers/macintosh/windfarm_rm31.c | 2 +-
+ drivers/tty/hvc/hvsi.c | 4 +-
+ 111 files changed, 2722 insertions(+), 1158 deletions(-)
+ create mode 100644 arch/powerpc/crypto/Makefile
+ create mode 100644 arch/powerpc/crypto/sha1-powerpc-asm.S
+ create mode 100644 arch/powerpc/crypto/sha1.c
+ create mode 100644 arch/powerpc/include/asm/ppc4xx_ocm.h
+ create mode 100644 arch/powerpc/platforms/85xx/sgy_cts1000.c
+ create mode 100644 arch/powerpc/sysdev/ppc4xx_ocm.c
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (790f9a4 powerpc/5200: Use the gpt* labels to simplify mpc5200 dts files)
+$ git merge mpc5xxx/next
+Auto-merging drivers/video/fsl-diu-fb.c
+Auto-merging drivers/dma/bestcomm/sram.c
+Auto-merging drivers/dma/bestcomm/gen_bd.c
+Auto-merging drivers/dma/bestcomm/fec.c
+Auto-merging drivers/dma/bestcomm/bestcomm.c
+Auto-merging drivers/dma/bestcomm/ata.c
+Auto-merging drivers/ata/pata_mpc52xx.c
+Auto-merging arch/powerpc/sysdev/Makefile
+Auto-merging arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+Merge made by the 'recursive' strategy.
+ arch/powerpc/boot/dts/a3m071.dts | 6 +-
+ arch/powerpc/boot/dts/a4m072.dts | 27 +-
+ arch/powerpc/boot/dts/cm5200.dts | 6 +-
+ arch/powerpc/boot/dts/digsy_mtc.dts | 14 +-
+ arch/powerpc/boot/dts/lite5200b.dts | 23 +-
+ arch/powerpc/boot/dts/media5200.dts | 6 +-
+ arch/powerpc/boot/dts/motionpro.dts | 26 +-
+ arch/powerpc/boot/dts/mpc5121.dtsi | 410 +++++++++++++++++++++
+ arch/powerpc/boot/dts/mpc5121ads.dts | 319 ++--------------
+ arch/powerpc/boot/dts/mpc5200b.dtsi | 25 +-
+ arch/powerpc/boot/dts/mucmc52.dts | 48 +--
+ arch/powerpc/boot/dts/o2d.dtsi | 27 +-
+ arch/powerpc/boot/dts/pcm030.dts | 48 +--
+ arch/powerpc/boot/dts/pcm032.dts | 45 +--
+ arch/powerpc/boot/dts/pdm360ng.dts | 273 ++------------
+ arch/powerpc/boot/dts/uc101.dts | 52 +--
+ arch/powerpc/include/asm/mpc5121.h | 17 +
+ arch/powerpc/platforms/512x/clock.c | 34 +-
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 32 +-
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 6 +-
+ arch/powerpc/platforms/Kconfig | 2 -
+ arch/powerpc/sysdev/Makefile | 1 -
+ arch/powerpc/sysdev/mpc5xxx_clocks.c | 4 +-
+ drivers/Makefile | 2 +-
+ drivers/ata/pata_mpc52xx.c | 6 +-
+ drivers/dma/Kconfig | 2 +
+ drivers/dma/Makefile | 1 +
+ .../sysdev => drivers/dma}/bestcomm/Kconfig | 0
+ .../sysdev => drivers/dma}/bestcomm/Makefile | 0
+ .../powerpc/sysdev => drivers/dma}/bestcomm/ata.c | 6 +-
+ .../dma}/bestcomm/bcom_ata_task.c | 0
+ .../dma}/bestcomm/bcom_fec_rx_task.c | 0
+ .../dma}/bestcomm/bcom_fec_tx_task.c | 0
+ .../dma}/bestcomm/bcom_gen_bd_rx_task.c | 0
+ .../dma}/bestcomm/bcom_gen_bd_tx_task.c | 0
+ .../sysdev => drivers/dma}/bestcomm/bestcomm.c | 6 +-
+ .../powerpc/sysdev => drivers/dma}/bestcomm/fec.c | 6 +-
+ .../sysdev => drivers/dma}/bestcomm/gen_bd.c | 6 +-
+ .../powerpc/sysdev => drivers/dma}/bestcomm/sram.c | 2 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 +-
+ drivers/video/fsl-diu-fb.c | 64 ++--
+ .../sysdev => include/linux/fsl}/bestcomm/ata.h | 0
+ .../linux/fsl}/bestcomm/bestcomm.h | 0
+ .../linux/fsl}/bestcomm/bestcomm_priv.h | 0
+ .../sysdev => include/linux/fsl}/bestcomm/fec.h | 0
+ .../sysdev => include/linux/fsl}/bestcomm/gen_bd.h | 0
+ .../sysdev => include/linux/fsl}/bestcomm/sram.h | 0
+ sound/soc/fsl/mpc5200_dma.c | 4 +-
+ 48 files changed, 716 insertions(+), 844 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/mpc5121.dtsi
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/Kconfig (100%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/Makefile (100%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/ata.c (97%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_ata_task.c (100%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_fec_rx_task.c (100%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_fec_tx_task.c (100%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_gen_bd_rx_task.c (100%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_gen_bd_tx_task.c (100%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bestcomm.c (99%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/fec.c (98%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/gen_bd.c (98%)
+ rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/sram.c (99%)
+ rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/ata.h (100%)
+ rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/bestcomm.h (100%)
+ rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/bestcomm_priv.h (100%)
+ rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/fec.h (100%)
+ rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/gen_bd.h (100%)
+ rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/sram.h (100%)
+Merging galak/next (64871ff powerpc/e500/qemu-e500: enable coreint)
+$ git merge galak/next
+Auto-merging arch/powerpc/platforms/512x/mpc512x_shared.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/crypto/fsl-sec4.txt | 12 +-
+ .../devicetree/bindings/powerpc/fsl/guts.txt | 13 +-
+ .../devicetree/bindings/powerpc/fsl/pamu.txt | 140 ++++++++
+ arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 4 +-
+ arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 6 +-
+ arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 87 ++++-
+ arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 87 ++++-
+ arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 74 ++++-
+ arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 92 +++++-
+ arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 92 +++++-
+ arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi | 1 +
+ arch/powerpc/boot/dts/ppa8548.dts | 166 ++++++++++
+ arch/powerpc/boot/dts/sbc8548-altflash.dts | 115 +++++++
+ arch/powerpc/boot/dts/sbc8548-post.dtsi | 295 +++++++++++++++++
+ arch/powerpc/boot/dts/sbc8548-pre.dtsi | 52 +++
+ arch/powerpc/boot/dts/sbc8548.dts | 356 ++-------------------
+ arch/powerpc/configs/83xx/kmeter1_defconfig | 6 +-
+ arch/powerpc/configs/85xx/ppa8548_defconfig | 65 ++++
+ arch/powerpc/configs/85xx/sbc8548_defconfig | 19 ++
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 5 -
+ arch/powerpc/platforms/82xx/km82xx.c | 6 +-
+ arch/powerpc/platforms/83xx/km83xx.c | 161 +++++-----
+ arch/powerpc/platforms/85xx/Kconfig | 7 +
+ arch/powerpc/platforms/85xx/Makefile | 1 +
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c | 40 +--
+ arch/powerpc/platforms/85xx/p1022_rdk.c | 12 -
+ arch/powerpc/platforms/85xx/ppa8548.c | 98 ++++++
+ arch/powerpc/platforms/85xx/qemu_e500.c | 7 +-
+ arch/powerpc/sysdev/fsl_ifc.c | 2 +-
+ arch/powerpc/sysdev/fsl_lbc.c | 6 +-
+ arch/powerpc/sysdev/fsl_msi.c | 4 +-
+ arch/powerpc/sysdev/fsl_pci.c | 24 +-
+ arch/powerpc/sysdev/fsl_pci.h | 2 +-
+ arch/powerpc/sysdev/fsl_soc.c | 4 +-
+ arch/powerpc/sysdev/mpic.c | 26 +-
+ 36 files changed, 1528 insertions(+), 563 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/pamu.txt
+ create mode 100644 arch/powerpc/boot/dts/ppa8548.dts
+ create mode 100644 arch/powerpc/boot/dts/sbc8548-altflash.dts
+ create mode 100644 arch/powerpc/boot/dts/sbc8548-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/sbc8548-pre.dtsi
+ create mode 100644 arch/powerpc/configs/85xx/ppa8548_defconfig
+ create mode 100644 arch/powerpc/platforms/85xx/ppa8548.c
+Merging s390/features (e80cfc3 s390/module: Add missing R_390_NONE relocation type)
+$ git merge s390/features
+Auto-merging include/asm-generic/io.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ arch/s390/Kconfig | 115 +++----
+ arch/s390/appldata/appldata_mem.c | 2 +-
+ arch/s390/appldata/appldata_net_sum.c | 2 +-
+ arch/s390/appldata/appldata_os.c | 2 +-
+ arch/s390/hypfs/hypfs_vm.c | 2 +-
+ arch/s390/include/asm/barrier.h | 9 +-
+ arch/s390/include/asm/clp.h | 2 +-
+ arch/s390/include/asm/cpu_mf.h | 4 +-
+ arch/s390/include/asm/dma-mapping.h | 8 +-
+ arch/s390/include/asm/mman.h | 4 +-
+ arch/s390/include/asm/page.h | 22 --
+ arch/s390/include/asm/pci.h | 11 +-
+ arch/s390/include/asm/pgtable.h | 132 +++++---
+ arch/s390/include/asm/sclp.h | 1 -
+ arch/s390/include/asm/setup.h | 22 +-
+ arch/s390/include/asm/timex.h | 18 +-
+ arch/s390/kernel/debug.c | 2 +-
+ arch/s390/kernel/dis.c | 1 -
+ arch/s390/kernel/early.c | 8 +-
+ arch/s390/kernel/entry64.S | 10 +-
+ arch/s390/kernel/ipl.c | 16 +-
+ arch/s390/kernel/module.c | 143 +++++---
+ arch/s390/kernel/nmi.c | 2 +-
+ arch/s390/kernel/perf_cpum_cf.c | 13 +-
+ arch/s390/kernel/smp.c | 10 +-
+ arch/s390/kernel/time.c | 26 +-
+ arch/s390/kernel/vmlinux.lds.S | 4 +
+ arch/s390/kernel/vtime.c | 2 +-
+ arch/s390/kvm/interrupt.c | 6 +-
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ arch/s390/lib/delay.c | 16 +-
+ arch/s390/lib/uaccess_pt.c | 2 +-
+ arch/s390/mm/mmap.c | 9 +-
+ arch/s390/mm/pageattr.c | 2 +-
+ arch/s390/mm/vmem.c | 24 +-
+ arch/s390/net/bpf_jit_comp.c | 21 ++
+ arch/s390/pci/pci.c | 35 +-
+ arch/s390/pci/pci_clp.c | 14 +-
+ drivers/ata/Kconfig | 2 +-
+ drivers/gpio/Kconfig | 4 +-
+ drivers/input/Kconfig | 2 +-
+ drivers/input/keyboard/Kconfig | 4 +-
+ drivers/input/serio/Kconfig | 1 +
+ drivers/input/touchscreen/Kconfig | 2 +-
+ drivers/media/radio/Kconfig | 2 +-
+ drivers/net/ethernet/cadence/Kconfig | 1 +
+ drivers/net/phy/Kconfig | 1 -
+ drivers/parport/Kconfig | 2 +-
+ drivers/pci/hotplug/s390_pci_hpc.c | 60 ++--
+ drivers/s390/block/dasd.c | 23 +-
+ drivers/s390/block/dasd_3990_erp.c | 8 +-
+ drivers/s390/block/dasd_alias.c | 4 +-
+ drivers/s390/block/dasd_diag.c | 10 +-
+ drivers/s390/block/dasd_eckd.c | 30 +-
+ drivers/s390/block/dasd_eer.c | 2 +-
+ drivers/s390/block/dasd_erp.c | 4 +-
+ drivers/s390/block/dasd_fba.c | 2 +-
+ drivers/s390/block/scm_blk.h | 41 ++-
+ drivers/s390/char/fs3270.c | 29 +-
+ drivers/s390/char/raw3270.c | 611 +++++++++++++++-------------------
+ drivers/s390/char/raw3270.h | 12 +-
+ drivers/s390/char/sclp.c | 4 +-
+ drivers/s390/char/sclp_cmd.c | 10 +-
+ drivers/s390/char/tty3270.c | 187 ++++++++---
+ drivers/s390/char/zcore.c | 64 +++-
+ drivers/s390/cio/chsc.c | 68 ++--
+ drivers/s390/cio/chsc.h | 2 +-
+ drivers/s390/cio/cio.c | 4 +-
+ drivers/s390/cio/cmf.c | 6 +-
+ drivers/s390/cio/css.c | 2 +-
+ drivers/s390/cio/device.c | 10 +
+ drivers/s390/cio/device_fsm.c | 2 +-
+ drivers/s390/cio/device_pgid.c | 123 ++++++-
+ drivers/s390/cio/io_sch.h | 5 +
+ drivers/s390/cio/qdio_main.c | 12 +-
+ drivers/s390/net/qeth_core.h | 2 +-
+ drivers/s390/scsi/zfcp_fsf.c | 2 +-
+ drivers/s390/scsi/zfcp_qdio.c | 2 +-
+ drivers/tty/tty_io.c | 1 +
+ drivers/uio/Kconfig | 1 -
+ include/asm-generic/io.h | 20 +-
+ include/asm-generic/pgtable.h | 10 -
+ include/linux/page-flags.h | 8 -
+ mm/rmap.c | 24 --
+ net/iucv/iucv.c | 5 +-
+ 86 files changed, 1222 insertions(+), 935 deletions(-)
+Merging sh/sh-latest (035688d sh: ecovec: add sample amixer settings)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (ecc46c5 tile: support atomic64_dec_if_positive())
+$ git merge tile/master
+Auto-merging arch/tile/kernel/intvec_64.S
+Auto-merging arch/tile/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/tile/Kconfig | 3 +++
+ 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(+), 34 deletions(-)
+Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (0ed93fe xtensa: avoid mmap cache aliasing)
+$ git merge xtensa/for_next
+Auto-merging arch/xtensa/kernel/traps.c
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 7 +
+ arch/xtensa/Makefile | 5 +-
+ arch/xtensa/boot/Makefile | 12 -
+ arch/xtensa/boot/dts/Makefile | 15 +
+ arch/xtensa/include/asm/atomic.h | 6 +-
+ arch/xtensa/include/asm/pgtable.h | 4 +
+ arch/xtensa/include/asm/processor.h | 4 +-
+ arch/xtensa/include/asm/regs.h | 1 +
+ arch/xtensa/include/asm/timex.h | 8 +-
+ arch/xtensa/include/uapi/asm/signal.h | 11 +-
+ arch/xtensa/include/uapi/asm/unistd.h | 4 +-
+ arch/xtensa/kernel/entry.S | 55 ++-
+ arch/xtensa/kernel/head.S | 9 +-
+ arch/xtensa/kernel/setup.c | 42 ++
+ arch/xtensa/kernel/syscall.c | 41 ++
+ arch/xtensa/kernel/traps.c | 55 ++-
+ arch/xtensa/kernel/vectors.S | 57 ++-
+ arch/xtensa/kernel/vmlinux.lds.S | 68 ++-
+ arch/xtensa/platforms/xtfpga/setup.c | 4 +-
+ arch/xtensa/variants/dc233c/include/variant/core.h | 475 +++++++++++++++++++++
+ .../variants/dc233c/include/variant/tie-asm.h | 193 +++++++++
+ arch/xtensa/variants/dc233c/include/variant/tie.h | 150 +++++++
+ 22 files changed, 1154 insertions(+), 72 deletions(-)
+ create mode 100644 arch/xtensa/boot/dts/Makefile
+ create mode 100644 arch/xtensa/variants/dc233c/include/variant/core.h
+ create mode 100644 arch/xtensa/variants/dc233c/include/variant/tie-asm.h
+ create mode 100644 arch/xtensa/variants/dc233c/include/variant/tie.h
+Merging btrfs/next (fb8ec37 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into linus-merge)
+$ git merge btrfs/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ceph/master (3ebc21f libceph: fix messenger CONFIG_BLOCK dependencies)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ drivers/block/rbd.c | 855 +++++++++++++++++++------------------
+ fs/ceph/caps.c | 32 +-
+ fs/ceph/file.c | 6 +
+ fs/ceph/ioctl.c | 2 +-
+ fs/ceph/mds_client.c | 33 +-
+ fs/ceph/mds_client.h | 6 +
+ fs/ceph/xattr.c | 210 +++++++--
+ include/linux/ceph/ceph_features.h | 8 +-
+ include/linux/ceph/decode.h | 29 +-
+ include/linux/ceph/messenger.h | 2 +
+ include/linux/ceph/osd_client.h | 24 +-
+ include/linux/ceph/osdmap.h | 2 +-
+ include/linux/crush/crush.h | 2 +
+ net/ceph/crush/mapper.c | 15 +-
+ net/ceph/messenger.c | 5 +-
+ net/ceph/osd_client.c | 206 ++++-----
+ net/ceph/osdmap.c | 43 +-
+ 17 files changed, 821 insertions(+), 659 deletions(-)
+Merging cifs/for-next (4992880 cifs: set MAY_SIGN when sec=krb5)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsfs.c | 5 +++++
+ fs/cifs/cifssmb.c | 5 ++++-
+ fs/cifs/connect.c | 2 +-
+ fs/cifs/file.c | 12 +++++++++---
+ 4 files changed, 19 insertions(+), 5 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 (1101d58 ecryptfs: ecryptfs_msg_ctx_alloc_to_free(): remove kfree() redundant null check)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 9 +++------
+ fs/ecryptfs/dentry.c | 2 --
+ fs/ecryptfs/file.c | 2 --
+ fs/ecryptfs/inode.c | 8 ++++----
+ fs/ecryptfs/keystore.c | 5 ++---
+ fs/ecryptfs/messaging.c | 3 +--
+ 6 files changed, 10 insertions(+), 19 deletions(-)
+Merging ext3/for_next (712ddc5 Ext2: remove the static function release_blocks to optimize the kernel)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext2/balloc.c | 28 +++++++-----------
+ fs/ext2/inode.c | 12 ++++++++
+ fs/ext2/super.c | 2 +-
+ fs/ext2/xattr.c | 4 +--
+ fs/ext3/inode.c | 16 +++++++----
+ fs/ext3/namei.c | 1 -
+ fs/ext3/resize.c | 12 ++++----
+ fs/ext3/super.c | 51 +++++++++++++++++++--------------
+ fs/ext3/xattr.c | 4 +--
+ fs/ext4/namei.c | 1 -
+ fs/ocfs2/dir.c | 1 -
+ fs/udf/inode.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
+ fs/udf/super.c | 11 ++++----
+ fs/udf/udf_i.h | 16 +++++++++++
+ fs/udf/udf_sb.h | 5 ++--
+ fs/udf/udfdecl.h | 5 ----
+ 16 files changed, 177 insertions(+), 78 deletions(-)
+Merging ext4/dev (e759417 ext4: fix xattr block allocation/release with bigalloc)
+$ git merge ext4/dev
+Auto-merging fs/ext4/namei.c
+Merge made by the 'recursive' strategy.
+ fs/ext4/acl.c | 7 +-
+ fs/ext4/balloc.c | 4 +-
+ fs/ext4/dir.c | 1 +
+ fs/ext4/ext4.h | 126 +++++++--
+ fs/ext4/ext4_extents.h | 6 -
+ fs/ext4/ext4_jbd2.c | 102 +++++++
+ fs/ext4/ext4_jbd2.h | 51 +++-
+ fs/ext4/extents.c | 362 +++++++++++-------------
+ fs/ext4/extents_status.c | 625 ++++++++++++++++++++++++++++++-----------
+ fs/ext4/extents_status.h | 83 +++++-
+ fs/ext4/file.c | 16 +-
+ fs/ext4/hash.c | 6 +-
+ fs/ext4/ialloc.c | 29 +-
+ fs/ext4/indirect.c | 259 ++++++++++++++++-
+ fs/ext4/inline.c | 12 +-
+ fs/ext4/inode.c | 664 ++++++++++++++++++++------------------------
+ fs/ext4/ioctl.c | 33 ++-
+ fs/ext4/mballoc.c | 69 ++---
+ fs/ext4/mballoc.h | 4 +-
+ fs/ext4/migrate.c | 15 +-
+ fs/ext4/mmp.c | 4 +-
+ fs/ext4/move_extent.c | 10 +-
+ fs/ext4/namei.c | 497 +++++++++++++++------------------
+ fs/ext4/page-io.c | 85 ++----
+ fs/ext4/resize.c | 36 +--
+ fs/ext4/super.c | 485 ++++++++++++++------------------
+ fs/ext4/xattr.c | 23 +-
+ fs/ext4/xattr.h | 68 -----
+ fs/jbd2/commit.c | 8 +
+ fs/jbd2/journal.c | 66 ++---
+ fs/jbd2/transaction.c | 29 +-
+ include/linux/jbd2.h | 44 ++-
+ include/linux/quota.h | 1 +
+ include/trace/events/ext4.h | 214 +++++++++++---
+ include/trace/events/jbd2.h | 106 ++++++-
+ 35 files changed, 2455 insertions(+), 1695 deletions(-)
+Merging f2fs/dev (7dd690c f2fs: avoid build warning)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/checkpoint.c | 63 +++++++++++---------------
+ fs/f2fs/debug.c | 4 +-
+ fs/f2fs/dir.c | 29 ++++++------
+ fs/f2fs/f2fs.h | 44 ++++++++++++++----
+ fs/f2fs/file.c | 35 ++++++++++++---
+ fs/f2fs/gc.c | 124 ++++++++++++++++++++++-----------------------------
+ fs/f2fs/gc.h | 21 ---------
+ fs/f2fs/inode.c | 53 +++++++++-------------
+ fs/f2fs/node.c | 20 ++++-----
+ fs/f2fs/recovery.c | 16 +++----
+ fs/f2fs/segment.c | 29 ++++++++----
+ fs/f2fs/segment.h | 23 +++-------
+ fs/f2fs/super.c | 92 +++++++++++++++++++++++++++++---------
+ 13 files changed, 292 insertions(+), 261 deletions(-)
+Merging fuse/for-next (23c153e fuse: bump version for READDIRPLUS)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/cuse.c | 10 +-
+ fs/fuse/dev.c | 117 ++++++++++++++++------
+ fs/fuse/dir.c | 248 +++++++++++++++++++++++++++++++++++++++-------
+ fs/fuse/file.c | 237 ++++++++++++++++++++++++++++----------------
+ fs/fuse/fuse_i.h | 71 ++++++++++---
+ fs/fuse/inode.c | 14 ++-
+ include/linux/fs.h | 2 +-
+ include/uapi/linux/fuse.h | 17 +++-
+ mm/filemap.c | 2 +-
+ 9 files changed, 543 insertions(+), 175 deletions(-)
+Merging gfs2/master (fd95e81 GFS2: Reinstate withdraw ack system)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 17 ++++---
+ fs/gfs2/bmap.c | 30 ++++++++-----
+ fs/gfs2/dir.c | 30 ++++++-------
+ fs/gfs2/file.c | 4 +-
+ fs/gfs2/glock.c | 116 +++++++++++++++++++++++++++++++++--------------
+ fs/gfs2/incore.h | 8 ++--
+ fs/gfs2/inode.c | 8 ++--
+ fs/gfs2/log.c | 76 +++++++++++++++----------------
+ fs/gfs2/log.h | 12 +++++
+ fs/gfs2/lops.c | 83 +---------------------------------
+ fs/gfs2/lops.h | 14 +-----
+ fs/gfs2/meta_io.c | 35 ---------------
+ fs/gfs2/meta_io.h | 3 --
+ fs/gfs2/ops_fstype.c | 4 +-
+ fs/gfs2/quota.c | 4 +-
+ fs/gfs2/rgrp.c | 18 ++++----
+ fs/gfs2/super.c | 70 ++++-------------------------
+ fs/gfs2/super.h | 3 --
+ fs/gfs2/sys.c | 48 ++++++++++++++------
+ fs/gfs2/trans.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++-----
+ fs/gfs2/trans.h | 3 +-
+ fs/gfs2/util.c | 3 ++
+ fs/gfs2/xattr.c | 36 +++++++--------
+ 23 files changed, 375 insertions(+), 374 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
+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 (5a12cca umount oops when remove blocklayoutdriver first)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/blocklayout/blocklayout.c | 1 +
+ fs/nfs/callback_proc.c | 61 ++------------
+ fs/nfs/delegation.c | 154 ++++++++++++++++++++++++----------
+ fs/nfs/delegation.h | 1 +
+ fs/nfs/getroot.c | 3 +-
+ fs/nfs/inode.c | 5 +-
+ fs/nfs/internal.h | 1 -
+ fs/nfs/nfs4_fs.h | 4 +
+ fs/nfs/nfs4proc.c | 133 ++++++++++++++++++++---------
+ fs/nfs/nfs4state.c | 11 ++-
+ fs/nfs/objlayout/objio_osd.c | 1 +
+ fs/nfs/pnfs.c | 150 ++++++++++++++++++++++++++++-----
+ fs/nfs/pnfs.h | 7 +-
+ fs/nfs/super.c | 49 -----------
+ fs/nfs/unlink.c | 5 +-
+ include/linux/sunrpc/sched.h | 1 -
+ include/linux/sunrpc/xprt.h | 6 +-
+ net/sunrpc/auth_gss/auth_gss.c | 5 +-
+ net/sunrpc/auth_gss/gss_mech_switch.c | 4 +-
+ net/sunrpc/clnt.c | 16 ++--
+ net/sunrpc/xprt.c | 21 +++--
+ net/sunrpc/xprtrdma/rpc_rdma.c | 4 +-
+ net/sunrpc/xprtrdma/transport.c | 7 +-
+ net/sunrpc/xprtrdma/xprt_rdma.h | 6 +-
+ net/sunrpc/xprtsock.c | 16 ++--
+ 25 files changed, 412 insertions(+), 260 deletions(-)
+Merging nfsd/nfsd-next (56edc86 nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum)
+$ git merge nfsd/nfsd-next
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging net/sunrpc/xprtrdma/transport.c
+Auto-merging net/sunrpc/clnt.c
+Auto-merging fs/nfs/super.c
+Auto-merging fs/nfs/nfs4client.c
+Merge made by the 'recursive' strategy.
+ fs/lockd/clntlock.c | 14 +-
+ fs/lockd/clntproc.c | 6 +-
+ fs/lockd/host.c | 1 +
+ fs/lockd/mon.c | 1 +
+ fs/lockd/svcsubs.c | 2 +-
+ fs/nfs/cache_lib.c | 12 +-
+ fs/nfs/cache_lib.h | 2 -
+ fs/nfs/dns_resolve.c | 67 +++----
+ fs/nfs/nfs4client.c | 1 +
+ fs/nfs/nfs4filelayoutdev.c | 1 +
+ fs/nfs/nfs4namespace.c | 1 +
+ fs/nfs/super.c | 1 +
+ fs/nfsd/cache.h | 17 +-
+ fs/nfsd/export.c | 16 +-
+ fs/nfsd/fault_inject.c | 2 +-
+ fs/nfsd/nfs4idmap.c | 16 +-
+ fs/nfsd/nfs4proc.c | 7 +-
+ fs/nfsd/nfs4recover.c | 6 +
+ fs/nfsd/nfs4state.c | 102 ++++++-----
+ fs/nfsd/nfs4xdr.c | 21 +--
+ fs/nfsd/nfscache.c | 354 ++++++++++++++++++++++++++++--------
+ fs/nfsd/nfsctl.c | 81 ++++++---
+ fs/nfsd/nfssvc.c | 6 +-
+ fs/nfsd/xdr4.h | 2 +-
+ include/linux/lockd/lockd.h | 3 +-
+ include/linux/sunrpc/addr.h | 170 +++++++++++++++++
+ include/linux/sunrpc/cache.h | 10 +-
+ include/linux/sunrpc/clnt.h | 152 ----------------
+ include/linux/sunrpc/svc.h | 1 +
+ include/linux/sunrpc/xdr.h | 3 +-
+ net/sunrpc/addr.c | 3 +-
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +
+ net/sunrpc/auth_gss/svcauth_gss.c | 18 +-
+ net/sunrpc/cache.c | 51 +++---
+ net/sunrpc/clnt.c | 1 +
+ net/sunrpc/rpcb_clnt.c | 1 +
+ net/sunrpc/svc.c | 13 +-
+ net/sunrpc/svc_xprt.c | 81 +++++----
+ net/sunrpc/svcauth_unix.c | 16 +-
+ net/sunrpc/xdr.c | 41 +++++
+ net/sunrpc/xprtrdma/transport.c | 1 +
+ net/sunrpc/xprtsock.c | 1 +
+ 42 files changed, 807 insertions(+), 500 deletions(-)
+ create mode 100644 include/linux/sunrpc/addr.h
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ fs/ocfs2/symlink.c | 2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (b6f4bee fs/9p: Fix atomic_open)
+$ git merge v9fs/for-next
+Merge made by the 'recursive' strategy.
+ fs/9p/vfs_dir.c | 92 +++++++++++++-------------------------------------
+ fs/9p/vfs_file.c | 4 ---
+ fs/9p/vfs_inode.c | 3 --
+ fs/9p/vfs_inode_dotl.c | 11 ++++--
+ 4 files changed, 31 insertions(+), 79 deletions(-)
+Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (1e82379 xfs: xfs_bmap_add_attrfork_local is too generic)
+$ git merge xfs/for-next
+Resolved 'fs/xfs/xfs_buf_item.c' using previous resolution.
+Auto-merging fs/xfs/xfs_qm_syscalls.c
+Auto-merging fs/xfs/xfs_mount.c
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging fs/xfs/xfs_buf_item.h
+Auto-merging fs/xfs/xfs_buf_item.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_buf_item.c
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_bmap.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9a8c96d] Merge remote-tracking branch 'xfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/xfs/xfs_alloc.c | 2 -
+ fs/xfs/xfs_attr.c | 9 +-
+ fs/xfs/xfs_bmap.c | 118 +++++++++++----
+ fs/xfs/xfs_buf.c | 2 -
+ fs/xfs/xfs_buf_item.c | 118 ++-------------
+ fs/xfs/xfs_buf_item.h | 14 --
+ fs/xfs/xfs_dquot.c | 12 +-
+ fs/xfs/xfs_fsops.c | 4 +-
+ fs/xfs/xfs_ialloc.c | 4 -
+ fs/xfs/xfs_inode.c | 6 -
+ fs/xfs/xfs_inode.h | 1 +
+ fs/xfs/xfs_inode_item.c | 16 --
+ fs/xfs/xfs_inode_item.h | 4 -
+ fs/xfs/xfs_iomap.c | 77 ++++++++--
+ fs/xfs/xfs_log.c | 10 +-
+ fs/xfs/xfs_mount.c | 12 +-
+ fs/xfs/xfs_mount.h | 9 +-
+ fs/xfs/xfs_qm.c | 7 +-
+ fs/xfs/xfs_qm_bhv.c | 2 +-
+ fs/xfs/xfs_qm_syscalls.c | 28 ++--
+ fs/xfs/xfs_super.c | 29 ++--
+ fs/xfs/xfs_trans.c | 376 ++++++++++++++++++++++++++++++-----------------
+ fs/xfs/xfs_trans.h | 18 ++-
+ fs/xfs/xfs_trans_ail.c | 14 --
+ fs/xfs/xfs_trans_dquot.c | 10 +-
+ fs/xfs/xfs_trans_inode.c | 41 ------
+ fs/xfs/xfs_types.h | 1 -
+ fs/xfs/xfs_vnodeops.c | 12 +-
+ 28 files changed, 503 insertions(+), 453 deletions(-)
+Merging vfs/for-next (3a142ed Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (fd5e20b Merge branch 'pci/misc' into next)
+$ git merge pci/next
+Resolved 'arch/ia64/pci/pci.c' using previous resolution.
+Auto-merging drivers/pci/remove.c
+Auto-merging drivers/pci/pcie/aspm.c
+Auto-merging drivers/pci/iov.c
+Auto-merging drivers/pci/hotplug/pciehp_core.c
+Auto-merging drivers/acpi/scan.c
+Removing drivers/acpi/pci_bind.c
+Auto-merging drivers/acpi/osl.c
+Auto-merging drivers/acpi/glue.c
+Auto-merging drivers/acpi/device_pm.c
+Auto-merging drivers/acpi/acpi_memhotplug.c
+Auto-merging arch/x86/pci/numaq_32.c
+Auto-merging arch/x86/pci/legacy.c
+Auto-merging arch/x86/pci/common.c
+Auto-merging arch/x86/pci/acpi.c
+Auto-merging arch/x86/include/asm/pci_x86.h
+Auto-merging arch/mn10300/unit-asb2305/pci.c
+Auto-merging arch/ia64/pci/pci.c
+CONFLICT (content): Merge conflict in arch/ia64/pci/pci.c
+Auto-merging arch/frv/mb93090-mb00/pci-vdk.c
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4708d3c] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 21 ++
+ arch/frv/mb93090-mb00/pci-frv.h | 1 -
+ arch/frv/mb93090-mb00/pci-vdk.c | 4 +-
+ arch/ia64/pci/pci.c | 8 +
+ arch/mn10300/unit-asb2305/pci-asb2305.h | 1 -
+ arch/mn10300/unit-asb2305/pci.c | 4 +-
+ arch/x86/include/asm/pci.h | 3 +
+ arch/x86/include/asm/pci_x86.h | 1 -
+ arch/x86/pci/acpi.c | 9 +
+ arch/x86/pci/common.c | 1 -
+ arch/x86/pci/i386.c | 185 +++++++++++-------
+ arch/x86/pci/legacy.c | 2 +-
+ arch/x86/pci/numaq_32.c | 2 +-
+ drivers/acpi/Kconfig | 5 +-
+ drivers/acpi/Makefile | 2 +-
+ drivers/acpi/acpi_memhotplug.c | 26 +--
+ drivers/acpi/container.c | 31 +--
+ drivers/acpi/device_pm.c | 2 +-
+ drivers/acpi/dock.c | 17 +-
+ drivers/acpi/glue.c | 50 +++--
+ drivers/acpi/internal.h | 7 +
+ drivers/acpi/osl.c | 24 ++-
+ drivers/acpi/pci_bind.c | 122 ------------
+ drivers/acpi/pci_root.c | 217 ++++++++++++++-------
+ drivers/acpi/pci_slot.c | 13 +-
+ drivers/acpi/processor_driver.c | 32 +---
+ drivers/acpi/scan.c | 330 ++++++++++++--------------------
+ drivers/pci/access.c | 6 +-
+ drivers/pci/bus.c | 81 ++------
+ drivers/pci/hotplug/acpiphp.h | 14 +-
+ drivers/pci/hotplug/acpiphp_core.c | 23 +--
+ drivers/pci/hotplug/acpiphp_glue.c | 292 ++++++----------------------
+ drivers/pci/hotplug/cpci_hotplug_pci.c | 29 ++-
+ drivers/pci/hotplug/cpqphp_ctrl.c | 57 ++----
+ drivers/pci/hotplug/pciehp_core.c | 2 -
+ drivers/pci/hotplug/pciehp_pci.c | 44 ++---
+ drivers/pci/hotplug/sgi_hotplug.c | 73 ++++---
+ drivers/pci/hotplug/shpchp_pci.c | 36 ++--
+ drivers/pci/iov.c | 10 +-
+ drivers/pci/pci-acpi.c | 65 +++++--
+ drivers/pci/pci-driver.c | 12 +-
+ drivers/pci/pci.c | 80 +++-----
+ drivers/pci/pci.h | 9 +-
+ drivers/pci/pcie/aspm.c | 8 +-
+ drivers/pci/pcie/portdrv_core.c | 2 +-
+ drivers/pci/probe.c | 104 ++++++----
+ drivers/pci/remove.c | 4 +-
+ drivers/pci/search.c | 10 +-
+ drivers/pci/setup-bus.c | 2 +-
+ include/acpi/acpi_bus.h | 35 ++--
+ include/acpi/acpiosxf.h | 2 -
+ include/linux/acpi.h | 5 +
+ include/linux/pci.h | 15 +-
+ 53 files changed, 908 insertions(+), 1232 deletions(-)
+ delete mode 100644 drivers/acpi/pci_bind.c
+Merging hid/for-next (06d3141 Merge branch 'for-3.9/upstream' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-hid-srws1 | 21 ++
+ drivers/hid/Kconfig | 8 +-
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-a4tech.c | 13 +-
+ drivers/hid/hid-apple.c | 19 +-
+ drivers/hid/hid-aureal.c | 13 +-
+ drivers/hid/hid-axff.c | 14 +-
+ drivers/hid/hid-belkin.c | 13 +-
+ drivers/hid/hid-cherry.c | 13 +-
+ drivers/hid/hid-chicony.c | 13 +-
+ drivers/hid/hid-core.c | 16 +-
+ drivers/hid/hid-cypress.c | 13 +-
+ drivers/hid/hid-dr.c | 13 +-
+ drivers/hid/hid-elecom.c | 13 +-
+ drivers/hid/hid-emsff.c | 13 +-
+ drivers/hid/hid-ezkey.c | 13 +-
+ drivers/hid/hid-gaff.c | 13 +-
+ drivers/hid/hid-generic.c | 14 +-
+ drivers/hid/hid-gyration.c | 13 +-
+ drivers/hid/hid-holtek-kbd.c | 13 +-
+ drivers/hid/hid-holtekff.c | 15 +-
+ drivers/hid/hid-icade.c | 19 +-
+ drivers/hid/hid-ids.h | 16 +
+ drivers/hid/hid-kensington.c | 13 +-
+ drivers/hid/hid-keytouch.c | 13 +-
+ drivers/hid/hid-kye.c | 13 +-
+ drivers/hid/hid-lcpower.c | 13 +-
+ drivers/hid/hid-lenovo-tpkbd.c | 14 +-
+ drivers/hid/hid-lg.c | 13 +-
+ drivers/hid/hid-magicmouse.c | 19 +-
+ drivers/hid/hid-microsoft.c | 13 +-
+ drivers/hid/hid-monterey.c | 13 +-
+ drivers/hid/hid-multitouch.c | 163 +++++++---
+ drivers/hid/hid-ntrig.c | 81 ++---
+ drivers/hid/hid-ortek.c | 13 +-
+ drivers/hid/hid-petalynx.c | 13 +-
+ drivers/hid/hid-picolcd_core.c | 13 +-
+ drivers/hid/hid-pl.c | 26 +-
+ drivers/hid/hid-primax.c | 13 +-
+ drivers/hid/hid-prodikeys.c | 19 +-
+ drivers/hid/hid-ps3remote.c | 13 +-
+ drivers/hid/hid-roccat-lua.c | 14 +-
+ drivers/hid/hid-saitek.c | 13 +-
+ drivers/hid/hid-samsung.c | 13 +-
+ drivers/hid/hid-sensor-hub.c | 22 +-
+ drivers/hid/hid-sjoy.c | 13 +-
+ drivers/hid/hid-sony.c | 59 +++-
+ drivers/hid/hid-speedlink.c | 13 +-
+ drivers/hid/hid-steelseries.c | 393 +++++++++++++++++++++++
+ drivers/hid/hid-sunplus.c | 13 +-
+ drivers/hid/hid-tivo.c | 13 +-
+ drivers/hid/hid-tmff.c | 13 +-
+ drivers/hid/hid-topseed.c | 13 +-
+ drivers/hid/hid-twinhan.c | 13 +-
+ drivers/hid/hid-uclogic.c | 13 +-
+ drivers/hid/hid-wacom.c | 18 +-
+ drivers/hid/hid-waltop.c | 13 +-
+ drivers/hid/hid-wiimote-core.c | 19 +-
+ drivers/hid/hid-wiimote-debug.c | 2 +-
+ drivers/hid/hid-wiimote-ext.c | 8 +-
+ drivers/hid/hid-zpff.c | 13 +-
+ drivers/hid/hid-zydacron.c | 13 +-
+ drivers/hid/i2c-hid/i2c-hid.c | 87 ++++-
+ include/linux/hid.h | 17 +-
+ include/uapi/linux/uhid.h | 2 +-
+ 65 files changed, 811 insertions(+), 789 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-srws1
+ create mode 100644 drivers/hid/hid-steelseries.c
+Merging i2c/i2c/for-next (58823c7 i2c: tegra: remove warning dump if timeout happen in transfer)
+$ git merge i2c/i2c/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/brcm,bcm2835-i2c.txt | 20 +
+ .../devicetree/bindings/i2c/i2c-s3c2410.txt | 2 +
+ Documentation/i2c/busses/i2c-i801 | 2 +
+ Documentation/i2c/busses/i2c-ismt | 36 +
+ Documentation/i2c/busses/i2c-sis630 | 9 +
+ Documentation/i2c/smbus-protocol | 4 +-
+ Documentation/i2c/writing-clients | 4 +-
+ MAINTAINERS | 7 +
+ drivers/i2c/busses/Kconfig | 28 +-
+ drivers/i2c/busses/Makefile | 2 +
+ drivers/i2c/busses/i2c-at91.c | 17 +-
+ drivers/i2c/busses/i2c-bcm2835.c | 342 ++++++++
+ drivers/i2c/busses/i2c-designware-core.c | 16 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c | 59 +-
+ drivers/i2c/busses/i2c-i801.c | 18 +
+ drivers/i2c/busses/i2c-isch.c | 17 +
+ drivers/i2c/busses/i2c-ismt.c | 963 +++++++++++++++++++++
+ drivers/i2c/busses/i2c-mxs.c | 270 ++++--
+ drivers/i2c/busses/i2c-nforce2.c | 152 ++--
+ drivers/i2c/busses/i2c-nomadik.c | 98 ++-
+ drivers/i2c/busses/i2c-s3c2410.c | 61 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 152 ++--
+ drivers/i2c/busses/i2c-sis630.c | 360 ++++----
+ drivers/i2c/busses/i2c-tegra.c | 79 +-
+ drivers/i2c/i2c-core.c | 23 -
+ drivers/misc/eeprom/Kconfig | 11 +-
+ 26 files changed, 2306 insertions(+), 446 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.txt
+ create mode 100644 Documentation/i2c/busses/i2c-ismt
+ create mode 100644 drivers/i2c/busses/i2c-bcm2835.c
+ create mode 100644 drivers/i2c/busses/i2c-ismt.c
+Merging jdelvare-hwmon/master (54e37b8 Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio)
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (f8d9f79 hwmon: (ltc2978) Add support for LTC2974 and LTC3883)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/i2c/ina209.txt | 18 +
+ Documentation/devicetree/bindings/i2c/max6697.txt | 64 ++
+ Documentation/hwmon/coretemp | 9 +
+ Documentation/hwmon/ina209 | 93 +++
+ Documentation/hwmon/it87 | 16 +-
+ Documentation/hwmon/jc42 | 3 +-
+ Documentation/hwmon/lm73 | 90 +++
+ Documentation/hwmon/ltc2978 | 30 +-
+ Documentation/hwmon/max34440 | 16 +
+ Documentation/hwmon/max6697 | 58 ++
+ Documentation/hwmon/sysfs-interface | 8 +-
+ Documentation/hwmon/zl6100 | 26 +-
+ drivers/hwmon/Kconfig | 28 +-
+ drivers/hwmon/Makefile | 2 +
+ drivers/hwmon/ad7414.c | 2 +-
+ drivers/hwmon/adm1021.c | 4 +-
+ drivers/hwmon/adm1026.c | 16 +-
+ drivers/hwmon/adm1031.c | 12 +-
+ drivers/hwmon/adm9240.c | 6 +-
+ drivers/hwmon/ads7828.c | 6 +-
+ drivers/hwmon/adt7410.c | 10 +-
+ drivers/hwmon/adt7462.c | 20 +-
+ drivers/hwmon/adt7470.c | 20 +-
+ drivers/hwmon/adt7475.c | 18 +-
+ drivers/hwmon/amc6821.c | 32 +-
+ drivers/hwmon/asb100.c | 10 +-
+ drivers/hwmon/asc7621.c | 26 +-
+ drivers/hwmon/coretemp.c | 5 +-
+ drivers/hwmon/dme1737.c | 15 +-
+ drivers/hwmon/emc2103.c | 2 +-
+ drivers/hwmon/emc6w201.c | 6 +-
+ drivers/hwmon/f71882fg.c | 25 +-
+ drivers/hwmon/f75375s.c | 12 +-
+ drivers/hwmon/fschmd.c | 4 +-
+ drivers/hwmon/g760a.c | 2 +-
+ drivers/hwmon/gl518sm.c | 10 +-
+ drivers/hwmon/gl520sm.c | 9 +-
+ drivers/hwmon/ina209.c | 636 ++++++++++++++++
+ drivers/hwmon/it87.c | 52 +-
+ drivers/hwmon/jc42.c | 10 +-
+ drivers/hwmon/lm63.c | 8 +-
+ drivers/hwmon/lm73.c | 136 +++-
+ drivers/hwmon/lm75.h | 2 +-
+ drivers/hwmon/lm77.c | 2 +-
+ drivers/hwmon/lm78.c | 6 +-
+ drivers/hwmon/lm80.c | 8 +-
+ drivers/hwmon/lm85.c | 10 +-
+ drivers/hwmon/lm90.c | 2 +-
+ drivers/hwmon/lm93.c | 28 +-
+ drivers/hwmon/lm95245.c | 4 +-
+ drivers/hwmon/max16065.c | 2 +-
+ drivers/hwmon/max1668.c | 4 +-
+ drivers/hwmon/max6639.c | 4 +-
+ drivers/hwmon/max6642.c | 2 +-
+ drivers/hwmon/max6650.c | 4 +-
+ drivers/hwmon/max6697.c | 726 +++++++++++++++++++
+ drivers/hwmon/pmbus/Kconfig | 6 +-
+ drivers/hwmon/pmbus/ltc2978.c | 136 +++-
+ drivers/hwmon/pmbus/max34440.c | 75 +-
+ drivers/hwmon/pmbus/pmbus.h | 11 +
+ drivers/hwmon/pmbus/pmbus_core.c | 840 +++++++++++-----------
+ drivers/hwmon/pmbus/zl6100.c | 176 ++++-
+ drivers/hwmon/sht15.c | 157 ++--
+ drivers/hwmon/sis5595.c | 6 +-
+ drivers/hwmon/smsc47m1.c | 2 +-
+ drivers/hwmon/smsc47m192.c | 4 +-
+ drivers/hwmon/thmc50.c | 6 +-
+ drivers/hwmon/tmp102.c | 2 +-
+ drivers/hwmon/tmp401.c | 14 +-
+ drivers/hwmon/via686a.c | 17 +-
+ drivers/hwmon/vt1211.c | 10 +-
+ drivers/hwmon/vt8231.c | 22 +-
+ drivers/hwmon/w83627ehf.c | 17 +-
+ drivers/hwmon/w83627hf.c | 23 +-
+ drivers/hwmon/w83781d.c | 17 +-
+ drivers/hwmon/w83791d.c | 10 +-
+ drivers/hwmon/w83792d.c | 25 +-
+ drivers/hwmon/w83793.c | 18 +-
+ drivers/hwmon/w83795.c | 28 +-
+ drivers/hwmon/w83l786ng.c | 17 +-
+ drivers/platform/x86/eeepc-laptop.c | 2 +-
+ include/linux/hwmon.h | 12 -
+ include/linux/platform_data/max6697.h | 36 +
+ 83 files changed, 3182 insertions(+), 886 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/ina209.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/max6697.txt
+ create mode 100644 Documentation/hwmon/ina209
+ create mode 100644 Documentation/hwmon/lm73
+ create mode 100644 Documentation/hwmon/max6697
+ create mode 100644 drivers/hwmon/ina209.c
+ create mode 100644 drivers/hwmon/max6697.c
+ create mode 100644 include/linux/platform_data/max6697.h
+Merging v4l-dvb/master (eccaaad Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Auto-merging drivers/media/radio/radio-wl1273.c
+Auto-merging drivers/media/radio/Kconfig
+Auto-merging drivers/media/platform/coda.c
+Auto-merging drivers/media/dvb-core/dvb_frontend.c
+Auto-merging drivers/media/common/tveeprom.c
+Auto-merging drivers/hid/hid-ids.h
+Auto-merging drivers/hid/hid-core.c
+Auto-merging MAINTAINERS
+Removing Documentation/video4linux/zc0301.txt
+Removing Documentation/video4linux/w9968cf.txt
+Removing Documentation/video4linux/stv680.txt
+Removing Documentation/video4linux/se401.txt
+Removing Documentation/video4linux/ov511.txt
+Removing Documentation/video4linux/m5602.txt
+Removing Documentation/video4linux/ibmcam.txt
+Removing Documentation/video4linux/et61x251.txt
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/dvb/dvbapi.xml | 2 +-
+ Documentation/DocBook/media/dvb/dvbproperty.xml | 180 +-
+ Documentation/DocBook/media/dvb/frontend.xml | 2 +-
+ Documentation/DocBook/media/v4l/common.xml | 2 +-
+ Documentation/DocBook/media/v4l/compat.xml | 16 +
+ Documentation/DocBook/media/v4l/controls.xml | 23 -
+ Documentation/DocBook/media/v4l/io.xml | 59 +-
+ Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 2 +-
+ .../DocBook/media/v4l/pixfmt-srggb10alaw8.xml | 34 +
+ Documentation/DocBook/media/v4l/pixfmt-uv8.xml | 62 +
+ Documentation/DocBook/media/v4l/pixfmt.xml | 2 +
+ Documentation/DocBook/media/v4l/subdev-formats.xml | 926 ++++-----
+ Documentation/DocBook/media/v4l/v4l2.xml | 12 +-
+ Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 6 +
+ Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 28 +-
+ Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml | 8 +-
+ .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 57 +-
+ .../DocBook/media/v4l/vidioc-querycap.xml | 2 +-
+ Documentation/DocBook/media_api.tmpl | 1 +
+ .../devicetree/bindings/media/gpio-ir-receiver.txt | 16 +
+ Documentation/dvb/get_dvb_firmware | 17 +-
+ Documentation/media-framework.txt | 2 +-
+ Documentation/video4linux/CARDLIST.au0828 | 2 +-
+ Documentation/video4linux/CARDLIST.cx23885 | 2 +
+ Documentation/video4linux/CARDLIST.em28xx | 3 +-
+ Documentation/video4linux/CARDLIST.saa7134 | 1 +
+ Documentation/video4linux/et61x251.txt | 315 ---
+ Documentation/video4linux/extract_xc3028.pl | 0
+ Documentation/video4linux/fimc.txt | 2 +-
+ Documentation/video4linux/ibmcam.txt | 323 ---
+ Documentation/video4linux/m5602.txt | 12 -
+ Documentation/video4linux/ov511.txt | 288 ---
+ Documentation/video4linux/se401.txt | 54 -
+ Documentation/video4linux/si470x.txt | 7 +-
+ Documentation/video4linux/soc-camera.txt | 146 +-
+ Documentation/video4linux/stv680.txt | 53 -
+ Documentation/video4linux/v4l2-controls.txt | 22 +-
+ Documentation/video4linux/v4l2-framework.txt | 3 +-
+ Documentation/video4linux/w9968cf.txt | 458 -----
+ Documentation/video4linux/zc0301.txt | 270 ---
+ MAINTAINERS | 262 ++-
+ arch/arm/mach-davinci/board-da850-evm.c | 13 +
+ arch/arm/mach-davinci/board-dm644x-evm.c | 8 +-
+ arch/arm/mach-davinci/dm644x.c | 10 +-
+ arch/arm/mach-exynos/mach-nuri.c | 8 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 8 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 6 +-
+ drivers/hid/hid-core.c | 1 +
+ drivers/hid/hid-ids.h | 3 +
+ drivers/media/Kconfig | 19 +-
+ drivers/media/common/Kconfig | 11 +
+ drivers/media/common/Makefile | 3 +
+ drivers/media/{i2c => common}/btcx-risc.c | 0
+ drivers/media/{i2c => common}/btcx-risc.h | 0
+ drivers/media/{i2c => common}/cx2341x.c | 0
+ drivers/media/common/saa7146/saa7146_fops.c | 5 +-
+ drivers/media/{i2c => common}/tveeprom.c | 290 ++-
+ drivers/media/dvb-core/dvb-usb-ids.h | 6 +
+ drivers/media/dvb-core/dvb_ca_en50221.c | 16 +-
+ drivers/media/dvb-core/dvb_frontend.c | 59 +-
+ drivers/media/dvb-core/dvb_frontend.h | 10 +
+ drivers/media/dvb-core/dvb_net.c | 71 +-
+ drivers/media/dvb-core/dvb_net.h | 1 +
+ drivers/media/dvb-core/dvbdev.c | 2 -
+ drivers/media/dvb-frontends/Kconfig | 7 +
+ drivers/media/dvb-frontends/Makefile | 1 +
+ drivers/media/dvb-frontends/af9033.c | 18 +
+ drivers/media/dvb-frontends/af9033.h | 1 +
+ drivers/media/dvb-frontends/af9033_priv.h | 132 +-
+ drivers/media/dvb-frontends/bcm3510.h | 2 +-
+ drivers/media/dvb-frontends/cx22700.h | 2 +-
+ drivers/media/dvb-frontends/cx24110.h | 2 +-
+ drivers/media/dvb-frontends/cx24116.c | 2 +-
+ drivers/media/dvb-frontends/dib0070.h | 2 +-
+ drivers/media/dvb-frontends/dib0090.h | 2 +-
+ drivers/media/dvb-frontends/dib3000.h | 2 +-
+ drivers/media/dvb-frontends/dib8000.h | 2 +-
+ drivers/media/dvb-frontends/dib9000.h | 2 +-
+ drivers/media/dvb-frontends/drxd_hard.c | 9 +-
+ drivers/media/dvb-frontends/ds3000.c | 261 +--
+ drivers/media/dvb-frontends/ds3000.h | 10 +-
+ drivers/media/dvb-frontends/dvb-pll.h | 2 +-
+ drivers/media/dvb-frontends/isl6405.h | 2 +-
+ drivers/media/dvb-frontends/isl6421.h | 2 +-
+ drivers/media/dvb-frontends/isl6423.h | 2 +-
+ drivers/media/dvb-frontends/itd1000.h | 2 +-
+ drivers/media/dvb-frontends/ix2505v.c | 2 +-
+ drivers/media/dvb-frontends/l64781.h | 2 +-
+ drivers/media/dvb-frontends/lgdt330x.h | 2 +-
+ drivers/media/dvb-frontends/m88rs2000.c | 422 ++--
+ drivers/media/dvb-frontends/m88rs2000.h | 6 -
+ drivers/media/dvb-frontends/mb86a16.h | 2 +-
+ drivers/media/dvb-frontends/mb86a20s.c | 1836 ++++++++++++++---
+ drivers/media/dvb-frontends/mt312.h | 2 +-
+ drivers/media/dvb-frontends/mt352.h | 2 +-
+ drivers/media/dvb-frontends/nxt200x.h | 2 +-
+ drivers/media/dvb-frontends/nxt6000.h | 2 +-
+ drivers/media/dvb-frontends/or51132.h | 2 +-
+ drivers/media/dvb-frontends/or51211.c | 99 +-
+ drivers/media/dvb-frontends/or51211.h | 2 +-
+ drivers/media/dvb-frontends/s5h1420.h | 2 +-
+ drivers/media/dvb-frontends/sp8870.h | 2 +-
+ drivers/media/dvb-frontends/sp887x.h | 2 +-
+ drivers/media/dvb-frontends/stb0899_drv.h | 2 +-
+ drivers/media/dvb-frontends/stb6100.h | 2 +-
+ drivers/media/dvb-frontends/stv0297.h | 2 +-
+ drivers/media/dvb-frontends/stv0299.c | 2 +-
+ drivers/media/dvb-frontends/stv0299.h | 2 +-
+ drivers/media/dvb-frontends/stv0900_core.c | 40 +-
+ drivers/media/dvb-frontends/stv0900_reg.h | 3 +
+ drivers/media/dvb-frontends/stv0900_sw.c | 7 +-
+ drivers/media/dvb-frontends/stv090x.c | 141 +-
+ drivers/media/dvb-frontends/stv090x.h | 2 +-
+ drivers/media/dvb-frontends/stv6110x.h | 2 +-
+ drivers/media/dvb-frontends/tda1002x.h | 5 +-
+ drivers/media/dvb-frontends/tda1004x.h | 2 +-
+ drivers/media/dvb-frontends/tda10071.c | 22 +-
+ drivers/media/dvb-frontends/tda10071.h | 8 +-
+ drivers/media/dvb-frontends/tda10086.h | 2 +-
+ drivers/media/dvb-frontends/tda665x.h | 2 +-
+ drivers/media/dvb-frontends/tda8083.h | 2 +-
+ drivers/media/dvb-frontends/tda8261.h | 2 +-
+ drivers/media/dvb-frontends/tda8261_cfg.h | 2 +-
+ drivers/media/dvb-frontends/tda826x.h | 2 +-
+ drivers/media/dvb-frontends/ts2020.c | 373 ++++
+ drivers/media/dvb-frontends/ts2020.h | 50 +
+ drivers/media/dvb-frontends/tua6100.h | 2 +-
+ drivers/media/dvb-frontends/ves1820.h | 2 +-
+ drivers/media/dvb-frontends/ves1x93.h | 2 +-
+ drivers/media/dvb-frontends/zl10353.h | 2 +-
+ drivers/media/i2c/Kconfig | 42 +-
+ drivers/media/i2c/Makefile | 5 +-
+ drivers/media/i2c/adv7180.c | 3 -
+ drivers/media/i2c/adv7343.c | 45 +-
+ drivers/media/i2c/cx25840/cx25840-ir.c | 6 +-
+ drivers/media/i2c/mt9v011.c | 223 +--
+ drivers/media/i2c/noon010pc30.c | 7 -
+ drivers/media/i2c/ov7670.c | 589 +++---
+ drivers/media/i2c/ov9650.c | 1562 +++++++++++++++
+ drivers/media/i2c/s5c73m3/Makefile | 2 +
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 1704 ++++++++++++++++
+ drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 563 ++++++
+ drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 156 ++
+ drivers/media/i2c/s5c73m3/s5c73m3.h | 459 +++++
+ drivers/media/i2c/s5k6aa.c | 7 +-
+ drivers/media/i2c/soc_camera/imx074.c | 27 +-
+ drivers/media/i2c/soc_camera/mt9m001.c | 52 +-
+ drivers/media/i2c/soc_camera/mt9m111.c | 36 +-
+ drivers/media/i2c/soc_camera/mt9t031.c | 36 +-
+ drivers/media/i2c/soc_camera/mt9t112.c | 45 +-
+ drivers/media/i2c/soc_camera/mt9v022.c | 45 +-
+ drivers/media/i2c/soc_camera/ov2640.c | 29 +-
+ drivers/media/i2c/soc_camera/ov5642.c | 31 +-
+ drivers/media/i2c/soc_camera/ov6650.c | 30 +-
+ drivers/media/i2c/soc_camera/ov772x.c | 36 +-
+ drivers/media/i2c/soc_camera/ov9640.c | 27 +-
+ drivers/media/i2c/soc_camera/ov9740.c | 29 +-
+ drivers/media/i2c/soc_camera/rj54n1cb0c.c | 39 +-
+ drivers/media/i2c/soc_camera/tw9910.c | 30 +-
+ drivers/media/i2c/ths7303.c | 3 +-
+ drivers/media/i2c/tvaudio.c | 238 +--
+ drivers/media/i2c/tvp514x.c | 4 +-
+ drivers/media/i2c/tvp5150.c | 7 -
+ drivers/media/i2c/tvp7002.c | 18 +-
+ drivers/media/parport/Kconfig | 1 +
+ drivers/media/parport/bw-qcam.c | 165 +-
+ drivers/media/pci/bt8xx/Makefile | 1 +
+ drivers/media/pci/bt8xx/bttv-driver.c | 6 +-
+ drivers/media/pci/bt8xx/bttv-i2c.c | 5 +-
+ drivers/media/pci/bt8xx/dst_ca.c | 4 +-
+ drivers/media/pci/cx18/cx18-alsa-main.c | 2 +-
+ drivers/media/pci/cx18/cx18-alsa-pcm.h | 2 +-
+ drivers/media/pci/cx18/cx18-i2c.c | 9 +-
+ drivers/media/pci/cx18/cx18-vbi.c | 2 +-
+ drivers/media/pci/cx23885/Kconfig | 3 +
+ drivers/media/pci/cx23885/Makefile | 1 +
+ drivers/media/pci/cx23885/cx23885-cards.c | 114 ++
+ drivers/media/pci/cx23885/cx23885-core.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c | 66 +-
+ drivers/media/pci/cx23885/cx23885-input.c | 9 +
+ drivers/media/pci/cx23885/cx23885-video.c | 20 +-
+ drivers/media/pci/cx23885/cx23885.h | 2 +
+ drivers/media/pci/cx23885/cx23888-ir.c | 6 +-
+ drivers/media/pci/cx25821/Makefile | 1 +
+ drivers/media/pci/cx25821/cx25821-video.c | 2 +-
+ drivers/media/pci/cx88/Kconfig | 2 +
+ drivers/media/pci/cx88/Makefile | 1 +
+ drivers/media/pci/cx88/cx88-cards.c | 2 +-
+ drivers/media/pci/cx88/cx88-core.c | 2 +-
+ drivers/media/pci/cx88/cx88-dvb.c | 15 +-
+ drivers/media/pci/cx88/cx88-i2c.c | 3 +-
+ drivers/media/pci/cx88/cx88-vp3054-i2c.c | 3 +-
+ drivers/media/pci/cx88/cx88-vp3054-i2c.h | 2 +-
+ drivers/media/pci/cx88/cx88.h | 10 +-
+ drivers/media/pci/dm1105/Kconfig | 1 +
+ drivers/media/pci/dm1105/dm1105.c | 11 +-
+ drivers/media/pci/ivtv/ivtv-alsa-main.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 2 +-
+ drivers/media/pci/ivtv/ivtv-driver.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-i2c.c | 14 +-
+ drivers/media/pci/ivtv/ivtv-vbi.c | 4 +-
+ drivers/media/pci/mantis/mantis_ca.c | 5 +-
+ drivers/media/pci/meye/meye.c | 286 +--
+ drivers/media/pci/meye/meye.h | 2 +
+ drivers/media/pci/ngene/ngene-cards.c | 9 +
+ drivers/media/pci/saa7134/saa7134-cards.c | 17 +
+ drivers/media/pci/saa7134/saa7134-core.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-dvb.c | 3 +
+ drivers/media/pci/saa7134/saa7134-video.c | 13 +
+ drivers/media/pci/saa7134/saa7134.h | 7 +-
+ drivers/media/pci/saa7164/saa7164-encoder.c | 2 +
+ drivers/media/pci/sta2x11/Kconfig | 2 +-
+ drivers/media/pci/sta2x11/sta2x11_vip.c | 1073 ++++------
+ drivers/media/pci/ttpci/Kconfig | 5 -
+ drivers/media/pci/ttpci/av7110.c | 12 +-
+ drivers/media/pci/ttpci/av7110.h | 2 +
+ drivers/media/pci/ttpci/av7110_av.c | 8 +
+ drivers/media/pci/ttpci/av7110_ca.c | 24 +-
+ drivers/media/pci/zoran/zoran_card.c | 3 +-
+ drivers/media/pci/zoran/zoran_device.c | 4 +-
+ drivers/media/pci/zoran/zoran_driver.c | 2 +-
+ drivers/media/platform/Kconfig | 11 +-
+ drivers/media/platform/Makefile | 2 +
+ drivers/media/platform/blackfin/Kconfig | 7 +-
+ drivers/media/platform/blackfin/Makefile | 4 +-
+ drivers/media/platform/blackfin/bfin_capture.c | 189 +-
+ drivers/media/platform/blackfin/ppi.c | 90 +-
+ drivers/media/platform/coda.c | 32 +-
+ drivers/media/platform/davinci/Kconfig | 22 +-
+ drivers/media/platform/davinci/Makefile | 4 +-
+ drivers/media/platform/davinci/dm355_ccdc.c | 2 +-
+ drivers/media/platform/davinci/vpbe.c | 12 +-
+ drivers/media/platform/davinci/vpbe_display.c | 9 +-
+ drivers/media/platform/davinci/vpbe_osd.c | 35 +-
+ drivers/media/platform/davinci/vpbe_venc.c | 65 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 5 +-
+ drivers/media/platform/davinci/vpif_capture.c | 2 +-
+ drivers/media/platform/davinci/vpif_display.c | 6 +-
+ drivers/media/platform/davinci/vpss.c | 70 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 56 +-
+ drivers/media/platform/exynos-gsc/gsc-core.h | 5 +
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 34 +-
+ drivers/media/platform/exynos-gsc/gsc-regs.c | 6 +
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/media/platform/m2m-deinterlace.c | 6 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 84 +-
+ drivers/media/platform/marvell-ccic/mcam-core.h | 17 +-
+ drivers/media/platform/mx2_emmaprp.c | 6 +-
+ drivers/media/platform/omap/Kconfig | 2 +-
+ drivers/media/platform/omap/omap_vout.c | 36 +-
+ drivers/media/platform/omap24xxcam.c | 2 +-
+ drivers/media/platform/omap3isp/isp.c | 74 +-
+ drivers/media/platform/omap3isp/ispccp2.c | 8 +-
+ drivers/media/platform/omap3isp/ispcsiphy.c | 13 +-
+ drivers/media/platform/omap3isp/isph3a_aewb.c | 28 +-
+ drivers/media/platform/omap3isp/isph3a_af.c | 28 +-
+ drivers/media/platform/omap3isp/isphist.c | 21 +-
+ drivers/media/platform/omap3isp/isppreview.c | 40 +-
+ drivers/media/platform/omap3isp/ispqueue.c | 5 +-
+ drivers/media/platform/s3c-camif/camif-core.c | 9 +-
+ drivers/media/platform/s5p-fimc/fimc-capture.c | 190 +-
+ drivers/media/platform/s5p-fimc/fimc-core.c | 173 +-
+ drivers/media/platform/s5p-fimc/fimc-core.h | 17 +-
+ drivers/media/platform/s5p-fimc/fimc-lite-reg.c | 16 +-
+ drivers/media/platform/s5p-fimc/fimc-lite-reg.h | 4 +-
+ drivers/media/platform/s5p-fimc/fimc-lite.c | 200 +-
+ drivers/media/platform/s5p-fimc/fimc-lite.h | 9 +-
+ drivers/media/platform/s5p-fimc/fimc-m2m.c | 136 +-
+ drivers/media/platform/s5p-fimc/fimc-mdevice.c | 400 ++--
+ drivers/media/platform/s5p-fimc/fimc-mdevice.h | 14 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.c | 82 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.h | 10 +-
+ drivers/media/platform/s5p-fimc/mipi-csis.c | 109 +-
+ drivers/media/platform/s5p-g2d/g2d-hw.c | 16 +-
+ drivers/media/platform/s5p-g2d/g2d-regs.h | 7 +
+ drivers/media/platform/s5p-g2d/g2d.c | 43 +-
+ drivers/media/platform/s5p-g2d/g2d.h | 17 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 173 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 31 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 149 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 3 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 15 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 30 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 5 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 197 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 148 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 2 +-
+ drivers/media/platform/s5p-tv/hdmi_drv.c | 18 +-
+ drivers/media/platform/s5p-tv/hdmiphy_drv.c | 2 +-
+ drivers/media/platform/s5p-tv/mixer.h | 1 +
+ drivers/media/platform/s5p-tv/mixer_drv.c | 14 +-
+ drivers/media/platform/s5p-tv/mixer_reg.c | 6 +-
+ drivers/media/platform/s5p-tv/mixer_video.c | 19 +-
+ drivers/media/platform/s5p-tv/sdo_drv.c | 29 +-
+ drivers/media/platform/s5p-tv/sii9234_drv.c | 6 +-
+ drivers/media/platform/sh_veu.c | 1266 ++++++++++++
+ drivers/media/platform/sh_vou.c | 123 +-
+ drivers/media/platform/soc_camera/Kconfig | 7 +-
+ drivers/media/platform/soc_camera/atmel-isi.c | 6 +-
+ drivers/media/platform/soc_camera/mx1_camera.c | 5 +-
+ drivers/media/platform/soc_camera/mx2_camera.c | 541 ++---
+ drivers/media/platform/soc_camera/mx3_camera.c | 6 +-
+ drivers/media/platform/soc_camera/omap1_camera.c | 6 +-
+ drivers/media/platform/soc_camera/pxa_camera.c | 73 +-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 44 +-
+ drivers/media/platform/soc_camera/sh_mobile_csi2.c | 23 +-
+ drivers/media/platform/soc_camera/soc_camera.c | 172 +-
+ .../platform/soc_camera/soc_camera_platform.c | 6 +-
+ drivers/media/platform/soc_camera/soc_mediabus.c | 6 -
+ drivers/media/platform/timblogiw.c | 2 +-
+ drivers/media/platform/via-camera.c | 60 +-
+ drivers/media/platform/vino.c | 11 +-
+ drivers/media/platform/vivi.c | 224 ++-
+ drivers/media/radio/Kconfig | 12 +
+ drivers/media/radio/Makefile | 1 +
+ drivers/media/radio/radio-ma901.c | 460 +++++
+ drivers/media/radio/radio-miropcm20.c | 173 +-
+ drivers/media/radio/radio-wl1273.c | 3 +-
+ drivers/media/radio/si470x/radio-si470x.h | 4 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 3 +-
+ drivers/media/rc/ati_remote.c | 27 +-
+ drivers/media/rc/ene_ir.c | 28 +-
+ drivers/media/rc/fintek-cir.c | 24 +-
+ drivers/media/rc/gpio-ir-recv.c | 55 +-
+ drivers/media/rc/iguanair.c | 26 +-
+ drivers/media/rc/imon.c | 4 +-
+ drivers/media/rc/ir-raw.c | 17 +-
+ drivers/media/rc/ite-cir.c | 26 +-
+ drivers/media/rc/keymaps/Makefile | 1 +
+ .../media/rc/keymaps/rc-total-media-in-hand-02.c | 86 +
+ drivers/media/rc/mceusb.c | 37 +-
+ drivers/media/rc/nuvoton-cir.c | 41 +-
+ drivers/media/rc/rc-core-priv.h | 16 +-
+ drivers/media/rc/rc-main.c | 7 +-
+ drivers/media/rc/redrat3.c | 18 +-
+ drivers/media/rc/ttusbir.c | 10 +-
+ drivers/media/rc/winbond-cir.c | 41 +-
+ drivers/media/tuners/fc0011.c | 19 +-
+ drivers/media/tuners/fc0012-priv.h | 13 +-
+ drivers/media/tuners/fc0012.c | 113 +-
+ drivers/media/tuners/fc0012.h | 32 +-
+ drivers/media/tuners/mt2060.h | 2 +-
+ drivers/media/tuners/mt2063.h | 2 +-
+ drivers/media/tuners/mt20xx.h | 2 +-
+ drivers/media/tuners/mt2131.h | 2 +-
+ drivers/media/tuners/mt2266.h | 2 +-
+ drivers/media/tuners/mxl5007t.h | 2 +-
+ drivers/media/tuners/qt1010.h | 2 +-
+ drivers/media/tuners/tda18212.c | 6 +-
+ drivers/media/tuners/tda18218.c | 6 +-
+ drivers/media/tuners/tda18271-fe.c | 2 +
+ drivers/media/tuners/tda18271-maps.c | 6 +-
+ drivers/media/tuners/tda18271.h | 2 +-
+ drivers/media/tuners/tda827x.h | 2 +-
+ drivers/media/tuners/tda8290.h | 2 +-
+ drivers/media/tuners/tda9887.h | 2 +-
+ drivers/media/tuners/tea5761.h | 2 +-
+ drivers/media/tuners/tea5767.h | 2 +-
+ drivers/media/tuners/tuner-simple.h | 2 +-
+ drivers/media/tuners/tuner-xc2028.c | 2 +-
+ drivers/media/tuners/tuner-xc2028.h | 2 +-
+ drivers/media/tuners/xc4000.c | 2 +-
+ drivers/media/tuners/xc4000.h | 2 +-
+ drivers/media/tuners/xc5000.c | 1 +
+ drivers/media/usb/Kconfig | 2 +-
+ drivers/media/usb/au0828/Kconfig | 17 +-
+ drivers/media/usb/au0828/Makefile | 6 +-
+ drivers/media/usb/au0828/au0828-cards.c | 24 +-
+ drivers/media/usb/au0828/au0828-core.c | 13 +-
+ drivers/media/usb/au0828/au0828-i2c.c | 13 +-
+ drivers/media/usb/au0828/au0828-video.c | 4 +-
+ drivers/media/usb/au0828/au0828.h | 2 +
+ drivers/media/usb/cpia2/cpia2_usb.c | 2 +-
+ drivers/media/usb/cpia2/cpia2_v4l.c | 5 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 31 +-
+ drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 6 +-
+ drivers/media/usb/cx231xx/cx231xx.h | 1 +
+ drivers/media/usb/dvb-usb-v2/Kconfig | 4 +-
+ drivers/media/usb/dvb-usb-v2/af9015.c | 4 +
+ drivers/media/usb/dvb-usb-v2/af9035.c | 289 ++-
+ drivers/media/usb/dvb-usb-v2/af9035.h | 3 +-
+ drivers/media/usb/dvb-usb-v2/anysee.c | 4 +
+ drivers/media/usb/dvb-usb-v2/az6007.c | 26 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 3 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 15 +-
+ drivers/media/usb/dvb-usb-v2/it913x.c | 54 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 38 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 30 +-
+ drivers/media/usb/dvb-usb/Kconfig | 8 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c | 5 +-
+ drivers/media/usb/dvb-usb/dvb-usb-init.c | 60 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 179 +-
+ drivers/media/usb/dvb-usb/friio-fe.c | 5 +-
+ drivers/media/usb/dvb-usb/m920x.c | 277 ++-
+ drivers/media/usb/dvb-usb/ttusb2.c | 8 +-
+ drivers/media/usb/em28xx/Kconfig | 8 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 270 ++-
+ drivers/media/usb/em28xx/em28xx-core.c | 296 +--
+ drivers/media/usb/em28xx/em28xx-dvb.c | 96 +-
+ drivers/media/usb/em28xx/em28xx-i2c.c | 293 +--
+ drivers/media/usb/em28xx/em28xx-input.c | 359 ++--
+ drivers/media/usb/em28xx/em28xx-reg.h | 5 +-
+ drivers/media/usb/em28xx/em28xx-vbi.c | 123 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 1699 +++++-----------
+ drivers/media/usb/em28xx/em28xx.h | 149 +-
+ drivers/media/usb/gspca/cpia1.c | 6 +-
+ drivers/media/usb/gspca/gspca.c | 10 +-
+ drivers/media/usb/gspca/gspca.h | 6 +-
+ drivers/media/usb/gspca/jl2005bcd.c | 18 +-
+ drivers/media/usb/gspca/konica.c | 6 +-
+ drivers/media/usb/gspca/ov519.c | 6 +-
+ drivers/media/usb/gspca/pac207.c | 36 +-
+ drivers/media/usb/gspca/pac7302.c | 4 +-
+ drivers/media/usb/gspca/pac7311.c | 4 +-
+ drivers/media/usb/gspca/se401.c | 4 +-
+ drivers/media/usb/gspca/sn9c20x.c | 4 +-
+ drivers/media/usb/gspca/sonixb.c | 6 +-
+ drivers/media/usb/gspca/sonixj.c | 4 +-
+ drivers/media/usb/gspca/spca561.c | 6 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx.c | 4 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 17 +-
+ drivers/media/usb/gspca/t613.c | 8 +-
+ drivers/media/usb/gspca/xirlink_cit.c | 8 +-
+ drivers/media/usb/gspca/zc3xx.c | 4 +-
+ drivers/media/usb/hdpvr/hdpvr-core.c | 6 +-
+ drivers/media/usb/hdpvr/hdpvr-i2c.c | 5 +-
+ drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 3 +-
+ drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 2 +-
+ drivers/media/usb/pwc/pwc-if.c | 5 +-
+ drivers/media/usb/pwc/pwc-v4l.c | 7 +-
+ drivers/media/usb/s2255/s2255drv.c | 6 +-
+ drivers/media/usb/sn9c102/sn9c102_core.c | 9 +-
+ drivers/media/usb/stk1160/stk1160-video.c | 4 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c | 59 +-
+ drivers/media/usb/tlg2300/pd-video.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-core.c | 9 +-
+ drivers/media/usb/tm6000/tm6000-dvb.c | 4 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 542 +++--
+ drivers/media/usb/tm6000/tm6000.h | 10 +
+ drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 7 +
+ drivers/media/usb/usbvision/usbvision-core.c | 2 +-
+ drivers/media/usb/usbvision/usbvision-i2c.c | 3 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 5 +-
+ drivers/media/usb/uvc/uvc_ctrl.c | 2 +-
+ drivers/media/usb/uvc/uvc_queue.c | 16 +
+ drivers/media/usb/uvc/uvc_v4l2.c | 8 +-
+ drivers/media/usb/zr364xx/zr364xx.c | 6 +-
+ drivers/media/v4l2-core/Kconfig | 11 +
+ drivers/media/v4l2-core/Makefile | 3 +-
+ drivers/media/v4l2-core/tuner-core.c | 17 +-
+ drivers/media/v4l2-core/v4l2-common.c | 14 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 179 +-
+ drivers/media/v4l2-core/v4l2-dev.c | 14 +-
+ drivers/media/v4l2-core/v4l2-device.c | 32 +-
+ drivers/media/v4l2-core/v4l2-event.c | 7 +
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 4 +-
+ drivers/media/v4l2-core/videobuf-core.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 15 +-
+ drivers/staging/media/Kconfig | 2 +
+ drivers/staging/media/Makefile | 1 +
+ drivers/staging/media/as102/as102_usb_drv.c | 4 +-
+ drivers/staging/media/as102/as10x_cmd_cfg.c | 2 +-
+ drivers/staging/media/cxd2099/cxd2099.c | 29 +-
+ drivers/staging/media/cxd2099/cxd2099.h | 2 +-
+ drivers/staging/media/davinci_vpfe/Kconfig | 9 +
+ drivers/staging/media/davinci_vpfe/Makefile | 3 +
+ drivers/staging/media/davinci_vpfe/TODO | 37 +
+ .../staging/media/davinci_vpfe/davinci-vpfe-mc.txt | 154 ++
+ .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 1290 ++++++++++++
+ drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 1863 +++++++++++++++++
+ drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 179 ++
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 1048 ++++++++++
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 559 ++++++
+ drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 1071 ++++++++++
+ drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 233 +++
+ .../media/davinci_vpfe/dm365_ipipeif_user.h | 93 +
+ drivers/staging/media/davinci_vpfe/dm365_isif.c | 2104 ++++++++++++++++++++
+ drivers/staging/media/davinci_vpfe/dm365_isif.h | 203 ++
+ .../staging/media/davinci_vpfe/dm365_isif_regs.h | 294 +++
+ drivers/staging/media/davinci_vpfe/dm365_resizer.c | 1999 +++++++++++++++++++
+ drivers/staging/media/davinci_vpfe/dm365_resizer.h | 244 +++
+ drivers/staging/media/davinci_vpfe/vpfe.h | 86 +
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 740 +++++++
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 97 +
+ drivers/staging/media/davinci_vpfe/vpfe_video.c | 1620 +++++++++++++++
+ drivers/staging/media/davinci_vpfe/vpfe_video.h | 155 ++
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 2 +-
+ drivers/staging/media/go7007/go7007-driver.c | 15 +-
+ drivers/staging/media/go7007/go7007-fw.c | 24 +-
+ drivers/staging/media/go7007/go7007-i2c.c | 10 +-
+ drivers/staging/media/go7007/go7007-usb.c | 5 +-
+ drivers/staging/media/go7007/go7007-v4l2.c | 11 +-
+ drivers/staging/media/go7007/s2250-board.c | 32 +-
+ drivers/staging/media/go7007/s2250-loader.c | 38 +-
+ drivers/staging/media/go7007/wis-saa7113.c | 2 +-
+ drivers/staging/media/go7007/wis-sony-tuner.c | 86 +-
+ drivers/staging/media/go7007/wis-tw2804.c | 24 +-
+ drivers/staging/media/go7007/wis-tw9903.c | 12 +-
+ drivers/staging/media/go7007/wis-uda1342.c | 7 +-
+ drivers/staging/media/lirc/lirc_bt829.c | 15 +-
+ drivers/staging/media/lirc/lirc_igorplugusb.c | 12 +-
+ drivers/staging/media/lirc/lirc_imon.c | 31 +-
+ drivers/staging/media/lirc/lirc_parallel.c | 49 +-
+ drivers/staging/media/lirc/lirc_sasem.c | 73 +-
+ drivers/staging/media/lirc/lirc_serial.c | 70 +-
+ drivers/staging/media/lirc/lirc_sir.c | 36 +-
+ drivers/staging/media/solo6x10/p2m.c | 8 +-
+ drivers/staging/media/solo6x10/v4l2-enc.c | 4 +
+ drivers/staging/media/solo6x10/v4l2.c | 5 +-
+ include/media/adv7343.h | 52 +
+ include/media/blackfin/bfin_capture.h | 5 +-
+ include/media/blackfin/ppi.h | 36 +-
+ include/media/davinci/vpbe_osd.h | 5 +-
+ include/media/davinci/vpbe_venc.h | 5 +-
+ include/media/davinci/vpss.h | 16 +
+ include/media/ov7670.h | 2 +
+ include/media/ov9650.h | 27 +
+ include/media/rc-map.h | 1 +
+ include/media/s5c73m3.h | 55 +
+ include/media/s5p_fimc.h | 49 +-
+ include/media/soc_camera.h | 107 +-
+ include/media/soc_camera_platform.h | 10 +-
+ include/media/tvp514x.h | 7 +-
+ include/media/v4l2-common.h | 2 +
+ include/media/v4l2-ctrls.h | 53 +
+ include/media/v4l2-event.h | 4 +-
+ include/media/v4l2-image-sizes.h | 34 +
+ include/media/v4l2-mem2mem.h | 2 +-
+ include/uapi/linux/dvb/frontend.h | 79 +-
+ include/uapi/linux/dvb/version.h | 2 +-
+ include/uapi/linux/meye.h | 8 +-
+ include/uapi/linux/v4l2-controls.h | 33 +-
+ include/uapi/linux/v4l2-mediabus.h | 11 +-
+ include/uapi/linux/videodev2.h | 35 +-
+ 540 files changed, 33018 insertions(+), 11116 deletions(-)
+ create mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml
+ create mode 100644 Documentation/DocBook/media/v4l/pixfmt-uv8.xml
+ create mode 100644 Documentation/devicetree/bindings/media/gpio-ir-receiver.txt
+ delete mode 100644 Documentation/video4linux/et61x251.txt
+ mode change 100644 => 100755 Documentation/video4linux/extract_xc3028.pl
+ delete mode 100644 Documentation/video4linux/ibmcam.txt
+ delete mode 100644 Documentation/video4linux/m5602.txt
+ delete mode 100644 Documentation/video4linux/ov511.txt
+ delete mode 100644 Documentation/video4linux/se401.txt
+ delete mode 100644 Documentation/video4linux/stv680.txt
+ delete mode 100644 Documentation/video4linux/w9968cf.txt
+ delete mode 100644 Documentation/video4linux/zc0301.txt
+ rename drivers/media/{i2c => common}/btcx-risc.c (100%)
+ rename drivers/media/{i2c => common}/btcx-risc.h (100%)
+ rename drivers/media/{i2c => common}/cx2341x.c (100%)
+ rename drivers/media/{i2c => common}/tveeprom.c (74%)
+ create mode 100644 drivers/media/dvb-frontends/ts2020.c
+ create mode 100644 drivers/media/dvb-frontends/ts2020.h
+ create mode 100644 drivers/media/i2c/ov9650.c
+ create mode 100644 drivers/media/i2c/s5c73m3/Makefile
+ create mode 100644 drivers/media/i2c/s5c73m3/s5c73m3-core.c
+ create mode 100644 drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
+ create mode 100644 drivers/media/i2c/s5c73m3/s5c73m3-spi.c
+ create mode 100644 drivers/media/i2c/s5c73m3/s5c73m3.h
+ create mode 100644 drivers/media/platform/sh_veu.c
+ create mode 100644 drivers/media/radio/radio-ma901.c
+ create mode 100644 drivers/media/rc/keymaps/rc-total-media-in-hand-02.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/Kconfig
+ create mode 100644 drivers/staging/media/davinci_vpfe/Makefile
+ create mode 100644 drivers/staging/media/davinci_vpfe/TODO
+ create mode 100644 drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt
+ create mode 100644 drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif_regs.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/vpfe.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h
+ create mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.c
+ create mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.h
+ create mode 100644 include/media/ov9650.h
+ create mode 100644 include/media/s5c73m3.h
+ create mode 100644 include/media/v4l2-image-sizes.h
+Merging kbuild/for-next (ef247b8 Merge branch 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Removing kernel/timeconst.pl
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/kbuild/kconfig-language.txt | 23 -
+ Documentation/kbuild/kconfig.txt | 6 +
+ Makefile | 1 -
+ include/linux/mod_devicetable.h | 58 +--
+ kernel/Makefile | 16 +-
+ kernel/timeconst.bc | 108 +++++
+ kernel/timeconst.pl | 378 ----------------
+ scripts/Makefile.modpost | 7 +-
+ scripts/coccinelle/misc/semicolon.cocci | 83 ++++
+ scripts/kconfig/Makefile | 3 +
+ scripts/kconfig/expr.c | 10 +-
+ scripts/kconfig/gconf.c | 2 +-
+ scripts/kconfig/lkc.h | 8 +
+ scripts/kconfig/lxdialog/check-lxdialog.sh | 1 +
+ scripts/kconfig/lxdialog/inputbox.c | 121 ++++--
+ scripts/kconfig/lxdialog/menubox.c | 20 +-
+ scripts/kconfig/mconf.c | 54 ++-
+ scripts/kconfig/menu.c | 4 +-
+ scripts/kconfig/merge_config.sh | 20 +-
+ scripts/kconfig/nconf.c | 12 +-
+ scripts/kconfig/nconf.gui.c | 2 +-
+ scripts/kconfig/qconf.cc | 1 +
+ scripts/kconfig/symbol.c | 12 +-
+ scripts/kconfig/util.c | 23 +-
+ scripts/kconfig/zconf.l | 8 +-
+ scripts/kconfig/zconf.lex.c_shipped | 8 +-
+ scripts/mod/.gitignore | 1 +
+ scripts/mod/Makefile | 35 ++
+ scripts/mod/devicetable-offsets.c | 178 ++++++++
+ scripts/mod/file2alias.c | 674 ++++++++++++++++-------------
+ scripts/mod/modpost.c | 5 +-
+ scripts/tags.sh | 50 +--
+ 32 files changed, 1044 insertions(+), 888 deletions(-)
+ create mode 100644 kernel/timeconst.bc
+ delete mode 100644 kernel/timeconst.pl
+ create mode 100644 scripts/coccinelle/misc/semicolon.cocci
+ create mode 100644 scripts/mod/devicetable-offsets.c
+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 (44ec657 [SCSI] remove can_power_off flag from scsi_device)
+$ git merge libata/NEXT
+Auto-merging drivers/ata/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/ata/Kconfig | 13 ++
+ drivers/ata/Makefile | 1 +
+ drivers/ata/ahci.c | 16 +++
+ drivers/ata/ata_piix.c | 8 ++
+ drivers/ata/libata-acpi.c | 177 +++++++++++--------------
+ drivers/ata/libata-core.c | 66 +++++++---
+ drivers/ata/libata-eh.c | 27 +++-
+ drivers/ata/libata-scsi.c | 2 +
+ drivers/ata/libata-zpodd.c | 300 ++++++++++++++++++++++++++++++++++++++++++
+ drivers/ata/libata.h | 27 ++++
+ drivers/ata/pata_samsung_cf.c | 4 +-
+ drivers/scsi/scsi_lib.c | 14 ++
+ drivers/scsi/sr.c | 46 ++++++-
+ include/linux/libata.h | 3 +
+ include/scsi/scsi_device.h | 5 +-
+ include/uapi/linux/cdrom.h | 34 +++++
+ 16 files changed, 609 insertions(+), 134 deletions(-)
+ create mode 100644 drivers/ata/libata-zpodd.c
+Merging infiniband/for-next (8c29066 Merge branches 'cxgb4', 'misc', 'mlx4' and 'qib' into for-next)
+$ git merge infiniband/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/hw/amso1100/c2.c | 13 +--
+ drivers/infiniband/hw/cxgb4/cm.c | 170 ++++++++++++++++++++-------------
+ drivers/infiniband/hw/cxgb4/device.c | 5 +-
+ drivers/infiniband/hw/cxgb4/ev.c | 8 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 +
+ drivers/infiniband/hw/cxgb4/qp.c | 1 +
+ drivers/infiniband/hw/mlx4/mad.c | 7 +-
+ drivers/infiniband/hw/mlx4/sysfs.c | 2 +-
+ drivers/infiniband/hw/qib/qib_qp.c | 5 +-
+ 9 files changed, 123 insertions(+), 90 deletions(-)
+Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change)
+$ git merge pstore/master
+Already up-to-date.
+Merging pm/linux-next (10baf04 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux)
+$ git merge pm/linux-next
+Resolved 'drivers/acpi/internal.h' using previous resolution.
+Resolved 'drivers/acpi/scan.c' using previous resolution.
+Resolved 'drivers/pci/hotplug/acpiphp_glue.c' using previous resolution.
+Removing include/acpi/container.h
+Auto-merging include/acpi/acpiosxf.h
+Auto-merging include/acpi/acpi_bus.h
+Auto-merging drivers/platform/x86/eeepc-laptop.c
+Auto-merging drivers/pci/pci-acpi.c
+Auto-merging drivers/pci/hotplug/sgi_hotplug.c
+Auto-merging drivers/pci/hotplug/acpiphp_glue.c
+CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c
+Auto-merging drivers/ata/libata-acpi.c
+Auto-merging drivers/acpi/scan.c
+CONFLICT (content): Merge conflict in drivers/acpi/scan.c
+Auto-merging drivers/acpi/pci_slot.c
+Auto-merging drivers/acpi/pci_root.c
+Auto-merging drivers/acpi/osl.c
+Auto-merging drivers/acpi/internal.h
+CONFLICT (content): Merge conflict in drivers/acpi/internal.h
+Auto-merging drivers/acpi/custom_method.c
+Auto-merging drivers/acpi/Kconfig
+Auto-merging drivers/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/microblaze/kernel/process.c
+Auto-merging arch/arm64/kernel/process.c
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d549258] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-devices-power_resources_D0 | 13 +
+ .../ABI/testing/sysfs-devices-power_resources_D1 | 14 +
+ .../ABI/testing/sysfs-devices-power_resources_D2 | 14 +
+ .../testing/sysfs-devices-power_resources_D3hot | 14 +
+ .../ABI/testing/sysfs-devices-power_state | 20 +
+ .../ABI/testing/sysfs-devices-real_power_state | 23 +
+ .../ABI/testing/sysfs-devices-resource_in_use | 12 +
+ Documentation/acpi/enumeration.txt | 4 +-
+ Documentation/acpi/scan_handlers.txt | 77 ++
+ Documentation/cpu-freq/cpu-drivers.txt | 6 +
+ Documentation/cpu-freq/user-guide.txt | 8 +-
+ Documentation/devicetree/bindings/arm/kirkwood.txt | 27 +
+ Documentation/kernel-parameters.txt | 16 +-
+ Documentation/power/freezing-of-tasks.txt | 5 +
+ Documentation/power/runtime_pm.txt | 4 +
+ Documentation/trace/events-power.txt | 27 +-
+ arch/arm/boot/dts/highbank.dts | 10 +
+ arch/arm/kernel/process.c | 13 +-
+ arch/arm/kernel/smp_twd.c | 53 +-
+ arch/arm/mach-davinci/cpuidle.c | 84 +--
+ arch/arm/mach-exynos/include/mach/cpufreq.h | 19 +-
+ arch/arm/mach-highbank/Kconfig | 4 +
+ arch/arm/mach-omap2/pm34xx.c | 2 -
+ arch/arm/mach-tegra/cpu-tegra.c | 3 +-
+ arch/arm64/kernel/process.c | 13 +-
+ arch/blackfin/kernel/process.c | 7 -
+ arch/cris/kernel/process.c | 11 +-
+ arch/ia64/hp/common/aml_nfw.c | 2 +-
+ arch/ia64/include/asm/acpi.h | 4 -
+ arch/ia64/kernel/process.c | 3 -
+ arch/ia64/kernel/setup.c | 1 -
+ arch/m32r/kernel/process.c | 51 +-
+ arch/microblaze/kernel/process.c | 3 -
+ arch/mn10300/kernel/process.c | 7 -
+ arch/sh/kernel/idle.c | 12 +-
+ arch/sparc/include/asm/processor_32.h | 1 +
+ arch/sparc/kernel/apc.c | 3 +-
+ arch/sparc/kernel/leon_pmc.c | 5 +-
+ arch/sparc/kernel/pmc.c | 3 +-
+ arch/sparc/kernel/process_32.c | 7 +-
+ arch/unicore32/kernel/process.c | 5 -
+ arch/x86/Kconfig | 11 +
+ arch/x86/include/asm/acpi.h | 4 -
+ arch/x86/include/asm/mwait.h | 3 +-
+ arch/x86/include/asm/processor.h | 18 +-
+ arch/x86/include/uapi/asm/msr-index.h | 3 +
+ arch/x86/kernel/apm_32.c | 57 +-
+ arch/x86/kernel/cpu/bugs.c | 27 -
+ arch/x86/kernel/cpu/proc.c | 2 -
+ arch/x86/kernel/process.c | 122 +--
+ arch/x86/kernel/smpboot.c | 2 +-
+ arch/x86/platform/olpc/olpc-xo15-sci.c | 2 +-
+ arch/x86/xen/setup.c | 5 +-
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/acpi/Kconfig | 2 +-
+ drivers/acpi/Makefile | 1 +
+ drivers/acpi/ac.c | 4 +-
+ drivers/acpi/acpi_memhotplug.c | 60 +-
+ drivers/acpi/acpi_pad.c | 3 +-
+ drivers/acpi/acpi_platform.c | 72 +-
+ drivers/acpi/acpica/Makefile | 8 +-
+ drivers/acpi/acpica/accommon.h | 3 +-
+ drivers/acpi/acpica/acdebug.h | 19 +-
+ drivers/acpi/acpica/acdispat.h | 2 +-
+ drivers/acpi/acpica/acevents.h | 23 +-
+ drivers/acpi/acpica/acglobal.h | 43 +-
+ drivers/acpi/acpica/achware.h | 2 +-
+ drivers/acpi/acpica/acinterp.h | 4 +-
+ drivers/acpi/acpica/aclocal.h | 47 +-
+ drivers/acpi/acpica/acmacros.h | 173 +----
+ drivers/acpi/acpica/acnamesp.h | 16 +-
+ drivers/acpi/acpica/acobject.h | 4 +-
+ drivers/acpi/acpica/acopcode.h | 2 +-
+ drivers/acpi/acpica/acparser.h | 27 +-
+ drivers/acpi/acpica/acpredef.h | 31 +-
+ drivers/acpi/acpica/acresrc.h | 8 +-
+ drivers/acpi/acpica/acstruct.h | 2 +-
+ drivers/acpi/acpica/actables.h | 2 +-
+ drivers/acpi/acpica/acutils.h | 59 +-
+ drivers/acpi/acpica/amlcode.h | 2 +-
+ drivers/acpi/acpica/amlresrc.h | 8 +-
+ drivers/acpi/acpica/dsargs.c | 2 +-
+ drivers/acpi/acpica/dscontrol.c | 2 +-
+ drivers/acpi/acpica/dsfield.c | 2 +-
+ drivers/acpi/acpica/dsinit.c | 2 +-
+ drivers/acpi/acpica/dsmethod.c | 8 +-
+ drivers/acpi/acpica/dsmthdat.c | 2 +-
+ drivers/acpi/acpica/dsobject.c | 20 +-
+ drivers/acpi/acpica/dsopcode.c | 16 +-
+ drivers/acpi/acpica/dsutils.c | 12 +-
+ drivers/acpi/acpica/dswexec.c | 6 +-
+ drivers/acpi/acpica/dswload.c | 7 +-
+ drivers/acpi/acpica/dswload2.c | 4 +-
+ drivers/acpi/acpica/dswscope.c | 2 +-
+ drivers/acpi/acpica/dswstate.c | 2 +-
+ drivers/acpi/acpica/evevent.c | 2 +-
+ drivers/acpi/acpica/evglock.c | 2 +-
+ drivers/acpi/acpica/evgpe.c | 14 +-
+ drivers/acpi/acpica/evgpeblk.c | 24 +-
+ drivers/acpi/acpica/evgpeinit.c | 5 +-
+ drivers/acpi/acpica/evgpeutil.c | 2 +-
+ drivers/acpi/acpica/evhandler.c | 529 +++++++++++++
+ drivers/acpi/acpica/evmisc.c | 2 +-
+ drivers/acpi/acpica/evregion.c | 584 ++-------------
+ drivers/acpi/acpica/evrgnini.c | 2 +-
+ drivers/acpi/acpica/evsci.c | 6 +-
+ drivers/acpi/acpica/evxface.c | 36 +-
+ drivers/acpi/acpica/evxfevnt.c | 7 +-
+ drivers/acpi/acpica/evxfgpe.c | 11 +-
+ drivers/acpi/acpica/evxfregn.c | 2 +-
+ drivers/acpi/acpica/exconfig.c | 22 +-
+ drivers/acpi/acpica/exconvrt.c | 4 +-
+ drivers/acpi/acpica/excreate.c | 2 +-
+ drivers/acpi/acpica/exdebug.c | 2 +-
+ drivers/acpi/acpica/exdump.c | 21 +-
+ drivers/acpi/acpica/exfield.c | 2 +-
+ drivers/acpi/acpica/exfldio.c | 3 +-
+ drivers/acpi/acpica/exmisc.c | 2 +-
+ drivers/acpi/acpica/exmutex.c | 5 +-
+ drivers/acpi/acpica/exnames.c | 2 +-
+ drivers/acpi/acpica/exoparg1.c | 10 +-
+ drivers/acpi/acpica/exoparg2.c | 2 +-
+ drivers/acpi/acpica/exoparg3.c | 2 +-
+ drivers/acpi/acpica/exoparg6.c | 2 +-
+ drivers/acpi/acpica/exprep.c | 6 +-
+ drivers/acpi/acpica/exregion.c | 25 +-
+ drivers/acpi/acpica/exresnte.c | 2 +-
+ drivers/acpi/acpica/exresolv.c | 2 +-
+ drivers/acpi/acpica/exresop.c | 2 +-
+ drivers/acpi/acpica/exstore.c | 31 +-
+ drivers/acpi/acpica/exstoren.c | 4 +-
+ drivers/acpi/acpica/exstorob.c | 2 +-
+ drivers/acpi/acpica/exsystem.c | 2 +-
+ drivers/acpi/acpica/exutils.c | 24 +-
+ drivers/acpi/acpica/hwacpi.c | 13 +-
+ drivers/acpi/acpica/hwesleep.c | 3 +-
+ drivers/acpi/acpica/hwgpe.c | 10 +-
+ drivers/acpi/acpica/hwpci.c | 2 +-
+ drivers/acpi/acpica/hwregs.c | 8 +-
+ drivers/acpi/acpica/hwsleep.c | 8 +-
+ drivers/acpi/acpica/hwtimer.c | 9 +-
+ drivers/acpi/acpica/hwvalid.c | 20 +-
+ drivers/acpi/acpica/hwxface.c | 137 ++--
+ drivers/acpi/acpica/hwxfsleep.c | 13 +-
+ drivers/acpi/acpica/nsaccess.c | 2 +-
+ drivers/acpi/acpica/nsalloc.c | 2 +-
+ drivers/acpi/acpica/nsdump.c | 14 +-
+ drivers/acpi/acpica/nsdumpdv.c | 3 +-
+ drivers/acpi/acpica/nseval.c | 2 +-
+ drivers/acpi/acpica/nsinit.c | 29 +-
+ drivers/acpi/acpica/nsload.c | 2 +-
+ drivers/acpi/acpica/nsnames.c | 5 +-
+ drivers/acpi/acpica/nsobject.c | 2 +-
+ drivers/acpi/acpica/nsparse.c | 2 +-
+ drivers/acpi/acpica/nspredef.c | 586 +--------------
+ drivers/acpi/acpica/nsprepkg.c | 621 +++++++++++++++
+ drivers/acpi/acpica/nsrepair.c | 2 +-
+ drivers/acpi/acpica/nsrepair2.c | 5 +-
+ drivers/acpi/acpica/nssearch.c | 7 +-
+ drivers/acpi/acpica/nsutils.c | 88 +--
+ drivers/acpi/acpica/nswalk.c | 6 +-
+ drivers/acpi/acpica/nsxfeval.c | 19 +-
+ drivers/acpi/acpica/nsxfname.c | 20 +-
+ drivers/acpi/acpica/nsxfobj.c | 2 +-
+ drivers/acpi/acpica/psargs.c | 9 +-
+ drivers/acpi/acpica/psloop.c | 623 +---------------
+ drivers/acpi/acpica/psobject.c | 647 ++++++++++++++++
+ drivers/acpi/acpica/psopcode.c | 174 +----
+ drivers/acpi/acpica/psopinfo.c | 223 ++++++
+ drivers/acpi/acpica/psparse.c | 2 +-
+ drivers/acpi/acpica/psscope.c | 2 +-
+ drivers/acpi/acpica/pstree.c | 2 +-
+ drivers/acpi/acpica/psutils.c | 10 +-
+ drivers/acpi/acpica/pswalk.c | 2 +-
+ drivers/acpi/acpica/psxface.c | 2 +-
+ drivers/acpi/acpica/rsaddr.c | 2 +-
+ drivers/acpi/acpica/rscalc.c | 8 +-
+ drivers/acpi/acpica/rscreate.c | 9 +-
+ drivers/acpi/acpica/rsdump.c | 424 +----------
+ drivers/acpi/acpica/rsdumpinfo.c | 454 +++++++++++
+ drivers/acpi/acpica/rsinfo.c | 2 +-
+ drivers/acpi/acpica/rsio.c | 2 +-
+ drivers/acpi/acpica/rsirq.c | 40 +-
+ drivers/acpi/acpica/rslist.c | 9 +-
+ drivers/acpi/acpica/rsmemory.c | 8 +-
+ drivers/acpi/acpica/rsmisc.c | 76 +-
+ drivers/acpi/acpica/rsserial.c | 10 +-
+ drivers/acpi/acpica/rsutils.c | 14 +-
+ drivers/acpi/acpica/rsxface.c | 107 ++-
+ drivers/acpi/acpica/tbfadt.c | 7 +-
+ drivers/acpi/acpica/tbfind.c | 2 +-
+ drivers/acpi/acpica/tbinstal.c | 2 +-
+ drivers/acpi/acpica/tbutils.c | 4 +-
+ drivers/acpi/acpica/tbxface.c | 7 +-
+ drivers/acpi/acpica/tbxfload.c | 4 +-
+ drivers/acpi/acpica/tbxfroot.c | 2 +-
+ drivers/acpi/acpica/utaddress.c | 6 +-
+ drivers/acpi/acpica/utalloc.c | 2 +-
+ drivers/acpi/acpica/utcache.c | 2 +-
+ drivers/acpi/acpica/utcopy.c | 6 +-
+ drivers/acpi/acpica/utdebug.c | 120 ++-
+ drivers/acpi/acpica/utdecode.c | 2 +-
+ drivers/acpi/acpica/utdelete.c | 70 +-
+ drivers/acpi/acpica/uteval.c | 4 +-
+ drivers/acpi/acpica/utexcep.c | 2 +-
+ drivers/acpi/acpica/utglobal.c | 11 +-
+ drivers/acpi/acpica/utids.c | 2 +-
+ drivers/acpi/acpica/utinit.c | 2 +-
+ drivers/acpi/acpica/utlock.c | 16 +-
+ drivers/acpi/acpica/utmath.c | 2 +-
+ drivers/acpi/acpica/utmisc.c | 830 ++-------------------
+ drivers/acpi/acpica/utmutex.c | 2 +-
+ drivers/acpi/acpica/utobject.c | 4 +-
+ drivers/acpi/acpica/utosi.c | 2 +-
+ drivers/acpi/acpica/utownerid.c | 218 ++++++
+ drivers/acpi/acpica/utresrc.c | 83 ++-
+ drivers/acpi/acpica/utstate.c | 42 +-
+ drivers/acpi/acpica/utstring.c | 574 ++++++++++++++
+ drivers/acpi/acpica/uttrack.c | 18 +-
+ drivers/acpi/acpica/utxface.c | 6 +-
+ drivers/acpi/acpica/utxferror.c | 6 +-
+ drivers/acpi/acpica/utxfinit.c | 2 +-
+ drivers/acpi/acpica/utxfmutex.c | 2 +-
+ drivers/acpi/battery.c | 2 +-
+ drivers/acpi/bus.c | 270 -------
+ drivers/acpi/button.c | 4 +-
+ drivers/acpi/container.c | 180 ++---
+ drivers/acpi/csrt.c | 159 ++++
+ drivers/acpi/custom_method.c | 2 +-
+ drivers/acpi/device_pm.c | 357 ++++++++-
+ drivers/acpi/dock.c | 29 +-
+ drivers/acpi/ec.c | 2 +-
+ drivers/acpi/fan.c | 4 +-
+ drivers/acpi/glue.c | 35 +-
+ drivers/acpi/hed.c | 2 +-
+ drivers/acpi/internal.h | 32 +-
+ drivers/acpi/numa.c | 8 +-
+ drivers/acpi/osl.c | 2 +-
+ drivers/acpi/pci_link.c | 47 +-
+ drivers/acpi/pci_root.c | 38 +-
+ drivers/acpi/pci_slot.c | 7 +-
+ drivers/acpi/power.c | 730 +++++++++---------
+ drivers/acpi/proc.c | 9 +-
+ drivers/acpi/processor_driver.c | 30 +-
+ drivers/acpi/processor_idle.c | 48 +-
+ drivers/acpi/sbs.c | 6 +-
+ drivers/acpi/sbshc.c | 4 +-
+ drivers/acpi/scan.c | 725 ++++++++++--------
+ drivers/acpi/sleep.c | 97 ++-
+ drivers/acpi/sleep.h | 2 +
+ drivers/acpi/sysfs.c | 2 +-
+ drivers/acpi/tables.c | 6 +-
+ drivers/acpi/thermal.c | 10 +-
+ drivers/acpi/video.c | 8 +-
+ drivers/ata/libata-acpi.c | 18 +-
+ drivers/base/power/domain.c | 3 +-
+ drivers/base/power/opp.c | 19 +-
+ drivers/base/power/wakeup.c | 6 +
+ drivers/char/hpet.c | 2 +-
+ drivers/char/sonypi.c | 2 +-
+ drivers/clk/Makefile | 1 +
+ drivers/clk/clk-highbank.c | 2 +
+ drivers/clk/mvebu/clk-gating-ctrl.c | 1 +
+ 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 | 86 +++
+ drivers/cpufreq/Kconfig | 2 +-
+ drivers/cpufreq/Kconfig.arm | 30 +
+ drivers/cpufreq/Kconfig.x86 | 13 +
+ drivers/cpufreq/Makefile | 11 +-
+ drivers/cpufreq/acpi-cpufreq.c | 8 +-
+ drivers/cpufreq/cpufreq-cpu0.c | 42 +-
+ drivers/cpufreq/cpufreq.c | 460 ++++++------
+ drivers/cpufreq/cpufreq_conservative.c | 19 +-
+ drivers/cpufreq/cpufreq_governor.c | 131 ++--
+ drivers/cpufreq/cpufreq_governor.h | 6 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 70 +-
+ drivers/cpufreq/cpufreq_stats.c | 49 +-
+ drivers/cpufreq/cpufreq_userspace.c | 2 -
+ drivers/cpufreq/db8500-cpufreq.c | 4 +-
+ drivers/cpufreq/exynos-cpufreq.c | 188 +++--
+ drivers/cpufreq/exynos4210-cpufreq.c | 152 +---
+ drivers/cpufreq/exynos4x12-cpufreq.c | 388 ++--------
+ drivers/cpufreq/exynos5250-cpufreq.c | 178 +----
+ drivers/cpufreq/freq_table.c | 15 +-
+ drivers/cpufreq/highbank-cpufreq.c | 120 +++
+ drivers/cpufreq/imx6q-cpufreq.c | 336 +++++++++
+ drivers/cpufreq/intel_pstate.c | 823 ++++++++++++++++++++
+ drivers/cpufreq/kirkwood-cpufreq.c | 259 +++++++
+ drivers/cpufreq/maple-cpufreq.c | 2 +-
+ drivers/cpufreq/omap-cpufreq.c | 4 +-
+ drivers/cpufreq/powernow-k8.c | 46 +-
+ drivers/cpufreq/spear-cpufreq.c | 12 +-
+ drivers/cpuidle/cpuidle.c | 2 -
+ drivers/hwmon/acpi_power_meter.c | 2 +-
+ drivers/hwmon/asus_atk0110.c | 4 +-
+ drivers/i2c/busses/i2c-scmi.c | 2 +-
+ drivers/idle/intel_idle.c | 278 ++++---
+ drivers/input/misc/atlas_btns.c | 2 +-
+ drivers/mailbox/Kconfig | 19 +
+ drivers/mailbox/Makefile | 1 +
+ drivers/mailbox/pl320-ipc.c | 199 +++++
+ drivers/pci/hotplug/acpiphp_glue.c | 16 +-
+ drivers/pci/hotplug/sgi_hotplug.c | 5 +-
+ drivers/pci/pci-acpi.c | 2 -
+ drivers/platform/x86/asus-laptop.c | 2 +-
+ drivers/platform/x86/classmate-laptop.c | 10 +-
+ drivers/platform/x86/eeepc-laptop.c | 2 +-
+ drivers/platform/x86/fujitsu-laptop.c | 4 +-
+ drivers/platform/x86/fujitsu-tablet.c | 2 +-
+ drivers/platform/x86/hp_accel.c | 2 +-
+ drivers/platform/x86/ideapad-laptop.c | 2 +-
+ drivers/platform/x86/intel_menlow.c | 2 +-
+ drivers/platform/x86/panasonic-laptop.c | 4 +-
+ drivers/platform/x86/sony-laptop.c | 4 +-
+ drivers/platform/x86/topstar-laptop.c | 2 +-
+ drivers/platform/x86/toshiba_acpi.c | 4 +-
+ drivers/platform/x86/toshiba_bluetooth.c | 4 +-
+ drivers/platform/x86/wmi.c | 4 +-
+ drivers/platform/x86/xo15-ebook.c | 2 +-
+ drivers/pnp/pnpacpi/core.c | 10 +-
+ drivers/pnp/pnpbios/Kconfig | 4 +-
+ drivers/staging/quickstart/quickstart.c | 2 +-
+ drivers/video/backlight/apple_bl.c | 2 +-
+ drivers/xen/xen-acpi-pad.c | 3 +-
+ fs/sysfs/group.c | 42 ++
+ fs/sysfs/symlink.c | 45 +-
+ fs/sysfs/sysfs.h | 2 +
+ include/acpi/acbuffer.h | 2 +-
+ include/acpi/acconfig.h | 27 +-
+ include/acpi/acexcep.h | 2 +-
+ include/acpi/acnames.h | 2 +-
+ include/acpi/acoutput.h | 159 +++-
+ include/acpi/acpi.h | 2 +-
+ include/acpi/acpi_bus.h | 77 +-
+ include/acpi/acpiosxf.h | 13 +-
+ include/acpi/acpixf.h | 68 +-
+ include/acpi/acrestyp.h | 17 +-
+ include/acpi/actbl.h | 9 +-
+ include/acpi/actbl1.h | 8 +-
+ include/acpi/actbl2.h | 25 +-
+ include/acpi/actbl3.h | 34 +-
+ include/acpi/actypes.h | 38 +-
+ include/acpi/container.h | 12 -
+ include/acpi/platform/acenv.h | 319 ++++----
+ include/acpi/platform/acgcc.h | 6 +-
+ include/acpi/platform/aclinux.h | 3 +-
+ include/linux/acpi.h | 20 +-
+ include/linux/cpufreq.h | 34 +-
+ include/linux/cpuidle.h | 22 -
+ include/linux/freezer.h | 5 +
+ include/linux/mailbox.h | 17 +
+ include/linux/pm.h | 1 -
+ include/linux/pm_runtime.h | 7 +
+ include/linux/suspend.h | 6 +-
+ include/linux/sysfs.h | 16 +
+ include/trace/events/power.h | 92 ---
+ kernel/power/autosleep.c | 2 +-
+ kernel/power/main.c | 29 +-
+ kernel/power/process.c | 4 +-
+ kernel/power/qos.c | 9 +-
+ kernel/power/suspend.c | 69 +-
+ kernel/trace/Kconfig | 15 -
+ kernel/trace/power-traces.c | 3 -
+ tools/power/acpi/Makefile | 2 +-
+ tools/power/x86/turbostat/turbostat.8 | 36 +-
+ tools/power/x86/turbostat/turbostat.c | 48 +-
+ 369 files changed, 10483 insertions(+), 7532 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-power_resources_D0
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-power_resources_D1
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-power_resources_D2
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-power_resources_D3hot
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-power_state
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-real_power_state
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-resource_in_use
+ create mode 100644 Documentation/acpi/scan_handlers.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/kirkwood.txt
+ create mode 100644 drivers/acpi/acpica/evhandler.c
+ create mode 100644 drivers/acpi/acpica/nsprepkg.c
+ create mode 100644 drivers/acpi/acpica/psobject.c
+ create mode 100644 drivers/acpi/acpica/psopinfo.c
+ create mode 100644 drivers/acpi/acpica/rsdumpinfo.c
+ create mode 100644 drivers/acpi/acpica/utownerid.c
+ create mode 100644 drivers/acpi/acpica/utstring.c
+ create mode 100644 drivers/acpi/csrt.c
+ create mode 100644 drivers/clk/x86/Makefile
+ create mode 100644 drivers/clk/x86/clk-lpss.c
+ create mode 100644 drivers/clk/x86/clk-lpss.h
+ create mode 100644 drivers/clk/x86/clk-lpt.c
+ create mode 100644 drivers/cpufreq/highbank-cpufreq.c
+ create mode 100644 drivers/cpufreq/imx6q-cpufreq.c
+ create mode 100644 drivers/cpufreq/intel_pstate.c
+ create mode 100644 drivers/cpufreq/kirkwood-cpufreq.c
+ create mode 100644 drivers/mailbox/Kconfig
+ create mode 100644 drivers/mailbox/Makefile
+ create mode 100644 drivers/mailbox/pl320-ipc.c
+ delete mode 100644 include/acpi/container.h
+ create mode 100644 include/linux/mailbox.h
+Merging idle/next (ca62cf5 Merge branch 'misc' into release)
+$ git merge idle/next
+Already up-to-date.
+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 (9d185d0 Thermal: rename thermal governor Kconfig option to avoid generic naming)
+$ git merge thermal/next
+Resolved 'drivers/thermal/exynos_thermal.c' using previous resolution.
+Auto-merging drivers/thermal/exynos_thermal.c
+CONFLICT (content): Merge conflict in drivers/thermal/exynos_thermal.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5f05e79] Merge remote-tracking branch 'thermal/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/thermal/dove-thermal.txt | 18 +
+ .../bindings/thermal/kirkwood-thermal.txt | 15 +
+ .../devicetree/bindings/thermal/rcar-thermal.txt | 29 +
+ Documentation/thermal/exynos_thermal_emulation | 53 ++
+ Documentation/thermal/intel_powerclamp.txt | 307 ++++++++
+ Documentation/thermal/sysfs-api.txt | 18 +-
+ arch/x86/kernel/nmi.c | 1 +
+ drivers/thermal/Kconfig | 55 +-
+ drivers/thermal/Makefile | 10 +-
+ drivers/thermal/cpu_cooling.c | 4 +-
+ drivers/thermal/db8500_cpufreq_cooling.c | 5 +-
+ drivers/thermal/db8500_thermal.c | 4 +-
+ drivers/thermal/dove_thermal.c | 209 ++++++
+ drivers/thermal/exynos_thermal.c | 211 ++++--
+ drivers/thermal/intel_powerclamp.c | 794 +++++++++++++++++++++
+ drivers/thermal/kirkwood_thermal.c | 134 ++++
+ drivers/thermal/rcar_thermal.c | 490 +++++++++----
+ drivers/thermal/spear_thermal.c | 7 +-
+ drivers/thermal/step_wise.c | 122 ++--
+ drivers/thermal/thermal_sys.c | 104 ++-
+ include/linux/platform_data/exynos_thermal.h | 3 +
+ include/linux/thermal.h | 10 +-
+ kernel/time/tick-sched.c | 2 +
+ 23 files changed, 2336 insertions(+), 269 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/rcar-thermal.txt
+ create mode 100644 Documentation/thermal/exynos_thermal_emulation
+ create mode 100644 Documentation/thermal/intel_powerclamp.txt
+ create mode 100644 drivers/thermal/dove_thermal.c
+ create mode 100644 drivers/thermal/intel_powerclamp.c
+ create mode 100644 drivers/thermal/kirkwood_thermal.c
+Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast())
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (eab7377 UBI: embed ubi_debug_info field in ubi_device struct)
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/dlm_internal.h | 3 +++
+ fs/dlm/lock.c | 15 +++++++++++++++
+ 2 files changed, 18 insertions(+)
+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 (52cb5cb [SCSI] fnic: Fnic Trace Utility)
+$ git merge scsi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 +-
+ drivers/scsi/aacraid/aacraid.h | 8 +-
+ drivers/scsi/aacraid/comminit.c | 11 +-
+ drivers/scsi/bfa/bfad.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc.h | 27 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 21 +-
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 29 +-
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 8 +-
+ drivers/scsi/bnx2fc/bnx2fc_tgt.c | 95 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
+ drivers/scsi/csiostor/csio_hw.c | 15 +-
+ drivers/scsi/csiostor/csio_init.c | 9 +-
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 +
+ drivers/scsi/fnic/Makefile | 2 +
+ drivers/scsi/fnic/fnic.h | 60 ++
+ drivers/scsi/fnic/fnic_debugfs.c | 312 +++++++
+ drivers/scsi/fnic/fnic_fcs.c | 6 +-
+ drivers/scsi/fnic/fnic_io.h | 6 +-
+ drivers/scsi/fnic/fnic_main.c | 17 +
+ drivers/scsi/fnic/fnic_scsi.c | 724 +++++++++++++--
+ drivers/scsi/fnic/fnic_trace.c | 264 ++++++
+ drivers/scsi/fnic/fnic_trace.h | 80 ++
+ drivers/scsi/gdth.c | 10 +-
+ drivers/scsi/ipr.c | 1296 ++++++++++++++++++++-------
+ drivers/scsi/ipr.h | 101 ++-
+ drivers/scsi/lpfc/lpfc.h | 17 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 51 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 4 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 37 +-
+ drivers/scsi/lpfc/lpfc_els.c | 25 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 2 +
+ drivers/scsi/lpfc/lpfc_hw4.h | 176 ++--
+ drivers/scsi/lpfc/lpfc_init.c | 251 ++----
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 10 +
+ drivers/scsi/lpfc/lpfc_scsi.c | 24 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 378 ++++++--
+ drivers/scsi/lpfc/lpfc_sli4.h | 8 +
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 19 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 1 +
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 1 -
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 -
+ drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 1 -
+ drivers/scsi/qla4xxx/ql4_83xx.c | 55 +-
+ drivers/scsi/qla4xxx/ql4_attr.c | 16 +-
+ drivers/scsi/qla4xxx/ql4_def.h | 10 +-
+ drivers/scsi/qla4xxx/ql4_fw.h | 6 +-
+ drivers/scsi/qla4xxx/ql4_glbl.h | 6 +-
+ drivers/scsi/qla4xxx/ql4_init.c | 17 +-
+ drivers/scsi/qla4xxx/ql4_iocb.c | 2 +-
+ drivers/scsi/qla4xxx/ql4_isr.c | 68 +-
+ drivers/scsi/qla4xxx/ql4_mbx.c | 61 +-
+ drivers/scsi/qla4xxx/ql4_nx.c | 14 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 160 ++--
+ drivers/scsi/qla4xxx/ql4_version.h | 2 +-
+ drivers/scsi/scsi_transport_iscsi.c | 12 +
+ 58 files changed, 3581 insertions(+), 979 deletions(-)
+ create mode 100644 drivers/scsi/fnic/fnic_debugfs.c
+ create mode 100644 drivers/scsi/fnic/fnic_trace.c
+ create mode 100644 drivers/scsi/fnic/fnic_trace.h
+Merging target-updates/for-next (71f41fe target: Fix parameter list length checking in MODE SELECT)
+$ git merge target-updates/for-next
+Merge made by the 'recursive' strategy.
+ drivers/target/iscsi/iscsi_target_parameters.c | 8 +-
+ drivers/target/iscsi/iscsi_target_stat.c | 25 ++-
+ drivers/target/target_core_configfs.c | 4 +
+ drivers/target/target_core_device.c | 45 ++++
+ drivers/target/target_core_iblock.c | 42 +++-
+ drivers/target/target_core_internal.h | 1 +
+ drivers/target/target_core_rd.c | 18 +-
+ drivers/target/target_core_sbc.c | 2 +-
+ drivers/target/target_core_spc.c | 42 +++-
+ drivers/target/target_core_tmr.c | 12 --
+ drivers/target/target_core_transport.c | 19 +-
+ drivers/vhost/tcm_vhost.c | 287 ++++++++++++++-----------
+ drivers/vhost/tcm_vhost.h | 8 +-
+ include/target/target_core_backend.h | 3 +
+ include/target/target_core_base.h | 7 +-
+ 15 files changed, 346 insertions(+), 177 deletions(-)
+Merging target-merge/for-next-merge (d1c3ed6 Linux 3.8-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging slave-dma/next (42cf209 ARM: dts: pl330: Add #dma-cells for generic dma binding support)
+$ git merge slave-dma/next
+Resolved 'drivers/dma/ioat/dma_v3.c' using previous resolution.
+Resolved 'drivers/dma/tegra20-apb-dma.c' using previous resolution.
+Auto-merging net/ipv4/tcp.c
+Auto-merging include/linux/amba/pl080.h
+Auto-merging drivers/mtd/nand/fsmc_nand.c
+Auto-merging drivers/dma/tegra20-apb-dma.c
+CONFLICT (content): Merge conflict in drivers/dma/tegra20-apb-dma.c
+Auto-merging drivers/dma/sirf-dma.c
+Auto-merging drivers/dma/sh/shdma.c
+Auto-merging drivers/dma/pl330.c
+Auto-merging drivers/dma/pch_dma.c
+Auto-merging drivers/dma/mv_xor.c
+Auto-merging drivers/dma/mmp_pdma.c
+Auto-merging drivers/dma/iop-adma.c
+Auto-merging drivers/dma/ioat/pci.c
+Auto-merging drivers/dma/ioat/dma_v3.c
+CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
+Auto-merging drivers/dma/ioat/dma_v2.c
+Auto-merging drivers/dma/ioat/dma.h
+Auto-merging drivers/dma/ioat/dma.c
+Auto-merging drivers/dma/edma.c
+Auto-merging drivers/dma/dw_dmac.c
+Auto-merging drivers/dma/Makefile
+Auto-merging drivers/dma/Kconfig
+Auto-merging arch/arm/boot/dts/exynos5250.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5457f59] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/dma/arm-pl330.txt | 21 +-
+ Documentation/devicetree/bindings/dma/dma.txt | 81 ++++
+ Documentation/devicetree/bindings/dma/snps-dma.txt | 44 ++
+ arch/arm/boot/dts/exynos5250.dtsi | 12 +
+ arch/arm/boot/dts/spear1340.dtsi | 19 +
+ arch/arm/boot/dts/spear13xx.dtsi | 38 ++
+ arch/arm/mach-s3c64xx/dma.c | 2 +-
+ arch/arm/mach-spear13xx/include/mach/spear.h | 2 -
+ arch/arm/mach-spear13xx/spear1310.c | 5 +-
+ arch/arm/mach-spear13xx/spear1340.c | 33 +-
+ arch/arm/mach-spear13xx/spear13xx.c | 55 +--
+ arch/arm/mach-spear3xx/spear3xx.c | 1 -
+ arch/arm/mach-spear6xx/spear6xx.c | 2 +-
+ crypto/async_tx/async_memcpy.c | 6 +
+ crypto/async_tx/async_memset.c | 1 +
+ crypto/async_tx/async_tx.c | 9 +-
+ crypto/async_tx/async_xor.c | 4 +-
+ drivers/dca/dca-core.c | 5 +
+ drivers/dma/Kconfig | 11 +-
+ drivers/dma/Makefile | 2 +
+ drivers/dma/amba-pl08x.c | 10 +-
+ drivers/dma/at_hdmac.c | 10 +-
+ drivers/dma/at_hdmac_regs.h | 8 +-
+ drivers/dma/coh901318.c | 4 +-
+ drivers/dma/coh901318_lli.c | 2 +-
+ drivers/dma/dmaengine.c | 21 +-
+ drivers/dma/dmatest.c | 22 +-
+ drivers/dma/dw_dmac.c | 523 +++++++++++++++------
+ drivers/dma/dw_dmac_regs.h | 27 +-
+ drivers/dma/edma.c | 61 +--
+ drivers/dma/ep93xx_dma.c | 3 +-
+ drivers/dma/ioat/dma.c | 11 +-
+ drivers/dma/ioat/dma.h | 1 +
+ drivers/dma/ioat/dma_v2.c | 113 +++--
+ drivers/dma/ioat/dma_v3.c | 216 ++++++---
+ drivers/dma/ioat/hw.h | 11 +
+ drivers/dma/ioat/pci.c | 11 -
+ drivers/dma/iop-adma.c | 45 +-
+ drivers/dma/ipu/ipu_idmac.c | 2 +-
+ drivers/dma/ipu/ipu_irq.c | 1 -
+ drivers/dma/mmp_pdma.c | 6 +-
+ drivers/dma/mv_xor.c | 40 +-
+ drivers/dma/mxs-dma.c | 8 +-
+ drivers/dma/of-dma.c | 267 +++++++++++
+ drivers/dma/pch_dma.c | 13 +-
+ drivers/dma/pl330.c | 101 ++--
+ drivers/dma/sh/shdma-base.c | 3 -
+ drivers/dma/sh/shdma.c | 2 +-
+ drivers/dma/sirf-dma.c | 73 ++-
+ drivers/dma/ste_dma40.c | 491 ++++++++++++++-----
+ drivers/dma/ste_dma40_ll.c | 29 +-
+ drivers/dma/ste_dma40_ll.h | 130 ++++-
+ drivers/dma/tegra20-apb-dma.c | 55 ++-
+ drivers/misc/carma/carma-fpga-program.c | 2 +-
+ drivers/misc/carma/carma-fpga.c | 6 +-
+ drivers/mtd/nand/fsmc_nand.c | 22 +-
+ .../asm/hardware => include/linux/amba}/pl080.h | 2 +-
+ include/linux/dmaengine.h | 48 +-
+ include/linux/dw_dmac.h | 45 +-
+ include/linux/of_dma.h | 74 +++
+ include/linux/platform_data/dma-ste-dma40.h | 13 +
+ net/ipv4/tcp.c | 8 +-
+ 62 files changed, 2109 insertions(+), 784 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/dma.txt
+ create mode 100644 drivers/dma/of-dma.c
+ rename {arch/arm/include/asm/hardware => include/linux/amba}/pl080.h (99%)
+ create mode 100644 include/linux/of_dma.h
+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 1ef33859] Merge remote-tracking branch 'dmaengine/next'
+$ git diff -M --stat --summary HEAD^..
+Merging net-next/master (8064b3c ipv6: fix a sparse warning)
+$ git merge net-next/master
+Resolved 'arch/mips/include/uapi/asm/socket.h' using previous resolution.
+Removing net/wanrouter/wanproc.c
+Removing net/wanrouter/wanmain.c
+Removing net/wanrouter/patchlevel
+Removing net/wanrouter/Makefile
+Removing net/wanrouter/Kconfig
+Auto-merging net/netfilter/nf_conntrack_netlink.c
+Auto-merging net/netfilter/nf_conntrack_helper.c
+Auto-merging net/ipv6/xfrm6_policy.c
+Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/batman-adv/distributed-arp-table.c
+Auto-merging include/net/sock.h
+Removing include/linux/cycx_drv.h
+Removing include/linux/cyclomx.h
+Auto-merging drivers/s390/net/qeth_core.h
+Auto-merging drivers/net/xen-netback/interface.c
+Removing drivers/net/wan/cycx_x25.c
+Removing drivers/net/wan/cycx_main.c
+Removing drivers/net/wan/cycx_drv.c
+Auto-merging drivers/net/usb/cdc_ncm.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Removing drivers/net/ethernet/seeq/seeq8005.h
+Removing drivers/net/ethernet/seeq/seeq8005.c
+Removing drivers/net/ethernet/racal/ni5010.h
+Removing drivers/net/ethernet/racal/ni5010.c
+Removing drivers/net/ethernet/racal/Makefile
+Removing drivers/net/ethernet/racal/Kconfig
+Removing drivers/net/ethernet/natsemi/ibmlana.h
+Removing drivers/net/ethernet/natsemi/ibmlana.c
+Removing drivers/net/ethernet/i825xx/znet.c
+Removing drivers/net/ethernet/i825xx/ni52.h
+Removing drivers/net/ethernet/i825xx/ni52.c
+Removing drivers/net/ethernet/i825xx/lp486e.c
+Removing drivers/net/ethernet/i825xx/eexpress.h
+Removing drivers/net/ethernet/i825xx/eexpress.c
+Removing drivers/net/ethernet/i825xx/eepro.c
+Removing drivers/net/ethernet/i825xx/3c507.c
+Removing drivers/net/ethernet/i825xx/3c505.h
+Removing drivers/net/ethernet/i825xx/3c505.c
+Removing drivers/net/ethernet/fujitsu/eth16i.c
+Removing drivers/net/ethernet/fujitsu/at1700.c
+Auto-merging drivers/net/ethernet/freescale/fec_mpc52xx.c
+Removing drivers/net/ethernet/dlink/de620.h
+Removing drivers/net/ethernet/dlink/de620.c
+Removing drivers/net/ethernet/dlink/de600.h
+Removing drivers/net/ethernet/dlink/de600.c
+Removing drivers/net/ethernet/dec/ewrk3.h
+Removing drivers/net/ethernet/dec/ewrk3.c
+Auto-merging drivers/net/ethernet/cadence/macb.c
+Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+Removing drivers/net/ethernet/amd/depca.h
+Removing drivers/net/ethernet/amd/depca.c
+Removing drivers/net/ethernet/8390/smc-ultra32.c
+Removing drivers/net/ethernet/8390/ne3210.c
+Removing drivers/net/ethernet/8390/lne390.c
+Removing drivers/net/ethernet/8390/hp.c
+Removing drivers/net/ethernet/8390/hp-plus.c
+Removing drivers/net/ethernet/8390/es3210.c
+Removing drivers/net/ethernet/8390/e2100.c
+Removing drivers/net/ethernet/8390/ac3200.c
+Removing drivers/net/ethernet/8390/3c503.h
+Removing drivers/net/ethernet/8390/3c503.c
+Removing drivers/net/ethernet/3com/3c501.h
+Removing drivers/net/ethernet/3com/3c501.c
+Auto-merging arch/mips/include/uapi/asm/socket.h
+CONFLICT (content): Merge conflict in arch/mips/include/uapi/asm/socket.h
+Auto-merging MAINTAINERS
+Removing Documentation/networking/multicast.txt
+Removing Documentation/networking/ewrk3.txt
+Removing Documentation/networking/depca.txt
+Removing Documentation/networking/DLINK.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0948591] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/net/cpsw.txt | 2 +
+ Documentation/ioctl/ioctl-number.txt | 2 +-
+ Documentation/magic-number.txt | 2 +-
+ Documentation/networking/00-INDEX | 6 -
+ Documentation/networking/DLINK.txt | 203 --
+ Documentation/networking/LICENSE.qlcnic | 2 +-
+ Documentation/networking/cs89x0.txt | 79 -
+ Documentation/networking/depca.txt | 92 -
+ Documentation/networking/ewrk3.txt | 46 -
+ Documentation/networking/filter.txt | 11 +-
+ Documentation/networking/ip-sysctl.txt | 19 +-
+ Documentation/networking/multicast.txt | 63 -
+ Documentation/networking/netconsole.txt | 7 +-
+ Documentation/networking/nf_conntrack-sysctl.txt | 176 ++
+ Documentation/networking/operstates.txt | 4 +
+ Documentation/networking/phy.txt | 11 +-
+ Documentation/nfc/nfc-hci.txt | 129 +-
+ Documentation/nfc/nfc-pn544.txt | 84 +-
+ Documentation/zh_CN/magic-number.txt | 2 +-
+ MAINTAINERS | 12 -
+ arch/alpha/include/uapi/asm/socket.h | 3 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 10 +-
+ arch/avr32/include/uapi/asm/socket.h | 4 +-
+ arch/cris/include/uapi/asm/socket.h | 4 +-
+ arch/frv/include/uapi/asm/socket.h | 4 +-
+ arch/h8300/include/uapi/asm/socket.h | 4 +-
+ arch/ia64/include/uapi/asm/socket.h | 4 +-
+ arch/m32r/include/uapi/asm/socket.h | 4 +-
+ arch/mips/bcm47xx/serial.c | 2 +-
+ arch/mips/include/uapi/asm/socket.h | 5 +-
+ arch/mn10300/include/uapi/asm/socket.h | 4 +-
+ arch/parisc/include/uapi/asm/socket.h | 3 +-
+ arch/powerpc/include/uapi/asm/socket.h | 4 +-
+ arch/s390/include/uapi/asm/socket.h | 4 +-
+ arch/sparc/include/uapi/asm/socket.h | 3 +-
+ arch/um/drivers/net_kern.c | 26 +-
+ arch/um/include/shared/net_kern.h | 1 -
+ arch/x86/crypto/aesni-intel_glue.c | 37 -
+ arch/x86/net/bpf_jit_comp.c | 40 +-
+ arch/xtensa/include/uapi/asm/socket.h | 4 +-
+ crypto/ctr.c | 173 +-
+ crypto/tcrypt.c | 4 +
+ crypto/tcrypt.h | 1 +
+ drivers/bcma/bcma_private.h | 3 +
+ drivers/bcma/driver_chipcommon.c | 2 +-
+ drivers/bcma/driver_chipcommon_nflash.c | 4 +-
+ drivers/bcma/driver_chipcommon_pmu.c | 3 +-
+ drivers/bcma/driver_chipcommon_sflash.c | 4 +-
+ drivers/bcma/driver_gpio.c | 11 +
+ drivers/bcma/driver_mips.c | 195 +-
+ drivers/bcma/driver_pci_host.c | 62 +-
+ drivers/bcma/main.c | 12 +-
+ drivers/connector/connector.c | 4 +-
+ drivers/firewire/net.c | 14 +-
+ drivers/infiniband/hw/nes/nes.c | 8 +-
+ drivers/infiniband/hw/nes/nes_cm.c | 2 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 13 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 +-
+ drivers/isdn/divert/divert_init.c | 33 +-
+ drivers/isdn/divert/isdn_divert.c | 423 ++-
+ drivers/isdn/divert/isdn_divert.h | 28 +-
+ drivers/isdn/gigaset/common.c | 31 +-
+ drivers/isdn/gigaset/ev-layer.c | 124 +-
+ drivers/isdn/gigaset/gigaset.h | 9 +-
+ drivers/isdn/gigaset/interface.c | 46 +-
+ drivers/isdn/i4l/isdn_x25iface.h | 1 -
+ drivers/net/Space.c | 106 +-
+ drivers/net/bonding/bond_3ad.c | 30 +-
+ drivers/net/bonding/bond_alb.c | 6 +-
+ drivers/net/bonding/bond_main.c | 150 +-
+ drivers/net/bonding/bonding.h | 15 +-
+ drivers/net/caif/caif_shmcore.c | 6 -
+ drivers/net/can/Kconfig | 37 +-
+ drivers/net/can/Makefile | 2 +
+ drivers/net/can/at91_can.c | 10 +
+ drivers/net/can/c_can/Kconfig | 2 +-
+ drivers/net/can/c_can/c_can.c | 10 +
+ drivers/net/can/cc770/Kconfig | 2 +-
+ drivers/net/can/dev.c | 26 +-
+ drivers/net/can/flexcan.c | 11 +
+ drivers/net/can/led.c | 124 +
+ drivers/net/can/mcp251x.c | 23 +-
+ drivers/net/can/mscan/Kconfig | 2 +-
+ drivers/net/can/sja1000/Kconfig | 14 +-
+ drivers/net/can/sja1000/ems_pci.c | 1 -
+ drivers/net/can/sja1000/peak_pci.c | 5 +-
+ drivers/net/can/sja1000/peak_pcmcia.c | 1 -
+ drivers/net/can/sja1000/plx_pci.c | 1 -
+ drivers/net/can/sja1000/sja1000.c | 17 +-
+ drivers/net/can/slcan.c | 8 +-
+ drivers/net/can/softing/Kconfig | 2 +-
+ drivers/net/can/ti_hecc.c | 10 +
+ drivers/net/can/usb/Kconfig | 8 +-
+ drivers/net/can/usb/Makefile | 1 +
+ drivers/net/can/usb/ems_usb.c | 8 +-
+ drivers/net/can/usb/kvaser_usb.c | 2 -
+ drivers/net/can/usb/peak_usb/pcan_usb_core.c | 5 -
+ drivers/net/can/usb/usb_8dev.c | 1031 ++++++
+ drivers/net/cris/eth_v10.c | 8 +-
+ drivers/net/dsa/mv88e6060.c | 54 +-
+ drivers/net/dsa/mv88e6123_61_65.c | 125 +-
+ drivers/net/dsa/mv88e6131.c | 114 +-
+ drivers/net/dsa/mv88e6xxx.c | 141 +-
+ drivers/net/dsa/mv88e6xxx.h | 11 +-
+ drivers/net/dummy.c | 10 +
+ drivers/net/ethernet/3com/3c501.c | 896 ------
+ drivers/net/ethernet/3com/3c501.h | 91 -
+ drivers/net/ethernet/3com/3c509.c | 4 +-
+ drivers/net/ethernet/3com/3c515.c | 7 +-
+ drivers/net/ethernet/3com/3c59x.c | 1 -
+ drivers/net/ethernet/3com/Kconfig | 20 +-
+ drivers/net/ethernet/3com/Makefile | 1 -
+ drivers/net/ethernet/8390/3c503.c | 777 -----
+ drivers/net/ethernet/8390/3c503.h | 91 -
+ drivers/net/ethernet/8390/Kconfig | 119 +-
+ drivers/net/ethernet/8390/Makefile | 10 -
+ drivers/net/ethernet/8390/ac3200.c | 431 ---
+ drivers/net/ethernet/8390/ax88796.c | 8 +-
+ drivers/net/ethernet/8390/e2100.c | 489 ---
+ drivers/net/ethernet/8390/es3210.c | 445 ---
+ drivers/net/ethernet/8390/hp-plus.c | 505 ---
+ drivers/net/ethernet/8390/hp.c | 438 ---
+ drivers/net/ethernet/8390/lne390.c | 433 ---
+ drivers/net/ethernet/8390/ne2k-pci.c | 1 -
+ drivers/net/ethernet/8390/ne3210.c | 346 ---
+ drivers/net/ethernet/8390/smc-ultra32.c | 463 ---
+ drivers/net/ethernet/Kconfig | 1 -
+ drivers/net/ethernet/Makefile | 1 -
+ drivers/net/ethernet/adi/bfin_mac.c | 13 +-
+ drivers/net/ethernet/aeroflex/greth.c | 13 +-
+ drivers/net/ethernet/amd/Kconfig | 15 +-
+ drivers/net/ethernet/amd/Makefile | 1 -
+ drivers/net/ethernet/amd/au1000_eth.c | 12 +-
+ drivers/net/ethernet/amd/depca.c | 1910 ------------
+ drivers/net/ethernet/amd/depca.h | 183 --
+ drivers/net/ethernet/amd/pcnet32.c | 50 +-
+ drivers/net/ethernet/amd/sunlance.c | 4 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 10 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 3 -
+ drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 7 -
+ drivers/net/ethernet/atheros/atlx/atlx.c | 1 -
+ drivers/net/ethernet/broadcom/Kconfig | 18 +
+ drivers/net/ethernet/broadcom/Makefile | 1 +
+ drivers/net/ethernet/broadcom/b44.c | 6 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 17 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 1461 +++++++++
+ drivers/net/ethernet/broadcom/bgmac.h | 453 +++
+ drivers/net/ethernet/broadcom/bnx2.c | 1 -
+ drivers/net/ethernet/broadcom/bnx2x/Makefile | 3 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 174 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 993 ++++--
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 123 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 7 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 3274 +++++++++++++-------
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 456 ++-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 8 +-
+ .../ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 32 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 8 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 22 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1669 ++++++----
+ .../net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 58 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 203 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 30 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 3198 +++++++++++++++++++
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 809 +++++
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 134 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 13 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 1651 ++++++++++
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 360 +++
+ drivers/net/ethernet/broadcom/cnic.c | 10 +-
+ drivers/net/ethernet/broadcom/cnic_if.h | 1 +
+ drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 1099 ++++---
+ drivers/net/ethernet/broadcom/tg3.h | 65 +-
+ drivers/net/ethernet/cadence/macb.c | 2 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 1 -
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 28 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 42 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 92 +-
+ drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1 -
+ drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 1 -
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 23 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 6 +-
+ drivers/net/ethernet/cirrus/ep93xx_eth.c | 4 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 13 +-
+ drivers/net/ethernet/davicom/dm9000.c | 7 +-
+ drivers/net/ethernet/dec/Kconfig | 16 -
+ drivers/net/ethernet/dec/Makefile | 1 -
+ drivers/net/ethernet/dec/ewrk3.c | 1961 ------------
+ drivers/net/ethernet/dec/ewrk3.h | 322 --
+ drivers/net/ethernet/dlink/Kconfig | 32 +-
+ drivers/net/ethernet/dlink/Makefile | 2 -
+ drivers/net/ethernet/dlink/de600.c | 529 ----
+ drivers/net/ethernet/dlink/de600.h | 168 -
+ drivers/net/ethernet/dlink/de620.c | 987 ------
+ drivers/net/ethernet/dlink/de620.h | 117 -
+ drivers/net/ethernet/dlink/dl2k.c | 7 +-
+ drivers/net/ethernet/dlink/sundance.c | 1 -
+ drivers/net/ethernet/dnet.c | 4 +-
+ drivers/net/ethernet/emulex/benet/be.h | 2 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 46 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 20 +
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 12 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 164 +-
+ drivers/net/ethernet/ethoc.c | 63 +-
+ drivers/net/ethernet/faraday/ftgmac100.c | 9 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 6 +-
+ drivers/net/ethernet/freescale/Kconfig | 9 +-
+ drivers/net/ethernet/freescale/Makefile | 3 +-
+ drivers/net/ethernet/freescale/fec.c | 351 ++-
+ drivers/net/ethernet/freescale/fec.h | 23 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx.c | 62 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 4 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 4 +-
+ drivers/net/ethernet/freescale/gianfar.c | 252 +-
+ drivers/net/ethernet/freescale/gianfar.h | 210 +-
+ drivers/net/ethernet/freescale/gianfar_ethtool.c | 35 +-
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 8 +-
+ drivers/net/ethernet/fujitsu/Kconfig | 25 +-
+ drivers/net/ethernet/fujitsu/Makefile | 2 -
+ drivers/net/ethernet/fujitsu/at1700.c | 791 -----
+ drivers/net/ethernet/fujitsu/eth16i.c | 1483 ---------
+ drivers/net/ethernet/i825xx/3c505.c | 1671 ----------
+ drivers/net/ethernet/i825xx/3c505.h | 292 --
+ drivers/net/ethernet/i825xx/3c507.c | 938 ------
+ drivers/net/ethernet/i825xx/82596.c | 94 +-
+ drivers/net/ethernet/i825xx/Kconfig | 92 +-
+ drivers/net/ethernet/i825xx/Makefile | 8 -
+ drivers/net/ethernet/i825xx/eepro.c | 1822 -----------
+ drivers/net/ethernet/i825xx/eexpress.c | 1661 ----------
+ drivers/net/ethernet/i825xx/eexpress.h | 179 --
+ drivers/net/ethernet/i825xx/lp486e.c | 1337 --------
+ drivers/net/ethernet/i825xx/ni52.c | 1346 --------
+ drivers/net/ethernet/i825xx/ni52.h | 310 --
+ drivers/net/ethernet/i825xx/znet.c | 928 ------
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 12 +-
+ drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 19 +-
+ drivers/net/ethernet/ibm/emac/core.c | 9 +-
+ drivers/net/ethernet/ibm/emac/mal.c | 7 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 6 +-
+ drivers/net/ethernet/intel/Kconfig | 16 +-
+ drivers/net/ethernet/intel/e100.c | 3 +-
+ drivers/net/ethernet/intel/e1000/e1000.h | 65 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 140 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c | 558 ++--
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 339 +-
+ drivers/net/ethernet/intel/e1000/e1000_param.c | 29 +-
+ drivers/net/ethernet/intel/e1000e/80003es2lan.c | 117 +-
+ drivers/net/ethernet/intel/e1000e/80003es2lan.h | 95 +
+ drivers/net/ethernet/intel/e1000e/82571.c | 57 +-
+ drivers/net/ethernet/intel/e1000e/82571.h | 58 +
+ drivers/net/ethernet/intel/e1000e/Makefile | 4 +-
+ drivers/net/ethernet/intel/e1000e/defines.h | 186 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 280 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 252 +-
+ drivers/net/ethernet/intel/e1000e/hw.h | 367 +--
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 415 ++-
+ drivers/net/ethernet/intel/e1000e/ich8lan.h | 268 ++
+ drivers/net/ethernet/intel/e1000e/mac.c | 164 +-
+ drivers/net/ethernet/intel/e1000e/mac.h | 74 +
+ drivers/net/ethernet/intel/e1000e/manage.c | 15 +-
+ drivers/net/ethernet/intel/e1000e/manage.h | 72 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 699 ++++-
+ drivers/net/ethernet/intel/e1000e/nvm.c | 28 +-
+ drivers/net/ethernet/intel/e1000e/nvm.h | 47 +
+ drivers/net/ethernet/intel/e1000e/param.c | 8 +-
+ drivers/net/ethernet/intel/e1000e/phy.c | 354 +--
+ drivers/net/ethernet/intel/e1000e/phy.h | 242 ++
+ drivers/net/ethernet/intel/e1000e/ptp.c | 277 ++
+ drivers/net/ethernet/intel/e1000e/regs.h | 252 ++
+ drivers/net/ethernet/intel/igb/Makefile | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 630 ++--
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 19 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 15 +-
+ drivers/net/ethernet/intel/igb/e1000_hw.h | 22 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.c | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.h | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.h | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_mbx.c | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_mbx.h | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_nvm.c | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_nvm.h | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.h | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_regs.h | 18 +-
+ drivers/net/ethernet/intel/igb/igb.h | 69 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 +-
+ drivers/net/ethernet/intel/igb/igb_hwmon.c | 242 ++
+ drivers/net/ethernet/intel/igb/igb_main.c | 865 +++++-
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 65 +-
+ drivers/net/ethernet/intel/igbvf/igbvf.h | 2 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 87 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 13 +-
+ drivers/net/ethernet/intel/ixgbe/Makefile | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 82 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 59 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 57 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 65 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 320 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 13 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 23 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 410 +--
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 56 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 12 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 219 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 203 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 16 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 10 +-
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c | 1 +
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 56 +-
+ drivers/net/ethernet/korina.c | 6 +-
+ drivers/net/ethernet/lantiq_etop.c | 12 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 10 +-
+ drivers/net/ethernet/marvell/mvmdio.c | 1 -
+ drivers/net/ethernet/marvell/pxa168_eth.c | 11 +-
+ drivers/net/ethernet/marvell/skge.c | 6 +-
+ drivers/net/ethernet/marvell/sky2.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 174 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 26 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 869 ++++--
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 59 +-
+ drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 3 +
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 24 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.h | 1 -
+ drivers/net/ethernet/mellanox/mlx4/main.c | 32 +-
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 19 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 38 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 193 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +-
+ drivers/net/ethernet/micrel/ks8842.c | 1 -
+ drivers/net/ethernet/micrel/ks8851.c | 44 +-
+ drivers/net/ethernet/micrel/ks8851_mll.c | 1 -
+ drivers/net/ethernet/microchip/enc28j60.c | 1 -
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 5 +-
+ drivers/net/ethernet/natsemi/ibmlana.c | 1075 -------
+ drivers/net/ethernet/natsemi/ibmlana.h | 278 --
+ drivers/net/ethernet/natsemi/natsemi.c | 3 -
+ drivers/net/ethernet/neterion/s2io.c | 1 -
+ drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 6 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 -
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 4 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 4 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 9 +-
+ drivers/net/ethernet/octeon/octeon_mgmt.c | 14 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 7 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 7 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 5 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 18 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 28 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 8 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 11 +-
+ drivers/net/ethernet/qlogic/qlcnic/Makefile | 4 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 539 +++-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2919 +++++++++++++++++
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 434 +++
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2054 ++++++++++++
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 225 ++
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 707 +++--
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 550 ++--
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h | 108 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 231 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 194 ++
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 97 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 690 ++++-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1166 ++++---
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 650 +++-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 271 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 24 +-
+ drivers/net/ethernet/racal/Kconfig | 33 -
+ drivers/net/ethernet/racal/Makefile | 5 -
+ drivers/net/ethernet/racal/ni5010.c | 771 -----
+ drivers/net/ethernet/racal/ni5010.h | 144 -
+ drivers/net/ethernet/rdc/r6040.c | 14 +-
+ drivers/net/ethernet/realtek/8139cp.c | 1 -
+ drivers/net/ethernet/realtek/8139too.c | 1 -
+ drivers/net/ethernet/realtek/r8169.c | 14 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 12 +-
+ drivers/net/ethernet/s6gmac.c | 2 +-
+ drivers/net/ethernet/seeq/Kconfig | 11 -
+ drivers/net/ethernet/seeq/Makefile | 1 -
+ drivers/net/ethernet/seeq/seeq8005.c | 749 -----
+ drivers/net/ethernet/seeq/seeq8005.h | 156 -
+ drivers/net/ethernet/sfc/ptp.c | 2 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 6 +-
+ drivers/net/ethernet/silan/sc92031.c | 12 +-
+ drivers/net/ethernet/sis/sis900.c | 22 +-
+ drivers/net/ethernet/smsc/smc911x.c | 9 +-
+ drivers/net/ethernet/smsc/smc91x.c | 7 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 6 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 11 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 3 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 +
+ drivers/net/ethernet/sun/niu.c | 48 +-
+ drivers/net/ethernet/sun/sunbmac.c | 4 +-
+ drivers/net/ethernet/sun/sunqe.c | 7 +-
+ drivers/net/ethernet/sun/sunvnet.c | 6 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 8 +-
+ drivers/net/ethernet/ti/cpmac.c | 11 +-
+ drivers/net/ethernet/ti/cpsw.c | 530 +++-
+ drivers/net/ethernet/ti/cpsw_ale.c | 107 +-
+ drivers/net/ethernet/ti/cpsw_ale.h | 24 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 74 +-
+ drivers/net/ethernet/ti/davinci_cpdma.h | 12 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 26 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 4 +-
+ drivers/net/ethernet/tile/tilepro.c | 1 -
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +-
+ drivers/net/ethernet/toshiba/spider_net_ethtool.c | 12 +-
+ drivers/net/ethernet/toshiba/tc35815.c | 13 +-
+ drivers/net/ethernet/via/via-rhine.c | 48 +-
+ drivers/net/ethernet/wiznet/w5100.c | 1 -
+ drivers/net/ethernet/wiznet/w5300.c | 1 -
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 37 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 5 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 3 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 7 +-
+ drivers/net/hamradio/bpqether.c | 5 +-
+ drivers/net/hamradio/dmascc.c | 7 +-
+ drivers/net/hamradio/scc.c | 4 +-
+ drivers/net/hamradio/yam.c | 4 +-
+ drivers/net/hyperv/netvsc_drv.c | 6 +-
+ drivers/net/ieee802154/at86rf230.c | 12 -
+ drivers/net/ieee802154/fakehard.c | 1 -
+ drivers/net/ifb.c | 2 +-
+ drivers/net/macvlan.c | 51 +-
+ drivers/net/macvtap.c | 1 +
+ drivers/net/netconsole.c | 44 +-
+ drivers/net/phy/micrel.c | 64 +-
+ drivers/net/phy/phy_device.c | 15 +-
+ drivers/net/phy/realtek.c | 50 +-
+ drivers/net/phy/spi_ks8995.c | 4 +-
+ drivers/net/ppp/ppp_generic.c | 3 +-
+ drivers/net/ppp/pppoe.c | 4 +-
+ drivers/net/rionet.c | 8 +-
+ drivers/net/team/team.c | 261 +-
+ drivers/net/team/team_mode_activebackup.c | 13 +-
+ drivers/net/tun.c | 1 +
+ drivers/net/usb/asix.h | 18 +-
+ drivers/net/usb/asix_common.c | 94 +-
+ drivers/net/usb/asix_devices.c | 51 +-
+ drivers/net/usb/ax88172a.c | 19 +-
+ drivers/net/usb/catc.c | 6 +-
+ drivers/net/usb/cdc_ncm.c | 6 +-
+ drivers/net/usb/dm9601.c | 4 +-
+ drivers/net/usb/hso.c | 25 +-
+ drivers/net/usb/kalmia.c | 1 -
+ drivers/net/usb/pegasus.c | 19 +-
+ drivers/net/usb/rndis_host.c | 1 -
+ drivers/net/usb/rtl8150.c | 6 +-
+ drivers/net/usb/sierra_net.c | 14 +-
+ drivers/net/usb/smsc75xx.c | 6 +-
+ drivers/net/usb/smsc95xx.c | 441 ++-
+ drivers/net/usb/usbnet.c | 5 +-
+ drivers/net/veth.c | 177 +-
+ drivers/net/virtio_net.c | 115 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 227 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 15 +-
+ drivers/net/vmxnet3/vmxnet3_int.h | 3 -
+ drivers/net/vxlan.c | 18 +-
+ drivers/net/wan/Kconfig | 54 -
+ drivers/net/wan/Makefile | 5 -
+ drivers/net/wan/cosa.c | 9 +-
+ drivers/net/wan/cycx_drv.c | 569 ----
+ drivers/net/wan/cycx_main.c | 346 ---
+ drivers/net/wan/cycx_x25.c | 1602 ----------
+ drivers/net/wan/farsync.c | 6 +-
+ drivers/net/wan/hdlc.c | 9 +-
+ drivers/net/wan/x25_asy.c | 1 -
+ drivers/net/wimax/i2400m/fw.c | 1 -
+ drivers/net/wimax/i2400m/netdev.c | 10 +-
+ drivers/net/wimax/i2400m/rx.c | 17 +-
+ drivers/net/wimax/i2400m/usb-notif.c | 1 -
+ drivers/net/wimax/i2400m/usb.c | 6 +-
+ drivers/net/wireless/airo_cs.c | 5 +-
+ drivers/net/wireless/at76c50x-usb.c | 4 +-
+ drivers/net/wireless/ath/ath5k/base.c | 5 +-
+ drivers/net/wireless/ath/ath5k/phy.c | 4 +
+ drivers/net/wireless/ath/ath5k/reset.c | 2 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 133 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.h | 2 -
+ drivers/net/wireless/ath/ath6kl/core.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/htc_pipe.c | 26 +-
+ drivers/net/wireless/ath/ath6kl/init.c | 36 +-
+ drivers/net/wireless/ath/ath6kl/usb.c | 6 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 30 +-
+ drivers/net/wireless/ath/ath6kl/wmi.h | 6 +
+ drivers/net/wireless/ath/ath9k/Kconfig | 1 +
+ drivers/net/wireless/ath/ath9k/ahb.c | 22 +-
+ drivers/net/wireless/ath/ath9k/ani.c | 33 +-
+ drivers/net/wireless/ath/ath9k/ani.h | 8 -
+ drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 8 +-
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 50 +-
+ drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 23 +-
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 66 +-
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 180 ++
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 143 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 128 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 69 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 95 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 100 +
+ drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 146 +
+ .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 132 +-
+ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 76 +
+ drivers/net/wireless/ath/ath9k/ath9k.h | 166 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 115 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 304 ++
+ drivers/net/wireless/ath/ath9k/debug.h | 7 +
+ .../net/wireless/ath/ath9k/dfs_pattern_detector.c | 6 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 10 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 11 +-
+ drivers/net/wireless/ath/ath9k/hw-ops.h | 16 -
+ drivers/net/wireless/ath/ath9k/hw.c | 55 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 58 +-
+ drivers/net/wireless/ath/ath9k/init.c | 123 +-
+ drivers/net/wireless/ath/ath9k/mac.c | 8 +-
+ drivers/net/wireless/ath/ath9k/mac.h | 3 +-
+ drivers/net/wireless/ath/ath9k/main.c | 149 +-
+ drivers/net/wireless/ath/ath9k/mci.c | 9 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 39 +-
+ drivers/net/wireless/ath/ath9k/rc.c | 14 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 151 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 7 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 150 +-
+ drivers/net/wireless/ath/carl9170/carl9170.h | 19 +-
+ drivers/net/wireless/ath/carl9170/fw.c | 37 +-
+ drivers/net/wireless/ath/carl9170/fwcmd.h | 8 +
+ drivers/net/wireless/ath/carl9170/hw.h | 2 +-
+ drivers/net/wireless/ath/carl9170/main.c | 115 +-
+ drivers/net/wireless/ath/carl9170/tx.c | 133 +-
+ drivers/net/wireless/ath/carl9170/version.h | 6 +-
+ drivers/net/wireless/ath/regd.c | 37 +-
+ drivers/net/wireless/ath/regd.h | 10 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 11 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c | 55 +-
+ drivers/net/wireless/ath/wil6210/main.c | 63 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 31 +-
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 4 +-
+ drivers/net/wireless/ath/wil6210/txrx.c | 109 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 22 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 119 +-
+ drivers/net/wireless/atmel_cs.c | 5 +-
+ drivers/net/wireless/b43/tables_nphy.c | 30 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +-
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 -
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 -
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 96 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 38 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 56 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 -
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 35 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 395 ++-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 54 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 11 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 6 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 7 +-
+ .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 66 +
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2277 ++++++++++++++
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 183 ++
+ .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 2 -
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 43 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 1463 ++++++---
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 113 +-
+ drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 7 +-
+ drivers/net/wireless/brcm80211/brcmsmac/channel.c | 16 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 12 +-
+ drivers/net/wireless/brcm80211/brcmsmac/main.c | 74 +-
+ drivers/net/wireless/brcm80211/brcmsmac/scb.h | 1 -
+ drivers/net/wireless/ipw2x00/ipw2100.c | 9 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 1 -
+ drivers/net/wireless/iwlegacy/3945-mac.c | 96 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 105 +-
+ drivers/net/wireless/iwlegacy/4965-rs.c | 3 +-
+ drivers/net/wireless/iwlegacy/4965.c | 3 -
+ drivers/net/wireless/iwlegacy/commands.h | 3 +-
+ drivers/net/wireless/iwlegacy/common.c | 68 +-
+ drivers/net/wireless/iwlegacy/common.h | 2 +
+ drivers/net/wireless/iwlwifi/Kconfig | 14 +-
+ drivers/net/wireless/iwlwifi/Makefile | 3 +
+ drivers/net/wireless/iwlwifi/dvm/agn.h | 6 +-
+ drivers/net/wireless/iwlwifi/dvm/calib.c | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/calib.h | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/commands.h | 30 +-
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 6 +-
+ drivers/net/wireless/iwlwifi/dvm/dev.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/devices.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/led.c | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/led.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 183 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 55 +-
+ drivers/net/wireless/iwlwifi/dvm/power.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/power.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/rs.c | 19 +-
+ drivers/net/wireless/iwlwifi/dvm/rs.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/rx.c | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/rxon.c | 7 +-
+ drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/sta.c | 42 +-
+ drivers/net/wireless/iwlwifi/dvm/testmode.c | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/tt.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/tt.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 74 +-
+ drivers/net/wireless/iwlwifi/dvm/ucode.c | 98 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 8 +-
+ drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 27 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.h | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 18 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 13 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-read.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-read.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-fh.h | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 22 +-
+ drivers/net/wireless/iwlwifi/iwl-io.c | 229 +-
+ drivers/net/wireless/iwlwifi/iwl-io.h | 32 +-
+ drivers/net/wireless/iwlwifi/iwl-modparams.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-notif-wait.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 346 +++
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 80 +
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 16 +-
+ drivers/net/wireless/iwlwifi/iwl-phy-db.c | 514 +++
+ drivers/net/wireless/iwlwifi/iwl-phy-db.h | 82 +
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 7 +-
+ drivers/net/wireless/iwlwifi/iwl-test.c | 56 +-
+ drivers/net/wireless/iwlwifi/iwl-test.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-testmode.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 164 +-
+ drivers/net/wireless/iwlwifi/mvm/Makefile | 10 +
+ drivers/net/wireless/iwlwifi/mvm/binding.c | 197 ++
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 955 ++++++
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 378 +++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 282 ++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 369 +++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 140 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 312 ++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 561 ++++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 380 +++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 580 ++++
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 952 ++++++
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 640 ++++
+ drivers/net/wireless/iwlwifi/mvm/led.c | 134 +
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 955 ++++++
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1316 ++++++++
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 500 +++
+ drivers/net/wireless/iwlwifi/mvm/nvm.c | 311 ++
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 682 ++++
+ drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 292 ++
+ drivers/net/wireless/iwlwifi/mvm/power.c | 207 ++
+ drivers/net/wireless/iwlwifi/mvm/quota.c | 197 ++
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 3080 ++++++++++++++++++
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 393 +++
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 355 +++
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 437 +++
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 1235 ++++++++
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 372 +++
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 511 +++
+ drivers/net/wireless/iwlwifi/mvm/time-event.h | 214 ++
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 916 ++++++
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 472 +++
+ drivers/net/wireless/iwlwifi/pcie/1000.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/2000.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/5000.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/6000.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/7000.c | 111 +
+ drivers/net/wireless/iwlwifi/pcie/cfg.h | 6 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 10 +-
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 17 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 57 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 361 ++-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 89 +-
+ drivers/net/wireless/libertas/cfg.c | 45 +-
+ drivers/net/wireless/libertas/cfg.h | 3 -
+ drivers/net/wireless/mac80211_hwsim.c | 178 +-
+ drivers/net/wireless/mwifiex/11n.c | 48 +-
+ drivers/net/wireless/mwifiex/11n.h | 2 -
+ drivers/net/wireless/mwifiex/11n_aggr.c | 6 +-
+ drivers/net/wireless/mwifiex/11n_rxreorder.c | 5 +-
+ drivers/net/wireless/mwifiex/Kconfig | 4 +-
+ drivers/net/wireless/mwifiex/README | 1 -
+ drivers/net/wireless/mwifiex/cfg80211.c | 15 +-
+ drivers/net/wireless/mwifiex/cmdevt.c | 11 +-
+ drivers/net/wireless/mwifiex/debugfs.c | 2 -
+ drivers/net/wireless/mwifiex/decl.h | 18 +
+ drivers/net/wireless/mwifiex/fw.h | 14 +-
+ drivers/net/wireless/mwifiex/init.c | 12 +-
+ drivers/net/wireless/mwifiex/ioctl.h | 4 +-
+ drivers/net/wireless/mwifiex/join.c | 36 +-
+ drivers/net/wireless/mwifiex/main.h | 7 +-
+ drivers/net/wireless/mwifiex/pcie.c | 1265 +++++---
+ drivers/net/wireless/mwifiex/pcie.h | 228 +-
+ drivers/net/wireless/mwifiex/scan.c | 29 +-
+ drivers/net/wireless/mwifiex/sdio.c | 21 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 10 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 5 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 22 +-
+ drivers/net/wireless/mwifiex/txrx.c | 6 +-
+ drivers/net/wireless/mwifiex/uap_cmd.c | 44 +
+ drivers/net/wireless/mwifiex/usb.c | 34 +-
+ drivers/net/wireless/mwifiex/util.c | 2 +-
+ drivers/net/wireless/mwifiex/util.h | 8 +-
+ drivers/net/wireless/mwifiex/wmm.c | 15 +-
+ drivers/net/wireless/mwl8k.c | 322 +-
+ drivers/net/wireless/orinoco/main.c | 17 +-
+ drivers/net/wireless/orinoco/scan.c | 4 +-
+ drivers/net/wireless/p54/p54pci.c | 7 +-
+ drivers/net/wireless/p54/p54usb.c | 12 +-
+ drivers/net/wireless/prism54/isl_ioctl.c | 1 +
+ drivers/net/wireless/prism54/islpci_mgt.c | 14 +-
+ drivers/net/wireless/ray_cs.c | 19 +-
+ drivers/net/wireless/rndis_wlan.c | 9 +-
+ drivers/net/wireless/rt2x00/rt2400pci.c | 12 +-
+ drivers/net/wireless/rt2x00/rt2500pci.c | 7 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 816 ++---
+ drivers/net/wireless/rt2x00/rt2800lib.h | 8 +-
+ drivers/net/wireless/rt2x00/rt2800pci.c | 36 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 53 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 30 +-
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 108 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 78 +-
+ drivers/net/wireless/rtlwifi/Kconfig | 50 +-
+ drivers/net/wireless/rtlwifi/base.c | 7 +-
+ drivers/net/wireless/rtlwifi/core.c | 4 +-
+ drivers/net/wireless/rtlwifi/rc.c | 13 +-
+ drivers/net/wireless/rtlwifi/regd.c | 37 +-
+ drivers/net/wireless/rtlwifi/regd.h | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 11 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/fw.c | 8 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c | 2 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 11 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/phy.c | 20 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 7 +-
+ drivers/net/wireless/rtlwifi/usb.c | 9 +-
+ drivers/net/wireless/rtlwifi/usb.h | 3 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 2 +-
+ drivers/net/wireless/ti/Kconfig | 9 +
+ drivers/net/wireless/ti/Makefile | 4 +-
+ ...12xx_platform_data.c => wilink_platform_data.c} | 0
+ drivers/net/wireless/ti/wl1251/Kconfig | 2 +-
+ drivers/net/wireless/ti/wl1251/event.c | 6 +-
+ drivers/net/wireless/ti/wl1251/main.c | 24 +-
+ drivers/net/wireless/ti/wl12xx/Makefile | 2 +-
+ drivers/net/wireless/ti/wl12xx/cmd.c | 37 +
+ drivers/net/wireless/ti/wl12xx/cmd.h | 20 +
+ drivers/net/wireless/ti/wl12xx/event.c | 116 +
+ drivers/net/wireless/ti/wl12xx/event.h | 111 +
+ drivers/net/wireless/ti/wl12xx/main.c | 195 +-
+ drivers/net/wireless/ti/wl12xx/scan.c | 501 +++
+ drivers/net/wireless/ti/wl12xx/scan.h | 140 +
+ drivers/net/wireless/ti/wl12xx/wl12xx.h | 40 +-
+ drivers/net/wireless/ti/wl18xx/Makefile | 2 +-
+ drivers/net/wireless/ti/wl18xx/acx.c | 87 +-
+ drivers/net/wireless/ti/wl18xx/acx.h | 55 +-
+ drivers/net/wireless/ti/wl18xx/cmd.c | 80 +
+ drivers/net/wireless/ti/wl18xx/cmd.h | 52 +
+ drivers/net/wireless/ti/wl18xx/conf.h | 22 +-
+ drivers/net/wireless/ti/wl18xx/event.c | 111 +
+ drivers/net/wireless/ti/wl18xx/event.h | 77 +
+ drivers/net/wireless/ti/wl18xx/main.c | 272 +-
+ drivers/net/wireless/ti/wl18xx/scan.c | 326 ++
+ drivers/net/wireless/ti/wl18xx/scan.h | 127 +
+ drivers/net/wireless/ti/wl18xx/tx.c | 54 +-
+ drivers/net/wireless/ti/wl18xx/wl18xx.h | 50 +-
+ drivers/net/wireless/ti/wlcore/Kconfig | 5 -
+ drivers/net/wireless/ti/wlcore/Makefile | 3 -
+ drivers/net/wireless/ti/wlcore/acx.c | 15 +-
+ drivers/net/wireless/ti/wlcore/acx.h | 1 -
+ drivers/net/wireless/ti/wlcore/boot.c | 77 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 423 ++-
+ drivers/net/wireless/ti/wlcore/cmd.h | 81 +-
+ drivers/net/wireless/ti/wlcore/conf.h | 110 +-
+ drivers/net/wireless/ti/wlcore/debugfs.c | 10 +-
+ drivers/net/wireless/ti/wlcore/event.c | 326 +-
+ drivers/net/wireless/ti/wlcore/event.h | 99 +-
+ drivers/net/wireless/ti/wlcore/hw_ops.h | 41 +
+ drivers/net/wireless/ti/wlcore/init.c | 19 +-
+ drivers/net/wireless/ti/wlcore/io.h | 12 +-
+ drivers/net/wireless/ti/wlcore/main.c | 1610 ++++++----
+ drivers/net/wireless/ti/wlcore/ps.c | 11 +-
+ drivers/net/wireless/ti/wlcore/rx.c | 33 +-
+ drivers/net/wireless/ti/wlcore/rx.h | 3 +-
+ drivers/net/wireless/ti/wlcore/scan.c | 696 +----
+ drivers/net/wireless/ti/wlcore/scan.h | 144 +-
+ drivers/net/wireless/ti/wlcore/sdio.c | 34 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 31 +-
+ drivers/net/wireless/ti/wlcore/tx.c | 298 +-
+ drivers/net/wireless/ti/wlcore/tx.h | 35 +-
+ drivers/net/wireless/ti/wlcore/wlcore.h | 119 +-
+ drivers/net/wireless/ti/wlcore/wlcore_i.h | 58 +-
+ drivers/net/wireless/zd1211rw/zd_usb.c | 1 -
+ drivers/net/xen-netback/interface.c | 2 +
+ drivers/nfc/Kconfig | 16 +-
+ drivers/nfc/Makefile | 3 +-
+ drivers/nfc/microread/Kconfig | 35 +
+ drivers/nfc/microread/Makefile | 10 +
+ drivers/nfc/microread/i2c.c | 340 ++
+ drivers/nfc/microread/mei.c | 246 ++
+ drivers/nfc/microread/microread.c | 728 +++++
+ drivers/nfc/microread/microread.h | 33 +
+ drivers/nfc/nfcwilink.c | 10 +-
+ drivers/nfc/pn533.c | 1593 +++++-----
+ drivers/nfc/pn544/Kconfig | 23 +
+ drivers/nfc/pn544/Makefile | 5 +-
+ drivers/nfc/pn544/i2c.c | 44 +-
+ drivers/nfc/pn544/pn544.c | 65 +-
+ drivers/of/of_mdio.c | 4 +-
+ drivers/s390/net/Kconfig | 4 +-
+ drivers/s390/net/qeth_core.h | 8 +-
+ drivers/s390/net/qeth_core_main.c | 256 +-
+ drivers/s390/net/qeth_core_mpc.c | 1 +
+ drivers/s390/net/qeth_core_mpc.h | 5 +
+ drivers/s390/net/qeth_core_sys.c | 3 +-
+ drivers/s390/net/qeth_l2_main.c | 16 +-
+ drivers/s390/net/qeth_l3_main.c | 35 +-
+ drivers/ssb/Kconfig | 5 +
+ drivers/ssb/Makefile | 1 +
+ drivers/ssb/driver_chipcommon_sflash.c | 140 +
+ drivers/ssb/driver_gpio.c | 22 +
+ drivers/ssb/driver_mipscore.c | 51 +-
+ drivers/ssb/main.c | 8 +
+ drivers/ssb/ssb_private.h | 15 +
+ drivers/staging/bcm/Bcmnet.c | 4 +-
+ drivers/staging/ccg/u_ether.c | 10 +-
+ drivers/staging/et131x/et131x.c | 10 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 9 +-
+ drivers/staging/octeon/ethernet-mdio.c | 6 +-
+ drivers/staging/octeon/ethernet.c | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 +-
+ drivers/staging/wlags49_h2/wl_netdev.c | 14 +-
+ drivers/staging/wlan-ng/cfg80211.c | 2 +-
+ drivers/usb/gadget/u_ether.c | 10 +-
+ fs/proc/proc_net.c | 14 -
+ include/linux/bcma/bcma_driver_chipcommon.h | 4 +-
+ include/linux/bcma/bcma_driver_mips.h | 11 +-
+ include/linux/bcma/bcma_driver_pci.h | 2 +
+ include/linux/can/dev.h | 11 +
+ include/linux/can/led.h | 51 +
+ include/linux/can/skb.h | 45 +
+ include/linux/cyclomx.h | 77 -
+ include/linux/cycx_drv.h | 64 -
+ include/linux/etherdevice.h | 4 +-
+ include/linux/ieee80211.h | 155 +-
+ include/linux/if_macvlan.h | 6 +
+ include/linux/if_team.h | 1 +
+ include/linux/in6.h | 13 +
+ include/linux/inetdevice.h | 6 +
+ include/linux/ipv6.h | 10 +-
+ include/linux/micrel_phy.h | 9 +-
+ include/linux/mlx4/device.h | 8 +-
+ include/linux/mroute.h | 2 +-
+ include/linux/mroute6.h | 2 +-
+ include/linux/netdev_features.h | 3 +-
+ include/linux/netdevice.h | 76 +-
+ include/linux/netfilter/nf_conntrack_sip.h | 3 +
+ include/linux/netpoll.h | 28 +-
+ include/linux/pci_ids.h | 1 +
+ include/linux/phy.h | 6 +-
+ include/linux/platform_data/cpsw.h | 4 +
+ include/linux/platform_data/microread.h | 35 +
+ include/linux/proc_fs.h | 6 -
+ include/linux/random.h | 6 +
+ include/linux/skbuff.h | 61 +
+ include/linux/socket.h | 4 +-
+ include/linux/ssb/ssb_driver_gige.h | 23 +-
+ include/linux/ssb/ssb_driver_mips.h | 5 +
+ include/linux/tcp.h | 4 +-
+ include/linux/wanrouter.h | 127 +-
+ include/linux/wl12xx.h | 16 +-
+ include/net/act_api.h | 27 +-
+ include/net/addrconf.h | 63 +-
+ include/net/bluetooth/a2mp.h | 4 +-
+ include/net/bluetooth/bluetooth.h | 23 +
+ include/net/bluetooth/hci.h | 18 +
+ include/net/bluetooth/hci_core.h | 5 +
+ include/net/bluetooth/l2cap.h | 1 -
+ include/net/cfg80211.h | 480 ++-
+ include/net/dn_route.h | 2 +-
+ include/net/dsfield.h | 6 +-
+ include/net/dst.h | 1 +
+ include/net/gro_cells.h | 4 +-
+ include/net/inet6_hashtables.h | 5 +-
+ include/net/inet_frag.h | 84 +-
+ include/net/inet_hashtables.h | 13 +-
+ include/net/ip6_checksum.h | 62 +-
+ include/net/ip6_fib.h | 2 -
+ include/net/ip6_route.h | 9 +-
+ include/net/ipv6.h | 140 +-
+ include/net/mac80211.h | 313 +-
+ include/net/mrp.h | 143 +
+ include/net/ndisc.h | 32 +-
+ include/net/neighbour.h | 3 +-
+ include/net/netevent.h | 3 +-
+ include/net/netfilter/nf_conntrack_acct.h | 6 +-
+ include/net/netfilter/nf_conntrack_core.h | 15 +-
+ include/net/netfilter/nf_conntrack_ecache.h | 19 +-
+ include/net/netfilter/nf_conntrack_expect.h | 7 +-
+ include/net/netfilter/nf_conntrack_extend.h | 4 +
+ include/net/netfilter/nf_conntrack_helper.h | 7 +-
+ include/net/netfilter/nf_conntrack_l3proto.h | 11 +-
+ include/net/netfilter/nf_conntrack_l4proto.h | 10 +-
+ include/net/netfilter/nf_conntrack_labels.h | 58 +
+ include/net/netfilter/nf_conntrack_timeout.h | 8 +-
+ include/net/netfilter/nf_conntrack_timestamp.h | 21 +-
+ include/net/netfilter/nf_tproxy_core.h | 2 +
+ include/net/netns/conntrack.h | 4 +
+ include/net/netns/ipv4.h | 3 +
+ include/net/netns/ipv6.h | 1 +
+ include/net/nfc/hci.h | 22 +-
+ include/net/nfc/nci_core.h | 1 +
+ include/net/nfc/nfc.h | 8 +
+ include/net/pkt_cls.h | 7 +-
+ include/net/pkt_sched.h | 10 +-
+ include/net/regulatory.h | 4 +
+ include/net/sch_generic.h | 21 +-
+ include/net/sctp/constants.h | 2 +-
+ include/net/sctp/structs.h | 5 +-
+ include/net/sock.h | 8 +-
+ include/net/tcp.h | 10 +-
+ include/net/xfrm.h | 40 +-
+ include/uapi/asm-generic/socket.h | 5 +-
+ include/uapi/linux/can/gw.h | 2 +
+ include/uapi/linux/if_bridge.h | 11 +
+ include/uapi/linux/if_ether.h | 1 +
+ include/uapi/linux/if_link.h | 1 +
+ include/uapi/linux/if_vlan.h | 1 +
+ include/uapi/linux/in6.h | 20 +-
+ include/uapi/linux/ipv6.h | 2 +
+ include/uapi/linux/mroute.h | 3 +
+ include/uapi/linux/mroute6.h | 3 +
+ include/uapi/linux/neighbour.h | 1 +
+ include/uapi/linux/netfilter/Kbuild | 2 +
+ include/uapi/linux/netfilter/nf_conntrack_common.h | 1 +
+ include/uapi/linux/netfilter/nfnetlink_conntrack.h | 2 +
+ include/uapi/linux/netfilter/xt_bpf.h | 17 +
+ include/uapi/linux/netfilter/xt_connlabel.h | 12 +
+ include/uapi/linux/nfc.h | 37 +-
+ include/uapi/linux/nl80211.h | 395 ++-
+ include/uapi/linux/rtnetlink.h | 1 +
+ include/uapi/linux/snmp.h | 1 +
+ include/uapi/linux/tcp.h | 1 +
+ include/uapi/linux/virtio_net.h | 8 +-
+ include/uapi/linux/vm_sockets.h | 163 +
+ include/uapi/linux/wanrouter.h | 443 +--
+ kernel/softirq.c | 17 +-
+ kernel/sysctl_binary.c | 1 -
+ net/802/Kconfig | 3 +
+ net/802/Makefile | 1 +
+ net/802/mrp.c | 895 ++++++
+ net/8021q/Kconfig | 11 +
+ net/8021q/Makefile | 1 +
+ net/8021q/vlan.c | 42 +-
+ net/8021q/vlan.h | 16 +
+ net/8021q/vlan_core.c | 25 +-
+ net/8021q/vlan_dev.c | 20 +-
+ net/8021q/vlan_mvrp.c | 72 +
+ net/8021q/vlan_netlink.c | 2 +-
+ net/8021q/vlanproc.c | 2 +-
+ net/Kconfig | 4 +-
+ net/Makefile | 2 +-
+ net/atm/proc.c | 2 +-
+ net/ax25/af_ax25.c | 13 +-
+ net/batman-adv/bat_algo.h | 2 +-
+ net/batman-adv/bat_iv_ogm.c | 14 +-
+ net/batman-adv/bitarray.c | 2 +-
+ net/batman-adv/bitarray.h | 2 +-
+ net/batman-adv/bridge_loop_avoidance.c | 135 +-
+ net/batman-adv/bridge_loop_avoidance.h | 2 +-
+ net/batman-adv/debugfs.c | 23 +-
+ net/batman-adv/debugfs.h | 2 +-
+ net/batman-adv/distributed-arp-table.c | 2 +-
+ net/batman-adv/distributed-arp-table.h | 2 +-
+ net/batman-adv/gateway_client.c | 2 +-
+ net/batman-adv/gateway_client.h | 2 +-
+ net/batman-adv/gateway_common.c | 2 +-
+ net/batman-adv/gateway_common.h | 2 +-
+ net/batman-adv/hard-interface.c | 26 +-
+ net/batman-adv/hard-interface.h | 2 +-
+ net/batman-adv/hash.c | 2 +-
+ net/batman-adv/hash.h | 4 +-
+ net/batman-adv/icmp_socket.c | 2 +-
+ net/batman-adv/icmp_socket.h | 2 +-
+ net/batman-adv/main.c | 2 +-
+ net/batman-adv/main.h | 12 +-
+ net/batman-adv/originator.c | 28 +-
+ net/batman-adv/originator.h | 2 +-
+ net/batman-adv/packet.h | 2 +-
+ net/batman-adv/ring_buffer.c | 2 +-
+ net/batman-adv/ring_buffer.h | 2 +-
+ net/batman-adv/routing.c | 6 +-
+ net/batman-adv/routing.h | 2 +-
+ net/batman-adv/send.c | 9 +-
+ net/batman-adv/send.h | 2 +-
+ net/batman-adv/soft-interface.c | 50 +-
+ net/batman-adv/soft-interface.h | 2 +-
+ net/batman-adv/sysfs.c | 2 +-
+ net/batman-adv/sysfs.h | 2 +-
+ net/batman-adv/translation-table.c | 89 +-
+ net/batman-adv/translation-table.h | 2 +-
+ net/batman-adv/types.h | 571 +++-
+ net/batman-adv/unicast.c | 4 +-
+ net/batman-adv/unicast.h | 2 +-
+ net/batman-adv/vis.c | 40 +-
+ net/batman-adv/vis.h | 2 +-
+ net/bluetooth/a2mp.c | 42 +-
+ net/bluetooth/af_bluetooth.c | 4 +-
+ net/bluetooth/amp.c | 25 +-
+ net/bluetooth/bnep/core.c | 1 -
+ net/bluetooth/hci_core.c | 30 +-
+ net/bluetooth/hci_event.c | 64 +-
+ net/bluetooth/hci_sysfs.c | 22 +-
+ net/bluetooth/l2cap_core.c | 5 -
+ net/bluetooth/mgmt.c | 489 ++-
+ net/bluetooth/rfcomm/core.c | 4 +-
+ net/bluetooth/sco.c | 18 +-
+ net/bridge/Kconfig | 14 +
+ net/bridge/Makefile | 2 +
+ net/bridge/br_device.c | 19 +-
+ net/bridge/br_fdb.c | 258 +-
+ net/bridge/br_forward.c | 9 +
+ net/bridge/br_if.c | 16 +-
+ net/bridge/br_input.c | 28 +-
+ net/bridge/br_mdb.c | 3 -
+ net/bridge/br_multicast.c | 69 +-
+ net/bridge/br_netlink.c | 247 +-
+ net/bridge/br_notify.c | 2 +-
+ net/bridge/br_private.h | 178 +-
+ net/bridge/br_stp_if.c | 4 +-
+ net/bridge/br_sysfs_br.c | 21 +
+ net/bridge/br_vlan.c | 415 +++
+ net/bridge/netfilter/ebt_ulog.c | 6 +-
+ net/bridge/netfilter/ebtables.c | 24 +-
+ net/can/Kconfig | 13 +-
+ net/can/bcm.c | 14 +-
+ net/can/gw.c | 72 +-
+ net/can/proc.c | 2 +-
+ net/can/raw.c | 8 +-
+ net/core/Makefile | 2 +-
+ net/core/dev.c | 1489 ++++-----
+ net/core/dev_addr_lists.c | 4 +-
+ net/core/dev_ioctl.c | 576 ++++
+ net/core/ethtool.c | 46 +-
+ net/core/filter.c | 13 +
+ net/core/flow.c | 2 +-
+ net/core/flow_dissector.c | 173 ++
+ net/core/neighbour.c | 20 +-
+ net/core/net-sysfs.c | 175 +-
+ net/core/netpoll.c | 721 +++--
+ net/core/netprio_cgroup.c | 4 +-
+ net/core/pktgen.c | 196 +-
+ net/core/rtnetlink.c | 214 +-
+ net/core/skbuff.c | 111 +-
+ net/core/sock.c | 24 +-
+ net/core/sysctl_net_core.c | 14 +-
+ net/dccp/probe.c | 6 +-
+ net/decnet/af_decnet.c | 10 +-
+ net/decnet/dn_dev.c | 4 +-
+ net/decnet/dn_neigh.c | 7 +-
+ net/decnet/dn_nsp_out.c | 2 +-
+ net/decnet/dn_route.c | 7 +-
+ net/dsa/dsa.c | 6 +
+ net/dsa/slave.c | 14 +-
+ net/ethernet/eth.c | 43 +-
+ net/ieee802154/6lowpan.c | 94 +-
+ net/ipv4/af_inet.c | 25 +-
+ net/ipv4/ah4.c | 3 +-
+ net/ipv4/arp.c | 4 +-
+ net/ipv4/devinet.c | 215 +-
+ net/ipv4/fib_frontend.c | 2 +-
+ net/ipv4/fib_trie.c | 18 +-
+ net/ipv4/gre.c | 118 +
+ net/ipv4/igmp.c | 11 +-
+ net/ipv4/inet_connection_sock.c | 45 +-
+ net/ipv4/inet_fragment.c | 39 +-
+ net/ipv4/inet_hashtables.c | 28 +-
+ net/ipv4/ip_fragment.c | 52 +-
+ net/ipv4/ip_gre.c | 90 +-
+ net/ipv4/ip_input.c | 7 -
+ net/ipv4/ip_output.c | 1 +
+ net/ipv4/ipcomp.c | 1 +
+ net/ipv4/ipconfig.c | 2 +-
+ net/ipv4/ipip.c | 4 +-
+ net/ipv4/ipmr.c | 130 +-
+ net/ipv4/netfilter/arp_tables.c | 10 +-
+ net/ipv4/netfilter/ip_tables.c | 10 +-
+ net/ipv4/netfilter/ipt_ULOG.c | 12 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 82 +-
+ .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 14 +-
+ net/ipv4/ping.c | 4 +-
+ net/ipv4/proc.c | 17 +-
+ net/ipv4/protocol.c | 6 +
+ net/ipv4/raw.c | 4 +-
+ net/ipv4/route.c | 4 +-
+ net/ipv4/syncookies.c | 7 +-
+ net/ipv4/sysctl_net_ipv4.c | 38 +-
+ net/ipv4/tcp.c | 16 +-
+ net/ipv4/tcp_cong.c | 30 +-
+ net/ipv4/tcp_input.c | 25 +-
+ net/ipv4/tcp_ipv4.c | 21 +-
+ net/ipv4/tcp_minisocks.c | 4 +-
+ net/ipv4/tcp_output.c | 8 +-
+ net/ipv4/tcp_probe.c | 6 +-
+ net/ipv4/udp.c | 68 +-
+ net/ipv4/xfrm4_input.c | 2 +-
+ net/ipv4/xfrm4_mode_tunnel.c | 4 +-
+ net/ipv4/xfrm4_policy.c | 58 +-
+ net/ipv6/Makefile | 2 +-
+ net/ipv6/addrconf.c | 27 +-
+ net/ipv6/af_inet6.c | 3 +-
+ net/ipv6/ah6.c | 3 +-
+ net/ipv6/anycast.c | 20 +-
+ net/ipv6/datagram.c | 19 +-
+ net/ipv6/exthdrs.c | 3 +-
+ net/ipv6/inet6_connection_sock.c | 19 +-
+ net/ipv6/inet6_hashtables.c | 19 +-
+ net/ipv6/ip6_checksum.c | 97 +
+ net/ipv6/ip6_flowlabel.c | 167 +-
+ net/ipv6/ip6_gre.c | 6 +-
+ net/ipv6/ip6_input.c | 35 +-
+ net/ipv6/ip6_offload.c | 1 +
+ net/ipv6/ip6_output.c | 77 +-
+ net/ipv6/ip6_tunnel.c | 4 +-
+ net/ipv6/ip6mr.c | 136 +-
+ net/ipv6/mcast.c | 91 +-
+ net/ipv6/ndisc.c | 362 +--
+ net/ipv6/netfilter/ip6_tables.c | 10 +-
+ net/ipv6/netfilter/ip6t_REJECT.c | 2 +-
+ net/ipv6/netfilter/ip6table_mangle.c | 5 +-
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 86 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 13 +-
+ net/ipv6/proc.c | 16 +-
+ net/ipv6/raw.c | 4 +-
+ net/ipv6/reassembly.c | 28 +-
+ net/ipv6/route.c | 193 +-
+ net/ipv6/sit.c | 61 +-
+ net/ipv6/syncookies.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 34 +-
+ net/ipv6/udp.c | 64 +-
+ net/ipv6/udp_offload.c | 3 +-
+ net/ipv6/xfrm6_mode_tunnel.c | 4 +-
+ net/ipv6/xfrm6_policy.c | 53 +-
+ net/ipv6/xfrm6_tunnel.c | 6 +-
+ net/irda/af_irda.c | 3 +-
+ net/irda/irnet/irnet_ppp.c | 117 +-
+ net/key/af_key.c | 52 +-
+ net/l2tp/l2tp_core.c | 179 +-
+ net/l2tp/l2tp_core.h | 2 +
+ net/l2tp/l2tp_ip.c | 16 +-
+ net/l2tp/l2tp_netlink.c | 1 +
+ net/l2tp/l2tp_ppp.c | 5 +-
+ net/mac80211/Kconfig | 11 +
+ net/mac80211/Makefile | 3 +-
+ net/mac80211/agg-rx.c | 14 +-
+ net/mac80211/agg-tx.c | 300 +-
+ net/mac80211/cfg.c | 256 +-
+ net/mac80211/chan.c | 158 +-
+ net/mac80211/debug.h | 10 +
+ net/mac80211/debugfs.c | 6 +-
+ net/mac80211/debugfs_netdev.c | 5 +
+ net/mac80211/debugfs_sta.c | 5 +-
+ net/mac80211/driver-ops.h | 99 +-
+ net/mac80211/ht.c | 115 +-
+ net/mac80211/ibss.c | 110 +-
+ net/mac80211/ieee80211_i.h | 222 +-
+ net/mac80211/iface.c | 173 +-
+ net/mac80211/key.c | 5 +-
+ net/mac80211/main.c | 170 +-
+ net/mac80211/mesh.c | 313 +-
+ net/mac80211/mesh.h | 56 +-
+ net/mac80211/mesh_hwmp.c | 54 +-
+ net/mac80211/mesh_pathtbl.c | 12 +-
+ net/mac80211/mesh_plink.c | 280 +-
+ net/mac80211/mesh_ps.c | 598 ++++
+ net/mac80211/mlme.c | 1189 ++++---
+ net/mac80211/offchannel.c | 50 +-
+ net/mac80211/pm.c | 76 +-
+ net/mac80211/rate.h | 2 +
+ net/mac80211/rc80211_minstrel.c | 29 +
+ net/mac80211/rc80211_minstrel.h | 2 +
+ net/mac80211/rc80211_minstrel_ht.c | 181 +-
+ net/mac80211/rc80211_minstrel_ht.h | 5 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 112 +-
+ net/mac80211/rx.c | 166 +-
+ net/mac80211/scan.c | 75 +-
+ net/mac80211/sta_info.c | 91 +-
+ net/mac80211/sta_info.h | 62 +-
+ net/mac80211/status.c | 25 +-
+ net/mac80211/tkip.c | 10 +-
+ net/mac80211/trace.h | 98 +-
+ net/mac80211/tx.c | 156 +-
+ net/mac80211/util.c | 107 +-
+ net/mac80211/vht.c | 172 +-
+ net/mac80211/wme.c | 13 +-
+ net/mac80211/wpa.c | 5 +-
+ net/mac802154/wpan.c | 9 +-
+ net/netfilter/Kconfig | 27 +
+ net/netfilter/Makefile | 3 +
+ net/netfilter/ipset/ip_set_hash_ip.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_ipport.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_ipportip.c | 4 +-
+ net/netfilter/ipset/ip_set_hash_ipportnet.c | 4 +-
+ net/netfilter/ipset/ip_set_hash_net.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c | 2 +-
+ net/netfilter/ipset/ip_set_hash_netport.c | 2 +-
+ net/netfilter/ipvs/ip_vs_app.c | 4 +-
+ net/netfilter/ipvs/ip_vs_conn.c | 11 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 14 +-
+ net/netfilter/nf_conntrack_acct.c | 36 +-
+ net/netfilter/nf_conntrack_core.c | 191 +-
+ net/netfilter/nf_conntrack_ecache.c | 37 +-
+ net/netfilter/nf_conntrack_expect.c | 58 +-
+ net/netfilter/nf_conntrack_helper.c | 53 +-
+ net/netfilter/nf_conntrack_labels.c | 112 +
+ net/netfilter/nf_conntrack_netlink.c | 88 +
+ net/netfilter/nf_conntrack_proto.c | 92 +-
+ net/netfilter/nf_conntrack_proto_dccp.c | 43 +-
+ net/netfilter/nf_conntrack_proto_gre.c | 23 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 43 +-
+ net/netfilter/nf_conntrack_proto_udplite.c | 40 +-
+ net/netfilter/nf_conntrack_sip.c | 17 +
+ net/netfilter/nf_conntrack_snmp.c | 1 +
+ net/netfilter/nf_conntrack_standalone.c | 69 +-
+ net/netfilter/nf_conntrack_timeout.c | 23 +-
+ net/netfilter/nf_conntrack_timestamp.c | 39 +-
+ net/netfilter/nf_nat_sip.c | 27 +-
+ net/netfilter/x_tables.c | 10 +-
+ net/netfilter/xt_bpf.c | 73 +
+ net/netfilter/xt_connlabel.c | 99 +
+ net/netfilter/xt_hashlimit.c | 6 +-
+ net/netfilter/xt_recent.c | 2 +-
+ net/netlink/af_netlink.c | 7 +-
+ net/netrom/af_netrom.c | 12 +-
+ net/nfc/core.c | 50 +-
+ net/nfc/hci/command.c | 7 +-
+ net/nfc/hci/core.c | 57 +-
+ net/nfc/hci/hcp.c | 7 +
+ net/nfc/llcp/commands.c | 2 +
+ net/nfc/llcp/llcp.c | 49 +-
+ net/nfc/llcp/llcp.h | 1 -
+ net/nfc/llcp/sock.c | 22 +-
+ net/nfc/nci/core.c | 2 +
+ net/nfc/netlink.c | 1 +
+ net/openvswitch/datapath.c | 5 +-
+ net/openvswitch/vport-internal_dev.c | 3 +-
+ net/packet/af_packet.c | 4 +-
+ net/phonet/pn_dev.c | 8 +-
+ net/rose/af_rose.c | 19 +-
+ net/rxrpc/af_rxrpc.c | 13 +-
+ net/sched/act_api.c | 18 +-
+ net/sched/act_csum.c | 2 +-
+ net/sched/act_gact.c | 5 +-
+ net/sched/act_ipt.c | 8 +-
+ net/sched/act_mirred.c | 7 +-
+ net/sched/act_nat.c | 2 +-
+ net/sched/act_pedit.c | 8 +-
+ net/sched/act_police.c | 105 +-
+ net/sched/act_simple.c | 5 +-
+ net/sched/act_skbedit.c | 5 +-
+ net/sched/cls_api.c | 11 +-
+ net/sched/cls_basic.c | 13 +-
+ net/sched/cls_cgroup.c | 5 +-
+ net/sched/cls_flow.c | 4 +-
+ net/sched/cls_fw.c | 10 +-
+ net/sched/cls_route.c | 15 +-
+ net/sched/cls_rsvp.h | 4 +-
+ net/sched/cls_tcindex.c | 14 +-
+ net/sched/cls_u32.c | 13 +-
+ net/sched/sch_api.c | 10 +-
+ net/sched/sch_generic.c | 37 +
+ net/sched/sch_htb.c | 76 +-
+ net/sched/sch_tbf.c | 76 +-
+ net/sctp/associola.c | 5 +-
+ net/sctp/auth.c | 29 +-
+ net/sctp/endpointola.c | 9 +-
+ net/sctp/input.c | 3 +-
+ net/sctp/outqueue.c | 4 +-
+ net/sctp/probe.c | 27 +-
+ net/sctp/protocol.c | 2 +-
+ net/sctp/sm_make_chunk.c | 31 +-
+ net/sctp/sm_sideeffect.c | 6 +-
+ net/sctp/transport.c | 20 +-
+ net/socket.c | 19 +-
+ net/tipc/socket.c | 103 +-
+ net/unix/af_unix.c | 7 +-
+ net/vmw_vsock/Kconfig | 28 +
+ net/vmw_vsock/Makefile | 7 +
+ net/vmw_vsock/af_vsock.c | 2012 ++++++++++++
+ net/vmw_vsock/af_vsock.h | 175 ++
+ net/vmw_vsock/vmci_transport.c | 2155 +++++++++++++
+ net/vmw_vsock/vmci_transport.h | 139 +
+ net/vmw_vsock/vmci_transport_notify.c | 680 ++++
+ net/vmw_vsock/vmci_transport_notify.h | 83 +
+ net/vmw_vsock/vmci_transport_notify_qstate.c | 438 +++
+ net/vmw_vsock/vsock_addr.c | 86 +
+ net/vmw_vsock/vsock_addr.h | 32 +
+ net/wanrouter/Kconfig | 27 -
+ net/wanrouter/Makefile | 7 -
+ net/wanrouter/patchlevel | 1 -
+ net/wanrouter/wanmain.c | 782 -----
+ net/wanrouter/wanproc.c | 380 ---
+ net/wireless/ap.c | 62 +
+ net/wireless/chan.c | 146 +-
+ net/wireless/core.c | 39 +-
+ net/wireless/core.h | 60 +-
+ net/wireless/ethtool.c | 4 +-
+ net/wireless/ibss.c | 4 +-
+ net/wireless/mesh.c | 8 +
+ net/wireless/mlme.c | 162 +-
+ net/wireless/nl80211.c | 1157 ++++++-
+ net/wireless/nl80211.h | 7 +
+ net/wireless/rdev-ops.h | 12 +
+ net/wireless/reg.c | 1142 +++----
+ net/wireless/reg.h | 7 +-
+ net/wireless/scan.c | 630 ++--
+ net/wireless/sme.c | 25 +-
+ net/wireless/sysfs.c | 2 -
+ net/wireless/trace.h | 98 +
+ net/wireless/util.c | 42 +-
+ net/wireless/wext-proc.c | 5 +-
+ net/xfrm/xfrm_algo.c | 68 +-
+ net/xfrm/xfrm_output.c | 6 +
+ net/xfrm/xfrm_policy.c | 271 +-
+ net/xfrm/xfrm_proc.c | 7 +-
+ net/xfrm/xfrm_state.c | 165 +-
+ net/xfrm/xfrm_user.c | 2 +-
+ 1370 files changed, 97487 insertions(+), 59621 deletions(-)
+ delete mode 100644 Documentation/networking/DLINK.txt
+ delete mode 100644 Documentation/networking/depca.txt
+ delete mode 100644 Documentation/networking/ewrk3.txt
+ delete mode 100644 Documentation/networking/multicast.txt
+ create mode 100644 Documentation/networking/nf_conntrack-sysctl.txt
+ create mode 100644 drivers/net/can/led.c
+ create mode 100644 drivers/net/can/usb/usb_8dev.c
+ delete mode 100644 drivers/net/ethernet/3com/3c501.c
+ delete mode 100644 drivers/net/ethernet/3com/3c501.h
+ delete mode 100644 drivers/net/ethernet/8390/3c503.c
+ delete mode 100644 drivers/net/ethernet/8390/3c503.h
+ delete mode 100644 drivers/net/ethernet/8390/ac3200.c
+ delete mode 100644 drivers/net/ethernet/8390/e2100.c
+ delete mode 100644 drivers/net/ethernet/8390/es3210.c
+ delete mode 100644 drivers/net/ethernet/8390/hp-plus.c
+ delete mode 100644 drivers/net/ethernet/8390/hp.c
+ delete mode 100644 drivers/net/ethernet/8390/lne390.c
+ delete mode 100644 drivers/net/ethernet/8390/ne3210.c
+ delete mode 100644 drivers/net/ethernet/8390/smc-ultra32.c
+ delete mode 100644 drivers/net/ethernet/amd/depca.c
+ delete mode 100644 drivers/net/ethernet/amd/depca.h
+ create mode 100644 drivers/net/ethernet/broadcom/bgmac.c
+ create mode 100644 drivers/net/ethernet/broadcom/bgmac.h
+ create mode 100644 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+ create mode 100644 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
+ create mode 100644 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+ create mode 100644 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
+ delete mode 100644 drivers/net/ethernet/dec/ewrk3.c
+ delete mode 100644 drivers/net/ethernet/dec/ewrk3.h
+ delete mode 100644 drivers/net/ethernet/dlink/de600.c
+ delete mode 100644 drivers/net/ethernet/dlink/de600.h
+ delete mode 100644 drivers/net/ethernet/dlink/de620.c
+ delete mode 100644 drivers/net/ethernet/dlink/de620.h
+ delete mode 100644 drivers/net/ethernet/fujitsu/at1700.c
+ delete mode 100644 drivers/net/ethernet/fujitsu/eth16i.c
+ delete mode 100644 drivers/net/ethernet/i825xx/3c505.c
+ delete mode 100644 drivers/net/ethernet/i825xx/3c505.h
+ delete mode 100644 drivers/net/ethernet/i825xx/3c507.c
+ delete mode 100644 drivers/net/ethernet/i825xx/eepro.c
+ delete mode 100644 drivers/net/ethernet/i825xx/eexpress.c
+ delete mode 100644 drivers/net/ethernet/i825xx/eexpress.h
+ delete mode 100644 drivers/net/ethernet/i825xx/lp486e.c
+ delete mode 100644 drivers/net/ethernet/i825xx/ni52.c
+ delete mode 100644 drivers/net/ethernet/i825xx/ni52.h
+ delete mode 100644 drivers/net/ethernet/i825xx/znet.c
+ create mode 100644 drivers/net/ethernet/intel/e1000e/80003es2lan.h
+ create mode 100644 drivers/net/ethernet/intel/e1000e/82571.h
+ create mode 100644 drivers/net/ethernet/intel/e1000e/ich8lan.h
+ create mode 100644 drivers/net/ethernet/intel/e1000e/mac.h
+ create mode 100644 drivers/net/ethernet/intel/e1000e/manage.h
+ create mode 100644 drivers/net/ethernet/intel/e1000e/nvm.h
+ create mode 100644 drivers/net/ethernet/intel/e1000e/phy.h
+ create mode 100644 drivers/net/ethernet/intel/e1000e/ptp.c
+ create mode 100644 drivers/net/ethernet/intel/e1000e/regs.h
+ create mode 100644 drivers/net/ethernet/intel/igb/igb_hwmon.c
+ delete mode 100644 drivers/net/ethernet/natsemi/ibmlana.c
+ delete mode 100644 drivers/net/ethernet/natsemi/ibmlana.h
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
+ create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
+ delete mode 100644 drivers/net/ethernet/racal/Kconfig
+ delete mode 100644 drivers/net/ethernet/racal/Makefile
+ delete mode 100644 drivers/net/ethernet/racal/ni5010.c
+ delete mode 100644 drivers/net/ethernet/racal/ni5010.h
+ delete mode 100644 drivers/net/ethernet/seeq/seeq8005.c
+ delete mode 100644 drivers/net/ethernet/seeq/seeq8005.h
+ delete mode 100644 drivers/net/wan/cycx_drv.c
+ delete mode 100644 drivers/net/wan/cycx_main.c
+ delete mode 100644 drivers/net/wan/cycx_x25.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/p2p.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-phy-db.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-phy-db.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/Makefile
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/binding.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/d3.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/debugfs.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/led.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/mac80211.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/mvm.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/nvm.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/ops.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/power.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/quota.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/rs.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/rs.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/rx.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/scan.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/sta.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/sta.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/time-event.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/time-event.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/tx.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/utils.c
+ create mode 100644 drivers/net/wireless/iwlwifi/pcie/7000.c
+ rename drivers/net/wireless/ti/{wlcore/wl12xx_platform_data.c => wilink_platform_data.c} (100%)
+ create mode 100644 drivers/net/wireless/ti/wl12xx/event.c
+ create mode 100644 drivers/net/wireless/ti/wl12xx/event.h
+ create mode 100644 drivers/net/wireless/ti/wl12xx/scan.c
+ create mode 100644 drivers/net/wireless/ti/wl12xx/scan.h
+ create mode 100644 drivers/net/wireless/ti/wl18xx/cmd.c
+ create mode 100644 drivers/net/wireless/ti/wl18xx/cmd.h
+ create mode 100644 drivers/net/wireless/ti/wl18xx/event.c
+ create mode 100644 drivers/net/wireless/ti/wl18xx/event.h
+ create mode 100644 drivers/net/wireless/ti/wl18xx/scan.c
+ create mode 100644 drivers/net/wireless/ti/wl18xx/scan.h
+ create mode 100644 drivers/nfc/microread/Kconfig
+ create mode 100644 drivers/nfc/microread/Makefile
+ create mode 100644 drivers/nfc/microread/i2c.c
+ create mode 100644 drivers/nfc/microread/mei.c
+ create mode 100644 drivers/nfc/microread/microread.c
+ create mode 100644 drivers/nfc/microread/microread.h
+ create mode 100644 drivers/nfc/pn544/Kconfig
+ create mode 100644 drivers/ssb/driver_chipcommon_sflash.c
+ create mode 100644 include/linux/can/led.h
+ create mode 100644 include/linux/can/skb.h
+ delete mode 100644 include/linux/cyclomx.h
+ delete mode 100644 include/linux/cycx_drv.h
+ create mode 100644 include/linux/platform_data/microread.h
+ create mode 100644 include/net/mrp.h
+ create mode 100644 include/net/netfilter/nf_conntrack_labels.h
+ create mode 100644 include/uapi/linux/netfilter/xt_bpf.h
+ create mode 100644 include/uapi/linux/netfilter/xt_connlabel.h
+ create mode 100644 include/uapi/linux/vm_sockets.h
+ create mode 100644 net/802/mrp.c
+ create mode 100644 net/8021q/vlan_mvrp.c
+ create mode 100644 net/bridge/br_vlan.c
+ create mode 100644 net/core/dev_ioctl.c
+ create mode 100644 net/ipv6/ip6_checksum.c
+ create mode 100644 net/mac80211/mesh_ps.c
+ create mode 100644 net/netfilter/nf_conntrack_labels.c
+ create mode 100644 net/netfilter/xt_bpf.c
+ create mode 100644 net/netfilter/xt_connlabel.c
+ create mode 100644 net/vmw_vsock/Kconfig
+ create mode 100644 net/vmw_vsock/Makefile
+ create mode 100644 net/vmw_vsock/af_vsock.c
+ create mode 100644 net/vmw_vsock/af_vsock.h
+ create mode 100644 net/vmw_vsock/vmci_transport.c
+ create mode 100644 net/vmw_vsock/vmci_transport.h
+ create mode 100644 net/vmw_vsock/vmci_transport_notify.c
+ create mode 100644 net/vmw_vsock/vmci_transport_notify.h
+ create mode 100644 net/vmw_vsock/vmci_transport_notify_qstate.c
+ create mode 100644 net/vmw_vsock/vsock_addr.c
+ create mode 100644 net/vmw_vsock/vsock_addr.h
+ delete mode 100644 net/wanrouter/Kconfig
+ delete mode 100644 net/wanrouter/Makefile
+ delete mode 100644 net/wanrouter/patchlevel
+ delete mode 100644 net/wanrouter/wanmain.c
+ delete mode 100644 net/wanrouter/wanproc.c
+$ git revert 18cf0d0784b4
+[master 62420c9] Revert "xfrm: release neighbor upon dst destruction"
+ 1 file changed, 2 deletions(-)
+Merging ipsec-next/master (7cb8a93 xfrm: Allow inserting policies with matching mark and different priorities)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging wireless-next/master (b53cf45 net: wireless: hostap: hostap_ap.c: Return -ENOMEM instead of -1 for if kmalloc() fails.)
+$ git merge wireless-next/master
+Auto-merging drivers/net/wireless/mwifiex/sta_ioctl.c
+Auto-merging drivers/net/wireless/mwifiex/scan.c
+Auto-merging drivers/net/wireless/mwifiex/cmdevt.c
+Auto-merging drivers/net/wireless/mwifiex/cfg80211.c
+Auto-merging drivers/net/wireless/mwifiex/11n.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/80211.tmpl | 4 +-
+ drivers/net/wireless/hostap/hostap_ap.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/commands.h | 1 +
+ drivers/net/wireless/iwlwifi/dvm/tt.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 51 +++--
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 47 ++++-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 10 +-
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 1 +
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 7 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 14 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 6 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 10 +-
+ drivers/net/wireless/mwifiex/11ac.c | 261 ++++++++++++++++++++++++++
+ drivers/net/wireless/mwifiex/11ac.h | 26 +++
+ drivers/net/wireless/mwifiex/11n.c | 7 +-
+ drivers/net/wireless/mwifiex/11n.h | 4 +-
+ drivers/net/wireless/mwifiex/Makefile | 1 +
+ drivers/net/wireless/mwifiex/cfg80211.c | 177 ++++++++++++++---
+ drivers/net/wireless/mwifiex/cfp.c | 159 +++++++++++++++-
+ drivers/net/wireless/mwifiex/cmdevt.c | 19 ++
+ drivers/net/wireless/mwifiex/fw.h | 127 ++++++++++++-
+ drivers/net/wireless/mwifiex/ioctl.h | 4 +
+ drivers/net/wireless/mwifiex/join.c | 8 +
+ drivers/net/wireless/mwifiex/main.h | 23 ++-
+ drivers/net/wireless/mwifiex/pcie.c | 5 +-
+ drivers/net/wireless/mwifiex/scan.c | 63 ++++++-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 2 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 1 +
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 5 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 11 +-
+ drivers/net/wireless/rtlwifi/usb.c | 44 +++--
+ net/mac80211/cfg.c | 14 +-
+ net/mac80211/iface.c | 8 +-
+ net/mac80211/main.c | 3 +-
+ net/mac80211/mesh.c | 116 ++++++------
+ net/mac80211/mesh.h | 105 +++++------
+ net/mac80211/mesh_hwmp.c | 68 +++----
+ net/mac80211/mesh_pathtbl.c | 89 ++++-----
+ net/mac80211/mesh_plink.c | 134 ++++++-------
+ net/mac80211/mesh_sync.c | 47 ++---
+ net/mac80211/rx.c | 12 +-
+ net/mac80211/sta_info.h | 2 -
+ net/mac80211/trace.h | 6 +-
+ net/mac80211/tx.c | 26 ++-
+ net/wireless/nl80211.c | 9 -
+ 45 files changed, 1297 insertions(+), 444 deletions(-)
+ create mode 100644 drivers/net/wireless/mwifiex/11ac.c
+ create mode 100644 drivers/net/wireless/mwifiex/11ac.h
+Merging bluetooth/master (9e97d14 Merge branch 'for-linville' of git://github.com/kvalo/ath6kl)
+$ git merge bluetooth/master
+Already up-to-date.
+Merging mtd/master (0ce82b7 mtd: nand: onfi don't WARN if we are in 16 bits mode)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (be0638d mtd: bcm47xxnflash: use pr_fmt for module prefix in messages)
+$ git merge l2-mtd/master
+Auto-merging include/linux/bcma/bcma_driver_chipcommon.h
+Auto-merging drivers/mtd/nand/nand_base.c
+Auto-merging drivers/mtd/nand/davinci_nand.c
+Auto-merging drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+Auto-merging drivers/mtd/maps/physmap_of.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mtd/elm.txt | 16 +
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 3 +
+ drivers/mtd/Kconfig | 4 +-
+ drivers/mtd/ar7part.c | 6 +
+ drivers/mtd/bcm47xxpart.c | 49 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 217 ++++++++
+ drivers/mtd/cmdlinepart.c | 47 +-
+ drivers/mtd/devices/Makefile | 4 +-
+ drivers/mtd/devices/bcm47xxsflash.c | 55 +-
+ drivers/mtd/devices/bcm47xxsflash.h | 15 +
+ drivers/mtd/devices/elm.c | 404 ++++++++++++++
+ drivers/mtd/devices/m25p80.c | 100 ++++
+ drivers/mtd/maps/Kconfig | 2 +-
+ drivers/mtd/maps/physmap_of.c | 9 +-
+ drivers/mtd/maps/uclinux.c | 30 +-
+ drivers/mtd/nand/atmel_nand.c | 141 ++++-
+ drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 4 +
+ drivers/mtd/nand/bcm47xxnflash/main.c | 14 +-
+ drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 4 +-
+ drivers/mtd/nand/davinci_nand.c | 24 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 233 ++++----
+ drivers/mtd/nand/gpmi-nand/bch-regs.h | 22 +
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 9 +
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 63 ++-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 4 +
+ drivers/mtd/nand/mxc_nand.c | 11 +
+ drivers/mtd/nand/nand_base.c | 8 +-
+ drivers/mtd/nand/nand_ecc.c | 5 +-
+ drivers/mtd/nand/nandsim.c | 6 +-
+ drivers/mtd/nand/omap2.c | 583 +++++++++++++++++++--
+ drivers/mtd/ofpart.c | 7 +
+ drivers/mtd/tests/mtd_nandecctest.c | 10 +-
+ drivers/mtd/tests/mtd_stresstest.c | 8 +-
+ drivers/mtd/tests/mtd_torturetest.c | 25 +-
+ drivers/mtd/ubi/debug.h | 6 +-
+ include/linux/bcma/bcma_driver_chipcommon.h | 1 +
+ include/linux/mtd/map.h | 1 +
+ include/linux/platform_data/elm.h | 54 ++
+ 38 files changed, 1875 insertions(+), 329 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/elm.txt
+ create mode 100644 drivers/mtd/devices/bcm47xxsflash.h
+ create mode 100644 drivers/mtd/devices/elm.c
+ create mode 100644 include/linux/platform_data/elm.h
+Merging crypto/master (7eb9c5d crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.)
+$ git merge crypto/master
+Recorded preimage for 'Documentation/devicetree/bindings/crypto/fsl-sec4.txt'
+Resolved 'crypto/ctr.c' using previous resolution.
+Auto-merging drivers/crypto/omap-sham.c
+Auto-merging drivers/crypto/bfin_crc.c
+Auto-merging drivers/crypto/atmel-aes.c
+Auto-merging crypto/ctr.c
+CONFLICT (content): Merge conflict in crypto/ctr.c
+Auto-merging crypto/Kconfig
+Auto-merging Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'Documentation/devicetree/bindings/crypto/fsl-sec4.txt'.
+[master c9a131d] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/crypto/Makefile | 2 +
+ arch/x86/crypto/aes-i586-asm_32.S | 15 +-
+ arch/x86/crypto/aes-x86_64-asm_64.S | 30 +-
+ arch/x86/crypto/aesni-intel_asm.S | 23 +-
+ arch/x86/crypto/blowfish-x86_64-asm_64.S | 39 +-
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 38 +-
+ arch/x86/crypto/camellia-x86_64-asm_64.S | 50 +-
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 48 +-
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 35 +-
+ arch/x86/crypto/crc32-pclmul_asm.S | 246 +++++++
+ arch/x86/crypto/crc32-pclmul_glue.c | 201 ++++++
+ arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 8 +-
+ arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 +
+ arch/x86/crypto/salsa20-i586-asm_32.S | 28 +-
+ arch/x86/crypto/salsa20-x86_64-asm_64.S | 28 +-
+ arch/x86/crypto/salsa20_glue.c | 5 -
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 35 +-
+ arch/x86/crypto/serpent-sse2-i586-asm_32.S | 20 +-
+ arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 20 +-
+ arch/x86/crypto/sha1_ssse3_asm.S | 10 +-
+ arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 35 +-
+ arch/x86/crypto/twofish-i586-asm_32.S | 11 +-
+ arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 20 +-
+ arch/x86/crypto/twofish-x86_64-asm_64.S | 11 +-
+ crypto/Kconfig | 21 +
+ crypto/Makefile | 1 +
+ crypto/aead.c | 6 +-
+ crypto/algapi.c | 4 +-
+ crypto/authenc.c | 3 +-
+ crypto/authencesn.c | 3 +-
+ crypto/blkcipher.c | 6 +-
+ crypto/ccm.c | 23 +-
+ crypto/chainiv.c | 3 +-
+ crypto/crc32.c | 158 +++++
+ crypto/ctr.c | 6 +-
+ crypto/cts.c | 3 +-
+ crypto/gcm.c | 29 +-
+ crypto/seqiv.c | 3 +-
+ crypto/testmgr.c | 15 +
+ drivers/crypto/atmel-aes.c | 2 +-
+ drivers/crypto/bfin_crc.c | 6 +-
+ drivers/crypto/omap-aes.c | 658 ++++++++++++++-----
+ drivers/crypto/omap-sham.c | 915 +++++++++++++++++++++------
+ drivers/crypto/s5p-sss.c | 4 +-
+ 44 files changed, 2101 insertions(+), 730 deletions(-)
+ create mode 100644 arch/x86/crypto/crc32-pclmul_asm.S
+ create mode 100644 arch/x86/crypto/crc32-pclmul_glue.c
+ create mode 100644 crypto/crc32.c
+Merging drm/drm-next (3314fdf Merge branch 'drm-fb-helper' of git://people.freedesktop.org/~danvet/drm into drm-next)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/radeon/evergreen_cs.c' using previous resolution.
+Auto-merging drivers/gpu/drm/radeon/r600_cs.c
+Auto-merging drivers/gpu/drm/radeon/evergreen_cs.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen_cs.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1600bbb] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 68 +-
+ Documentation/EDID/HOWTO.txt | 27 +-
+ .../devicetree/bindings/video/display-timing.txt | 109 ++
+ drivers/char/agp/intel-gtt.c | 88 +-
+ drivers/gpu/drm/Kconfig | 3 +
+ drivers/gpu/drm/ast/ast_drv.c | 4 +-
+ drivers/gpu/drm/ast/ast_drv.h | 2 +
+ drivers/gpu/drm/ast/ast_fb.c | 27 +-
+ drivers/gpu/drm/ast/ast_main.c | 12 +-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 27 +-
+ drivers/gpu/drm/cirrus/cirrus_main.c | 12 +-
+ drivers/gpu/drm/drm_crtc.c | 806 ++++++++------
+ drivers/gpu/drm/drm_edid.c | 42 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 37 +-
+ drivers/gpu/drm/drm_fb_helper.c | 310 ++++--
+ drivers/gpu/drm/drm_fops.c | 1 +
+ drivers/gpu/drm/drm_irq.c | 11 +-
+ drivers/gpu/drm/drm_mm.c | 96 +-
+ drivers/gpu/drm/drm_modes.c | 70 ++
+ drivers/gpu/drm/drm_pci.c | 81 +-
+ drivers/gpu/drm/drm_prime.c | 186 +++-
+ drivers/gpu/drm/drm_usb.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 39 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 43 +-
+ drivers/gpu/drm/gma500/psb_device.c | 8 +-
+ drivers/gpu/drm/gma500/psb_drv.c | 14 +-
+ drivers/gpu/drm/i2c/Kconfig | 22 +
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +-
+ drivers/gpu/drm/i915/Makefile | 1 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 241 +++-
+ drivers/gpu/drm/i915/i915_dma.c | 93 +-
+ drivers/gpu/drm/i915/i915_drv.c | 118 +-
+ drivers/gpu/drm/i915/i915_drv.h | 453 +++++---
+ drivers/gpu/drm/i915/i915_gem.c | 462 ++++----
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 5 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 333 +++---
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 640 ++++++-----
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 305 ++++--
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 33 +-
+ drivers/gpu/drm/i915/i915_irq.c | 290 +++--
+ drivers/gpu/drm/i915/i915_reg.h | 344 +++---
+ drivers/gpu/drm/i915/i915_suspend.c | 540 +--------
+ drivers/gpu/drm/i915/i915_ums.c | 503 +++++++++
+ drivers/gpu/drm/i915/intel_crt.c | 32 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 54 +-
+ drivers/gpu/drm/i915/intel_display.c | 834 +++++---------
+ drivers/gpu/drm/i915/intel_dp.c | 362 +++---
+ drivers/gpu/drm/i915/intel_drv.h | 30 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 1 -
+ drivers/gpu/drm/i915/intel_fb.c | 55 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 93 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 103 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 170 ++-
+ drivers/gpu/drm/i915/intel_modes.c | 6 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 2 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 24 +-
+ drivers/gpu/drm/i915/intel_pm.c | 77 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 107 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 11 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 67 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 8 +-
+ drivers/gpu/drm/i915/intel_tv.c | 4 +-
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 28 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 16 +-
+ drivers/gpu/drm/nouveau/Kconfig | 23 -
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 22 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 9 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 26 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 22 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.h | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 173 +--
+ drivers/gpu/drm/nouveau/nv04_display.c | 2 +-
+ drivers/gpu/drm/nouveau/nv17_tv.c | 2 +-
+ drivers/gpu/drm/nouveau/nv50_display.c | 10 +
+ drivers/gpu/drm/radeon/Kconfig | 33 +-
+ drivers/gpu/drm/radeon/Makefile | 10 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 6 +-
+ drivers/gpu/drm/radeon/evergreen.c | 353 ++++--
+ drivers/gpu/drm/radeon/evergreen_cs.c | 1149 ++++++++------------
+ drivers/gpu/drm/radeon/evergreen_reg.h | 1 +
+ drivers/gpu/drm/radeon/evergreend.h | 54 +-
+ drivers/gpu/drm/radeon/ni.c | 339 ++++--
+ drivers/gpu/drm/radeon/nid.h | 27 +-
+ drivers/gpu/drm/radeon/r100.c | 224 +---
+ drivers/gpu/drm/radeon/r100_track.h | 4 -
+ drivers/gpu/drm/radeon/r100d.h | 11 -
+ drivers/gpu/drm/radeon/r200.c | 26 +-
+ drivers/gpu/drm/radeon/r300.c | 42 +-
+ drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +
+ drivers/gpu/drm/radeon/r300d.h | 11 -
+ drivers/gpu/drm/radeon/r500_reg.h | 1 +
+ drivers/gpu/drm/radeon/r600.c | 384 ++++---
+ drivers/gpu/drm/radeon/r600_blit.c | 33 +-
+ drivers/gpu/drm/radeon/r600_blit_kms.c | 31 +
+ drivers/gpu/drm/radeon/r600_cp.c | 2 +
+ drivers/gpu/drm/radeon/r600_cs.c | 332 ++----
+ drivers/gpu/drm/radeon/r600d.h | 17 +-
+ drivers/gpu/drm/radeon/radeon.h | 32 +-
+ drivers/gpu/drm/radeon/radeon_asic.c | 52 +-
+ drivers/gpu/drm/radeon/radeon_asic.h | 17 +-
+ drivers/gpu/drm/radeon/radeon_cp.c | 2 +
+ drivers/gpu/drm/radeon/radeon_cs.c | 176 ++-
+ drivers/gpu/drm/radeon/radeon_cursor.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 1 +
+ drivers/gpu/drm/radeon/radeon_display.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 91 +-
+ drivers/gpu/drm/radeon/radeon_drv.h | 16 +-
+ drivers/gpu/drm/radeon/radeon_family.h | 1 +
+ drivers/gpu/drm/radeon/radeon_fb.c | 27 +-
+ drivers/gpu/drm/radeon/radeon_gart.c | 60 +-
+ drivers/gpu/drm/radeon/radeon_irq.c | 2 +
+ drivers/gpu/drm/radeon/radeon_mem.c | 2 +
+ drivers/gpu/drm/radeon/radeon_prime.c | 170 +--
+ drivers/gpu/drm/radeon/radeon_reg.h | 15 +
+ drivers/gpu/drm/radeon/radeon_ring.c | 19 +
+ drivers/gpu/drm/radeon/radeon_state.c | 2 +
+ drivers/gpu/drm/radeon/rv515d.h | 11 -
+ drivers/gpu/drm/radeon/si.c | 478 +++++---
+ drivers/gpu/drm/radeon/sid.h | 25 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +-
+ drivers/gpu/drm/tegra/fb.c | 4 -
+ drivers/gpu/drm/ttm/ttm_bo.c | 103 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c | 78 +-
+ drivers/gpu/drm/udl/udl_drv.h | 2 +
+ drivers/gpu/drm/udl/udl_fb.c | 78 +-
+ drivers/gpu/drm/udl/udl_transfer.c | 46 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 38 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 87 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +-
+ drivers/gpu/vga/vga_switcheroo.c | 3 +
+ drivers/staging/omapdrm/omap_crtc.c | 8 +-
+ drivers/staging/omapdrm/omap_debugfs.c | 2 +
+ drivers/staging/omapdrm/omap_drv.c | 4 +-
+ drivers/staging/omapdrm/omap_fb.c | 16 +-
+ drivers/staging/omapdrm/omap_fbdev.c | 29 +-
+ drivers/tty/vt/vt.c | 136 ++-
+ drivers/video/Kconfig | 21 +
+ drivers/video/Makefile | 4 +
+ drivers/video/console/fbcon.c | 58 +-
+ drivers/video/console/vgacon.c | 22 +-
+ drivers/video/display_timing.c | 24 +
+ drivers/video/fbmem.c | 11 +-
+ drivers/video/fbmon.c | 94 ++
+ drivers/video/fbsysfs.c | 3 +
+ drivers/video/of_display_timing.c | 239 ++++
+ drivers/video/of_videomode.c | 54 +
+ drivers/video/via/hw.c | 6 +-
+ drivers/video/via/hw.h | 2 +-
+ drivers/video/via/lcd.c | 2 +-
+ drivers/video/via/share.h | 2 +-
+ drivers/video/via/via_modesetting.c | 8 +-
+ drivers/video/via/via_modesetting.h | 6 +-
+ drivers/video/videomode.c | 39 +
+ include/drm/drmP.h | 34 +
+ include/drm/drm_crtc.h | 32 +
+ include/drm/drm_fb_helper.h | 18 +-
+ include/drm/drm_mm.h | 40 +
+ include/drm/drm_pciids.h | 13 +
+ include/drm/intel-gtt.h | 21 +-
+ include/drm/ttm/ttm_bo_driver.h | 61 +-
+ include/linux/console.h | 2 +
+ include/linux/fb.h | 8 +
+ include/linux/vt_kern.h | 3 +
+ include/uapi/drm/i915_drm.h | 20 +
+ include/video/display_timing.h | 124 +++
+ include/video/of_display_timing.h | 20 +
+ include/video/of_videomode.h | 18 +
+ include/video/videomode.h | 48 +
+ kernel/printk.c | 9 +
+ 173 files changed, 8812 insertions(+), 6107 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/video/display-timing.txt
+ create mode 100644 drivers/gpu/drm/i2c/Kconfig
+ create mode 100644 drivers/gpu/drm/i915/i915_ums.c
+ create mode 100644 drivers/video/display_timing.c
+ create mode 100644 drivers/video/of_display_timing.c
+ create mode 100644 drivers/video/of_videomode.c
+ create mode 100644 drivers/video/videomode.c
+ create mode 100644 include/video/display_timing.h
+ create mode 100644 include/video/of_display_timing.h
+ create mode 100644 include/video/of_videomode.h
+ create mode 100644 include/video/videomode.h
+Merging drm-intel/drm-intel-next-queued (1a1b91b drm/i915: Remove platforms in the preliminary_hw_support description)
+$ git merge drm-intel/drm-intel-next-queued
+Auto-merging include/linux/pm.h
+Auto-merging drivers/gpu/drm/i915/intel_lvds.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/intel_crt.c
+Auto-merging drivers/gpu/drm/drm_crtc.c
+Merge made by the 'recursive' strategy.
+ drivers/char/agp/intel-gtt.c | 42 +++++++++++-
+ drivers/gpu/drm/drm_crtc.c | 3 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 13 +++-
+ drivers/gpu/drm/i915/i915_dma.c | 1 +
+ drivers/gpu/drm/i915/i915_drv.c | 17 ++---
+ drivers/gpu/drm/i915/i915_drv.h | 24 +++----
+ drivers/gpu/drm/i915/i915_gem.c | 62 +++++++++++------
+ drivers/gpu/drm/i915/i915_gem_context.c | 12 +---
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 23 ++++---
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 9 +--
+ drivers/gpu/drm/i915/i915_irq.c | 104 ++++++++++++-----------------
+ drivers/gpu/drm/i915/i915_reg.h | 92 ++++++++++++++++++-------
+ drivers/gpu/drm/i915/intel_crt.c | 14 ++--
+ drivers/gpu/drm/i915/intel_ddi.c | 25 +++++--
+ drivers/gpu/drm/i915/intel_display.c | 108 ++++++++++++++++++++++++++----
+ drivers/gpu/drm/i915/intel_dp.c | 12 ++--
+ drivers/gpu/drm/i915/intel_drv.h | 4 ++
+ drivers/gpu/drm/i915/intel_hdmi.c | 10 +--
+ drivers/gpu/drm/i915/intel_lvds.c | 80 ++++++++++++----------
+ drivers/gpu/drm/i915/intel_panel.c | 13 ++--
+ drivers/gpu/drm/i915/intel_pm.c | 18 ++++-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 30 ++++++---
+ drivers/video/fbmem.c | 7 ++
+ include/drm/intel-gtt.h | 3 +-
+ include/linux/fb.h | 2 +
+ include/linux/pm.h | 13 ++++
+ kernel/power/console.c | 115 ++++++++++++++++++++++++++++++++
+ 28 files changed, 616 insertions(+), 246 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 1600bbb Merge remote-tracking branch 'drm/drm-next'
+Merging sound/for-next (e6e0ee5 ALSA: hda - Fix the silent speaker output on Fujitsu S7020 laptop)
+$ git merge sound/for-next
+Auto-merging sound/soc/soc-core.c
+Removing sound/soc/omap/zoom2.c
+Removing sound/soc/omap/sdp3430.c
+Removing include/sound/saif.h
+Auto-merging arch/arm/boot/dts/exynos5250.dtsi
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/writing-an-alsa-driver.tmpl | 58 +-
+ Documentation/devicetree/bindings/sound/ak4642.txt | 17 +
+ Documentation/devicetree/bindings/sound/cs4271.txt | 12 +
+ .../bindings/sound/nvidia,tegra-audio-wm9712.txt | 51 +
+ .../bindings/sound/nvidia,tegra20-ac97.txt | 22 +
+ .../devicetree/bindings/sound/omap-twl4030.txt | 46 +
+ .../devicetree/bindings/sound/renesas,fsi.txt | 26 +
+ .../bindings/sound/samsung,smdk-wm8994.txt | 14 +
+ .../devicetree/bindings/sound/samsung-i2s.txt | 63 +
+ .../devicetree/bindings/sound/tlv320aic3x.txt | 6 +
+ Documentation/devicetree/bindings/sound/wm8962.txt | 16 +
+ Documentation/sound/alsa/ALSA-Configuration.txt | 5 +-
+ Documentation/sound/alsa/HD-Audio-Models.txt | 2 +-
+ Documentation/sound/alsa/HD-Audio.txt | 126 +-
+ Documentation/sound/alsa/compress_offload.txt | 46 +
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 26 +
+ arch/arm/boot/dts/exynos5250.dtsi | 44 +-
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 6 +
+ arch/arm/mach-pxa/pxa27x.c | 20 +-
+ arch/arm/mach-shmobile/board-ap4evb.c | 42 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 34 +-
+ arch/arm/mach-shmobile/board-kzm9g.c | 20 +-
+ arch/arm/mach-shmobile/board-mackerel.c | 42 +-
+ arch/arm/plat-samsung/dma-ops.c | 10 +-
+ arch/arm/plat-samsung/include/plat/dma-ops.h | 3 +-
+ arch/arm/plat-samsung/s3c-dma-ops.c | 3 +-
+ arch/sh/boards/mach-ecovec24/setup.c | 27 +-
+ arch/sh/boards/mach-se/7724/setup.c | 29 +-
+ drivers/base/regmap/internal.h | 18 +
+ drivers/base/regmap/regmap-spi.c | 52 +
+ drivers/base/regmap/regmap.c | 301 +-
+ drivers/misc/Kconfig | 2 +-
+ drivers/misc/atmel-ssc.c | 2 +-
+ drivers/spi/spi-s3c64xx.c | 77 +-
+ include/linux/mfd/arizona/pdata.h | 9 +
+ include/linux/regmap.h | 28 +
+ include/sound/compress_driver.h | 8 +
+ include/sound/core.h | 12 +-
+ include/sound/cs4271.h | 15 +
+ include/sound/da7213.h | 52 +
+ include/sound/max98090.h | 29 +
+ include/sound/memalloc.h | 2 +-
+ include/sound/saif.h | 16 -
+ include/sound/sh_fsi.h | 70 +-
+ include/sound/simple_card.h | 12 +-
+ include/sound/soc-dai.h | 8 +-
+ include/sound/soc.h | 6 +-
+ include/sound/tlv320aic3x.h | 10 +
+ include/sound/wm2000.h | 3 -
+ include/sound/wm2200.h | 22 +-
+ include/uapi/sound/compress_offload.h | 31 +-
+ sound/arm/pxa2xx-ac97-lib.c | 8 +-
+ sound/core/compress_offload.c | 114 +-
+ sound/drivers/vx/vx_core.c | 3 +-
+ sound/pci/Kconfig | 1 +
+ sound/pci/ali5451/ali5451.c | 2 +-
+ sound/pci/atiixp.c | 5 +-
+ sound/pci/au88x0/au88x0_pcm.c | 23 +
+ sound/pci/hda/Kconfig | 25 +-
+ sound/pci/hda/ca0132_regs.h | 409 +
+ sound/pci/hda/hda_auto_parser.c | 129 +-
+ sound/pci/hda/hda_auto_parser.h | 81 +-
+ sound/pci/hda/hda_codec.c | 664 +-
+ sound/pci/hda/hda_codec.h | 93 +-
+ sound/pci/hda/hda_generic.c | 5474 +++++++++++--
+ sound/pci/hda/hda_generic.h | 303 +
+ sound/pci/hda/hda_hwdep.c | 87 +-
+ sound/pci/hda/hda_intel.c | 154 +-
+ sound/pci/hda/hda_jack.c | 9 +-
+ sound/pci/hda/hda_local.h | 90 +-
+ sound/pci/hda/hda_proc.c | 35 +-
+ sound/pci/hda/patch_analog.c | 1442 ++--
+ sound/pci/hda/patch_ca0110.c | 490 +-
+ sound/pci/hda/patch_ca0132.c | 4494 ++++++++++-
+ sound/pci/hda/patch_cirrus.c | 1328 +--
+ sound/pci/hda/patch_cmedia.c | 166 +-
+ sound/pci/hda/patch_conexant.c | 1502 +---
+ sound/pci/hda/patch_hdmi.c | 111 +-
+ sound/pci/hda/patch_realtek.c | 4633 ++---------
+ sound/pci/hda/patch_sigmatel.c | 8523 ++++++++------------
+ sound/pci/hda/patch_via.c | 2746 +------
+ sound/pci/ice1712/wm8766.c | 2 +-
+ sound/pci/intel8x0.c | 10 +-
+ sound/pci/maestro3.c | 10 +-
+ sound/pci/nm256/nm256.c | 3 +-
+ sound/pci/pcxhr/pcxhr_core.c | 3 +-
+ sound/pci/rme32.c | 2 +-
+ sound/pci/rme9652/hdsp.c | 462 +-
+ sound/pci/via82xx.c | 2 +-
+ sound/soc/atmel/Kconfig | 6 +-
+ sound/soc/atmel/atmel-pcm-pdc.c | 4 +-
+ sound/soc/atmel/atmel-pcm.c | 2 +-
+ sound/soc/atmel/atmel-pcm.h | 6 +-
+ sound/soc/atmel/atmel_ssc_dai.c | 14 +-
+ sound/soc/atmel/sam9g20_wm8731.c | 6 +-
+ sound/soc/codecs/Kconfig | 6 +-
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/ak4642.c | 33 +-
+ sound/soc/codecs/arizona.c | 253 +-
+ sound/soc/codecs/arizona.h | 8 +-
+ sound/soc/codecs/cs4271.c | 34 +
+ sound/soc/codecs/cs42l52.c | 4 +-
+ sound/soc/codecs/da7213.c | 1599 ++++
+ sound/soc/codecs/da7213.h | 523 ++
+ sound/soc/codecs/max98090.c | 2685 +++++-
+ sound/soc/codecs/max98090.h | 1549 ++++
+ sound/soc/codecs/tlv320aic3x.c | 83 +-
+ sound/soc/codecs/tlv320aic3x.h | 4 +
+ sound/soc/codecs/tlv320dac33.c | 16 -
+ sound/soc/codecs/twl4030.c | 85 +-
+ sound/soc/codecs/twl6040.c | 62 +-
+ sound/soc/codecs/wm2000.c | 35 +-
+ sound/soc/codecs/wm2000.h | 3 +
+ sound/soc/codecs/wm2200.c | 58 +
+ sound/soc/codecs/wm5100.c | 13 +
+ sound/soc/codecs/wm5102.c | 159 +-
+ sound/soc/codecs/wm5110.c | 94 +-
+ sound/soc/codecs/wm8350.c | 10 +-
+ sound/soc/codecs/wm8804.c | 3 -
+ sound/soc/codecs/wm8962.c | 37 +-
+ sound/soc/codecs/wm8983.c | 41 +-
+ sound/soc/codecs/wm8985.c | 43 +-
+ sound/soc/codecs/wm8994.c | 10 +-
+ sound/soc/codecs/wm_adsp.c | 511 +-
+ sound/soc/codecs/wm_adsp.h | 18 +
+ sound/soc/codecs/wmfw.h | 15 +-
+ sound/soc/davinci/davinci-evm.c | 6 +-
+ sound/soc/fsl/imx-audmux.c | 2 +-
+ sound/soc/generic/simple-card.c | 63 +-
+ sound/soc/mxs/mxs-saif.c | 49 +-
+ sound/soc/omap/Kconfig | 19 +-
+ sound/soc/omap/Makefile | 4 -
+ sound/soc/omap/n810.c | 4 +-
+ sound/soc/omap/omap-hdmi.c | 2 +
+ sound/soc/omap/omap-mcpdm.c | 4 -
+ sound/soc/omap/omap-pcm.c | 14 +-
+ sound/soc/omap/omap-twl4030.c | 204 +-
+ sound/soc/omap/omap3pandora.c | 8 +-
+ sound/soc/omap/rx51.c | 8 +-
+ sound/soc/omap/sdp3430.c | 278 -
+ sound/soc/omap/zoom2.c | 207 -
+ sound/soc/pxa/palm27x.c | 38 +-
+ sound/soc/samsung/Kconfig | 6 +-
+ sound/soc/samsung/dma.c | 3 +-
+ sound/soc/samsung/dma.h | 1 +
+ sound/soc/samsung/i2s.c | 267 +-
+ sound/soc/samsung/i2s.h | 7 -
+ sound/soc/samsung/smdk_wm8580.c | 7 +-
+ sound/soc/samsung/smdk_wm8994.c | 30 +-
+ sound/soc/sh/fsi.c | 242 +-
+ sound/soc/soc-compress.c | 123 +-
+ sound/soc/soc-core.c | 135 +-
+ sound/soc/soc-dapm.c | 6 +-
+ sound/soc/soc-pcm.c | 19 +-
+ sound/soc/tegra/Kconfig | 19 +
+ sound/soc/tegra/Makefile | 4 +
+ sound/soc/tegra/tegra20_ac97.c | 480 ++
+ sound/soc/tegra/tegra20_ac97.h | 95 +
+ sound/soc/tegra/tegra20_das.c | 13 +
+ sound/soc/tegra/tegra30_ahub.c | 4 +-
+ sound/soc/tegra/tegra30_i2s.c | 4 +-
+ sound/soc/tegra/tegra_asoc_utils.c | 53 +
+ sound/soc/tegra/tegra_asoc_utils.h | 1 +
+ sound/soc/tegra/tegra_wm9712.c | 176 +
+ sound/usb/caiaq/device.c | 8 +-
+ sound/usb/card.c | 2 +-
+ sound/usb/mixer.c | 1 +
+ sound/usb/mixer_maps.c | 4 +
+ sound/usb/mixer_quirks.c | 72 +-
+ sound/usb/pcm.c | 26 +-
+ sound/usb/quirks-table.h | 71 +
+ sound/usb/quirks.c | 13 +-
+ 172 files changed, 26450 insertions(+), 19625 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/ak4642.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/renesas,fsi.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/samsung,smdk-wm8994.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8962.txt
+ create mode 100644 include/sound/da7213.h
+ create mode 100755 include/sound/max98090.h
+ delete mode 100644 include/sound/saif.h
+ create mode 100644 sound/pci/hda/ca0132_regs.h
+ create mode 100644 sound/pci/hda/hda_generic.h
+ create mode 100644 sound/soc/codecs/da7213.c
+ create mode 100644 sound/soc/codecs/da7213.h
+ mode change 100644 => 100755 sound/soc/codecs/max98090.c
+ create mode 100755 sound/soc/codecs/max98090.h
+ delete mode 100644 sound/soc/omap/sdp3430.c
+ delete mode 100644 sound/soc/omap/zoom2.c
+ create mode 100644 sound/soc/tegra/tegra20_ac97.c
+ create mode 100644 sound/soc/tegra/tegra20_ac97.h
+ create mode 100644 sound/soc/tegra/tegra_wm9712.c
+Merging sound-asoc/for-next (5475931 Merge remote-tracking branch 'asoc/topic/da7213' into asoc-next)
+$ git merge sound-asoc/for-next
+Already up-to-date.
+Merging modules/modules-next (d9d8d7e MODSIGN: Add option to not sign modules during modules_install)
+$ git merge modules/modules-next
+Auto-merging scripts/mod/modpost.c
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 4 +-
+ include/linux/module.h | 4 +-
+ init/Kconfig | 20 ++++++++
+ kernel/Makefile | 22 ++------
+ kernel/module.c | 107 +++++++++++++++++++++++++--------------
+ scripts/mod/modpost.c | 2 +
+ scripts/sign-file | 134 +++++++++++++++++++++++--------------------------
+ 7 files changed, 160 insertions(+), 133 deletions(-)
+Merging pekey/devel-pekey (736c71b PEFILE: Load the contained key if we consider the container to be validly signed)
+$ git merge pekey/devel-pekey
+Auto-merging kernel/system_certificates.S
+Removing kernel/modsign_pubkey.c
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+Merge made by the 'recursive' strategy.
+ crypto/asymmetric_keys/Kconfig | 20 +-
+ crypto/asymmetric_keys/Makefile | 30 ++
+ crypto/asymmetric_keys/mscode.asn1 | 28 ++
+ crypto/asymmetric_keys/mscode_parser.c | 110 +++++
+ crypto/asymmetric_keys/pefile_parser.c | 479 +++++++++++++++++++++
+ crypto/asymmetric_keys/pefile_parser.h | 36 ++
+ crypto/asymmetric_keys/pkcs7.asn1 | 127 ++++++
+ crypto/asymmetric_keys/pkcs7_parser.c | 326 ++++++++++++++
+ crypto/asymmetric_keys/pkcs7_parser.h | 72 ++++
+ crypto/asymmetric_keys/pkcs7_trust.c | 149 +++++++
+ crypto/asymmetric_keys/pkcs7_verify.c | 260 +++++++++++
+ crypto/asymmetric_keys/public_key.c | 60 ++-
+ crypto/asymmetric_keys/public_key.h | 6 +
+ crypto/asymmetric_keys/x509.asn1 | 2 +-
+ crypto/asymmetric_keys/x509_cert_parser.c | 55 ++-
+ crypto/asymmetric_keys/x509_parser.h | 28 +-
+ crypto/asymmetric_keys/x509_public_key.c | 119 ++---
+ include/crypto/public_key.h | 9 +-
+ include/keys/system_keyring.h | 23 +
+ include/linux/key-type.h | 1 +
+ include/linux/key.h | 3 +
+ include/linux/oid_registry.h | 7 +-
+ include/linux/pe.h | 448 +++++++++++++++++++
+ init/Kconfig | 13 +
+ kernel/Makefile | 44 +-
+ kernel/modsign_pubkey.c | 104 -----
+ kernel/module-internal.h | 2 -
+ kernel/module_signing.c | 7 +-
+ ...modsign_certificate.S => system_certificates.S} | 7 +-
+ kernel/system_keyring.c | 103 +++++
+ security/keys/key.c | 8 +
+ security/keys/keyring.c | 4 +
+ 32 files changed, 2475 insertions(+), 215 deletions(-)
+ create mode 100644 crypto/asymmetric_keys/mscode.asn1
+ create mode 100644 crypto/asymmetric_keys/mscode_parser.c
+ create mode 100644 crypto/asymmetric_keys/pefile_parser.c
+ create mode 100644 crypto/asymmetric_keys/pefile_parser.h
+ create mode 100644 crypto/asymmetric_keys/pkcs7.asn1
+ create mode 100644 crypto/asymmetric_keys/pkcs7_parser.c
+ create mode 100644 crypto/asymmetric_keys/pkcs7_parser.h
+ create mode 100644 crypto/asymmetric_keys/pkcs7_trust.c
+ create mode 100644 crypto/asymmetric_keys/pkcs7_verify.c
+ create mode 100644 include/keys/system_keyring.h
+ create mode 100644 include/linux/pe.h
+ delete mode 100644 kernel/modsign_pubkey.c
+ rename kernel/{modsign_certificate.S => system_certificates.S} (72%)
+ create mode 100644 kernel/system_keyring.c
+Merging virtio/virtio-next (8078db7 virtio_console: Initialize guest_connected=true for rproc_serial)
+$ git merge virtio/virtio-next
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/char/virtio_console.c
+Merge made by the 'recursive' strategy.
+ drivers/char/hw_random/virtio-rng.c | 13 +------------
+ drivers/char/virtio_console.c | 18 ++++--------------
+ drivers/lguest/lguest_device.c | 2 +-
+ drivers/net/virtio_net.c | 12 +-----------
+ drivers/remoteproc/remoteproc_virtio.c | 2 +-
+ drivers/s390/kvm/kvm_virtio.c | 2 +-
+ drivers/virtio/virtio_balloon.c | 13 +------------
+ drivers/virtio/virtio_mmio.c | 4 ++--
+ drivers/virtio/virtio_pci.c | 8 ++++----
+ include/linux/virtio.h | 11 ++++++++++-
+ 10 files changed, 26 insertions(+), 59 deletions(-)
+Merging input/next (005a69d Input: cyttsp-spi - remove duplicate MODULE_ALIAS())
+$ git merge input/next
+Removing include/linux/input/tegra_kbc.h
+Auto-merging drivers/tty/sysrq.c
+Auto-merging drivers/input/tablet/wacom_wac.c
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging drivers/input/input-mt.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/imx-keypad.txt | 53 ++
+ .../bindings/input/nvidia,tegra20-kbc.txt | 22 +
+ drivers/input/input-mt.c | 1 +
+ drivers/input/joystick/walkera0701.c | 82 +-
+ drivers/input/keyboard/Kconfig | 12 +-
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/atkbd.c | 74 +-
+ drivers/input/keyboard/goldfish_events.c | 194 ++++
+ drivers/input/keyboard/imx_keypad.c | 43 +-
+ drivers/input/keyboard/qt2160.c | 141 ++-
+ drivers/input/keyboard/tegra-kbc.c | 478 ++++------
+ drivers/input/misc/adxl34x.c | 7 +-
+ drivers/input/misc/bma150.c | 14 +-
+ drivers/input/misc/twl4030-vibra.c | 45 +-
+ drivers/input/misc/twl6040-vibra.c | 100 +--
+ drivers/input/misc/wm831x-on.c | 4 +-
+ drivers/input/mouse/Kconfig | 22 +
+ drivers/input/mouse/Makefile | 2 +
+ drivers/input/mouse/alps.c | 773 ++++++++--------
+ drivers/input/mouse/alps.h | 145 ++-
+ drivers/input/mouse/cyapa.c | 973 +++++++++++++++++++++
+ drivers/input/mouse/cypress_ps2.c | 725 +++++++++++++++
+ drivers/input/mouse/cypress_ps2.h | 191 ++++
+ drivers/input/mouse/psmouse-base.c | 32 +
+ drivers/input/mouse/psmouse.h | 1 +
+ drivers/input/mouse/synaptics.c | 32 +-
+ drivers/input/tablet/wacom_wac.c | 192 ++--
+ drivers/input/tablet/wacom_wac.h | 2 +-
+ drivers/input/touchscreen/cyttsp_spi.c | 1 -
+ drivers/input/touchscreen/mms114.c | 54 +-
+ drivers/input/touchscreen/stmpe-ts.c | 2 +
+ drivers/input/touchscreen/tsc2005.c | 1 +
+ drivers/input/touchscreen/wm831x-ts.c | 4 +-
+ drivers/tty/sysrq.c | 276 ++++--
+ include/linux/bma150.h | 16 +-
+ include/linux/input/adxl34x.h | 2 +
+ include/linux/input/tegra_kbc.h | 62 --
+ include/linux/libps2.h | 2 +-
+ 38 files changed, 3603 insertions(+), 1178 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/imx-keypad.txt
+ create mode 100644 drivers/input/keyboard/goldfish_events.c
+ create mode 100644 drivers/input/mouse/cyapa.c
+ create mode 100644 drivers/input/mouse/cypress_ps2.c
+ create mode 100644 drivers/input/mouse/cypress_ps2.h
+ delete mode 100644 include/linux/input/tegra_kbc.h
+Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (5d30b00 Merge branch 'for-3.9' into for-next)
+$ git merge cgroup/for-next
+Auto-merging tools/cgroup/cgroup_event_listener.c
+Auto-merging kernel/sched/debug.c
+Auto-merging kernel/sched/core.c
+Auto-merging include/linux/sched.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/cgroups/00-INDEX | 2 -
+ Documentation/cgroups/memcg_test.txt | 3 +-
+ MAINTAINERS | 4 +-
+ include/linux/cgroup.h | 3 +-
+ include/linux/sched.h | 3 +
+ kernel/cgroup.c | 288 ++++---
+ kernel/cpuset.c | 884 ++++++++++++---------
+ kernel/sched/auto_group.c | 3 +
+ kernel/sched/core.c | 49 +-
+ kernel/sched/debug.c | 7 -
+ tools/Makefile | 19 +-
+ tools/cgroup/.gitignore | 1 +
+ tools/cgroup/Makefile | 11 +
+ .../cgroup}/cgroup_event_listener.c | 72 +-
+ 14 files changed, 755 insertions(+), 594 deletions(-)
+ create mode 100644 tools/cgroup/.gitignore
+ create mode 100644 tools/cgroup/Makefile
+ rename {Documentation/cgroups => tools/cgroup}/cgroup_event_listener.c (54%)
+Merging block/for-next (2b03d00 Merge branch 'for-3.9/drivers' into for-next)
+$ git merge block/for-next
+Auto-merging kernel/sched/core.c
+Auto-merging fs/buffer.c
+Auto-merging drivers/md/dm.c
+Removing drivers/block/xd.h
+Removing drivers/block/xd.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/block/cfq-iosched.txt | 58 ++
+ Documentation/cgroups/blkio-controller.txt | 35 +-
+ MAINTAINERS | 6 +
+ block/blk-cgroup.c | 277 ++++++-
+ block/blk-cgroup.h | 68 +-
+ block/blk-core.c | 18 +-
+ block/blk-exec.c | 4 +-
+ block/blk-flush.c | 2 +-
+ block/blk-lib.c | 6 +-
+ block/blk-sysfs.c | 9 +-
+ block/blk.h | 2 +-
+ block/cfq-iosched.c | 627 +++++++++++++---
+ block/elevator.c | 23 +-
+ drivers/block/DAC960.c | 1 +
+ drivers/block/Kconfig | 23 +-
+ drivers/block/Makefile | 3 +-
+ drivers/block/mtip32xx/Kconfig | 2 +-
+ drivers/block/mtip32xx/mtip32xx.c | 431 +++++++++--
+ drivers/block/mtip32xx/mtip32xx.h | 48 +-
+ drivers/block/rsxx/Makefile | 2 +
+ drivers/block/rsxx/config.c | 213 ++++++
+ drivers/block/rsxx/core.c | 649 ++++++++++++++++
+ drivers/block/rsxx/cregs.c | 758 +++++++++++++++++++
+ drivers/block/rsxx/dev.c | 367 +++++++++
+ drivers/block/rsxx/dma.c | 998 ++++++++++++++++++++++++
+ drivers/block/rsxx/rsxx.h | 45 ++
+ drivers/block/rsxx/rsxx_cfg.h | 72 ++
+ drivers/block/rsxx/rsxx_priv.h | 399 ++++++++++
+ drivers/block/xd.c | 1123 ----------------------------
+ drivers/block/xd.h | 134 ----
+ drivers/md/dm.c | 1 -
+ drivers/md/raid5.c | 11 +-
+ fs/bio.c | 2 +
+ fs/buffer.c | 10 +
+ fs/fs-writeback.c | 16 +-
+ include/linux/blkdev.h | 3 +-
+ include/linux/blktrace_api.h | 1 +
+ include/linux/buffer_head.h | 2 +-
+ include/linux/completion.h | 3 +
+ include/linux/elevator.h | 5 +-
+ include/trace/events/block.h | 104 ++-
+ include/trace/events/writeback.h | 116 +++
+ kernel/sched/core.c | 57 +-
+ kernel/trace/blktrace.c | 28 +-
+ mm/page-writeback.c | 2 +
+ 45 files changed, 5155 insertions(+), 1609 deletions(-)
+ create mode 100644 drivers/block/rsxx/Makefile
+ create mode 100644 drivers/block/rsxx/config.c
+ create mode 100644 drivers/block/rsxx/core.c
+ create mode 100644 drivers/block/rsxx/cregs.c
+ create mode 100644 drivers/block/rsxx/dev.c
+ create mode 100644 drivers/block/rsxx/dma.c
+ create mode 100644 drivers/block/rsxx/rsxx.h
+ create mode 100644 drivers/block/rsxx/rsxx_cfg.h
+ create mode 100644 drivers/block/rsxx/rsxx_priv.h
+ delete mode 100644 drivers/block/xd.c
+ delete mode 100644 drivers/block/xd.h
+Merging device-mapper/master (3152bf7 Add a persistent bitset as a wrapper around dm-array.)
+$ git merge device-mapper/master
+Auto-merging drivers/md/dm.c
+Merge made by the 'recursive' strategy.
+ drivers/md/Kconfig | 24 +-
+ drivers/md/dm-bio-prison.c | 146 +++--
+ drivers/md/dm-bio-prison.h | 47 +-
+ drivers/md/dm-bufio.c | 2 +-
+ drivers/md/dm-crypt.c | 6 +-
+ drivers/md/dm-delay.c | 4 +-
+ drivers/md/dm-flakey.c | 4 +-
+ drivers/md/dm-ioctl.c | 116 ++--
+ drivers/md/dm-kcopyd.c | 121 +++-
+ drivers/md/dm-linear.c | 6 +-
+ drivers/md/dm-mpath.c | 4 +-
+ drivers/md/dm-raid.c | 2 +-
+ drivers/md/dm-raid1.c | 9 +-
+ drivers/md/dm-snap.c | 17 +-
+ drivers/md/dm-stripe.c | 20 +-
+ drivers/md/dm-table.c | 11 +-
+ drivers/md/dm-target.c | 2 +-
+ drivers/md/dm-thin-metadata.c | 12 +-
+ drivers/md/dm-thin.c | 197 ++++--
+ drivers/md/dm-zero.c | 2 +-
+ drivers/md/dm.c | 337 ++++++-----
+ drivers/md/persistent-data/Kconfig | 2 +-
+ drivers/md/persistent-data/Makefile | 2 +
+ drivers/md/persistent-data/dm-array.c | 808 +++++++++++++++++++++++++
+ drivers/md/persistent-data/dm-array.h | 166 +++++
+ drivers/md/persistent-data/dm-bitset.c | 163 +++++
+ drivers/md/persistent-data/dm-bitset.h | 165 +++++
+ drivers/md/persistent-data/dm-btree-internal.h | 1 +
+ drivers/md/persistent-data/dm-btree-spine.c | 7 +
+ drivers/md/persistent-data/dm-btree.c | 52 ++
+ drivers/md/persistent-data/dm-btree.h | 15 +-
+ include/linux/device-mapper.h | 45 +-
+ include/linux/dm-kcopyd.h | 25 +-
+ include/uapi/linux/dm-ioctl.h | 6 +-
+ 34 files changed, 2129 insertions(+), 417 deletions(-)
+ create mode 100644 drivers/md/persistent-data/dm-array.c
+ create mode 100644 drivers/md/persistent-data/dm-array.h
+ create mode 100644 drivers/md/persistent-data/dm-bitset.c
+ create mode 100644 drivers/md/persistent-data/dm-bitset.h
+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 (63af0fe mmc: tmio: add barriers to IO operations)
+$ git merge mmc/mmc-next
+Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt | 18 +
+ Documentation/devicetree/bindings/mmc/mmc.txt | 34 +-
+ .../devicetree/bindings/mmc/orion-sdio.txt | 17 +
+ .../devicetree/bindings/mmc/synopsis-dw-mshc.txt | 12 +-
+ Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 20 +
+ MAINTAINERS | 10 +-
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 +
+ drivers/mmc/card/block.c | 491 +++++++++++++++++-
+ drivers/mmc/card/queue.c | 128 ++++-
+ drivers/mmc/card/queue.h | 25 +
+ drivers/mmc/core/bus.c | 1 +
+ drivers/mmc/core/core.c | 246 ++++++++-
+ drivers/mmc/core/core.h | 6 +-
+ drivers/mmc/core/host.c | 123 +++++
+ drivers/mmc/core/mmc.c | 46 +-
+ drivers/mmc/core/mmc_ops.c | 1 +
+ drivers/mmc/core/sd.c | 44 +-
+ drivers/mmc/core/sdio.c | 54 +-
+ drivers/mmc/core/slot-gpio.c | 57 ++-
+ drivers/mmc/host/Kconfig | 18 +
+ drivers/mmc/host/Makefile | 2 +
+ drivers/mmc/host/android-goldfish.c | 570 +++++++++++++++++++++
+ drivers/mmc/host/dw_mmc-exynos.c | 10 -
+ drivers/mmc/host/dw_mmc.c | 69 ++-
+ drivers/mmc/host/mvsdio.c | 131 +++--
+ drivers/mmc/host/mxs-mmc.c | 3 +-
+ drivers/mmc/host/of_mmc_spi.c | 2 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 5 -
+ drivers/mmc/host/sdhci-bcm2835.c | 210 ++++++++
+ drivers/mmc/host/sdhci-esdhc-imx.c | 230 +++++----
+ drivers/mmc/host/sdhci-pci.c | 4 +-
+ drivers/mmc/host/sdhci-pltfm.c | 8 +
+ drivers/mmc/host/sdhci-pltfm.h | 2 +
+ drivers/mmc/host/sdhci-pxav2.c | 11 +-
+ drivers/mmc/host/sdhci-pxav3.c | 117 ++++-
+ drivers/mmc/host/sdhci-s3c.c | 8 +-
+ drivers/mmc/host/sdhci-tegra.c | 4 +-
+ drivers/mmc/host/sdhci.c | 448 ++++++++--------
+ drivers/mmc/host/sdhci.h | 14 +-
+ drivers/mmc/host/sh_mmcif.c | 281 +++++-----
+ drivers/mmc/host/sh_mobile_sdhi.c | 96 ++--
+ drivers/mmc/host/tmio_mmc.h | 18 +-
+ drivers/mmc/host/tmio_mmc_pio.c | 87 +++-
+ drivers/mmc/host/wmt-sdmmc.c | 2 +-
+ include/linux/mfd/tmio.h | 18 -
+ include/linux/mmc/card.h | 22 +-
+ include/linux/mmc/core.h | 7 +-
+ include/linux/mmc/dw_mmc.h | 6 +-
+ include/linux/mmc/host.h | 61 ++-
+ include/linux/mmc/mmc.h | 15 +-
+ include/linux/mmc/sdhci.h | 1 +
+ include/linux/mmc/sh_mobile_sdhi.h | 2 -
+ include/linux/platform_data/mmc-esdhc-imx.h | 1 +
+ 53 files changed, 3029 insertions(+), 788 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/tmio_mmc.txt
+ create mode 100644 drivers/mmc/host/android-goldfish.c
+ create mode 100644 drivers/mmc/host/sdhci-bcm2835.c
+Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (b1e0541 mm/sl[au]b: correct allocation type check in kmalloc_slab())
+$ 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 | 182 +---------
+ 9 files changed, 739 insertions(+), 902 deletions(-)
+ delete mode 100644 include/linux/kmalloc_sizes.h
+Merging uclinux/for-next (b69f085 Linux 3.7-rc8)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (1060071 raid5: create multiple threads to handle stripes)
+$ git merge md/for-next
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/dm-raid.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/dm-raid.txt | 44 +++-
+ drivers/md/dm-raid.c | 123 ++++++++--
+ drivers/md/md.c | 8 +-
+ drivers/md/md.h | 8 +
+ drivers/md/raid1.c | 7 +-
+ drivers/md/raid10.c | 96 ++++++--
+ drivers/md/raid10.h | 5 +
+ drivers/md/raid5.c | 408 ++++++++++++++++++++++++++++++--
+ drivers/md/raid5.h | 19 ++
+ 9 files changed, 644 insertions(+), 74 deletions(-)
+Merging mfd/for-next (ff7109f mfd: lpc_ich: Use devres API to allocate private data)
+$ git merge mfd/for-next
+Auto-merging include/linux/mfd/arizona/pdata.h
+Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c
+Auto-merging drivers/gpio/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/max8925.txt | 64 +
+ .../bindings/power_supply/max8925_batter.txt | 18 +
+ .../devicetree/bindings/regulator/tps65090.txt | 122 ++
+ .../bindings/video/backlight/max8925-backlight.txt | 10 +
+ arch/arm/boot/dts/mmp2-brownstone.dts | 158 +++
+ arch/arm/boot/dts/mmp2.dtsi | 4 +-
+ arch/arm/mach-omap2/board-zoom-display.c | 14 +-
+ drivers/gpio/Kconfig | 7 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-palmas.c | 184 +++
+ drivers/input/misc/max8925_onkey.c | 3 -
+ drivers/memstick/host/rtsx_pci_ms.c | 7 +
+ drivers/mfd/88pm800.c | 10 +-
+ drivers/mfd/88pm805.c | 4 +-
+ drivers/mfd/88pm80x.c | 22 +-
+ drivers/mfd/Kconfig | 72 +-
+ drivers/mfd/Makefile | 2 +-
+ drivers/mfd/ab8500-core.c | 61 +-
+ drivers/mfd/ab8500-debugfs.c | 1248 +++++++++++++++++++-
+ drivers/mfd/ab8500-gpadc.c | 90 +-
+ drivers/mfd/ab8500-sysctrl.c | 92 ++
+ drivers/mfd/abx500-core.c | 16 +
+ drivers/mfd/arizona-core.c | 55 +-
+ drivers/mfd/da9052-i2c.c | 3 +-
+ drivers/mfd/db8500-prcmu.c | 17 +
+ drivers/mfd/lpc_ich.c | 144 ++-
+ drivers/mfd/lpc_sch.c | 147 ++-
+ drivers/mfd/max8925-core.c | 89 +-
+ drivers/mfd/max8925-i2c.c | 36 +-
+ drivers/mfd/omap-usb-host.c | 558 +++++----
+ drivers/mfd/omap-usb-tll.c | 243 ++--
+ drivers/mfd/palmas.c | 14 +-
+ drivers/mfd/rtl8411.c | 16 +-
+ drivers/mfd/rts5209.c | 8 +
+ drivers/mfd/rts5227.c | 234 ++++
+ drivers/mfd/rts5229.c | 8 +
+ drivers/mfd/rtsx_pcr.c | 98 +-
+ drivers/mfd/rtsx_pcr.h | 4 +
+ drivers/mfd/syscon.c | 1 +
+ drivers/mfd/tps6507x.c | 9 +
+ drivers/mfd/tps65090.c | 47 +-
+ drivers/mfd/twl-core.c | 370 +++---
+ drivers/mfd/vexpress-sysreg.c | 83 +-
+ drivers/mfd/wm5102-tables.c | 131 +-
+ drivers/mfd/wm8994-core.c | 7 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 18 +
+ drivers/rtc/Kconfig | 10 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-palmas.c | 339 ++++++
+ drivers/usb/host/ehci-omap.c | 6 +-
+ drivers/video/backlight/max8925_bl.c | 31 +-
+ drivers/watchdog/Kconfig | 12 +
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/ux500_wdt.c | 171 +++
+ include/linux/i2c/twl.h | 84 +-
+ include/linux/mfd/88pm80x.h | 2 +-
+ include/linux/mfd/abx500.h | 2 +
+ include/linux/mfd/abx500/ab8500-sysctrl.h | 5 +
+ include/linux/mfd/abx500/ab8500.h | 12 +
+ include/linux/mfd/arizona/pdata.h | 12 +
+ include/linux/mfd/arizona/registers.h | 16 +
+ include/linux/mfd/dbx500-prcmu.h | 12 +
+ include/linux/mfd/max8925.h | 3 +-
+ include/linux/mfd/palmas.h | 52 +
+ include/linux/mfd/rtsx_pci.h | 9 +-
+ include/linux/platform_data/usb-omap.h | 9 +-
+ include/linux/platform_data/ux500_wdt.h | 19 +
+ include/linux/vexpress.h | 8 +
+ 68 files changed, 4309 insertions(+), 1056 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/max8925.txt
+ create mode 100644 Documentation/devicetree/bindings/power_supply/max8925_batter.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/tps65090.txt
+ create mode 100644 Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt
+ create mode 100644 drivers/gpio/gpio-palmas.c
+ create mode 100644 drivers/mfd/rts5227.c
+ create mode 100644 drivers/rtc/rtc-palmas.c
+ create mode 100644 drivers/watchdog/ux500_wdt.c
+ create mode 100644 include/linux/platform_data/ux500_wdt.h
+Merging battery/master (ac6324e bq2415x_charger: Add support for offline and 100mA mode)
+$ git merge battery/master
+Resolved 'drivers/power/ab8500_bmdata.c' using previous resolution.
+Resolved 'include/linux/mfd/abx500/ab8500-bm.h' using previous resolution.
+Resolved 'include/linux/mfd/abx500/ab8500.h' using previous resolution.
+Auto-merging include/linux/mfd/abx500/ab8500.h
+CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500.h
+Auto-merging include/linux/mfd/abx500/ab8500-bm.h
+CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500-bm.h
+Auto-merging include/linux/mfd/abx500.h
+Auto-merging drivers/power/ab8500_bmdata.c
+CONFLICT (content): Merge conflict in drivers/power/ab8500_bmdata.c
+Auto-merging drivers/mfd/ab8500-core.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6c098fb] Merge remote-tracking branch 'battery/master'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/power_supply/qnap-poweroff.txt | 13 +
+ .../bindings/power_supply/restart-poweroff.txt | 8 +
+ MAINTAINERS | 16 +
+ drivers/mfd/ab8500-core.c | 14 +-
+ drivers/power/88pm860x_battery.c | 13 +-
+ drivers/power/Kconfig | 14 +
+ drivers/power/Makefile | 4 +-
+ drivers/power/ab8500_bmdata.c | 523 +++++-----
+ drivers/power/ab8500_btemp.c | 192 ++--
+ drivers/power/ab8500_charger.c | 1067 +++++++++++++++----
+ drivers/power/ab8500_fg.c | 447 +++++---
+ drivers/power/abx500_chargalg.c | 204 ++--
+ drivers/power/bq2415x_charger.c | 54 +-
+ drivers/power/bq27x00_battery.c | 12 +-
+ drivers/power/charger-manager.c | 310 +++---
+ drivers/power/da9030_battery.c | 1 +
+ drivers/power/da9052-battery.c | 2 +-
+ drivers/power/ds2782_battery.c | 69 ++
+ drivers/power/generic-adc-battery.c | 16 +-
+ drivers/power/goldfish_battery.c | 236 +++++
+ drivers/power/lp8727_charger.c | 8 +-
+ drivers/power/lp8788-charger.c | 17 +-
+ drivers/power/max17040_battery.c | 4 +-
+ drivers/power/pm2301_charger.c | 1088 ++++++++++++++++++++
+ drivers/power/pm2301_charger.h | 513 +++++++++
+ drivers/power/power_supply_sysfs.c | 3 +-
+ drivers/power/reset/Kconfig | 17 +
+ drivers/power/reset/Makefile | 2 +
+ drivers/power/reset/qnap-poweroff.c | 116 +++
+ drivers/power/reset/restart-poweroff.c | 65 ++
+ include/linux/mfd/abx500.h | 15 +-
+ include/linux/mfd/abx500/ab8500-bm.h | 31 +-
+ include/linux/mfd/abx500/ab8500.h | 25 +
+ include/linux/mfd/abx500/ux500_chargalg.h | 5 +
+ include/linux/pm2301_charger.h | 61 ++
+ include/linux/power/bq2415x_charger.h | 3 +-
+ include/linux/power_supply.h | 2 +
+ 37 files changed, 4202 insertions(+), 988 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
+ create mode 100644 Documentation/devicetree/bindings/power_supply/restart-poweroff.txt
+ create mode 100644 drivers/power/goldfish_battery.c
+ create mode 100644 drivers/power/pm2301_charger.c
+ create mode 100644 drivers/power/pm2301_charger.h
+ create mode 100644 drivers/power/reset/qnap-poweroff.c
+ create mode 100644 drivers/power/reset/restart-poweroff.c
+ create mode 100644 include/linux/pm2301_charger.h
+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 (797cbe2 Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging sound/soc/codecs/wm5110.c
+Auto-merging sound/soc/codecs/wm5102.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/tps6507x.txt | 91 ++++
+ .../bindings/regulator/anatop-regulator.txt | 8 +
+ .../bindings/regulator/s5m8767-regulator.txt | 152 ++++++
+ .../bindings/regulator/tps51632-regulator.txt | 27 +
+ arch/arm/mach-ux500/board-mop500-regulators.c | 56 +-
+ drivers/mfd/sec-core.c | 75 ++-
+ drivers/regulator/88pm8607.c | 40 +-
+ drivers/regulator/Kconfig | 10 +
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/ab8500.c | 275 ++++++++--
+ drivers/regulator/anatop-regulator.c | 41 ++
+ drivers/regulator/arizona-micsupp.c | 78 ++-
+ drivers/regulator/as3711-regulator.c | 2 +-
+ drivers/regulator/core.c | 43 +-
+ drivers/regulator/da9052-regulator.c | 46 +-
+ drivers/regulator/da9055-regulator.c | 3 -
+ drivers/regulator/gpio-regulator.c | 7 +-
+ drivers/regulator/lp3971.c | 22 +-
+ drivers/regulator/lp3972.c | 22 +-
+ drivers/regulator/lp872x.c | 36 +-
+ drivers/regulator/lp8755.c | 566 +++++++++++++++++++++
+ drivers/regulator/lp8788-buck.c | 41 +-
+ drivers/regulator/lp8788-ldo.c | 133 +----
+ drivers/regulator/max77686.c | 14 +-
+ drivers/regulator/max8907-regulator.c | 7 +-
+ drivers/regulator/max8925-regulator.c | 3 +-
+ drivers/regulator/max8997.c | 89 +---
+ drivers/regulator/max8998.c | 14 +-
+ drivers/regulator/mc13892-regulator.c | 111 +++-
+ drivers/regulator/mc13xxx-regulator-core.c | 25 +-
+ drivers/regulator/mc13xxx.h | 4 +-
+ drivers/regulator/palmas-regulator.c | 7 +-
+ drivers/regulator/s5m8767.c | 268 +++++++---
+ drivers/regulator/tps51632-regulator.c | 152 ++++--
+ drivers/regulator/tps6507x-regulator.c | 92 ++++
+ drivers/regulator/tps65090-regulator.c | 106 +++-
+ drivers/regulator/tps6586x-regulator.c | 54 +-
+ drivers/regulator/tps65910-regulator.c | 6 +-
+ include/linux/mfd/samsung/core.h | 11 +-
+ include/linux/platform_data/lp8755.h | 71 +++
+ include/linux/regulator/ab8500.h | 8 +
+ include/linux/regulator/driver.h | 6 +
+ sound/soc/codecs/wm5102.c | 4 +
+ sound/soc/codecs/wm5110.c | 4 +
+ 44 files changed, 2214 insertions(+), 617 deletions(-)
+ create mode 100755 Documentation/devicetree/bindings/mfd/tps6507x.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/tps51632-regulator.txt
+ create mode 100644 drivers/regulator/lp8755.c
+ create mode 100644 include/linux/platform_data/lp8755.h
+Merging security/next (5b26603 tpm/ibmvtpm: build only when IBM pseries is configured)
+$ git merge security/next
+Resolved 'lib/digsig.c' using previous resolution.
+Resolved 'security/integrity/ima/ima_main.c' using previous resolution.
+Auto-merging security/integrity/ima/ima_policy.c
+Auto-merging security/integrity/ima/ima_main.c
+CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c
+Auto-merging security/integrity/ima/ima.h
+Auto-merging security/integrity/evm/evm_crypto.c
+Auto-merging lib/digsig.c
+CONFLICT (content): Merge conflict in lib/digsig.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2c420dc] Merge remote-tracking branch 'security/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-class-tpm | 185 +++++++
+ Documentation/ABI/testing/ima_policy | 10 +-
+ drivers/char/tpm/Kconfig | 12 +-
+ drivers/char/tpm/Makefile | 1 +
+ drivers/char/tpm/tpm.c | 114 ++--
+ drivers/char/tpm/tpm.h | 52 +-
+ drivers/char/tpm/tpm_acpi.c | 8 +-
+ drivers/char/tpm/tpm_atmel.c | 7 +-
+ drivers/char/tpm/tpm_i2c_infineon.c | 7 +-
+ drivers/char/tpm/tpm_i2c_stm_st33.c | 887 +++++++++++++++++++++++++++++++
+ drivers/char/tpm/tpm_i2c_stm_st33.h | 61 +++
+ drivers/char/tpm/tpm_ibmvtpm.c | 15 +-
+ drivers/char/tpm/tpm_nsc.c | 7 +-
+ drivers/char/tpm/tpm_tis.c | 64 ++-
+ lib/digsig.c | 41 +-
+ lib/mpi/mpi-internal.h | 4 -
+ lib/mpi/mpicoder.c | 8 +-
+ security/integrity/Kconfig | 12 +
+ security/integrity/Makefile | 1 +
+ security/integrity/digsig.c | 11 +-
+ security/integrity/digsig_asymmetric.c | 115 ++++
+ security/integrity/evm/Kconfig | 13 +
+ security/integrity/evm/evm.h | 2 +-
+ security/integrity/evm/evm_crypto.c | 3 +
+ security/integrity/evm/evm_main.c | 10 +-
+ security/integrity/evm/evm_secfs.c | 6 -
+ security/integrity/iint.c | 10 +-
+ security/integrity/ima/ima.h | 21 +-
+ security/integrity/ima/ima_api.c | 27 +-
+ security/integrity/ima/ima_appraise.c | 92 +++-
+ security/integrity/ima/ima_crypto.c | 81 ++-
+ security/integrity/ima/ima_init.c | 3 +
+ security/integrity/ima/ima_main.c | 138 +++--
+ security/integrity/ima/ima_policy.c | 138 ++++-
+ security/integrity/integrity.h | 62 ++-
+ 35 files changed, 1918 insertions(+), 310 deletions(-)
+ create mode 100644 Documentation/ABI/stable/sysfs-class-tpm
+ create mode 100644 drivers/char/tpm/tpm_i2c_stm_st33.c
+ create mode 100644 drivers/char/tpm/tpm_i2c_stm_st33.h
+ create mode 100644 security/integrity/digsig_asymmetric.c
+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 (fbf57548 watchdog: add timeout-sec property binding)
+$ git merge watchdog/master
+Resolved 'drivers/watchdog/Kconfig' using previous resolution.
+Resolved 'drivers/watchdog/Makefile' using previous resolution.
+Removing drivers/watchdog/stmp3xxx_wdt.c
+Auto-merging drivers/watchdog/Makefile
+CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
+Auto-merging drivers/watchdog/Kconfig
+CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 46bb752] Merge remote-tracking branch 'watchdog/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/watchdog/atmel-wdt.txt | 4 +
+ .../devicetree/bindings/watchdog/marvel.txt | 5 +
+ .../devicetree/bindings/watchdog/pnx4008-wdt.txt | 4 +
+ .../bindings/watchdog/qca-ar7130-wdt.txt | 13 +
+ .../devicetree/bindings/watchdog/samsung-wdt.txt | 3 +
+ Documentation/watchdog/watchdog-kernel-api.txt | 14 +-
+ arch/mips/ath79/dev-common.c | 15 +-
+ drivers/rtc/rtc-stmp3xxx.c | 64 ++++
+ drivers/watchdog/Kconfig | 31 +-
+ drivers/watchdog/Makefile | 3 +-
+ drivers/watchdog/at91sam9_wdt.c | 168 +++-------
+ drivers/watchdog/ath79_wdt.c | 66 +++-
+ drivers/watchdog/bcm47xx_wdt.c | 339 +++++++++------------
+ drivers/watchdog/booke_wdt.c | 185 ++++-------
+ drivers/watchdog/gef_wdt.c | 1 +
+ drivers/watchdog/omap_wdt.c | 6 +-
+ drivers/watchdog/orion_wdt.c | 11 +-
+ drivers/watchdog/pnx4008_wdt.c | 7 +-
+ drivers/watchdog/retu_wdt.c | 178 +++++++++++
+ drivers/watchdog/s3c2410_wdt.c | 48 +--
+ drivers/watchdog/sp5100_tco.c | 27 +-
+ drivers/watchdog/stmp3xxx_rtc_wdt.c | 111 +++++++
+ drivers/watchdog/stmp3xxx_wdt.c | 288 -----------------
+ drivers/watchdog/watchdog_core.c | 66 +++-
+ drivers/watchdog/watchdog_dev.c | 3 +-
+ include/linux/bcm47xx_wdt.h | 9 +
+ include/linux/stmp3xxx_rtc_wdt.h | 15 +
+ include/linux/watchdog.h | 9 +
+ 28 files changed, 862 insertions(+), 831 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/qca-ar7130-wdt.txt
+ create mode 100644 drivers/watchdog/retu_wdt.c
+ create mode 100644 drivers/watchdog/stmp3xxx_rtc_wdt.c
+ delete mode 100644 drivers/watchdog/stmp3xxx_wdt.c
+ create mode 100644 include/linux/stmp3xxx_rtc_wdt.h
+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 (c2c25cf Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next)
+$ git merge iommu/next
+Resolved 'arch/arm/mach-exynos/mach-exynos5-dt.c' using previous resolution.
+Auto-merging arch/arm/mach-exynos/mach-exynos5-dt.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-exynos5-dt.c
+Removing arch/arm/mach-exynos/include/mach/sysmmu.h
+Removing arch/arm/mach-exynos/dev-sysmmu.c
+Auto-merging arch/arm/mach-exynos/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9e8601a] Merge remote-tracking branch 'iommu/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-exynos/Kconfig | 5 -
+ arch/arm/mach-exynos/Makefile | 1 -
+ arch/arm/mach-exynos/clock-exynos4.c | 41 ++-
+ arch/arm/mach-exynos/clock-exynos4210.c | 9 +-
+ arch/arm/mach-exynos/clock-exynos4212.c | 23 +-
+ arch/arm/mach-exynos/clock-exynos5.c | 62 ++---
+ arch/arm/mach-exynos/dev-sysmmu.c | 274 --------------------
+ arch/arm/mach-exynos/include/mach/sysmmu.h | 66 -----
+ arch/arm/mach-exynos/mach-exynos4-dt.c | 34 +++
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 30 +++
+ arch/arm/mach-shmobile/setup-r8a7740.c | 33 +++
+ arch/arm/mach-shmobile/setup-sh7372.c | 39 +++
+ arch/arm/mach-shmobile/setup-sh73a0.c | 31 +++
+ drivers/iommu/Kconfig | 76 +++++-
+ drivers/iommu/Makefile | 2 +
+ drivers/iommu/amd_iommu.c | 3 +-
+ drivers/iommu/amd_iommu_init.c | 10 +-
+ drivers/iommu/dmar.c | 2 +-
+ drivers/iommu/exynos-iommu.c | 2 +-
+ drivers/iommu/iommu.c | 66 ++++-
+ drivers/iommu/omap-iommu.c | 4 +-
+ drivers/iommu/shmobile-iommu.c | 395 +++++++++++++++++++++++++++++
+ drivers/iommu/shmobile-ipmmu.c | 136 ++++++++++
+ drivers/iommu/shmobile-ipmmu.h | 34 +++
+ drivers/iommu/tegra-smmu.c | 71 +++---
+ include/linux/iommu.h | 30 ++-
+ include/linux/platform_data/sh_ipmmu.h | 18 ++
+ 27 files changed, 1041 insertions(+), 456 deletions(-)
+ delete mode 100644 arch/arm/mach-exynos/dev-sysmmu.c
+ delete mode 100644 arch/arm/mach-exynos/include/mach/sysmmu.h
+ create mode 100644 drivers/iommu/shmobile-iommu.c
+ create mode 100644 drivers/iommu/shmobile-ipmmu.c
+ create mode 100644 drivers/iommu/shmobile-ipmmu.h
+ create mode 100644 include/linux/platform_data/sh_ipmmu.h
+Merging vfio/next (84237a8 vfio-pci: Add support for VGA region access)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/Kconfig | 10 ++
+ drivers/vfio/pci/vfio_pci.c | 75 ++++++----
+ drivers/vfio/pci/vfio_pci_config.c | 52 +++++--
+ drivers/vfio/pci/vfio_pci_private.h | 19 +--
+ drivers/vfio/pci/vfio_pci_rdwr.c | 281 ++++++++++++++++--------------------
+ drivers/vfio/vfio.c | 35 ++---
+ include/uapi/linux/vfio.h | 9 ++
+ 7 files changed, 254 insertions(+), 227 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 (df63447 DocBook: update EXPORT_SYMBOL entry to point at export.h)
+$ git merge trivial/for-next
+Resolved 'arch/mips/cavium-octeon/executive/cvmx-helper-util.c' using previous resolution.
+Resolved 'arch/mips/include/asm/octeon/cvmx-helper-util.h' using previous resolution.
+Auto-merging sound/soc/codecs/wm8985.c
+Auto-merging sound/soc/codecs/wm8983.c
+Auto-merging net/sctp/sm_make_chunk.c
+Auto-merging net/bluetooth/hci_core.c
+Auto-merging fs/btrfs/transaction.c
+Auto-merging fs/btrfs/extent-tree.c
+Auto-merging drivers/staging/octeon/ethernet.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/media/platform/soc_camera/mx2_camera.c
+Auto-merging drivers/hid/Kconfig
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/powerpc/platforms/85xx/p1022_ds.c
+Auto-merging arch/mips/include/asm/octeon/cvmx-helper-util.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/cvmx-helper-util.h
+Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+Auto-merging Documentation/00-INDEX
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d52d69e] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/00-INDEX | 149 +++++++++++++++++++--
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 14 --
+ Documentation/DocBook/kernel-hacking.tmpl | 4 +-
+ Documentation/x86/x86_64/boot-options.txt | 4 -
+ arch/h8300/README | 2 +-
+ .../cavium-octeon/executive/cvmx-helper-util.c | 4 +-
+ arch/mips/include/asm/octeon/cvmx-helper-util.h | 4 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c | 8 +-
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 4 +-
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
+ arch/xtensa/Kconfig | 2 +-
+ drivers/bluetooth/ath3k.c | 2 +-
+ drivers/devfreq/exynos4_bus.c | 2 +-
+ drivers/firewire/ohci.c | 2 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
+ drivers/hid/Kconfig | 2 +-
+ drivers/ide/Kconfig | 5 -
+ drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +-
+ drivers/isdn/hardware/eicon/divacapi.h | 6 +-
+ drivers/isdn/hardware/eicon/pc.h | 4 +-
+ drivers/isdn/mISDN/l1oip_core.c | 2 +-
+ drivers/media/platform/soc_camera/mx2_camera.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
+ drivers/net/ethernet/marvell/mvneta.c | 1 -
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-
+ drivers/net/irda/ali-ircc.c | 2 +-
+ drivers/of/address.c | 2 +-
+ drivers/of/platform.c | 1 +
+ drivers/pcmcia/rsrc_nonstatic.c | 6 +-
+ drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
+ drivers/scsi/Kconfig | 2 +-
+ drivers/staging/android/binder.h | 2 +-
+ drivers/staging/octeon/ethernet.c | 2 +-
+ drivers/target/sbp/sbp_target.c | 2 +-
+ drivers/tty/ipwireless/hardware.c | 4 +-
+ fs/btrfs/extent-tree.c | 6 +-
+ fs/btrfs/relocation.c | 4 +-
+ fs/btrfs/transaction.c | 1 -
+ fs/cifs/link.c | 2 +-
+ fs/hpfs/inode.c | 2 +-
+ fs/jfs/super.c | 2 +-
+ fs/ocfs2/cluster/tcp.c | 2 +-
+ fs/qnx6/inode.c | 2 +-
+ include/linux/dma-buf.h | 2 +-
+ include/linux/percpu_counter.h | 2 +-
+ include/net/irda/irlmp.h | 2 +-
+ include/net/irda/irttp.h | 2 +-
+ net/bluetooth/hci_core.c | 2 +-
+ net/caif/cfcnfg.c | 2 +-
+ net/irda/timer.c | 2 +-
+ net/sctp/sm_make_chunk.c | 2 +-
+ scripts/basic/fixdep.c | 2 +-
+ sound/soc/codecs/ab8500-codec.c | 2 +-
+ sound/soc/codecs/wm8974.c | 6 +-
+ sound/soc/codecs/wm8978.c | 6 +-
+ sound/soc/codecs/wm8983.c | 6 +-
+ sound/soc/codecs/wm8985.c | 6 +-
+ 58 files changed, 215 insertions(+), 110 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 (1c06910 i7core_edac: fix kernel crash on unloading i7core_edac.)
+$ git merge edac/linux_next
+Auto-merging drivers/edac/sb_edac.c
+Auto-merging drivers/edac/i7core_edac.c
+Auto-merging drivers/edac/edac_pci_sysfs.c
+Auto-merging drivers/edac/edac_mc.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 7 -------
+ drivers/edac/edac_pci_sysfs.c | 2 +-
+ drivers/edac/i7core_edac.c | 8 ++++----
+ drivers/edac/sb_edac.c | 2 +-
+ include/linux/edac.h | 1 -
+ 5 files changed, 6 insertions(+), 14 deletions(-)
+Merging edac-amd/for-next (e7d2c21 mpc85xx_edac: Fix typo)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/amd64_edac.c | 105 ----------------------------
+ drivers/edac/mce_amd.c | 166 ++++++++++++++++++++++++++++++--------------
+ drivers/edac/mce_amd.h | 13 ++--
+ drivers/edac/mpc85xx_edac.c | 4 +-
+ 4 files changed, 120 insertions(+), 168 deletions(-)
+Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add")
+$ git merge devicetree/devicetree/next
+Auto-merging drivers/dma/bestcomm/bestcomm.c
+Auto-merging Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/atmel-aic.txt | 2 +-
+ Documentation/devicetree/bindings/arm/gic.txt | 4 +-
+ .../devicetree/bindings/arm/omap/omap.txt | 6 +-
+ .../devicetree/bindings/drm/exynos/g2d.txt | 22 ++
+ .../devicetree/bindings/input/lpc32xx-key.txt | 9 +-
+ .../devicetree/bindings/input/matrix-keymap.txt | 8 +
+ .../devicetree/bindings/input/omap-keypad.txt | 13 +-
+ .../devicetree/bindings/input/tca8418_keypad.txt | 6 +-
+ .../bindings/{gpio => leds}/leds-ns2.txt | 0
+ .../devicetree/bindings/mips/cavium/dma-engine.txt | 2 +-
+ .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 8 +-
+ .../devicetree/bindings/mmc/samsung-sdhci.txt | 2 +-
+ .../devicetree/bindings/powerpc/fsl/srio.txt | 4 +-
+ .../bindings/regulator/tps62360-regulator.txt | 4 +-
+ Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 2 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 3 +
+ .../devicetree/bindings/watchdog/samsung-wdt.txt | 2 +-
+ Documentation/kbuild/makefiles.txt | 23 ++
+ arch/sparc/kernel/prom_common.c | 4 +-
+ drivers/dma/bestcomm/bestcomm.c | 2 +-
+ drivers/gpio/gpiolib-of.c | 35 ---
+ drivers/hwmon/gpio-fan.c | 4 +-
+ drivers/input/keyboard/matrix_keypad.c | 8 +-
+ drivers/net/phy/mdio-mux-gpio.c | 4 +-
+ drivers/of/base.c | 303 ++++++++++++++-------
+ drivers/of/device.c | 13 +
+ drivers/of/of_private.h | 36 +++
+ drivers/of/selftest.c | 54 ++--
+ drivers/spi/spi-fsl-spi.c | 4 +-
+ drivers/spi/spi-oc-tiny.c | 8 +-
+ drivers/spi/spi-ppc4xx.c | 4 +-
+ drivers/spi/spi.c | 5 +-
+ include/linux/of.h | 13 +-
+ include/linux/of_gpio.h | 40 +--
+ scripts/Makefile.lib | 14 +
+ 35 files changed, 444 insertions(+), 227 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/g2d.txt
+ rename Documentation/devicetree/bindings/{gpio => leds}/leds-ns2.txt (100%)
+ create mode 100644 drivers/of/of_private.h
+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
+Resolved 'drivers/spi/spi-s3c64xx.c' using previous resolution.
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+CONFLICT (content): Merge conflict in drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/spi-ppc4xx.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 399316c] Merge remote-tracking branch 'spi/spi/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/spi/sh-msiof.txt | 12 +
+ MAINTAINERS | 1 +
+ drivers/spi/Kconfig | 15 +-
+ drivers/spi/Makefile | 5 +-
+ drivers/spi/spi-altera.c | 2 +-
+ drivers/spi/spi-ath79.c | 115 +-
+ drivers/spi/spi-atmel.c | 2 +-
+ drivers/spi/spi-au1550.c | 8 +-
+ drivers/spi/spi-bcm63xx.c | 179 +++-
+ drivers/spi/spi-bfin-sport.c | 3 +-
+ drivers/spi/spi-bfin5xx.c | 5 +-
+ drivers/spi/spi-bitbang.c | 33 +-
+ drivers/spi/spi-clps711x.c | 2 +-
+ drivers/spi/spi-coldfire-qspi.c | 3 +-
+ drivers/spi/spi-davinci.c | 119 ++-
+ drivers/spi/spi-ep93xx.c | 2 +-
+ drivers/spi/spi-falcon.c | 3 +-
+ drivers/spi/spi-gpio.c | 23 +-
+ drivers/spi/spi-imx.c | 1 +
+ drivers/spi/spi-mpc512x-psc.c | 17 +-
+ drivers/spi/spi-mxs.c | 5 +-
+ drivers/spi/spi-omap-100k.c | 6 +-
+ drivers/spi/spi-omap-uwire.c | 6 +-
+ drivers/spi/spi-omap2-mcspi.c | 42 +-
+ drivers/spi/spi-orion.c | 21 +-
+ drivers/spi/spi-ppc4xx.c | 6 +-
+ drivers/spi/spi-pxa2xx-dma.c | 392 +++++++
+ drivers/spi/spi-pxa2xx-pci.c | 133 +--
+ drivers/spi/spi-pxa2xx-pxadma.c | 490 +++++++++
+ drivers/spi/spi-pxa2xx.c | 1103 ++++++--------------
+ drivers/spi/spi-pxa2xx.h | 221 ++++
+ drivers/spi/spi-s3c64xx.c | 76 +-
+ drivers/spi/spi-sh-msiof.c | 56 +-
+ drivers/spi/spi-sirf.c | 10 +-
+ drivers/spi/spi-tegra20-sflash.c | 14 +-
+ drivers/spi/spi-tegra20-slink.c | 15 +-
+ drivers/spi/spi-txx9.c | 12 +-
+ drivers/spi/spi.c | 15 +-
+ include/linux/platform_data/spi-omap2-mcspi.h | 3 +
+ include/linux/pxa2xx_ssp.h | 18 +
+ include/linux/spi/pxa2xx_spi.h | 108 +-
+ include/linux/spi/spi.h | 5 +
+ include/linux/spi/spi_gpio.h | 4 +-
+ 43 files changed, 2076 insertions(+), 1235 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/sh-msiof.txt
+ create mode 100644 drivers/spi/spi-pxa2xx-dma.c
+ create mode 100644 drivers/spi/spi-pxa2xx-pxadma.c
+ create mode 100644 drivers/spi/spi-pxa2xx.h
+Merging spi-mb/spi-next (a349685 spi/pxa2xx: add support for Lynxpoint SPI controllers)
+$ git merge spi-mb/spi-next
+Already up-to-date.
+Merging tip/auto-latest (b2f7365 Merge branch 'core/locking')
+$ git merge tip/auto-latest
+Resolved 'arch/powerpc/configs/pasemi_defconfig' using previous resolution.
+Resolved 'arch/s390/Kconfig' using previous resolution.
+Removing tools/perf/tests/util.c
+Removing tools/perf/scripts/perl/workqueue-stats.pl
+Removing tools/perf/scripts/perl/bin/workqueue-stats-report
+Removing tools/perf/scripts/perl/bin/workqueue-stats-record
+Auto-merging tools/perf/perf.h
+Auto-merging tools/Makefile
+Auto-merging scripts/kconfig/Makefile
+Removing samples/tracepoints/tracepoint-sample.c
+Removing samples/tracepoints/tracepoint-probe-sample2.c
+Removing samples/tracepoints/tracepoint-probe-sample.c
+Removing samples/tracepoints/tp-samples-trace.h
+Removing samples/tracepoints/Makefile
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/bootmem.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/trace/ring_buffer.c
+Auto-merging kernel/trace/blktrace.c
+Auto-merging kernel/trace/Kconfig
+CONFLICT (modify/delete): kernel/timeconst.pl deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of kernel/timeconst.pl left in tree.
+Auto-merging kernel/time/tick-sched.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/softirq.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/printk.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/mm.h
+Auto-merging fs/binfmt_elf.c
+Auto-merging drivers/tty/sysrq.c
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/rtc/Makefile
+Auto-merging drivers/rtc/Kconfig
+Auto-merging drivers/iommu/dmar.c
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging drivers/edac/amd64_edac.c
+Auto-merging drivers/ata/ahci.c
+Auto-merging block/blk-exec.c
+Auto-merging arch/x86/kernel/kprobes/opt.c
+Auto-merging arch/x86/kernel/kprobes/core.c
+Auto-merging arch/x86/kernel/kprobes/common.h
+Auto-merging arch/x86/kernel/cpu/amd.c
+Auto-merging arch/x86/kernel/apm_32.c
+Auto-merging arch/x86/include/uapi/asm/msr-index.h
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/include/asm/pci.h
+Removing arch/x86/include/asm/numa_64.h
+Auto-merging arch/x86/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kernel/vtime.c
+Auto-merging arch/s390/Kconfig
+CONFLICT (content): Merge conflict in arch/s390/Kconfig
+Auto-merging arch/powerpc/platforms/pseries/setup.c
+Auto-merging arch/powerpc/perf/core-book3s.c
+Auto-merging arch/powerpc/kernel/entry_64.S
+Auto-merging arch/powerpc/include/asm/ppc_asm.h
+Auto-merging arch/powerpc/include/asm/perf_event_server.h
+Auto-merging arch/powerpc/configs/pasemi_defconfig
+CONFLICT (content): Merge conflict in arch/powerpc/configs/pasemi_defconfig
+Auto-merging arch/powerpc/configs/corenet64_smp_defconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/ia64/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f kernel/timeconst.pl
+kernel/timeconst.pl: needs merge
+rm 'kernel/timeconst.pl'
+$ git commit -v -a
+[master b5a282f] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ .../testing/sysfs-bus-event_source-devices-events | 62 +
+ Documentation/ABI/testing/sysfs-platform-ts5500 | 47 +
+ Documentation/PCI/MSI-HOWTO.txt | 37 +-
+ Documentation/atomic_ops.txt | 2 +
+ Documentation/kernel-parameters.txt | 3 +
+ Documentation/lockstat.txt | 2 +-
+ Documentation/memory-barriers.txt | 1 +
+ Documentation/trace/ftrace.txt | 83 +
+ Documentation/x86/boot.txt | 38 +
+ Documentation/x86/early-microcode.txt | 43 +
+ MAINTAINERS | 20 +-
+ Makefile | 3 +-
+ arch/Kconfig | 12 +
+ arch/alpha/Kconfig | 1 -
+ arch/alpha/kernel/osf_sys.c | 6 +-
+ arch/arm/Kconfig | 1 -
+ arch/arm64/Kconfig | 1 -
+ arch/blackfin/Kconfig | 2 -
+ arch/frv/Kconfig | 1 -
+ arch/hexagon/Kconfig | 2 -
+ arch/ia64/Kconfig | 1 -
+ arch/ia64/include/asm/cputime.h | 92 +-
+ arch/ia64/include/asm/thread_info.h | 4 +-
+ arch/ia64/include/asm/xen/minstate.h | 2 +-
+ arch/ia64/kernel/asm-offsets.c | 2 +-
+ arch/ia64/kernel/entry.S | 16 +-
+ arch/ia64/kernel/fsys.S | 4 +-
+ arch/ia64/kernel/head.S | 4 +-
+ arch/ia64/kernel/ivt.S | 8 +-
+ arch/ia64/kernel/minstate.h | 2 +-
+ arch/ia64/kernel/time.c | 5 +-
+ arch/mips/Kconfig | 2 -
+ arch/mips/cavium-octeon/dma-octeon.c | 3 +-
+ arch/parisc/Kconfig | 2 -
+ arch/powerpc/Kconfig | 2 -
+ arch/powerpc/configs/chroma_defconfig | 2 +-
+ arch/powerpc/configs/corenet64_smp_defconfig | 2 +-
+ arch/powerpc/configs/pasemi_defconfig | 1 +
+ arch/powerpc/include/asm/cputime.h | 6 +-
+ arch/powerpc/include/asm/lppaca.h | 2 +-
+ arch/powerpc/include/asm/perf_event_server.h | 26 +
+ arch/powerpc/include/asm/ppc_asm.h | 4 +-
+ arch/powerpc/kernel/entry_64.S | 4 +-
+ arch/powerpc/kernel/time.c | 7 +-
+ arch/powerpc/perf/core-book3s.c | 12 +
+ arch/powerpc/perf/power7-pmu.c | 80 +-
+ arch/powerpc/platforms/cell/spufs/sched.c | 1 +
+ arch/powerpc/platforms/pseries/dtl.c | 6 +-
+ arch/powerpc/platforms/pseries/setup.c | 6 +-
+ arch/s390/Kconfig | 1 -
+ arch/s390/kernel/vtime.c | 6 +-
+ arch/sh/Kconfig | 4 -
+ arch/sparc/Kconfig | 1 -
+ arch/sparc/mm/init_64.c | 24 +-
+ arch/x86/Kconfig | 86 +-
+ arch/x86/Makefile | 4 +
+ arch/x86/boot/boot.h | 18 +-
+ arch/x86/boot/cmdline.c | 12 +-
+ arch/x86/boot/compressed/cmdline.c | 12 +-
+ arch/x86/boot/compressed/head_64.S | 48 +-
+ arch/x86/boot/compressed/misc.c | 2 +
+ arch/x86/boot/compressed/misc.h | 1 +
+ arch/x86/boot/header.S | 10 +-
+ arch/x86/configs/i386_defconfig | 1 +
+ arch/x86/include/asm/amd_nb.h | 17 +
+ arch/x86/include/asm/bootparam_utils.h | 38 +
+ arch/x86/include/asm/cpufeature.h | 2 +
+ arch/x86/include/asm/ftrace.h | 1 -
+ arch/x86/include/asm/hpet.h | 5 +-
+ arch/x86/include/asm/hw_irq.h | 13 +-
+ arch/x86/include/asm/hypervisor.h | 13 +-
+ arch/x86/include/asm/init.h | 28 +-
+ arch/x86/include/asm/io_apic.h | 28 +
+ arch/x86/include/asm/irq_remapping.h | 40 +-
+ arch/x86/include/asm/irq_vectors.h | 4 +-
+ arch/x86/include/asm/kexec.h | 6 +-
+ arch/x86/include/asm/kvm_para.h | 8 +-
+ arch/x86/include/asm/linkage.h | 18 +-
+ arch/x86/include/asm/microcode.h | 14 +
+ arch/x86/include/asm/microcode_intel.h | 85 +
+ arch/x86/include/asm/mmzone_32.h | 6 -
+ arch/x86/include/asm/mshyperv.h | 4 +
+ arch/x86/include/asm/numa.h | 2 -
+ arch/x86/include/asm/numa_64.h | 6 -
+ arch/x86/include/asm/page.h | 7 +-
+ arch/x86/include/asm/page_32.h | 1 +
+ arch/x86/include/asm/page_64.h | 36 +
+ arch/x86/include/asm/page_64_types.h | 22 -
+ arch/x86/include/asm/page_types.h | 2 +
+ arch/x86/include/asm/pci.h | 3 +
+ arch/x86/include/asm/perf_event.h | 13 +-
+ arch/x86/include/asm/pgtable.h | 28 +
+ arch/x86/include/asm/pgtable_32.h | 7 -
+ arch/x86/include/asm/pgtable_64.h | 8 +-
+ arch/x86/include/asm/pgtable_64_types.h | 4 +
+ arch/x86/include/asm/pgtable_types.h | 4 +-
+ arch/x86/include/asm/processor.h | 11 +-
+ arch/x86/include/asm/realmode.h | 3 +-
+ arch/x86/include/asm/required-features.h | 8 +-
+ arch/x86/include/asm/tlbflush.h | 18 +-
+ arch/x86/include/asm/uaccess.h | 55 +-
+ arch/x86/include/asm/uv/uv_hub.h | 44 +-
+ arch/x86/include/asm/uv/uv_mmrs.h | 1496 +++++++++++++----
+ arch/x86/include/asm/x86_init.h | 39 +-
+ arch/x86/include/asm/xor.h | 491 +++++-
+ arch/x86/include/asm/xor_32.h | 309 +---
+ arch/x86/include/asm/xor_64.h | 305 +---
+ arch/x86/include/uapi/asm/msr-index.h | 3 +
+ arch/x86/kernel/Makefile | 6 +-
+ arch/x86/kernel/acpi/boot.c | 1 -
+ arch/x86/kernel/acpi/sleep.c | 2 +-
+ arch/x86/kernel/amd_gart_64.c | 5 +-
+ arch/x86/kernel/apb_timer.c | 10 +-
+ arch/x86/kernel/apic/apic.c | 28 +-
+ arch/x86/kernel/apic/apic_numachip.c | 1 +
+ arch/x86/kernel/apic/io_apic.c | 457 +++---
+ arch/x86/kernel/apic/ipi.c | 2 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 206 ++-
+ arch/x86/kernel/apm_32.c | 11 +-
+ arch/x86/kernel/cpu/amd.c | 63 +-
+ arch/x86/kernel/cpu/common.c | 17 +-
+ arch/x86/kernel/cpu/hypervisor.c | 7 +
+ arch/x86/kernel/cpu/intel.c | 3 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
+ arch/x86/kernel/cpu/mshyperv.c | 54 +-
+ arch/x86/kernel/cpu/perf_event.c | 15 +-
+ arch/x86/kernel/cpu/perf_event.h | 25 +-
+ arch/x86/kernel/cpu/perf_event_amd.c | 322 +++-
+ arch/x86/kernel/cpu/vmware.c | 13 +
+ arch/x86/kernel/e820.c | 16 +-
+ arch/x86/kernel/entry_32.S | 9 +-
+ arch/x86/kernel/entry_64.S | 7 +-
+ arch/x86/kernel/ftrace.c | 4 +-
+ arch/x86/kernel/head32.c | 21 +-
+ arch/x86/kernel/head64.c | 139 +-
+ arch/x86/kernel/head_32.S | 104 +-
+ arch/x86/kernel/head_64.S | 210 ++-
+ arch/x86/kernel/hpet.c | 2 +-
+ arch/x86/kernel/i386_ksyms_32.c | 1 +
+ arch/x86/kernel/kprobes/Makefile | 7 +
+ .../kernel/{kprobes-common.h => kprobes/common.h} | 11 +
+ arch/x86/kernel/{kprobes.c => kprobes/core.c} | 76 +-
+ arch/x86/kernel/kprobes/ftrace.c | 93 ++
+ arch/x86/kernel/{kprobes-opt.c => kprobes/opt.c} | 2 +-
+ arch/x86/kernel/kvm.c | 12 +-
+ arch/x86/kernel/kvmclock.c | 4 +-
+ arch/x86/kernel/machine_kexec_64.c | 171 +-
+ arch/x86/kernel/microcode_core.c | 7 +-
+ arch/x86/kernel/microcode_core_early.c | 76 +
+ arch/x86/kernel/microcode_intel.c | 198 +--
+ arch/x86/kernel/microcode_intel_early.c | 796 +++++++++
+ arch/x86/kernel/microcode_intel_lib.c | 174 ++
+ arch/x86/kernel/process_64.c | 2 +-
+ arch/x86/kernel/ptrace.c | 2 +-
+ arch/x86/kernel/rtc.c | 1 -
+ arch/x86/kernel/setup.c | 260 +--
+ arch/x86/kernel/sys_x86_64.c | 2 +-
+ arch/x86/kernel/traps.c | 9 +
+ arch/x86/kernel/tsc.c | 3 +-
+ arch/x86/kernel/uprobes.c | 4 +-
+ arch/x86/kernel/x8664_ksyms_64.c | 3 +
+ arch/x86/kernel/x86_init.c | 28 +-
+ arch/x86/lguest/boot.c | 3 +-
+ arch/x86/lib/getuser.S | 43 +-
+ arch/x86/mm/init.c | 469 ++++--
+ arch/x86/mm/init_32.c | 106 +-
+ arch/x86/mm/init_64.c | 259 +--
+ arch/x86/mm/memtest.c | 10 +-
+ arch/x86/mm/mm_internal.h | 19 +
+ arch/x86/mm/numa.c | 32 +-
+ arch/x86/mm/numa_32.c | 161 --
+ arch/x86/mm/numa_64.c | 13 -
+ arch/x86/mm/numa_internal.h | 6 -
+ arch/x86/mm/pageattr.c | 66 +-
+ arch/x86/mm/pat.c | 4 +-
+ arch/x86/mm/pgtable.c | 7 +-
+ arch/x86/mm/physaddr.c | 60 +-
+ arch/x86/mm/srat.c | 29 +-
+ arch/x86/mm/tlb.c | 2 +-
+ arch/x86/pci/mmconfig-shared.c | 3 +-
+ arch/x86/platform/Makefile | 2 +
+ arch/x86/platform/efi/efi-bgrt.c | 7 +-
+ arch/x86/platform/efi/efi.c | 11 +-
+ arch/x86/platform/goldfish/Makefile | 1 +
+ arch/x86/platform/goldfish/goldfish.c | 51 +
+ arch/x86/platform/sfi/sfi.c | 2 +-
+ arch/x86/platform/ts5500/Makefile | 1 +
+ arch/x86/platform/ts5500/ts5500.c | 339 ++++
+ arch/x86/platform/uv/tlb_uv.c | 4 +-
+ arch/x86/platform/uv/uv_time.c | 13 +-
+ arch/x86/power/hibernate_32.c | 2 -
+ arch/x86/power/hibernate_64.c | 66 +-
+ arch/x86/realmode/init.c | 49 +-
+ arch/x86/um/fault.c | 2 +-
+ arch/x86/vdso/vclock_gettime.c | 2 +-
+ arch/x86/xen/enlighten.c | 1 +
+ arch/x86/xen/mmu.c | 28 -
+ block/blk-exec.c | 1 +
+ drivers/acpi/apei/cper.c | 19 +-
+ drivers/ata/ahci.c | 93 +-
+ drivers/ata/ahci.h | 6 +
+ drivers/ata/libahci.c | 118 +-
+ drivers/char/random.c | 6 +-
+ drivers/edac/amd64_edac.c | 109 +-
+ drivers/edac/amd64_edac.h | 12 +-
+ drivers/hv/Kconfig | 2 +-
+ drivers/idle/i7300_idle.c | 8 +-
+ drivers/iommu/amd_iommu.c | 8 +-
+ drivers/iommu/dmar.c | 2 +
+ drivers/iommu/intel-iommu.c | 2 +
+ drivers/iommu/intel_irq_remapping.c | 48 +-
+ drivers/iommu/irq_remapping.c | 231 ++-
+ drivers/iommu/irq_remapping.h | 1 +
+ drivers/isdn/mISDN/stack.c | 7 +-
+ drivers/misc/sgi-gru/grufile.c | 2 +-
+ drivers/pci/msi.c | 26 +
+ drivers/pci/pcie/aer/aerdrv_errprint.c | 63 +-
+ drivers/rtc/Kconfig | 12 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/class.c | 7 +
+ drivers/rtc/systohc.c | 44 +
+ drivers/spi/spi.c | 2 +-
+ drivers/staging/csr/bh.c | 2 +-
+ drivers/staging/csr/unifi_sme.c | 2 +-
+ drivers/staging/iio/trigger/Kconfig | 1 -
+ drivers/tty/sysrq.c | 1 +
+ drivers/usb/chipidea/debug.c | 2 +-
+ drivers/xen/events.c | 7 +-
+ drivers/xen/swiotlb-xen.c | 4 +-
+ fs/binfmt_elf.c | 8 +-
+ fs/binfmt_elf_fdpic.c | 7 +-
+ fs/file.c | 2 +-
+ fs/proc/array.c | 4 +-
+ fs/pstore/ram.c | 10 +-
+ fs/select.c | 1 +
+ include/asm-generic/cmpxchg-local.h | 8 +-
+ include/asm-generic/cputime.h | 66 +-
+ include/asm-generic/cputime_jiffies.h | 72 +
+ include/asm-generic/cputime_nsecs.h | 104 ++
+ include/linux/aer.h | 4 +-
+ include/linux/bootmem.h | 5 +
+ include/linux/context_tracking.h | 28 +
+ include/linux/ftrace.h | 6 +-
+ include/linux/ftrace_event.h | 6 +-
+ include/linux/hardirq.h | 8 +-
+ include/linux/idr.h | 2 +-
+ include/linux/init_task.h | 12 +
+ include/linux/irq.h | 8 +
+ include/linux/irq_work.h | 22 +-
+ include/linux/kernel_stat.h | 2 +-
+ include/linux/kexec.h | 3 +
+ include/linux/kprobes.h | 12 +-
+ include/linux/kvm_host.h | 55 +-
+ include/linux/lockdep.h | 2 +-
+ include/linux/memblock.h | 1 +
+ include/linux/mm.h | 1 -
+ include/linux/pci.h | 7 +
+ include/linux/perf_event.h | 20 +-
+ include/linux/printk.h | 3 -
+ include/linux/profile.h | 13 -
+ include/linux/rcupdate.h | 15 +-
+ include/linux/ring_buffer.h | 1 +
+ include/linux/rtc.h | 1 +
+ include/linux/sched.h | 185 +--
+ include/linux/sched/rt.h | 58 +
+ include/linux/sched/sysctl.h | 110 ++
+ include/linux/seqlock.h | 193 +--
+ include/linux/smpboot.h | 5 +
+ include/linux/srcu.h | 26 +-
+ include/linux/swiotlb.h | 2 +-
+ include/linux/tick.h | 17 +-
+ include/linux/time.h | 13 +
+ include/linux/tsacct_kern.h | 3 +
+ include/linux/uprobes.h | 23 +-
+ include/linux/vtime.h | 59 +-
+ include/trace/events/ras.h | 77 +
+ include/trace/events/rcu.h | 31 +-
+ include/uapi/linux/perf_event.h | 3 +-
+ init/Kconfig | 42 +-
+ init/init_task.c | 2 +
+ kernel/acct.c | 6 +-
+ kernel/context_tracking.c | 114 +-
+ kernel/cpu.c | 6 +-
+ kernel/delayacct.c | 7 +-
+ kernel/events/core.c | 5 +-
+ kernel/events/hw_breakpoint.c | 2 +-
+ kernel/events/uprobes.c | 466 +++---
+ kernel/exit.c | 10 +-
+ kernel/fork.c | 6 +
+ kernel/futex.c | 3 +-
+ kernel/futex_compat.c | 2 -
+ kernel/hrtimer.c | 38 +-
+ kernel/irq/chip.c | 30 +-
+ kernel/irq/manage.c | 1 +
+ kernel/irq/spurious.c | 7 +-
+ kernel/irq_work.c | 150 +-
+ kernel/kexec.c | 34 +-
+ kernel/kprobes.c | 8 +-
+ kernel/lockdep.c | 19 +-
+ kernel/mutex.c | 1 +
+ kernel/posix-cpu-timers.c | 51 +-
+ kernel/posix-timers.c | 2 +-
+ kernel/printk.c | 36 +-
+ kernel/profile.c | 24 -
+ kernel/ptrace.c | 6 +
+ kernel/rcu.h | 7 +
+ kernel/rcupdate.c | 60 +-
+ kernel/rcutiny.c | 8 +-
+ kernel/rcutiny_plugin.h | 56 +
+ kernel/rcutorture.c | 66 +-
+ kernel/rcutree.c | 260 ++-
+ kernel/rcutree.h | 11 +-
+ kernel/rtmutex-debug.c | 1 +
+ kernel/rtmutex-tester.c | 1 +
+ kernel/rtmutex.c | 1 +
+ kernel/sched/core.c | 27 +-
+ kernel/sched/cpupri.c | 2 +
+ kernel/sched/cputime.c | 314 +++-
+ kernel/sched/fair.c | 35 +-
+ kernel/sched/idle_task.c | 10 +
+ kernel/sched/rt.c | 41 +-
+ kernel/sched/sched.h | 2 +
+ kernel/signal.c | 12 +-
+ kernel/smpboot.c | 5 +-
+ kernel/softirq.c | 6 +-
+ kernel/srcu.c | 37 +-
+ kernel/stop_machine.c | 156 +-
+ kernel/sysctl.c | 8 +
+ kernel/time.c | 8 +
+ kernel/time/Kconfig | 5 +
+ kernel/time/ntp.c | 48 +-
+ kernel/time/tick-broadcast.c | 22 +-
+ kernel/time/tick-sched.c | 12 +-
+ kernel/time/timekeeping.c | 45 +-
+ kernel/timer.c | 2 +-
+ kernel/trace/Kconfig | 18 +
+ kernel/trace/blktrace.c | 2 +-
+ kernel/trace/ftrace.c | 88 +-
+ kernel/trace/ring_buffer.c | 108 +-
+ kernel/trace/trace.c | 253 ++-
+ kernel/trace/trace.h | 134 +-
+ kernel/trace/trace_clock.c | 5 +-
+ kernel/trace/trace_events.c | 1 -
+ kernel/trace/trace_functions.c | 61 +-
+ kernel/trace/trace_functions_graph.c | 68 +-
+ kernel/trace/trace_probe.h | 1 -
+ kernel/trace/trace_sched_wakeup.c | 2 +-
+ kernel/trace/trace_selftest.c | 21 +-
+ kernel/trace/trace_syscalls.c | 18 +-
+ kernel/trace/trace_uprobe.c | 217 ++-
+ kernel/tsacct.c | 44 +-
+ kernel/watchdog.c | 11 +-
+ lib/Kconfig.debug | 117 +-
+ lib/locking-selftest.c | 34 +-
+ lib/rwsem-spinlock.c | 69 +-
+ lib/rwsem.c | 75 +-
+ lib/swiotlb.c | 47 +-
+ mm/bootmem.c | 8 +
+ mm/memblock.c | 17 +
+ mm/mmap.c | 1 +
+ mm/mremap.c | 1 +
+ mm/nobootmem.c | 23 +-
+ mm/nommu.c | 1 +
+ mm/page-writeback.c | 1 +
+ mm/page_alloc.c | 3 +-
+ samples/Kconfig | 6 -
+ samples/Makefile | 2 +-
+ samples/tracepoints/Makefile | 6 -
+ samples/tracepoints/tp-samples-trace.h | 11 -
+ samples/tracepoints/tracepoint-probe-sample.c | 57 -
+ samples/tracepoints/tracepoint-probe-sample2.c | 44 -
+ samples/tracepoints/tracepoint-sample.c | 57 -
+ scripts/kconfig/Makefile | 7 +-
+ tools/Makefile | 2 +-
+ tools/kvm/.gitignore | 12 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 +
+ tools/kvm/Documentation/kvm-sandbox.txt | 16 +
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 491 ++++++
+ tools/kvm/README | 112 ++
+ tools/kvm/arm/aarch32/cortex-a15.c | 94 ++
+ tools/kvm/arm/aarch32/include/kvm/barrier.h | 10 +
+ tools/kvm/arm/aarch32/include/kvm/kvm-arch.h | 13 +
+ .../kvm/arm/aarch32/include/kvm/kvm-config-arch.h | 8 +
+ tools/kvm/arm/aarch32/include/kvm/kvm-cpu-arch.h | 12 +
+ tools/kvm/arm/aarch32/kvm-cpu.c | 105 ++
+ tools/kvm/arm/aarch64/cortex-a57.c | 95 ++
+ tools/kvm/arm/aarch64/include/kvm/barrier.h | 8 +
+ tools/kvm/arm/aarch64/include/kvm/kvm-arch.h | 17 +
+ .../kvm/arm/aarch64/include/kvm/kvm-config-arch.h | 10 +
+ tools/kvm/arm/aarch64/include/kvm/kvm-cpu-arch.h | 13 +
+ tools/kvm/arm/aarch64/kvm-cpu.c | 159 ++
+ tools/kvm/arm/fdt.c | 250 +++
+ tools/kvm/arm/gic.c | 92 ++
+ tools/kvm/arm/include/arm-common/gic.h | 35 +
+ tools/kvm/arm/include/arm-common/kvm-arch.h | 57 +
+ tools/kvm/arm/include/arm-common/kvm-config-arch.h | 17 +
+ tools/kvm/arm/include/arm-common/kvm-cpu-arch.h | 46 +
+ tools/kvm/arm/ioport.c | 5 +
+ tools/kvm/arm/irq.c | 17 +
+ tools/kvm/arm/kvm-cpu.c | 109 ++
+ tools/kvm/arm/kvm.c | 82 +
+ tools/kvm/builtin-balloon.c | 80 +
+ tools/kvm/builtin-debug.c | 110 ++
+ tools/kvm/builtin-help.c | 63 +
+ tools/kvm/builtin-list.c | 155 ++
+ tools/kvm/builtin-pause.c | 88 +
+ tools/kvm/builtin-resume.c | 88 +
+ tools/kvm/builtin-run.c | 702 ++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 258 +++
+ tools/kvm/builtin-stat.c | 127 ++
+ tools/kvm/builtin-stop.c | 70 +
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 177 ++
+ tools/kvm/config/utilities.mak | 196 +++
+ tools/kvm/devices.c | 86 +
+ tools/kvm/disk/blk.c | 76 +
+ tools/kvm/disk/core.c | 356 ++++
+ tools/kvm/disk/qcow.c | 1527 +++++++++++++++++
+ tools/kvm/disk/raw.c | 141 ++
+ tools/kvm/framebuffer.c | 80 +
+ tools/kvm/guest/init.c | 76 +
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 355 ++++
+ tools/kvm/hw/pci-shmem.c | 411 +++++
+ tools/kvm/hw/rtc.c | 155 ++
+ tools/kvm/hw/serial.c | 452 +++++
+ tools/kvm/hw/vesa.c | 95 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 20 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/devices.h | 27 +
+ tools/kvm/include/kvm/disk-image.h | 96 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/fdt.h | 26 +
+ tools/kvm/include/kvm/framebuffer.h | 36 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 28 +
+ tools/kvm/include/kvm/ioport.h | 70 +
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-config.h | 61 +
+ tools/kvm/include/kvm/kvm-cpu.h | 26 +
+ tools/kvm/include/kvm/kvm-ipc.h | 26 +
+ tools/kvm/include/kvm/kvm.h | 133 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 39 +
+ tools/kvm/include/kvm/parse-options.h | 221 +++
+ tools/kvm/include/kvm/pci-shmem.h | 32 +
+ tools/kvm/include/kvm/pci.h | 93 ++
+ tools/kvm/include/kvm/qcow.h | 133 ++
+ tools/kvm/include/kvm/rbtree-interval.h | 30 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 28 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 20 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 24 +
+ tools/kvm/include/kvm/threadpool.h | 38 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 360 ++++
+ tools/kvm/include/kvm/util-init.h | 51 +
+ tools/kvm/include/kvm/util.h | 97 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 76 +
+ tools/kvm/include/kvm/virtio-balloon.h | 9 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 10 +
+ tools/kvm/include/kvm/virtio-mmio.h | 59 +
+ tools/kvm/include/kvm/virtio-net.h | 30 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
+ tools/kvm/include/kvm/virtio-pci.h | 51 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-scsi.h | 26 +
+ tools/kvm/include/kvm/virtio.h | 92 ++
+ tools/kvm/include/kvm/vnc.h | 22 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 20 +
+ tools/kvm/include/linux/kernel.h | 41 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/stddef.h | 10 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 218 +++
+ tools/kvm/ioport.c | 198 +++
+ tools/kvm/kvm-cmd.c | 91 +
+ tools/kvm/kvm-cpu.c | 242 +++
+ tools/kvm/kvm-ipc.c | 509 ++++++
+ tools/kvm/kvm.c | 513 ++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 139 ++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 ++
+ tools/kvm/net/uip/core.c | 190 +++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 202 +++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 348 ++++
+ tools/kvm/net/uip/udp.c | 239 +++
+ tools/kvm/pci.c | 200 +++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 210 +++
+ tools/kvm/powerpc/cpu_info.h | 42 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 59 +
+ tools/kvm/powerpc/include/kvm/kvm-config-arch.h | 7 +
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 +
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 50 +
+ tools/kvm/powerpc/kvm-cpu.c | 290 ++++
+ tools/kvm/powerpc/kvm.c | 531 ++++++
+ tools/kvm/powerpc/spapr.h | 93 ++
+ tools/kvm/powerpc/spapr_hcall.c | 134 ++
+ tools/kvm/powerpc/spapr_hvcons.c | 108 ++
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 427 +++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 233 +++
+ tools/kvm/powerpc/xics.c | 519 ++++++
+ tools/kvm/powerpc/xics.h | 18 +
+ tools/kvm/symbol.c | 133 ++
+ tools/kvm/term.c | 174 ++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 101 ++
+ tools/kvm/ui/sdl.c | 323 ++++
+ tools/kvm/ui/vnc.c | 250 +++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/init.c | 69 +
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 +++++++
+ tools/kvm/util/rbtree-interval.c | 58 +
+ tools/kvm/util/read-write.c | 354 ++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 62 +
+ tools/kvm/util/threadpool.c | 175 ++
+ tools/kvm/util/util.c | 133 ++
+ tools/kvm/virtio/9p-pdu.c | 287 ++++
+ tools/kvm/virtio/9p.c | 1441 ++++++++++++++++
+ tools/kvm/virtio/balloon.c | 279 ++++
+ tools/kvm/virtio/blk.c | 319 ++++
+ tools/kvm/virtio/console.c | 212 +++
+ tools/kvm/virtio/core.c | 233 +++
+ tools/kvm/virtio/mmio.c | 271 +++
+ tools/kvm/virtio/net.c | 674 ++++++++
+ tools/kvm/virtio/pci.c | 410 +++++
+ tools/kvm/virtio/rng.c | 204 +++
+ tools/kvm/virtio/scsi.c | 311 ++++
+ tools/kvm/x86/bios.c | 174 ++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 +
+ tools/kvm/x86/bios/entry.S | 92 ++
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 ++
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 60 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 20 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 36 +
+ tools/kvm/x86/include/kvm/kvm-config-arch.h | 15 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 99 ++
+ tools/kvm/x86/irq.c | 222 +++
+ tools/kvm/x86/kvm-cpu.c | 431 +++++
+ tools/kvm/x86/kvm.c | 381 +++++
+ tools/kvm/x86/mptable.c | 289 ++++
+ tools/lib/lockdep/Makefile | 251 +++
+ tools/lib/lockdep/common.c | 24 +
+ tools/lib/lockdep/include/liblockdep/common.h | 43 +
+ tools/lib/lockdep/include/liblockdep/mutex.h | 73 +
+ tools/lib/lockdep/include/liblockdep/rwlock.h | 91 +
+ tools/lib/lockdep/lockdep | 3 +
+ tools/lib/lockdep/lockdep.c | 2 +
+ tools/lib/lockdep/lockdep_internals.h | 1 +
+ tools/lib/lockdep/lockdep_states.h | 1 +
+ tools/lib/lockdep/preload.c | 209 +++
+ tools/lib/lockdep/rbtree.c | 1 +
+ tools/lib/lockdep/run_tests.sh | 27 +
+ tools/lib/lockdep/tests/AA.c | 13 +
+ tools/lib/lockdep/tests/ABBA.c | 13 +
+ tools/lib/lockdep/tests/ABBCCA.c | 15 +
+ tools/lib/lockdep/tests/ABBCCDDA.c | 17 +
+ tools/lib/lockdep/tests/ABCABC.c | 15 +
+ tools/lib/lockdep/tests/ABCDBCDA.c | 17 +
+ tools/lib/lockdep/tests/ABCDBDDA.c | 17 +
+ tools/lib/lockdep/tests/WW.c | 13 +
+ tools/lib/lockdep/tests/common.h | 12 +
+ tools/lib/lockdep/tests/unlock_balance.c | 12 +
+ tools/lib/lockdep/uinclude/asm/hweight.h | 0
+ tools/lib/lockdep/uinclude/asm/sections.h | 0
+ tools/lib/lockdep/uinclude/linux/bitops.h | 0
+ tools/lib/lockdep/uinclude/linux/compiler.h | 7 +
+ tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 +
+ tools/lib/lockdep/uinclude/linux/delay.h | 0
+ tools/lib/lockdep/uinclude/linux/export.h | 7 +
+ tools/lib/lockdep/uinclude/linux/ftrace.h | 0
+ tools/lib/lockdep/uinclude/linux/gfp.h | 0
+ tools/lib/lockdep/uinclude/linux/hardirq.h | 11 +
+ tools/lib/lockdep/uinclude/linux/hash.h | 1 +
+ tools/lib/lockdep/uinclude/linux/interrupt.h | 0
+ tools/lib/lockdep/uinclude/linux/irqflags.h | 38 +
+ tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 +
+ tools/lib/lockdep/uinclude/linux/kernel.h | 36 +
+ tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 +
+ tools/lib/lockdep/uinclude/linux/linkage.h | 0
+ tools/lib/lockdep/uinclude/linux/list.h | 1 +
+ tools/lib/lockdep/uinclude/linux/lockdep.h | 57 +
+ tools/lib/lockdep/uinclude/linux/mm_types.h | 0
+ tools/lib/lockdep/uinclude/linux/module.h | 6 +
+ tools/lib/lockdep/uinclude/linux/mutex.h | 0
+ tools/lib/lockdep/uinclude/linux/poison.h | 1 +
+ tools/lib/lockdep/uinclude/linux/prefetch.h | 6 +
+ tools/lib/lockdep/uinclude/linux/proc_fs.h | 0
+ tools/lib/lockdep/uinclude/linux/rbtree.h | 1 +
+ .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 +
+ tools/lib/lockdep/uinclude/linux/rcu.h | 16 +
+ tools/lib/lockdep/uinclude/linux/seq_file.h | 0
+ tools/lib/lockdep/uinclude/linux/spinlock.h | 25 +
+ tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 +
+ tools/lib/lockdep/uinclude/linux/stringify.h | 7 +
+ tools/lib/lockdep/uinclude/linux/system.h | 0
+ tools/lib/lockdep/uinclude/linux/types.h | 58 +
+ tools/lib/lockdep/uinclude/linux/util.h | 0
+ tools/lib/lockdep/uinclude/trace/events/lock.h | 0
+ tools/lib/traceevent/event-parse.c | 49 +-
+ tools/lib/traceevent/event-parse.h | 3 +-
+ tools/lib/traceevent/event-utils.h | 3 +-
+ tools/lib/traceevent/parse-filter.c | 3 +-
+ tools/lib/traceevent/parse-utils.c | 19 +
+ tools/lib/traceevent/trace-seq.c | 3 +-
+ tools/perf/Documentation/Makefile | 4 +
+ tools/perf/Documentation/perf-annotate.txt | 7 +-
+ tools/perf/Documentation/perf-buildid-cache.txt | 7 +
+ tools/perf/Documentation/perf-diff.txt | 4 -
+ tools/perf/Documentation/perf-evlist.txt | 4 +
+ tools/perf/Documentation/perf-report.txt | 41 +-
+ tools/perf/Documentation/perf-script-python.txt | 2 -
+ tools/perf/Documentation/perf-stat.txt | 11 +
+ tools/perf/Documentation/perf-test.txt | 4 +
+ tools/perf/Documentation/perf-top.txt | 2 +-
+ tools/perf/Makefile | 126 +-
+ tools/perf/arch/common.c | 1 +
+ tools/perf/bench/bench.h | 1 +
+ tools/perf/bench/numa.c | 1731 ++++++++++++++++++++
+ tools/perf/builtin-annotate.c | 30 +-
+ tools/perf/builtin-bench.c | 19 +
+ tools/perf/builtin-buildid-cache.c | 96 +-
+ tools/perf/builtin-buildid-list.c | 21 +-
+ tools/perf/builtin-diff.c | 205 +--
+ tools/perf/builtin-evlist.c | 88 +-
+ tools/perf/builtin-kmem.c | 16 +-
+ tools/perf/builtin-kvm.c | 3 +-
+ tools/perf/builtin-record.c | 168 +-
+ tools/perf/builtin-report.c | 93 +-
+ tools/perf/builtin-sched.c | 10 +-
+ tools/perf/builtin-script.c | 17 +-
+ tools/perf/builtin-stat.c | 328 +++-
+ tools/perf/builtin-top.c | 372 ++---
+ tools/perf/builtin-trace.c | 2 +-
+ tools/perf/config/feature-tests.mak | 22 +
+ tools/perf/config/utilities.mak | 6 +-
+ tools/perf/perf.c | 32 +-
+ tools/perf/perf.h | 32 -
+ tools/perf/scripts/perl/bin/workqueue-stats-record | 2 -
+ tools/perf/scripts/perl/bin/workqueue-stats-report | 3 -
+ tools/perf/scripts/perl/rwtop.pl | 6 +-
+ tools/perf/scripts/perl/workqueue-stats.pl | 129 --
+ tools/perf/tests/attr.c | 9 +-
+ tools/perf/tests/attr.py | 27 +-
+ tools/perf/tests/attr/base-record | 2 +-
+ tools/perf/tests/attr/test-record-group | 2 +
+ tools/perf/tests/attr/test-record-group1 | 4 +-
+ tools/perf/tests/builtin-test.c | 40 +-
+ tools/perf/tests/evsel-roundtrip-name.c | 4 +-
+ tools/perf/tests/hists_link.c | 500 ++++++
+ tools/perf/tests/mmap-basic.c | 40 +-
+ tools/perf/tests/open-syscall-all-cpus.c | 19 +-
+ tools/perf/tests/open-syscall.c | 17 +-
+ tools/perf/tests/parse-events.c | 324 +++-
+ tools/perf/tests/perf-record.c | 20 +-
+ tools/perf/tests/pmu.c | 11 +-
+ tools/perf/tests/python-use.c | 23 +
+ tools/perf/tests/tests.h | 11 +-
+ tools/perf/tests/util.c | 30 -
+ tools/perf/tests/vmlinux-kallsyms.c | 7 +-
+ tools/perf/ui/browser.c | 6 +-
+ tools/perf/ui/browsers/annotate.c | 33 +-
+ tools/perf/ui/browsers/hists.c | 341 +++-
+ tools/perf/ui/gtk/annotate.c | 229 +++
+ tools/perf/ui/gtk/browser.c | 235 +--
+ tools/perf/ui/gtk/gtk.h | 10 +-
+ tools/perf/ui/gtk/helpline.c | 23 +-
+ tools/perf/ui/gtk/hists.c | 312 ++++
+ tools/perf/ui/helpline.c | 12 +
+ tools/perf/ui/helpline.h | 22 +-
+ tools/perf/ui/hist.c | 481 +++---
+ tools/perf/ui/keysyms.h | 1 +
+ tools/perf/ui/setup.c | 8 +-
+ tools/perf/ui/stdio/hist.c | 25 +-
+ tools/perf/ui/tui/helpline.c | 29 +-
+ tools/perf/ui/util.c | 1 -
+ tools/perf/util/PERF-VERSION-GEN | 4 +-
+ tools/perf/util/annotate.c | 2 +-
+ tools/perf/util/annotate.h | 24 +
+ tools/perf/util/callchain.c | 2 +-
+ tools/perf/util/callchain.h | 5 +
+ tools/perf/util/cpumap.c | 54 +
+ tools/perf/util/cpumap.h | 9 +
+ tools/perf/util/debug.c | 28 +-
+ tools/perf/util/debug.h | 34 +-
+ tools/perf/util/dso.c | 6 +-
+ tools/perf/util/dso.h | 2 +-
+ tools/perf/util/event.c | 4 +-
+ tools/perf/util/evlist.c | 31 +-
+ tools/perf/util/evlist.h | 34 +-
+ tools/perf/util/evsel.c | 370 ++++-
+ tools/perf/util/evsel.h | 50 +-
+ tools/perf/util/header.c | 266 ++-
+ tools/perf/util/header.h | 2 +
+ tools/perf/util/hist.c | 142 +-
+ tools/perf/util/hist.h | 27 +-
+ tools/perf/util/include/linux/bitops.h | 1 +
+ tools/perf/util/intlist.c | 36 +-
+ tools/perf/util/intlist.h | 2 +-
+ tools/perf/util/liblockdep.h | 9 +
+ tools/perf/util/machine.c | 784 ++++++++-
+ tools/perf/util/machine.h | 41 +-
+ tools/perf/util/map.c | 121 +-
+ tools/perf/util/map.h | 24 +-
+ tools/perf/util/parse-events.c | 96 +-
+ tools/perf/util/parse-events.h | 22 +-
+ tools/perf/util/parse-events.y | 75 +-
+ tools/perf/util/pmu.c | 46 +-
+ tools/perf/util/pmu.h | 15 +-
+ tools/perf/util/pmu.y | 1 -
+ tools/perf/util/probe-finder.c | 10 +-
+ tools/perf/util/python-ext-sources | 1 +
+ tools/perf/util/python.c | 9 +
+ .../perf/util/scripting-engines/trace-event-perl.c | 1 +
+ .../util/scripting-engines/trace-event-python.c | 1 +
+ tools/perf/util/session.c | 325 +---
+ tools/perf/util/session.h | 35 +-
+ tools/perf/util/sort.c | 245 +--
+ tools/perf/util/sort.h | 15 +-
+ tools/perf/util/string.c | 18 +
+ tools/perf/util/strlist.c | 54 +-
+ tools/perf/util/strlist.h | 42 +-
+ tools/perf/util/symbol-elf.c | 14 +-
+ tools/perf/util/symbol-minimal.c | 1 -
+ tools/perf/util/symbol.c | 536 +-----
+ tools/perf/util/symbol.h | 9 +-
+ tools/perf/util/sysfs.c | 2 +-
+ tools/perf/util/thread.c | 20 +-
+ tools/perf/util/thread.h | 1 +
+ tools/perf/util/top.c | 22 +-
+ tools/perf/util/top.h | 10 +-
+ tools/perf/util/util.c | 24 +
+ tools/perf/util/util.h | 5 +
+ 814 files changed, 46225 insertions(+), 8365 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-events
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-ts5500
+ create mode 100644 Documentation/x86/early-microcode.txt
+ create mode 100644 arch/x86/include/asm/bootparam_utils.h
+ create mode 100644 arch/x86/include/asm/microcode_intel.h
+ delete mode 100644 arch/x86/include/asm/numa_64.h
+ create mode 100644 arch/x86/kernel/kprobes/Makefile
+ rename arch/x86/kernel/{kprobes-common.h => kprobes/common.h} (90%)
+ rename arch/x86/kernel/{kprobes.c => kprobes/core.c} (94%)
+ create mode 100644 arch/x86/kernel/kprobes/ftrace.c
+ rename arch/x86/kernel/{kprobes-opt.c => kprobes/opt.c} (99%)
+ create mode 100644 arch/x86/kernel/microcode_core_early.c
+ create mode 100644 arch/x86/kernel/microcode_intel_early.c
+ create mode 100644 arch/x86/kernel/microcode_intel_lib.c
+ create mode 100644 arch/x86/mm/mm_internal.h
+ create mode 100644 arch/x86/platform/goldfish/Makefile
+ create mode 100644 arch/x86/platform/goldfish/goldfish.c
+ create mode 100644 arch/x86/platform/ts5500/Makefile
+ create mode 100644 arch/x86/platform/ts5500/ts5500.c
+ create mode 100644 drivers/rtc/systohc.c
+ create mode 100644 include/asm-generic/cputime_jiffies.h
+ create mode 100644 include/asm-generic/cputime_nsecs.h
+ create mode 100644 include/linux/sched/rt.h
+ create mode 100644 include/linux/sched/sysctl.h
+ create mode 100644 include/trace/events/ras.h
+ delete mode 100644 samples/tracepoints/Makefile
+ delete mode 100644 samples/tracepoints/tp-samples-trace.h
+ delete mode 100644 samples/tracepoints/tracepoint-probe-sample.c
+ delete mode 100644 samples/tracepoints/tracepoint-probe-sample2.c
+ delete mode 100644 samples/tracepoints/tracepoint-sample.c
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/arm/aarch32/cortex-a15.c
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/barrier.h
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/kvm-config-arch.h
+ create mode 100644 tools/kvm/arm/aarch32/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/arm/aarch32/kvm-cpu.c
+ create mode 100644 tools/kvm/arm/aarch64/cortex-a57.c
+ create mode 100644 tools/kvm/arm/aarch64/include/kvm/barrier.h
+ create mode 100644 tools/kvm/arm/aarch64/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/arm/aarch64/include/kvm/kvm-config-arch.h
+ create mode 100644 tools/kvm/arm/aarch64/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/arm/aarch64/kvm-cpu.c
+ create mode 100644 tools/kvm/arm/fdt.c
+ create mode 100644 tools/kvm/arm/gic.c
+ create mode 100644 tools/kvm/arm/include/arm-common/gic.h
+ create mode 100644 tools/kvm/arm/include/arm-common/kvm-arch.h
+ create mode 100644 tools/kvm/arm/include/arm-common/kvm-config-arch.h
+ create mode 100644 tools/kvm/arm/include/arm-common/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/arm/ioport.c
+ create mode 100644 tools/kvm/arm/irq.c
+ create mode 100644 tools/kvm/arm/kvm-cpu.c
+ create mode 100644 tools/kvm/arm/kvm.c
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/devices.c
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/devices.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/fdt.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-config.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util-init.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-config-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100644 tools/kvm/util/init.c
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/mmio.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/virtio/scsi.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-config-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+ create mode 100644 tools/lib/lockdep/Makefile
+ create mode 100644 tools/lib/lockdep/common.c
+ create mode 100644 tools/lib/lockdep/include/liblockdep/common.h
+ create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h
+ create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h
+ create mode 100755 tools/lib/lockdep/lockdep
+ create mode 100644 tools/lib/lockdep/lockdep.c
+ create mode 100644 tools/lib/lockdep/lockdep_internals.h
+ create mode 100644 tools/lib/lockdep/lockdep_states.h
+ create mode 100644 tools/lib/lockdep/preload.c
+ create mode 100644 tools/lib/lockdep/rbtree.c
+ create mode 100755 tools/lib/lockdep/run_tests.sh
+ create mode 100644 tools/lib/lockdep/tests/AA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBCCA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c
+ create mode 100644 tools/lib/lockdep/tests/ABCABC.c
+ create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c
+ create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c
+ create mode 100644 tools/lib/lockdep/tests/WW.c
+ create mode 100644 tools/lib/lockdep/tests/common.h
+ create mode 100644 tools/lib/lockdep/tests/unlock_balance.c
+ create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
+ create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/export.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/list.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/mm_types.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/module.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/system.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/types.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/util.h
+ create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
+ create mode 100644 tools/perf/bench/numa.c
+ delete mode 100644 tools/perf/scripts/perl/bin/workqueue-stats-record
+ delete mode 100644 tools/perf/scripts/perl/bin/workqueue-stats-report
+ delete mode 100644 tools/perf/scripts/perl/workqueue-stats.pl
+ create mode 100644 tools/perf/tests/hists_link.c
+ create mode 100644 tools/perf/tests/python-use.c
+ delete mode 100644 tools/perf/tests/util.c
+ create mode 100644 tools/perf/ui/gtk/annotate.c
+ create mode 100644 tools/perf/ui/gtk/hists.c
+ create mode 100644 tools/perf/util/liblockdep.h
+$ git am -3 ../patches/0001-sched-rt-fix-PowerClamp-Driver-for-define-move.patch
+Applying: sched/rt: fix PowerClamp Driver for define move
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/thermal/intel_powerclamp.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 6264c2a] Merge remote-tracking branch 'tip/auto-latest'
+Merging ftrace/for-next (5ec8d01 ftrace: Call ftrace cleanup module notifier after all other notifiers)
+$ git merge ftrace/for-next
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/ftrace.h | 24 ++++++++++++++++++++
+ arch/x86/include/asm/thread_info.h | 1 -
+ kernel/trace/ftrace.c | 46 ++++++++++++++++++++++++++------------
+ kernel/trace/trace_syscalls.c | 43 ++++++++++++++++++++++++++++++-----
+ 4 files changed, 94 insertions(+), 20 deletions(-)
+Merging rcu/rcu/next (7a6b55e srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock())
+$ git merge rcu/rcu/next
+Already up-to-date.
+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 (cbd29cb KVM: nVMX: Remove redundant get_vmcs12 from nested_vmx_exit_handled_msr)
+$ git merge kvm/linux-next
+Resolved 'arch/s390/include/asm/irq.h' using previous resolution.
+Resolved 'arch/s390/kernel/irq.c' using previous resolution.
+Resolved 'arch/x86/include/asm/vmx.h' using previous resolution.
+Resolved 'include/uapi/linux/kvm.h' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging kernel/sched/core.c
+Auto-merging include/uapi/linux/kvm.h
+CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
+Auto-merging include/linux/kvm_host.h
+Auto-merging drivers/s390/kvm/kvm_virtio.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/include/asm/vmx.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/vmx.h
+Auto-merging arch/x86/include/asm/kvm_para.h
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/kernel/irq.c
+CONFLICT (content): Merge conflict in arch/s390/kernel/irq.c
+Auto-merging arch/s390/include/asm/irq.h
+CONFLICT (content): Merge conflict in arch/s390/include/asm/irq.h
+Auto-merging arch/powerpc/kvm/emulate.c
+Auto-merging arch/powerpc/kvm/book3s_pr.c
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Auto-merging Documentation/virtual/kvm/api.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 327b791] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 108 ++++-
+ Documentation/virtual/kvm/mmu.txt | 7 -
+ arch/ia64/include/asm/kvm_host.h | 4 +-
+ arch/ia64/kvm/kvm-ia64.c | 8 +-
+ arch/ia64/kvm/lapic.h | 6 +
+ arch/powerpc/include/asm/kvm_host.h | 8 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 10 +
+ arch/powerpc/include/uapi/asm/kvm.h | 6 +-
+ arch/powerpc/kvm/book3s_emulate.c | 30 ++
+ arch/powerpc/kvm/book3s_hv.c | 2 +-
+ arch/powerpc/kvm/book3s_pr.c | 5 +
+ arch/powerpc/kvm/booke.c | 40 +-
+ arch/powerpc/kvm/booke_emulate.c | 3 +
+ arch/powerpc/kvm/emulate.c | 5 -
+ arch/powerpc/kvm/powerpc.c | 17 +-
+ arch/s390/include/asm/irq.h | 1 +
+ arch/s390/include/asm/kvm_host.h | 15 +-
+ arch/s390/kernel/irq.c | 1 +
+ arch/s390/kvm/intercept.c | 45 +-
+ arch/s390/kvm/interrupt.c | 264 +++++++++-
+ arch/s390/kvm/kvm-s390.c | 50 +-
+ arch/s390/kvm/kvm-s390.h | 46 ++
+ arch/s390/kvm/priv.c | 316 ++++++++++--
+ arch/s390/kvm/sigp.c | 10 +-
+ arch/s390/kvm/trace-s390.h | 26 +-
+ arch/x86/include/asm/kvm_host.h | 26 +-
+ arch/x86/include/asm/kvm_para.h | 2 +-
+ arch/x86/include/asm/vmx.h | 19 +-
+ arch/x86/kvm/emulate.c | 673 +++++++++++++++-----------
+ arch/x86/kvm/i8254.c | 1 -
+ arch/x86/kvm/i8259.c | 2 +
+ arch/x86/kvm/irq.c | 74 ++-
+ arch/x86/kvm/lapic.c | 140 ++++--
+ arch/x86/kvm/lapic.h | 34 ++
+ arch/x86/kvm/mmu.c | 191 +++-----
+ arch/x86/kvm/mmutrace.h | 6 -
+ arch/x86/kvm/paging_tmpl.h | 106 ++++-
+ arch/x86/kvm/svm.c | 24 +
+ arch/x86/kvm/vmx.c | 714 ++++++++++++++++++---------
+ arch/x86/kvm/x86.c | 168 ++++---
+ drivers/s390/kvm/Makefile | 2 +-
+ drivers/s390/kvm/kvm_virtio.c | 38 +-
+ drivers/s390/kvm/virtio_ccw.c | 926 ++++++++++++++++++++++++++++++++++++
+ include/linux/kvm_host.h | 30 +-
+ include/trace/events/kvm.h | 2 +-
+ include/uapi/linux/kvm.h | 27 ++
+ kernel/sched/core.c | 25 +-
+ virt/kvm/ioapic.c | 48 +-
+ virt/kvm/ioapic.h | 4 +
+ virt/kvm/iommu.c | 4 +-
+ virt/kvm/irq_comm.c | 25 +
+ virt/kvm/kvm_main.c | 201 +++++---
+ 52 files changed, 3532 insertions(+), 1013 deletions(-)
+ create mode 100644 drivers/s390/kvm/virtio_ccw.c
+$ git am -3 ../patches/0001-KVM-s390-fix-for-IOINT_VIR-name-change.patch
+Applying: KVM: s390: fix for IOINT_VIR name change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/s390/kvm/virtio_ccw.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 6333245] Merge remote-tracking branch 'kvm/linux-next'
+$ git am -3 ../patches/0001-x86-apicv-merge-fixup-for-uapi-include-file-split.patch
+Applying: x86, apicv: merge fixup for uapi include file split
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/x86/include/uapi/asm/vmx.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 1c79a02] Merge remote-tracking branch 'kvm/linux-next'
+Merging kvm-ppc/kvm-ppc-next (899f7b2 Merge commit 'origin/next' into kvm-ppc-next)
+$ git merge kvm-ppc/kvm-ppc-next
+Auto-merging arch/powerpc/kvm/e500_mmu.c
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Auto-merging arch/powerpc/include/asm/reg.h
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/kvm_ppc.h | 2 -
+ arch/powerpc/include/asm/reg.h | 2 -
+ arch/powerpc/include/asm/reg_booke.h | 1 +
+ arch/powerpc/kernel/asm-offsets.c | 2 +-
+ arch/powerpc/kvm/Makefile | 9 +-
+ arch/powerpc/kvm/booke.c | 30 +-
+ arch/powerpc/kvm/booke.h | 1 +
+ arch/powerpc/kvm/booke_interrupts.S | 49 +-
+ arch/powerpc/kvm/e500.c | 16 +-
+ arch/powerpc/kvm/e500.h | 1 +
+ arch/powerpc/kvm/{e500_tlb.c => e500_mmu.c} | 659 +-------------------------
+ arch/powerpc/kvm/e500_mmu_host.c | 699 ++++++++++++++++++++++++++++
+ arch/powerpc/kvm/e500_mmu_host.h | 18 +
+ 13 files changed, 820 insertions(+), 669 deletions(-)
+ rename arch/powerpc/kvm/{e500_tlb.c => e500_mmu.c} (55%)
+ create mode 100644 arch/powerpc/kvm/e500_mmu_host.c
+ create mode 100644 arch/powerpc/kvm/e500_mmu_host.h
+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 (20fbb97 Merge branch 'stable/for-linus-3.9' into linux-next)
+$ git merge xen-two/linux-next
+Auto-merging drivers/xen/events.c
+Auto-merging drivers/net/xen-netback/netback.c
+Auto-merging arch/x86/xen/setup.c
+Auto-merging arch/x86/xen/mmu.c
+Auto-merging arch/x86/xen/enlighten.c
+Merge made by the 'recursive' strategy.
+ arch/arm/xen/enlighten.c | 8 +-
+ arch/x86/include/asm/xen/interface.h | 11 +-
+ arch/x86/include/asm/xen/page.h | 3 +
+ arch/x86/xen/Kconfig | 10 +
+ arch/x86/xen/enlighten.c | 76 ++++--
+ arch/x86/xen/irq.c | 5 +-
+ arch/x86/xen/mmu.c | 159 +++++++++++-
+ arch/x86/xen/mmu.h | 2 +
+ arch/x86/xen/p2m.c | 2 +-
+ arch/x86/xen/setup.c | 59 ++++-
+ arch/x86/xen/smp.c | 75 ++++--
+ arch/x86/xen/xen-head.S | 10 +-
+ drivers/net/xen-netback/netback.c | 11 +-
+ drivers/xen/Kconfig | 34 +++
+ drivers/xen/Makefile | 3 +
+ 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 | 115 +++++----
+ drivers/xen/pcpu.c | 35 +++
+ drivers/xen/privcmd.c | 2 +-
+ drivers/xen/tmem.c | 2 +-
+ drivers/xen/xen-acpi-cpuhotplug.c | 471 ++++++++++++++++++++++++++++++++++
+ drivers/xen/xen-acpi-memhotplug.c | 483 +++++++++++++++++++++++++++++++++++
+ drivers/xen/xen-stub.c | 101 ++++++++
+ drivers/xen/xenbus/xenbus_client.c | 9 +-
+ include/xen/acpi.h | 35 +++
+ include/xen/grant_table.h | 12 -
+ include/xen/interface/memory.h | 6 +
+ include/xen/interface/platform.h | 21 +-
+ 31 files changed, 1626 insertions(+), 164 deletions(-)
+ create mode 100644 drivers/xen/xen-acpi-cpuhotplug.c
+ create mode 100644 drivers/xen/xen-acpi-memhotplug.c
+ create mode 100644 drivers/xen/xen-stub.c
+$ git am -3 ../patches/0001-xen-fix-bad-merge-of-arch-x86-xen-mmu.c.patch
+Applying: xen: fix bad merge of arch/x86/xen/mmu.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/x86/xen/mmu.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 216c748] Merge remote-tracking branch 'xen-two/linux-next'
+$ git am -3 ../patches/0001-xen-acpi-fix-up-for-apci_bus_add-api-change.patch
+Applying: xen/acpi: fix up for apci_bus_add api change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/xen/xen-acpi-cpuhotplug.c
+M drivers/xen/xen-acpi-memhotplug.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 328f5b8] Merge remote-tracking branch 'xen-two/linux-next'
+$ git am -3 ../patches/0001-xen-acpi-updates-the-argument-of-.remove-operation-o.patch
+Applying: xen/acpi: updates the argument of .remove operation of xen cpu/mem hotplug
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/xen/xen-acpi-cpuhotplug.c
+M drivers/xen/xen-acpi-memhotplug.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 3765118] Merge remote-tracking branch 'xen-two/linux-next'
+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 (a4791ca Merge branch 'for-3.9' into for-next)
+$ git merge workqueues/for-next
+Removing kernel/workqueue_sched.h
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/kprobes.c
+Auto-merging init/main.c
+Auto-merging include/linux/elevator.h
+Auto-merging drivers/net/wireless/mwifiex/sdio.c
+Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c
+Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c
+Auto-merging drivers/net/wimax/i2400m/netdev.c
+Auto-merging drivers/net/can/sja1000/peak_pci.c
+Auto-merging block/elevator.c
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/cpu/mcheck/mce.c | 14 +-
+ block/elevator.c | 35 +-
+ drivers/net/can/sja1000/peak_pci.c | 3 +-
+ drivers/net/wimax/i2400m/netdev.c | 31 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 31 +-
+ drivers/net/wireless/ipw2x00/ipw2100.h | 3 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 13 +-
+ drivers/net/wireless/mwifiex/sdio.c | 9 +-
+ drivers/net/wireless/ti/wl1251/ps.c | 3 +-
+ drivers/platform/x86/thinkpad_acpi.c | 3 +-
+ drivers/tty/serial/max3100.c | 3 +-
+ drivers/video/exynos/exynos_dp_core.c | 6 +-
+ include/linux/async.h | 10 +-
+ include/linux/elevator.h | 5 +
+ include/linux/init.h | 1 +
+ include/linux/workqueue.h | 35 +-
+ include/trace/events/workqueue.h | 10 +-
+ init/do_mounts_initrd.c | 3 +
+ init/initramfs.c | 8 +-
+ init/main.c | 16 +
+ kernel/async.c | 167 ++--
+ kernel/kmod.c | 9 +
+ kernel/kprobes.c | 23 +-
+ kernel/sched/core.c | 2 +-
+ kernel/workqueue.c | 1528 +++++++++++++++-----------------
+ kernel/workqueue_internal.h | 65 ++
+ kernel/workqueue_sched.h | 9 -
+ net/rfkill/input.c | 8 +-
+ 28 files changed, 1007 insertions(+), 1046 deletions(-)
+ create mode 100644 kernel/workqueue_internal.h
+ delete mode 100644 kernel/workqueue_sched.h
+Merging drivers-x86/linux-next (6710c61 asus-laptop: Fix potential invalid pointer dereference)
+$ git merge drivers-x86/linux-next
+Resolved 'drivers/platform/x86/apple-gmux.c' using previous resolution.
+Resolved 'drivers/platform/x86/compal-laptop.c' using previous resolution.
+Resolved 'drivers/platform/x86/fujitsu-tablet.c' using previous resolution.
+Resolved 'drivers/platform/x86/ideapad-laptop.c' using previous resolution.
+Resolved 'drivers/platform/x86/intel_oaktrail.c' using previous resolution.
+Resolved 'drivers/platform/x86/toshiba_acpi.c' using previous resolution.
+Auto-merging drivers/platform/x86/toshiba_acpi.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Auto-merging drivers/platform/x86/sony-laptop.c
+Auto-merging drivers/platform/x86/intel_oaktrail.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/intel_oaktrail.c
+Auto-merging drivers/platform/x86/ideapad-laptop.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/ideapad-laptop.c
+Auto-merging drivers/platform/x86/hp-wmi.c
+Auto-merging drivers/platform/x86/fujitsu-tablet.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-tablet.c
+Auto-merging drivers/platform/x86/eeepc-wmi.c
+Auto-merging drivers/platform/x86/compal-laptop.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/compal-laptop.c
+Auto-merging drivers/platform/x86/asus-wmi.c
+Auto-merging drivers/platform/x86/asus-nb-wmi.c
+Auto-merging drivers/platform/x86/asus-laptop.c
+Auto-merging drivers/platform/x86/apple-gmux.c
+CONFLICT (content): Merge conflict in drivers/platform/x86/apple-gmux.c
+Auto-merging drivers/platform/x86/acer-wmi.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 905acdb] Merge remote-tracking branch 'drivers-x86/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-platform-msi-laptop | 83 +++++
+ drivers/platform/x86/Kconfig | 11 +
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/acer-wmi.c | 18 +
+ drivers/platform/x86/asus-laptop.c | 85 +++--
+ drivers/platform/x86/asus-nb-wmi.c | 76 ++++-
+ drivers/platform/x86/asus-wmi.c | 113 ++++++-
+ drivers/platform/x86/asus-wmi.h | 9 +
+ drivers/platform/x86/chromeos_laptop.c | 205 +++++++++++
+ drivers/platform/x86/eeepc-wmi.c | 2 +
+ drivers/platform/x86/fujitsu-tablet.c | 2 +-
+ drivers/platform/x86/hp-wmi.c | 44 ++-
+ drivers/platform/x86/ideapad-laptop.c | 2 +-
+ drivers/platform/x86/msi-laptop.c | 374 ++++++++++++++++-----
+ drivers/platform/x86/msi-wmi.c | 224 +++++++-----
+ drivers/platform/x86/sony-laptop.c | 143 +++++++-
+ drivers/platform/x86/thinkpad_acpi.c | 6 +-
+ 17 files changed, 1167 insertions(+), 231 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-msi-laptop
+ create mode 100644 drivers/platform/x86/chromeos_laptop.c
+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 (a2b37ef Merge remote-tracking branch 'regmap/topic/no-bus' into regmap-next)
+$ git merge regmap/for-next
+Auto-merging drivers/mfd/wm5102-tables.c
+Auto-merging drivers/base/regmap/regmap-debugfs.c
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/Makefile | 2 +-
+ drivers/base/regmap/internal.h | 4 ++
+ drivers/base/regmap/regcache-flat.c | 72 ++++++++++++++++++++
+ drivers/base/regmap/regcache.c | 1 +
+ drivers/base/regmap/regmap-debugfs.c | 50 +++++++++-----
+ drivers/base/regmap/regmap-irq.c | 125 +++++++++++++++++++++++++++--------
+ drivers/base/regmap/regmap-mmio.c | 79 ++++++++++++++++++----
+ drivers/base/regmap/regmap-spi.c | 2 +
+ drivers/base/regmap/regmap.c | 64 ++++++++++++++----
+ drivers/mfd/wm5102-tables.c | 1 +
+ drivers/mfd/wm5110-tables.c | 1 +
+ include/linux/regmap.h | 69 ++++++++++++++++---
+ 12 files changed, 392 insertions(+), 78 deletions(-)
+ create mode 100644 drivers/base/regmap/regcache-flat.c
+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 (4b07c5d leds: leds-sunfire: use dev_err()/pr_err() instead of printk())
+$ git merge leds/for-next
+Removing include/linux/leds-lp5523.h
+Removing include/linux/leds-lp5521.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/leds/leds-pwm.txt | 48 +
+ Documentation/devicetree/bindings/leds/tca6507.txt | 33 +
+ Documentation/leds/00-INDEX | 2 +
+ Documentation/leds/leds-lp5521.txt | 63 +-
+ Documentation/leds/leds-lp5523.txt | 27 +-
+ Documentation/leds/leds-lp55xx.txt | 118 +++
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 8 +-
+ arch/arm/mach-ux500/board-mop500.c | 14 +-
+ drivers/leds/Kconfig | 12 +-
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-88pm860x.c | 5 +-
+ drivers/leds/leds-lm3530.c | 58 +-
+ drivers/leds/leds-lm355x.c | 2 +-
+ drivers/leds/leds-lm3642.c | 4 +-
+ drivers/leds/leds-lp5521.c | 944 +++++-------------
+ drivers/leds/leds-lp5523.c | 1050 +++++---------------
+ drivers/leds/leds-lp55xx-common.c | 523 ++++++++++
+ drivers/leds/leds-lp55xx-common.h | 134 +++
+ drivers/leds/leds-lp8788.c | 9 +-
+ drivers/leds/leds-pca9532.c | 6 +-
+ drivers/leds/leds-pwm.c | 152 ++-
+ drivers/leds/leds-renesas-tpu.c | 12 +-
+ drivers/leds/leds-ss4200.c | 3 +-
+ drivers/leds/leds-sunfire.c | 19 +-
+ drivers/leds/leds-tca6507.c | 72 +-
+ drivers/leds/leds-wm831x-status.c | 2 +-
+ drivers/pwm/core.c | 38 +-
+ include/linux/leds-lp5521.h | 73 --
+ include/linux/leds-lp5523.h | 49 -
+ include/linux/leds_pwm.h | 2 +-
+ include/linux/platform_data/leds-lp55xx.h | 87 ++
+ include/linux/pwm.h | 20 +-
+ 32 files changed, 1803 insertions(+), 1787 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/tca6507.txt
+ create mode 100644 Documentation/leds/leds-lp55xx.txt
+ create mode 100644 drivers/leds/leds-lp55xx-common.c
+ create mode 100644 drivers/leds/leds-lp55xx-common.h
+ delete mode 100644 include/linux/leds-lp5521.h
+ delete mode 100644 include/linux/leds-lp5523.h
+ create mode 100644 include/linux/platform_data/leds-lp55xx.h
+Merging driver-core/driver-core-next (74fef7a base: memory: fix soft/hard_offline_page permissions)
+$ git merge driver-core/driver-core-next
+Auto-merging sound/soc/mxs/mxs-saif.c
+Auto-merging sound/soc/fsl/imx-audmux.c
+CONFLICT (modify/delete): net/wanrouter/Kconfig deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of net/wanrouter/Kconfig left in tree.
+Auto-merging net/nfc/core.c
+Auto-merging net/netfilter/Kconfig
+Auto-merging net/mac80211/Kconfig
+Auto-merging net/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging init/Kconfig
+Auto-merging include/linux/rtc.h
+Auto-merging include/linux/printk.h
+Auto-merging include/linux/power_supply.h
+Auto-merging drivers/watchdog/pnx4008_wdt.c
+Auto-merging drivers/watchdog/at91sam9_wdt.c
+Auto-merging drivers/video/exynos/exynos_dp_core.c
+Auto-merging drivers/video/Kconfig
+Auto-merging drivers/tty/tty_io.c
+Auto-merging drivers/thermal/exynos_thermal.c
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-tegra20-slink.c
+Auto-merging drivers/spi/spi-tegra20-sflash.c
+Auto-merging drivers/spi/spi-sirf.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+CONFLICT (content): Merge conflict in drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/spi-omap2-mcspi.c
+Auto-merging drivers/spi/spi-mxs.c
+Auto-merging drivers/spi/spi-ep93xx.c
+Auto-merging drivers/spi/Kconfig
+CONFLICT (content): Merge conflict in drivers/spi/Kconfig
+Auto-merging drivers/scsi/scsi_transport_iscsi.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging drivers/platform/x86/Kconfig
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging drivers/pinctrl/pinctrl-exynos5440.c
+Auto-merging drivers/net/wireless/rtlwifi/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/Kconfig
+Auto-merging drivers/net/wan/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/wan/Kconfig
+Auto-merging drivers/net/ethernet/seeq/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/seeq/Kconfig
+CONFLICT (modify/delete): drivers/net/ethernet/racal/Kconfig deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/net/ethernet/racal/Kconfig left in tree.
+Auto-merging drivers/net/ethernet/intel/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
+Auto-merging drivers/net/ethernet/i825xx/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/i825xx/Kconfig
+Auto-merging drivers/net/ethernet/fujitsu/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/fujitsu/Kconfig
+Auto-merging drivers/net/ethernet/8390/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/8390/Kconfig
+Auto-merging drivers/mtd/nand/mxc_nand.c
+Auto-merging drivers/mtd/nand/fsmc_nand.c
+Auto-merging drivers/mtd/devices/Kconfig
+Auto-merging drivers/mtd/Kconfig
+Auto-merging drivers/mmc/host/sdhci-s3c.c
+Auto-merging drivers/mmc/host/mxs-mmc.c
+Auto-merging drivers/mmc/host/Kconfig
+Auto-merging drivers/misc/atmel-ssc.c
+Auto-merging drivers/media/usb/dvb-usb-v2/Kconfig
+Auto-merging drivers/media/platform/Kconfig
+Auto-merging drivers/media/Kconfig
+Auto-merging drivers/leds/Kconfig
+Auto-merging drivers/iommu/tegra-smmu.c
+CONFLICT (content): Merge conflict in drivers/iommu/tegra-smmu.c
+Auto-merging drivers/iommu/Kconfig
+Auto-merging drivers/ide/Kconfig
+Auto-merging drivers/i2c/busses/i2c-tegra.c
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-s3c2410.c
+Auto-merging drivers/i2c/busses/i2c-at91.c
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging drivers/gpu/drm/exynos/exynos_hdmi.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_rotator.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/dma/tegra20-apb-dma.c
+Auto-merging drivers/dma/mmp_pdma.c
+Auto-merging drivers/dma/dw_dmac.c
+CONFLICT (content): Merge conflict in drivers/dma/dw_dmac.c
+Auto-merging drivers/cpufreq/Kconfig.x86
+Auto-merging drivers/cpufreq/Kconfig.arm
+Auto-merging drivers/ata/Kconfig
+Auto-merging drivers/acpi/Kconfig
+CONFLICT (content): Merge conflict in drivers/acpi/Kconfig
+Auto-merging crypto/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/sh/KconResolved 'drivers/acpi/Kconfig' using previous resolution.
+Resolved 'drivers/dma/dw_dmac.c' using previous resolution.
+Resolved 'drivers/i2c/busses/i2c-s3c2410.c' using previous resolution.
+Resolved 'drivers/iommu/tegra-smmu.c' using previous resolution.
+Resolved 'drivers/net/ethernet/8390/Kconfig' using previous resolution.
+Resolved 'drivers/net/ethernet/fujitsu/Kconfig' using previous resolution.
+Resolved 'drivers/net/ethernet/i825xx/Kconfig' using previous resolution.
+Resolved 'drivers/net/ethernet/intel/Kconfig' using previous resolution.
+Resolved 'drivers/net/ethernet/seeq/Kconfig' using previous resolution.
+Resolved 'drivers/net/wan/Kconfig' using previous resolution.
+Resolved 'drivers/net/wireless/rtlwifi/Kconfig' using previous resolution.
+Resolved 'drivers/spi/Kconfig' using previous resolution.
+Resolved 'drivers/spi/spi-s3c64xx.c' using previous resolution.
+fig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/platforms/85xx/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/ia64/Kconfig
+Auto-merging arch/blackfin/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/alpha/Kconfig
+Auto-merging Documentation/DocBook/kernel-hacking.tmpl
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f net/wanrouter/Kconfig drivers/net/ethernet/racal/Kconfig
+drivers/net/ethernet/racal/Kconfig: needs merge
+net/wanrouter/Kconfig: needs merge
+rm 'drivers/net/ethernet/racal/Kconfig'
+rm 'net/wanrouter/Kconfig'
+$ git commit -v -a
+[master 60d317a] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/CodingStyle | 10 +-
+ Documentation/DocBook/kernel-hacking.tmpl | 7 -
+ Documentation/DocBook/kgdb.tmpl | 6 +-
+ Documentation/driver-model/devres.txt | 7 +-
+ Documentation/dynamic-debug-howto.txt | 15 +-
+ Documentation/intel_txt.txt | 2 +-
+ Documentation/laptops/thinkpad-acpi.txt | 2 +-
+ Documentation/zh_CN/CodingStyle | 7 -
+ arch/alpha/Kconfig | 3 +-
+ arch/arm/Kconfig | 19 +-
+ arch/arm/Kconfig.debug | 2 +-
+ arch/arm/mach-omap2/gpmc.c | 8 +-
+ arch/arm/mach-s3c24xx/Kconfig | 4 +-
+ arch/arm/mach-tegra/tegra2_emc.c | 8 +-
+ arch/arm/plat-omap/dmtimer.c | 8 +-
+ arch/arm/plat-samsung/adc.c | 8 +-
+ arch/blackfin/Kconfig | 6 +-
+ arch/cris/arch-v32/drivers/Kconfig | 4 +-
+ arch/ia64/Kconfig | 8 +-
+ arch/ia64/kvm/Kconfig | 2 +-
+ arch/ia64/xen/Kconfig | 2 +-
+ arch/microblaze/platform/Kconfig.platform | 2 +-
+ arch/mips/Kconfig | 27 +-
+ arch/mips/jazz/Kconfig | 6 +-
+ arch/mips/sgi-ip27/Kconfig | 1 -
+ arch/parisc/Kconfig | 8 +-
+ arch/powerpc/Kconfig | 14 +-
+ arch/powerpc/kvm/Kconfig | 10 +-
+ arch/powerpc/platforms/85xx/Kconfig | 1 -
+ arch/powerpc/platforms/cell/Kconfig | 2 +-
+ arch/powerpc/platforms/ps3/Kconfig | 2 +-
+ arch/s390/Kconfig | 4 +-
+ arch/s390/kvm/Kconfig | 2 +-
+ arch/sh/Kconfig | 13 +-
+ arch/sh/Kconfig.cpu | 3 +-
+ arch/sh/mm/Kconfig | 4 +-
+ arch/tile/kvm/Kconfig | 2 +-
+ arch/um/Kconfig.net | 2 +-
+ arch/um/Kconfig.um | 8 +-
+ arch/x86/Kconfig | 22 +-
+ arch/x86/um/Kconfig | 3 +-
+ crypto/Kconfig | 15 +-
+ drivers/acpi/Kconfig | 9 +-
+ drivers/amba/tegra-ahb.c | 7 +-
+ drivers/ata/Kconfig | 24 +-
+ drivers/ata/pata_ep93xx.c | 7 +-
+ drivers/base/Kconfig | 11 +
+ drivers/base/bus.c | 6 +-
+ drivers/base/class.c | 4 +-
+ drivers/base/core.c | 8 +-
+ drivers/base/dd.c | 2 +
+ drivers/base/dma-buf.c | 9 +-
+ drivers/base/firmware_class.c | 550 +++++++++++----------
+ drivers/base/memory.c | 4 +-
+ drivers/block/paride/Kconfig | 4 +-
+ drivers/char/hw_random/exynos-rng.c | 9 +-
+ drivers/char/hw_random/omap-rng.c | 6 +-
+ drivers/char/hw_random/tx4939-rng.c | 7 +-
+ drivers/cpufreq/Kconfig.arm | 4 +-
+ drivers/cpufreq/Kconfig.x86 | 6 +-
+ drivers/dma/dw_dmac.c | 7 +-
+ drivers/dma/imx-dma.c | 7 +-
+ drivers/dma/mmp_pdma.c | 7 +-
+ drivers/dma/mmp_tdma.c | 7 +-
+ drivers/dma/tegra20-apb-dma.c | 10 +-
+ drivers/edac/Kconfig | 4 +-
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-mvebu.c | 18 +-
+ drivers/gpio/gpio-mxs.c | 9 +-
+ drivers/gpio/gpio-spear-spics.c | 8 +-
+ drivers/gpio/gpio-stp-xway.c | 9 +-
+ drivers/gpio/gpio-tegra.c | 9 +-
+ drivers/gpio/gpiolib.c | 2 +-
+ drivers/gpu/drm/ast/Kconfig | 2 +-
+ drivers/gpu/drm/cirrus/Kconfig | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimc.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 7 +-
+ drivers/gpu/drm/exynos/exynos_drm_gsc.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_drm_rotator.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +-
+ drivers/gpu/drm/gma500/Kconfig | 2 +-
+ drivers/gpu/drm/mgag200/Kconfig | 2 +-
+ drivers/gpu/drm/tegra/dc.c | 8 +-
+ drivers/gpu/drm/tegra/hdmi.c | 6 +-
+ drivers/gpu/drm/tegra/host1x.c | 6 +-
+ drivers/gpu/drm/udl/Kconfig | 2 +-
+ drivers/i2c/Kconfig | 2 +-
+ drivers/i2c/busses/Kconfig | 16 +-
+ drivers/i2c/busses/i2c-at91.c | 6 +-
+ drivers/i2c/busses/i2c-imx.c | 6 +-
+ drivers/i2c/busses/i2c-ocores.c | 7 +-
+ drivers/i2c/busses/i2c-omap.c | 8 +-
+ drivers/i2c/busses/i2c-rcar.c | 8 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 8 +-
+ drivers/i2c/busses/i2c-sirf.c | 7 +-
+ drivers/i2c/busses/i2c-stu300.c | 6 +-
+ drivers/i2c/busses/i2c-tegra.c | 8 +-
+ drivers/i2c/busses/i2c-xlr.c | 9 +-
+ drivers/i2c/muxes/Kconfig | 2 -
+ drivers/ide/Kconfig | 8 +-
+ drivers/idle/Kconfig | 1 -
+ drivers/iio/adc/at91_adc.c | 6 +-
+ drivers/input/keyboard/spear-keyboard.c | 8 +-
+ drivers/input/serio/arc_ps2.c | 7 +-
+ drivers/iommu/Kconfig | 8 +-
+ drivers/iommu/tegra-smmu.c | 7 +-
+ drivers/isdn/hisax/Kconfig | 15 +-
+ drivers/isdn/mISDN/core.c | 4 +-
+ drivers/leds/Kconfig | 2 +-
+ drivers/lguest/Kconfig | 2 +-
+ drivers/macintosh/Kconfig | 2 +-
+ drivers/media/Kconfig | 7 +-
+ drivers/media/pci/cx25821/Kconfig | 2 +-
+ drivers/media/platform/Kconfig | 8 +-
+ drivers/media/platform/s5p-fimc/Kconfig | 1 -
+ drivers/media/platform/s5p-tv/Kconfig | 3 +-
+ drivers/media/usb/dvb-usb-v2/Kconfig | 2 +-
+ drivers/media/usb/pvrusb2/Kconfig | 8 +-
+ drivers/memory/emif.c | 8 +-
+ drivers/memory/tegra20-mc.c | 7 +-
+ drivers/memory/tegra30-mc.c | 7 +-
+ drivers/memstick/Kconfig | 2 +-
+ drivers/memstick/host/Kconfig | 12 +-
+ drivers/mfd/intel_msic.c | 9 +-
+ drivers/misc/atmel-ssc.c | 8 +-
+ drivers/mmc/core/Kconfig | 3 +-
+ drivers/mmc/host/Kconfig | 20 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 7 +-
+ drivers/mmc/host/mxs-mmc.c | 6 +-
+ drivers/mmc/host/sdhci-s3c.c | 7 +-
+ drivers/mtd/Kconfig | 2 +-
+ drivers/mtd/chips/Kconfig | 2 +-
+ drivers/mtd/devices/Kconfig | 4 +-
+ drivers/mtd/devices/spear_smi.c | 7 +-
+ drivers/mtd/maps/autcpu12-nvram.c | 9 +-
+ drivers/mtd/maps/lantiq-flash.c | 8 +-
+ drivers/mtd/nand/Kconfig | 7 +-
+ drivers/mtd/nand/fsmc_nand.c | 33 +-
+ drivers/mtd/nand/lpc32xx_mlc.c | 9 +-
+ drivers/mtd/nand/lpc32xx_slc.c | 8 +-
+ drivers/mtd/nand/mxc_nand.c | 12 +-
+ drivers/mtd/nand/s3c2410.c | 7 +-
+ drivers/mtd/nand/txx9ndfmc.c | 7 +-
+ drivers/net/Kconfig | 9 +-
+ drivers/net/ethernet/8390/Kconfig | 5 +-
+ drivers/net/ethernet/atheros/Kconfig | 8 +-
+ drivers/net/ethernet/dec/tulip/Kconfig | 4 +-
+ drivers/net/ethernet/fujitsu/Kconfig | 2 +-
+ drivers/net/ethernet/i825xx/Kconfig | 4 +-
+ drivers/net/ethernet/icplus/Kconfig | 2 +-
+ drivers/net/ethernet/intel/Kconfig | 5 -
+ drivers/net/ethernet/microchip/Kconfig | 4 +-
+ drivers/net/ethernet/natsemi/Kconfig | 3 -
+ drivers/net/ethernet/packetengines/Kconfig | 4 +-
+ drivers/net/ethernet/realtek/Kconfig | 4 +-
+ drivers/net/ethernet/seeq/Kconfig | 1 -
+ drivers/net/ethernet/silan/Kconfig | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 4 +-
+ drivers/net/ethernet/sun/Kconfig | 4 +-
+ drivers/net/ethernet/ti/Kconfig | 4 +-
+ drivers/net/hippi/Kconfig | 8 +-
+ drivers/net/irda/Kconfig | 36 +-
+ drivers/net/phy/mdio_bus.c | 2 +-
+ drivers/net/ppp/Kconfig | 20 +-
+ drivers/net/team/Kconfig | 3 +-
+ drivers/net/usb/Kconfig | 16 +-
+ drivers/net/wan/Kconfig | 4 +-
+ drivers/net/wireless/Kconfig | 10 +-
+ drivers/net/wireless/ath/ath6kl/Kconfig | 1 -
+ drivers/net/wireless/ath/carl9170/Kconfig | 2 +-
+ drivers/net/wireless/ath/wil6210/dbg_hexdump.h | 18 +-
+ drivers/net/wireless/b43/Kconfig | 12 +-
+ drivers/net/wireless/ipw2x00/Kconfig | 2 +-
+ drivers/net/wireless/p54/Kconfig | 2 +-
+ drivers/net/wireless/rt2x00/Kconfig | 5 -
+ drivers/net/wireless/rtl818x/Kconfig | 2 +-
+ drivers/net/wireless/zd1211rw/Kconfig | 2 +-
+ drivers/pcmcia/Kconfig | 4 +-
+ drivers/pinctrl/pinctrl-at91.c | 7 +-
+ drivers/pinctrl/pinctrl-bcm2835.c | 6 +-
+ drivers/pinctrl/pinctrl-coh901.c | 8 +-
+ drivers/pinctrl/pinctrl-exynos5440.c | 8 +-
+ drivers/pinctrl/pinctrl-falcon.c | 13 +-
+ drivers/pinctrl/pinctrl-imx.c | 6 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 6 +-
+ drivers/pinctrl/pinctrl-pxa3xx.c | 7 +-
+ drivers/pinctrl/pinctrl-samsung.c | 8 +-
+ drivers/pinctrl/pinctrl-u300.c | 6 +-
+ drivers/pinctrl/pinctrl-xway.c | 9 +-
+ drivers/pinctrl/spear/pinctrl-plgpio.c | 8 +-
+ drivers/platform/x86/Kconfig | 6 +-
+ drivers/power/jz4740-battery.c | 7 +-
+ drivers/power/power_supply_core.c | 4 +-
+ drivers/pwm/pwm-imx.c | 6 +-
+ drivers/pwm/pwm-lpc32xx.c | 6 +-
+ drivers/pwm/pwm-mxs.c | 6 +-
+ drivers/pwm/pwm-puv3.c | 6 +-
+ drivers/pwm/pwm-pxa.c | 6 +-
+ drivers/pwm/pwm-spear.c | 6 +-
+ drivers/pwm/pwm-tegra.c | 6 +-
+ drivers/pwm/pwm-tiecap.c | 6 +-
+ drivers/pwm/pwm-tiehrpwm.c | 6 +-
+ drivers/pwm/pwm-tipwmss.c | 6 +-
+ drivers/pwm/pwm-vt8500.c | 6 +-
+ drivers/remoteproc/Kconfig | 5 +-
+ drivers/rpmsg/Kconfig | 3 +-
+ drivers/rtc/interface.c | 6 +-
+ drivers/rtc/rtc-s3c.c | 8 +-
+ drivers/rtc/rtc-snvs.c | 6 +-
+ drivers/rtc/rtc-spear.c | 8 +-
+ drivers/rtc/rtc-tegra.c | 8 +-
+ drivers/sbus/char/Kconfig | 7 +-
+ drivers/scsi/Kconfig | 18 +-
+ drivers/scsi/arm/Kconfig | 10 +-
+ drivers/scsi/device_handler/Kconfig | 4 +-
+ drivers/scsi/hosts.c | 4 +-
+ drivers/scsi/osd/osd_uld.c | 26 +-
+ drivers/scsi/scsi_transport_iscsi.c | 4 +-
+ drivers/spi/Kconfig | 17 +-
+ drivers/spi/spi-ep93xx.c | 7 +-
+ drivers/spi/spi-mxs.c | 6 +-
+ drivers/spi/spi-omap2-mcspi.c | 7 +-
+ drivers/spi/spi-s3c64xx.c | 7 +-
+ drivers/spi/spi-sirf.c | 7 +-
+ drivers/spi/spi-tegra20-sflash.c | 8 +-
+ drivers/spi/spi-tegra20-slink.c | 8 +-
+ drivers/spi/spi.c | 4 +-
+ drivers/staging/iio/adc/mxs-lradc.c | 7 +-
+ drivers/staging/nvec/nvec.c | 8 +-
+ drivers/staging/omap-thermal/omap-bandgap.c | 11 +-
+ drivers/thermal/exynos_thermal.c | 8 +-
+ drivers/tty/serial/sccnxp.c | 8 +-
+ drivers/tty/tty_io.c | 4 +-
+ drivers/usb/chipidea/usbmisc_imx6q.c | 6 +-
+ drivers/usb/gadget/at91_udc.c | 12 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 12 +-
+ drivers/usb/gadget/bcm63xx_udc.c | 13 +-
+ drivers/usb/gadget/fusb300_udc.c | 13 +-
+ drivers/usb/gadget/imx_udc.c | 12 +-
+ drivers/usb/gadget/lpc32xx_udc.c | 12 +-
+ drivers/usb/gadget/m66592-udc.c | 12 +-
+ drivers/usb/gadget/pxa25x_udc.c | 15 +-
+ drivers/usb/gadget/r8a66597-udc.c | 15 +-
+ drivers/usb/gadget/s3c-hsotg.c | 7 +-
+ drivers/usb/gadget/s3c-hsudc.c | 7 +-
+ drivers/usb/host/ehci-atmel.c | 7 +-
+ drivers/usb/host/ehci-grlib.c | 9 +-
+ drivers/usb/host/ehci-mxc.c | 7 +-
+ drivers/usb/host/ehci-platform.c | 7 +-
+ drivers/usb/host/ehci-ppc-of.c | 8 +-
+ drivers/usb/host/ehci-sead3.c | 8 +-
+ drivers/usb/host/ehci-sh.c | 7 +-
+ drivers/usb/host/ehci-vt8500.c | 8 +-
+ drivers/usb/host/ehci-xilinx-of.c | 8 +-
+ drivers/usb/host/ohci-nxp.c | 7 +-
+ drivers/usb/host/ohci-platform.c | 7 +-
+ drivers/usb/host/ohci-s3c2410.c | 7 +-
+ drivers/usb/musb/musb_dsps.c | 7 +-
+ drivers/usb/musb/omap2430.c | 4 +-
+ drivers/usb/otg/gpio_vbus.c | 12 +-
+ drivers/usb/otg/msm_otg.c | 13 +-
+ drivers/usb/otg/mxs-phy.c | 6 +-
+ drivers/usb/phy/mv_u3d_phy.c | 8 +-
+ drivers/usb/phy/omap-usb2.c | 8 +-
+ drivers/usb/renesas_usbhs/common.c | 9 +-
+ drivers/uwb/lc-rc.c | 21 +-
+ drivers/vhost/Kconfig | 4 +-
+ drivers/vhost/Kconfig.tcm | 4 +-
+ drivers/video/Kconfig | 26 +-
+ drivers/video/backlight/backlight.c | 2 +-
+ drivers/video/console/Kconfig | 2 +-
+ drivers/video/exynos/exynos_dp_core.c | 8 +-
+ drivers/video/geode/Kconfig | 14 +-
+ drivers/video/jz4740_fb.c | 6 +-
+ drivers/video/omap/Kconfig | 2 +-
+ drivers/video/omap2/dss/hdmi.c | 8 +-
+ drivers/video/omap2/vrfb.c | 9 +-
+ drivers/video/s3c-fb.c | 7 +-
+ drivers/virtio/Kconfig | 8 +-
+ drivers/vlynq/Kconfig | 2 +-
+ drivers/w1/masters/omap_hdq.c | 8 +-
+ drivers/watchdog/ar7_wdt.c | 8 +-
+ drivers/watchdog/at32ap700x_wdt.c | 12 +-
+ drivers/watchdog/at91sam9_wdt.c | 13 +-
+ drivers/watchdog/coh901327_wdt.c | 12 +-
+ drivers/watchdog/dw_wdt.c | 6 +-
+ drivers/watchdog/imx2_wdt.c | 20 +-
+ drivers/watchdog/jz4740_wdt.c | 6 +-
+ drivers/watchdog/lantiq_wdt.c | 8 +-
+ drivers/watchdog/max63xx_wdt.c | 7 +-
+ drivers/watchdog/pnx4008_wdt.c | 6 +-
+ drivers/watchdog/txx9wdt.c | 19 +-
+ fs/9p/Kconfig | 3 +-
+ fs/adfs/Kconfig | 4 +-
+ fs/affs/Kconfig | 4 +-
+ fs/afs/Kconfig | 7 +-
+ fs/befs/Kconfig | 4 +-
+ fs/bfs/Kconfig | 4 +-
+ fs/btrfs/Kconfig | 3 +-
+ fs/ceph/Kconfig | 4 +-
+ fs/cifs/Kconfig | 8 +-
+ fs/debugfs/inode.c | 1 -
+ fs/ecryptfs/Kconfig | 4 +-
+ fs/efs/Kconfig | 4 +-
+ fs/hfs/Kconfig | 4 +-
+ fs/jffs2/Kconfig | 10 +-
+ fs/logfs/Kconfig | 4 +-
+ fs/nfsd/Kconfig | 4 +-
+ fs/nilfs2/Kconfig | 3 +-
+ fs/sysfs/mount.c | 2 +-
+ fs/ufs/Kconfig | 2 +-
+ fs/xfs/Kconfig | 4 +-
+ include/linux/debugfs.h | 2 +-
+ include/linux/device.h | 5 +-
+ include/linux/dynamic_debug.h | 11 +
+ include/linux/platform_device.h | 18 +
+ include/linux/power_supply.h | 2 +-
+ include/linux/printk.h | 17 +
+ include/linux/rtc.h | 2 +-
+ init/Kconfig | 54 +-
+ init/do_mounts.c | 4 +-
+ kernel/gcov/Kconfig | 2 +-
+ kernel/power/suspend_test.c | 11 +-
+ lib/Kconfig | 2 +-
+ lib/Kconfig.debug | 2 +-
+ lib/Kconfig.kgdb | 2 +-
+ lib/devres.c | 58 ++-
+ lib/dynamic_debug.c | 165 ++++---
+ lib/hexdump.c | 4 +-
+ mm/Kconfig | 2 +-
+ net/9p/Kconfig | 2 +-
+ net/Kconfig | 5 +-
+ net/ceph/Kconfig | 4 +-
+ net/dccp/Kconfig | 4 +-
+ net/dccp/ccids/Kconfig | 5 +-
+ net/decnet/Kconfig | 4 +-
+ net/decnet/netfilter/Kconfig | 2 +-
+ net/ieee802154/Kconfig | 3 +-
+ net/ieee802154/wpan-class.c | 5 +-
+ net/ipv4/Kconfig | 11 +-
+ net/ipv4/netfilter/Kconfig | 4 +-
+ net/ipv6/Kconfig | 24 +-
+ net/l2tp/Kconfig | 4 +-
+ net/lapb/Kconfig | 3 +-
+ net/mac80211/Kconfig | 2 +-
+ net/mac802154/Kconfig | 2 +-
+ net/netfilter/Kconfig | 24 +-
+ net/nfc/core.c | 4 +-
+ net/rds/Kconfig | 4 +-
+ net/rxrpc/Kconfig | 2 +-
+ net/sunrpc/Kconfig | 2 +-
+ net/tipc/Kconfig | 4 +-
+ net/x25/Kconfig | 3 +-
+ net/xfrm/Kconfig | 16 +-
+ scripts/coccinelle/api/devm_ioremap_resource.cocci | 90 ++++
+ sound/soc/cirrus/ep93xx-ac97.c | 7 +-
+ sound/soc/cirrus/ep93xx-i2s.c | 6 +-
+ sound/soc/codecs/jz4740.c | 6 +-
+ sound/soc/fsl/imx-audmux.c | 6 +-
+ sound/soc/fsl/imx-ssi.c | 7 +-
+ sound/soc/kirkwood/kirkwood-i2s.c | 8 +-
+ sound/soc/mxs/mxs-saif.c | 8 +-
+ sound/soc/pxa/mmp-sspa.c | 6 +-
+ tools/lguest/lguest.txt | 8 +-
+ 365 files changed, 1641 insertions(+), 1819 deletions(-)
+ create mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci
+Merging tty/tty-next (9e17df3 tty: mxser: improve error handling in mxser_probe() and mxser_module_init())
+$ git merge tty/tty-next
+Resolved 'drivers/i2c/busses/Kconfig' using previous resolution.
+Resolved 'drivers/lguest/Kconfig' using previous resolution.
+Resolved 'drivers/net/can/Kconfig' using previous resolution.
+Resolved 'drivers/net/wan/Kconfig' using previous resolution.
+Auto-merging sound/soc/codecs/Kconfig
+Auto-merging lib/Kconfig.kgdb
+Auto-merging include/linux/proc_fs.h
+Auto-merging include/linux/platform_data/serial-sccnxp.h
+Auto-merging include/linux/pci_ids.h
+Removing include/linux/of_serial.h
+Auto-merging include/linux/console.h
+Auto-merging drivers/usb/serial/ftdi_sio.c
+Auto-merging drivers/tty/vt/vt.c
+Auto-merging drivers/tty/tty_io.c
+Auto-merging drivers/tty/serial/xilinx_uartps.c
+Auto-merging drivers/tty/serial/sccnxp.c
+Auto-merging drivers/tty/serial/max3100.c
+Auto-merging drivers/tty/serial/Kconfig
+Auto-merging drivers/tty/hvc/hvsi.c
+Auto-merging drivers/s390/char/tty3270.c
+Auto-merging drivers/net/wan/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/wan/Kconfig
+Auto-merging drivers/net/usb/hso.c
+Auto-merging drivers/net/usb/Kconfig
+Auto-merging drivers/net/ppp/Kconfig
+Auto-merging drivers/net/irda/Kconfig
+Auto-merging drivers/net/can/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/can/Kconfig
+Auto-merging drivers/misc/Kconfig
+Auto-merging drivers/lguest/Kconfig
+CONFLICT (content): Merge conflict in drivers/lguest/Kconfig
+Auto-merging drivers/isdn/gigaset/interface.c
+Auto-merging drivers/input/serio/Kconfig
+Auto-merging drivers/i2c/busses/Kconfig
+CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/tile/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/mips/sni/a20r.c
+Auto-merging arch/alpha/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 43a157a] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/serial/nvidia,tegra20-hsuart.txt | 24 +
+ .../devicetree/bindings/tty/serial/arc-uart.txt | 26 +
+ .../devicetree/bindings/tty/serial/efm32-uart.txt | 6 +
+ Documentation/serial/driver | 44 +-
+ arch/alpha/Kconfig | 2 +
+ arch/alpha/kernel/srmcons.c | 18 +-
+ arch/arm/boot/dts/vt8500.dtsi | 40 +-
+ arch/arm/boot/dts/wm8505.dtsi | 60 +-
+ arch/arm/boot/dts/wm8650.dtsi | 20 +-
+ arch/arm/mach-sa1100/assabet.c | 1 +
+ arch/arm/plat-samsung/include/plat/adc.h | 1 +
+ arch/ia64/hp/sim/Kconfig | 1 +
+ arch/ia64/hp/sim/simserial.c | 21 +-
+ arch/m68k/Kconfig.devices | 2 +-
+ arch/mips/sni/a20r.c | 2 +-
+ arch/mn10300/kernel/mn10300-serial.c | 20 +-
+ arch/parisc/Kconfig | 1 +
+ arch/parisc/kernel/pdc_cons.c | 10 +-
+ arch/sparc/kernel/kgdb_32.c | 1 +
+ arch/tile/Kconfig | 1 +
+ arch/um/Kconfig.common | 1 +
+ arch/um/drivers/chan.h | 3 +-
+ arch/um/drivers/chan_kern.c | 25 +-
+ arch/um/drivers/line.c | 7 +-
+ arch/x86/lguest/Kconfig | 1 +
+ arch/xtensa/Kconfig | 1 +
+ arch/xtensa/platforms/iss/console.c | 10 +-
+ drivers/bluetooth/Kconfig | 1 +
+ drivers/char/Kconfig | 7 +-
+ drivers/char/pcmcia/Kconfig | 4 +-
+ drivers/char/pcmcia/synclink_cs.c | 62 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 +
+ drivers/i2c/busses/Kconfig | 1 +
+ drivers/input/serio/Kconfig | 1 +
+ drivers/ipack/devices/Kconfig | 2 +-
+ drivers/ipack/devices/ipoctal.c | 19 +-
+ drivers/isdn/Kconfig | 1 +
+ drivers/isdn/capi/Kconfig | 1 +
+ drivers/isdn/gigaset/Kconfig | 1 +
+ drivers/isdn/gigaset/interface.c | 14 +-
+ drivers/isdn/hardware/mISDN/Kconfig | 1 +
+ drivers/isdn/i4l/isdn_common.c | 14 +-
+ drivers/isdn/i4l/isdn_common.h | 2 +-
+ drivers/isdn/i4l/isdn_tty.c | 59 +-
+ drivers/lguest/Kconfig | 2 +-
+ drivers/media/radio/wl128x/Kconfig | 2 +-
+ drivers/misc/Kconfig | 2 +-
+ drivers/misc/ti-st/Kconfig | 2 +-
+ drivers/mmc/card/Kconfig | 1 +
+ drivers/mmc/card/sdio_uart.c | 13 +-
+ drivers/net/caif/Kconfig | 2 +-
+ drivers/net/caif/caif_serial.c | 2 +-
+ drivers/net/can/Kconfig | 1 +
+ drivers/net/hamradio/Kconfig | 4 +-
+ drivers/net/irda/Kconfig | 2 +-
+ drivers/net/irda/irtty-sir.c | 2 +-
+ drivers/net/ppp/Kconfig | 3 +
+ drivers/net/slip/Kconfig | 1 +
+ drivers/net/usb/Kconfig | 4 +-
+ drivers/net/usb/hso.c | 32 +-
+ drivers/net/wan/Kconfig | 2 +-
+ drivers/parport/parport_serial.c | 21 +
+ drivers/pps/clients/Kconfig | 2 +-
+ drivers/pps/clients/pps-ldisc.c | 30 +-
+ drivers/pps/pps.c | 47 +-
+ drivers/s390/char/Kconfig | 8 +-
+ drivers/s390/char/con3215.c | 12 +-
+ drivers/s390/char/keyboard.h | 16 +-
+ drivers/s390/char/sclp_tty.c | 14 +-
+ drivers/s390/char/sclp_vt220.c | 12 +-
+ drivers/s390/char/tty3270.c | 4 +-
+ drivers/staging/ccg/Kconfig | 2 +-
+ drivers/staging/ccg/u_serial.c | 13 +-
+ drivers/staging/dgrp/Kconfig | 2 +-
+ drivers/staging/dgrp/dgrp_net_ops.c | 13 +-
+ drivers/staging/dgrp/dgrp_tty.c | 1 +
+ drivers/staging/fwserial/Kconfig | 2 +-
+ drivers/staging/fwserial/fwserial.c | 51 +-
+ drivers/staging/sb105x/Kconfig | 3 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 41 +-
+ drivers/staging/speakup/selection.c | 1 +
+ drivers/tty/Kconfig | 32 +
+ drivers/tty/Makefile | 4 +-
+ drivers/tty/amiserial.c | 18 +-
+ drivers/tty/bfin_jtag_comm.c | 22 +-
+ drivers/tty/cyclades.c | 297 ++---
+ drivers/tty/ehv_bytechan.c | 13 +-
+ drivers/tty/goldfish.c | 328 +++++
+ drivers/tty/hvc/Kconfig | 3 +
+ drivers/tty/hvc/hvc_console.c | 6 +-
+ drivers/tty/hvc/hvcs.c | 6 +-
+ drivers/tty/hvc/hvsi.c | 28 +-
+ drivers/tty/ipwireless/tty.c | 12 +-
+ drivers/tty/isicom.c | 12 +-
+ drivers/tty/metag_da.c | 677 ++++++++++
+ drivers/tty/moxa.c | 10 +-
+ drivers/tty/mxser.c | 50 +-
+ drivers/tty/n_gsm.c | 120 +-
+ drivers/tty/n_tty.c | 59 +-
+ drivers/tty/nozomi.c | 37 +-
+ drivers/tty/pty.c | 28 +-
+ drivers/tty/rocket.c | 60 +-
+ drivers/tty/serial/21285.c | 3 +-
+ drivers/tty/serial/68328serial.c | 19 +-
+ drivers/tty/serial/8250/8250.c | 132 +-
+ drivers/tty/serial/8250/8250.h | 50 +
+ drivers/tty/serial/8250/8250_dma.c | 216 +++
+ drivers/tty/serial/8250/8250_dw.c | 257 +++-
+ drivers/tty/serial/8250/8250_early.c | 2 +-
+ drivers/tty/serial/8250/8250_pci.c | 342 +++++
+ drivers/tty/serial/8250/Kconfig | 27 +-
+ drivers/tty/serial/8250/Makefile | 1 +
+ drivers/tty/serial/Kconfig | 41 +-
+ drivers/tty/serial/Makefile | 2 +
+ drivers/tty/serial/altera_jtaguart.c | 8 +-
+ drivers/tty/serial/altera_uart.c | 8 +-
+ drivers/tty/serial/amba-pl010.c | 3 +-
+ drivers/tty/serial/amba-pl011.c | 11 +-
+ drivers/tty/serial/apbuart.c | 3 +-
+ drivers/tty/serial/ar933x_uart.c | 15 +-
+ drivers/tty/serial/arc_uart.c | 104 +-
+ drivers/tty/serial/atmel_serial.c | 9 +-
+ drivers/tty/serial/bcm63xx_uart.c | 9 +-
+ drivers/tty/serial/bfin_sport_uart.c | 12 +-
+ drivers/tty/serial/bfin_uart.c | 10 +-
+ drivers/tty/serial/clps711x.c | 8 +-
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 10 +-
+ drivers/tty/serial/crisv10.c | 35 +-
+ drivers/tty/serial/dz.c | 4 +-
+ drivers/tty/serial/efm32-uart.c | 52 +-
+ drivers/tty/serial/icom.c | 10 +-
+ drivers/tty/serial/ifx6x60.c | 11 +-
+ drivers/tty/serial/imx.c | 282 ++--
+ drivers/tty/serial/ioc3_serial.c | 11 +-
+ drivers/tty/serial/ioc4_serial.c | 13 +-
+ drivers/tty/serial/ip22zilog.c | 30 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 18 +-
+ drivers/tty/serial/kgdb_nmi.c | 13 +-
+ drivers/tty/serial/lantiq.c | 20 +-
+ drivers/tty/serial/lpc32xx_hs.c | 30 +-
+ drivers/tty/serial/m32r_sio.c | 8 +-
+ drivers/tty/serial/max3100.c | 10 +-
+ drivers/tty/serial/max310x.c | 8 +-
+ drivers/tty/serial/mcf.c | 73 +-
+ drivers/tty/serial/mfd.c | 15 +-
+ drivers/tty/serial/mpc52xx_uart.c | 8 +-
+ drivers/tty/serial/mpsc.c | 15 +-
+ drivers/tty/serial/mrst_max3110.c | 19 +-
+ drivers/tty/serial/msm_serial.c | 16 +-
+ drivers/tty/serial/msm_serial_hs.c | 19 +-
+ drivers/tty/serial/msm_smd_tty.c | 4 +-
+ drivers/tty/serial/mux.c | 9 +-
+ drivers/tty/serial/mxs-auart.c | 11 +-
+ drivers/tty/serial/netx-serial.c | 4 +-
+ drivers/tty/serial/nwpserial.c | 6 +-
+ drivers/tty/serial/of_serial.c | 7 +-
+ drivers/tty/serial/omap-serial.c | 51 +-
+ drivers/tty/serial/pch_uart.c | 90 +-
+ drivers/tty/serial/pmac_zilog.c | 36 +-
+ drivers/tty/serial/pnx8xxx_uart.c | 3 +-
+ drivers/tty/serial/pxa.c | 17 +-
+ drivers/tty/serial/rp2.c | 885 +++++++++++++
+ drivers/tty/serial/sa1100.c | 3 +-
+ drivers/tty/serial/samsung.c | 15 +-
+ drivers/tty/serial/sb1250-duart.c | 2 +-
+ drivers/tty/serial/sc26xx.c | 29 +-
+ drivers/tty/serial/sccnxp.c | 171 ++-
+ drivers/tty/serial/serial-tegra.c | 1401 ++++++++++++++++++++
+ drivers/tty/serial/serial_core.c | 94 +-
+ drivers/tty/serial/serial_ks8695.c | 3 +-
+ drivers/tty/serial/serial_txx9.c | 3 +-
+ drivers/tty/serial/sh-sci.c | 52 +-
+ drivers/tty/serial/sirfsoc_uart.c | 55 +-
+ drivers/tty/serial/sirfsoc_uart.h | 3 +-
+ drivers/tty/serial/sn_console.c | 16 +-
+ drivers/tty/serial/sunhv.c | 33 +-
+ drivers/tty/serial/sunsab.c | 28 +-
+ drivers/tty/serial/sunsu.c | 18 +-
+ drivers/tty/serial/sunzilog.c | 39 +-
+ drivers/tty/serial/timbuart.c | 6 +-
+ drivers/tty/serial/uartlite.c | 119 +-
+ drivers/tty/serial/ucc_uart.c | 10 +-
+ drivers/tty/serial/vr41xx_siu.c | 4 +-
+ drivers/tty/serial/vt8500_serial.c | 52 +-
+ drivers/tty/serial/xilinx_uartps.c | 16 +-
+ drivers/tty/serial/zs.c | 2 +-
+ drivers/tty/synclink.c | 50 +-
+ drivers/tty/synclink_gt.c | 61 +-
+ drivers/tty/synclinkmp.c | 103 +-
+ drivers/tty/tty_buffer.c | 131 +-
+ drivers/tty/tty_io.c | 10 +-
+ drivers/tty/tty_ioctl.c | 12 +-
+ drivers/tty/tty_ldisc.c | 14 +-
+ drivers/tty/vt/Makefile | 4 +-
+ drivers/tty/vt/keyboard.c | 25 +-
+ drivers/tty/vt/vt.c | 16 +-
+ drivers/usb/class/Kconfig | 2 +-
+ drivers/usb/class/cdc-acm.c | 13 +-
+ drivers/usb/gadget/Kconfig | 6 +
+ drivers/usb/gadget/u_serial.c | 15 +-
+ drivers/usb/serial/Kconfig | 2 +-
+ drivers/usb/serial/aircable.c | 17 +-
+ drivers/usb/serial/ark3116.c | 12 +-
+ drivers/usb/serial/belkin_sa.c | 12 +-
+ drivers/usb/serial/cyberjack.c | 11 +-
+ drivers/usb/serial/cypress_m8.c | 6 +-
+ drivers/usb/serial/digi_acceleport.c | 14 +-
+ drivers/usb/serial/f81232.c | 15 +-
+ drivers/usb/serial/ftdi_sio.c | 21 +-
+ drivers/usb/serial/garmin_gps.c | 9 +-
+ drivers/usb/serial/generic.c | 12 +-
+ drivers/usb/serial/io_edgeport.c | 39 +-
+ drivers/usb/serial/io_ti.c | 32 +-
+ drivers/usb/serial/ir-usb.c | 9 +-
+ drivers/usb/serial/iuu_phoenix.c | 9 +-
+ drivers/usb/serial/keyspan.c | 60 +-
+ drivers/usb/serial/keyspan_pda.c | 9 +-
+ drivers/usb/serial/kl5kusb105.c | 10 +-
+ drivers/usb/serial/kobil_sct.c | 9 +-
+ drivers/usb/serial/mct_u232.c | 11 +-
+ drivers/usb/serial/metro-usb.c | 9 +-
+ drivers/usb/serial/mos7720.c | 9 +-
+ drivers/usb/serial/mos7840.c | 10 +-
+ drivers/usb/serial/navman.c | 9 +-
+ drivers/usb/serial/omninet.c | 10 +-
+ drivers/usb/serial/opticon.c | 11 +-
+ drivers/usb/serial/oti6858.c | 9 +-
+ drivers/usb/serial/pl2303.c | 15 +-
+ drivers/usb/serial/quatech2.c | 29 +-
+ drivers/usb/serial/safe_serial.c | 15 +-
+ drivers/usb/serial/sierra.c | 17 +-
+ drivers/usb/serial/spcp8x5.c | 24 +-
+ drivers/usb/serial/ssu100.c | 31 +-
+ drivers/usb/serial/symbolserial.c | 9 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 44 +-
+ drivers/usb/serial/usb_wwan.c | 17 +-
+ drivers/video/auo_k190x.c | 1 +
+ drivers/video/backlight/ot200_bl.c | 1 +
+ drivers/video/clps711xfb.c | 1 +
+ drivers/video/exynos/exynos_mipi_dsi_common.c | 1 +
+ drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 1 +
+ fs/proc/Makefile | 3 +-
+ include/linux/console.h | 5 +
+ include/linux/kgdb.h | 1 -
+ include/linux/of_serial.h | 17 -
+ include/linux/pci_ids.h | 15 +
+ include/linux/platform_data/s3c-hsotg.h | 2 +
+ .../platform_data/{sccnxp.h => serial-sccnxp.h} | 6 +-
+ include/linux/pps_kernel.h | 17 +-
+ include/linux/proc_fs.h | 5 +
+ include/linux/serial_8250.h | 4 +
+ include/linux/serial_core.h | 26 +-
+ include/linux/sunserialcore.h | 4 +
+ include/linux/tty.h | 50 +-
+ include/linux/tty_driver.h | 1 +
+ include/linux/tty_flip.h | 28 +-
+ include/linux/tty_ldisc.h | 11 +-
+ include/uapi/linux/serial_core.h | 5 +-
+ kernel/debug/debug_core.c | 1 +
+ kernel/debug/gdbstub.c | 1 +
+ lib/Kconfig.kgdb | 1 +
+ net/bluetooth/rfcomm/Kconfig | 1 +
+ net/bluetooth/rfcomm/tty.c | 21 +-
+ net/irda/ircomm/Kconfig | 2 +-
+ net/irda/ircomm/ircomm_tty.c | 8 +-
+ sound/soc/codecs/Kconfig | 3 +-
+ 266 files changed, 6840 insertions(+), 2505 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/arc-uart.txt
+ create mode 100644 drivers/tty/goldfish.c
+ create mode 100644 drivers/tty/metag_da.c
+ create mode 100644 drivers/tty/serial/8250/8250_dma.c
+ create mode 100644 drivers/tty/serial/rp2.c
+ create mode 100644 drivers/tty/serial/serial-tegra.c
+ delete mode 100644 include/linux/of_serial.h
+ rename include/linux/platform_data/{sccnxp.h => serial-sccnxp.h} (93%)
+Merging usb/usb-next (e2ced16 USB: update host controller Kconfig entries)
+$ git merge usb/usb-next
+Resolved 'drivers/usb/gadget/Kconfig' using previous resolution.
+Resolved 'drivers/usb/host/ehci-vt8500.c' using previous resolution.
+Resolved 'drivers/usb/musb/omap2430.c' using previous resolution.
+Resolved 'drivers/usb/phy/omap-usb2.c' using previous resolution.
+Auto-merging drivers/usb/serial/usb_wwan.c
+Auto-merging drivers/usb/serial/ssu100.c
+Auto-merging drivers/usb/serial/sierra.c
+Auto-merging drivers/usb/serial/quatech2.c
+Auto-merging drivers/usb/serial/mct_u232.c
+Auto-merging drivers/usb/serial/keyspan.c
+Auto-merging drivers/usb/serial/io_ti.c
+Auto-merging drivers/usb/serial/ftdi_sio.c
+Auto-merging drivers/usb/serial/Kconfig
+Auto-merging drivers/usb/phy/omap-usb2.c
+CONFLICT (content): Merge conflict in drivers/usb/phy/omap-usb2.c
+Auto-merging drivers/usb/otg/mxs-phy.c
+Auto-merging drivers/usb/musb/omap2430.c
+CONFLICT (content): Merge conflict in drivers/usb/musb/omap2430.c
+Auto-merging drivers/usb/musb/musb_dsps.c
+Auto-merging drivers/usb/host/ehci-vt8500.c
+CONFLICT (content): Merge conflict in drivers/usb/host/ehci-vt8500.c
+Auto-merging drivers/usb/host/ehci-omap.c
+Auto-merging drivers/usb/host/ehci-mxc.c
+Auto-merging drivers/usb/gadget/u_serial.c
+Auto-merging drivers/usb/gadget/s3c-hsudc.c
+Auto-merging drivers/usb/gadget/s3c-hsotg.c
+Auto-merging drivers/usb/gadget/r8a66597-udc.c
+Auto-merging drivers/usb/gadget/pxa25x_udc.c
+Auto-merging drivers/usb/gadget/m66592-udc.c
+Auto-merging drivers/usb/gadget/fusb300_udc.c
+Auto-merging drivers/usb/gadget/at91_udc.c
+Auto-merging drivers/usb/gadget/Kconfig
+CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig
+Auto-merging arch/arm/mach-omap2/board-omap3evm.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 542d189] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-usb | 9 +
+ Documentation/devicetree/bindings/usb/dwc3.txt | 22 +
+ Documentation/devicetree/bindings/usb/omap-usb.txt | 34 +-
+ .../devicetree/bindings/usb/samsung-usbphy.txt | 55 ++
+ Documentation/devicetree/bindings/usb/usb-phy.txt | 35 +-
+ Documentation/devicetree/bindings/usb/usb3503.txt | 20 +
+ MAINTAINERS | 3 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 2 +
+ arch/arm/mach-omap2/board-3430sdp.c | 2 +
+ arch/arm/mach-omap2/board-4430sdp.c | 2 +
+ arch/arm/mach-omap2/board-cm-t35.c | 2 +
+ arch/arm/mach-omap2/board-devkit8000.c | 2 +
+ arch/arm/mach-omap2/board-igep0020.c | 2 +
+ arch/arm/mach-omap2/board-ldp.c | 2 +
+ arch/arm/mach-omap2/board-omap3beagle.c | 2 +
+ arch/arm/mach-omap2/board-omap3evm.c | 2 +
+ arch/arm/mach-omap2/board-omap3logic.c | 2 +
+ arch/arm/mach-omap2/board-omap3pandora.c | 2 +
+ arch/arm/mach-omap2/board-omap3stalker.c | 2 +
+ arch/arm/mach-omap2/board-omap3touchbook.c | 2 +
+ arch/arm/mach-omap2/board-omap4panda.c | 2 +
+ arch/arm/mach-omap2/board-overo.c | 2 +
+ arch/arm/mach-omap2/board-rm680.c | 2 +
+ arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +
+ arch/arm/mach-omap2/devices.c | 45 +
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 -
+ arch/arm/mach-omap2/usb-musb.c | 3 +
+ drivers/base/power/qos.c | 1 +
+ drivers/usb/c67x00/c67x00-ll-hpi.c | 2 +-
+ drivers/usb/chipidea/ci13xxx_imx.h | 2 +-
+ drivers/usb/chipidea/core.c | 2 +-
+ drivers/usb/core/Makefile | 1 +
+ drivers/usb/core/devices.c | 13 +-
+ drivers/usb/core/devio.c | 3 +-
+ drivers/usb/core/generic.c | 2 +-
+ drivers/usb/core/hcd.c | 5 +-
+ drivers/usb/core/hub.c | 616 ++++++++------
+ drivers/usb/core/hub.h | 122 +++
+ drivers/usb/core/message.c | 2 +-
+ drivers/usb/core/port.c | 202 +++++
+ drivers/usb/core/sysfs.c | 31 +-
+ drivers/usb/core/usb.h | 12 +
+ drivers/usb/dwc3/Kconfig | 31 +-
+ drivers/usb/dwc3/Makefile | 10 +-
+ drivers/usb/dwc3/core.c | 31 +-
+ drivers/usb/dwc3/core.h | 24 +-
+ drivers/usb/dwc3/debugfs.c | 38 +-
+ drivers/usb/dwc3/dwc3-exynos.c | 57 +-
+ drivers/usb/dwc3/dwc3-omap.c | 152 ++--
+ drivers/usb/dwc3/gadget.c | 292 ++++---
+ drivers/usb/dwc3/host.c | 2 +-
+ drivers/usb/gadget/Kconfig | 24 +-
+ drivers/usb/gadget/Makefile | 8 +-
+ drivers/usb/gadget/acm_ms.c | 42 +-
+ drivers/usb/gadget/amd5536udc.c | 59 +-
+ drivers/usb/gadget/amd5536udc.h | 2 +
+ drivers/usb/gadget/at91_udc.c | 5 +-
+ drivers/usb/gadget/cdc2.c | 36 +-
+ drivers/usb/gadget/composite.c | 326 ++++++--
+ drivers/usb/gadget/dbgp.c | 14 +-
+ drivers/usb/gadget/f_acm.c | 153 ++--
+ drivers/usb/gadget/f_fs.c | 5 +-
+ drivers/usb/gadget/f_loopback.c | 103 +--
+ drivers/usb/gadget/f_mass_storage.c | 37 +-
+ drivers/usb/gadget/f_ncm.c | 18 +-
+ drivers/usb/gadget/f_obex.c | 4 -
+ drivers/usb/gadget/f_serial.c | 4 -
+ drivers/usb/gadget/f_sourcesink.c | 200 +++--
+ drivers/usb/gadget/f_uac2.c | 9 +-
+ drivers/usb/gadget/f_uvc.c | 3 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 2 +-
+ drivers/usb/gadget/fsl_udc_core.c | 60 +-
+ drivers/usb/gadget/functions.c | 116 +++
+ drivers/usb/gadget/fusb300_udc.c | 67 +-
+ drivers/usb/gadget/fusb300_udc.h | 2 +
+ drivers/usb/gadget/g_zero.h | 35 +-
+ drivers/usb/gadget/gmidi.c | 2 +-
+ drivers/usb/gadget/goku_udc.c | 70 +-
+ drivers/usb/gadget/goku_udc.h | 1 +
+ drivers/usb/gadget/m66592-udc.c | 72 +-
+ drivers/usb/gadget/m66592-udc.h | 1 +
+ drivers/usb/gadget/multi.c | 71 +-
+ drivers/usb/gadget/mv_udc_core.c | 246 +++---
+ drivers/usb/gadget/net2280.c | 15 +
+ drivers/usb/gadget/nokia.c | 43 +-
+ drivers/usb/gadget/omap_udc.c | 51 +-
+ drivers/usb/gadget/pch_udc.c | 67 +-
+ drivers/usb/gadget/pxa25x_udc.c | 62 +-
+ drivers/usb/gadget/pxa25x_udc.h | 1 +
+ drivers/usb/gadget/pxa27x_udc.c | 61 +-
+ drivers/usb/gadget/pxa27x_udc.h | 1 +
+ drivers/usb/gadget/r8a66597-udc.c | 2 +-
+ drivers/usb/gadget/s3c-hsotg.c | 44 +-
+ drivers/usb/gadget/s3c-hsudc.c | 13 +-
+ drivers/usb/gadget/s3c2410_udc.c | 65 +-
+ drivers/usb/gadget/s3c2410_udc.h | 1 +
+ drivers/usb/gadget/serial.c | 118 ++-
+ drivers/usb/gadget/storage_common.c | 61 --
+ drivers/usb/gadget/u_serial.c | 313 +++----
+ drivers/usb/gadget/u_serial.h | 13 +-
+ drivers/usb/gadget/udc-core.c | 157 ++--
+ drivers/usb/gadget/webcam.c | 2 +-
+ drivers/usb/gadget/zero.c | 233 ++++--
+ drivers/usb/host/Kconfig | 36 +-
+ drivers/usb/host/Makefile | 2 +
+ drivers/usb/host/ehci-hcd.c | 12 +-
+ drivers/usb/host/ehci-mv.c | 1 -
+ drivers/usb/host/ehci-mxc.c | 20 -
+ drivers/usb/host/ehci-omap.c | 10 +-
+ drivers/usb/host/ehci-orion.c | 90 +-
+ drivers/usb/host/ehci-s5p.c | 83 +-
+ drivers/usb/host/ehci-vt8500.c | 73 +-
+ drivers/usb/host/isp1760-hcd.c | 4 +-
+ drivers/usb/host/ohci-exynos.c | 87 +-
+ drivers/usb/host/ohci-q.c | 1 +
+ drivers/usb/host/uhci-debug.c | 178 ++--
+ drivers/usb/host/uhci-hcd.c | 31 +-
+ drivers/usb/host/uhci-hcd.h | 4 -
+ drivers/usb/host/uhci-hub.c | 4 +-
+ drivers/usb/host/uhci-q.c | 2 +-
+ drivers/usb/host/xhci-ring.c | 2 -
+ drivers/usb/misc/Kconfig | 6 +
+ drivers/usb/misc/Makefile | 1 +
+ drivers/usb/misc/usb3503.c | 325 +++++++
+ drivers/usb/misc/usbtest.c | 13 +-
+ drivers/usb/musb/Kconfig | 2 +
+ drivers/usb/musb/am35x.c | 2 +-
+ drivers/usb/musb/blackfin.c | 2 +-
+ drivers/usb/musb/da8xx.c | 7 +-
+ drivers/usb/musb/davinci.c | 7 +-
+ drivers/usb/musb/musb_core.c | 1 +
+ drivers/usb/musb/musb_dsps.c | 3 +-
+ drivers/usb/musb/musb_gadget.c | 22 +-
+ drivers/usb/musb/musb_host.c | 44 +-
+ drivers/usb/musb/omap2430.c | 89 +-
+ drivers/usb/musb/omap2430.h | 9 -
+ drivers/usb/musb/tusb6010.c | 2 +-
+ drivers/usb/musb/ux500.c | 12 +-
+ drivers/usb/otg/mv_otg.c | 84 +-
+ drivers/usb/otg/mxs-phy.c | 20 +
+ drivers/usb/otg/otg.c | 235 +++++-
+ drivers/usb/otg/twl4030-usb.c | 3 +-
+ drivers/usb/phy/Kconfig | 28 +
+ drivers/usb/phy/Makefile | 3 +
+ drivers/usb/phy/omap-control-usb.c | 295 +++++++
+ drivers/usb/phy/omap-usb2.c | 72 +-
+ drivers/usb/phy/omap-usb3.c | 355 ++++++++
+ drivers/usb/phy/samsung-usbphy.c | 930 +++++++++++++++++++++
+ drivers/usb/renesas_usbhs/Kconfig | 2 +-
+ drivers/usb/renesas_usbhs/mod_gadget.c | 2 +-
+ drivers/usb/serial/Kconfig | 12 +
+ drivers/usb/serial/Makefile | 1 +
+ drivers/usb/serial/ftdi_sio.c | 20 +-
+ drivers/usb/serial/io_ti.c | 89 +-
+ drivers/usb/serial/keyspan.c | 4 +-
+ drivers/usb/serial/mct_u232.c | 22 +-
+ drivers/usb/serial/option.c | 16 +-
+ drivers/usb/serial/quatech2.c | 18 +-
+ drivers/usb/serial/sierra.c | 8 +-
+ drivers/usb/serial/ssu100.c | 19 +-
+ drivers/usb/serial/usb-serial.c | 28 +-
+ drivers/usb/serial/usb_wwan.c | 8 +-
+ drivers/usb/serial/xsens_mt.c | 86 ++
+ drivers/usb/storage/initializers.c | 4 +-
+ drivers/usb/storage/uas.c | 124 ++-
+ drivers/usb/storage/unusual_cypress.h | 2 +-
+ drivers/usb/storage/usb.c | 3 +
+ drivers/usb/wusbcore/wa-xfer.c | 6 +-
+ include/linux/platform_data/samsung-usbphy.h | 27 +
+ include/linux/platform_data/usb3503.h | 19 +
+ include/linux/usb/composite.h | 75 +-
+ include/linux/usb/dwc3-omap.h | 30 +
+ include/linux/usb/gadget.h | 13 +-
+ include/linux/usb/musb.h | 2 +
+ include/linux/usb/omap_control_usb.h | 92 ++
+ include/linux/usb/omap_usb.h | 27 +-
+ include/linux/usb/phy.h | 43 +
+ include/linux/usb/samsung_usb_phy.h | 16 +
+ tools/usb/testusb.c | 31 +-
+ 179 files changed, 6492 insertions(+), 2615 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/dwc3.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/samsung-usbphy.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/usb3503.txt
+ create mode 100644 drivers/usb/core/hub.h
+ create mode 100644 drivers/usb/core/port.c
+ create mode 100644 drivers/usb/gadget/functions.c
+ create mode 100644 drivers/usb/misc/usb3503.c
+ create mode 100644 drivers/usb/phy/omap-control-usb.c
+ create mode 100644 drivers/usb/phy/omap-usb3.c
+ create mode 100644 drivers/usb/phy/samsung-usbphy.c
+ create mode 100644 drivers/usb/serial/xsens_mt.c
+ create mode 100644 include/linux/platform_data/samsung-usbphy.h
+ create mode 100644 include/linux/platform_data/usb3503.h
+ create mode 100644 include/linux/usb/dwc3-omap.h
+ create mode 100644 include/linux/usb/omap_control_usb.h
+ create mode 100644 include/linux/usb/samsung_usb_phy.h
+Merging staging/staging-next (951348b staging: comedi: vmk80xx: wait for URBs to complete)
+$ git merge staging/staging-next
+Resolved 'drivers/staging/et131x/et131x.c' using previous resolution.
+Auto-merging include/linux/spi/spi.h
+Auto-merging include/linux/platform_data/tsl2563.h
+Auto-merging include/linux/pci_ids.h
+Auto-merging drivers/staging/zcache/zbud.c
+Auto-merging drivers/staging/zcache/ramster/ramster.c
+Auto-merging drivers/staging/speakup/selection.c
+Removing drivers/staging/ramster/zcache-main.c
+Removing drivers/staging/ramster/tmem.h
+Removing drivers/staging/ramster/tmem.c
+Removing drivers/staging/ramster/Makefile
+Removing drivers/staging/ramster/Kconfig
+Auto-merging drivers/staging/omapdrm/omap_fbdev.c
+Auto-merging drivers/staging/omapdrm/omap_fb.c
+Auto-merging drivers/staging/omapdrm/omap_drv.c
+Auto-merging drivers/staging/omapdrm/omap_crtc.c
+Auto-merging drivers/staging/omap-thermal/omap-bandgap.c
+Auto-merging drivers/staging/nvec/nvec.c
+Removing drivers/staging/iio/ring_sw.h
+Removing drivers/staging/iio/ring_sw.c
+Removing drivers/staging/iio/imu/adis16400_trigger.c
+Removing drivers/staging/iio/imu/adis16400_ring.c
+Removing drivers/staging/iio/imu/adis16400_core.c
+Removing drivers/staging/iio/imu/Makefile
+Removing drivers/staging/iio/imu/Kconfig
+Removing drivers/staging/iio/gyro/adxrs450.h
+Auto-merging drivers/staging/iio/adc/mxs-lradc.c
+Auto-merging drivers/staging/fwserial/fwserial.c
+Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+Auto-merging drivers/staging/et131x/et131x.c
+CONFLICT (content): Merge conflict in drivers/staging/et131x/et131x.c
+Auto-merging drivers/staging/csr/unifi_sme.c
+Removing drivers/staging/comedi/drivers/pcm_common.h
+Removing drivers/staging/comedi/drivers/pcm_common.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
+Auto-merging drivers/staging/android/binder.h
+Auto-merging drivers/rtc/Makefile
+Auto-merging drivers/rtc/Kconfig
+Auto-merging drivers/power/lp8788-charger.c
+Auto-merging drivers/power/generic-adc-battery.c
+Auto-merging drivers/iio/light/tsl2563.c
+Auto-merging drivers/iio/imu/adis16400.h
+Auto-merging drivers/iio/gyro/adxrs450.c
+Auto-merging drivers/iio/gyro/adis16080.c
+Removing drivers/iio/common/hid-sensors/hid-sensor-attributes.h
+Auto-merging drivers/iio/accel/kxsd9.c
+Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e62062c] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio-mpu6050 | 13 +
+ .../bindings/staging/iio/adc/mxs-lradc.txt | 6 +
+ MAINTAINERS | 3 +-
+ arch/arm/boot/dts/imx23.dtsi | 2 +
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
+ drivers/extcon/extcon-adc-jack.c | 3 +-
+ drivers/iio/accel/Kconfig | 38 +
+ drivers/iio/accel/Makefile | 9 +
+ drivers/iio/accel/hid-sensor-accel-3d.c | 3 +-
+ drivers/{staging => }/iio/accel/kxsd9.c | 16 +-
+ drivers/iio/accel/st_accel.h | 47 +
+ drivers/iio/accel/st_accel_buffer.c | 114 +
+ drivers/iio/accel/st_accel_core.c | 500 ++++
+ drivers/iio/accel/st_accel_i2c.c | 86 +
+ drivers/iio/accel/st_accel_spi.c | 85 +
+ drivers/iio/adc/Kconfig | 4 +-
+ drivers/iio/adc/lp8788_adc.c | 18 +-
+ drivers/iio/adc/max1363.c | 167 +-
+ drivers/iio/buffer_cb.c | 4 +-
+ drivers/iio/common/Kconfig | 1 +
+ drivers/iio/common/Makefile | 1 +
+ .../iio/common/hid-sensors/hid-sensor-attributes.c | 11 +-
+ .../iio/common/hid-sensors/hid-sensor-attributes.h | 57 -
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 5 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.h | 2 +-
+ drivers/iio/common/st_sensors/Kconfig | 14 +
+ drivers/iio/common/st_sensors/Makefile | 10 +
+ drivers/iio/common/st_sensors/st_sensors_buffer.c | 116 +
+ drivers/iio/common/st_sensors/st_sensors_core.c | 446 ++++
+ drivers/iio/common/st_sensors/st_sensors_i2c.c | 81 +
+ drivers/iio/common/st_sensors/st_sensors_spi.c | 128 +
+ drivers/iio/common/st_sensors/st_sensors_trigger.c | 77 +
+ drivers/iio/dac/ad5360.c | 7 +-
+ drivers/iio/dac/ad5421.c | 7 +-
+ drivers/iio/dac/ad5504.c | 6 +-
+ drivers/iio/dac/ad5686.c | 7 +-
+ drivers/iio/dac/ad5755.c | 7 +-
+ drivers/iio/dac/ad5764.c | 7 +-
+ drivers/iio/dac/ad5791.c | 6 +-
+ drivers/iio/frequency/ad9523.c | 14 +-
+ drivers/iio/gyro/Kconfig | 55 +
+ drivers/iio/gyro/Makefile | 14 +
+ .../gyro/adis16080_core.c => iio/gyro/adis16080.c} | 154 +-
+ .../gyro/adxrs450_core.c => iio/gyro/adxrs450.c} | 202 +-
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 3 +-
+ drivers/iio/gyro/itg3200_buffer.c | 156 ++
+ drivers/iio/gyro/itg3200_core.c | 401 +++
+ drivers/iio/gyro/st_gyro.h | 45 +
+ drivers/iio/gyro/st_gyro_buffer.c | 114 +
+ drivers/iio/gyro/st_gyro_core.c | 368 +++
+ drivers/iio/gyro/st_gyro_i2c.c | 84 +
+ drivers/iio/gyro/st_gyro_spi.c | 83 +
+ drivers/iio/imu/Kconfig | 13 +
+ drivers/iio/imu/Makefile | 5 +
+ drivers/{staging => }/iio/imu/adis16400.h | 141 +-
+ drivers/iio/imu/adis16400_buffer.c | 96 +
+ drivers/iio/imu/adis16400_core.c | 965 ++++++++
+ drivers/iio/imu/inv_mpu6050/Kconfig | 13 +
+ drivers/iio/imu/inv_mpu6050/Makefile | 6 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 795 ++++++
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 246 ++
+ drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 196 ++
+ drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 155 ++
+ drivers/iio/industrialio-trigger.c | 12 +-
+ drivers/iio/inkern.c | 53 +-
+ drivers/iio/kfifo_buf.c | 1 -
+ drivers/iio/light/Kconfig | 10 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/hid-sensor-als.c | 3 +-
+ drivers/{staging => }/iio/light/tsl2563.c | 96 +-
+ drivers/iio/magnetometer/Kconfig | 30 +
+ drivers/iio/magnetometer/Makefile | 7 +
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 3 +-
+ drivers/iio/magnetometer/st_magn.h | 45 +
+ drivers/iio/magnetometer/st_magn_buffer.c | 98 +
+ drivers/iio/magnetometer/st_magn_core.c | 400 +++
+ drivers/iio/magnetometer/st_magn_i2c.c | 80 +
+ drivers/iio/magnetometer/st_magn_spi.c | 79 +
+ drivers/platform/Kconfig | 4 +
+ drivers/platform/Makefile | 1 +
+ drivers/platform/goldfish/Kconfig | 5 +
+ drivers/platform/goldfish/Makefile | 5 +
+ drivers/platform/goldfish/goldfish_pipe.c | 612 +++++
+ drivers/platform/goldfish/pdev_bus.c | 240 ++
+ drivers/power/generic-adc-battery.c | 4 +-
+ drivers/power/lp8788-charger.c | 8 +-
+ drivers/rtc/Kconfig | 16 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-hid-sensor-time.c | 292 +++
+ drivers/staging/Kconfig | 8 +-
+ drivers/staging/Makefile | 4 +-
+ drivers/staging/android/Kconfig | 29 +-
+ drivers/staging/android/alarm-dev.c | 277 ++-
+ drivers/staging/android/android_alarm.h | 19 +
+ drivers/staging/android/binder.c | 6 +-
+ drivers/staging/android/binder.h | 4 +-
+ drivers/staging/asus_oled/asus_oled.c | 15 +-
+ drivers/staging/bcm/Adapter.h | 20 +-
+ drivers/staging/bcm/Bcmchar.c | 14 +-
+ drivers/staging/bcm/CmHost.c | 6 +-
+ drivers/staging/bcm/CmHost.h | 12 +-
+ drivers/staging/bcm/Debug.h | 356 ++-
+ drivers/staging/bcm/IPv6Protocol.c | 34 +-
+ drivers/staging/bcm/IPv6ProtocolHdr.h | 149 +-
+ drivers/staging/bcm/InterfaceDld.c | 6 +-
+ drivers/staging/bcm/InterfaceInit.c | 14 +-
+ drivers/staging/bcm/Ioctl.h | 6 +-
+ drivers/staging/bcm/Macros.h | 25 +-
+ drivers/staging/bcm/Misc.c | 10 +-
+ drivers/staging/bcm/PHSDefines.h | 200 +-
+ drivers/staging/bcm/PHSModule.c | 160 +-
+ drivers/staging/bcm/PHSModule.h | 14 +-
+ drivers/staging/bcm/Protocol.h | 177 +-
+ drivers/staging/bcm/Prototypes.h | 6 +-
+ drivers/staging/bcm/Qos.c | 46 +-
+ drivers/staging/bcm/hostmibs.c | 12 +-
+ drivers/staging/bcm/led_control.c | 8 +-
+ drivers/staging/bcm/led_control.h | 138 +-
+ drivers/staging/bcm/nvm.c | 87 +-
+ drivers/staging/bcm/nvm.h | 665 ++---
+ drivers/staging/bcm/target_params.h | 128 +-
+ drivers/staging/bcm/vendorspecificextn.c | 2 +-
+ drivers/staging/bcm/vendorspecificextn.h | 2 +-
+ drivers/staging/ced1401/ced_ioc.c | 18 +-
+ drivers/staging/ced1401/usb1401.c | 14 +-
+ drivers/staging/ced1401/usb1401.h | 2 +-
+ drivers/staging/comedi/Kconfig | 46 +-
+ drivers/staging/comedi/Makefile | 19 +-
+ drivers/staging/comedi/comedi.h | 12 +-
+ drivers/staging/comedi/comedi_buf.c | 415 ++++
+ drivers/staging/comedi/comedi_compat32.c | 4 -
+ drivers/staging/comedi/comedi_fops.c | 1061 ++++----
+ drivers/staging/comedi/comedi_internal.h | 33 +-
+ drivers/staging/comedi/comedi_pci.c | 140 ++
+ drivers/staging/comedi/comedi_pcmcia.c | 160 ++
+ drivers/staging/comedi/comedi_usb.c | 108 +
+ drivers/staging/comedi/comedidev.h | 370 ++-
+ drivers/staging/comedi/drivers.c | 859 ++-----
+ drivers/staging/comedi/drivers/8255_pci.c | 9 +-
+ drivers/staging/comedi/drivers/Makefile | 4 +-
+ .../staging/comedi/drivers/addi-data/addi_common.c | 26 +-
+ .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 807 ------
+ .../comedi/drivers/addi-data/hwdrv_apci2200.c | 263 --
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3501.c | 589 +----
+ drivers/staging/comedi/drivers/addi_apci_035.c | 9 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 10 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 9 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 114 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 9 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 257 +-
+ drivers/staging/comedi/drivers/addi_apci_1710.c | 9 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 282 ++-
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 187 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 9 +-
+ drivers/staging/comedi/drivers/addi_apci_3200.c | 9 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 482 +++-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 9 +-
+ drivers/staging/comedi/drivers/addi_watchdog.c | 172 ++
+ drivers/staging/comedi/drivers/addi_watchdog.h | 10 +
+ drivers/staging/comedi/drivers/adl_pci6208.c | 9 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 17 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c | 39 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 12 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 13 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 8 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 9 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 12 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 20 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 8 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 9 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 8 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 12 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 132 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 11 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 12 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 9 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 12 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 9 +-
+ drivers/staging/comedi/drivers/comedi_bond.c | 5 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 75 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 9 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 14 +-
+ drivers/staging/comedi/drivers/das08.c | 358 +--
+ drivers/staging/comedi/drivers/das08.h | 2 -
+ drivers/staging/comedi/drivers/das08_cs.c | 152 +-
+ drivers/staging/comedi/drivers/das08_isa.c | 217 ++
+ drivers/staging/comedi/drivers/das08_pci.c | 121 +
+ drivers/staging/comedi/drivers/das16.c | 2 +
+ drivers/staging/comedi/drivers/dt3000.c | 11 +-
+ drivers/staging/comedi/drivers/dt9812.c | 30 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 11 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 11 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 13 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 15 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 9 +-
+ drivers/staging/comedi/drivers/me4000.c | 14 +-
+ drivers/staging/comedi/drivers/me_daq.c | 9 +-
+ drivers/staging/comedi/drivers/mite.c | 5 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 9 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 10 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 10 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 9 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 119 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 303 +--
+ drivers/staging/comedi/drivers/ni_labpc.c | 55 +-
+ drivers/staging/comedi/drivers/ni_labpc_cs.c | 257 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 4 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 399 +--
+ drivers/staging/comedi/drivers/ni_pcidio.c | 9 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 11 +-
+ drivers/staging/comedi/drivers/ni_tio.c | 2 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c | 1 +
+ drivers/staging/comedi/drivers/pcl818.c | 19 +-
+ drivers/staging/comedi/drivers/pcm_common.c | 63 -
+ drivers/staging/comedi/drivers/pcm_common.h | 8 -
+ drivers/staging/comedi/drivers/pcmda12.c | 3 -
+ drivers/staging/comedi/drivers/pcmmio.c | 62 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 72 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 589 ++---
+ drivers/staging/comedi/drivers/rtd520.c | 10 +-
+ drivers/staging/comedi/drivers/s626.c | 8 +-
+ drivers/staging/comedi/drivers/skel.c | 12 +-
+ drivers/staging/comedi/drivers/unioxx5.c | 6 +-
+ drivers/staging/comedi/drivers/usbdux.c | 29 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 8 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 33 +-
+ drivers/staging/comedi/drivers/vmk80xx.c | 1272 +++-------
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 8 +-
+ drivers/staging/comedi/proc.c | 9 +-
+ drivers/staging/cptm1217/clearpad_tm1217.c | 5 +-
+ drivers/staging/csr/drv.c | 6 +-
+ drivers/staging/csr/sme_sys.c | 41 +-
+ drivers/staging/csr/unifi_sme.c | 1 -
+ drivers/staging/cxt1e1/linux.c | 4 +-
+ drivers/staging/dgrp/dgrp_specproc.c | 81 +-
+ drivers/staging/echo/echo.c | 42 +-
+ drivers/staging/et131x/README | 4 +
+ drivers/staging/et131x/et131x.c | 791 +++---
+ drivers/staging/et131x/et131x.h | 96 +-
+ drivers/staging/frontier/alphatrack.c | 51 +-
+ drivers/staging/frontier/tranzport.c | 26 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 33 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 21 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 10 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 153 +-
+ .../staging/ft1000/ft1000-usb/ft1000_download.c | 110 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 166 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 6 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 39 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 84 +-
+ drivers/staging/ft1000/ft1000.h | 35 +
+ drivers/staging/fwserial/TODO | 15 -
+ drivers/staging/fwserial/fwserial.c | 361 +--
+ drivers/staging/fwserial/fwserial.h | 25 +-
+ drivers/staging/gdm72xx/gdm_sdio.c | 8 +-
+ drivers/staging/gdm72xx/sdio_boot.c | 9 +-
+ drivers/staging/gdm72xx/usb_boot.c | 8 +-
+ drivers/staging/goldfish/Kconfig | 13 +
+ drivers/staging/goldfish/Makefile | 6 +
+ drivers/staging/goldfish/README | 12 +
+ drivers/staging/goldfish/goldfish_audio.c | 363 +++
+ drivers/staging/goldfish/goldfish_nand.c | 444 ++++
+ drivers/staging/goldfish/goldfish_nand_reg.h | 72 +
+ drivers/staging/iio/Kconfig | 14 -
+ drivers/staging/iio/Makefile | 3 -
+ drivers/staging/iio/accel/Kconfig | 30 +-
+ drivers/staging/iio/accel/Makefile | 2 -
+ drivers/staging/iio/accel/lis3l02dq.h | 8 -
+ drivers/staging/iio/accel/lis3l02dq_core.c | 18 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 12 +-
+ drivers/staging/iio/accel/sca3000_core.c | 13 +-
+ drivers/staging/iio/accel/sca3000_ring.c | 6 +-
+ drivers/staging/iio/adc/Kconfig | 4 +-
+ drivers/staging/iio/adc/ad7280a.c | 6 +-
+ drivers/staging/iio/adc/mxs-lradc.c | 525 +++-
+ drivers/staging/iio/frequency/ad5930.c | 5 +-
+ drivers/staging/iio/frequency/ad9850.c | 5 +-
+ drivers/staging/iio/frequency/ad9852.c | 5 +-
+ drivers/staging/iio/gyro/Kconfig | 17 -
+ drivers/staging/iio/gyro/Makefile | 9 -
+ drivers/staging/iio/gyro/adxrs450.h | 62 -
+ drivers/staging/iio/iio_hwmon.c | 83 +-
+ drivers/staging/iio/iio_simple_dummy.c | 4 +-
+ drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +-
+ drivers/staging/iio/impedance-analyzer/Kconfig | 2 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 8 +-
+ drivers/staging/iio/imu/Kconfig | 17 -
+ drivers/staging/iio/imu/Makefile | 7 -
+ drivers/staging/iio/imu/adis16400_core.c | 1320 ----------
+ drivers/staging/iio/imu/adis16400_ring.c | 204 --
+ drivers/staging/iio/imu/adis16400_trigger.c | 74 -
+ drivers/staging/iio/light/Kconfig | 10 -
+ drivers/staging/iio/light/Makefile | 1 -
+ drivers/staging/iio/light/tsl2x7x_core.c | 78 +-
+ drivers/staging/iio/meter/Kconfig | 2 +-
+ drivers/staging/iio/meter/ade7753.c | 6 +-
+ drivers/staging/iio/meter/ade7754.c | 5 +-
+ drivers/staging/iio/meter/ade7758_core.c | 28 +-
+ drivers/staging/iio/meter/ade7758_ring.c | 12 +-
+ drivers/staging/iio/meter/ade7759.c | 5 +-
+ drivers/staging/iio/meter/ade7854-spi.c | 44 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 5 +-
+ drivers/staging/iio/ring_sw.c | 366 ---
+ drivers/staging/iio/ring_sw.h | 30 -
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 3 -
+ drivers/staging/imx-drm/ipu-v3/ipu-di.c | 2 +-
+ drivers/staging/keucr/usb.c | 188 +-
+ drivers/staging/line6/Kconfig | 10 -
+ drivers/staging/line6/capture.c | 10 -
+ drivers/staging/line6/driver.c | 86 +-
+ drivers/staging/line6/driver.h | 13 +-
+ drivers/staging/line6/midi.c | 2 +-
+ drivers/staging/line6/midi.h | 4 +-
+ drivers/staging/line6/midibuf.c | 25 +-
+ drivers/staging/line6/midibuf.h | 22 +-
+ drivers/staging/line6/pcm.c | 36 +-
+ drivers/staging/line6/playback.c | 9 -
+ drivers/staging/line6/pod.c | 105 +-
+ drivers/staging/line6/toneport.c | 6 +-
+ drivers/staging/line6/variax.c | 14 -
+ drivers/staging/nvec/nvec.c | 82 +-
+ drivers/staging/nvec/nvec.h | 5 +-
+ drivers/staging/nvec/nvec_kbd.c | 42 +-
+ drivers/staging/nvec/nvec_power.c | 8 +-
+ drivers/staging/nvec/nvec_ps2.c | 37 +-
+ drivers/staging/omap-thermal/omap-bandgap.c | 2 -
+ drivers/staging/omap-thermal/omap-thermal-common.c | 4 +-
+ drivers/staging/omapdrm/omap_connector.c | 4 +-
+ drivers/staging/omapdrm/omap_crtc.c | 5 +-
+ drivers/staging/omapdrm/omap_dmm_priv.h | 5 +
+ drivers/staging/omapdrm/omap_dmm_tiler.c | 172 +-
+ drivers/staging/omapdrm/omap_drv.c | 18 +-
+ drivers/staging/omapdrm/omap_drv.h | 4 +
+ drivers/staging/omapdrm/omap_encoder.c | 4 +-
+ drivers/staging/omapdrm/omap_fb.c | 1 -
+ drivers/staging/omapdrm/omap_fbdev.c | 4 +-
+ drivers/staging/omapdrm/omap_gem.c | 42 +-
+ drivers/staging/omapdrm/omap_gem_dmabuf.c | 6 +-
+ drivers/staging/omapdrm/omap_plane.c | 4 +-
+ drivers/staging/omapdrm/tcm.h | 2 +
+ drivers/staging/ozwpan/TODO | 3 +-
+ drivers/staging/ozwpan/ozcdev.c | 52 +-
+ drivers/staging/ozwpan/ozcdev.h | 1 -
+ drivers/staging/ozwpan/ozeltbuf.c | 18 +-
+ drivers/staging/ozwpan/ozevent.c | 8 +-
+ drivers/staging/ozwpan/ozhcd.c | 152 +-
+ drivers/staging/ozwpan/ozmain.c | 2 +-
+ drivers/staging/ozwpan/ozpd.c | 88 +-
+ drivers/staging/ozwpan/ozpd.h | 4 +-
+ drivers/staging/ozwpan/ozproto.c | 84 +-
+ drivers/staging/ozwpan/ozproto.h | 2 +-
+ drivers/staging/ozwpan/ozusbif.h | 8 +-
+ drivers/staging/ozwpan/ozusbsvc.c | 22 +-
+ drivers/staging/ozwpan/ozusbsvc1.c | 26 +-
+ drivers/staging/panel/panel.c | 31 +-
+ drivers/staging/ramster/Kconfig | 31 -
+ drivers/staging/ramster/Makefile | 6 -
+ drivers/staging/ramster/tmem.c | 894 -------
+ drivers/staging/ramster/tmem.h | 259 --
+ drivers/staging/ramster/zcache-main.c | 1820 --------------
+ drivers/staging/rtl8187se/ieee80211/dot11d.c | 71 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_module.c | 4 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 6 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 408 ++-
+ drivers/staging/rtl8187se/r8185b_init.c | 301 +--
+ drivers/staging/rtl8192u/changes | 1 -
+ drivers/staging/rtl8192u/ieee80211/Makefile | 1 -
+ drivers/staging/rtl8192u/ieee80211/aes.c | 3 +-
+ drivers/staging/rtl8192u/ieee80211/arc4.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/crypto_compat.h | 2 -
+ drivers/staging/rtl8192u/ieee80211/dot11d.c | 1 -
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 102 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_module.c | 8 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 394 +--
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 280 +--
+ .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 31 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 54 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/internal.h | 1 -
+ drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 6 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 63 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 13 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 124 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 83 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 3 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 18 +-
+ drivers/staging/rtl8192u/ieee80211/rtl_crypto.h | 93 +-
+ drivers/staging/rtl8192u/r8180_93cx6.c | 2 +-
+ drivers/staging/rtl8192u/r8180_pm.h | 2 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c | 13 +-
+ drivers/staging/rtl8192u/r8192U.h | 299 ++-
+ drivers/staging/rtl8192u/r8192U_core.c | 589 +++--
+ drivers/staging/rtl8192u/r8192U_dm.c | 197 +-
+ drivers/staging/rtl8192u/r8192U_dm.h | 24 +-
+ drivers/staging/rtl8192u/r8192U_hw.h | 16 +-
+ drivers/staging/rtl8192u/r8192U_wx.c | 37 +-
+ drivers/staging/rtl8192u/r819xU_HTGen.h | 1 -
+ drivers/staging/rtl8192u/r819xU_HTType.h | 9 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 38 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.h | 44 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 109 +-
+ drivers/staging/rtl8192u/r819xU_firmware.h | 1 -
+ drivers/staging/rtl8192u/r819xU_phy.c | 127 +-
+ drivers/staging/rtl8192u/r819xU_phyreg.h | 1044 ++++----
+ drivers/staging/rtl8712/ethernet.h | 7 -
+ drivers/staging/rtl8712/hal_init.c | 17 +-
+ drivers/staging/rtl8712/ieee80211.h | 2 +-
+ drivers/staging/rtl8712/mlme_linux.c | 2 -
+ drivers/staging/rtl8712/os_intfs.c | 3 +-
+ drivers/staging/rtl8712/rtl8712_recv.c | 14 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 1 -
+ drivers/staging/rtl8712/rtl871x_cmd.h | 2 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 66 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 181 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_set.c | 2 -
+ drivers/staging/rtl8712/rtl871x_mlme.c | 9 +-
+ drivers/staging/rtl8712/rtl871x_mp.h | 56 -
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 393 +--
+ drivers/staging/rtl8712/rtl871x_security.h | 6 +-
+ drivers/staging/rtl8712/sta_info.h | 2 +-
+ drivers/staging/rtl8712/usb_intf.c | 33 +-
+ drivers/staging/rtl8712/usb_ops_linux.c | 15 +-
+ drivers/staging/rtl8712/wifi.h | 171 +-
+ drivers/staging/rtl8712/xmit_linux.c | 3 +-
+ drivers/staging/sb105x/sb_mp_register.h | 2 +-
+ drivers/staging/sb105x/sb_pci_mp.c | 18 +-
+ drivers/staging/sbe-2t3e3/dc.c | 9 +-
+ drivers/staging/sbe-2t3e3/module.c | 7 +-
+ drivers/staging/sep/sep_crypto.c | 10 +-
+ drivers/staging/sep/sep_main.c | 44 +-
+ drivers/staging/slicoss/slic.h | 504 ++--
+ drivers/staging/slicoss/slichw.h | 6 +-
+ drivers/staging/slicoss/slicoss.c | 35 +-
+ drivers/staging/speakup/Kconfig | 2 +-
+ drivers/staging/speakup/buffers.c | 14 +-
+ drivers/staging/speakup/fakekey.c | 2 +-
+ drivers/staging/speakup/i18n.c | 12 +-
+ drivers/staging/speakup/i18n.h | 12 +-
+ drivers/staging/speakup/keyhelp.c | 39 +-
+ drivers/staging/speakup/kobjects.c | 84 +-
+ drivers/staging/speakup/main.c | 370 +--
+ drivers/staging/speakup/selection.c | 15 +-
+ drivers/staging/speakup/serialio.c | 6 +-
+ drivers/staging/speakup/speakup.h | 72 +-
+ drivers/staging/speakup/speakup_acntpc.c | 6 +-
+ drivers/staging/speakup/speakup_acntsa.c | 2 +-
+ drivers/staging/speakup/speakup_apollo.c | 8 +-
+ drivers/staging/speakup/speakup_audptr.c | 2 +-
+ drivers/staging/speakup/speakup_bns.c | 2 +-
+ drivers/staging/speakup/speakup_decext.c | 6 +-
+ drivers/staging/speakup/speakup_decpc.c | 4 +-
+ drivers/staging/speakup/speakup_dectlk.c | 6 +-
+ drivers/staging/speakup/speakup_dtlk.c | 4 +-
+ drivers/staging/speakup/speakup_dummy.c | 2 +-
+ drivers/staging/speakup/speakup_keypc.c | 6 +-
+ drivers/staging/speakup/speakup_ltlk.c | 2 +-
+ drivers/staging/speakup/speakup_spkout.c | 2 +-
+ drivers/staging/speakup/speakup_txprt.c | 2 +-
+ drivers/staging/speakup/spk_priv.h | 8 +-
+ drivers/staging/speakup/synth.c | 38 +-
+ drivers/staging/speakup/thread.c | 4 +-
+ drivers/staging/speakup/varhandlers.c | 66 +-
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 18 +-
+ drivers/staging/tidspbridge/core/msg_sm.c | 3 +-
+ drivers/staging/tidspbridge/core/tiomap3430.c | 34 +-
+ .../staging/tidspbridge/include/dspbridge/proc.h | 2 -
+ drivers/staging/tidspbridge/pmgr/cod.c | 2 +-
+ drivers/staging/tidspbridge/pmgr/dbll.c | 2 +-
+ drivers/staging/tidspbridge/pmgr/dspapi.c | 11 +-
+ drivers/staging/tidspbridge/rmgr/dbdcd.c | 3 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 -
+ drivers/staging/tidspbridge/rmgr/nldr.c | 6 +-
+ drivers/staging/tidspbridge/rmgr/node.c | 12 +-
+ drivers/staging/tidspbridge/rmgr/proc.c | 23 +-
+ drivers/staging/usbip/Kconfig | 2 +-
+ drivers/staging/usbip/stub_dev.c | 42 +-
+ drivers/staging/usbip/stub_rx.c | 5 +-
+ drivers/staging/usbip/stub_tx.c | 1 -
+ drivers/staging/usbip/usbip_common.c | 3 +-
+ drivers/staging/usbip/usbip_event.c | 6 +-
+ drivers/staging/usbip/userspace/.gitignore | 28 +
+ drivers/staging/usbip/userspace/Makefile.am | 2 +-
+ drivers/staging/usbip/userspace/README | 2 -
+ drivers/staging/usbip/userspace/configure.ac | 20 +-
+ drivers/staging/usbip/userspace/src/Makefile.am | 4 +-
+ drivers/staging/usbip/userspace/src/usbip_attach.c | 15 +-
+ drivers/staging/usbip/userspace/src/usbipd.c | 96 +-
+ drivers/staging/usbip/vhci_hcd.c | 80 +-
+ drivers/staging/usbip/vhci_rx.c | 10 +-
+ drivers/staging/usbip/vhci_tx.c | 14 +-
+ drivers/staging/vme/devices/Kconfig | 2 +-
+ drivers/staging/vme/devices/vme_pio2_core.c | 1 -
+ drivers/staging/vme/devices/vme_pio2_gpio.c | 4 +-
+ drivers/staging/vme/devices/vme_user.c | 2 -
+ drivers/staging/vt6655/channel.c | 11 +-
+ drivers/staging/vt6655/device.h | 24 +-
+ drivers/staging/vt6655/rxtx.c | 6 +-
+ drivers/staging/vt6655/wcmd.c | 2 +-
+ drivers/staging/vt6655/wmgr.c | 2 +-
+ drivers/staging/vt6656/80211mgr.c | 36 +-
+ drivers/staging/vt6656/80211mgr.h | 169 +-
+ drivers/staging/vt6656/aes_ccmp.c | 10 +-
+ drivers/staging/vt6656/aes_ccmp.h | 2 +-
+ drivers/staging/vt6656/baseband.c | 91 +-
+ drivers/staging/vt6656/baseband.h | 70 +-
+ drivers/staging/vt6656/bssdb.c | 435 ++--
+ drivers/staging/vt6656/bssdb.h | 172 +-
+ drivers/staging/vt6656/card.c | 366 ++-
+ drivers/staging/vt6656/card.h | 47 +-
+ drivers/staging/vt6656/channel.c | 157 +-
+ drivers/staging/vt6656/channel.h | 9 +-
+ drivers/staging/vt6656/control.c | 55 +-
+ drivers/staging/vt6656/control.h | 26 +-
+ drivers/staging/vt6656/datarate.c | 109 +-
+ drivers/staging/vt6656/datarate.h | 43 +-
+ drivers/staging/vt6656/desc.h | 195 +-
+ drivers/staging/vt6656/device.h | 879 ++++---
+ drivers/staging/vt6656/device_cfg.h | 12 +-
+ drivers/staging/vt6656/dpc.c | 470 ++--
+ drivers/staging/vt6656/dpc.h | 16 +-
+ drivers/staging/vt6656/firmware.c | 33 +-
+ drivers/staging/vt6656/firmware.h | 17 +-
+ drivers/staging/vt6656/hostap.c | 147 +-
+ drivers/staging/vt6656/hostap.h | 4 +-
+ drivers/staging/vt6656/int.c | 22 +-
+ drivers/staging/vt6656/int.h | 7 +-
+ drivers/staging/vt6656/iocmd.h | 22 +-
+ drivers/staging/vt6656/iwctl.c | 184 +-
+ drivers/staging/vt6656/key.c | 364 ++-
+ drivers/staging/vt6656/key.h | 104 +-
+ drivers/staging/vt6656/mac.c | 92 +-
+ drivers/staging/vt6656/mac.h | 35 +-
+ drivers/staging/vt6656/main_usb.c | 530 ++--
+ drivers/staging/vt6656/power.c | 104 +-
+ drivers/staging/vt6656/power.h | 16 +-
+ drivers/staging/vt6656/rf.c | 178 +-
+ drivers/staging/vt6656/rf.h | 26 +-
+ drivers/staging/vt6656/rxtx.c | 965 +++-----
+ drivers/staging/vt6656/rxtx.h | 31 +-
+ drivers/staging/vt6656/tether.c | 8 +-
+ drivers/staging/vt6656/tether.h | 2 +-
+ drivers/staging/vt6656/ttype.h | 23 -
+ drivers/staging/vt6656/usbpipe.c | 216 +-
+ drivers/staging/vt6656/usbpipe.h | 40 +-
+ drivers/staging/vt6656/wcmd.c | 323 ++-
+ drivers/staging/vt6656/wcmd.h | 18 +-
+ drivers/staging/vt6656/wctl.c | 50 +-
+ drivers/staging/vt6656/wctl.h | 10 +-
+ drivers/staging/vt6656/wmgr.c | 1406 +++++------
+ drivers/staging/vt6656/wmgr.h | 394 ++-
+ drivers/staging/vt6656/wpa.c | 30 +-
+ drivers/staging/vt6656/wpa.h | 4 +-
+ drivers/staging/vt6656/wpa2.c | 41 +-
+ drivers/staging/vt6656/wpactl.c | 34 +-
+ drivers/staging/vt6656/wpactl.h | 2 +-
+ drivers/staging/winbond/Kconfig | 2 +-
+ drivers/staging/wlags49_h2/ap_h2.c | 8 +-
+ drivers/staging/wlags49_h2/ap_h25.c | 78 +-
+ drivers/staging/wlags49_h2/sta_h2.c | 80 +-
+ drivers/staging/wlags49_h2/wl_enc.c | 128 +-
+ drivers/staging/wlags49_h2/wl_netdev.h | 94 +-
+ drivers/staging/wlags49_h2/wl_priv.c | 1113 +++++----
+ drivers/staging/wlags49_h2/wl_priv.h | 58 +-
+ drivers/staging/wlags49_h2/wl_profile.h | 12 +-
+ drivers/staging/wlags49_h2/wl_util.h | 38 +-
+ drivers/staging/wlags49_h2/wl_wext.c | 2 -
+ drivers/staging/wlan-ng/hfa384x.h | 31 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 2 +
+ drivers/staging/wlan-ng/prism2mgmt.c | 40 +-
+ drivers/staging/xgifb/XGI_main_26.c | 84 +-
+ drivers/staging/xgifb/XGIfb.h | 2 +-
+ drivers/staging/xgifb/vb_init.c | 119 +-
+ drivers/staging/xgifb/vb_init.h | 1 +
+ drivers/staging/xgifb/vb_setmode.c | 684 ++----
+ drivers/staging/xgifb/vb_struct.h | 5 +-
+ drivers/staging/xgifb/vb_table.h | 168 +-
+ drivers/staging/zcache/Kconfig | 34 +-
+ drivers/staging/zcache/Makefile | 5 +-
+ drivers/staging/zcache/TODO | 69 +
+ drivers/staging/{ramster => zcache}/ramster.h | 0
+ .../{ramster => zcache}/ramster/heartbeat.c | 0
+ .../{ramster => zcache}/ramster/heartbeat.h | 0
+ .../staging/{ramster => zcache}/ramster/masklog.c | 0
+ .../staging/{ramster => zcache}/ramster/masklog.h | 0
+ .../{ramster => zcache}/ramster/nodemanager.c | 0
+ .../{ramster => zcache}/ramster/nodemanager.h | 0
+ .../staging/{ramster => zcache}/ramster/r2net.c | 0
+ .../staging/{ramster => zcache}/ramster/ramster.c | 34 +-
+ .../staging/{ramster => zcache}/ramster/ramster.h | 0
+ .../ramster/ramster_nodemanager.h | 0
+ drivers/staging/{ramster => zcache}/ramster/tcp.c | 0
+ drivers/staging/{ramster => zcache}/ramster/tcp.h | 0
+ .../{ramster => zcache}/ramster/tcp_internal.h | 0
+ drivers/staging/zcache/tmem.c | 327 ++-
+ drivers/staging/zcache/tmem.h | 83 +-
+ drivers/staging/{ramster => zcache}/zbud.c | 41 +-
+ drivers/staging/{ramster => zcache}/zbud.h | 0
+ drivers/staging/zcache/zcache-main.c | 2590 ++++++++++----------
+ drivers/staging/{ramster => zcache}/zcache.h | 0
+ drivers/staging/zram/Kconfig | 2 +-
+ drivers/staging/zram/zram.txt | 27 +-
+ drivers/staging/zram/zram_drv.c | 294 +--
+ drivers/staging/zram/zram_drv.h | 17 +-
+ drivers/staging/zram/zram_sysfs.c | 16 +-
+ drivers/staging/zsmalloc/zsmalloc-main.c | 29 +-
+ drivers/staging/zsmalloc/zsmalloc.h | 2 +-
+ include/linux/hid-sensor-hub.h | 38 +
+ include/linux/hid-sensor-ids.h | 9 +
+ include/linux/iio/buffer.h | 13 -
+ include/linux/iio/common/st_sensors.h | 280 +++
+ include/linux/iio/common/st_sensors_i2c.h | 20 +
+ include/linux/iio/common/st_sensors_spi.h | 20 +
+ include/linux/iio/consumer.h | 14 +-
+ include/linux/iio/driver.h | 9 +-
+ include/linux/iio/gyro/itg3200.h | 154 ++
+ include/linux/iio/trigger.h | 5 +
+ include/linux/pci_ids.h | 10 +
+ include/linux/platform_data/invensense_mpu6050.h | 31 +
+ .../linux/platform_data}/tsl2563.h | 1 -
+ include/linux/spi/spi.h | 44 +
+ 621 files changed, 28253 insertions(+), 28402 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-mpu6050
+ rename drivers/{staging => }/iio/accel/kxsd9.c (97%)
+ create mode 100644 drivers/iio/accel/st_accel.h
+ create mode 100644 drivers/iio/accel/st_accel_buffer.c
+ create mode 100644 drivers/iio/accel/st_accel_core.c
+ create mode 100644 drivers/iio/accel/st_accel_i2c.c
+ create mode 100644 drivers/iio/accel/st_accel_spi.c
+ delete mode 100644 drivers/iio/common/hid-sensors/hid-sensor-attributes.h
+ create mode 100644 drivers/iio/common/st_sensors/Kconfig
+ create mode 100644 drivers/iio/common/st_sensors/Makefile
+ create mode 100644 drivers/iio/common/st_sensors/st_sensors_buffer.c
+ create mode 100644 drivers/iio/common/st_sensors/st_sensors_core.c
+ create mode 100644 drivers/iio/common/st_sensors/st_sensors_i2c.c
+ create mode 100644 drivers/iio/common/st_sensors/st_sensors_spi.c
+ create mode 100644 drivers/iio/common/st_sensors/st_sensors_trigger.c
+ rename drivers/{staging/iio/gyro/adis16080_core.c => iio/gyro/adis16080.c} (55%)
+ rename drivers/{staging/iio/gyro/adxrs450_core.c => iio/gyro/adxrs450.c} (68%)
+ create mode 100644 drivers/iio/gyro/itg3200_buffer.c
+ create mode 100644 drivers/iio/gyro/itg3200_core.c
+ create mode 100644 drivers/iio/gyro/st_gyro.h
+ create mode 100644 drivers/iio/gyro/st_gyro_buffer.c
+ create mode 100644 drivers/iio/gyro/st_gyro_core.c
+ create mode 100644 drivers/iio/gyro/st_gyro_i2c.c
+ create mode 100644 drivers/iio/gyro/st_gyro_spi.c
+ rename drivers/{staging => }/iio/imu/adis16400.h (68%)
+ create mode 100644 drivers/iio/imu/adis16400_buffer.c
+ create mode 100644 drivers/iio/imu/adis16400_core.c
+ create mode 100644 drivers/iio/imu/inv_mpu6050/Kconfig
+ create mode 100644 drivers/iio/imu/inv_mpu6050/Makefile
+ create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+ create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
+ create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
+ create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+ rename drivers/{staging => }/iio/light/tsl2563.c (91%)
+ create mode 100644 drivers/iio/magnetometer/st_magn.h
+ create mode 100644 drivers/iio/magnetometer/st_magn_buffer.c
+ create mode 100644 drivers/iio/magnetometer/st_magn_core.c
+ create mode 100644 drivers/iio/magnetometer/st_magn_i2c.c
+ create mode 100644 drivers/iio/magnetometer/st_magn_spi.c
+ create mode 100644 drivers/platform/goldfish/Kconfig
+ create mode 100644 drivers/platform/goldfish/Makefile
+ create mode 100644 drivers/platform/goldfish/goldfish_pipe.c
+ create mode 100644 drivers/platform/goldfish/pdev_bus.c
+ create mode 100644 drivers/rtc/rtc-hid-sensor-time.c
+ create mode 100644 drivers/staging/comedi/comedi_buf.c
+ create mode 100644 drivers/staging/comedi/comedi_pci.c
+ create mode 100644 drivers/staging/comedi/comedi_pcmcia.c
+ create mode 100644 drivers/staging/comedi/comedi_usb.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
+ create mode 100644 drivers/staging/comedi/drivers/addi_watchdog.c
+ create mode 100644 drivers/staging/comedi/drivers/addi_watchdog.h
+ create mode 100644 drivers/staging/comedi/drivers/das08_isa.c
+ create mode 100644 drivers/staging/comedi/drivers/das08_pci.c
+ delete mode 100644 drivers/staging/comedi/drivers/pcm_common.c
+ delete mode 100644 drivers/staging/comedi/drivers/pcm_common.h
+ create mode 100644 drivers/staging/goldfish/Kconfig
+ create mode 100644 drivers/staging/goldfish/Makefile
+ create mode 100644 drivers/staging/goldfish/README
+ create mode 100644 drivers/staging/goldfish/goldfish_audio.c
+ create mode 100644 drivers/staging/goldfish/goldfish_nand.c
+ create mode 100644 drivers/staging/goldfish/goldfish_nand_reg.h
+ delete mode 100644 drivers/staging/iio/gyro/adxrs450.h
+ delete mode 100644 drivers/staging/iio/imu/Kconfig
+ delete mode 100644 drivers/staging/iio/imu/Makefile
+ delete mode 100644 drivers/staging/iio/imu/adis16400_core.c
+ delete mode 100644 drivers/staging/iio/imu/adis16400_ring.c
+ delete mode 100644 drivers/staging/iio/imu/adis16400_trigger.c
+ delete mode 100644 drivers/staging/iio/ring_sw.c
+ delete mode 100644 drivers/staging/iio/ring_sw.h
+ delete mode 100644 drivers/staging/ramster/Kconfig
+ delete mode 100644 drivers/staging/ramster/Makefile
+ delete mode 100644 drivers/staging/ramster/tmem.c
+ delete mode 100644 drivers/staging/ramster/tmem.h
+ delete mode 100644 drivers/staging/ramster/zcache-main.c
+ create mode 100644 drivers/staging/usbip/userspace/.gitignore
+ create mode 100644 drivers/staging/zcache/TODO
+ rename drivers/staging/{ramster => zcache}/ramster.h (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/heartbeat.c (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/heartbeat.h (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/masklog.c (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/masklog.h (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/nodemanager.c (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/nodemanager.h (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/r2net.c (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/ramster.c (97%)
+ rename drivers/staging/{ramster => zcache}/ramster/ramster.h (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/ramster_nodemanager.h (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/tcp.c (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/tcp.h (100%)
+ rename drivers/staging/{ramster => zcache}/ramster/tcp_internal.h (100%)
+ rename drivers/staging/{ramster => zcache}/zbud.c (97%)
+ rename drivers/staging/{ramster => zcache}/zbud.h (100%)
+ rename drivers/staging/{ramster => zcache}/zcache.h (100%)
+ create mode 100644 include/linux/iio/common/st_sensors.h
+ create mode 100644 include/linux/iio/common/st_sensors_i2c.h
+ create mode 100644 include/linux/iio/common/st_sensors_spi.h
+ create mode 100644 include/linux/iio/gyro/itg3200.h
+ create mode 100644 include/linux/platform_data/invensense_mpu6050.h
+ rename {drivers/staging/iio/light => include/linux/platform_data}/tsl2563.h (99%)
+Merging char-misc/char-misc-next (29e5507 w1: w1_therm: Add force-pullup option for "broken" sensors)
+$ git merge char-misc/char-misc-next
+Resolved 'drivers/char/pcmcia/synclink_cs.c' using previous resolution.
+Resolved 'drivers/ipack/devices/ipoctal.c' using previous resolution.
+Resolved 'drivers/mfd/wm5102-tables.c' using previous resolution.
+Resolved 'include/linux/mfd/arizona/pdata.h' using previous resolution.
+Auto-merging include/linux/mfd/arizona/registers.h
+Auto-merging include/linux/mfd/arizona/pdata.h
+CONFLICT (content): Merge conflict in include/linux/mfd/arizona/pdata.h
+Auto-merging drivers/net/hyperv/netvsc_drv.c
+Auto-merging drivers/net/Kconfig
+Auto-merging drivers/mmc/host/Kconfig
+Removing drivers/misc/mei/iorw.c
+Removing drivers/misc/mei/interface.h
+Removing drivers/misc/mei/interface.c
+Auto-merging drivers/misc/Kconfig
+Auto-merging drivers/mfd/wm5102-tables.c
+CONFLICT (content): Merge conflict in drivers/mfd/wm5102-tables.c
+Auto-merging drivers/ipack/devices/ipoctal.c
+CONFLICT (content): Merge conflict in drivers/ipack/devices/ipoctal.c
+Auto-merging drivers/char/pcmcia/synclink_cs.c
+CONFLICT (content): Merge conflict in drivers/char/pcmcia/synclink_cs.c
+Auto-merging drivers/char/hw_random/exynos-rng.c
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0ffe96d] Merge remote-tracking branch 'char-misc/char-misc-next'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 8 +-
+ Documentation/DocBook/uio-howto.tmpl | 2 +-
+ Documentation/w1/slaves/w1_therm | 13 +-
+ MAINTAINERS | 7 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/char/hw_random/exynos-rng.c | 2 +-
+ drivers/char/mem.c | 10 +-
+ drivers/char/pcmcia/synclink_cs.c | 645 ++--
+ drivers/extcon/Kconfig | 4 +-
+ drivers/extcon/extcon-arizona.c | 810 ++++-
+ drivers/extcon/extcon-gpio.c | 2 +-
+ drivers/extcon/extcon-max77693.c | 981 ++++--
+ drivers/extcon/extcon-max8997.c | 734 +++--
+ drivers/hid/hid-hyperv.c | 3 +-
+ drivers/hv/channel.c | 33 +-
+ drivers/hv/channel_mgmt.c | 93 +
+ drivers/hv/connection.c | 232 +-
+ drivers/hv/hv.c | 72 +-
+ drivers/hv/hv_balloon.c | 63 +-
+ drivers/hv/hv_util.c | 46 +-
+ drivers/hv/hyperv_vmbus.h | 65 +-
+ drivers/hv/ring_buffer.c | 130 +-
+ drivers/hv/vmbus_drv.c | 54 +-
+ drivers/ipack/devices/ipoctal.c | 113 +-
+ drivers/mfd/wm5102-tables.c | 11 +-
+ drivers/misc/Kconfig | 12 +
+ drivers/misc/Makefile | 3 +
+ drivers/misc/cb710/Kconfig | 2 +-
+ drivers/misc/lattice-ecp3-config.c | 243 ++
+ drivers/misc/mei/Kconfig | 15 +-
+ drivers/misc/mei/Makefile | 6 +-
+ drivers/misc/mei/amthif.c | 164 +-
+ drivers/misc/mei/client.c | 729 +++++
+ drivers/misc/mei/client.h | 102 +
+ drivers/misc/mei/hbm.c | 669 ++++
+ drivers/misc/mei/hbm.h | 39 +
+ drivers/misc/mei/hw-me-regs.h | 167 +
+ drivers/misc/mei/hw-me.c | 576 ++++
+ drivers/misc/mei/hw-me.h | 48 +
+ drivers/misc/mei/hw.h | 125 +-
+ drivers/misc/mei/init.c | 572 +---
+ drivers/misc/mei/interface.c | 388 ---
+ drivers/misc/mei/interface.h | 81 -
+ drivers/misc/mei/interrupt.c | 656 +---
+ drivers/misc/mei/iorw.c | 366 ---
+ drivers/misc/mei/main.c | 536 +--
+ drivers/misc/mei/mei_dev.h | 350 +-
+ drivers/misc/mei/pci-me.c | 396 +++
+ drivers/misc/mei/wd.c | 77 +-
+ drivers/misc/ti-st/st_core.c | 3 +-
+ drivers/misc/vmw_vmci/Kconfig | 16 +
+ drivers/misc/vmw_vmci/Makefile | 4 +
+ drivers/misc/vmw_vmci/vmci_context.c | 1214 +++++++
+ drivers/misc/vmw_vmci/vmci_context.h | 182 ++
+ drivers/misc/vmw_vmci/vmci_datagram.c | 500 +++
+ drivers/misc/vmw_vmci/vmci_datagram.h | 52 +
+ drivers/misc/vmw_vmci/vmci_doorbell.c | 604 ++++
+ drivers/misc/vmw_vmci/vmci_doorbell.h | 51 +
+ drivers/misc/vmw_vmci/vmci_driver.c | 117 +
+ drivers/misc/vmw_vmci/vmci_driver.h | 50 +
+ drivers/misc/vmw_vmci/vmci_event.c | 224 ++
+ drivers/misc/vmw_vmci/vmci_event.h | 25 +
+ drivers/misc/vmw_vmci/vmci_guest.c | 759 +++++
+ drivers/misc/vmw_vmci/vmci_handle_array.c | 142 +
+ drivers/misc/vmw_vmci/vmci_handle_array.h | 52 +
+ drivers/misc/vmw_vmci/vmci_host.c | 1043 ++++++
+ drivers/misc/vmw_vmci/vmci_queue_pair.c | 3425 ++++++++++++++++++++
+ drivers/misc/vmw_vmci/vmci_queue_pair.h | 191 ++
+ drivers/misc/vmw_vmci/vmci_resource.c | 229 ++
+ drivers/misc/vmw_vmci/vmci_resource.h | 59 +
+ drivers/misc/vmw_vmci/vmci_route.c | 226 ++
+ drivers/misc/vmw_vmci/vmci_route.h | 30 +
+ drivers/mmc/host/Kconfig | 2 +-
+ drivers/net/Kconfig | 4 +
+ drivers/net/Makefile | 1 +
+ drivers/net/hyperv/netvsc_drv.c | 3 +-
+ drivers/net/ntb_netdev.c | 408 +++
+ drivers/ntb/Kconfig | 13 +
+ drivers/ntb/Makefile | 3 +
+ drivers/ntb/ntb_hw.c | 1141 +++++++
+ drivers/ntb/ntb_hw.h | 181 ++
+ drivers/ntb/ntb_regs.h | 139 +
+ drivers/ntb/ntb_transport.c | 1441 ++++++++
+ drivers/pcmcia/i82092.c | 8 +-
+ drivers/pcmcia/vrc4171_card.c | 1 +
+ drivers/scsi/storvsc_drv.c | 12 +-
+ drivers/vme/vme.c | 1 +
+ drivers/w1/masters/ds1wm.c | 52 +-
+ drivers/w1/masters/ds2482.c | 51 +-
+ drivers/w1/masters/mxc_w1.c | 49 +-
+ drivers/w1/masters/w1-gpio.c | 2 +-
+ drivers/w1/slaves/w1_therm.c | 36 +-
+ .../linux/extcon/{extcon_gpio.h => extcon-gpio.h} | 0
+ include/linux/hyperv.h | 248 +-
+ include/linux/mfd/arizona/core.h | 4 +-
+ include/linux/mfd/arizona/pdata.h | 21 +
+ include/linux/mfd/arizona/registers.h | 56 +
+ include/linux/mfd/max77693-private.h | 86 +
+ include/linux/mfd/max77693.h | 9 +
+ include/linux/mfd/max8997-private.h | 64 +
+ include/linux/mfd/max8997.h | 25 +-
+ include/linux/ntb.h | 83 +
+ include/linux/vmw_vmci_api.h | 82 +
+ include/linux/vmw_vmci_defs.h | 880 +++++
+ tools/hv/hv_kvp_daemon.c | 79 +-
+ tools/hv/hv_set_ifconfig.sh | 24 +-
+ 107 files changed, 20749 insertions(+), 4116 deletions(-)
+ create mode 100644 drivers/misc/lattice-ecp3-config.c
+ create mode 100644 drivers/misc/mei/client.c
+ create mode 100644 drivers/misc/mei/client.h
+ create mode 100644 drivers/misc/mei/hbm.c
+ create mode 100644 drivers/misc/mei/hbm.h
+ create mode 100644 drivers/misc/mei/hw-me-regs.h
+ create mode 100644 drivers/misc/mei/hw-me.c
+ create mode 100644 drivers/misc/mei/hw-me.h
+ delete mode 100644 drivers/misc/mei/interface.c
+ delete mode 100644 drivers/misc/mei/interface.h
+ delete mode 100644 drivers/misc/mei/iorw.c
+ create mode 100644 drivers/misc/mei/pci-me.c
+ create mode 100644 drivers/misc/vmw_vmci/Kconfig
+ create mode 100644 drivers/misc/vmw_vmci/Makefile
+ create mode 100644 drivers/misc/vmw_vmci/vmci_context.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_context.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_datagram.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_datagram.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_doorbell.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_doorbell.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_driver.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_driver.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_event.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_event.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_guest.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_handle_array.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_handle_array.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_host.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_queue_pair.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_queue_pair.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_resource.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_resource.h
+ create mode 100644 drivers/misc/vmw_vmci/vmci_route.c
+ create mode 100644 drivers/misc/vmw_vmci/vmci_route.h
+ create mode 100644 drivers/net/ntb_netdev.c
+ create mode 100644 drivers/ntb/Kconfig
+ create mode 100644 drivers/ntb/Makefile
+ create mode 100644 drivers/ntb/ntb_hw.c
+ create mode 100644 drivers/ntb/ntb_hw.h
+ create mode 100644 drivers/ntb/ntb_regs.h
+ create mode 100644 drivers/ntb/ntb_transport.c
+ rename include/linux/extcon/{extcon_gpio.h => extcon-gpio.h} (100%)
+ create mode 100644 include/linux/ntb.h
+ create mode 100644 include/linux/vmw_vmci_api.h
+ create mode 100644 include/linux/vmw_vmci_defs.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
+Auto-merging mm/page-writeback.c
+Auto-merging fs/fs-writeback.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/btrfs/extent-tree.c
+Merge made by the 'recursive' strategy.
+ fs/btrfs/extent-tree.c | 20 +++-----------------
+ fs/ext4/inode.c | 8 ++------
+ fs/fs-writeback.c | 44 ++++++++++++++++++++------------------------
+ include/linux/writeback.h | 6 +++---
+ mm/page-writeback.c | 2 +-
+ 5 files changed, 29 insertions(+), 51 deletions(-)
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (ade158e pinctrl: tegra: add clfvs function to Tegra114 support)
+$ git merge pinctrl/for-next
+Resolved 'drivers/gpio/Kconfig' using previous resolution.
+Resolved 'drivers/pinctrl/pinctrl-nomadik.c' using previous resolution.
+Resolved 'include/linux/mfd/abx500/ab8500.h' using previous resolution.
+Auto-merging include/linux/mfd/abx500/ab8500.h
+CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500.h
+Auto-merging include/linux/device.h
+Auto-merging drivers/pinctrl/pinctrl-xway.c
+Auto-merging drivers/pinctrl/pinctrl-samsung.c
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging drivers/pinctrl/pinctrl-falcon.c
+Auto-merging drivers/pinctrl/Makefile
+Auto-merging drivers/pinctrl/Kconfig
+Auto-merging drivers/gpio/gpiolib-of.c
+Removing drivers/gpio/gpio-ab8500.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
+Auto-merging drivers/base/dd.c
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+Auto-merging arch/arm/Kconfig
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a3de2a5] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 60 +
+ .../bindings/pinctrl/nvidia,tegra114-pinmux.txt | 120 +
+ .../devicetree/bindings/pinctrl/ste,nomadik.txt | 140 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/pinctrl.txt | 18 +-
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/dts/dbx5x0.dtsi | 10 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi | 30 +
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 +
+ arch/arm/boot/dts/sun5i-a13.dtsi | 23 +
+ arch/arm/mach-sunxi/Kconfig | 1 +
+ arch/arm/mach-ux500/Kconfig | 6 +
+ arch/arm/mach-ux500/board-mop500.c | 20 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 2 +-
+ .../mach-ux500/include/mach/irqs-board-mop500.h | 10 +-
+ drivers/base/Makefile | 1 +
+ drivers/base/dd.c | 7 +
+ drivers/base/pinctrl.c | 69 +
+ drivers/gpio/Kconfig | 6 -
+ drivers/gpio/Makefile | 1 -
+ drivers/gpio/gpio-ab8500.c | 520 ----
+ drivers/gpio/gpiolib-of.c | 2 +-
+ drivers/pinctrl/Kconfig | 32 +
+ drivers/pinctrl/Makefile | 7 +
+ drivers/pinctrl/core.c | 118 +-
+ drivers/pinctrl/core.h | 29 +
+ drivers/pinctrl/devicetree.c | 5 +
+ drivers/pinctrl/pinconf-generic.c | 4 +-
+ drivers/pinctrl/pinconf.c | 207 ++
+ drivers/pinctrl/pinctrl-ab8500.c | 484 ++++
+ drivers/pinctrl/pinctrl-ab8505.c | 380 +++
+ drivers/pinctrl/pinctrl-ab8540.c | 407 +++
+ drivers/pinctrl/pinctrl-ab9540.c | 485 ++++
+ drivers/pinctrl/pinctrl-abx500.c | 1012 +++++++
+ drivers/pinctrl/pinctrl-abx500.h | 234 ++
+ drivers/pinctrl/pinctrl-falcon.c | 38 +-
+ drivers/pinctrl/pinctrl-lantiq.c | 56 +-
+ drivers/pinctrl/pinctrl-lantiq.h | 1 +
+ drivers/pinctrl/pinctrl-nomadik.c | 390 ++-
+ drivers/pinctrl/pinctrl-samsung.c | 1 -
+ drivers/pinctrl/pinctrl-sunxi.c | 1505 +++++++++++
+ drivers/pinctrl/pinctrl-sunxi.h | 478 ++++
+ drivers/pinctrl/pinctrl-tegra.c | 14 +
+ drivers/pinctrl/pinctrl-tegra.h | 16 +
+ drivers/pinctrl/pinctrl-tegra114.c | 2769 ++++++++++++++++++++
+ drivers/pinctrl/pinctrl-tegra20.c | 6 +
+ drivers/pinctrl/pinctrl-tegra30.c | 4 +
+ drivers/pinctrl/pinctrl-xway.c | 60 +-
+ include/linux/device.h | 7 +
+ include/linux/mfd/abx500/ab8500-gpio.h | 16 +-
+ include/linux/mfd/abx500/ab8500.h | 254 +-
+ include/linux/pinctrl/devinfo.h | 45 +
+ include/linux/pinctrl/pinconf-generic.h | 16 +-
+ include/linux/pinctrl/pinctrl.h | 1 +
+ 54 files changed, 9390 insertions(+), 742 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra114-pinmux.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
+ create mode 100644 drivers/base/pinctrl.c
+ delete mode 100644 drivers/gpio/gpio-ab8500.c
+ create mode 100644 drivers/pinctrl/pinctrl-ab8500.c
+ create mode 100644 drivers/pinctrl/pinctrl-ab8505.c
+ create mode 100644 drivers/pinctrl/pinctrl-ab8540.c
+ create mode 100644 drivers/pinctrl/pinctrl-ab9540.c
+ create mode 100644 drivers/pinctrl/pinctrl-abx500.c
+ create mode 100644 drivers/pinctrl/pinctrl-abx500.h
+ create mode 100644 drivers/pinctrl/pinctrl-sunxi.c
+ create mode 100644 drivers/pinctrl/pinctrl-sunxi.h
+ create mode 100644 drivers/pinctrl/pinctrl-tegra114.c
+ create mode 100644 include/linux/pinctrl/devinfo.h
+Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency)
+$ git merge vhost/linux-next
+Auto-merging drivers/vhost/Kconfig
+Merge made by the 'recursive' strategy.
+ 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 (e9a65bb gpio: using common order: let 'static const' instead of 'const static')
+$ git merge gpio/gpio/next
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/gpio-mxs.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-pxa/tosa.c | 6 -
+ drivers/gpio/Kconfig | 11 +
+ drivers/gpio/Makefile | 4 +-
+ drivers/gpio/gpio-langwell.c | 53 ++-
+ drivers/gpio/gpio-lynxpoint.c | 469 ++++++++++++++++++++++++++
+ drivers/gpio/gpio-mpc8xxx.c | 1 -
+ drivers/gpio/gpio-mxs.c | 31 ++
+ drivers/gpio/gpio-omap.c | 6 +-
+ drivers/gpio/gpio-pca953x.c | 380 +++++++++++----------
+ drivers/gpio/gpio-pl061.c | 2 +-
+ drivers/gpio/gpio-pxa.c | 7 +-
+ drivers/gpio/gpio-twl4030.c | 176 ++++++----
+ drivers/gpio/gpio-vt8500.c | 65 +++-
+ drivers/gpio/gpiolib-acpi.c | 87 +++++
+ drivers/gpio/gpiolib.c | 759 +++++++++++++++++++++++++-----------------
+ include/asm-generic/gpio.h | 86 +++--
+ include/linux/acpi_gpio.h | 4 +
+ include/linux/gpio.h | 28 +-
+ 18 files changed, 1506 insertions(+), 669 deletions(-)
+ create mode 100644 drivers/gpio/gpio-lynxpoint.c
+Merging gpio-lw/for-next (c7886b1 gpio: em: Use irq_domain_add_simple() to fix runtime error)
+$ git merge gpio-lw/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpio/gpio-em.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging arm-soc/for-next (84f4327 Merge branch 'next/dt' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging sound/soc/tegra/tegra30_ahub.c
+Auto-merging kernel/time/timekeeping.c
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging include/linux/time.h
+Auto-merging include/linux/mfd/dbx500-prcmu.h
+Auto-merging include/linux/irqchip/arm-vic.h
+Auto-merging include/linux/irqchip/arm-gic.h
+Auto-merging include/linux/clk/tegra.h
+Removing include/clocksource/arm_generic.h
+Auto-merging drivers/w1/masters/mxc_w1.c
+Auto-merging drivers/staging/nvec/nvec.c
+Auto-merging drivers/spi/spi-tegra20-slink.c
+Auto-merging drivers/spi/spi-tegra20-sflash.c
+Removing drivers/sh/pfc/Makefile
+Removing drivers/sh/pfc/Kconfig
+Auto-merging drivers/rtc/Kconfig
+Auto-merging drivers/remoteproc/Kconfig
+Auto-merging drivers/pinctrl/sh-pfc/sh_pfc.h
+Auto-merging drivers/pinctrl/sh-pfc/pinctrl.c
+Auto-merging drivers/pinctrl/sh-pfc/pfc-sh73a0.c
+Auto-merging drivers/pinctrl/sh-pfc/pfc-sh7372.c
+Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+Auto-merging drivers/pinctrl/sh-pfc/gpio.c
+Auto-merging drivers/pinctrl/sh-pfc/core.c
+Auto-merging drivers/pinctrl/pinctrl-samsung.c
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging drivers/pinctrl/Makefile
+Auto-merging drivers/pinctrl/Kconfig
+Auto-merging drivers/net/ethernet/ti/davinci_cpdma.c
+Auto-merging drivers/mtd/nand/omap2.c
+Auto-merging drivers/mtd/nand/fsmc_nand.c
+Auto-merging drivers/mfd/vexpress-sysreg.c
+Auto-merging drivers/mfd/db8500-prcmu.c
+CONFLICT (content): Merge conflict in drivers/mfd/db8500-prcmu.c
+Auto-merging drivers/media/platform/omap3isp/isp.c
+Auto-merging drivers/media/platform/davinci/vpss.c
+Auto-merging drivers/irqchip/irq-vic.c
+Auto-merging drivers/irqchip/irq-gic.c
+Auto-merging drivers/irqchip/Makefile
+CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
+Auto-merging drivers/input/keyboard/tegra-kbc.c
+CONFLICT (content): Merge conflict in drivers/input/keyboard/tegra-kbc.c
+Auto-merging drivers/i2c/busses/i2c-tegra.c
+Auto-merging drivers/gpu/drm/tegra/hdmi.c
+Auto-merging drivers/gpu/drm/tegra/dc.c
+Auto-merging drivers/dma/tegra20-apb-dma.c
+Auto-merging drivers/dma/coh901318_lli.c
+Auto-merging drivers/dma/coh901318.h
+Auto-merging drivers/dma/coh901318.c
+Auto-merging drivers/crypto/omap-sham.c
+CONFLICT (content): Merge conflict in drivers/crypto/omap-sham.c
+Auto-merging drivers/cpuidle/cpuidle-kirkwood.c
+Auto-merging drivers/cpufreq/exynos5250-cpufreq.c
+Auto-merging drivers/cpufreq/exynos4x12-cpufreq.c
+Auto-merging drivers/cpufreq/exynos4210-cpufreq.c
+Auto-merging drivers/cpufreq/exynos-cpufreq.h
+Auto-merging drivers/cpufreq/exynos-cpufreq.c
+Auto-merging drivers/cpufreq/dbx500-cpufreq.c
+Auto-merging drivers/cpufreq/Makefile
+Auto-merging drivers/clocksource/vt8500_timer.c
+Auto-merging drivers/clocksource/tegra20_timer.c
+Removing drivers/clocksource/arm_generic.c
+Auto-merging drivers/clocksource/Makefile
+CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/Kconfig
+CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
+Auto-merging drivers/clk/Makefile
+CONFLICT (content): Merge conflict in drivers/clk/Makefile
+Auto-merging arch/sh/include/cpu-common/cpu/pfc.h
+Auto-merging arch/sh/Kconfig
+Removing arch/arm64/include/asm/arm_generic.h
+Auto-merging arch/arm64/Kconfig
+Removing arch/arm/plat-samsung/include/plat/gpio-fns.h
+Removing arch/arm/plat-s3c24xx/irq.c
+Removing arch/arm/plat-s3c24xx/Makefile
+Removing arch/arm/plat-s3c24xx/Kconfig
+Auto-merging arch/arm/mach-zynq/common.c
+CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c
+Removing arch/arm/mach-vt8500/include/mach/uncompress.h
+Removing arch/arm/mach-vt8500/include/mach/timex.h
+Auto-merging arch/arm/mach-versatile/core.c
+Auto-merging arch/arm/mach-ux500/id.h
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+Removing arch/arm/mach-u300/include/mach/coh901318.h
+Removing arch/arm/mach-u300/dma_channels.h
+Removing arch/arm/mach-tegra/tegra30_clocks_data.c
+Removing arch/arm/mach-tegra/tegra30_clocks.h
+Removing arch/arm/mach-tegra/tegra30_clocks.c
+Removing arch/arm/mach-tegra/tegra20_clocks_data.c
+Removing arch/arm/mach-tegra/tegra20_clocks.h
+Removing arch/arm/mach-tegra/tegra20_clocks.c
+Removing arch/arm/mach-tegra/include/mach/clk.h
+Auto-merging arch/arm/mach-tegra/cpu-tegra.c
+Removing arch/arm/mach-tegra/clock.h
+Removing arch/arm/mach-tegra/clock.c
+Auto-merging arch/arm/mach-spear6xx/spear6xx.c
+CONFLICT (content): Merge conflict in arch/arm/mach-spear6xx/spear6xx.c
+Auto-merging arch/arm/mach-spear3xx/spear3xx.c
+CONFLICT (content): Merge conflict in arch/arm/mach-spear3xx/spear3xx.c
+Auto-merging arch/arm/mach-spear13xx/spear13xx.c
+Auto-merging arch/arm/mach-spear13xx/spear1340.c
+CONFLICT (content): Merge conflict in arch/arm/mach-spear13xx/spear1340.c
+Auto-merging arch/arm/mach-spear13xx/spear1310.c
+Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c
+CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c
+Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
+Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
+CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
+Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
+Auto-merging arch/arm/mach-sa1100/assabet.c
+Auto-merging arch/arm/mach-s5pv210/mach-goni.c
+Removing arch/arm/mach-s5pv210/include/mach/tick.h
+Removing arch/arm/mach-s5pv210/include/mach/regs-sys.h
+Removing arch/arm/mach-s5pv210/include/mach/regs-audss.h
+Removing arch/arm/mach-s5p64x0/include/mach/tick.h
+Auto-merging arch/arm/mach-s5p64x0/i2c.h
+Removing arch/arm/mach-s5p64x0/gpiolib.c
+Auto-merging arch/arm/mach-s5p64x0/clock.h
+Auto-merging arch/arm/mach-s3c64xx/regs-syscon-power.h
+Auto-merging arch/arm/mach-s3c64xx/regs-srom.h
+Auto-merging arch/arm/mach-s3c64xx/regs-modem.h
+Auto-merging arch/arm/mach-s3c64xx/regs-gpio-memport.h
+Removing arch/arm/mach-s3c64xx/include/mach/regs-sys.h
+Auto-merging arch/arm/mach-s3c64xx/dma.c
+CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dma.c
+Auto-merging arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c
+Auto-merging arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c
+Auto-merging arch/arm/mach-s3c24xx/pll-s3c2410.c
+Auto-merging arch/arm/mach-s3c24xx/otom.h
+Auto-merging arch/arm/mach-s3c24xx/osiris.h
+Removing arch/arm/mach-s3c24xx/irq-s3c2443.c
+Removing arch/arm/mach-s3c24xx/irq-s3c2416.c
+Auto-merging arch/arm/mach-s3c24xx/iotiming-s3c2412.c
+Auto-merging arch/arm/mach-s3c24xx/iotiming-s3c2410.c
+Removing arch/arm/mach-s3c24xx/include/mach/vr1000-map.h
+Removing arch/arm/mach-s3c24xx/include/mach/vr1000-irq.h
+Removing arch/arm/mach-s3c24xx/include/mach/vr1000-cpld.h
+Removing arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h
+Removing arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h
+Removing arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h
+Removing arch/arm/mach-s3c24xx/include/mach/regs-s3c2412-mem.h
+Removing arch/arm/mach-s3c24xx/include/mach/regs-power.h
+Removing arch/arm/mach-s3c24xx/include/mach/regs-mem.h
+Removing arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h
+Removing arch/arm/mach-s3c24xx/include/mach/idle.h
+Removing arch/arm/mach-s3c24xx/include/mach/h1940.h
+Removing arch/arm/mach-s3c24xx/include/mach/gpio-track.h
+Removing arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h
+Removing arch/arm/mach-s3c24xx/include/mach/gpio-fns.h
+Removing arch/arm/mach-s3c24xx/include/mach/bast-map.h
+Removing arch/arm/mach-s3c24xx/include/mach/bast-irq.h
+Removing arch/arm/mach-s3c24xx/include/mach/bast-cpld.h
+Removing arch/arm/mach-s3c24xx/include/mach/anubis-map.h
+Removing arch/arm/mach-s3c24xx/include/mach/anubis-irq.h
+Removing arch/arm/mach-s3c24xx/include/mach/anubis-cpld.h
+Auto-merging arch/arm/mach-s3c24xx/h1940.h
+Auto-merging arch/arm/mach-s3c24xx/gta02.h
+Auto-merging arch/arm/mach-s3c24xx/dma.c
+Auto-merging arch/arm/mach-s3c24xx/cpufreq.c
+Auto-merging arch/arm/mach-s3c24xx/cpufreq-utils.c
+Auto-merging arch/arm/mach-s3c24xx/cpufreq-s3c2440.c
+Auto-merging arch/arm/mach-s3c24xxResolved 'arch/arm/mach-omap2/board-3430sdp.c' using previous resolution.
+Resolved 'arch/arm/mach-s3c64xx/dma.c' using previous resolution.
+Resolved 'arch/arm/mach-shmobile/setup-r8a7740.c' using previous resolution.
+Resolved 'arch/arm/mach-shmobile/setup-sh73a0.c' using previous resolution.
+Resolved 'arch/arm/mach-spear13xx/spear1340.c' using previous resolution.
+Resolved 'arch/arm/mach-spear3xx/spear3xx.c' using previous resolution.
+Resolved 'arch/arm/mach-spear6xx/spear6xx.c' using previous resolution.
+Resolved 'arch/arm/mach-zynq/common.c' using previous resolution.
+Resolved 'drivers/clk/Makefile' using previous resolution.
+Resolved 'drivers/clocksource/Kconfig' using previous resolution.
+Resolved 'drivers/clocksource/Makefile' using previous resolution.
+Resolved 'drivers/crypto/omap-sham.c' using previous resolution.
+Resolved 'drivers/input/keyboard/tegra-kbc.c' using previous resolution.
+Resolved 'drivers/irqchip/Makefile' using previous resolution.
+Resolved 'drivers/mfd/db8500-prcmu.c' using previous resolution.
+Resolved 'drivers/pinctrl/pinctrl-nomadik.c' using previous resolution.
+/cpufreq-s3c2412.c
+Auto-merging arch/arm/mach-s3c24xx/cpufreq-s3c2410.c
+Auto-merging arch/arm/mach-s3c24xx/cpufreq-debugfs.c
+Auto-merging arch/arm/mach-s3c24xx/clock-s3c2410.c
+Auto-merging arch/arm/mach-s3c24xx/clock-dclk.c
+Auto-merging arch/arm/mach-s3c24xx/Kconfig
+Removing arch/arm/mach-s3c2440/dsc.c
+Removing arch/arm/mach-s3c2440/Makefile
+Removing arch/arm/mach-s3c2440/Kconfig
+Removing arch/arm/mach-s3c2412/gpio.c
+Removing arch/arm/mach-s3c2412/Makefile
+Removing arch/arm/mach-s3c2412/Kconfig
+Removing arch/arm/mach-s3c2410/Makefile
+Removing arch/arm/mach-s3c2410/Kconfig
+Auto-merging arch/arm/mach-pxa/tosa.c
+Auto-merging arch/arm/mach-pxa/pxa27x.c
+Auto-merging arch/arm/mach-prima2/timer-prima2.c
+Auto-merging arch/arm/mach-omap2/usb-musb.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+Removing arch/arm/mach-omap2/include/mach/uncompress.h
+Auto-merging arch/arm/mach-omap2/gpmc.c
+Auto-merging arch/arm/mach-omap2/devices.c
+Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom-peripherals.c
+Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
+Auto-merging arch/arm/mach-omap2/board-rm680.c
+Auto-merging arch/arm/mach-omap2/board-overo.c
+Auto-merging arch/arm/mach-omap2/board-omap4panda.c
+Auto-merging arch/arm/mach-omap2/board-omap3touchbook.c
+Auto-merging arch/arm/mach-omap2/board-omap3stalker.c
+Auto-merging arch/arm/mach-omap2/board-omap3pandora.c
+Auto-merging arch/arm/mach-omap2/board-omap3logic.c
+Auto-merging arch/arm/mach-omap2/board-omap3evm.c
+Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
+Auto-merging arch/arm/mach-omap2/board-ldp.c
+Auto-merging arch/arm/mach-omap2/board-igep0020.c
+Auto-merging arch/arm/mach-omap2/board-devkit8000.c
+Auto-merging arch/arm/mach-omap2/board-cm-t35.c
+Removing arch/arm/mach-omap2/board-apollon.c
+Auto-merging arch/arm/mach-omap2/board-4430sdp.c
+Auto-merging arch/arm/mach-omap2/board-3430sdp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-3430sdp.c
+Auto-merging arch/arm/mach-omap2/board-2430sdp.c
+Removing arch/arm/mach-nomadik/include/mach/hardware.h
+Removing arch/arm/mach-nomadik/i2c-8815nhk.c
+Removing arch/arm/mach-nomadik/cpu-8815.h
+Removing arch/arm/mach-nomadik/board-nhk8815.c
+Removing arch/arm/mach-imx/mx50.h
+Removing arch/arm/mach-imx/mach-mx51_3ds.c
+Removing arch/arm/mach-imx/mach-mx50_rdp.c
+Removing arch/arm/mach-imx/lluart.c
+Removing arch/arm/mach-imx/iomux-mx50.h
+Removing arch/arm/mach-imx/devices-imx50.h
+Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Auto-merging arch/arm/mach-exynos/mach-exynos5-dt.c
+Auto-merging arch/arm/mach-exynos/mach-exynos4-dt.c
+Removing arch/arm/mach-exynos/include/mach/regs-audss.h
+Removing arch/arm/mach-exynos/include/mach/pmu.h
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+Removing arch/arm/mach-at91/board-neocore926.c
+Auto-merging arch/arm/kernel/smp_twd.c
+Auto-merging arch/arm/kernel/smp.c
+Auto-merging arch/arm/include/debug/vt8500.S
+Auto-merging arch/arm/include/debug/omap2plus.S
+Auto-merging arch/arm/include/asm/memory.h
+Auto-merging arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+Auto-merging arch/arm/boot/dts/imx27-pdk.dts
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/virtual/kvm/api.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/mach-omap2/board-zoom-peripherals.c'.
+[master f38eec04] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/arm/altera/socfpga-system.txt | 2 +
+ .../devicetree/bindings/arm/arch_timer.txt | 7 +-
+ Documentation/devicetree/bindings/arm/armadeus.txt | 6 +
+ Documentation/devicetree/bindings/arm/fsl.txt | 8 +
+ Documentation/devicetree/bindings/arm/sirf.txt | 10 +-
+ .../devicetree/bindings/arm/ste-nomadik.txt | 27 +
+ Documentation/devicetree/bindings/arm/tegra.txt | 32 +-
+ Documentation/devicetree/bindings/arm/vt8500.txt | 8 +
+ Documentation/devicetree/bindings/bus/ti-gpmc.txt | 84 +
+ .../devicetree/bindings/clock/imx31-clock.txt | 91 +
+ .../devicetree/bindings/clock/imx5-clock.txt | 1 +
+ .../devicetree/bindings/clock/imx6q-clock.txt | 2 +
+ .../bindings/clock/nvidia,tegra20-car.txt | 205 ++
+ .../bindings/clock/nvidia,tegra30-car.txt | 262 ++
+ .../devicetree/bindings/mtd/fsmc-nand.txt | 2 +-
+ .../devicetree/bindings/mtd/gpmc-nand.txt | 80 +
+ .../devicetree/bindings/mtd/gpmc-onenand.txt | 43 +
+ .../bindings/pinctrl/samsung-pinctrl.txt | 12 +-
+ .../bindings/usb/nvidia,tegra20-ehci.txt | 3 +
+ .../bindings/usb/nvidia,tegra20-usb-phy.txt | 17 +
+ .../devicetree/bindings/w1/fsl-imx-owire.txt | 19 +
+ Documentation/virtual/kvm/api.txt | 38 +
+ MAINTAINERS | 20 +-
+ arch/arm/Kconfig | 62 +-
+ arch/arm/Kconfig.debug | 119 +-
+ arch/arm/Makefile | 5 +-
+ arch/arm/arm-soc-for-next-contents.txt | 243 ++
+ arch/arm/boot/compressed/decompress.c | 2 -
+ arch/arm/boot/dts/Makefile | 25 +-
+ arch/arm/boot/dts/am33xx.dtsi | 14 +
+ arch/arm/boot/dts/animeo_ip.dts | 4 +
+ arch/arm/boot/dts/at91rm9200.dtsi | 158 ++
+ arch/arm/boot/dts/at91rm9200ek.dts | 5 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 11 +-
+ arch/arm/boot/dts/at91sam9n12ek.dts | 5 +-
+ arch/arm/boot/dts/at91sam9x5.dtsi | 14 +-
+ arch/arm/boot/dts/at91sam9x5cm.dtsi | 5 +-
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 16 +-
+ arch/arm/boot/dts/bcm2835.dtsi | 44 +
+ arch/arm/boot/dts/da850-evm.dts | 20 +
+ arch/arm/boot/dts/da850.dtsi | 70 +-
+ arch/arm/boot/dts/dove.dtsi | 2 +
+ arch/arm/boot/dts/emev2-kzm9d.dts | 2 +-
+ arch/arm/boot/dts/emev2.dtsi | 7 +
+ arch/arm/boot/dts/exynos4210.dtsi | 6 +-
+ arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4x12.dtsi | 8 +-
+ arch/arm/boot/dts/exynos5440.dtsi | 4 +-
+ arch/arm/boot/dts/imx25-karo-tx25.dts | 30 +-
+ arch/arm/boot/dts/imx25-pdk.dts | 36 +
+ arch/arm/boot/dts/imx25.dtsi | 2 +-
+ arch/arm/boot/dts/imx27-apf27.dts | 82 +-
+ arch/arm/boot/dts/{imx27-3ds.dts => imx27-pdk.dts} | 24 +-
+ arch/arm/boot/dts/imx28-cfa10037.dts | 77 +
+ arch/arm/boot/dts/imx28-cfa10049.dts | 214 +-
+ arch/arm/boot/dts/imx28-m28evk.dts | 1 +
+ arch/arm/boot/dts/imx28.dtsi | 10 +
+ arch/arm/boot/dts/imx31-bug.dts | 12 +-
+ arch/arm/boot/dts/imx31.dtsi | 17 +
+ arch/arm/boot/dts/imx51-apf51.dts | 52 +
+ arch/arm/boot/dts/imx51-babbage.dts | 478 ++--
+ arch/arm/boot/dts/imx51.dtsi | 53 +
+ arch/arm/boot/dts/imx53-ard.dts | 126 +-
+ arch/arm/boot/dts/imx53-evk.dts | 194 +-
+ arch/arm/boot/dts/imx53-mba53.dts | 130 +
+ arch/arm/boot/dts/imx53-qsb.dts | 380 ++-
+ arch/arm/boot/dts/imx53-smd.dts | 294 +-
+ arch/arm/boot/dts/imx53-tqma53.dtsi | 172 ++
+ arch/arm/boot/dts/imx53.dtsi | 68 +
+ arch/arm/boot/dts/imx6dl.dtsi | 59 +
+ arch/arm/boot/dts/imx6q-arm2.dts | 124 +-
+ arch/arm/boot/dts/imx6q-sabreauto.dts | 64 +-
+ arch/arm/boot/dts/imx6q-sabrelite.dts | 216 +-
+ arch/arm/boot/dts/imx6q-sabresd.dts | 102 +-
+ arch/arm/boot/dts/imx6q.dtsi | 796 +-----
+ arch/arm/boot/dts/imx6qdl.dtsi | 800 ++++++
+ arch/arm/boot/dts/marco-evb.dts | 54 +
+ arch/arm/boot/dts/marco.dtsi | 756 ++++++
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 6 +-
+ arch/arm/boot/dts/sh7372-mackerel.dts | 6 +-
+ arch/arm/boot/dts/sh73a0-kzm9g.dts | 6 +-
+ arch/arm/boot/dts/sh73a0-reference.dtsi | 24 +
+ arch/arm/boot/dts/sh73a0.dtsi | 100 +
+ arch/arm/boot/dts/socfpga.dtsi | 22 +-
+ arch/arm/boot/dts/socfpga_cyclone5.dts | 34 +-
+ arch/arm/boot/dts/socfpga_vt.dts | 64 +
+ arch/arm/boot/dts/ste-nomadik-s8815.dts | 30 +
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 256 ++
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 26 +
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 30 +
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 20 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 21 +
+ arch/arm/boot/dts/tegra114-pluto.dts | 21 +
+ arch/arm/boot/dts/tegra114.dtsi | 153 ++
+ arch/arm/boot/dts/tegra20-colibri-512.dtsi | 491 ++++
+ arch/arm/boot/dts/tegra20-harmony.dts | 124 +-
+ arch/arm/boot/dts/tegra20-iris-512.dts | 89 +
+ arch/arm/boot/dts/tegra20-paz00.dts | 28 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 162 +-
+ arch/arm/boot/dts/tegra20-tamonten.dtsi | 1 -
+ arch/arm/boot/dts/tegra20-trimslice.dts | 15 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 27 +-
+ arch/arm/boot/dts/tegra20-whistler.dts | 15 +-
+ arch/arm/boot/dts/tegra20.dtsi | 168 +-
+ arch/arm/boot/dts/tegra30-beaver.dts | 373 +++
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 15 +-
+ arch/arm/boot/dts/tegra30.dtsi | 157 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 2 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 2 +-
+ arch/arm/boot/dts/wm8850-w70v2.dts | 47 +
+ arch/arm/boot/dts/wm8850.dtsi | 224 ++
+ arch/arm/common/Kconfig | 23 -
+ arch/arm/common/Makefile | 2 -
+ arch/arm/configs/armadillo800eva_defconfig | 10 +-
+ arch/arm/configs/at91sam9263_defconfig | 1 -
+ arch/arm/configs/bcm2835_defconfig | 43 +-
+ arch/arm/configs/da8xx_omapl_defconfig | 4 +
+ arch/arm/configs/davinci_all_defconfig | 3 +
+ arch/arm/configs/dove_defconfig | 28 +-
+ arch/arm/configs/imx_v4_v5_defconfig | 3 +
+ arch/arm/configs/imx_v6_v7_defconfig | 10 +-
+ arch/arm/configs/kirkwood_defconfig | 1 +
+ arch/arm/configs/kota2_defconfig | 2 +-
+ arch/arm/configs/kzm9d_defconfig | 4 +-
+ arch/arm/configs/kzm9g_defconfig | 4 +-
+ arch/arm/configs/mackerel_defconfig | 3 +-
+ arch/arm/configs/marzen_defconfig | 1 -
+ arch/arm/configs/multi_v7_defconfig | 2 +-
+ arch/arm/configs/mvebu_defconfig | 2 +
+ arch/arm/configs/mxs_defconfig | 64 +-
+ arch/arm/configs/omap2plus_defconfig | 31 +-
+ arch/arm/configs/prima2_defconfig | 3 +
+ arch/arm/configs/shark_defconfig | 1 -
+ arch/arm/configs/tegra_defconfig | 6 +
+ arch/arm/configs/u8500_defconfig | 6 +-
+ arch/arm/include/asm/arch_timer.h | 109 +-
+ arch/arm/include/asm/dma.h | 2 +-
+ arch/arm/include/asm/kvm_arch_timer.h | 85 +
+ arch/arm/include/asm/kvm_asm.h | 3 +-
+ arch/arm/include/asm/kvm_host.h | 23 +
+ arch/arm/include/asm/kvm_vgic.h | 221 ++
+ arch/arm/include/asm/mach/arch.h | 3 +-
+ arch/arm/include/asm/mach/irq.h | 1 +
+ arch/arm/include/asm/mach/time.h | 30 -
+ arch/arm/include/asm/memory.h | 2 +
+ arch/arm/include/asm/smp_scu.h | 17 +
+ arch/arm/include/debug/imx-uart.h | 88 +
+ arch/arm/include/debug/imx.S | 29 +-
+ .../debug-macro.S => include/debug/omap2plus.S} | 137 +-
+ .../mach/debug-macro.S => include/debug/vt8500.S} | 24 +-
+ arch/arm/include/uapi/asm/kvm.h | 16 +
+ arch/arm/kernel/arch_timer.c | 505 +---
+ arch/arm/kernel/asm-offsets.c | 18 +
+ arch/arm/kernel/irq.c | 10 +
+ arch/arm/kernel/smp.c | 3 +-
+ arch/arm/kernel/smp_twd.c | 1 -
+ arch/arm/kernel/time.c | 53 +-
+ arch/arm/kvm/Kconfig | 16 +
+ arch/arm/kvm/Makefile | 2 +
+ arch/arm/kvm/arch_timer.c | 271 ++
+ arch/arm/kvm/arm.c | 178 +-
+ arch/arm/kvm/coproc.c | 4 +
+ arch/arm/kvm/interrupts.S | 6 +
+ arch/arm/kvm/interrupts_head.S | 164 ++
+ arch/arm/kvm/mmio.c | 3 +
+ arch/arm/kvm/vgic.c | 1506 +++++++++++
+ arch/arm/mach-at91/Kconfig | 6 -
+ arch/arm/mach-at91/Makefile | 1 -
+ arch/arm/mach-at91/at91rm9200.c | 2 +
+ arch/arm/mach-at91/at91rm9200_time.c | 12 +-
+ arch/arm/mach-at91/at91sam926x_time.c | 53 +-
+ arch/arm/mach-at91/at91x40_time.c | 13 +-
+ arch/arm/mach-at91/board-1arm.c | 2 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c | 2 +-
+ arch/arm/mach-at91/board-cam60.c | 2 +-
+ arch/arm/mach-at91/board-carmeva.c | 2 +-
+ arch/arm/mach-at91/board-cpu9krea.c | 2 +-
+ arch/arm/mach-at91/board-cpuat91.c | 2 +-
+ arch/arm/mach-at91/board-csb337.c | 2 +-
+ arch/arm/mach-at91/board-csb637.c | 2 +-
+ arch/arm/mach-at91/board-dt.c | 2 +-
+ arch/arm/mach-at91/board-eb01.c | 2 +-
+ arch/arm/mach-at91/board-eb9200.c | 2 +-
+ arch/arm/mach-at91/board-ecbat91.c | 2 +-
+ arch/arm/mach-at91/board-eco920.c | 2 +-
+ arch/arm/mach-at91/board-flexibity.c | 2 +-
+ arch/arm/mach-at91/board-foxg20.c | 2 +-
+ arch/arm/mach-at91/board-gsia18s.c | 2 +-
+ arch/arm/mach-at91/board-kafa.c | 2 +-
+ arch/arm/mach-at91/board-kb9202.c | 2 +-
+ arch/arm/mach-at91/board-neocore926.c | 387 ---
+ arch/arm/mach-at91/board-pcontrol-g20.c | 2 +-
+ arch/arm/mach-at91/board-picotux200.c | 2 +-
+ arch/arm/mach-at91/board-qil-a9260.c | 2 +-
+ arch/arm/mach-at91/board-rm9200-dt.c | 2 +-
+ arch/arm/mach-at91/board-rm9200dk.c | 2 +-
+ arch/arm/mach-at91/board-rm9200ek.c | 2 +-
+ arch/arm/mach-at91/board-rsi-ews.c | 2 +-
+ arch/arm/mach-at91/board-sam9-l9260.c | 2 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9g20ek.c | 4 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 2 +-
+ arch/arm/mach-at91/board-snapper9260.c | 2 +-
+ arch/arm/mach-at91/board-stamp9g20.c | 4 +-
+ arch/arm/mach-at91/board-usb-a926x.c | 6 +-
+ arch/arm/mach-at91/board-yl-9200.c | 2 +-
+ arch/arm/mach-at91/generic.h | 7 +-
+ arch/arm/mach-at91/include/mach/uncompress.h | 2 -
+ arch/arm/mach-bcm/Kconfig | 1 -
+ arch/arm/mach-bcm/board_bcm.c | 22 +-
+ arch/arm/mach-bcm2835/bcm2835.c | 32 +-
+ arch/arm/mach-bcm2835/include/mach/uncompress.h | 1 -
+ arch/arm/mach-clps711x/board-autcpu12.c | 2 +-
+ arch/arm/mach-clps711x/board-cdb89712.c | 2 +-
+ arch/arm/mach-clps711x/board-clep7312.c | 2 +-
+ arch/arm/mach-clps711x/board-edb7211.c | 2 +-
+ arch/arm/mach-clps711x/board-fortunet.c | 2 +-
+ arch/arm/mach-clps711x/board-p720t.c | 2 +-
+ arch/arm/mach-clps711x/common.c | 6 +-
+ arch/arm/mach-clps711x/common.h | 4 +-
+ arch/arm/mach-clps711x/include/mach/uncompress.h | 2 -
+ arch/arm/mach-cns3xxx/cns3420vb.c | 4 +-
+ arch/arm/mach-cns3xxx/core.c | 21 +-
+ arch/arm/mach-cns3xxx/core.h | 2 +-
+ arch/arm/mach-cns3xxx/include/mach/uncompress.h | 1 -
+ arch/arm/mach-davinci/Kconfig | 1 +
+ arch/arm/mach-davinci/board-da830-evm.c | 11 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 113 +-
+ arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 4 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 11 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 2 +-
+ arch/arm/mach-davinci/board-omapl138-hawk.c | 32 +-
+ arch/arm/mach-davinci/board-sffsdr.c | 2 +-
+ arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +-
+ arch/arm/mach-davinci/clock.c | 39 +-
+ arch/arm/mach-davinci/clock.h | 3 +
+ arch/arm/mach-davinci/da850.c | 17 +
+ arch/arm/mach-davinci/da8xx-dt.c | 11 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 28 +-
+ arch/arm/mach-davinci/include/mach/clock.h | 3 +
+ arch/arm/mach-davinci/include/mach/common.h | 4 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 5 +-
+ arch/arm/mach-davinci/include/mach/psc.h | 3 +
+ arch/arm/mach-davinci/include/mach/uncompress.h | 1 -
+ arch/arm/mach-davinci/psc.c | 29 +-
+ arch/arm/mach-davinci/time.c | 7 +-
+ arch/arm/mach-dove/cm-a510.c | 2 +-
+ arch/arm/mach-dove/common.c | 37 +-
+ arch/arm/mach-dove/common.h | 2 +-
+ arch/arm/mach-dove/dove-db-setup.c | 2 +-
+ arch/arm/mach-dove/include/mach/uncompress.h | 1 -
+ arch/arm/mach-ebsa110/core.c | 15 +-
+ arch/arm/mach-ebsa110/include/mach/uncompress.h | 1 -
+ arch/arm/mach-ep93xx/adssphere.c | 4 +-
+ arch/arm/mach-ep93xx/core.c | 38 +-
+ arch/arm/mach-ep93xx/edb93xx.c | 25 +-
+ arch/arm/mach-ep93xx/gesbc9312.c | 4 +-
+ arch/arm/mach-ep93xx/include/mach/platform.h | 2 +-
+ arch/arm/mach-ep93xx/include/mach/uncompress.h | 2 -
+ arch/arm/mach-ep93xx/micro9.c | 13 +-
+ arch/arm/mach-ep93xx/simone.c | 4 +-
+ arch/arm/mach-ep93xx/snappercl15.c | 4 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 4 +-
+ arch/arm/mach-ep93xx/vision_ep9307.c | 4 +-
+ arch/arm/mach-exynos/common.c | 233 +-
+ arch/arm/mach-exynos/common.h | 25 +-
+ arch/arm/mach-exynos/cpuidle.c | 3 +-
+ arch/arm/mach-exynos/dev-audio.c | 3 +-
+ arch/arm/mach-exynos/include/mach/pmu.h | 34 -
+ arch/arm/mach-exynos/include/mach/regs-audss.h | 18 -
+ arch/arm/mach-exynos/include/mach/regs-irq.h | 2 +-
+ arch/arm/mach-exynos/mach-armlex4210.c | 4 +-
+ arch/arm/mach-exynos/mach-exynos4-dt.c | 4 +-
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 4 +-
+ arch/arm/mach-exynos/mach-nuri.c | 4 +-
+ arch/arm/mach-exynos/mach-origen.c | 4 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 7 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 7 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 4 +-
+ arch/arm/mach-exynos/mct.c | 25 +-
+ arch/arm/mach-exynos/platsmp.c | 6 +-
+ arch/arm/mach-exynos/pm.c | 9 +-
+ arch/arm/mach-exynos/pmu.c | 3 +-
+ arch/arm/mach-footbridge/cats-hw.c | 2 +-
+ arch/arm/mach-footbridge/common.h | 4 +-
+ arch/arm/mach-footbridge/dc21285-timer.c | 12 +-
+ arch/arm/mach-footbridge/ebsa285.c | 2 +-
+ arch/arm/mach-footbridge/include/mach/uncompress.h | 1 -
+ arch/arm/mach-footbridge/isa-timer.c | 6 +-
+ arch/arm/mach-footbridge/netwinder-hw.c | 2 +-
+ arch/arm/mach-footbridge/personal.c | 2 +-
+ arch/arm/mach-gemini/board-nas4220b.c | 6 +-
+ arch/arm/mach-gemini/board-rut1xx.c | 6 +-
+ arch/arm/mach-gemini/board-wbd111.c | 6 +-
+ arch/arm/mach-gemini/board-wbd222.c | 6 +-
+ arch/arm/mach-gemini/include/mach/uncompress.h | 2 -
+ arch/arm/mach-h720x/common.c | 6 +-
+ arch/arm/mach-h720x/common.h | 6 +-
+ arch/arm/mach-h720x/cpu-h7201.c | 9 +-
+ arch/arm/mach-h720x/cpu-h7202.c | 9 +-
+ arch/arm/mach-h720x/h7201-eval.c | 2 +-
+ arch/arm/mach-h720x/h7202-eval.c | 2 +-
+ arch/arm/mach-h720x/include/mach/uncompress.h | 1 -
+ arch/arm/mach-highbank/highbank.c | 17 +-
+ arch/arm/mach-highbank/platsmp.c | 6 +-
+ arch/arm/mach-imx/Kconfig | 38 +-
+ arch/arm/mach-imx/Makefile | 9 +-
+ arch/arm/mach-imx/Makefile.boot | 4 -
+ arch/arm/mach-imx/clk-imx27.c | 7 +-
+ arch/arm/mach-imx/clk-imx31.c | 15 +-
+ arch/arm/mach-imx/clk-imx35.c | 4 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c | 4 +-
+ arch/arm/mach-imx/clk-imx6q.c | 38 +-
+ arch/arm/mach-imx/common.h | 15 +-
+ arch/arm/mach-imx/cpu-imx5.c | 39 -
+ arch/arm/mach-imx/cpuidle-imx6q.c | 95 +
+ arch/arm/mach-imx/cpuidle.h | 5 +
+ arch/arm/mach-imx/devices-imx50.h | 33 -
+ arch/arm/mach-imx/devices/Kconfig | 2 +-
+ arch/arm/mach-imx/devices/platform-fec.c | 6 -
+ arch/arm/mach-imx/devices/platform-imx-i2c.c | 10 -
+ arch/arm/mach-imx/devices/platform-imx-uart.c | 12 -
+ arch/arm/mach-imx/epit.c | 15 +-
+ arch/arm/mach-imx/gpc.c | 7 +-
+ arch/arm/mach-imx/hardware.h | 6 -
+ arch/arm/mach-imx/headsmp.S | 47 -
+ arch/arm/mach-imx/imx25-dt.c | 11 +-
+ arch/arm/mach-imx/imx27-dt.c | 16 +-
+ arch/arm/mach-imx/imx31-dt.c | 33 +-
+ arch/arm/mach-imx/imx51-dt.c | 16 +-
+ arch/arm/mach-imx/iomux-mx50.h | 977 -------
+ arch/arm/mach-imx/lluart.c | 47 -
+ arch/arm/mach-imx/mach-apf9328.c | 6 +-
+ arch/arm/mach-imx/mach-armadillo5x0.c | 6 +-
+ arch/arm/mach-imx/mach-bug.c | 6 +-
+ arch/arm/mach-imx/mach-cpuimx27.c | 6 +-
+ arch/arm/mach-imx/mach-cpuimx35.c | 6 +-
+ arch/arm/mach-imx/mach-cpuimx51sd.c | 6 +-
+ arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 6 +-
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +-
+ arch/arm/mach-imx/mach-imx27ipcam.c | 6 +-
+ arch/arm/mach-imx/mach-imx27lite.c | 6 +-
+ arch/arm/mach-imx/mach-imx53.c | 16 +-
+ arch/arm/mach-imx/mach-imx6q.c | 98 +-
+ arch/arm/mach-imx/mach-kzm_arm11_01.c | 6 +-
+ arch/arm/mach-imx/mach-mx1ads.c | 8 +-
+ arch/arm/mach-imx/mach-mx21ads.c | 6 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c | 6 +-
+ arch/arm/mach-imx/mach-mx27_3ds.c | 6 +-
+ arch/arm/mach-imx/mach-mx27ads.c | 6 +-
+ arch/arm/mach-imx/mach-mx31_3ds.c | 6 +-
+ arch/arm/mach-imx/mach-mx31ads.c | 6 +-
+ arch/arm/mach-imx/mach-mx31lilly.c | 6 +-
+ arch/arm/mach-imx/mach-mx31lite.c | 6 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 6 +-
+ arch/arm/mach-imx/mach-mx35_3ds.c | 6 +-
+ arch/arm/mach-imx/mach-mx50_rdp.c | 225 --
+ arch/arm/mach-imx/mach-mx51_3ds.c | 178 --
+ arch/arm/mach-imx/mach-mx51_babbage.c | 6 +-
+ arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
+ arch/arm/mach-imx/mach-pca100.c | 6 +-
+ arch/arm/mach-imx/mach-pcm037.c | 6 +-
+ arch/arm/mach-imx/mach-pcm038.c | 6 +-
+ arch/arm/mach-imx/mach-pcm043.c | 6 +-
+ arch/arm/mach-imx/mach-qong.c | 6 +-
+ arch/arm/mach-imx/mach-scb9328.c | 6 +-
+ arch/arm/mach-imx/mach-vpr200.c | 6 +-
+ arch/arm/mach-imx/mm-imx5.c | 48 -
+ arch/arm/mach-imx/mx50.h | 290 --
+ arch/arm/mach-imx/mxc.h | 13 -
+ arch/arm/mach-imx/platsmp.c | 14 +-
+ arch/arm/mach-imx/pm-imx5.c | 7 +-
+ arch/arm/mach-imx/time.c | 18 +-
+ arch/arm/mach-integrator/common.h | 5 -
+ arch/arm/mach-integrator/core.c | 2 +-
+ arch/arm/mach-integrator/include/mach/uncompress.h | 2 -
+ arch/arm/mach-integrator/integrator_ap.c | 20 +-
+ arch/arm/mach-integrator/integrator_cp.c | 18 +-
+ arch/arm/mach-iop13xx/include/mach/uncompress.h | 1 -
+ arch/arm/mach-iop13xx/iq81340mc.c | 6 +-
+ arch/arm/mach-iop13xx/iq81340sc.c | 6 +-
+ arch/arm/mach-iop32x/em7210.c | 6 +-
+ arch/arm/mach-iop32x/glantank.c | 6 +-
+ arch/arm/mach-iop32x/include/mach/uncompress.h | 1 -
+ arch/arm/mach-iop32x/iq31244.c | 8 +-
+ arch/arm/mach-iop32x/iq80321.c | 6 +-
+ arch/arm/mach-iop32x/n2100.c | 6 +-
+ arch/arm/mach-iop33x/include/mach/uncompress.h | 1 -
+ arch/arm/mach-iop33x/iq80331.c | 6 +-
+ arch/arm/mach-iop33x/iq80332.c | 6 +-
+ arch/arm/mach-ixp4xx/avila-setup.c | 4 +-
+ arch/arm/mach-ixp4xx/common.c | 15 +-
+ arch/arm/mach-ixp4xx/coyote-setup.c | 4 +-
+ arch/arm/mach-ixp4xx/dsmg600-setup.c | 6 +-
+ arch/arm/mach-ixp4xx/fsg-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +-
+ arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/include/mach/platform.h | 3 -
+ arch/arm/mach-ixp4xx/include/mach/uncompress.h | 2 -
+ arch/arm/mach-ixp4xx/ixdp425-setup.c | 8 +-
+ arch/arm/mach-ixp4xx/nas100d-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/nslu2-setup.c | 6 +-
+ arch/arm/mach-ixp4xx/omixp-setup.c | 6 +-
+ arch/arm/mach-ixp4xx/vulcan-setup.c | 2 +-
+ arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +-
+ arch/arm/mach-kirkwood/Makefile | 1 -
+ arch/arm/mach-kirkwood/board-dt.c | 4 +-
+ arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
+ arch/arm/mach-kirkwood/board-mplcec4.c | 1 -
+ arch/arm/mach-kirkwood/board-nsa310.c | 10 +-
+ arch/arm/mach-kirkwood/common.c | 29 +-
+ arch/arm/mach-kirkwood/common.h | 3 +-
+ arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
+ arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
+ arch/arm/mach-kirkwood/dockstar-setup.c | 3 +-
+ arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
+ arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +-
+ arch/arm/mach-kirkwood/include/mach/uncompress.h | 1 -
+ arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
+ arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +-
+ arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +-
+ arch/arm/mach-kirkwood/openrd-setup.c | 6 +-
+ arch/arm/mach-kirkwood/pcie.c | 10 +-
+ arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
+ arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
+ arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +-
+ arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
+ arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
+ arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
+ arch/arm/mach-ks8695/board-acs5k.c | 2 +-
+ arch/arm/mach-ks8695/board-dsm320.c | 2 +-
+ arch/arm/mach-ks8695/board-micrel.c | 2 +-
+ arch/arm/mach-ks8695/board-og.c | 10 +-
+ arch/arm/mach-ks8695/board-sg.c | 6 +-
+ arch/arm/mach-ks8695/generic.h | 2 +-
+ arch/arm/mach-ks8695/include/mach/uncompress.h | 1 -
+ arch/arm/mach-ks8695/time.c | 6 +-
+ arch/arm/mach-lpc32xx/common.h | 2 +-
+ arch/arm/mach-lpc32xx/include/mach/uncompress.h | 1 -
+ arch/arm/mach-lpc32xx/phy3250.c | 2 +-
+ arch/arm/mach-lpc32xx/timer.c | 16 +-
+ arch/arm/mach-mmp/aspenite.c | 4 +-
+ arch/arm/mach-mmp/avengers_lite.c | 2 +-
+ arch/arm/mach-mmp/brownstone.c | 2 +-
+ arch/arm/mach-mmp/common.h | 2 -
+ arch/arm/mach-mmp/flint.c | 2 +-
+ arch/arm/mach-mmp/gplugd.c | 2 +-
+ arch/arm/mach-mmp/include/mach/mmp2.h | 4 +-
+ arch/arm/mach-mmp/include/mach/pxa168.h | 4 +-
+ arch/arm/mach-mmp/include/mach/pxa910.h | 4 +-
+ arch/arm/mach-mmp/include/mach/uncompress.h | 6 -
+ arch/arm/mach-mmp/jasper.c | 2 +-
+ arch/arm/mach-mmp/mmp-dt.c | 8 +-
+ arch/arm/mach-mmp/mmp2-dt.c | 6 +-
+ arch/arm/mach-mmp/mmp2.c | 6 +-
+ arch/arm/mach-mmp/pxa168.c | 6 +-
+ arch/arm/mach-mmp/pxa910.c | 6 +-
+ arch/arm/mach-mmp/tavorevb.c | 2 +-
+ arch/arm/mach-mmp/teton_bga.c | 2 +-
+ arch/arm/mach-mmp/time.c | 7 +-
+ arch/arm/mach-mmp/ttc_dkb.c | 2 +-
+ arch/arm/mach-msm/board-dt-8660.c | 18 +-
+ arch/arm/mach-msm/board-dt-8960.c | 18 +-
+ arch/arm/mach-msm/board-halibut.c | 2 +-
+ arch/arm/mach-msm/board-mahimahi.c | 4 +-
+ arch/arm/mach-msm/board-msm7x30.c | 6 +-
+ arch/arm/mach-msm/board-qsd8x50.c | 4 +-
+ arch/arm/mach-msm/board-sapphire.c | 4 +-
+ arch/arm/mach-msm/board-trout.c | 2 +-
+ arch/arm/mach-msm/common.h | 8 +-
+ arch/arm/mach-msm/include/mach/uncompress.h | 4 -
+ arch/arm/mach-msm/platsmp.c | 6 +-
+ arch/arm/mach-msm/proc_comm.h | 2 +-
+ arch/arm/mach-msm/timer.c | 31 +-
+ arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
+ arch/arm/mach-mv78xx0/common.c | 6 +-
+ arch/arm/mach-mv78xx0/common.h | 2 +-
+ arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
+ arch/arm/mach-mv78xx0/include/mach/uncompress.h | 1 -
+ arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
+ arch/arm/mach-mvebu/Makefile | 5 +-
+ arch/arm/mach-mvebu/armada-370-xp.c | 6 +-
+ arch/arm/mach-mxs/include/mach/uncompress.h | 1 -
+ arch/arm/mach-mxs/mach-mxs.c | 42 +-
+ arch/arm/mach-mxs/timer.c | 34 +-
+ arch/arm/mach-netx/generic.c | 2 +-
+ arch/arm/mach-netx/generic.h | 3 +-
+ arch/arm/mach-netx/include/mach/uncompress.h | 1 -
+ arch/arm/mach-netx/nxdb500.c | 4 +-
+ arch/arm/mach-netx/nxdkn.c | 4 +-
+ arch/arm/mach-netx/nxeb500hmi.c | 4 +-
+ arch/arm/mach-netx/time.c | 16 +-
+ arch/arm/mach-nomadik/Kconfig | 10 +-
+ arch/arm/mach-nomadik/Makefile | 6 -
+ arch/arm/mach-nomadik/board-nhk8815.c | 359 ---
+ arch/arm/mach-nomadik/cpu-8815.c | 358 ++-
+ arch/arm/mach-nomadik/cpu-8815.h | 4 -
+ arch/arm/mach-nomadik/i2c-8815nhk.c | 88 -
+ arch/arm/mach-nomadik/include/mach/hardware.h | 90 -
+ arch/arm/mach-nomadik/include/mach/irqs.h | 2 -
+ arch/arm/mach-nomadik/include/mach/uncompress.h | 3 -
+ arch/arm/mach-omap1/board-ams-delta.c | 2 +-
+ arch/arm/mach-omap1/board-fsample.c | 2 +-
+ arch/arm/mach-omap1/board-generic.c | 2 +-
+ arch/arm/mach-omap1/board-h2.c | 2 +-
+ arch/arm/mach-omap1/board-h3.c | 2 +-
+ arch/arm/mach-omap1/board-htcherald.c | 2 +-
+ arch/arm/mach-omap1/board-innovator.c | 2 +-
+ arch/arm/mach-omap1/board-nokia770.c | 45 +-
+ arch/arm/mach-omap1/board-osk.c | 2 +-
+ arch/arm/mach-omap1/board-palmte.c | 2 +-
+ arch/arm/mach-omap1/board-palmtt.c | 2 +-
+ arch/arm/mach-omap1/board-palmz71.c | 2 +-
+ arch/arm/mach-omap1/board-perseus2.c | 2 +-
+ arch/arm/mach-omap1/board-sx1.c | 2 +-
+ arch/arm/mach-omap1/board-voiceblue.c | 2 +-
+ arch/arm/mach-omap1/common.h | 2 +-
+ arch/arm/mach-omap1/dma.c | 18 +-
+ arch/arm/mach-omap1/i2c.c | 6 +
+ arch/arm/mach-omap1/include/mach/uncompress.h | 5 -
+ arch/arm/mach-omap1/time.c | 17 +-
+ arch/arm/mach-omap1/timer32k.c | 12 +-
+ arch/arm/mach-omap2/Kconfig | 33 +-
+ arch/arm/mach-omap2/Makefile | 7 +-
+ arch/arm/mach-omap2/am33xx-restart.c | 34 +
+ arch/arm/mach-omap2/am35xx-emac.c | 3 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 2 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 22 +-
+ arch/arm/mach-omap2/board-3630sdp.c | 2 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 35 +-
+ arch/arm/mach-omap2/board-am3517crane.c | 61 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 2 +-
+ arch/arm/mach-omap2/board-apollon.c | 342 ---
+ arch/arm/mach-omap2/board-cm-t35.c | 6 +-
+ arch/arm/mach-omap2/board-cm-t3517.c | 29 +-
+ arch/arm/mach-omap2/board-devkit8000.c | 4 +-
+ arch/arm/mach-omap2/board-generic.c | 18 +-
+ arch/arm/mach-omap2/board-h4.c | 2 +-
+ arch/arm/mach-omap2/board-igep0020.c | 22 +-
+ arch/arm/mach-omap2/board-ldp.c | 2 +-
+ arch/arm/mach-omap2/board-n8x0.c | 6 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 45 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 4 +-
+ arch/arm/mach-omap2/board-omap3logic.c | 4 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 5 +-
+ arch/arm/mach-omap2/board-overo.c | 4 +-
+ arch/arm/mach-omap2/board-rm680.c | 4 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 20 +
+ arch/arm/mach-omap2/board-rx51-video.c | 3 +-
+ arch/arm/mach-omap2/board-rx51.c | 2 +-
+ arch/arm/mach-omap2/board-ti8168evm.c | 4 +-
+ arch/arm/mach-omap2/board-zoom-peripherals.c | 39 +-
+ arch/arm/mach-omap2/board-zoom.c | 4 +-
+ arch/arm/mach-omap2/cclock2420_data.c | 16 +-
+ arch/arm/mach-omap2/cclock2430_data.c | 16 +-
+ arch/arm/mach-omap2/cclock33xx_data.c | 10 +-
+ arch/arm/mach-omap2/cclock3xxx_data.c | 10 +-
+ arch/arm/mach-omap2/cclock44xx_data.c | 591 +---
+ arch/arm/mach-omap2/clock.h | 11 +
+ arch/arm/mach-omap2/clock2xxx.c | 2 +-
+ arch/arm/mach-omap2/clock3xxx.c | 2 +-
+ arch/arm/mach-omap2/clockdomain.c | 569 ++--
+ arch/arm/mach-omap2/clockdomain.h | 17 +-
+ arch/arm/mach-omap2/cm2xxx.c | 33 +-
+ arch/arm/mach-omap2/cm33xx.c | 3 -
+ arch/arm/mach-omap2/cm33xx.h | 9 +-
+ arch/arm/mach-omap2/cm3xxx.c | 14 +-
+ arch/arm/mach-omap2/cminst44xx.c | 2 +-
+ arch/arm/mach-omap2/common.h | 22 +-
+ arch/arm/mach-omap2/cpuidle34xx.c | 79 +-
+ arch/arm/mach-omap2/devices.c | 31 +-
+ arch/arm/mach-omap2/display.c | 2 +-
+ arch/arm/mach-omap2/dma.c | 25 +-
+ arch/arm/mach-omap2/dpll3xxx.c | 5 +-
+ arch/arm/mach-omap2/drm.c | 5 +-
+ arch/arm/mach-omap2/emu.c | 2 +-
+ arch/arm/mach-omap2/fb.c | 4 +-
+ arch/arm/mach-omap2/gpio.c | 8 +-
+ arch/arm/mach-omap2/gpmc-nand.c | 15 +-
+ arch/arm/mach-omap2/gpmc-onenand.c | 2 +-
+ arch/arm/mach-omap2/gpmc.c | 241 +-
+ arch/arm/mach-omap2/hdq1w.c | 5 +-
+ arch/arm/mach-omap2/hsmmc.c | 2 +-
+ arch/arm/mach-omap2/hwspinlock.c | 6 +-
+ arch/arm/mach-omap2/i2c.c | 8 +-
+ arch/arm/mach-omap2/id.c | 14 +-
+ arch/arm/mach-omap2/include/mach/serial.h | 37 -
+ arch/arm/mach-omap2/include/mach/uncompress.h | 176 --
+ arch/arm/mach-omap2/mcbsp.c | 5 +-
+ arch/arm/mach-omap2/msdi.c | 2 +-
+ arch/arm/mach-omap2/omap-iommu.c | 6 +-
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 44 +-
+ arch/arm/mach-omap2/omap-smp.c | 8 +-
+ arch/arm/mach-omap2/omap-wakeupgen.c | 17 +-
+ arch/arm/mach-omap2/omap2-restart.c | 3 +-
+ arch/arm/mach-omap2/omap4-common.c | 15 +-
+ arch/arm/mach-omap2/omap44xx.h | 1 -
+ arch/arm/mach-omap2/omap_device.c | 542 +---
+ arch/arm/mach-omap2/omap_device.h | 79 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 33 +-
+ arch/arm/mach-omap2/omap_hwmod.h | 17 +
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 7 +-
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 443 +--
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 150 +-
+ arch/arm/mach-omap2/omap_hwmod_reset.c | 53 +
+ arch/arm/mach-omap2/omap_phy_internal.c | 2 +-
+ arch/arm/mach-omap2/opp3xxx_data.c | 2 +-
+ arch/arm/mach-omap2/opp4xxx_data.c | 2 +-
+ arch/arm/mach-omap2/pm-debug.c | 8 +-
+ arch/arm/mach-omap2/pm.c | 91 +-
+ arch/arm/mach-omap2/pm.h | 1 -
+ arch/arm/mach-omap2/pm24xx.c | 53 +-
+ arch/arm/mach-omap2/pm44xx.c | 21 +-
+ arch/arm/mach-omap2/pmu.c | 5 +-
+ arch/arm/mach-omap2/powerdomain.c | 232 +-
+ arch/arm/mach-omap2/powerdomain.h | 52 +-
+ arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 4 +-
+ arch/arm/mach-omap2/powerdomains2xxx_data.c | 9 +-
+ arch/arm/mach-omap2/powerdomains3xxx_data.c | 44 +-
+ arch/arm/mach-omap2/prm2xxx_3xxx.c | 3 +-
+ arch/arm/mach-omap2/prm33xx.c | 11 +-
+ arch/arm/mach-omap2/prm33xx.h | 4 +-
+ arch/arm/mach-omap2/prm3xxx.c | 2 +-
+ arch/arm/mach-omap2/prm44xx.c | 2 +-
+ arch/arm/mach-omap2/serial.c | 5 +-
+ arch/arm/mach-omap2/sleep24xx.S | 19 -
+ arch/arm/mach-omap2/smartreflex-class3.c | 3 +-
+ arch/arm/mach-omap2/soc.h | 30 +
+ arch/arm/mach-omap2/sr_device.c | 3 +-
+ arch/arm/mach-omap2/timer.c | 42 +-
+ arch/arm/mach-omap2/twl-common.c | 20 +-
+ arch/arm/mach-omap2/twl-common.h | 3 +-
+ arch/arm/mach-omap2/usb-host.c | 16 +-
+ arch/arm/mach-omap2/usb-musb.c | 2 +-
+ arch/arm/mach-omap2/wd_timer.c | 5 +-
+ arch/arm/mach-orion5x/board-dt.c | 2 +-
+ arch/arm/mach-orion5x/common.c | 6 +-
+ arch/arm/mach-orion5x/common.h | 2 +-
+ arch/arm/mach-orion5x/d2net-setup.c | 4 +-
+ arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
+ arch/arm/mach-orion5x/dns323-setup.c | 2 +-
+ arch/arm/mach-orion5x/include/mach/uncompress.h | 1 -
+ arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +-
+ arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
+ arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
+ arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
+ arch/arm/mach-orion5x/mss2-setup.c | 2 +-
+ arch/arm/mach-orion5x/mv2120-setup.c | 2 +-
+ arch/arm/mach-orion5x/net2big-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
+ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
+ arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts209-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts409-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
+ arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
+ arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
+ arch/arm/mach-picoxcell/Kconfig | 1 -
+ arch/arm/mach-picoxcell/common.c | 17 +-
+ arch/arm/mach-picoxcell/common.h | 2 +-
+ arch/arm/mach-prima2/Kconfig | 10 +
+ arch/arm/mach-prima2/Makefile | 5 +-
+ arch/arm/mach-prima2/common.c | 33 +-
+ arch/arm/mach-prima2/common.h | 15 +-
+ arch/arm/mach-prima2/headsmp.S | 80 +
+ arch/arm/mach-prima2/hotplug.c | 41 +
+ arch/arm/mach-prima2/include/mach/irqs.h | 4 +-
+ arch/arm/mach-prima2/include/mach/uart.h | 6 +
+ arch/arm/mach-prima2/include/mach/uncompress.h | 5 +-
+ arch/arm/mach-prima2/irq.c | 16 +-
+ arch/arm/mach-prima2/l2x0.c | 29 +-
+ arch/arm/mach-prima2/platsmp.c | 157 ++
+ arch/arm/mach-prima2/rstc.c | 45 +-
+ arch/arm/mach-prima2/rtciobrg.c | 1 +
+ arch/arm/mach-prima2/timer-marco.c | 316 +++
+ arch/arm/mach-prima2/{timer.c => timer-prima2.c} | 18 +-
+ arch/arm/mach-pxa/balloon3.c | 2 +-
+ arch/arm/mach-pxa/capc7117.c | 2 +-
+ arch/arm/mach-pxa/cm-x2xx.c | 2 +-
+ arch/arm/mach-pxa/cm-x300.c | 2 +-
+ arch/arm/mach-pxa/colibri-pxa270.c | 4 +-
+ arch/arm/mach-pxa/colibri-pxa300.c | 2 +-
+ arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
+ arch/arm/mach-pxa/corgi.c | 6 +-
+ arch/arm/mach-pxa/csb726.c | 2 +-
+ arch/arm/mach-pxa/em-x270.c | 4 +-
+ arch/arm/mach-pxa/eseries.c | 12 +-
+ arch/arm/mach-pxa/ezx.c | 12 +-
+ arch/arm/mach-pxa/generic.h | 3 +-
+ arch/arm/mach-pxa/gumstix.c | 2 +-
+ arch/arm/mach-pxa/h5000.c | 2 +-
+ arch/arm/mach-pxa/himalaya.c | 2 +-
+ arch/arm/mach-pxa/hx4700.c | 2 +-
+ arch/arm/mach-pxa/icontrol.c | 2 +-
+ arch/arm/mach-pxa/idp.c | 2 +-
+ arch/arm/mach-pxa/include/mach/palmtreo.h | 5 +-
+ arch/arm/mach-pxa/include/mach/smemc.h | 1 +
+ arch/arm/mach-pxa/include/mach/uncompress.h | 5 -
+ arch/arm/mach-pxa/littleton.c | 2 +-
+ arch/arm/mach-pxa/lpd270.c | 2 +-
+ arch/arm/mach-pxa/lubbock.c | 2 +-
+ arch/arm/mach-pxa/magician.c | 2 +-
+ arch/arm/mach-pxa/mainstone.c | 2 +-
+ arch/arm/mach-pxa/mioa701.c | 2 +-
+ arch/arm/mach-pxa/mp900.c | 2 +-
+ arch/arm/mach-pxa/palmld.c | 2 +-
+ arch/arm/mach-pxa/palmt5.c | 2 +-
+ arch/arm/mach-pxa/palmtc.c | 2 +-
+ arch/arm/mach-pxa/palmte2.c | 2 +-
+ arch/arm/mach-pxa/palmtreo.c | 105 +-
+ arch/arm/mach-pxa/palmtx.c | 2 +-
+ arch/arm/mach-pxa/palmz72.c | 2 +-
+ arch/arm/mach-pxa/pcm027.c | 2 +-
+ arch/arm/mach-pxa/poodle.c | 2 +-
+ arch/arm/mach-pxa/pxa-dt.c | 2 +-
+ arch/arm/mach-pxa/pxa27x.c | 1 +
+ arch/arm/mach-pxa/raumfeld.c | 6 +-
+ arch/arm/mach-pxa/saar.c | 2 +-
+ arch/arm/mach-pxa/smemc.c | 15 +-
+ arch/arm/mach-pxa/spitz.c | 10 +-
+ arch/arm/mach-pxa/stargate2.c | 4 +-
+ arch/arm/mach-pxa/tavorevb.c | 2 +-
+ arch/arm/mach-pxa/time.c | 76 +-
+ arch/arm/mach-pxa/tosa.c | 2 +-
+ arch/arm/mach-pxa/trizeps4.c | 4 +-
+ arch/arm/mach-pxa/viper.c | 2 +-
+ arch/arm/mach-pxa/vpac270.c | 2 +-
+ arch/arm/mach-pxa/xcep.c | 2 +-
+ arch/arm/mach-pxa/z2.c | 2 +-
+ arch/arm/mach-pxa/zeus.c | 2 +-
+ arch/arm/mach-pxa/zylonite.c | 2 +-
+ arch/arm/mach-realview/core.c | 1 -
+ arch/arm/mach-realview/include/mach/uncompress.h | 1 -
+ arch/arm/mach-realview/platsmp.c | 3 -
+ arch/arm/mach-realview/realview_eb.c | 9 +-
+ arch/arm/mach-realview/realview_pb1176.c | 9 +-
+ arch/arm/mach-realview/realview_pb11mp.c | 9 +-
+ arch/arm/mach-realview/realview_pba8.c | 9 +-
+ arch/arm/mach-realview/realview_pbx.c | 9 +-
+ arch/arm/mach-rpc/include/mach/uncompress.h | 5 -
+ arch/arm/mach-rpc/riscpc.c | 4 +-
+ arch/arm/mach-rpc/time.c | 13 +-
+ arch/arm/mach-s3c2410/Kconfig | 20 -
+ arch/arm/mach-s3c2410/Makefile | 14 -
+ arch/arm/mach-s3c2412/Kconfig | 13 -
+ arch/arm/mach-s3c2412/Makefile | 12 -
+ arch/arm/mach-s3c2412/gpio.c | 62 -
+ arch/arm/mach-s3c2440/Kconfig | 37 -
+ arch/arm/mach-s3c2440/Makefile | 17 -
+ arch/arm/mach-s3c2440/dsc.c | 54 -
+ arch/arm/mach-s3c24xx/Kconfig | 162 ++
+ arch/arm/mach-s3c24xx/Makefile | 24 +-
+ arch/arm/mach-s3c24xx/anubis.h | 53 +
+ arch/arm/mach-s3c24xx/bast-ide.c | 18 +-
+ arch/arm/mach-s3c24xx/bast-irq.c | 19 +-
+ arch/arm/mach-s3c24xx/bast.h | 197 ++
+ .../{plat-s3c24xx => mach-s3c24xx}/clock-dclk.c | 3 +-
+ .../clock-s3c2410.c} | 3 +-
+ arch/arm/mach-s3c24xx/common-s3c2443.c | 2 +-
+ arch/arm/mach-s3c24xx/common.c | 2 +-
+ arch/arm/mach-s3c24xx/common.h | 2 +
+ .../cpufreq-debugfs.c} | 3 +-
+ .../cpu-freq.c => mach-s3c24xx/cpufreq-s3c2410.c} | 7 +-
+ .../cpu-freq.c => mach-s3c24xx/cpufreq-s3c2412.c} | 9 +-
+ .../cpufreq-s3c2440.c} | 4 +-
+ .../cpufreq-utils.c} | 6 +-
+ .../cpu-freq.c => mach-s3c24xx/cpufreq.c} | 3 +-
+ 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/{plat-s3c24xx => mach-s3c24xx}/dma.c | 3 +-
+ arch/arm/mach-s3c24xx/{include/mach => }/gta02.h | 14 +-
+ arch/arm/mach-s3c24xx/h1940-bluetooth.c | 6 +-
+ .../{include/mach/h1940-latch.h => h1940.h} | 22 +-
+ arch/arm/mach-s3c24xx/include/mach/anubis-cpld.h | 25 -
+ arch/arm/mach-s3c24xx/include/mach/anubis-irq.h | 21 -
+ arch/arm/mach-s3c24xx/include/mach/anubis-map.h | 38 -
+ arch/arm/mach-s3c24xx/include/mach/bast-cpld.h | 53 -
+ arch/arm/mach-s3c24xx/include/mach/bast-irq.h | 29 -
+ arch/arm/mach-s3c24xx/include/mach/bast-map.h | 146 -
+ arch/arm/mach-s3c24xx/include/mach/debug-macro.S | 12 +-
+ arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 4 +-
+ arch/arm/mach-s3c24xx/include/mach/gpio-fns.h | 1 -
+ arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h | 97 -
+ arch/arm/mach-s3c24xx/include/mach/gpio-track.h | 33 -
+ arch/arm/mach-s3c24xx/include/mach/gpio.h | 87 +-
+ arch/arm/mach-s3c24xx/include/mach/h1940.h | 24 -
+ arch/arm/mach-s3c24xx/include/mach/hardware.h | 6 -
+ arch/arm/mach-s3c24xx/include/mach/idle.h | 24 -
+ arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h | 30 -
+ arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 2 -
+ arch/arm/mach-s3c24xx/include/mach/regs-mem.h | 202 --
+ arch/arm/mach-s3c24xx/include/mach/regs-power.h | 40 -
+ .../mach-s3c24xx/include/mach/regs-s3c2412-mem.h | 48 -
+ arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h | 23 -
+ .../mach-s3c24xx/include/mach/regs-s3c2416-mem.h | 30 -
+ arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h | 24 -
+ arch/arm/mach-s3c24xx/include/mach/vr1000-cpld.h | 18 -
+ arch/arm/mach-s3c24xx/include/mach/vr1000-irq.h | 26 -
+ arch/arm/mach-s3c24xx/include/mach/vr1000-map.h | 110 -
+ .../iotiming-s3c2410.c} | 6 +-
+ .../iotiming-s3c2412.c} | 7 +-
+ arch/arm/mach-s3c24xx/irq-pm.c | 41 +-
+ arch/arm/mach-s3c24xx/irq-s3c2412.c | 3 +-
+ arch/arm/mach-s3c24xx/irq-s3c2416.c | 348 ---
+ arch/arm/mach-s3c24xx/irq-s3c2443.c | 281 --
+ arch/arm/mach-s3c24xx/irq.c | 822 ++++++
+ arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-anubis.c | 16 +-
+ arch/arm/mach-s3c24xx/mach-at2440evb.c | 4 +-
+ arch/arm/mach-s3c24xx/mach-bast.c | 53 +-
+ arch/arm/mach-s3c24xx/mach-gta02.c | 60 +-
+ arch/arm/mach-s3c24xx/mach-h1940.c | 39 +-
+ arch/arm/mach-s3c24xx/mach-jive.c | 6 +-
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 3 +-
+ arch/arm/mach-s3c24xx/mach-n30.c | 4 +-
+ arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-osiris.c | 30 +-
+ arch/arm/mach-s3c24xx/mach-otom.c | 22 +-
+ arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-rx1950.c | 33 +-
+ arch/arm/mach-s3c24xx/mach-rx3715.c | 18 +-
+ arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-smdk2413.c | 7 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 5 +-
+ arch/arm/mach-s3c24xx/mach-smdk2440.c | 3 +-
+ arch/arm/mach-s3c24xx/mach-smdk2443.c | 5 +-
+ arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-vr1000.c | 39 +-
+ arch/arm/mach-s3c24xx/mach-vstms.c | 3 +-
+ .../{include/mach/osiris-map.h => osiris.h} | 23 +-
+ .../{include/mach/otom-map.h => otom.h} | 20 +-
+ .../pll.c => mach-s3c24xx/pll-s3c2410.c} | 5 +-
+ .../pll-s3c2440-12000000.c} | 5 +-
+ .../pll-s3c2440-16934400.c} | 5 +-
+ arch/arm/mach-s3c24xx/pm-h1940.S | 2 +-
+ arch/arm/mach-s3c24xx/pm-s3c2410.c | 6 +-
+ arch/arm/mach-s3c24xx/pm-s3c2412.c | 11 +-
+ arch/arm/mach-s3c24xx/pm-s3c2416.c | 6 +-
+ arch/arm/mach-s3c24xx/pm.c | 3 +-
+ .../arm/mach-s3c24xx/{include/mach => }/regs-dsc.h | 0
+ arch/arm/mach-s3c24xx/regs-mem.h | 54 +
+ arch/arm/mach-s3c24xx/s3c2410.c | 4 +-
+ arch/arm/mach-s3c24xx/s3c2412-power.h | 37 +
+ arch/arm/mach-s3c24xx/s3c2412.c | 32 +-
+ arch/arm/mach-s3c24xx/s3c2412.h | 26 +
+ arch/arm/mach-s3c24xx/s3c2416.c | 4 +-
+ arch/arm/mach-s3c24xx/s3c2440.c | 4 +-
+ arch/arm/mach-s3c24xx/s3c2442.c | 4 +-
+ arch/arm/mach-s3c24xx/s3c244x.c | 3 +-
+ arch/arm/mach-s3c24xx/simtec-audio.c | 5 +-
+ arch/arm/mach-s3c24xx/simtec-nor.c | 3 +-
+ arch/arm/mach-s3c24xx/simtec-pm.c | 3 +-
+ arch/arm/mach-s3c24xx/simtec-usb.c | 8 +-
+ arch/arm/mach-s3c24xx/sleep-s3c2410.S | 15 +-
+ arch/arm/mach-s3c24xx/sleep-s3c2412.S | 12 +-
+ arch/arm/mach-s3c24xx/sleep.S | 1 -
+ arch/arm/mach-s3c24xx/vr1000.h | 118 +
+ arch/arm/mach-s3c64xx/clock.c | 3 +-
+ arch/arm/mach-s3c64xx/common.c | 2 +-
+ arch/arm/mach-s3c64xx/cpuidle.c | 4 +-
+ .../arm/mach-s3c64xx/{include/mach => }/crag6410.h | 0
+ arch/arm/mach-s3c64xx/dma.c | 3 +-
+ arch/arm/mach-s3c64xx/include/mach/regs-irq.h | 1 -
+ arch/arm/mach-s3c64xx/include/mach/regs-sys.h | 31 -
+ arch/arm/mach-s3c64xx/include/mach/tick.h | 2 +
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 6 +-
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 13 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 8 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 8 +-
+ arch/arm/mach-s3c64xx/mach-smartq.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-smdk6400.c | 4 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 10 +-
+ arch/arm/mach-s3c64xx/pm.c | 12 +-
+ .../{include/mach => }/regs-gpio-memport.h | 9 +-
+ .../mach-s3c64xx/{include/mach => }/regs-modem.h | 11 +-
+ .../mach-s3c64xx/{include/mach => }/regs-srom.h | 11 +-
+ arch/arm/mach-s3c64xx/regs-sys.h | 30 +
+ .../{include/mach => }/regs-syscon-power.h | 9 +-
+ arch/arm/mach-s3c64xx/setup-usb-phy.c | 3 +-
+ arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 +-
+ arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 +-
+ .../{include/mach/s5p64x0-clock.h => clock.h} | 9 +-
+ arch/arm/mach-s5p64x0/gpiolib.c | 508 ----
+ arch/arm/mach-s5p64x0/{include/mach => }/i2c.h | 3 +-
+ arch/arm/mach-s5p64x0/include/mach/regs-irq.h | 1 -
+ arch/arm/mach-s5p64x0/include/mach/tick.h | 29 -
+ arch/arm/mach-s5p64x0/include/mach/uncompress.h | 28 -
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 6 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 6 +-
+ arch/arm/mach-s5p64x0/pm.c | 4 +-
+ arch/arm/mach-s5p64x0/setup-i2c0.c | 2 +-
+ arch/arm/mach-s5p64x0/setup-i2c1.c | 2 +-
+ arch/arm/mach-s5pc100/include/mach/regs-irq.h | 1 -
+ arch/arm/mach-s5pc100/include/mach/tick.h | 2 +
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 4 +-
+ arch/arm/mach-s5pv210/dev-audio.c | 3 +-
+ arch/arm/mach-s5pv210/include/mach/regs-audss.h | 18 -
+ arch/arm/mach-s5pv210/include/mach/regs-irq.h | 1 -
+ arch/arm/mach-s5pv210/include/mach/regs-sys.h | 15 -
+ arch/arm/mach-s5pv210/include/mach/tick.h | 26 -
+ arch/arm/mach-s5pv210/include/mach/uncompress.h | 2 +
+ arch/arm/mach-s5pv210/mach-aquila.c | 4 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 4 +-
+ arch/arm/mach-s5pv210/mach-smdkc110.c | 4 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 4 +-
+ arch/arm/mach-s5pv210/mach-torbreck.c | 4 +-
+ arch/arm/mach-s5pv210/pm.c | 4 +-
+ arch/arm/mach-s5pv210/setup-usb-phy.c | 7 +-
+ arch/arm/mach-sa1100/assabet.c | 2 +-
+ arch/arm/mach-sa1100/badge4.c | 2 +-
+ arch/arm/mach-sa1100/cerf.c | 2 +-
+ arch/arm/mach-sa1100/collie.c | 2 +-
+ arch/arm/mach-sa1100/generic.h | 4 +-
+ arch/arm/mach-sa1100/h3100.c | 2 +-
+ arch/arm/mach-sa1100/h3600.c | 2 +-
+ arch/arm/mach-sa1100/hackkit.c | 2 +-
+ arch/arm/mach-sa1100/include/mach/uncompress.h | 1 -
+ arch/arm/mach-sa1100/jornada720.c | 2 +-
+ arch/arm/mach-sa1100/lart.c | 5 +-
+ arch/arm/mach-sa1100/nanoengine.c | 2 +-
+ arch/arm/mach-sa1100/pleb.c | 2 +-
+ arch/arm/mach-sa1100/shannon.c | 2 +-
+ arch/arm/mach-sa1100/simpad.c | 2 +-
+ arch/arm/mach-sa1100/time.c | 72 +-
+ arch/arm/mach-shark/core.c | 6 +-
+ arch/arm/mach-shark/include/mach/uncompress.h | 1 -
+ arch/arm/mach-shmobile/Makefile | 11 +-
+ arch/arm/mach-shmobile/board-ag5evm.c | 27 +-
+ arch/arm/mach-shmobile/board-ap4evb.c | 39 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 72 +-
+ arch/arm/mach-shmobile/board-bonito.c | 12 +-
+ arch/arm/mach-shmobile/board-kota2.c | 14 +-
+ arch/arm/mach-shmobile/board-kzm9d.c | 4 +-
+ arch/arm/mach-shmobile/board-kzm9g.c | 27 +-
+ arch/arm/mach-shmobile/board-mackerel.c | 22 +-
+ arch/arm/mach-shmobile/board-marzen.c | 4 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 6 +-
+ arch/arm/mach-shmobile/clock-r8a7779.c | 3 +-
+ arch/arm/mach-shmobile/clock-sh7372.c | 9 +
+ arch/arm/mach-shmobile/clock-sh73a0.c | 35 +-
+ arch/arm/mach-shmobile/headsmp-sh73a0.S | 50 +
+ arch/arm/mach-shmobile/headsmp.S | 48 -
+ arch/arm/mach-shmobile/hotplug.c | 6 +
+ arch/arm/mach-shmobile/include/mach/common.h | 14 +-
+ arch/arm/mach-shmobile/include/mach/uncompress.h | 2 -
+ arch/arm/mach-shmobile/intc-r8a7779.c | 2 +-
+ arch/arm/mach-shmobile/intc-sh73a0.c | 18 +-
+ arch/arm/mach-shmobile/platsmp.c | 3 -
+ arch/arm/mach-shmobile/pm-r8a7740.c | 22 +
+ arch/arm/mach-shmobile/pm-sh73a0.c | 32 +
+ arch/arm/mach-shmobile/setup-emev2.c | 19 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 132 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 48 +-
+ arch/arm/mach-shmobile/setup-sh7372.c | 33 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 90 +-
+ arch/arm/mach-shmobile/sleep-sh7372.S | 12 +-
+ arch/arm/mach-shmobile/smp-emev2.c | 4 +-
+ arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 70 +-
+ arch/arm/mach-shmobile/timer.c | 9 +-
+ arch/arm/mach-socfpga/core.h | 4 +-
+ arch/arm/mach-socfpga/headsmp.S | 16 +-
+ arch/arm/mach-socfpga/platsmp.c | 21 +-
+ arch/arm/mach-socfpga/socfpga.c | 23 +-
+ arch/arm/mach-spear13xx/include/mach/generic.h | 3 +-
+ arch/arm/mach-spear13xx/platsmp.c | 4 +-
+ arch/arm/mach-spear13xx/spear1310.c | 7 +-
+ arch/arm/mach-spear13xx/spear1340.c | 7 +-
+ arch/arm/mach-spear13xx/spear13xx.c | 19 +-
+ arch/arm/mach-spear3xx/include/mach/generic.h | 3 +-
+ arch/arm/mach-spear3xx/spear300.c | 7 +-
+ arch/arm/mach-spear3xx/spear310.c | 7 +-
+ arch/arm/mach-spear3xx/spear320.c | 7 +-
+ arch/arm/mach-spear3xx/spear3xx.c | 22 +-
+ arch/arm/mach-spear6xx/spear6xx.c | 24 +-
+ arch/arm/mach-sunxi/sunxi.c | 23 +-
+ arch/arm/mach-tegra/Kconfig | 19 +-
+ arch/arm/mach-tegra/Makefile | 15 +-
+ arch/arm/mach-tegra/apbio.c | 2 +-
+ arch/arm/mach-tegra/board-dt-tegra114.c | 46 +
+ arch/arm/mach-tegra/board-dt-tegra20.c | 76 +-
+ arch/arm/mach-tegra/board-dt-tegra30.c | 67 +-
+ arch/arm/mach-tegra/board.h | 3 +-
+ arch/arm/mach-tegra/clock.c | 166 --
+ arch/arm/mach-tegra/clock.h | 153 --
+ arch/arm/mach-tegra/common.c | 80 +-
+ arch/arm/mach-tegra/common.h | 1 +
+ arch/arm/mach-tegra/cpu-tegra.c | 40 +-
+ arch/arm/mach-tegra/cpuidle-tegra114.c | 61 +
+ arch/arm/mach-tegra/cpuidle-tegra20.c | 197 +-
+ arch/arm/mach-tegra/cpuidle-tegra30.c | 8 +-
+ arch/arm/mach-tegra/cpuidle.c | 3 +
+ arch/arm/mach-tegra/cpuidle.h | 6 +
+ arch/arm/mach-tegra/flowctrl.c | 42 +-
+ arch/arm/mach-tegra/flowctrl.h | 4 +
+ arch/arm/mach-tegra/fuse.c | 8 +-
+ arch/arm/mach-tegra/fuse.h | 1 +
+ arch/arm/mach-tegra/headsmp.S | 264 --
+ arch/arm/mach-tegra/hotplug.c | 23 +-
+ arch/arm/mach-tegra/include/mach/clk.h | 44 -
+ arch/arm/mach-tegra/include/mach/uncompress.h | 4 -
+ arch/arm/mach-tegra/iomap.h | 9 -
+ arch/arm/mach-tegra/irq.c | 18 +-
+ arch/arm/mach-tegra/irq.h | 22 +
+ arch/arm/mach-tegra/pcie.c | 2 +-
+ arch/arm/mach-tegra/platsmp.c | 72 +-
+ arch/arm/mach-tegra/pm.c | 9 +-
+ arch/arm/mach-tegra/powergate.c | 2 +-
+ arch/arm/mach-tegra/reset-handler.S | 239 ++
+ arch/arm/mach-tegra/reset.c | 2 +-
+ arch/arm/mach-tegra/sleep-tegra20.S | 203 +-
+ arch/arm/mach-tegra/sleep-tegra30.S | 3 -
+ arch/arm/mach-tegra/sleep.S | 23 +-
+ arch/arm/mach-tegra/sleep.h | 27 +
+ arch/arm/mach-tegra/tegra20_clocks.c | 1623 -----------
+ arch/arm/mach-tegra/tegra20_clocks.h | 42 -
+ arch/arm/mach-tegra/tegra20_clocks_data.c | 1143 --------
+ arch/arm/mach-tegra/tegra30_clocks.c | 2506 -----------------
+ arch/arm/mach-tegra/tegra30_clocks.h | 54 -
+ arch/arm/mach-tegra/tegra30_clocks_data.c | 1425 ----------
+ arch/arm/mach-u300/core.c | 1092 +-------
+ arch/arm/mach-u300/dma_channels.h | 60 -
+ arch/arm/mach-u300/include/mach/coh901318.h | 267 --
+ arch/arm/mach-u300/include/mach/uncompress.h | 1 -
+ arch/arm/mach-u300/spi.c | 3 +-
+ arch/arm/mach-u300/timer.c | 10 +-
+ arch/arm/mach-u300/timer.h | 2 +-
+ arch/arm/mach-ux500/board-mop500-uib.c | 1 +
+ arch/arm/mach-ux500/board-mop500.c | 18 +-
+ arch/arm/mach-ux500/cache-l2x0.c | 3 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 13 +-
+ arch/arm/mach-ux500/cpu.c | 17 +-
+ arch/arm/mach-ux500/cpuidle.c | 4 +-
+ arch/arm/mach-ux500/devices-db8500.c | 44 +
+ arch/arm/mach-ux500/devices-db8500.h | 5 +
+ arch/arm/mach-ux500/id.c | 2 +
+ arch/arm/mach-ux500/{include/mach => }/id.h | 21 +-
+ arch/arm/mach-ux500/include/mach/hardware.h | 1 -
+ arch/arm/mach-ux500/include/mach/setup.h | 3 +-
+ arch/arm/mach-ux500/include/mach/uncompress.h | 2 -
+ arch/arm/mach-ux500/platsmp.c | 9 +-
+ arch/arm/mach-ux500/timer.c | 15 +-
+ arch/arm/mach-versatile/Kconfig | 5 +
+ arch/arm/mach-versatile/core.c | 11 +-
+ arch/arm/mach-versatile/core.h | 2 +-
+ arch/arm/mach-versatile/include/mach/uncompress.h | 1 -
+ arch/arm/mach-versatile/versatile_ab.c | 4 +-
+ arch/arm/mach-versatile/versatile_dt.c | 4 +-
+ arch/arm/mach-versatile/versatile_pb.c | 4 +-
+ arch/arm/mach-vexpress/ct-ca9x4.c | 4 +-
+ arch/arm/mach-vexpress/platsmp.c | 3 -
+ arch/arm/mach-vexpress/v2m.c | 28 +-
+ arch/arm/mach-virt/Kconfig | 10 +
+ arch/arm/mach-virt/Makefile | 6 +
+ arch/arm/mach-virt/platsmp.c | 58 +
+ arch/arm/mach-virt/virt.c | 54 +
+ arch/arm/mach-vt8500/Kconfig | 30 +-
+ arch/arm/mach-vt8500/Makefile | 2 +-
+ arch/arm/mach-vt8500/common.h | 1 -
+ arch/arm/mach-vt8500/include/mach/timex.h | 26 -
+ arch/arm/mach-vt8500/include/mach/uncompress.h | 37 -
+ arch/arm/mach-vt8500/vt8500.c | 9 +-
+ arch/arm/mach-w90x900/include/mach/entry-macro.S | 4 +-
+ arch/arm/mach-w90x900/include/mach/uncompress.h | 2 -
+ arch/arm/mach-w90x900/mach-nuc910evb.c | 2 +-
+ arch/arm/mach-w90x900/mach-nuc950evb.c | 2 +-
+ arch/arm/mach-w90x900/mach-nuc960evb.c | 2 +-
+ arch/arm/mach-w90x900/nuc9xx.h | 3 +-
+ arch/arm/mach-w90x900/time.c | 16 +-
+ arch/arm/mach-zynq/common.c | 27 +-
+ arch/arm/mm/cache-v7.S | 46 +
+ arch/arm/plat-iop/time.c | 9 +-
+ arch/arm/plat-omap/Kconfig | 41 +-
+ arch/arm/plat-omap/Makefile | 2 +
+ arch/arm/plat-omap/dma.c | 2 +-
+ arch/arm/plat-omap/i2c.c | 3 +-
+ arch/arm/plat-omap/include/plat/i2c.h | 6 +
+ arch/arm/plat-omap/include/plat/timex.h | 8 -
+ arch/arm/plat-orion/mpp.c | 2 +-
+ arch/arm/plat-orion/time.c | 6 +-
+ arch/arm/plat-s3c24xx/Kconfig | 116 -
+ arch/arm/plat-s3c24xx/Makefile | 27 -
+ arch/arm/plat-s3c24xx/irq.c | 676 -----
+ arch/arm/plat-samsung/include/plat/cpu.h | 3 +-
+ arch/arm/plat-samsung/include/plat/debug-macro.S | 18 +-
+ arch/arm/plat-samsung/include/plat/fimc-core.h | 2 +
+ arch/arm/plat-samsung/include/plat/gpio-core.h | 13 +-
+ arch/arm/plat-samsung/include/plat/gpio-fns.h | 1 -
+ arch/arm/plat-samsung/include/plat/pm.h | 6 -
+ arch/arm/plat-samsung/include/plat/s3c2416.h | 1 +
+ arch/arm/plat-samsung/include/plat/s3c2443.h | 2 +
+ arch/arm/plat-samsung/include/plat/s5p-time.h | 2 +-
+ arch/arm/plat-samsung/include/plat/sdhci.h | 2 +
+ arch/arm/plat-samsung/include/plat/uncompress.h | 28 -
+ arch/arm/plat-samsung/pm.c | 7 +-
+ arch/arm/plat-samsung/s5p-irq-eint.c | 3 +-
+ arch/arm/plat-samsung/s5p-irq.c | 3 +-
+ arch/arm/plat-samsung/s5p-time.c | 15 +-
+ arch/arm/plat-samsung/time.c | 20 +-
+ arch/arm/plat-spear/include/plat/uncompress.h | 1 -
+ arch/arm/plat-spear/restart.c | 2 +-
+ arch/arm/plat-spear/time.c | 8 +-
+ arch/arm/plat-versatile/platsmp.c | 4 +-
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/arch_timer.h | 133 +
+ arch/arm64/include/asm/arm_generic.h | 100 -
+ arch/arm64/kernel/time.c | 29 +-
+ arch/blackfin/kernel/time.c | 6 +-
+ arch/cris/arch-v10/kernel/time.c | 10 +-
+ arch/cris/kernel/time.c | 11 -
+ arch/m32r/kernel/time.c | 4 +-
+ arch/m68k/amiga/config.c | 10 +-
+ arch/m68k/apollo/config.c | 9 +-
+ arch/m68k/atari/config.c | 4 +-
+ arch/m68k/atari/time.c | 6 +-
+ arch/m68k/bvme6000/config.c | 10 +-
+ arch/m68k/hp300/config.c | 2 +-
+ arch/m68k/hp300/time.c | 4 +-
+ arch/m68k/hp300/time.h | 2 +-
+ arch/m68k/include/asm/machdep.h | 2 +-
+ arch/m68k/kernel/setup_mm.c | 1 -
+ arch/m68k/kernel/time.c | 15 +-
+ arch/m68k/mac/config.c | 4 +-
+ arch/m68k/mac/via.c | 4 +-
+ arch/m68k/mvme147/config.c | 8 +-
+ arch/m68k/mvme16x/config.c | 8 +-
+ arch/m68k/q40/config.c | 8 +-
+ arch/m68k/sun3/config.c | 4 +-
+ arch/m68k/sun3/intersil.c | 4 +-
+ arch/m68k/sun3x/config.c | 2 +-
+ arch/m68k/sun3x/time.c | 2 +-
+ arch/m68k/sun3x/time.h | 2 +-
+ arch/sh/Kconfig | 12 +
+ arch/sh/include/asm/gpio.h | 2 +-
+ .../sh/include/cpu-common/cpu/pfc.h | 20 +-
+ arch/sh/include/cpu-sh4/cpu/sh7723.h | 2 +-
+ arch/sh/include/cpu-sh4/cpu/sh7786.h | 8 +-
+ arch/sh/kernel/cpu/Makefile | 2 +-
+ arch/sh/kernel/cpu/pfc.c | 33 +
+ arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 1582 +----------
+ arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 2121 +--------------
+ arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 2823 +------------------
+ arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 1226 +--------
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 1778 +-----------
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 1893 +------------
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 2210 +--------------
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c | 2470 +----------------
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 2267 +---------------
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 1294 +--------
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 822 +-----
+ arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 573 +---
+ drivers/clk/Makefile | 1 +
+ drivers/clk/clk-bcm2835.c | 9 +
+ drivers/clk/mxs/clk-imx28.c | 2 +-
+ drivers/clk/tegra/Makefile | 11 +
+ drivers/clk/tegra/clk-audio-sync.c | 87 +
+ drivers/clk/tegra/clk-divider.c | 187 ++
+ drivers/clk/tegra/clk-periph-gate.c | 179 ++
+ drivers/clk/tegra/clk-periph.c | 218 ++
+ drivers/clk/tegra/clk-pll-out.c | 123 +
+ drivers/clk/tegra/clk-pll.c | 648 +++++
+ drivers/clk/tegra/clk-super.c | 154 ++
+ drivers/clk/tegra/clk-tegra20.c | 1349 ++++++++++
+ drivers/clk/tegra/clk-tegra30.c | 1987 ++++++++++++++
+ drivers/clk/tegra/clk.c | 85 +
+ drivers/clk/tegra/clk.h | 502 ++++
+ drivers/clk/versatile/clk-vexpress.c | 3 +-
+ drivers/clocksource/Kconfig | 12 +-
+ drivers/clocksource/Makefile | 5 +-
+ drivers/clocksource/arm_arch_timer.c | 391 +++
+ drivers/clocksource/arm_generic.c | 232 --
+ drivers/clocksource/bcm2835_timer.c | 9 +-
+ drivers/clocksource/clksrc-of.c | 35 +
+ drivers/clocksource/cs5535-clockevt.c | 11 +-
+ drivers/clocksource/dw_apb_timer_of.c | 6 +-
+ drivers/clocksource/nomadik-mtu.c | 44 +-
+ drivers/clocksource/sunxi_timer.c | 17 +-
+ drivers/clocksource/tcb_clksrc.c | 7 +-
+ .../timer.c => drivers/clocksource/tegra20_timer.c | 21 +-
+ .../timer.c => drivers/clocksource/vt8500_timer.c | 12 +-
+ drivers/cpufreq/Makefile | 2 +-
+ .../cpufreq/{db8500-cpufreq.c => dbx500-cpufreq.c} | 105 +-
+ drivers/cpufreq/exynos-cpufreq.c | 4 +-
+ .../cpufreq.h => drivers/cpufreq/exynos-cpufreq.h | 3 +-
+ drivers/cpufreq/exynos4210-cpufreq.c | 3 +-
+ drivers/cpufreq/exynos4x12-cpufreq.c | 3 +-
+ drivers/cpufreq/exynos5250-cpufreq.c | 3 +-
+ drivers/cpuidle/Kconfig | 6 +
+ drivers/cpuidle/Makefile | 1 +
+ .../cpuidle/cpuidle-kirkwood.c | 45 +-
+ drivers/dma/coh901318.c | 1302 ++++++++-
+ drivers/dma/{coh901318_lli.h => coh901318.h} | 35 +-
+ drivers/dma/coh901318_lli.c | 4 +-
+ drivers/dma/omap-dma.c | 20 +-
+ drivers/dma/tegra20-apb-dma.c | 2 +-
+ drivers/gpio/gpio-samsung.c | 7 +-
+ drivers/gpu/drm/tegra/dc.c | 3 +-
+ drivers/gpu/drm/tegra/drm.c | 1 -
+ drivers/gpu/drm/tegra/hdmi.c | 3 +-
+ drivers/i2c/busses/i2c-tegra.c | 3 +-
+ drivers/input/keyboard/tegra-kbc.c | 2 +-
+ drivers/irqchip/Kconfig | 27 +
+ drivers/irqchip/Makefile | 7 +-
+ drivers/irqchip/exynos-combiner.c | 230 ++
+ arch/arm/common/gic.c => drivers/irqchip/irq-gic.c | 59 +-
+ arch/arm/common/vic.c => drivers/irqchip/irq-vic.c | 95 +-
+ drivers/irqchip/irqchip.c | 30 +
+ drivers/irqchip/irqchip.h | 29 +
+ drivers/irqchip/spear-shirq.c | 5 +
+ drivers/media/platform/davinci/vpss.c | 1 -
+ drivers/media/platform/omap3isp/isp.c | 18 +-
+ drivers/media/platform/omap3isp/isp.h | 8 +-
+ drivers/media/rc/Kconfig | 2 +-
+ drivers/mfd/db8500-prcmu.c | 143 +-
+ drivers/mfd/vexpress-sysreg.c | 2 +-
+ drivers/mtd/nand/fsmc_nand.c | 1 +
+ drivers/mtd/nand/omap2.c | 4 +-
+ drivers/mtd/onenand/omap2.c | 4 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 3 +
+ drivers/pinctrl/Kconfig | 2 +-
+ drivers/pinctrl/Makefile | 2 +
+ drivers/pinctrl/pinctrl-nomadik.c | 4 +
+ drivers/pinctrl/pinctrl-samsung.c | 4 +-
+ drivers/pinctrl/sh-pfc/Kconfig | 116 +
+ drivers/pinctrl/sh-pfc/Makefile | 21 +
+ drivers/{sh/pfc => pinctrl/sh-pfc}/core.c | 355 ++-
+ drivers/pinctrl/sh-pfc/core.h | 72 +
+ drivers/{sh/pfc => pinctrl/sh-pfc}/gpio.c | 114 +-
+ .../pinctrl/sh-pfc}/pfc-r8a7740.c | 11 +-
+ .../pinctrl/sh-pfc}/pfc-r8a7779.c | 29 +-
+ drivers/pinctrl/sh-pfc/pfc-sh7203.c | 1592 +++++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7264.c | 2131 +++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7269.c | 2834 ++++++++++++++++++++
+ .../pinctrl/sh-pfc}/pfc-sh7372.c | 11 +-
+ .../pinctrl/sh-pfc}/pfc-sh73a0.c | 11 +-
+ drivers/pinctrl/sh-pfc/pfc-sh7720.c | 1236 +++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7722.c | 1779 ++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7723.c | 1903 +++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7724.c | 2225 +++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7734.c | 2475 +++++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7757.c | 2282 ++++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7785.c | 1304 +++++++++
+ drivers/pinctrl/sh-pfc/pfc-sh7786.c | 837 ++++++
+ drivers/pinctrl/sh-pfc/pfc-shx3.c | 582 ++++
+ drivers/{sh/pfc => pinctrl/sh-pfc}/pinctrl.c | 164 +-
+ {include/linux => drivers/pinctrl/sh-pfc}/sh_pfc.h | 43 +-
+ drivers/remoteproc/Kconfig | 2 +-
+ drivers/rtc/Kconfig | 2 +-
+ drivers/sh/Kconfig | 1 -
+ drivers/sh/Makefile | 1 -
+ drivers/sh/pfc/Kconfig | 26 -
+ drivers/sh/pfc/Makefile | 3 -
+ drivers/spi/spi-tegra20-sflash.c | 4 +-
+ drivers/spi/spi-tegra20-slink.c | 4 +-
+ drivers/staging/nvec/TODO | 4 -
+ drivers/staging/nvec/nvec.c | 5 +-
+ drivers/staging/tidspbridge/Kconfig | 2 +-
+ drivers/usb/host/ehci-tegra.c | 97 +-
+ drivers/usb/phy/tegra_usb_phy.c | 132 +-
+ drivers/video/omap2/displays/panel-generic-dpi.c | 24 -
+ drivers/w1/masters/mxc_w1.c | 9 +-
+ include/asm-generic/vmlinux.lds.h | 22 +-
+ include/clocksource/arm_arch_timer.h | 63 +
+ include/clocksource/arm_generic.h | 21 -
+ .../asm/hardware => include/linux/amba}/sp810.h | 0
+ .../tegra_cpu_car.h => include/linux/clk/tegra.h | 13 +-
+ include/linux/clocksource.h | 11 +
+ include/linux/dw_apb_timer.h | 2 +-
+ include/linux/irqchip.h | 16 +
+ .../gic.h => include/linux/irqchip/arm-gic.h | 44 +-
+ .../vic.h => include/linux/irqchip/arm-vic.h | 25 +-
+ include/linux/mfd/db8500-prcmu.h | 20 -
+ include/linux/mfd/dbx500-prcmu.h | 127 +-
+ include/linux/platform_data/dma-coh901318.h | 72 +
+ include/linux/platform_data/i2c-s3c2410.h | 2 +
+ include/linux/platform_data/mtd-nand-omap2.h | 4 +-
+ include/linux/platform_data/mtd-onenand-omap2.h | 3 +
+ include/linux/sunxi_timer.h | 2 +-
+ include/linux/tegra-soc.h | 22 +
+ include/linux/time.h | 4 +-
+ include/linux/usb/tegra_usb_phy.h | 16 +-
+ include/sound/aess.h | 53 +
+ include/uapi/linux/kvm.h | 8 +
+ kernel/time/clockevents.c | 1 +
+ kernel/time/timekeeping.c | 26 +-
+ scripts/sortextable.h | 2 +-
+ sound/soc/samsung/h1940_uda1380.c | 13 +-
+ sound/soc/samsung/neo1973_wm8753.c | 8 +-
+ sound/soc/tegra/tegra30_ahub.c | 16 +-
+ 1310 files changed, 50270 insertions(+), 47034 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/armadeus.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/ste-nomadik.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx31-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/imx25-pdk.dts
+ rename arch/arm/boot/dts/{imx27-3ds.dts => imx27-pdk.dts} (59%)
+ create mode 100644 arch/arm/boot/dts/imx28-cfa10037.dts
+ create mode 100644 arch/arm/boot/dts/imx51-apf51.dts
+ create mode 100644 arch/arm/boot/dts/imx53-mba53.dts
+ create mode 100644 arch/arm/boot/dts/imx53-tqma53.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl.dtsi
+ create mode 100644 arch/arm/boot/dts/marco-evb.dts
+ create mode 100644 arch/arm/boot/dts/marco.dtsi
+ create mode 100644 arch/arm/boot/dts/sh73a0-reference.dtsi
+ create mode 100644 arch/arm/boot/dts/sh73a0.dtsi
+ create mode 100644 arch/arm/boot/dts/socfpga_vt.dts
+ create mode 100644 arch/arm/boot/dts/ste-nomadik-s8815.dts
+ create mode 100644 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+ create mode 100644 arch/arm/boot/dts/sun4i-a10-hackberry.dts
+ create mode 100644 arch/arm/boot/dts/tegra114-dalmore.dts
+ create mode 100644 arch/arm/boot/dts/tegra114-pluto.dts
+ create mode 100644 arch/arm/boot/dts/tegra114.dtsi
+ create mode 100644 arch/arm/boot/dts/tegra20-colibri-512.dtsi
+ create mode 100644 arch/arm/boot/dts/tegra20-iris-512.dts
+ create mode 100644 arch/arm/boot/dts/tegra30-beaver.dts
+ create mode 100644 arch/arm/boot/dts/wm8850-w70v2.dts
+ create mode 100644 arch/arm/boot/dts/wm8850.dtsi
+ create mode 100644 arch/arm/include/asm/kvm_arch_timer.h
+ create mode 100644 arch/arm/include/asm/kvm_vgic.h
+ create mode 100644 arch/arm/include/debug/imx-uart.h
+ rename arch/arm/{mach-omap2/include/mach/debug-macro.S => include/debug/omap2plus.S} (56%)
+ rename arch/arm/{mach-vt8500/include/mach/debug-macro.S => include/debug/vt8500.S} (56%)
+ create mode 100644 arch/arm/kvm/arch_timer.c
+ create mode 100644 arch/arm/kvm/vgic.c
+ delete mode 100644 arch/arm/mach-at91/board-neocore926.c
+ delete mode 100644 arch/arm/mach-exynos/include/mach/pmu.h
+ delete mode 100644 arch/arm/mach-exynos/include/mach/regs-audss.h
+ create mode 100644 arch/arm/mach-imx/cpuidle-imx6q.c
+ delete mode 100644 arch/arm/mach-imx/devices-imx50.h
+ delete mode 100644 arch/arm/mach-imx/iomux-mx50.h
+ delete mode 100644 arch/arm/mach-imx/lluart.c
+ delete mode 100644 arch/arm/mach-imx/mach-mx50_rdp.c
+ delete mode 100644 arch/arm/mach-imx/mach-mx51_3ds.c
+ delete mode 100644 arch/arm/mach-imx/mx50.h
+ delete mode 100644 arch/arm/mach-nomadik/board-nhk8815.c
+ delete mode 100644 arch/arm/mach-nomadik/cpu-8815.h
+ delete mode 100644 arch/arm/mach-nomadik/i2c-8815nhk.c
+ delete mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-omap2/am33xx-restart.c
+ delete mode 100644 arch/arm/mach-omap2/board-apollon.c
+ delete mode 100644 arch/arm/mach-omap2/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_reset.c
+ create mode 100644 arch/arm/mach-prima2/headsmp.S
+ create mode 100644 arch/arm/mach-prima2/hotplug.c
+ create mode 100644 arch/arm/mach-prima2/platsmp.c
+ create mode 100644 arch/arm/mach-prima2/timer-marco.c
+ rename arch/arm/mach-prima2/{timer.c => timer-prima2.c} (93%)
+ delete mode 100644 arch/arm/mach-s3c2410/Kconfig
+ delete mode 100644 arch/arm/mach-s3c2410/Makefile
+ delete mode 100644 arch/arm/mach-s3c2412/Kconfig
+ delete mode 100644 arch/arm/mach-s3c2412/Makefile
+ delete mode 100644 arch/arm/mach-s3c2412/gpio.c
+ delete mode 100644 arch/arm/mach-s3c2440/Kconfig
+ delete mode 100644 arch/arm/mach-s3c2440/Makefile
+ delete mode 100644 arch/arm/mach-s3c2440/dsc.c
+ create mode 100644 arch/arm/mach-s3c24xx/anubis.h
+ create mode 100644 arch/arm/mach-s3c24xx/bast.h
+ rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/clock-dclk.c (98%)
+ rename arch/arm/{plat-s3c24xx/s3c2410-clock.c => mach-s3c24xx/clock-s3c2410.c} (99%)
+ rename arch/arm/{plat-s3c24xx/cpu-freq-debugfs.c => mach-s3c24xx/cpufreq-debugfs.c} (98%)
+ rename arch/arm/{mach-s3c2410/cpu-freq.c => mach-s3c24xx/cpufreq-s3c2410.c} (98%)
+ rename arch/arm/{mach-s3c2412/cpu-freq.c => mach-s3c24xx/cpufreq-s3c2412.c} (98%)
+ rename arch/arm/{mach-s3c2440/s3c2440-cpufreq.c => mach-s3c24xx/cpufreq-s3c2440.c} (99%)
+ rename arch/arm/{plat-s3c24xx/s3c2410-cpufreq-utils.c => mach-s3c24xx/cpufreq-utils.c} (95%)
+ rename arch/arm/{plat-s3c24xx/cpu-freq.c => mach-s3c24xx/cpufreq.c} (99%)
+ rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/dma.c (99%)
+ rename arch/arm/mach-s3c24xx/{include/mach => }/gta02.h (53%)
+ rename arch/arm/mach-s3c24xx/{include/mach/h1940-latch.h => h1940.h} (70%)
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/anubis-cpld.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/anubis-irq.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/anubis-map.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/bast-cpld.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/bast-irq.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/bast-map.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/gpio-fns.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/gpio-track.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/h1940.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/idle.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-mem.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-power.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-s3c2412-mem.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/vr1000-cpld.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/vr1000-irq.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/vr1000-map.h
+ rename arch/arm/{plat-s3c24xx/s3c2410-iotiming.c => mach-s3c24xx/iotiming-s3c2410.c} (99%)
+ rename arch/arm/{plat-s3c24xx/s3c2412-iotiming.c => mach-s3c24xx/iotiming-s3c2412.c} (98%)
+ delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2416.c
+ delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2443.c
+ create mode 100644 arch/arm/mach-s3c24xx/irq.c
+ rename arch/arm/mach-s3c24xx/{include/mach/osiris-map.h => osiris.h} (69%)
+ rename arch/arm/mach-s3c24xx/{include/mach/otom-map.h => otom.h} (50%)
+ rename arch/arm/{mach-s3c2410/pll.c => mach-s3c24xx/pll-s3c2410.c} (99%)
+ rename arch/arm/{mach-s3c2440/s3c2440-pll-12000000.c => mach-s3c24xx/pll-s3c2440-12000000.c} (98%)
+ rename arch/arm/{mach-s3c2440/s3c2440-pll-16934400.c => mach-s3c24xx/pll-s3c2440-16934400.c} (99%)
+ rename arch/arm/mach-s3c24xx/{include/mach => }/regs-dsc.h (100%)
+ create mode 100644 arch/arm/mach-s3c24xx/regs-mem.h
+ create mode 100644 arch/arm/mach-s3c24xx/s3c2412-power.h
+ create mode 100644 arch/arm/mach-s3c24xx/s3c2412.h
+ create mode 100644 arch/arm/mach-s3c24xx/vr1000.h
+ rename arch/arm/mach-s3c64xx/{include/mach => }/crag6410.h (100%)
+ delete mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-sys.h
+ rename arch/arm/mach-s3c64xx/{include/mach => }/regs-gpio-memport.h (71%)
+ rename arch/arm/mach-s3c64xx/{include/mach => }/regs-modem.h (78%)
+ rename arch/arm/mach-s3c64xx/{include/mach => }/regs-srom.h (90%)
+ create mode 100644 arch/arm/mach-s3c64xx/regs-sys.h
+ rename arch/arm/mach-s3c64xx/{include/mach => }/regs-syscon-power.h (95%)
+ rename arch/arm/mach-s5p64x0/{include/mach/s5p64x0-clock.h => clock.h} (87%)
+ delete mode 100644 arch/arm/mach-s5p64x0/gpiolib.c
+ rename arch/arm/mach-s5p64x0/{include/mach => }/i2c.h (91%)
+ delete mode 100644 arch/arm/mach-s5p64x0/include/mach/tick.h
+ delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-audss.h
+ delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-sys.h
+ delete mode 100644 arch/arm/mach-s5pv210/include/mach/tick.h
+ create mode 100644 arch/arm/mach-shmobile/headsmp-sh73a0.S
+ create mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c
+ create mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c
+ delete mode 100644 arch/arm/mach-tegra/clock.c
+ delete mode 100644 arch/arm/mach-tegra/clock.h
+ create mode 100644 arch/arm/mach-tegra/cpuidle-tegra114.c
+ delete mode 100644 arch/arm/mach-tegra/include/mach/clk.h
+ create mode 100644 arch/arm/mach-tegra/irq.h
+ create mode 100644 arch/arm/mach-tegra/reset-handler.S
+ delete mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
+ delete mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
+ delete mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
+ delete mode 100644 arch/arm/mach-tegra/tegra30_clocks.c
+ delete mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
+ delete mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
+ delete mode 100644 arch/arm/mach-u300/dma_channels.h
+ delete mode 100644 arch/arm/mach-u300/include/mach/coh901318.h
+ rename arch/arm/mach-ux500/{include/mach => }/id.h (85%)
+ create mode 100644 arch/arm/mach-virt/Kconfig
+ create mode 100644 arch/arm/mach-virt/Makefile
+ create mode 100644 arch/arm/mach-virt/platsmp.c
+ create mode 100644 arch/arm/mach-virt/virt.c
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h
+ delete mode 100644 arch/arm/plat-s3c24xx/Kconfig
+ delete mode 100644 arch/arm/plat-s3c24xx/Makefile
+ delete mode 100644 arch/arm/plat-s3c24xx/irq.c
+ delete mode 100644 arch/arm/plat-samsung/include/plat/gpio-fns.h
+ create mode 100644 arch/arm64/include/asm/arch_timer.h
+ delete mode 100644 arch/arm64/include/asm/arm_generic.h
+ rename include/linux/bcm2835_timer.h => arch/sh/include/cpu-common/cpu/pfc.h (51%)
+ create mode 100644 arch/sh/kernel/cpu/pfc.c
+ create mode 100644 drivers/clk/tegra/Makefile
+ create mode 100644 drivers/clk/tegra/clk-audio-sync.c
+ create mode 100644 drivers/clk/tegra/clk-divider.c
+ create mode 100644 drivers/clk/tegra/clk-periph-gate.c
+ create mode 100644 drivers/clk/tegra/clk-periph.c
+ create mode 100644 drivers/clk/tegra/clk-pll-out.c
+ create mode 100644 drivers/clk/tegra/clk-pll.c
+ create mode 100644 drivers/clk/tegra/clk-super.c
+ create mode 100644 drivers/clk/tegra/clk-tegra20.c
+ create mode 100644 drivers/clk/tegra/clk-tegra30.c
+ create mode 100644 drivers/clk/tegra/clk.c
+ create mode 100644 drivers/clk/tegra/clk.h
+ create mode 100644 drivers/clocksource/arm_arch_timer.c
+ delete mode 100644 drivers/clocksource/arm_generic.c
+ create mode 100644 drivers/clocksource/clksrc-of.c
+ rename arch/arm/mach-tegra/timer.c => drivers/clocksource/tegra20_timer.c (93%)
+ rename arch/arm/mach-vt8500/timer.c => drivers/clocksource/vt8500_timer.c (93%)
+ rename drivers/cpufreq/{db8500-cpufreq.c => dbx500-cpufreq.c} (60%)
+ rename arch/arm/mach-exynos/include/mach/cpufreq.h => drivers/cpufreq/exynos-cpufreq.h (95%)
+ rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
+ rename drivers/dma/{coh901318_lli.h => coh901318.h} (81%)
+ create mode 100644 drivers/irqchip/exynos-combiner.c
+ rename arch/arm/common/gic.c => drivers/irqchip/irq-gic.c (97%)
+ rename arch/arm/common/vic.c => drivers/irqchip/irq-vic.c (92%)
+ create mode 100644 drivers/irqchip/irqchip.c
+ create mode 100644 drivers/irqchip/irqchip.h
+ create mode 100644 drivers/pinctrl/sh-pfc/Kconfig
+ create mode 100644 drivers/pinctrl/sh-pfc/Makefile
+ rename drivers/{sh/pfc => pinctrl/sh-pfc}/core.c (50%)
+ create mode 100644 drivers/pinctrl/sh-pfc/core.h
+ rename drivers/{sh/pfc => pinctrl/sh-pfc}/gpio.c (58%)
+ rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-r8a7740.c (99%)
+ rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-r8a7779.c (99%)
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7203.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7264.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7269.c
+ rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-sh7372.c (99%)
+ rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-sh73a0.c (99%)
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7720.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7722.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7723.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7724.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7734.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7757.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7785.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7786.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-shx3.c
+ rename drivers/{sh/pfc => pinctrl/sh-pfc}/pinctrl.c (75%)
+ rename {include/linux => drivers/pinctrl/sh-pfc}/sh_pfc.h (83%)
+ delete mode 100644 drivers/sh/pfc/Kconfig
+ delete mode 100644 drivers/sh/pfc/Makefile
+ create mode 100644 include/clocksource/arm_arch_timer.h
+ delete mode 100644 include/clocksource/arm_generic.h
+ rename {arch/arm/include/asm/hardware => include/linux/amba}/sp810.h (100%)
+ rename arch/arm/mach-tegra/tegra_cpu_car.h => include/linux/clk/tegra.h (91%)
+ create mode 100644 include/linux/irqchip.h
+ rename arch/arm/include/asm/hardware/gic.h => include/linux/irqchip/arm-gic.h (58%)
+ rename arch/arm/include/asm/hardware/vic.h => include/linux/irqchip/arm-vic.h (63%)
+ create mode 100644 include/linux/platform_data/dma-coh901318.h
+ create mode 100644 include/linux/tegra-soc.h
+ create mode 100644 include/sound/aess.h
+Merging bcm2835/for-next (836dc9e Linux 3.8-rc7)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n)
+$ git merge cortex/for-next
+Resolved 'arch/arm/include/asm/cputype.h' using previous resolution.
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm/mm/Kconfig
+Auto-merging arch/arm/mach-omap2/omap-smp.c
+Auto-merging arch/arm/mach-omap2/id.c
+Auto-merging arch/arm/kernel/smp_scu.c
+Auto-merging arch/arm/include/asm/cputype.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1421d40] Merge remote-tracking branch 'cortex/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 3 ++-
+ arch/arm/include/asm/cp15.h | 16 +++++++++++++++-
+ arch/arm/include/asm/cputype.h | 31 +++++++++++++++++++++++++++----
+ arch/arm/include/asm/glue-df.h | 20 ++++++++++----------
+ arch/arm/kernel/head-common.S | 9 +++++++--
+ arch/arm/kernel/head-nommu.S | 8 +++++++-
+ arch/arm/kernel/setup.c | 2 +-
+ arch/arm/kernel/smp_scu.c | 2 +-
+ arch/arm/mach-omap2/id.c | 4 ++--
+ arch/arm/mach-omap2/omap-smp.c | 2 +-
+ arch/arm/mm/Kconfig | 9 ++++++++-
+ arch/arm/mm/alignment.c | 2 ++
+ arch/arm/mm/mmu.c | 17 +++++++++++++++++
+ 13 files changed, 100 insertions(+), 25 deletions(-)
+Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
+$ git merge ixp4xx/next
+Merge made by the 'recursive' strategy.
+Merging msm/for-next (a0d271c Linux 3.6)
+$ git merge msm/for-next
+Already up-to-date.
+Merging renesas/next (ae48ed8 Merge branches 'heads/soc5', 'heads/defconfig', 'heads/boards3', 'boards-kzm9g-reference', 'heads/pfc' and 'heads/clocksource' into next)
+$ git merge renesas/next
+Auto-merging drivers/Makefile
+Auto-merging arch/arm/mach-shmobile/headsmp-scu.S
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/r8a7779-marzen-reference.dts | 41 +++++
+ arch/arm/boot/dts/r8a7779.dtsi | 95 +++++++++++
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 77 +++++++++
+ arch/arm/configs/armadillo800eva_defconfig | 1 +
+ arch/arm/configs/mackerel_defconfig | 4 +
+ arch/arm/mach-shmobile/Kconfig | 27 +++
+ arch/arm/mach-shmobile/Makefile | 8 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 110 ++++++++++--
+ arch/arm/mach-shmobile/board-kzm9g-reference.c | 119 +++++++++++++
+ arch/arm/mach-shmobile/board-mackerel.c | 106 +++++-------
+ arch/arm/mach-shmobile/board-marzen-reference.c | 72 ++++++++
+ arch/arm/mach-shmobile/board-marzen.c | 1 +
+ arch/arm/mach-shmobile/clock-r8a7740.c | 4 +
+ arch/arm/mach-shmobile/clock-sh73a0.c | 3 +
+ .../{headsmp-sh73a0.S => headsmp-scu.S} | 14 +-
+ arch/arm/mach-shmobile/hotplug.c | 4 -
+ arch/arm/mach-shmobile/include/mach/common.h | 6 +-
+ arch/arm/mach-shmobile/intc-r8a7779.c | 27 ++-
+ arch/arm/mach-shmobile/setup-emev2.c | 4 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 59 ++++++-
+ arch/arm/mach-shmobile/smp-emev2.c | 86 ++--------
+ arch/arm/mach-shmobile/smp-r8a7779.c | 22 +--
+ arch/arm/mach-shmobile/smp-sh73a0.c | 29 ++--
+ drivers/Makefile | 8 +-
+ drivers/clocksource/sh_cmt.c | 187 +++++++++++++--------
+ 26 files changed, 824 insertions(+), 292 deletions(-)
+ 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
+ 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} (87%)
+Merging samsung/for-next (786b270 Merge branch 'next/cpufreq-exynos' into for-next)
+$ git merge samsung/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos5440.dtsi | 5 -----
+ arch/arm/mach-s5pc100/common.h | 9 ---------
+ arch/arm/mach-s5pv210/common.h | 9 ---------
+ 3 files changed, 23 deletions(-)
+Merging tegra/for-next (b76340f Merge branch 'for-3.9/soc-ccf-fixes' into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/tegra20.dtsi | 5 -----
+ arch/arm/boot/dts/tegra30.dtsi | 5 -----
+ drivers/clk/tegra/clk-super.c | 18 +++++++++++++---
+ drivers/clk/tegra/clk-tegra20.c | 22 ++++++++++++-------
+ drivers/clk/tegra/clk-tegra30.c | 47 +++++++++++++++++++++++------------------
+ 5 files changed, 56 insertions(+), 41 deletions(-)
+Merging dma-mapping/dma-mapping-next (ee06158 ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation)
+$ git merge dma-mapping/dma-mapping-next
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 21 ++++++++
+ arch/arm/include/asm/device.h | 6 +++
+ arch/arm/include/asm/dma-iommu.h | 2 +
+ arch/arm/mm/dma-mapping.c | 108 +++++++++++++++++++++++++++++++--------
+ 4 files changed, 117 insertions(+), 20 deletions(-)
+Merging pwm/for-next (30f7861 pwm: twl: Use to_twl() instead of container_of())
+$ git merge pwm/for-next
+Auto-merging include/linux/pwm.h
+Auto-merging drivers/pwm/pwm-vt8500.c
+Auto-merging drivers/pwm/pwm-tiehrpwm.c
+Auto-merging drivers/pwm/pwm-tiecap.c
+Auto-merging drivers/pwm/pwm-tegra.c
+Auto-merging drivers/pwm/core.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/atmel-tcb-pwm.txt | 18 +
+ .../devicetree/bindings/pwm/vt8500-pwm.txt | 9 +-
+ drivers/pwm/Kconfig | 18 +-
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/core.c | 14 +
+ drivers/pwm/pwm-atmel-tcb.c | 445 +++++++++++++++++++++
+ drivers/pwm/pwm-tegra.c | 4 +-
+ drivers/pwm/pwm-tiecap.c | 53 +++
+ drivers/pwm/pwm-tiehrpwm.c | 93 ++++-
+ drivers/pwm/pwm-twl-led.c | 1 +
+ drivers/pwm/pwm-twl.c | 10 +-
+ drivers/pwm/pwm-vt8500.c | 87 +++-
+ drivers/video/backlight/pwm_bl.c | 20 +-
+ include/linux/pwm.h | 10 +
+ 14 files changed, 741 insertions(+), 42 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/atmel-tcb-pwm.txt
+ create mode 100644 drivers/pwm/pwm-atmel-tcb.c
+Merging dma-buf/for-next (90b6e90 dma-buf: implement vmap refcounting in the interface logic)
+$ git merge dma-buf/for-next
+Auto-merging include/linux/dma-buf.h
+Auto-merging drivers/base/dma-buf.c
+Merge made by the 'recursive' strategy.
+ Documentation/dma-buf-sharing.txt | 6 +++++-
+ drivers/base/dma-buf.c | 43 ++++++++++++++++++++++++++++++++++-----
+ include/linux/dma-buf.h | 4 +++-
+ 3 files changed, 46 insertions(+), 7 deletions(-)
+Merging userns/for-next (139321c cifs: Enable building with user namespaces enabled.)
+$ git merge userns/for-next
+Resolved 'net/sunrpc/svcauth_unix.c' using previous resolution.
+Auto-merging net/sunrpc/svcauth_unix.c
+CONFLICT (content): Merge conflict in net/sunrpc/svcauth_unix.c
+Auto-merging net/sunrpc/auth_gss/svcauth_gss.c
+Auto-merging net/sunrpc/auth_gss/auth_gss.c
+Auto-merging mm/shmem.c
+Auto-merging init/Kconfig
+Auto-merging fs/nfsd/nfs4xdr.c
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/nfsd/nfs4recover.c
+Auto-merging fs/nfsd/nfs4idmap.c
+Auto-merging fs/nfsd/export.c
+Auto-merging fs/nfs/inode.c
+Auto-merging fs/gfs2/xattr.c
+Auto-merging fs/gfs2/sys.c
+Auto-merging fs/gfs2/super.c
+Auto-merging fs/gfs2/quota.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/gfs2/incore.h
+Auto-merging fs/gfs2/dir.c
+Auto-merging fs/gfs2/bmap.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/cifs/connect.c
+Auto-merging fs/cifs/cifssmb.c
+Auto-merging fs/cifs/cifsglob.h
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/ceph/mds_client.h
+Auto-merging fs/ceph/mds_client.c
+Auto-merging fs/ceph/caps.c
+Auto-merging fs/9p/vfs_inode_dotl.c
+Auto-merging fs/9p/vfs_inode.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fa8d621] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/namespaces/resource-control.txt | 14 +++
+ fs/9p/fid.c | 17 ++--
+ fs/9p/v9fs.c | 34 +++++--
+ fs/9p/v9fs.h | 10 +-
+ fs/9p/vfs_inode.c | 6 +-
+ fs/9p/vfs_inode_dotl.c | 10 +-
+ fs/afs/afs.h | 11 +-
+ fs/afs/fsclient.c | 14 ++-
+ fs/afs/inode.c | 6 +-
+ fs/afs/super.c | 6 ++
+ fs/ceph/caps.c | 17 ++--
+ fs/ceph/inode.c | 23 +++--
+ fs/ceph/mds_client.c | 4 +-
+ fs/ceph/mds_client.h | 4 +-
+ fs/ceph/super.h | 4 +-
+ fs/cifs/cifs_fs_sb.h | 8 +-
+ fs/cifs/cifs_spnego.c | 6 +-
+ fs/cifs/cifsacl.c | 47 ++++++---
+ fs/cifs/cifsfs.c | 14 ++-
+ fs/cifs/cifsglob.h | 22 ++--
+ fs/cifs/cifspdu.h | 1 -
+ fs/cifs/cifsproto.h | 9 +-
+ fs/cifs/cifssmb.c | 10 +-
+ fs/cifs/connect.c | 66 ++++++++----
+ fs/cifs/dir.c | 18 ++--
+ fs/cifs/file.c | 8 +-
+ fs/cifs/inode.c | 50 ++++++----
+ fs/cifs/misc.c | 2 +-
+ fs/coda/cache.c | 4 +-
+ fs/coda/coda_fs_i.h | 2 +-
+ fs/coda/coda_linux.c | 8 +-
+ fs/coda/inode.c | 6 +-
+ fs/coda/psdev.c | 7 ++
+ fs/coda/upcall.c | 10 +-
+ fs/devpts/inode.c | 18 ++++
+ fs/gfs2/acl.c | 2 +-
+ fs/gfs2/bmap.c | 2 +-
+ fs/gfs2/dir.c | 2 +-
+ fs/gfs2/glops.c | 4 +-
+ fs/gfs2/incore.h | 3 +-
+ fs/gfs2/inode.c | 32 +++---
+ fs/gfs2/quota.c | 138 ++++++++++----------------
+ fs/gfs2/quota.h | 15 +--
+ fs/gfs2/super.c | 6 +-
+ fs/gfs2/sys.c | 14 ++-
+ fs/gfs2/xattr.c | 4 +-
+ fs/ncpfs/inode.c | 55 ++++++----
+ fs/ncpfs/ioctl.c | 25 +++--
+ fs/ncpfs/ncp_fs_sb.h | 6 +-
+ fs/nfs/idmap.c | 53 ++++++----
+ fs/nfs/inode.c | 12 +--
+ fs/nfs/nfs2xdr.c | 19 +++-
+ fs/nfs/nfs3xdr.c | 18 +++-
+ fs/nfs/nfs4xdr.c | 16 +--
+ fs/nfs_common/nfsacl.c | 41 +++++---
+ fs/nfsd/acl.h | 2 -
+ fs/nfsd/auth.c | 12 +--
+ fs/nfsd/auth.h | 6 --
+ fs/nfsd/export.c | 22 ++--
+ fs/nfsd/idmap.h | 8 +-
+ fs/nfsd/nfs3xdr.c | 14 +--
+ fs/nfsd/nfs4acl.c | 63 ++++++++----
+ fs/nfsd/nfs4idmap.c | 38 ++++---
+ fs/nfsd/nfs4recover.c | 4 +-
+ fs/nfsd/nfs4state.c | 6 +-
+ fs/nfsd/nfs4xdr.c | 54 ++++++----
+ fs/nfsd/nfsxdr.c | 14 +--
+ fs/nfsd/state.h | 4 +-
+ fs/nfsd/vfs.c | 8 +-
+ fs/ocfs2/acl.c | 31 +++++-
+ fs/ocfs2/dlmglue.c | 8 +-
+ fs/ocfs2/file.c | 11 +-
+ fs/ocfs2/inode.c | 12 +--
+ fs/ocfs2/namei.c | 4 +-
+ fs/ocfs2/refcounttree.c | 2 +-
+ fs/ramfs/inode.c | 1 +
+ include/linux/coda_psdev.h | 2 +-
+ include/linux/nfs4.h | 6 +-
+ include/linux/nfs_idmap.h | 9 +-
+ include/linux/nfs_xdr.h | 4 +-
+ include/linux/nfsd/export.h | 4 +-
+ include/linux/sunrpc/auth.h | 7 +-
+ include/linux/sunrpc/svcauth.h | 4 +-
+ include/linux/user_namespace.h | 10 +-
+ include/net/9p/9p.h | 14 +--
+ include/net/9p/client.h | 12 +--
+ init/Kconfig | 20 ++--
+ ipc/mqueue.c | 1 +
+ kernel/sys.c | 5 +-
+ kernel/user.c | 4 +-
+ kernel/user_namespace.c | 62 +++++++++---
+ mm/shmem.c | 2 +
+ net/9p/client.c | 43 ++++----
+ net/9p/protocol.c | 49 +++++++--
+ net/ceph/ceph_common.c | 5 +
+ net/sunrpc/auth.c | 6 +-
+ net/sunrpc/auth_generic.c | 16 +--
+ net/sunrpc/auth_gss/auth_gss.c | 45 ++++++---
+ net/sunrpc/auth_gss/svcauth_gss.c | 18 +++-
+ net/sunrpc/auth_unix.c | 36 +++----
+ net/sunrpc/svcauth_unix.c | 43 +++++---
+ 101 files changed, 1058 insertions(+), 656 deletions(-)
+ create mode 100644 Documentation/namespaces/resource-control.txt
+Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check)
+$ git merge ktest/for-next
+Merge made by the 'recursive' strategy.
+ .../testing/ktest/examples/include/patchcheck.conf | 37 ++++
+ tools/testing/ktest/ktest.pl | 190 +++++++++++++++++++--
+ tools/testing/ktest/sample.conf | 44 +++++
+ 3 files changed, 253 insertions(+), 18 deletions(-)
+Merging signal/for-next (235b802 x86: convert to ksignal)
+$ git merge signal/for-next
+Resolved 'arch/mips/kernel/linux32.c' using previous resolution.
+Resolved 'arch/mips/kernel/process.c' using previous resolution.
+Resolved 'arch/mips/kernel/scall64-o32.S' using previous resolution.
+Resolved 'arch/mips/kernel/signal.c' using previous resolution.
+Resolved 'arch/mips/kernel/signal32.c' using previous resolution.
+Resolved 'arch/mips/kernel/signal_n32.c' using previous resolution.
+Resolved 'arch/mips/kernel/syscall.c' using previous resolution.
+Resolved 'arch/powerpc/Kconfig' using previous resolution.
+Resolved 'arch/s390/Kconfig' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Auto-merging kernel/signal.c
+Auto-merging kernel/futex_compat.c
+Auto-merging include/linux/sched.h
+Auto-merging include/asm-generic/unistd.h
+Auto-merging arch/xtensa/include/uapi/asm/unistd.h
+Removing arch/x86/um/syscalls_32.c
+Auto-merging arch/x86/um/Kconfig
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/entry_32.S
+Auto-merging arch/x86/ia32/ia32entry.S
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/tile/include/asm/syscalls.h
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/s390/Kconfig
+CONFLICT (content): Merge conflict in arch/s390/Kconfig
+Auto-merging arch/powerpc/kernel/signal.c
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Auto-merging arch/parisc/kernel/signal.c
+Auto-merging arch/parisc/kernel/entry.S
+Auto-merging arch/openrisc/kernel/entry.S
+Auto-merging arch/mips/kernel/syscall.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/syscall.c
+Auto-merging arch/mips/kernel/signal_n32.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/signal_n32.c
+Auto-merging arch/mips/kernel/signal32.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/signal32.c
+Auto-merging arch/mips/kernel/signal.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/signal.c
+Auto-merging arch/mips/kernel/scall64-o32.S
+CONFLICT (content): Merge conflict in arch/mips/kernel/scall64-o32.S
+Auto-merging arch/mips/kernel/scall64-n32.S
+Auto-merging arch/mips/kernel/scall64-64.S
+Auto-merging arch/mips/kernel/scall32-o32.S
+Auto-merging arch/mips/kernel/process.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
+Auto-merging arch/mips/kernel/linux32.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c
+Auto-merging arch/mips/include/uapi/asm/signal.h
+Auto-merging arch/mips/include/asm/compat.h
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/microblaze/kernel/signal.c
+Auto-merging arch/microblaze/kernel/ptrace.c
+Auto-merging arch/m68k/include/asm/unistd.h
+Auto-merging arch/frv/Kconfig
+Auto-merging arch/arm64/kernel/signal32.c
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/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 3189a80] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 29 ++-
+ arch/alpha/Kconfig | 3 +-
+ arch/alpha/include/asm/signal.h | 11 +-
+ arch/alpha/include/asm/unistd.h | 1 -
+ arch/alpha/kernel/process.c | 1 -
+ arch/alpha/kernel/signal.c | 121 +++++-------
+ arch/arm/Kconfig | 2 +
+ arch/arm/include/asm/signal.h | 18 +-
+ arch/arm/include/asm/unistd.h | 2 -
+ arch/arm/kernel/calls.S | 2 +-
+ arch/arm/kernel/entry-common.S | 5 -
+ arch/arm/kernel/signal.c | 160 +++++----------
+ arch/arm64/Kconfig | 2 +
+ arch/arm64/include/asm/syscalls.h | 2 -
+ arch/arm64/include/asm/unistd.h | 2 -
+ arch/arm64/include/asm/unistd32.h | 4 +-
+ arch/arm64/kernel/entry.S | 5 -
+ arch/arm64/kernel/signal.c | 17 +-
+ arch/arm64/kernel/signal32.c | 220 +--------------------
+ arch/arm64/kernel/sys.c | 1 -
+ arch/arm64/kernel/sys32.S | 5 -
+ arch/avr32/include/asm/signal.h | 11 +-
+ arch/avr32/include/asm/unistd.h | 2 -
+ arch/avr32/kernel/signal.c | 15 +-
+ arch/avr32/kernel/syscall-stubs.S | 6 -
+ arch/avr32/kernel/syscall_table.S | 2 +-
+ arch/blackfin/include/asm/unistd.h | 2 -
+ arch/blackfin/kernel/signal.c | 12 +-
+ arch/c6x/kernel/entry.S | 12 --
+ arch/cris/Kconfig | 2 +
+ arch/cris/arch-v10/kernel/signal.c | 65 +------
+ arch/cris/arch-v32/kernel/signal.c | 68 +------
+ arch/cris/include/asm/signal.h | 19 +-
+ arch/cris/include/asm/unistd.h | 2 -
+ arch/frv/Kconfig | 2 +
+ arch/frv/include/asm/signal.h | 7 -
+ arch/frv/include/asm/unistd.h | 2 -
+ arch/frv/kernel/signal.c | 55 +-----
+ arch/h8300/Kconfig | 2 +
+ arch/h8300/include/asm/signal.h | 18 +-
+ arch/h8300/include/asm/unistd.h | 2 -
+ arch/h8300/kernel/signal.c | 72 +------
+ arch/h8300/kernel/syscalls.S | 15 --
+ arch/hexagon/kernel/signal.c | 16 +-
+ arch/ia64/include/asm/signal.h | 10 -
+ arch/ia64/include/asm/unistd.h | 8 -
+ arch/ia64/kernel/signal.c | 19 +-
+ arch/m32r/include/asm/signal.h | 11 +-
+ arch/m32r/include/asm/unistd.h | 2 -
+ arch/m32r/kernel/signal.c | 16 +-
+ arch/m68k/Kconfig | 2 +
+ arch/m68k/include/asm/signal.h | 19 +-
+ arch/m68k/include/asm/unistd.h | 2 -
+ arch/m68k/kernel/signal.c | 59 +-----
+ arch/microblaze/include/asm/unistd.h | 2 -
+ arch/microblaze/kernel/entry-nommu.S | 21 +-
+ arch/microblaze/kernel/entry.S | 62 +++---
+ arch/microblaze/kernel/ptrace.c | 23 ---
+ arch/microblaze/kernel/signal.c | 26 +--
+ arch/mips/Kconfig | 1 +
+ arch/mips/include/asm/compat.h | 8 +
+ arch/mips/include/asm/signal.h | 2 +
+ arch/mips/include/asm/sim.h | 24 +--
+ arch/mips/include/asm/unistd.h | 3 +-
+ arch/mips/include/uapi/asm/signal.h | 6 +-
+ arch/mips/kernel/linux32.c | 44 -----
+ arch/mips/kernel/process.c | 7 +-
+ arch/mips/kernel/scall32-o32.S | 4 +-
+ arch/mips/kernel/scall64-64.S | 4 +-
+ arch/mips/kernel/scall64-n32.S | 20 +-
+ arch/mips/kernel/scall64-o32.S | 22 +--
+ arch/mips/kernel/signal.c | 48 +----
+ arch/mips/kernel/signal32.c | 241 +----------------------
+ arch/mips/kernel/signal_n32.c | 63 +-----
+ arch/mips/kernel/syscall.c | 54 +-----
+ arch/mn10300/Kconfig | 2 +
+ arch/mn10300/include/asm/signal.h | 19 +-
+ arch/mn10300/include/asm/unistd.h | 2 -
+ arch/mn10300/kernel/signal.c | 60 +-----
+ arch/openrisc/kernel/entry.S | 4 -
+ arch/openrisc/kernel/signal.c | 15 +-
+ arch/parisc/include/asm/signal.h | 6 +-
+ arch/parisc/include/asm/unistd.h | 3 -
+ arch/parisc/kernel/entry.S | 38 ----
+ arch/parisc/kernel/signal.c | 19 +-
+ arch/parisc/kernel/signal32.c | 142 --------------
+ arch/parisc/kernel/signal32.h | 23 ---
+ arch/parisc/kernel/sys32.h | 12 --
+ arch/parisc/kernel/sys_parisc32.c | 12 --
+ arch/parisc/kernel/syscall_table.S | 10 +-
+ arch/powerpc/Kconfig | 3 +
+ arch/powerpc/include/asm/signal.h | 1 +
+ arch/powerpc/include/asm/syscalls.h | 15 --
+ arch/powerpc/include/asm/systbl.h | 63 +++---
+ arch/powerpc/include/asm/unistd.h | 4 -
+ arch/powerpc/include/uapi/asm/signal.h | 6 +-
+ arch/powerpc/kernel/ppc32.h | 26 +--
+ arch/powerpc/kernel/signal.c | 7 -
+ arch/powerpc/kernel/signal_32.c | 253 +-----------------------
+ arch/powerpc/kernel/signal_64.c | 11 +-
+ arch/powerpc/kernel/sys_ppc32.c | 301 -----------------------------
+ arch/s390/Kconfig | 3 +
+ arch/s390/include/asm/signal.h | 19 +-
+ arch/s390/include/asm/unistd.h | 3 -
+ arch/s390/kernel/compat_linux.c | 80 --------
+ arch/s390/kernel/compat_linux.h | 34 +---
+ arch/s390/kernel/compat_signal.c | 134 +------------
+ arch/s390/kernel/compat_wrapper.S | 144 --------------
+ arch/s390/kernel/entry.h | 4 -
+ arch/s390/kernel/signal.c | 56 +-----
+ arch/s390/kernel/syscalls.S | 46 ++---
+ arch/score/include/asm/syscalls.h | 1 -
+ arch/score/kernel/entry.S | 5 -
+ arch/score/kernel/signal.c | 21 +-
+ arch/sh/Kconfig | 2 +
+ arch/sh/include/asm/syscalls_32.h | 6 -
+ arch/sh/include/asm/unistd.h | 2 -
+ arch/sh/include/uapi/asm/signal.h | 2 +
+ arch/sh/kernel/signal_32.c | 63 +-----
+ arch/sh/kernel/signal_64.c | 62 +-----
+ arch/sparc/Kconfig | 4 +
+ arch/sparc/include/asm/compat_signal.h | 6 -
+ arch/sparc/include/asm/signal.h | 6 +-
+ arch/sparc/include/asm/unistd.h | 3 -
+ arch/sparc/include/uapi/asm/signal.h | 2 +
+ arch/sparc/kernel/entry.S | 8 -
+ arch/sparc/kernel/signal32.c | 202 +++++++------------
+ arch/sparc/kernel/signal_32.c | 175 ++++++-----------
+ arch/sparc/kernel/signal_64.c | 142 +++++---------
+ arch/sparc/kernel/sys32.S | 86 ---------
+ arch/sparc/kernel/sys_sparc32.c | 185 ++----------------
+ arch/sparc/kernel/sys_sparc_32.c | 48 +----
+ arch/sparc/kernel/syscalls.S | 6 -
+ arch/sparc/kernel/systbls.h | 4 +-
+ arch/sparc/kernel/systbls_32.S | 2 +-
+ arch/sparc/kernel/systbls_64.S | 84 ++++----
+ arch/tile/include/asm/compat.h | 8 -
+ arch/tile/include/asm/syscalls.h | 2 -
+ arch/tile/include/asm/unistd.h | 1 -
+ arch/tile/kernel/compat_signal.c | 112 +----------
+ arch/tile/kernel/signal.c | 15 +-
+ arch/um/kernel/signal.c | 10 -
+ arch/unicore32/kernel/entry.S | 5 -
+ arch/unicore32/kernel/signal.c | 12 +-
+ arch/x86/Kconfig | 5 +-
+ arch/x86/ia32/ia32_signal.c | 50 ++---
+ arch/x86/ia32/ia32entry.S | 12 +-
+ arch/x86/ia32/sys_ia32.c | 171 ----------------
+ arch/x86/include/asm/fpu-internal.h | 5 +-
+ arch/x86/include/asm/ia32.h | 15 --
+ arch/x86/include/asm/signal.h | 22 +--
+ arch/x86/include/asm/sys_ia32.h | 16 +-
+ arch/x86/include/asm/syscalls.h | 13 +-
+ arch/x86/include/asm/unistd.h | 2 -
+ arch/x86/include/uapi/asm/signal.h | 8 +-
+ arch/x86/kernel/entry_32.S | 45 -----
+ arch/x86/kernel/entry_64.S | 34 ++--
+ arch/x86/kernel/ioport.c | 3 +-
+ arch/x86/kernel/signal.c | 184 ++++++------------
+ arch/x86/kernel/vm86_32.c | 8 +-
+ arch/x86/syscalls/syscall_32.tbl | 22 +--
+ arch/x86/syscalls/syscall_64.tbl | 6 +-
+ arch/x86/um/Kconfig | 3 +-
+ arch/x86/um/Makefile | 4 +-
+ arch/x86/um/shared/sysdep/syscalls_32.h | 5 -
+ arch/x86/um/signal.c | 15 +-
+ arch/x86/um/sys_call_table_32.c | 4 -
+ arch/x86/um/syscalls_32.c | 38 ----
+ arch/xtensa/include/asm/signal.h | 11 +-
+ arch/xtensa/include/asm/syscall.h | 7 -
+ arch/xtensa/include/asm/unistd.h | 2 -
+ arch/xtensa/include/uapi/asm/unistd.h | 2 +-
+ arch/xtensa/kernel/signal.c | 18 +-
+ fs/compat.c | 52 +----
+ fs/timerfd.c | 85 ++++++--
+ include/asm-generic/syscalls.h | 16 --
+ include/asm-generic/unistd.h | 3 -
+ include/linux/compat.h | 50 ++++-
+ include/linux/sched.h | 12 +-
+ include/linux/signal.h | 52 ++++-
+ include/linux/syscalls.h | 25 ++-
+ include/uapi/asm-generic/signal.h | 10 +-
+ include/uapi/asm-generic/unistd.h | 4 +-
+ kernel/compat.c | 72 +++----
+ kernel/futex_compat.c | 19 +-
+ kernel/signal.c | 332 ++++++++++++++++++++++++++++----
+ 186 files changed, 1364 insertions(+), 4825 deletions(-)
+ delete mode 100644 arch/x86/um/syscalls_32.c
+Merging clk/clk-next (fde8bc5 clk: sunxi: remove stale Makefile entry)
+$ git merge clk/clk-next
+Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution.
+Removing include/linux/clk/sunxi.h
+Auto-merging include/asm-generic/vmlinux.lds.h
+CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
+Auto-merging drivers/clocksource/sunxi_timer.c
+Auto-merging drivers/clk/versatile/clk-vexpress.c
+Auto-merging drivers/clk/mxs/clk-imx28.c
+Removing drivers/clk/clk-sunxi.c
+Auto-merging drivers/clk/clk-highbank.c
+Auto-merging drivers/clk/Makefile
+Auto-merging arch/arm/mach-highbank/highbank.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8742f7a] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/clock/prima2-clock.txt | 73 ++++++++
+ arch/arm/boot/dts/prima2.dtsi | 31 +++-
+ arch/arm/mach-highbank/core.h | 1 -
+ arch/arm/mach-highbank/highbank.c | 3 +-
+ drivers/clk/Makefile | 10 +-
+ drivers/clk/clk-divider.c | 6 +-
+ drivers/clk/clk-fixed-factor.c | 5 +-
+ drivers/clk/clk-fixed-rate.c | 3 +-
+ drivers/clk/clk-highbank.c | 18 +-
+ drivers/clk/clk-max77686.c | 37 ++--
+ drivers/clk/clk-prima2.c | 205 ++++++++-------------
+ drivers/clk/clk-sunxi.c | 30 ---
+ drivers/clk/clk-vt8500.c | 143 ++++++++++++--
+ drivers/clk/clk-zynq.c | 14 +-
+ drivers/clk/clk.c | 169 ++++++++++++++++-
+ drivers/clk/mxs/clk-imx23.c | 2 +-
+ drivers/clk/mxs/clk-imx28.c | 2 +-
+ drivers/clk/versatile/clk-vexpress-osc.c | 1 +
+ drivers/clk/versatile/clk-vexpress.c | 8 +-
+ drivers/clocksource/sunxi_timer.c | 4 +-
+ include/asm-generic/vmlinux.lds.h | 10 +
+ include/linux/clk-provider.h | 6 +
+ include/linux/clk/sunxi.h | 22 ---
+ 23 files changed, 527 insertions(+), 276 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/prima2-clock.txt
+ delete mode 100644 drivers/clk/clk-sunxi.c
+ delete mode 100644 include/linux/clk/sunxi.h
+Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool)
+$ git merge random/dev
+Already up-to-date.
+Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
+$ git merge lzo-update/lzo-update
+Removing lib/lzo/lzo1x_decompress.c
+Auto-merging crypto/testmgr.h
+Merge made by the 'recursive' strategy.
+ crypto/testmgr.h | 38 ++---
+ include/linux/lzo.h | 15 +-
+ lib/decompress_unlzo.c | 2 +-
+ lib/lzo/Makefile | 2 +-
+ lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++-----------------
+ lib/lzo/lzo1x_decompress.c | 255 ------------------------------
+ lib/lzo/lzo1x_decompress_safe.c | 237 ++++++++++++++++++++++++++++
+ lib/lzo/lzodefs.h | 34 +++-
+ 8 files changed, 488 insertions(+), 430 deletions(-)
+ delete mode 100644 lib/lzo/lzo1x_decompress.c
+ create mode 100644 lib/lzo/lzo1x_decompress_safe.c
+Merging modem_shm/remoteproc-next (c68dc8d remoteproc: Always perserve resource table data)
+$ git merge modem_shm/remoteproc-next
+Auto-merging drivers/remoteproc/remoteproc_virtio.c
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/remoteproc_core.c | 146 +++++++++++++++++------------
+ drivers/remoteproc/remoteproc_elf_loader.c | 96 +++++++++++++------
+ drivers/remoteproc/remoteproc_internal.h | 13 +++
+ drivers/remoteproc/remoteproc_virtio.c | 38 +++++++-
+ drivers/remoteproc/ste_modem_rproc.c | 50 +++++++---
+ include/linux/remoteproc.h | 7 +-
+ 6 files changed, 240 insertions(+), 110 deletions(-)
+Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
+Merging akpm-current/current (4d91892 fb: Yet another band-aid for fixing lockdep mess)
+$ git merge akpm-current/current
+Resolved 'drivers/tty/vt/vt.c' using previous resolution.
+Auto-merging drivers/tty/vt/vt.c
+CONFLICT (content): Merge conflict in drivers/tty/vt/vt.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 54e5064] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+$ 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: compiler-gcc4.h: Reorder macros based upon gcc ver
+Applying: compiler-gcc.h: Add gcc-recommended GCC_VERSION macro
+Applying: compiler-gcc{3,4}.h: Use GCC_VERSION macro
+Applying: compiler{,-gcc4}.h, bug.h: Remove duplicate macros
+Applying: bug.h: Fix BUILD_BUG_ON macro in __CHECKER__
+Applying: bug.h: Prevent double evaulation of in BUILD_BUG_ON
+Applying: bugh-prevent-double-evaulation-of-in-build_bug_on-fix
+Applying: bug.h: Make BUILD_BUG_ON generate compile-time error
+Applying: compiler.h, bug.h: Prevent double error messages with BUILD_BUG{,_ON}
+Applying: bug.h, compiler.h: Introduce compiletime_assert & BUILD_BUG_ON_MSG
+Applying: bugh-compilerh-introduce-compiletime_assert-build_bug_on_msg-checkpatch-fixes
+Applying: proc: avoid extra pde_put() in proc_fill_super()
+Applying: compat: return -EFAULT on error in waitid()
+Applying: inotify: remove broken mask checks causing unmount to be EINVAL
+Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
+Applying: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: Revert "x86, mm: Make spurious_fault check explicitly check the PRESENT bit"
+Applying: pageattr: prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
+Applying: x86: make 'mem=' option to work for efi platform
+Applying: drivers/md/persistent-data/dm-transaction-manager.c: rename HASH_SIZE
+Applying: cris: Use "int" for ssize_t to match size_t
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: mm: remove free_area_cache use in powerpc architecture
+Applying: mm: use vm_unmapped_area() on powerpc architecture
+Applying: fbcon: clear the logo bitmap from the margin area
+Applying: goldfish: framebuffer driver
+Applying: video: mmp display subsystem
+Applying: video: mmp fb support
+Applying: video: mmp display controller support
+Applying: video: mmp: add tpo hvga panel supported
+Applying: video: mmpdisp: add spi port in display controller
+Applying: ARM: mmp: added device for display controller
+Applying: ARM: mmp: enable display in ttc_dkb
+Applying: ARM: mmp: add display and fb support in pxa910 defconfig
+Applying: drivers/video/Kconfig: specify the SoCs that make use of FB_IMX
+Applying: cyber2000fb: avoid palette corruption at higher clocks
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: timer_list: split timer_list_show_tickdevices()
+Applying: timer_list: convert timer list to be a proper seq_file
+Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix
+Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2
+Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2-fix
+Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
+Applying: ia64/mm: fix a bad_page bug when crash kernel booting
+Applying: mm: use vm_unmapped_area() on ia64 architecture
+Applying: mm: use vm_unmapped_area() in hugetlbfs on ia64 architecture
+Applying: scripts/tags.sh: add ctags magic for declarations of popular kernel type
+Applying: mm: use vm_unmapped_area() on parisc architecture
+Applying: sched: /proc/sched_stat fails on very very large machines
+Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-fix
+Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2
+Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix
+Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix-fix
+Applying: sched: /proc/sched_debug fails on very very large machines
+Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-fix
+Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2
+Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2-fix
+Applying: lockdep: make lockdep_assert_held() not have a return value
+Applying: block: don't select PERCPU_RWSEM
+Applying: drivers/block/swim3.c: fix null pointer dereference
+Applying: cfq: fix lock imbalance with failed allocations
+Applying: block: use i_size_write() in bd_set_size()
+Applying: block: remove redundant check to bd_openers()
+Applying: loopdev: fix a deadlock
+Applying: loopdev: update block device size in loop_set_status()
+Applying: loopdev: move common code into loop_figure_size()
+Applying: loopdev: remove an user triggerable oops
+Applying: loopdev: ignore negative offset when calculate loop device size
+Applying: block: restore /proc/partitions to not display non-partitionable removable devices
+Applying: fs: change return values from -EACCES to -EPERM
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
+Applying: memcg, oom: provide more precise dump info while memcg oom happening
+Applying: mm/memcontrol.c: convert printk(KERN_FOO) to pr_foo()
+Applying: mm/hugetlb.c: convert to pr_foo()
+Applying: CMA: make putback_lru_pages() call conditional
+Applying: mm/page_alloc.c:__alloc_contig_migrate_range(): cleanup
+Applying: mm: memcg: only evict file pages when we have plenty
+Applying: mm: vmscan: save work scanning (almost) empty LRU lists
+Applying: mm: vmscan: clarify how swappiness, highest priority, memcg interact
+Applying: mm: vmscan: improve comment on low-page cache handling
+Applying: mm: vmscan: clean up get_scan_count()
+Applying: mm-vmscan-clean-up-get_scan_count-fix
+Applying: mm: vmscan: compaction works against zones, not lruvecs
+Applying: mm-vmscan-compaction-works-against-zones-not-lruvecs-fix
+Applying: mm: reduce rmap overhead for ex-KSM page copies created on swap faults
+Applying: mm/page_alloc.c:__setup_per_zone_wmarks: make min_pages unsigned long
+Applying: mm/vmscan.c:__zone_reclaim(): replace max_t() with max()
+Applying: mm: compaction: do not accidentally skip pageblocks in the migrate scanner
+Applying: mm/huge_memory.c: use new hashtable implementation
+Applying: mm/ksm.c: use new hashtable implementation
+Applying: memcg,vmscan: do not break out targeted reclaim without reclaimed pages
+Applying: mmotm: memcgvmscan-do-not-break-out-targeted-reclaim-without-reclaimed-pages.patch fix
+Applying: mmotm-memcgvmscan-do-not-break-out-targeted-reclaim-without-reclaimed-pagespatch-fix-fix
+Applying: mm: make madvise(MADV_WILLNEED) support swap file prefetch
+Applying: mm-make-madvisemadv_willneed-support-swap-file-prefetch-fix
+Applying: mm: fix BUG on madvise early failure
+Applying: mm: compaction: make __compact_pgdat() and compact_pgdat() return void
+Applying: mm: avoid calling pgdat_balanced() needlessly
+Applying: mm: remap_file_pages() fixes
+Applying: mm: introduce mm_populate() for populating new vmas
+Applying: mm: use mm_populate() for blocking remap_file_pages()
+Applying: mm: use mm_populate() when adjusting brk with MCL_FUTURE in effect
+Applying: mm: use mm_populate() for mremap() of VM_LOCKED vmas
+Applying: mm: remove flags argument to mmap_region
+Applying: mm-remove-flags-argument-to-mmap_region-fix
+Applying: mm: directly use __mlock_vma_pages_range() in find_extend_vma()
+Applying: mm: introduce VM_POPULATE flag to better deal with racy userspace programs
+Applying: mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool
+Applying: mm: memory_hotplug: no need to check res twice in add_memory
+Applying: memory-hotplug: try to offline the memory twice to avoid dependence
+Applying: memory-hotplug: check whether all memory blocks are offlined or not when removing memory
+Applying: memory-hotplug: remove redundant codes
+Applying: memory-hotplug: remove /sys/firmware/memmap/X sysfs
+Applying: Bug fix: Hold spinlock across find|remove /sys/firmware/memmap/X operation.
+Applying: Bug fix: Fix the wrong comments of map_entries.
+Applying: Bug fix: Reuse the storage of /sys/firmware/memmap/X/ allocated by bootmem.
+Applying: Bug fix: Fix section mismatch problem of release_firmware_map_entry().
+Applying: Bug fix: Fix the doc format in drivers/firmware/memmap.c
+Applying: memory-hotplug: introduce new arch_remove_memory() for removing page table
+Applying: memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap
+Applying: memory-hotplug-implement-register_page_bootmem_info_section-of-sparse-vmemmap-fix
+Applying: memory-hotplug: introduce CONFIG_HAVE_BOOTMEM_INFO_NODE and revert register_page_bootmem_info_node() when platform not support
+Applying: memory-hotplug: cleanup: removing the arch specific functions without any implementation
+Applying: memory-hotplug: mm/Kconfig: move auto selects from MEMORY_HOTPLUG to MEMORY_HOTREMOVE as needed
+Applying: memory-hotplug: move pgdat_resize_lock into sparse_remove_one_section()
+Applying: memory-hotplug: common APIs to support page tables hot-remove
+Applying: memory-hotplug-common-apis-to-support-page-tables-hot-remove-fix
+Applying: Bug fix: Do not calculate direct mapping pages when freeing vmemmap pagetables.
+Applying: Bug fix: Do not free direct mapping pages twice.
+Applying: Bug fix: Do not free page split from hugepage one by one.
+Applying: Bug fix: Do not split pages when freeing pagetable pages.
+Applying: memory-hotplug-common-apis-to-support-page-tables-hot-remove-fix-fix-fix-fix-fix-fix
+Applying: memory-hotplug-common-apis-to-support-page-tables-hot-remove-fix-fix-fix-fix-fix-fix-fix
+Applying: memory-hotplug: remove page table of x86_64 architecture
+Applying: memory-hotplug-remove-page-table-of-x86_64-architecture-fix
+Applying: memory-hotplug: remove memmap of sparse-vmemmap
+Applying: memory-hotplug-remove-memmap-of-sparse-vmemmap-fix
+Applying: memory-hotplug: integrated __remove_section() of CONFIG_SPARSEMEM_VMEMMAP.
+Applying: memory_hotplug: clear zone when removing the memory
+Applying: memory-hotplug: remove sysfs file of node
+Applying: memory-hotplug: free node_data when a node is offlined
+Applying: memory-hotplug: do not allocate pgdat if it was not freed when offline.
+Applying: memory-hotplug-do-not-allocate-pdgat-if-it-was-not-freed-when-offline-fix
+Applying: memory-hotplug-do-not-allocate-pdgat-if-it-was-not-freed-when-offline-fix-fix
+Applying: memory-hotplug: consider compound pages when free memmap
+Applying: mempolicy: fix is_valid_nodemask()
+Applying: cpu_hotplug: clear apicid to node when the cpu is hotremoved
+Applying: cpu_hotplug-clear-apicid-to-node-when-the-cpu-is-hotremoved-fix
+Applying: memory-hotplug: export the function try_offline_node()
+Applying: memory-hotplug: export the function try_offline_node() fix
+Applying: cpu-hotplug, memory-hotplug: try offlining the node when hotremoving a cpu
+Applying: cpu-hotplug,memory-hotplug: clear cpu_to_node() when offlining the node
+Applying: cpu-hotplugmemory-hotplug-clear-cpu_to_node-when-offlining-the-node-fix
+Applying: sched: do not use cpu_to_node() to find an offlined cpu's node.
+Applying: x86: get pg_data_t's memory from other node
+Applying: page_alloc: add movable_memmap kernel parameter
+Applying: page_alloc-add-movable_memmap-kernel-parameter-fix
+Applying: Bug fix: Fix the doc format.
+Applying: page_alloc-add-movable_memmap-kernel-parameter-fix-fix-checkpatch-fixes
+Applying: page_alloc-add-movable_memmap-kernel-parameter-fix-fix-fix
+Applying: Rename movablecore_map to movablemem_map.
+Applying: page_alloc: introduce zone_movable_limit[] to keep movable limit for nodes
+Applying: Bug fix: Remove the unused sanitize_zone_movable_limit() definition.
+Applying: page_alloc: make movablemem_map have higher priority
+Applying: page_alloc: bootmem limit with movablecore_map
+Applying: acpi, memory-hotplug: parse SRAT before memblock is ready
+Applying: acpi, memory-hotplug: parse SRAT before memblock is ready fix
+Applying: acpi, memory-hotplug: extend movablemem_map ranges to the end of node
+Applying: acpi-memory-hotplug-extend-movablemem_map-ranges-to-the-end-of-node-fix
+Applying: acpi, memory-hotplug: support getting hotplug info from SRAT
+Applying: acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix
+Applying: acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix-fix
+Applying: mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to protect movablecore_map in memblock_overlaps_region().
+Applying: mm: use zone->present_pages instead of zone->managed_pages where appropriate
+Applying: mm: set zone->present_pages to number of existing pages in the zone
+Applying: mm: increase totalram_pages when free pages allocated by bootmem allocator
+Applying: mm: remove MIGRATE_ISOLATE check in hotpath
+Applying: memory-failure: fix an error of mce_bad_pages statistics
+Applying: memory-failure: do code refactor of soft_offline_page()
+Applying: memory-failure: use num_poisoned_pages instead of mce_bad_pages
+Applying: memory-failure-use-num_poisoned_pages-instead-of-mce_bad_pages-fix
+Applying: mm/memory-failure.c: clean up soft_offline_page()
+Applying: mm/memory-failure.c: fix wrong num_poisoned_pages in handling memory error on thp
+Applying: mm-memory-failurec-fix-wrong-num_poisoned_pages-in-handling-memory-error-on-thp-fix
+Applying: mm: don't wait on congested zones in balance_pgdat()
+Applying: mm: teach mm by current context info to not do I/O during memory allocation
+Applying: pm / runtime: introduce pm_runtime_set_memalloc_noio()
+Applying: block/genhd.c: apply pm_runtime_set_memalloc_noio on block devices
+Applying: net/core: apply pm_runtime_set_memalloc_noio on network devices
+Applying: pm / runtime: force memory allocation with no I/O during Runtime PM callbcack
+Applying: usb: forbid memory allocation with I/O during bus reset
+Applying: mm: remove unused memclear_highpage_flush()
+Applying: mm: numa: fix minor typo in numa_next_scan
+Applying: mm: numa: take THP into account when migrating pages for NUMA balancing
+Applying: mm: numa: handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING
+Applying: mm: move page flags layout to separate header
+Applying: mm: Fold page->_last_nid into page->flags where possible
+Applying: mm: numa: Cleanup flow of transhuge page migration
+Applying: mm: don't inline page_mapping()
+Applying: swap: make each swap partition have one address_space
+Applying: swap-make-each-swap-partition-have-one-address_space-fix
+Applying: swap-make-each-swap-partition-have-one-address_space-fix-fix
+Applying: swap: add per-partition lock for swapfile
+Applying: swap-add-per-partition-lock-for-swapfile-fix-fix
+Applying: swap: fix "add per-partition lock for swapfile" for nommu
+Applying: swap: add per-partition lock for swapfile fix
+Applying: swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix
+Applying: mm: Get rid of lockdep whinge on sys_swapon
+Applying: mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
+Applying: page-writeback.c: subtract min_free_kbytes from dirtyable memory
+Applying: page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix
+Applying: page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix-fix
+Applying: memcg: do not create memsw files if swap accounting is disabled
+Applying: memcg: clean up swap accounting initialization code
+Applying: mm: uninline page_xchg_last_nid()
+Applying: mm: init: report on last-nid information stored in page->flags
+Applying: memcg: reduce the size of struct memcg 244-fold.
+Applying: memcg-reduce-the-size-of-struct-memcg-244-fold-fix
+Applying: memcg-reduce-the-size-of-struct-memcg-244-fold-fix-fix
+Applying: memcg: prevent changes to move_charge_at_immigrate during task attach
+Applying: memcg: split part of memcg creation to css_online
+Applying: memcg: fast hierarchy-aware child test
+Applying: memcg-fast-hierarchy-aware-child-test-fix
+Applying: memcg: replace cgroup_lock with memcg specific memcg_lock
+Applying: memcg: increment static branch right after limit set
+Applying: memcg: avoid dangling reference count in creation failure.
+Applying: mm: memmap_init_zone() performance improvement
+Applying: mm: rename page struct field helpers
+Applying: mm-rename-page-struct-field-helpers-fix
+Applying: ksm: allow trees per NUMA node
+Applying: ksm: add sysfs ABI Documentation
+Applying: ksm: trivial tidyups
+Applying: ksm-trivial-tidyups-fix
+Applying: ksm: reorganize ksm_check_stable_tree
+Applying: ksm: get_ksm_page locked
+Applying: ksm: remove old stable nodes more thoroughly
+Applying: ksm: make KSM page migration possible
+Applying: ksm: make !merge_across_nodes migration safe
+Applying: ksm: enable KSM page migration
+Applying: mm: remove offlining arg to migrate_pages
+Applying: ksm: stop hotremove lockdep warning
+Applying: mm: shmem: use new radix tree iterator
+Applying: mm: refactor inactive_file_is_low() to use get_lru_size()
+Applying: mm/mlock.c: document scary-looking stack expansion mlock chain
+Applying: mm: add SECTION_IN_PAGE_FLAGS
+Applying: mm: add & use zone_end_pfn() and zone_spans_pfn()
+Applying: mm: add zone_is_empty() and zone_is_initialized()
+Applying: mm/page_alloc: add a VM_BUG in __free_one_page() if the zone is uninitialized.
+Applying: mmzone: add pgdat_{end_pfn,is_empty}() helpers & consolidate.
+Applying: mm/page_alloc: add informative debugging message in page_outside_zone_boundaries()
+Applying: mm-page_alloc-add-informative-debugging-message-in-page_outside_zone_boundaries-fix
+Applying: mm: add helper ensure_zone_is_initialized()
+Applying: mm/memory_hotplug: use ensure_zone_is_initialized()
+Applying: mm/memory_hotplug: use pgdat_end_pfn() instead of open coding the same.
+Applying: mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
+Applying: mm: use NUMA_NO_NODE
+Applying: mm: remove free_area_cache
+Applying: include/linux/mmzone.h: cleanups
+Applying: include-linux-mmzoneh-cleanups-fix
+Applying: mm: use up free swap space before reaching OOM kill
+Applying: memcg: move mem_cgroup_soft_limit_tree_init to mem_cgroup_init
+Applying: memcg: move memcg_stock initialization to mem_cgroup_init
+Applying: memcg: cleanup mem_cgroup_init comment
+Applying: mm: fix return type for functions nr_free_*_pages
+Applying: ia64: use %ld to print pages calculated in nr_free_buffer_pages
+Applying: fs/buffer.c: change type of max_buffer_heads to unsigned long
+Applying: fs/nfsd: change type of max_delegations, nfsd_drc_max_mem and nfsd_drc_mem_used
+Applying: vmscan: change type of vm_total_pages to unsigned long
+Applying: net: change type of netns_ipvs->sysctl_sync_qlen_max
+Applying: net: change type of virtio_chan->p9_max_pages
+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: mm: use vm_unmapped_area() on frv architecture
+Applying: bdi: allow block devices to say that they require stable page writes
+Applying: mm: only enforce stable page writes if the backing device requires it
+Applying: 9pfs: fix filesystem to wait for stable page writeback
+Applying: block: optionally snapshot page contents to provide stable pages during write
+Applying: ocfs2: wait for page writeback to provide stable pages
+Applying: ubifs: wait for page writeback to provide stable pages
+Applying: mm: use vm_unmapped_area() on alpha architecture
+Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
+Applying: smp: make smp_call_function_many() use logic similar to smp_call_function_single()
+Applying: lib/Kconfig.debug: unhide CONFIG_PANIC_ON_OOPS
+Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock
+Applying: kernel/smp.c: cleanups
+Applying: lib/vsprintf.c: add %pa format specifier for phys_addr_t types
+Applying: get_maintainer.pl: find maintainers for removed files
+Applying: MAINTAINERS: mm: add additional include files to listing
+Applying: backlight: add lms501kf03 LCD driver
+Applying: backlight-add-lms501kf03-lcd-driver-fix
+Applying: backlight-add-lms501kf03-lcd-driver-fix-fix
+Applying: backlight: ld9040: use sleep instead of delay
+Applying: backlight: ld9040: remove unnecessary NULL deference check
+Applying: backlight: ld9040: replace EFAULT with EINVAL
+Applying: backlight: ld9040: remove redundant return variables
+Applying: backlight: ld9040: reorder inclusions of <linux/xxx.h>
+Applying: backlight: s6e63m0: use lowercase names of structs
+Applying: backlight: s6e63m0: use sleep instead of delay
+Applying: backlight: s6e63m0: remove unnecessary NULL deference check
+Applying: backlight: s6e63m0: replace EFAULT with EINVAL
+Applying: backlight: s6e63m0: remove redundant variable 'before_power'
+Applying: backlight: s6e63m0: reorder inclusions of <linux/xxx.h>
+Applying: backlight: ams369fg06: use sleep instead of delay
+Applying: backlight: ams369fg06: remove unnecessary NULL deference check
+Applying: backlight: ams369fg06: replace EFAULT with EINVAL
+Applying: backlight: ams369fg06: remove redundant variable 'before_power'
+Applying: backlight: ams369fg06: reorder inclusions of <linux/xxx.h>
+Applying: backlight: add new lp8788 backlight driver
+Applying: backlight-add-new-lp8788-backlight-driver-checkpatch-fixes
+Applying: backlight: l4f00242t03: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: ld9040: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: s6e63m0: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: ltv350qv: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: tdo24m: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: lms283gf05: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: ams369fg06: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: vgg2432a4: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: tosa: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: corgi_lcd: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: lms501kf03: use spi_get_drvdata and spi_set_drvdata
+Applying: backlight: aat2870: use bl_get_data instead of dev_get_drvdata
+Applying: pwm_backlight: use bl_get_data instead of dev_get_drvdata
+Applying: backlight: ams369fg06: use bl_get_data instead of dev_get_drvdata
+Applying: backlight: corgi_lcd: use bl_get_data instead of dev_get_drvdata
+Applying: backlight: tosa: use bl_get_data instead of dev_get_drvdata
+Applying: backlight: omap1: use bl_get_data instead of dev_get_drvdata
+Applying: backlight: corgi_lcd: use lcd_get_data instead of dev_get_drvdata
+Applying: drivers/video/backlight/lm3639_bl.c: remove ret = -EIO at error paths of probe
+Applying: drivers/video/backlight/l4f00242t03.c: convert to devm_regulator_get()
+Applying: drivers/video/backlight/ld9040.c: use devm_regulator_bulk_get() API
+Applying: fb: backlight: add the Himax HX-8357B LCD controller
+Applying: drivers/video/backlight/Makefile: cleanup
+Applying: backlight: add an AS3711 PMIC backlight driver
+Applying: backlight: as3711: fix compilation breakage
+Applying: drivers/video/backlight/88pm860x_bl.c: add missing of_node_put()
+Applying: drivers/video/backlight/s6e63m0.c: report ->gamma_table_count correctly
+Applying: drivers/video/backlight/lm3630_bl.c: remove ret = -EIO of lm3630_backlight_register()
+Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
+Applying: lib/parser.c: fix up comments for valid return values from match_number
+Applying: decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif
+Applying: decompressors: drop dependency on CONFIG_EXPERT
+Applying: decompressors: make the default XZ_DEC_* config match the selected architecture
+Applying: checkpatch: prefer dev_<level>( to dev_printk(KERN_<LEVEL>
+Applying: checkpatch: warn on unnecessary __dev<foo> section markings
+Applying: checkpatch: add Joe to MAINTAINERS
+Applying: checkpatch: don't emit the CamelCase warning for PageFoo
+Applying: checkpatch: Add check for kcalloc argument order
+Applying: checkpatch: fix USLEEP_RANGE test
+Applying: epoll: support for disabling items, and a self-test app
+Applying: epoll: stop comparing pointers with 0 in self-test app
+Applying: binfmt_elf: remove unused argument in fill_elf_header
+Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
+Applying: kernel/nsproxy.c: remove duplicate task_cred_xxx for user_ns
+Applying: drivers/rtc: dump small buffers via %*ph
+Applying: drivers/rtc/rtc-pxa.c: fix alarm not match issue
+Applying: drivers/rtc/rtc-pxa.c: fix alarm can't wake up system issue
+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-ds1307.c: long block operations bugfix
+Applying: rtc-ds1307-long-block-operations-bugfix-fix
+Applying: rtc: max77686: add Maxim 77686 driver
+Applying: rtc-max77686-add-maxim-77686-driver-fix
+Applying: rtc-pcf8523: add low battery voltage support
+Applying: rtc-pcf8523-add-low-battery-voltage-support-fix
+Applying: drivers/rtc: use of_match_ptr() macro
+Applying: drivers/rtc/rtc-twl: use of_match_ptr() macro
+Applying: drivers/rtc/rtc-pxa.c: avoid cpuid checking
+Applying: drivers/rtc: remove unnecessary semicolons
+Applying: drivers/rtc/rtc-ds2404.c: use module_platform_driver macro
+Applying: rtc: add new lp8788 rtc driver
+Applying: rtc: add RTC driver for TPS80031/TPS80032
+Applying: rtc-add-rtc-driver-for-tps80031-tps80032-v2
+Applying: rtc-add-rtc-driver-for-tps80031-tps80032-v2-fix
+Applying: drivers/rtc/rtc-tps65910.c: enable/disable wake in suspend/resume
+Applying: drivers/rtc/rtc-tps65910.c: remove unnecessary irq stat save and restore
+Applying: drivers/rtc/rtc-tps65910.c: use sleep_pm_ops macro for initialising suspend/resume callbacks
+Applying: drivers/rtc/rtc-tps65910.c: set irq flag to IRQF_EARLY_RESUME during irq request
+Applying: rtc: add support for spi rtc rx4581
+Applying: rtc-add-support-for-spi-rtc-rx4581-checkpatch-fixes
+Applying: rtc rx4581: change err type from unsigned char to int in get_datetime()
+Applying: drivers/rtc/rtc-pl031.c: add wakeup support
+Applying: arm: mvebu: add RTC support for Armada 370 and Armada XP
+Applying: arm: mvebu: update defconfig with Marvell RTC support
+Applying: drivers/rtc/rtc-s3c.c: use dev_dbg() instaed of pr_debug()
+Applying: hfsplus: add osx.* prefix for handling namespace of Mac OS X extended attributes
+Applying: hfsplus: add on-disk layout declarations related to attributes tree
+Applying: hfsplus: add functionality of manipulating by records in attributes tree
+Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
+Applying: hfsplus: add support of manipulation by attributes file
+Applying: fat: add extended fileds to struct fat_boot_sector
+Applying: fat: mark fs as dirty on mount and clean on umount
+Applying: fat: eliminate iterations in fat_search_long and __fat_readdir in case of EOD
+Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
+Applying: Documentation/cgroups/blkio-controller.txt: fix typo
+Applying: signal: allow to send any siginfo to itself
+Applying: signal-allow-to-send-any-siginfo-to-itself-fix
+Applying: signalfd: add ability to return siginfo in a raw format
+Applying: signalfd-add-ability-to-return-siginfo-in-a-raw-format-v2-fix
+Applying: coredump: remove redundant defines for dumpable states
+Applying: fs/proc: clean up printks
+Applying: fs-proc-clean-up-printks-fix
+Applying: seq-file: use SEEK_ macros instead of hardcoded numbers
+Applying: fs/seq_file.c:seq_lseek(): fix switch statement indenting
+Applying: fs-seq_filec-seq_lseek-fix-switch-statement-indenting-checkpatch-fixes
+Applying: fork: unshare: remove dead code
+Applying: fs/exec.c: make bprm_mm_init() static
+Applying: kexec: add the values related to buddy system for filtering free pages.
+Applying: kexec: get rid of duplicate check for hole_end
+Applying: block: fix ext_devt_idr handling
+Applying: idr: fix a subtle bug in idr_get_next()
+Applying: idr: make idr_destroy() imply idr_remove_all()
+Applying: atm/nicstar: don't use idr_remove_all()
+Applying: block/loop: don't use idr_remove_all()
+Applying: firewire: don't use idr_remove_all()
+Applying: drm: don't use idr_remove_all()
+Applying: dm: don't use idr_remove_all()
+Applying: remoteproc: don't use idr_remove_all()
+Applying: rpmsg: don't use idr_remove_all()
+Applying: dlm: use idr_for_each_entry() in recover_idr_clear() error path
+Applying: dlm: don't use idr_remove_all()
+Applying: nfs: idr_destroy() no longer needs idr_remove_all()
+Applying: inotify: don't use idr_remove_all()
+Applying: cgroup: don't use idr_remove_all()
+Applying: nfsd: idr_destroy() no longer needs idr_remove_all()
+Applying: idr: deprecate idr_remove_all()
+Applying: idr: cosmetic updates to struct / initializer definitions
+Applying: idr: relocate idr_for_each_entry() and reorganize id[r|a]_get_new()
+Applying: idr: remove _idr_rc_to_errno() hack
+Applying: idr: refactor idr_get_new_above()
+Applying: idr: implement idr_preload[_end]() and idr_alloc()
+Applying: block: fix synchronization and limit check in blk_alloc_devt()
+Applying: block: convert to idr_alloc()
+Applying: block/loop: convert to idr_alloc()
+Applying: atm/nicstar: convert to idr_alloc()
+Applying: drbd: convert to idr_alloc()
+Applying: dca: convert to idr_alloc()
+Applying: dmaengine: convert to idr_alloc()
+Applying: firewire: add minor number range check to fw_device_init()
+Applying: firewire: convert to idr_alloc()
+Applying: gpio: convert to idr_alloc()
+Applying: drm: convert to idr_alloc()
+Applying: drm/exynos: convert to idr_alloc()
+Applying: drm/i915: convert to idr_alloc()
+Applying: drm/sis: convert to idr_alloc()
+Applying: drm/via: convert to idr_alloc()
+Applying: drm/vmwgfx: convert to idr_alloc()
+Applying: i2c: convert to idr_alloc()
+Applying: IB/core: convert to idr_alloc()
+Applying: IB/amso1100: convert to idr_alloc()
+Applying: IB/cxgb3: convert to idr_alloc()
+Applying: IB/cxgb4: convert to idr_alloc()
+Applying: IB/ehca: convert to idr_alloc()
+Applying: IB/ipath: convert to idr_alloc()
+Applying: IB/mlx4: convert to idr_alloc()
+Applying: IB/ocrdma: convert to idr_alloc()
+Applying: IB/qib: convert to idr_alloc()
+Applying: dm: convert to idr_alloc()
+Applying: memstick: convert to idr_alloc()
+Applying: mfd: convert to idr_alloc()
+Applying: misc/c2port: convert to idr_alloc()
+Applying: misc/tifm_core: convert to idr_alloc()
+Applying: mmc: convert to idr_alloc()
+Applying: mtd: convert to idr_alloc()
+Applying: macvtap: convert to idr_alloc()
+Applying: ppp: convert to idr_alloc()
+Applying: power: convert to idr_alloc()
+Applying: pps: convert to idr_alloc()
+Applying: remoteproc: convert to idr_alloc()
+Applying: rpmsg: convert to idr_alloc()
+Applying: scsi/bfa: convert to idr_alloc()
+Applying: scsi: convert to idr_alloc()
+Applying: target/iscsi: convert to idr_alloc()
+Applying: scsi/lpfc: convert to idr_alloc()
+Applying: thermal: convert to idr_alloc()
+Applying: uio: convert to idr_alloc()
+Applying: vfio: convert to idr_alloc()
+Applying: dlm: convert to idr_alloc()
+Applying: inotify: convert to idr_alloc()
+Applying: ocfs2: convert to idr_alloc()
+Applying: ipc: convert to idr_alloc()
+Applying: cgroup: convert to idr_alloc()
+Applying: events: convert to idr_alloc()
+Applying: posix-timers: convert to idr_alloc()
+Applying: net/9p: convert to idr_alloc()
+Applying: mac80211: convert to idr_alloc()
+Applying: sctp: convert to idr_alloc()
+Applying: nfs4client: convert to idr_alloc()
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: ipmi: remove superfluous kernel/userspace explanation
+Applying: ipmi: add new kernel options to prevent automatic ipmi init
+Applying: ipmi: add options to disable openfirmware and PCI scanning
+Applying: drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally
+Applying: drivers-char-miscc-misc_register-do-not-loop-on-misc_list-unconditionally-fix
+Applying: block/partition/msdos: detect AIX formatted disks even without 55aa
+Applying: sysctl: fix null checking in bin_dn_node_address()
+Applying: kernel/utsname_sysctl.c: put get/get_uts() into CONFIG_PROC_SYSCTL code block
+Applying: kernel/utsname.c: fix wrong comment about clone_uts_ns()
+Applying: mtd: mtd_nandecctest: use prandom_bytes instead of get_random_bytes()
+Applying: mtd: mtd_oobtest: convert to use prandom library
+Applying: mtd: mtd_pagetest: convert to use prandom library
+Applying: mtd: mtd_speedtest: use prandom_bytes
+Applying: mtd: mtd_subpagetest: convert to use prandom library
+Applying: mtd: mtd_stresstest: use prandom_bytes()
+Applying: include/linux/eventfd.h: fix incorrect filename is a comment
+Applying: Documentation/DMA-API-HOWTO.txt: fix typo
+Applying: w1: add support for DS2413 Dual Channel Addressable Switch
+Applying: ocfs2: fix possible use-after-free with AIO
+Applying: fs/direct-io.c: fix possible use-after-free with AIO
+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-kiocb_cancel-fix
+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: wait-add-wait_event_hrtimeout-fix
+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-use-cancellation-list-lazily-fix
+Applying: aio-use-cancellation-list-lazily-fix-fix
+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-give-shared-kioctx-fields-their-own-cachelines-fix
+Applying: aio: reqs_active -> reqs_available
+Applying: aio: percpu reqs_available
+Applying: generic dynamic per cpu refcounting
+Applying: generic-dynamic-per-cpu-refcounting-fix
+Applying: percpu-refcount: sparse fixes
+Applying: generic-dynamic-per-cpu-refcounting-sparse-fixes-fix
+Applying: generic-dynamic-per-cpu-refcounting-doc
+Applying: generic-dynamic-per-cpu-refcounting-doc-fix
+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-dont-include-aioh-in-schedh-fix
+Applying: aio-dont-include-aioh-in-schedh-fix-fix
+Applying: aio-dont-include-aioh-in-schedh-fix-3
+Applying: aio-dont-include-aioh-in-schedh-fix-3-fix
+Applying: aio-dont-include-aioh-in-schedh-fix-3-fix-fix
+Applying: aio: kill ki_key
+Applying: aio: kill ki_retry
+Applying: aio-kill-ki_retry-fix
+Applying: aio-kill-ki_retry-fix-fix
+Applying: block, aio: batch completion for bios/kiocbs
+Applying: block-aio-batch-completion-for-bios-kiocbs-fix
+Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix
+Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix
+Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix
+Applying: Fix build error due to bio_endio_batch
+Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix
+Applying: aio: Fix a null pointer deref in batch_complete_aio
+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: kfifo: move kfifo.c from kernel/ to lib/
+Applying: kfifo: fix kfifo_alloc() and kfifo_init()
+Applying: hlist: drop the node parameter from iterators
+Using index info to reconstruct a base tree...
+M drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+M drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+M fs/nfsd/nfscache.c
+M include/net/sock.h
+M kernel/cgroup.c
+M net/ax25/af_ax25.c
+M net/can/proc.c
+M net/core/dev.c
+M net/decnet/af_decnet.c
+M net/ipv4/fib_trie.c
+M net/ipv4/raw.c
+M net/ipv4/tcp_ipv4.c
+M net/ipv6/addrconf.c
+M net/ipv6/raw.c
+M net/key/af_key.c
+M net/mac80211/mesh_pathtbl.c
+M net/netfilter/ipvs/ip_vs_conn.c
+M net/netfilter/nf_conntrack_expect.c
+M net/netfilter/xt_hashlimit.c
+M net/netlink/af_netlink.c
+M net/netrom/af_netrom.c
+M net/packet/af_packet.c
+M net/rose/af_rose.c
+M net/sched/sch_api.c
+M net/unix/af_unix.c
+<stdin>:3178: space before tab in indent.
+ typeof(*(pos)), member))
+<stdin>:3197: space before tab in indent.
+ typeof(*(pos)), member))
+warning: 2 lines add whitespace errors.
+Falling back to patching base and 3-way merge...
+Auto-merging net/unix/af_unix.c
+Auto-merging net/sched/sch_api.c
+Auto-merging net/rose/af_rose.c
+Auto-merging net/packet/af_packet.c
+Auto-merging net/netrom/af_netrom.c
+Auto-merging net/netlink/af_netlink.c
+Auto-merging net/netfilter/xt_hashlimit.c
+Auto-merging net/netfilter/nf_conntrack_expect.c
+Auto-merging net/netfilter/ipvs/ip_vs_conn.c
+Auto-merging net/mac80211/mesh_pathtbl.c
+CONFLICT (content): Merge conflict in net/mac80211/mesh_pathtbl.c
+Auto-merging net/key/af_key.c
+Auto-merging net/ipv6/raw.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/ipv4/raw.c
+Auto-merging net/ipv4/fib_trie.c
+Auto-merging net/decnet/af_decnet.c
+Auto-merging net/core/dev.c
+Auto-merging net/can/proc.c
+Auto-merging net/ax25/af_ax25.c
+Auto-merging kernel/cgroup.c
+Auto-merging include/net/sock.h
+Auto-merging fs/nfsd/nfscache.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+Failed to merge in the changes.
+Patch failed at 0573 hlist: drop the node parameter from iterators
+The copy of the patch that failed is found in:
+ /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch
+
+When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".
+
+$ git rebase --continue
+Applying: hlist-drop-the-node-parameter-from-iterators-fix
+Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix
+Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix
+Applying: idr: implement idr_preload[_end]() and idr_alloc()
+Applying: i2c-convert-to-idr_alloc-fix
+Applying: ipc-convert-to-idr_alloc-fix
+Applying: net/mlx4_en: fix up for hlist_for_each_entry_rcu API change
+Applying: net/mlx4_en: second fix up for hlist_for_each_entry_rcu API change
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + ae9da2a...8b8117d akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (8b8117d net/mlx4_en: second fix up for hlist_for_each_entry_rcu API change)
+$ git merge --no-ff akpm/master
+Auto-merging lib/kfifo.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-bdi | 5 +
+ Documentation/ABI/testing/sysfs-kernel-mm-ksm | 52 +
+ Documentation/DMA-API-HOWTO.txt | 9 +-
+ Documentation/IPMI.txt | 18 +-
+ Documentation/cgroups/blkio-controller.txt | 2 +-
+ Documentation/cgroups/memory.txt | 16 +
+ Documentation/kernel-parameters.txt | 30 +
+ Documentation/printk-formats.txt | 14 +-
+ Documentation/sysctl/vm.txt | 33 +-
+ Documentation/vm/ksm.txt | 7 +
+ MAINTAINERS | 7 +-
+ arch/alpha/kernel/osf_sys.c | 20 +-
+ arch/arm/boot/dts/armada-370-xp.dtsi | 6 +
+ arch/arm/configs/mvebu_defconfig | 1 +
+ arch/arm/configs/pxa910_defconfig | 8 +
+ arch/arm/kernel/kprobes.c | 6 +-
+ arch/arm/mach-mmp/include/mach/pxa910.h | 5 +-
+ arch/arm/mach-mmp/pxa910.c | 3 +
+ arch/arm/mach-mmp/ttc_dkb.c | 92 +
+ arch/arm/mm/mmap.c | 2 -
+ arch/arm64/mm/mmap.c | 2 -
+ arch/arm64/mm/mmu.c | 3 +
+ arch/cris/include/uapi/asm/posix_types.h | 5 -
+ arch/frv/mm/elf-fdpic.c | 49 +-
+ arch/ia64/include/asm/meminit.h | 2 +
+ arch/ia64/kernel/efi.c | 2 +-
+ arch/ia64/kernel/kprobes.c | 8 +-
+ arch/ia64/kernel/sys_ia64.c | 37 +-
+ arch/ia64/mm/contig.c | 2 +-
+ arch/ia64/mm/discontig.c | 6 +-
+ arch/ia64/mm/hugetlbpage.c | 20 +-
+ arch/ia64/mm/init.c | 29 +
+ arch/mips/kernel/kprobes.c | 6 +-
+ arch/mips/mm/mmap.c | 2 -
+ arch/parisc/kernel/sys_parisc.c | 46 +-
+ arch/powerpc/include/asm/page_64.h | 3 +-
+ arch/powerpc/kernel/kprobes.c | 6 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 18 +-
+ arch/powerpc/mm/hugetlbpage.c | 2 +-
+ arch/powerpc/mm/init_64.c | 5 +
+ arch/powerpc/mm/mem.c | 12 +
+ arch/powerpc/mm/mmap_64.c | 2 -
+ arch/powerpc/mm/slice.c | 223 +--
+ arch/powerpc/platforms/cell/spufs/file.c | 2 +-
+ arch/s390/hypfs/inode.c | 1 +
+ arch/s390/kernel/kprobes.c | 8 +-
+ arch/s390/mm/init.c | 12 +
+ arch/s390/mm/mmap.c | 4 -
+ arch/s390/mm/vmem.c | 4 +
+ arch/s390/pci/pci_msi.c | 3 +-
+ arch/sh/kernel/kprobes.c | 6 +-
+ arch/sh/mm/init.c | 17 +
+ arch/sparc/kernel/kprobes.c | 6 +-
+ arch/sparc/kernel/ldc.c | 3 +-
+ arch/sparc/kernel/sys_sparc_64.c | 2 -
+ arch/sparc/mm/init_32.c | 2 +-
+ arch/sparc/mm/init_64.c | 5 +
+ arch/tile/Kconfig | 6 -
+ arch/tile/mm/elf.c | 1 -
+ arch/tile/mm/init.c | 8 +
+ arch/tile/mm/mmap.c | 2 -
+ arch/tile/mm/pgtable.c | 2 +-
+ arch/x86/ia32/ia32_aout.c | 2 -
+ arch/x86/include/asm/e820.h | 2 +
+ arch/x86/include/asm/numa.h | 4 +-
+ arch/x86/include/asm/pgtable_types.h | 1 +
+ arch/x86/kernel/acpi/boot.c | 4 +
+ arch/x86/kernel/e820.c | 72 +-
+ arch/x86/kernel/kprobes/core.c | 8 +-
+ arch/x86/kernel/setup.c | 13 +-
+ arch/x86/kvm/mmu.c | 42 +-
+ arch/x86/mm/fault.c | 8 +-
+ arch/x86/mm/init_32.c | 12 +
+ arch/x86/mm/init_64.c | 397 ++++
+ arch/x86/mm/mmap.c | 2 -
+ arch/x86/mm/numa.c | 16 +-
+ arch/x86/mm/pageattr.c | 97 +-
+ arch/x86/mm/srat.c | 86 +-
+ arch/x86/platform/efi/efi.c | 15 +-
+ block/Kconfig | 1 -
+ block/blk-cgroup.c | 6 +-
+ block/blk-core.c | 42 +-
+ block/blk-flush.c | 2 +-
+ block/blk-integrity.c | 4 +
+ block/blk-ioc.c | 3 +-
+ block/blk.h | 3 +-
+ block/bsg.c | 29 +-
+ block/cfq-iosched.c | 5 +-
+ block/elevator.c | 4 +-
+ block/genhd.c | 36 +-
+ block/partition-generic.c | 2 +-
+ block/partitions/msdos.c | 11 +-
+ block/scsi_ioctl.c | 1 +
+ crypto/algapi.c | 6 +-
+ drivers/acpi/acpi_memhotplug.c | 8 +-
+ drivers/acpi/numa.c | 23 +-
+ drivers/acpi/processor_driver.c | 2 +
+ drivers/atm/atmtcp.c | 6 +-
+ drivers/atm/eni.c | 3 +-
+ drivers/atm/he.c | 3 +-
+ drivers/atm/nicstar.c | 25 +-
+ drivers/atm/solos-pci.c | 3 +-
+ drivers/base/memory.c | 6 +
+ drivers/base/power/runtime.c | 89 +-
+ drivers/block/drbd/drbd_main.c | 29 +-
+ drivers/block/loop.c | 85 +-
+ drivers/block/mtip32xx/mtip32xx.c | 64 +-
+ drivers/block/mtip32xx/mtip32xx.h | 8 +-
+ drivers/block/swim3.c | 7 +-
+ drivers/block/virtio_blk.c | 31 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 66 +-
+ drivers/char/mem.c | 36 +
+ drivers/char/misc.c | 16 +-
+ drivers/clk/clk.c | 59 +-
+ drivers/dca/dca-sysfs.c | 23 +-
+ drivers/dma/dmaengine.c | 16 +-
+ drivers/firewire/core-cdev.c | 20 +-
+ drivers/firewire/core-device.c | 4 +-
+ drivers/firmware/memmap.c | 196 +-
+ drivers/gpio/gpiolib.c | 11 +-
+ drivers/gpu/drm/drm_context.c | 19 +-
+ drivers/gpu/drm/drm_crtc.c | 20 +-
+ drivers/gpu/drm/drm_drv.c | 1 -
+ drivers/gpu/drm/drm_gem.c | 37 +-
+ drivers/gpu/drm/drm_hashtab.c | 19 +-
+ drivers/gpu/drm/drm_stub.c | 19 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 20 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 21 +-
+ drivers/gpu/drm/sis/sis_drv.c | 1 -
+ drivers/gpu/drm/sis/sis_mm.c | 13 +-
+ drivers/gpu/drm/via/via_map.c | 1 -
+ drivers/gpu/drm/via/via_mm.c | 13 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 17 +-
+ drivers/i2c/i2c-core.c | 43 +-
+ drivers/infiniband/core/cm.c | 22 +-
+ drivers/infiniband/core/cma.c | 27 +-
+ drivers/infiniband/core/fmr_pool.c | 3 +-
+ drivers/infiniband/core/sa_query.c | 18 +-
+ drivers/infiniband/core/ucm.c | 16 +-
+ drivers/infiniband/core/ucma.c | 32 +-
+ drivers/infiniband/core/uverbs_cmd.c | 17 +-
+ drivers/infiniband/hw/amso1100/c2_qp.c | 19 +-
+ drivers/infiniband/hw/cxgb3/iwch.h | 24 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 27 +-
+ drivers/infiniband/hw/ehca/ehca_cq.c | 27 +-
+ drivers/infiniband/hw/ehca/ehca_qp.c | 34 +-
+ drivers/infiniband/hw/ipath/ipath_driver.c | 16 +-
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
+ drivers/infiniband/hw/mlx4/cm.c | 32 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 14 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/infiniband/hw/qib/qib_init.c | 21 +-
+ drivers/isdn/mISDN/socket.c | 3 +-
+ drivers/isdn/mISDN/stack.c | 3 +-
+ drivers/leds/leds-ot200.c | 14 +-
+ drivers/md/dm-bio-prison.c | 3 +-
+ drivers/md/dm-bufio.c | 3 +-
+ drivers/md/dm-snap.c | 3 +-
+ drivers/md/dm.c | 57 +-
+ .../md/persistent-data/dm-transaction-manager.c | 21 +-
+ drivers/md/raid5.c | 3 +-
+ drivers/memstick/core/memstick.c | 21 +-
+ drivers/memstick/core/mspro_block.c | 17 +-
+ drivers/mfd/rtsx_pcr.c | 13 +-
+ drivers/misc/c2port/core.c | 22 +-
+ drivers/misc/sgi-gru/grutlbpurge.c | 3 +-
+ drivers/misc/tifm_core.c | 11 +-
+ drivers/misc/vmw_vmci/vmci_doorbell.c | 7 +-
+ drivers/misc/vmw_vmci/vmci_resource.c | 6 +-
+ drivers/mmc/core/host.c | 11 +-
+ drivers/mtd/mtdcore.c | 9 +-
+ drivers/mtd/tests/mtd_nandecctest.c | 2 +-
+ drivers/mtd/tests/mtd_oobtest.c | 49 +-
+ drivers/mtd/tests/mtd_pagetest.c | 43 +-
+ drivers/mtd/tests/mtd_speedtest.c | 9 +-
+ drivers/mtd/tests/mtd_stresstest.c | 3 +-
+ drivers/mtd/tests/mtd_subpagetest.c | 42 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 18 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 8 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 4 +-
+ drivers/net/ethernet/sun/sunvnet.c | 3 +-
+ drivers/net/macvlan.c | 6 +-
+ drivers/net/macvtap.c | 21 +-
+ drivers/net/ppp/ppp_generic.c | 33 +-
+ drivers/net/tun.c | 15 +-
+ drivers/net/vxlan.c | 12 +-
+ drivers/net/wireless/zd1201.c | 7 +-
+ drivers/pci/pci.c | 12 +-
+ drivers/pcmcia/cs.c | 37 +-
+ drivers/power/bq2415x_charger.c | 11 +-
+ drivers/power/bq27x00_battery.c | 9 +-
+ drivers/power/ds2782_battery.c | 9 +-
+ drivers/pps/kapi.c | 2 +-
+ drivers/pps/pps.c | 36 +-
+ drivers/remoteproc/remoteproc_core.c | 11 +-
+ drivers/rpmsg/virtio_rpmsg_bus.c | 31 +-
+ drivers/rtc/Kconfig | 32 +
+ drivers/rtc/Makefile | 4 +
+ drivers/rtc/rtc-cmos.c | 3 +-
+ drivers/rtc/rtc-ds1305.c | 8 +-
+ drivers/rtc/rtc-ds1307.c | 71 +-
+ drivers/rtc/rtc-ds2404.c | 14 +-
+ drivers/rtc/rtc-fm3130.c | 33 +-
+ drivers/rtc/rtc-isl12022.c | 2 +-
+ drivers/rtc/rtc-lp8788.c | 344 ++++
+ drivers/rtc/rtc-max77686.c | 645 +++++++
+ drivers/rtc/rtc-mpc5121.c | 5 +-
+ drivers/rtc/rtc-pcf8523.c | 31 +
+ drivers/rtc/rtc-pcf8563.c | 2 +-
+ drivers/rtc/rtc-pl031.c | 2 +
+ drivers/rtc/rtc-pxa.c | 81 +-
+ drivers/rtc/rtc-rx4581.c | 314 ++++
+ drivers/rtc/rtc-s3c.c | 18 +-
+ drivers/rtc/rtc-sa1100.c | 4 +-
+ drivers/rtc/rtc-snvs.c | 2 +-
+ drivers/rtc/rtc-stmp3xxx.c | 3 +-
+ drivers/rtc/rtc-tps65910.c | 44 +-
+ drivers/rtc/rtc-tps80031.c | 349 ++++
+ drivers/rtc/rtc-twl.c | 6 +-
+ drivers/scsi/bfa/bfad_im.c | 15 +-
+ drivers/scsi/ch.c | 21 +-
+ drivers/scsi/lpfc/lpfc_init.c | 12 +-
+ drivers/scsi/sg.c | 44 +-
+ drivers/scsi/st.c | 27 +-
+ drivers/staging/android/binder.c | 19 +-
+ drivers/staging/android/logger.c | 1 +
+ drivers/staging/zcache/zbud.c | 2 +-
+ drivers/staging/zsmalloc/zsmalloc-main.c | 2 +-
+ drivers/target/iscsi/iscsi_target.c | 15 +-
+ drivers/target/iscsi/iscsi_target_login.c | 15 +-
+ drivers/target/tcm_fc/tfc_sess.c | 12 +-
+ drivers/thermal/cpu_cooling.c | 17 +-
+ drivers/thermal/thermal_sys.c | 17 +-
+ drivers/uio/uio.c | 19 +-
+ drivers/usb/core/hub.c | 13 +
+ drivers/usb/gadget/amd5536udc.c | 16 +-
+ drivers/usb/gadget/inode.c | 42 +-
+ drivers/vfio/vfio.c | 17 +-
+ drivers/video/Kconfig | 12 +-
+ drivers/video/Makefile | 2 +
+ drivers/video/backlight/88pm860x_bl.c | 5 +-
+ drivers/video/backlight/Kconfig | 28 +
+ drivers/video/backlight/Makefile | 90 +-
+ drivers/video/backlight/aat2870_bl.c | 2 +-
+ drivers/video/backlight/ams369fg06.c | 104 +-
+ drivers/video/backlight/as3711_bl.c | 380 ++++
+ drivers/video/backlight/corgi_lcd.c | 18 +-
+ drivers/video/backlight/hx8357.c | 482 +++++
+ drivers/video/backlight/l4f00242t03.c | 36 +-
+ drivers/video/backlight/ld9040.c | 109 +-
+ drivers/video/backlight/lm3630_bl.c | 4 +-
+ drivers/video/backlight/lm3639_bl.c | 5 +-
+ drivers/video/backlight/lms283gf05.c | 4 +-
+ drivers/video/backlight/lms501kf03.c | 441 +++++
+ drivers/video/backlight/lp8788_bl.c | 350 ++++
+ drivers/video/backlight/ltv350qv.c | 10 +-
+ drivers/video/backlight/omap1_bl.c | 10 +-
+ drivers/video/backlight/pwm_bl.c | 8 +-
+ drivers/video/backlight/s6e63m0.c | 153 +-
+ drivers/video/backlight/tdo24m.c | 10 +-
+ drivers/video/backlight/tosa_bl.c | 2 +-
+ drivers/video/backlight/tosa_lcd.c | 12 +-
+ drivers/video/backlight/vgg2432a4.c | 9 +-
+ drivers/video/console/fbcon.c | 10 +-
+ drivers/video/cyber2000fb.c | 3 +
+ drivers/video/goldfishfb.c | 316 ++++
+ drivers/video/mmp/Kconfig | 11 +
+ drivers/video/mmp/Makefile | 1 +
+ drivers/video/mmp/core.c | 258 +++
+ drivers/video/mmp/fb/Kconfig | 13 +
+ drivers/video/mmp/fb/Makefile | 1 +
+ drivers/video/mmp/fb/mmpfb.c | 684 +++++++
+ drivers/video/mmp/fb/mmpfb.h | 54 +
+ drivers/video/mmp/hw/Kconfig | 20 +
+ drivers/video/mmp/hw/Makefile | 2 +
+ drivers/video/mmp/hw/mmp_ctrl.c | 591 ++++++
+ drivers/video/mmp/hw/mmp_ctrl.h | 1974 ++++++++++++++++++++
+ drivers/video/mmp/hw/mmp_spi.c | 180 ++
+ drivers/video/mmp/panel/Kconfig | 6 +
+ drivers/video/mmp/panel/Makefile | 1 +
+ drivers/video/mmp/panel/tpo_tj032md01bw.c | 186 ++
+ drivers/w1/slaves/Kconfig | 13 +-
+ drivers/w1/slaves/Makefile | 3 +-
+ drivers/w1/slaves/w1_ds2413.c | 177 ++
+ drivers/w1/w1_family.h | 1 +
+ fs/9p/vfs_addr.c | 1 +
+ fs/9p/vfs_file.c | 1 +
+ fs/affs/amigaffs.c | 3 +-
+ fs/afs/write.c | 1 +
+ fs/aio.c | 1794 ++++++++----------
+ fs/autofs4/root.c | 2 +-
+ fs/binfmt_aout.c | 2 -
+ fs/binfmt_elf.c | 29 +-
+ fs/bio.c | 52 +-
+ fs/block_dev.c | 16 +-
+ fs/btrfs/file.c | 1 +
+ fs/btrfs/inode.c | 1 +
+ fs/buffer.c | 6 +-
+ fs/ceph/file.c | 1 +
+ fs/cifs/inode.c | 3 +-
+ fs/compat.c | 1 +
+ fs/coredump.c | 2 +-
+ fs/dcache.c | 9 +-
+ fs/direct-io.c | 23 +-
+ fs/dlm/config.c | 2 +-
+ fs/dlm/lock.c | 18 +-
+ fs/dlm/lockspace.c | 1 -
+ fs/dlm/lowcomms.c | 10 +-
+ fs/dlm/recover.c | 52 +-
+ fs/drop_caches.c | 2 +
+ fs/ecryptfs/file.c | 1 +
+ fs/ecryptfs/messaging.c | 6 +-
+ fs/eventpoll.c | 40 +-
+ fs/exec.c | 12 +-
+ fs/exportfs/expfs.c | 3 +-
+ 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 | 3 +-
+ fs/ext4/page-io.c | 1 +
+ fs/f2fs/data.c | 1 +
+ fs/fat/dir.c | 8 +-
+ fs/fat/fat.h | 2 +
+ fs/fat/inode.c | 78 +-
+ fs/fat/nfs.c | 3 +-
+ fs/fscache/cookie.c | 11 +-
+ fs/fuse/cuse.c | 1 +
+ fs/fuse/dev.c | 1 +
+ fs/fuse/file.c | 1 +
+ fs/gfs2/aops.c | 1 +
+ fs/gfs2/file.c | 3 +-
+ fs/gfs2/sys.c | 18 +-
+ fs/hfs/inode.c | 1 +
+ fs/hfsplus/Makefile | 4 +-
+ fs/hfsplus/attributes.c | 399 ++++
+ fs/hfsplus/bfind.c | 93 +-
+ fs/hfsplus/bnode.c | 6 +-
+ fs/hfsplus/brec.c | 23 +-
+ fs/hfsplus/btree.c | 8 +
+ fs/hfsplus/catalog.c | 36 +-
+ fs/hfsplus/dir.c | 55 +-
+ fs/hfsplus/extents.c | 4 +-
+ fs/hfsplus/hfsplus_fs.h | 52 +-
+ fs/hfsplus/hfsplus_raw.h | 68 +-
+ fs/hfsplus/inode.c | 19 +-
+ fs/hfsplus/ioctl.c | 108 --
+ fs/hfsplus/super.c | 56 +-
+ fs/hfsplus/unicode.c | 7 +-
+ fs/hfsplus/xattr.c | 709 +++++++
+ fs/hfsplus/xattr.h | 60 +
+ fs/hfsplus/xattr_security.c | 104 ++
+ fs/hfsplus/xattr_trusted.c | 63 +
+ fs/hfsplus/xattr_user.c | 63 +
+ fs/inode.c | 19 +-
+ fs/jfs/inode.c | 1 +
+ fs/lockd/host.c | 29 +-
+ fs/lockd/svcsubs.c | 7 +-
+ fs/ncpfs/ioctl.c | 2 +-
+ fs/nfs/client.c | 1 -
+ fs/nfs/nfs4client.c | 13 +-
+ fs/nfs/pnfs_dev.c | 9 +-
+ fs/nfsd/nfs4state.c | 7 +-
+ fs/nfsd/nfscache.c | 3 +-
+ fs/nfsd/nfsd.h | 6 +-
+ fs/nfsd/nfssvc.c | 6 +-
+ fs/nilfs2/file.c | 2 +-
+ fs/nilfs2/inode.c | 2 +-
+ fs/notify/fsnotify.c | 3 +-
+ fs/notify/inode_mark.c | 19 +-
+ fs/notify/inotify/inotify_fsnotify.c | 1 -
+ fs/notify/inotify/inotify_user.c | 28 +-
+ fs/notify/vfsmount_mark.c | 19 +-
+ fs/ntfs/file.c | 1 +
+ fs/ntfs/inode.c | 1 +
+ fs/ocfs2/aops.c | 3 +-
+ fs/ocfs2/aops.h | 2 +
+ fs/ocfs2/cluster/tcp.c | 32 +-
+ fs/ocfs2/dcache.c | 3 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 6 +-
+ fs/ocfs2/dlmglue.c | 2 +-
+ fs/ocfs2/inode.h | 2 +
+ fs/pipe.c | 1 +
+ fs/proc/base.c | 9 +-
+ fs/proc/generic.c | 23 +-
+ fs/proc/inode.c | 22 +-
+ fs/proc/internal.h | 3 +-
+ fs/proc/kcore.c | 3 +-
+ fs/proc/meminfo.c | 6 +-
+ fs/proc/proc_devtree.c | 13 +-
+ fs/proc/proc_sysctl.c | 19 +-
+ fs/proc/vmcore.c | 15 +-
+ fs/read_write.c | 35 +-
+ fs/reiserfs/inode.c | 1 +
+ fs/seq_file.c | 40 +-
+ fs/signalfd.c | 65 +-
+ fs/super.c | 6 +-
+ fs/sysfs/bin.c | 3 +-
+ fs/ubifs/file.c | 2 +
+ fs/udf/file.c | 2 +-
+ fs/udf/inode.c | 1 +
+ fs/xfs/xfs_aops.c | 1 +
+ fs/xfs/xfs_file.c | 1 +
+ fs/xfs/xfs_log_recover.c | 3 +-
+ include/linux/acpi.h | 8 +
+ include/linux/aio.h | 199 +-
+ include/linux/backing-dev.h | 6 +
+ include/linux/balloon_compaction.h | 7 +
+ include/linux/batch_complete.h | 23 +
+ include/linux/binfmts.h | 1 -
+ include/linux/bio.h | 36 +-
+ include/linux/blk_types.h | 11 +-
+ include/linux/blkdev.h | 12 +-
+ include/linux/bootmem.h | 1 +
+ include/linux/bug.h | 47 +-
+ include/linux/cgroup.h | 1 +
+ include/linux/compaction.h | 5 +-
+ include/linux/compiler-gcc.h | 3 +
+ include/linux/compiler-gcc3.h | 8 +-
+ include/linux/compiler-gcc4.h | 36 +-
+ include/linux/compiler.h | 32 +-
+ include/linux/errno.h | 1 -
+ include/linux/eventfd.h | 2 +-
+ include/linux/firmware-map.h | 6 +
+ include/linux/fs.h | 2 +
+ include/linux/hashtable.h | 37 +-
+ include/linux/highmem.h | 6 -
+ include/linux/huge_mm.h | 2 +-
+ include/linux/idr.h | 109 +-
+ include/linux/if_team.h | 6 +-
+ include/linux/ipmi.h | 4 -
+ include/linux/ksm.h | 18 +-
+ include/linux/list.h | 49 +-
+ include/linux/lockdep.h | 4 +-
+ include/linux/memblock.h | 2 +
+ include/linux/memcontrol.h | 7 -
+ include/linux/memory_hotplug.h | 20 +-
+ include/linux/mfd/lp8788.h | 16 +-
+ include/linux/migrate.h | 14 +-
+ include/linux/mm.h | 148 +-
+ include/linux/mm_types.h | 12 +-
+ include/linux/mman.h | 4 +-
+ include/linux/mmzone.h | 78 +-
+ include/linux/page-flags-layout.h | 88 +
+ include/linux/page-isolation.h | 19 +
+ include/linux/pagemap.h | 1 +
+ include/linux/percpu-refcount.h | 114 ++
+ include/linux/pid.h | 3 +-
+ include/linux/pid_namespace.h | 1 +
+ include/linux/pm.h | 1 +
+ include/linux/pm_runtime.h | 3 +
+ include/linux/rculist.h | 56 +-
+ include/linux/rmap.h | 2 +-
+ include/linux/rtc-pxa.h | 18 +
+ include/linux/sched.h | 31 +-
+ include/linux/smp.h | 3 +-
+ include/linux/swap.h | 49 +-
+ include/linux/vm_event_item.h | 8 +-
+ include/linux/vmstat.h | 2 +-
+ include/linux/wait.h | 86 +
+ include/linux/writeback.h | 1 +
+ include/net/ax25.h | 8 +-
+ include/net/inet_hashtables.h | 4 +-
+ include/net/inet_timewait_sock.h | 8 +-
+ include/net/ip_vs.h | 2 +-
+ include/net/netrom.h | 16 +-
+ include/net/sch_generic.h | 3 +-
+ include/net/sctp/sctp.h | 4 +-
+ include/net/sock.h | 21 +-
+ include/uapi/linux/eventpoll.h | 1 +
+ include/uapi/linux/fs.h | 3 +
+ include/uapi/linux/ipmi.h | 10 +-
+ include/uapi/linux/msdos_fs.h | 38 +-
+ include/uapi/linux/signalfd.h | 1 +
+ include/uapi/linux/xattr.h | 13 +-
+ include/video/mmp_disp.h | 352 ++++
+ init/Kconfig | 17 +
+ ipc/sem.c | 250 ++-
+ ipc/shm.c | 12 +-
+ ipc/util.c | 30 +-
+ kernel/Makefile | 2 +-
+ kernel/cgroup.c | 43 +-
+ kernel/compat.c | 2 +-
+ kernel/events/core.c | 16 +-
+ kernel/fork.c | 12 +-
+ kernel/kexec.c | 6 +-
+ kernel/kprobes.c | 35 +-
+ kernel/nsproxy.c | 3 +-
+ kernel/pid.c | 3 +-
+ kernel/posix-timers.c | 18 +-
+ kernel/printk.c | 1 +
+ kernel/ptrace.c | 1 +
+ kernel/sched/core.c | 34 +-
+ kernel/sched/debug.c | 90 +-
+ kernel/sched/stats.c | 79 +-
+ kernel/signal.c | 6 +-
+ kernel/smp.c | 262 +--
+ kernel/smpboot.c | 2 +-
+ kernel/sysctl.c | 3 +-
+ kernel/sysctl_binary.c | 3 +-
+ kernel/time.c | 4 +-
+ kernel/time/timer_list.c | 112 +-
+ kernel/trace/ftrace.c | 24 +-
+ kernel/trace/trace_output.c | 3 +-
+ kernel/tracepoint.c | 6 +-
+ kernel/user-return-notifier.c | 4 +-
+ kernel/user.c | 3 +-
+ kernel/utsname.c | 2 +-
+ kernel/utsname_sysctl.c | 3 +-
+ kernel/watchdog.c | 10 +-
+ kernel/workqueue.c | 13 +-
+ lib/Kconfig.debug | 3 +-
+ lib/Makefile | 4 +-
+ lib/debugobjects.c | 21 +-
+ lib/idr.c | 301 ++-
+ {kernel => lib}/kfifo.c | 6 +-
+ lib/lru_cache.c | 3 +-
+ lib/parser.c | 6 +-
+ lib/percpu-refcount.c | 243 +++
+ lib/vsprintf.c | 7 +
+ lib/xz/Kconfig | 34 +-
+ mm/Kconfig | 23 +-
+ mm/backing-dev.c | 11 +
+ mm/balloon_compaction.c | 2 +
+ mm/bounce.c | 48 +-
+ mm/compaction.c | 35 +-
+ mm/dmapool.c | 5 +-
+ mm/filemap.c | 3 +-
+ mm/fremap.c | 51 +-
+ mm/huge_memory.c | 96 +-
+ mm/hugetlb.c | 22 +-
+ mm/internal.h | 4 +-
+ mm/kmemleak.c | 14 +-
+ mm/ksm.c | 615 ++++--
+ mm/madvise.c | 105 +-
+ mm/memblock.c | 50 +
+ mm/memcontrol.c | 656 +++++--
+ mm/memory-failure.c | 169 +-
+ mm/memory.c | 52 +-
+ mm/memory_hotplug.c | 553 +++++-
+ mm/mempolicy.c | 59 +-
+ mm/migrate.c | 165 +-
+ mm/mincore.c | 5 +-
+ mm/mlock.c | 97 +-
+ mm/mm_init.c | 31 +-
+ mm/mmap.c | 111 +-
+ mm/mmu_context.c | 3 -
+ mm/mmu_notifier.c | 100 +-
+ mm/mmzone.c | 20 +-
+ mm/mremap.c | 27 +-
+ mm/nommu.c | 11 +-
+ mm/oom_kill.c | 6 +-
+ mm/page-writeback.c | 27 +
+ mm/page_alloc.c | 421 ++++-
+ mm/page_io.c | 1 +
+ mm/rmap.c | 6 +-
+ mm/shmem.c | 26 +-
+ mm/slob.c | 2 +-
+ mm/slub.c | 2 +-
+ mm/sparse.c | 12 +-
+ mm/swap.c | 10 +-
+ mm/swap_state.c | 58 +-
+ mm/swapfile.c | 159 +-
+ mm/util.c | 27 +-
+ mm/vmalloc.c | 33 +-
+ mm/vmscan.c | 397 ++--
+ mm/vmstat.c | 16 +-
+ net/9p/error.c | 4 +-
+ net/9p/trans_virtio.c | 4 +-
+ net/9p/util.c | 17 +-
+ net/appletalk/ddp.c | 9 +-
+ net/atm/common.c | 7 +-
+ net/atm/lec.c | 66 +-
+ net/atm/signaling.c | 3 +-
+ net/ax25/af_ax25.c | 15 +-
+ net/ax25/ax25_ds_subr.c | 6 +-
+ net/ax25/ax25_ds_timer.c | 3 +-
+ net/ax25/ax25_iface.c | 3 +-
+ net/ax25/ax25_uid.c | 11 +-
+ net/batman-adv/bat_iv_ogm.c | 12 +-
+ net/batman-adv/bridge_loop_avoidance.c | 39 +-
+ net/batman-adv/distributed-arp-table.c | 15 +-
+ net/batman-adv/gateway_client.c | 13 +-
+ net/batman-adv/main.c | 6 +-
+ net/batman-adv/originator.c | 31 +-
+ net/batman-adv/originator.h | 3 +-
+ net/batman-adv/routing.c | 6 +-
+ net/batman-adv/send.c | 6 +-
+ net/batman-adv/translation-table.c | 82 +-
+ net/batman-adv/vis.c | 38 +-
+ net/bluetooth/hci_sock.c | 15 +-
+ net/bluetooth/rfcomm/sock.c | 13 +-
+ net/bluetooth/sco.c | 14 +-
+ net/bridge/br_fdb.c | 23 +-
+ net/bridge/br_mdb.c | 6 +-
+ net/bridge/br_multicast.c | 25 +-
+ net/can/af_can.c | 18 +-
+ net/can/gw.c | 15 +-
+ net/can/proc.c | 3 +-
+ net/core/dev.c | 15 +-
+ net/core/flow.c | 11 +-
+ net/core/net-sysfs.c | 5 +
+ net/core/rtnetlink.c | 3 +-
+ net/decnet/af_decnet.c | 9 +-
+ net/decnet/dn_table.c | 13 +-
+ net/ieee802154/dgram.c | 3 +-
+ net/ieee802154/raw.c | 3 +-
+ net/ipv4/devinet.c | 10 +-
+ net/ipv4/fib_frontend.c | 15 +-
+ net/ipv4/fib_semantics.c | 23 +-
+ net/ipv4/fib_trie.c | 33 +-
+ net/ipv4/inet_connection_sock.c | 10 +-
+ net/ipv4/inet_fragment.c | 10 +-
+ net/ipv4/inet_hashtables.c | 8 +-
+ net/ipv4/inet_timewait_sock.c | 7 +-
+ net/ipv4/raw.c | 13 +-
+ net/ipv4/tcp_ipv4.c | 7 +-
+ net/ipv6/addrconf.c | 32 +-
+ net/ipv6/addrlabel.c | 18 +-
+ net/ipv6/inet6_connection_sock.c | 5 +-
+ net/ipv6/ip6_fib.c | 12 +-
+ net/ipv6/raw.c | 21 +-
+ net/ipv6/xfrm6_tunnel.c | 10 +-
+ net/ipx/af_ipx.c | 16 +-
+ net/ipx/ipx_proc.c | 5 +-
+ net/iucv/af_iucv.c | 21 +-
+ net/key/af_key.c | 3 +-
+ net/l2tp/l2tp_core.c | 12 +-
+ net/l2tp/l2tp_ip.c | 3 +-
+ net/l2tp/l2tp_ip6.c | 3 +-
+ net/llc/llc_sap.c | 3 +-
+ net/mac80211/main.c | 2 -
+ net/mac80211/mesh_pathtbl.c | 45 +-
+ net/mac80211/tx.c | 18 +-
+ net/netfilter/ipvs/ip_vs_conn.c | 26 +-
+ net/netfilter/nf_conntrack_expect.c | 17 +-
+ net/netfilter/nf_conntrack_helper.c | 13 +-
+ net/netfilter/nf_conntrack_netlink.c | 9 +-
+ net/netfilter/nf_conntrack_sip.c | 8 +-
+ net/netfilter/nf_nat_core.c | 3 +-
+ net/netfilter/nfnetlink_cthelper.c | 17 +-
+ net/netfilter/nfnetlink_log.c | 7 +-
+ net/netfilter/nfnetlink_queue_core.c | 10 +-
+ net/netfilter/xt_RATEEST.c | 3 +-
+ net/netfilter/xt_connlimit.c | 8 +-
+ net/netfilter/xt_hashlimit.c | 16 +-
+ net/netlink/af_netlink.c | 30 +-
+ net/netrom/af_netrom.c | 12 +-
+ net/netrom/nr_route.c | 30 +-
+ net/nfc/llcp/llcp.c | 16 +-
+ net/openvswitch/datapath.c | 10 +-
+ net/openvswitch/flow.c | 13 +-
+ net/openvswitch/vport.c | 3 +-
+ net/packet/af_packet.c | 3 +-
+ net/packet/diag.c | 3 +-
+ net/phonet/pep.c | 3 +-
+ net/phonet/socket.c | 9 +-
+ net/rds/bind.c | 3 +-
+ net/rds/connection.c | 9 +-
+ net/rose/af_rose.c | 14 +-
+ net/sched/sch_api.c | 4 +-
+ net/sched/sch_cbq.c | 18 +-
+ net/sched/sch_drr.c | 10 +-
+ net/sched/sch_hfsc.c | 15 +-
+ net/sched/sch_htb.c | 12 +-
+ net/sched/sch_qfq.c | 16 +-
+ net/sctp/associola.c | 31 +-
+ net/sctp/endpointola.c | 3 +-
+ net/sctp/input.c | 6 +-
+ net/sctp/proc.c | 9 +-
+ net/sctp/socket.c | 9 +-
+ net/sunrpc/auth.c | 5 +-
+ net/sunrpc/cache.c | 4 +-
+ net/sunrpc/svcauth.c | 3 +-
+ net/tipc/name_table.c | 8 +-
+ net/tipc/node.c | 3 +-
+ net/unix/af_unix.c | 6 +-
+ net/unix/diag.c | 7 +-
+ net/x25/af_x25.c | 12 +-
+ net/xfrm/xfrm_policy.c | 47 +-
+ net/xfrm/xfrm_state.c | 42 +-
+ scripts/checkpatch.pl | 26 +-
+ scripts/get_maintainer.pl | 2 +-
+ scripts/pnmtologo.c | 8 +-
+ scripts/tags.sh | 24 +-
+ security/integrity/ima/ima_queue.c | 3 +-
+ security/keys/internal.h | 2 +
+ security/keys/keyctl.c | 1 +
+ security/selinux/avc.c | 19 +-
+ sound/core/pcm_native.c | 2 +-
+ tools/perf/util/evlist.c | 3 +-
+ tools/testing/selftests/Makefile | 2 +-
+ tools/testing/selftests/epoll/Makefile | 11 +
+ tools/testing/selftests/epoll/test_epoll.c | 364 ++++
+ virt/kvm/eventfd.c | 3 +-
+ virt/kvm/irq_comm.c | 18 +-
+ 700 files changed, 20390 insertions(+), 7451 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-ksm
+ create mode 100644 drivers/rtc/rtc-lp8788.c
+ create mode 100644 drivers/rtc/rtc-max77686.c
+ create mode 100644 drivers/rtc/rtc-rx4581.c
+ create mode 100644 drivers/rtc/rtc-tps80031.c
+ create mode 100644 drivers/video/backlight/as3711_bl.c
+ create mode 100644 drivers/video/backlight/hx8357.c
+ create mode 100644 drivers/video/backlight/lms501kf03.c
+ create mode 100644 drivers/video/backlight/lp8788_bl.c
+ create mode 100644 drivers/video/goldfishfb.c
+ create mode 100644 drivers/video/mmp/Kconfig
+ create mode 100644 drivers/video/mmp/Makefile
+ create mode 100644 drivers/video/mmp/core.c
+ create mode 100644 drivers/video/mmp/fb/Kconfig
+ create mode 100644 drivers/video/mmp/fb/Makefile
+ create mode 100644 drivers/video/mmp/fb/mmpfb.c
+ create mode 100644 drivers/video/mmp/fb/mmpfb.h
+ create mode 100644 drivers/video/mmp/hw/Kconfig
+ create mode 100644 drivers/video/mmp/hw/Makefile
+ create mode 100644 drivers/video/mmp/hw/mmp_ctrl.c
+ create mode 100644 drivers/video/mmp/hw/mmp_ctrl.h
+ create mode 100644 drivers/video/mmp/hw/mmp_spi.c
+ create mode 100644 drivers/video/mmp/panel/Kconfig
+ create mode 100644 drivers/video/mmp/panel/Makefile
+ create mode 100644 drivers/video/mmp/panel/tpo_tj032md01bw.c
+ create mode 100644 drivers/w1/slaves/w1_ds2413.c
+ create mode 100644 fs/hfsplus/attributes.c
+ create mode 100644 fs/hfsplus/xattr.c
+ create mode 100644 fs/hfsplus/xattr.h
+ create mode 100644 fs/hfsplus/xattr_security.c
+ create mode 100644 fs/hfsplus/xattr_trusted.c
+ create mode 100644 fs/hfsplus/xattr_user.c
+ create mode 100644 include/linux/batch_complete.h
+ create mode 100644 include/linux/page-flags-layout.h
+ create mode 100644 include/linux/percpu-refcount.h
+ create mode 100644 include/linux/rtc-pxa.h
+ create mode 100644 include/video/mmp_disp.h
+ rename {kernel => lib}/kfifo.c (99%)
+ create mode 100644 lib/percpu-refcount.c
+ create mode 100644 tools/testing/selftests/epoll/Makefile
+ create mode 100644 tools/testing/selftests/epoll/test_epoll.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..5118358
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,4 @@
+Importing jdelvare-hwmon based on 54e37b8dbe9a398f74cef313404bd2f1deca7853
+Unchanged quilt series jdelvare-hwmon
+Importing device-mapper based on v3.8-rc6
+Unchanged quilt series device-mapper
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..8fb283a
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20130219
