]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Add linux-next specific files for 20121109 next-20121109
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Nov 2012 04:19:39 +0000 (15:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Nov 2012 04:19:39 +0000 (15:19 +1100)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Next/SHA1s [new file with mode: 0644]
Next/Trees [new file with mode: 0644]
Next/merge.log [new file with mode: 0644]
Next/quilt-import.log [new file with mode: 0644]
localversion-next [new file with mode: 0644]

diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644 (file)
index 0000000..48a100e
--- /dev/null
@@ -0,0 +1,211 @@
+Name           SHA1
+----           ----
+origin         0e4a43ed08e2f44aa7b96aa95d0a540d675483e1
+fixes          12250d843e8489ee00b5b7726da855e51694e792
+kbuild-current bad9955db1b73d7286f74a8136a0628a9b1ac017
+arm-current    6404f0b71c44cfd612ddf28627de31b4604d1d6e
+m68k-current   8a745ee13fbbbead62fd7d3a3c15a270b1901d63
+powerpc-merge  8c23f406c6d86808726ace580657186bc3b44587
+sparc          afe760e43d576aa8d3af4d9fd3913e52014a7571
+net            a66fe1653f4e81c007a68ca975067432a42df05b
+sound-current  8bb4d9ce08b0a92ca174e41d92c180328f86173f
+pci-current    ff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc
+wireless       6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412
+driver-core.current    8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+tty.current    8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+usb.current    d99e65bda806f49e192dd31e9b01959974dea3cd
+staging.current        8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+char-misc.current      8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+input-current  32ed1911fc79908d704023317d4ddeb3883fd07e
+md-current     ed30be077e705e0dff53bfc51d23feb8aeeab78f
+audit-current  c158a35c8a681cf68d36f22f058f9f5466386c71
+crypto-current 9efade1b3e981f5064f9db9ca971b4dc7557ae42
+ide            9974e43d900af7979e0a571b8e0c9674c7399b79
+dwmw2          244dc4e54b73567fae7f8fd9ba56584be9375442
+sh-current     44033109e99cf584d6285226ed521098f5ef7250
+irqdomain-current      15e06bf64f686befd2030da867a3dad965b96cc0
+devicetree-current     4e8383b6b06b275999f51337adf7064b2c135a04
+spi-current    d1c185bcb15184ebcbc1b2e003e9a6c4658985c4
+gpio-current   96b70641b937e99c1579cb6ebbcdb7b0af98cdd0
+rr-fixes       f6a79af8f3701b5a0df431a76adee212616154dc
+asm-generic    9b04ebd1584766229c58fedaa8fe4dfff575ac3a
+arm            ee05d610f5698e106608e0cbeacf0243a5bc7860
+arm-perf       85776d5742d50e1a93c33fb6b83a571f5bf5a01f
+davinci                fe0d42203cb5616eeff68b14576a0f7e2dd56625
+xilinx         aaf5e0be79e37d5a8509f09852788fa6a82522b2
+arm64          42656f6cac19f8db887e518b14d1129878c05bb8
+blackfin       9d8460173f6f6089cb001066f92c889832da8fab
+c6x            fbdd63d76c5ad6ae56a7bd1acebabefafc6aadf0
+cris           eacb25c79aa10bccd17854df664694bc9ee79184
+hexagon                e1858b2a21cd84a855945a4747fb2db41b250c22
+ia64           4fafc8c21487f6b5259d462e9bee98661a02390d
+m68k           f82735d55056b200eab19749398457a2f534306b
+m68knommu      6762976c423586a47f6e2614481a0b69457c99c0
+microblaze     f229605441030bcd315c21d97b25889d63ed0130
+mips           99a83df1179dfc4b5a3bb5bb3778ec6b6201f72b
+openrisc       634bd40a894d64df09ba36c12bb6e70787989ba9
+parisc         559fd144d53e8e999b87c91f23b64691a7da01d9
+powerpc                83dac59409387789b88bed40b1be86a8abc572be
+4xx            2074b1d9d53ae696dd3f49482bad43254f40f01d
+mpc5xxx                fa9b24afc4698d7541cf1c13b4b4473eca877383
+galak          10bfa766efa19c23f72f50727952a26cb1512256
+s390           3256ce0147382873b193d52790b7f1beda559bbf
+sh             0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb
+sparc-next     43c422eda99b894f18d1cca17bcd2401efaf7bd0
+tile           ddffeb8c4d0331609ef2581d84de4d763607bd37
+unicore32      7bf279958cf17c711cbfde6ebd7b80de61aea982
+xtensa         d83ac75ac4c477349645973fa15e6a87f60a4fbd
+btrfs          c37b2b6269ee4637fb7cdb5da0d1e47215d57ce2
+ceph           35152979e6181b1fbb4b61c3ff641c14df53ad66
+cifs           5004f808b4976ee34a2176f87025ae2b8a566583
+configfs       b930c26416c4ea6855726fd977145ccea9afbdda
+ecryptfs       e4bc6522d53b7b8eb02cfac35fd18275fd86269d
+ext3           6c29c50fda25c2ac2ce45a9b042ff7e424aa8eac
+ext4           ffb5387e85d528fb6d0d924abfa3fbf0fc484071
+fuse           c7a3f5e3e7a1e4938a41f0196d4b4ee632b30b38
+gfs2           9dbe9610b9df4efe0946299804ed46bb8f91dec2
+jfs            4e7a4b01222343481d8ff084dbef9b80f7089a19
+logfs          ab2ec19f42dc084880ba9b77e1c153adc1e9c439
+nfs            8ede994af56a5da450cdbdea1868312b12cbbb8c
+nfsd           3c40794b2dd0f355ef4e6bf8d85af5dcd7da7ece
+ocfs2          4538df64655dcfe17b33080b219dc783161a262e
+omfs           976d167615b64e14bc1491ca51d424e2ba9a5e84
+squashfs       4b0180a49f08dd1c681cdc99edc9e0cec0a833fa
+v9fs           552aad02a283ee88406b102b4d6455eef7127196
+ubifs          a28ad42a4a0c6f302f488f26488b8b37c9b30024
+xfs            69a58a43f74eb2cb23d9bce2524dae33c289a40f
+vfs            a736427fa1103158338839813139b20763c7b13e
+pci            18003779f03edf6c5b3aedb508d335f34df4bb47
+hid            71bca10eb56969a840d1e4409790483f03ce8770
+i2c            100b2101e2d6aa95f9fd9376f6a2737f08b678a9
+i2c-embedded   60f0a25b65b548778c92e61190fa558925b4d816
+jdelvare-hwmon a196a0c3022ee2bd1715d2c7f38cc8cac736667b
+hwmon-staging  d29d75d60622ccca89f239fdb1745c84f9419e9b
+v4l-dvb                c3a64171f19388200758473ed578185fa4f89e0e
+kbuild         c582d2adcc4be89479836bd3176e42d3515de41a
+kconfig                4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb
+libata         13b74085d92feda78bad1045516d332a1e9a3407
+infiniband     1e3474d1de922ea3df176a0efbef843ada2dd43b
+pstore         80c9d03c22f13a17df67b4b99a83ed5e9acf6093
+acpi           afee9851673d2a11fcdc3b11dbc35f2071a09990
+cpuidle                3cf7997a389de59498c966c529456696ce8bc1a7
+cpupowerutils  f16603386b38c28979f4df1cafdc2fe73fa87d37
+thermal                160b7d8048b87cb594e1a22b5345b468b6c2c40e
+ieee1394       790198f74c9d1b46b6a89504361b1a844670d050
+ubi            6a059abdbae7b6b35ddc69f6336f7afc1ce79bac
+dlm            a3de56bdb980c63b01662cac05d430db60ff4374
+swiotlb                af51a9f1848ff50079a10def56a2c064f326af22
+scsi           5c1b10ab7f93d24f29b5630286e323d1c5802d5c
+target-updates da97b6615fcd215b9d78a5e540d90202e41a21b2
+target-merge   6f0c0580b70c89094b3422ba81118c7b959c7556
+ibft           935a9fee51c945b8942be2d7b4bae069167b4886
+isci           6734092e66011def7875bd67beef889d0fee1cc9
+slave-dma      800764435558240d71f3e8c6a8be0f859e29af2f
+dmaengine      a2bd1140a264b561e38d99e656cd843c2d840e86
+net-next       f1e0b5b4f1eae56a3192688177f36e2bdf0e01ac
+wireless-next  38141fcfaad34a388e61a7a7e98d521330e049d6
+bluetooth      0c0afedf55ff409be9db0b0aeeaa1c6fe0f3cd3c
+mtd            5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc
+l2-mtd         2c5e1925fce142083afc6c1aea3a8fd275adbea8
+crypto         3200da8d9afb3d0dc617515a2fe364d9d59ef523
+drm            6380813c6e316455b944ba5f7b1515c98b837850
+sound          ee81abb623cb5e03c182d16871bb4fb34fdc9b4f
+sound-asoc     7bbd3b8dd1cec59f8ff0e198b749641b8bdec887
+modules                56713a28675b966e027a824a0130b80dffab209f
+virtio         41395dfb3d3554b047d8cdf9ed89bd0dc887ea14
+input          4e99aab78ab2adf7645b7f58b2b549e6ea205dd7
+input-mt       6f0c0580b70c89094b3422ba81118c7b959c7556
+cgroup         316eb661f125397d46f16f94e3c81ad3dc4c1233
+block          454832b8eeb292d0efea792d4620912ab0e114ef
+device-mapper  cee3685bb2d9a7ce21520f810d27030472f1077b
+embedded       4744b43431e8613f920c5cba88346756f53c5165
+firmware       6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia         80af9e6d7ae633309cc5bca96aee6a45117e7c98
+mmc            ee93e7468fac3fef7272eec5a416400435913b7b
+kgdb           58bcdf6847831913b41e9dfee1cbc579f939ef8b
+slab           31841eb092844119636bb3d28ea14e6fae189ab4
+uclinux                ddffeb8c4d0331609ef2581d84de4d763607bd37
+md             79acf8a7d0d8808c2e4f888de39c5c6a041d0b61
+mfd            45e48aa6cabab6b03ac62caded4d86f157997b13
+battery                18766f0936d444fd7ff2e0064bd6e69a89d5c6fc
+fbdev          cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a
+viafb          838ac785d521e091bd8b5f6a2b545166f5f32b77
+omap_dss2      13b1ba7de8d0ecc42e4f9c002d5b0c1a48f05e58
+regulator      d4981afcaab855c5555f93536f4aeaa2ea41f829
+security       b5666502700855a1eb1a15482005b22478b9460e
+selinux                c2d7b247f0c028d325a5da5b9611b60ba160f237
+lblnet         7e27d6e778cd87b6f2415515d7127eba53fe5d02
+watchdog       58ddfed79a60ba5d5eb4dce2767aa592947e1586
+dwmw2-iommu    c3b92c8787367a8bb53d57d9789b558f1295cc96
+iommu          f74b5270880cd56165debf113ab0e0231605ab47
+vfio           12250d843e8489ee00b5b7726da855e51694e792
+osd            b6755ffb0c03c2e763cc56f72cc2ceaba8ea2805
+jc_docs                5c050fb96380a87a85aad9084b68fdcd2b84c193
+trivial                926ccfef82413623ae0e5c3a32d0cad2b9f33e96
+audit          dcd6c92267155e70a94b3927bce681ce74b80d1f
+pm             e1424ee4c8bfc6c8af31448d46edb2c2528be82f
+apm            fb9d78aca709b7a6389c79d6211fb384c69bb79f
+fsnotify       1aec9c0d718693553543349e92138033b0bcea4c
+edac           5e75cbbc849a5dab7c3446e15a2fe5237414cb24
+edac-amd       a8373ecc0c26d8afafd0d2e88f96756e26b7f3ee
+devicetree     efd68e7254503f3207805f674a1ea1d743f5dfe2
+dt-rh          2066306099d35430d01ed1b3d81c0536d77bf390
+spi            d8e328b3bd65fdefc9c49a27ee80c28e0a44b653
+spi-mb         fad8f9c0b28ff1b9c93ea91048c0be701407eb67
+tip            8a1d31c703d8a9d96bc9675c6120e2c08fab6966
+rcu            870a511503c0eb779fb1e3dabcd22e5955466489
+cputime                c3e0ef9a298e028a82ada28101ccd5cf64d209ee
+uprobes                0326f5a94ddea33fa331b2519f4172f4fb387baa
+kvm            f026399fc90655ac444c62139aa4f8a02e1c795a
+kvm-ppc                f534a5357b02eb59e298da3ffe014aac5c0d198b
+oprofile       44009105081b51417f311f4c3be0061870b6b8ed
+xen            af3a3ab2966112c0d0a44df7eeb1e95fe32d4495
+xen-two                eb827a70a3280837cdd10d7fdd63253eb0d2463c
+xen-pvhvm      b056b6a0144de90707cd22cf7b4f60bf69c86d59
+percpu         b4916cb17c261a6043bcb2a98d0d6512497a7cf8
+workqueues     b401057f5db0bed50a2072d2fbdd0da00f6674c5
+drivers-x86    455f38ccba672b33cda0a96cf9089be312ba95de
+hwpoison       46e387bbd82d438b9131e237e6e2cb55a825da49
+sysctl         4e474a00d7ff746ed177ddae14fa8b2d4bad7a00
+regmap         516edb8ac36d7752da2d2080731d538d9ef730af
+hsi            43139a61fc68f4b0af7327a0e63f340a7c81c69a
+leds           c84f14df09f1fc84e6bcdc885cb1a3b6e1470290
+driver-core    bb3215e97bb1ab917ed858322a9399fb32e69e49
+tty            76cc43868c1e9d6344ad6c4992c4f6abd5204a8f
+usb            cdb2fac78321a8d621b5612c7ddfe96bdbe7d267
+staging                fb7d2ebd217a2a3cead4402b47c65c25881a2f75
+char-misc      ab5c4a56d46f6a41d238aa6546f900407c9be275
+tmem           8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+writeback      2f60d628ffd042e65e0b1d3431fb3e38d6f7c1be
+arm-dt         ede338f4ce2fb5ee99d18751df32fbd3b10df268
+hwspinlock     8b37fcfc9b3400b647748783a2cafff67793e0ad
+pinctrl                820321ce5f218851100c8b4fef7ba4fe3ad58bf2
+vhost          e0953c8b85baaa38d77ebd5dc4051bc3837c1191
+memblock       7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077
+remoteproc     6f0c0580b70c89094b3422ba81118c7b959c7556
+irqdomain      f5a1ad057e6da5d0fc9c5677ff44797d193d3e62
+gpio           ddf343f635fe4440cad528e12f96f28bd50aa099
+gpio-lw                b1ffa4b3c3d7c4aaa3aa09bbc5d3b4b88592c60f
+arm-soc                9367622ffca46f1ed793a5212c6275717ced49fb
+bcm2835                d7f292ea1d34383a0f2181d8bbe85f272bf86cb5
+cortex         77a3018e38b901f565b36f16924a3f86ad3e7328
+ep93xx         fab1f7446a5baac4bf2f90e151a879677c0de916
+ixp4xx         b94740b3b38fd8e37fcd3bb06a18ec2796061c7d
+msm            a0d271cbfed1dd50278c6b06bead3d00ba0a88f9
+renesas                07efb0cceccf6d360bdbd6806e1308dd5998065b
+samsung                a9fe9f0bbad4cff980a6d1d8764c6134edbbb076
+tegra          c76dbd05396e250cb5682c144db013390f48e67a
+kvmtool                cfb8234face2dbd1edfa300ddb531db9c1bdeb3d
+dma-mapping    8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
+pwm            d5da78e1cedc8867e296d969a70274d16f69719c
+dma-buf                ba4205121f8199c32658b03c2660b1a9f9ff217c
+userns         e9069f470803eeb5e243a05bc717452c6218bd71
+ktest          95f57838418358e93212e9dddd60d3502c7f8e2e
+signal         f899e0f24a30c6d6c17b6cccf8db8c7eadf375eb
+clk            9be9d482bcf5a0a3e0ae131a98573b9e2d358915
+random         c5c1244f6cfe789ba651c760fdfe59d83420dab4
+lzo-update     ba32bf9f4149eeab14bb97ca2edd2f8d1619dfd8
+drop-experimental      9687bc410dce16e1a6db47a742109b4b853277bb
+scsi-post-merge        65112dccf8a113737684366349d7f9ec373ddc47
+akpm-current   d715ab175346618bd595a129c378ba645a7739fe
+akpm           6703d59701f7592c897b975de3952ba6bbb98b83
diff --git a/Next/Trees b/Next/Trees
new file mode 100644 (file)
index 0000000..fd0383c
--- /dev/null
@@ -0,0 +1,213 @@
+Trees included into this release:
+
+Name           Type    URL
+----           ----    ---
+origin         git     git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes          git     git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master
+kbuild-current git     git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes
+arm-current    git     git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes
+m68k-current   git     git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-merge  git     git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+sparc          git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+net            git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master
+sound-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+pci-current    git     git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+wireless       git     git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master
+driver-core.current    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+staging.current        git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+char-misc.current      git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+input-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+md-current     git     git://neil.brown.name/md#for-linus
+audit-current  git     git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-linus
+crypto-current git     git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+ide            git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+dwmw2          git     git://git.infradead.org/users/dwmw2/random-2.6.git#master
+sh-current     git     git://github.com/pmundt/linux-sh.git#sh-fixes-for-linus
+irqdomain-current      git     git://git.secretlab.ca/git/linux-2.6.git#irqdomain/merge
+devicetree-current     git     git://git.secretlab.ca/git/linux-2.6#devicetree/merge
+spi-current    git     git://git.secretlab.ca/git/linux-2.6#spi/merge
+gpio-current   git     git://git.secretlab.ca/git/linux-2.6#gpio/merge
+rr-fixes       git     git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes
+asm-generic    git     git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arm            git     git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next
+arm-perf       git     git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+davinci                git     git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next
+xilinx         git     git://git.xilinx.com/linux-2.6-xlnx.git#arm-next
+arm64          git     git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream
+blackfin       git     git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus
+c6x            git     git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next
+cris           git     git://www.jni.nu/cris.git#for-next
+hexagon                git     git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next
+ia64           git     git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next
+m68k           git     git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu      git     git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze     git     git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips           git     git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next
+openrisc       git     git://openrisc.net/jonas/linux#for-upstream
+parisc         git     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next
+powerpc                git     git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next
+4xx            git     git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next
+mpc5xxx                git     git://git.denx.de/linux-2.6-agust.git#next
+galak          git     git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next
+s390           git     git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features
+sh             git     git://github.com/pmundt/linux-sh.git#sh-latest
+sparc-next     git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+tile           git     git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+unicore32      git     git://github.com/gxt/linux.git#unicore32
+xtensa         git     git://github.com/czankel/xtensa-linux.git#for_next
+btrfs          git     git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next
+ceph           git     git://github.com/ceph/ceph-client.git#master
+cifs           git     git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs       git     git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next
+ecryptfs       git     git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+ext3           git     git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4           git     git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+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            quilt   http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/
+i2c-embedded   git     git://git.pengutronix.de/git/wsa/linux.git#i2c-embedded/for-next
+jdelvare-hwmon quilt   http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/
+hwmon-staging  git     git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+v4l-dvb                git     git://linuxtv.org/mchehab/media-next.git#master
+kbuild         git     git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
+kconfig                git     git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next
+libata         git     git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT
+infiniband     git     git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next
+pstore         git     git://git.infradead.org/users/cbou/linux-pstore.git#master
+acpi           git     git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
+cpuidle                git     git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next
+cpupowerutils  git     git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master
+thermal                git     git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+ieee1394       git     git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+ubi            git     git://git.infradead.org/ubi-2.6.git#linux-next
+dlm            git     git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb                git     git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+scsi           git     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+target-updates git     git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next
+target-merge   git     git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge
+ibft           git     git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next
+isci           git     git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all
+slave-dma      git     git://git.infradead.org/users/vkoul/slave-dma.git#next
+dmaengine      git     git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next
+net-next       git     git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master
+wireless-next  git     git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master
+bluetooth      git     git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+mtd            git     git://git.infradead.org/mtd-2.6.git#master
+l2-mtd         git     git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master
+crypto         git     git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm            git     git://people.freedesktop.org/~airlied/linux.git#drm-next
+sound          git     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc     git     git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules                git     git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next
+virtio         git     git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next
+input          git     git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+input-mt       git     git://github.com/rydberg/linux.git#for-next
+cgroup         git     git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+block          git     git://git.kernel.dk/linux-block.git#for-next
+device-mapper  quilt   http://people.redhat.com/agk/patches/linux/editing/
+embedded       git     git://git.infradead.org/embedded-2.6.git#master
+firmware       git     git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
+pcmcia         git     git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master
+mmc            git     git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next
+kgdb           git     git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next
+slab           git     git://github.com/penberg/linux.git#for-next
+uclinux                git     git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next
+md             git     git://neil.brown.name/md#for-next
+mfd            git     git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next
+battery                git     git://git.infradead.org/battery-2.6.git#master
+fbdev          git     git://github.com/schandinat/linux-2.6.git#fbdev-next
+viafb          git     git://github.com/schandinat/linux-2.6.git#viafb-next
+omap_dss2      git     git://gitorious.org/linux-omap-dss2/linux.git#for-next
+regulator      git     git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security       git     git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next
+selinux                git     git://git.infradead.org/users/eparis/selinux.git#master
+lblnet         git     git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master
+watchdog       git     git://www.linux-watchdog.org/linux-watchdog-next.git#master
+dwmw2-iommu    git     git://git.infradead.org/iommu-2.6.git#master
+iommu          git     git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+vfio           git     git://github.com/awilliam/linux-vfio.git#next
+osd            git     git://git.open-osd.org/linux-open-osd.git#linux-next
+jc_docs                git     git://git.lwn.net/linux-2.6.git#docs-next
+trivial                git     git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit          git     git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next
+pm             git     git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+apm            git     git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next
+fsnotify       git     git://git.infradead.org/users/eparis/notify.git#for-next
+edac           git     git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
+edac-amd       git     git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+devicetree     git     git://git.secretlab.ca/git/linux-2.6#devicetree/next
+dt-rh          git     git://sources.calxeda.com/kernel/linux.git#for-next
+spi            git     git://git.secretlab.ca/git/linux-2.6#spi/next
+spi-mb         git     git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git#spi-next
+tip            git     git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+rcu            git     git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+cputime                git     git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime
+uprobes                git     git://github.com/srikard/linux.git#for-next
+kvm            git     git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next
+kvm-ppc                git     git://github.com/agraf/linux-2.6.git#kvm-ppc-next
+oprofile       git     git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+xen            git     git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen
+xen-two                git     git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next
+xen-pvhvm      git     git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next
+percpu         git     git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next
+workqueues     git     git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86    git     git://cavan.codon.org.uk/platform-drivers-x86.git#linux-next
+hwpoison       git     git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison
+sysctl         git     git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master
+regmap         git     git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+hsi            git     git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next
+leds           git     git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next
+driver-core    git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+tty            git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+usb            git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+staging                git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+char-misc      git     git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+tmem           git     git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next
+writeback      git     git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next
+arm-dt         git     git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next
+hwspinlock     git     git://github.com/ohadbc/hwspinlock-next.git#linux-next
+pinctrl                git     git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+vhost          git     git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+memblock       git     git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map
+remoteproc     git     git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next
+irqdomain      git     git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next
+gpio           git     git://git.secretlab.ca/git/linux-2.6#gpio/next
+gpio-lw                git     git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+arm-soc                git     git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next
+bcm2835                git     git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next
+cortex         git     git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next
+ep93xx         git     git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next
+ixp4xx         git     git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next
+msm            git     git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next
+renesas                git     git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next
+samsung                git     git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+tegra          git     git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next
+kvmtool                git     git://github.com/penberg/linux-kvm.git#master
+dma-mapping    git     git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next
+pwm            git     git://gitorious.org/linux-pwm/linux-pwm.git#for-next
+dma-buf                git     git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next
+userns         git     git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest          git     git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+signal         git     git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next
+clk            git     git://git.linaro.org/people/mturquette/linux.git#clk-next
+random         git     git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev
+lzo-update     git     git://github.com/markus-oberhumer/linux.git#lzo-update
+drop-experimental      git     git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#linux-next
+scsi-post-merge        git     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master
+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 (file)
index 0000000..9284644
--- /dev/null
@@ -0,0 +1,7565 @@
+$ date
+Friday 9 November  08:52:45 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 0e4a43e Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
+Merging origin/master (0e4a43e Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge origin/master
+Already up-to-date.
+Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
+$ git merge kbuild-current/rc-fixes
+Merge made by the 'recursive' strategy.
+ scripts/kconfig/expr.h      |    5 +--
+ scripts/kconfig/list.h      |   91 +++++++++++++++++++++++++++++++++++++++++++
+ scripts/kconfig/lkc_proto.h |    4 +-
+ scripts/kconfig/mconf.c     |    6 +--
+ scripts/kconfig/menu.c      |   14 ++++---
+ 5 files changed, 106 insertions(+), 14 deletions(-)
+ create mode 100644 scripts/kconfig/list.h
+Merging arm-current/fixes (6404f0b ARM: 7569/1: mm: uninitialized warning corrections)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (8c23f40 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (afe760e sparc: Allow OF_GPIO on sparc.)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/backoff.h        |   69 ++++++++++++++++++++++++++-----
+ arch/sparc/include/asm/compat.h         |    5 ++-
+ arch/sparc/include/asm/processor_64.h   |   17 +++++++-
+ arch/sparc/include/asm/thread_info_64.h |    5 +++
+ arch/sparc/include/asm/ttable.h         |   24 +++++++----
+ arch/sparc/include/uapi/asm/unistd.h    |    7 +++-
+ arch/sparc/kernel/entry.h               |    7 ++++
+ arch/sparc/kernel/perf_event.c          |   22 +++++++---
+ arch/sparc/kernel/process_64.c          |   42 ++++++++++---------
+ arch/sparc/kernel/ptrace_64.c           |    4 +-
+ arch/sparc/kernel/setup_64.c            |   21 ++++++++++
+ arch/sparc/kernel/sys_sparc_64.c        |    5 +++
+ arch/sparc/kernel/systbls_32.S          |    1 +
+ arch/sparc/kernel/systbls_64.S          |    2 +
+ arch/sparc/kernel/unaligned_64.c        |   36 ++++++++++------
+ arch/sparc/kernel/visemul.c             |   23 +++++++----
+ arch/sparc/kernel/vmlinux.lds.S         |    5 +++
+ arch/sparc/kernel/winfixup.S            |    2 +
+ arch/sparc/math-emu/math_64.c           |    2 +-
+ drivers/gpio/Kconfig                    |    2 +-
+ drivers/scsi/qlogicpti.c                |   13 +-----
+ 21 files changed, 229 insertions(+), 85 deletions(-)
+Merging net/master (a66fe16 net: usb: cdc_eem: Fix rx skb allocation for 802.1Q VLANs)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/isdn/Kconfig                               |    2 +-
+ drivers/isdn/i4l/Kconfig                           |    2 +-
+ drivers/isdn/i4l/isdn_common.c                     |    4 -
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |    4 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |    6 +-
+ drivers/net/ethernet/jme.c                         |    8 +-
+ drivers/net/ethernet/marvell/skge.c                |    2 +-
+ drivers/net/ethernet/micrel/ksz884x.c              |    4 +-
+ drivers/net/ethernet/realtek/r8169.c               |    5 +
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |    2 +-
+ drivers/net/usb/cdc_eem.c                          |    3 +-
+ drivers/net/usb/smsc95xx.c                         |    1 +
+ drivers/net/wireless/b43legacy/pio.c               |    2 +-
+ drivers/usb/gadget/u_ether.c                       |    3 +-
+ include/linux/ptp_clock_kernel.h                   |    3 +-
+ net/core/dev.c                                     |    2 +-
+ net/core/rtnetlink.c                               |    3 +-
+ net/ipv4/inet_diag.c                               |    5 +-
+ net/sched/sch_qfq.c                                |  109 ++++++++++++++------
+ net/tipc/handler.c                                 |    1 -
+ 21 files changed, 117 insertions(+), 56 deletions(-)
+Merging sound-current/for-linus (8bb4d9c ALSA: Fix card refcount unbalance)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/core/oss/mixer_oss.c    |    1 +
+ sound/core/oss/pcm_oss.c      |    1 +
+ sound/core/pcm_native.c       |    6 ++++--
+ sound/core/sound.c            |    2 +-
+ sound/core/sound_oss.c        |    2 +-
+ sound/i2c/other/ak4113.c      |    2 +-
+ sound/i2c/other/ak4114.c      |    2 +-
+ sound/i2c/other/ak4117.c      |    2 +-
+ sound/pci/es1968.c            |    2 ++
+ sound/pci/hda/hda_intel.c     |    2 ++
+ sound/pci/hda/patch_analog.c  |    1 +
+ sound/pci/hda/patch_cirrus.c  |   21 ++++++++++++---------
+ sound/pci/hda/patch_realtek.c |   26 +++++++++++++-------------
+ sound/pci/hda/patch_via.c     |   36 +++++++++++++++++++++++++++++-------
+ sound/pci/rme9652/hdspm.c     |    5 +++--
+ sound/soc/codecs/cs42l52.c    |    2 +-
+ sound/soc/codecs/wm8994.c     |    2 +-
+ sound/usb/endpoint.c          |   13 +++++++++++++
+ sound/usb/endpoint.h          |    1 +
+ sound/usb/pcm.c               |    3 +++
+ 20 files changed, 92 insertions(+), 40 deletions(-)
+Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug)
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/pci/bus.c                  |    3 ---
+ drivers/pci/pci-driver.c           |   12 ++----------
+ drivers/pci/pci-sysfs.c            |   34 ----------------------------------
+ drivers/pci/pci.c                  |   32 ++++++++++++++++++++++++++++++++
+ drivers/pci/pci.h                  |    2 ++
+ drivers/pci/pcie/aer/aerdrv_core.c |   20 ++++++++++++++++----
+ drivers/pci/pcie/portdrv_core.c    |    3 ++-
+ drivers/pci/proc.c                 |    8 ++++++++
+ 8 files changed, 62 insertions(+), 52 deletions(-)
+Merging wireless/master (6fe7cc7 ath9k: Test for TID only in BlockAcks while checking tx status)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (8f0d816 Linux 3.7-rc3)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (8f0d816 Linux 3.7-rc3)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (d99e65b USB: fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/early/ehci-dbgp.c  |   15 +++++++++------
+ drivers/usb/musb/musb_gadget.c |   30 ++++++++++++++++++++++++++----
+ drivers/usb/musb/ux500.c       |    2 +-
+ drivers/usb/otg/Kconfig        |    4 ++--
+ drivers/usb/serial/usb_wwan.c  |   10 +++++-----
+ 5 files changed, 43 insertions(+), 18 deletions(-)
+Merging staging.current/staging-linus (8f0d816 Linux 3.7-rc3)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (8f0d816 Linux 3.7-rc3)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (32ed191 Input: tsc40 - remove wrong announcement of pressure support)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (ed30be0 MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ crypto/cryptd.c |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
+$ git merge devicetree-current/devicetree/merge
+Auto-merging drivers/of/base.c
+Merge made by the 'recursive' strategy.
+ drivers/of/base.c |    2 ++
+ 1 file changed, 2 insertions(+)
+Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
+$ git merge spi-current/spi/merge
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/spi-bcm63xx.c
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm63xx.c |   16 ++++++----------
+ drivers/spi/spi-s3c64xx.c |   10 ++++------
+ drivers/spi/spi.c         |    5 ++++-
+ 3 files changed, 14 insertions(+), 17 deletions(-)
+Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging rr-fixes/fixes (f6a79af modules: don't break modules_install on external modules with no key.)
+$ git merge rr-fixes/fixes
+Merge made by the 'recursive' strategy.
+ kernel/module.c          |   27 ++++++++++++++++-----------
+ scripts/Makefile.modinst |    3 ++-
+ 2 files changed, 18 insertions(+), 12 deletions(-)
+Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
+$ git merge asm-generic/master
+Merge made by the 'recursive' strategy.
+ arch/openrisc/include/asm/io.h |    1 +
+ include/asm-generic/io.h       |    1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+Merging arm/for-next (ee05d61 Merge remote-tracking branch 'wildea/asids' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig                              |    1 +
+ arch/arm/common/vic.c                         |   18 +-
+ arch/arm/include/asm/hardware/cache-l2x0.h    |    5 +
+ arch/arm/include/asm/hardware/vic.h           |    2 +-
+ arch/arm/include/asm/mmu.h                    |   11 +-
+ arch/arm/include/asm/mmu_context.h            |   82 +-------
+ arch/arm/kernel/process.c                     |    1 +
+ arch/arm/kernel/smp_twd.c                     |   54 +++--
+ arch/arm/kernel/vmlinux.lds.S                 |   19 +-
+ arch/arm/mm/cache-aurora-l2.h                 |   55 +++++
+ arch/arm/mm/cache-l2x0.c                      |  278 ++++++++++++++++++++++---
+ arch/arm/mm/context.c                         |  207 +++++++++---------
+ arch/arm/mm/proc-v7.S                         |    2 +-
+ arch/arm/plat-omap/include/plat/omap-serial.h |   55 -----
+ drivers/mmc/host/mmci.c                       |   58 ++++--
+ drivers/mmc/host/mmci.h                       |    4 +
+ drivers/tty/serial/omap-serial.c              |  235 +++++++++++++--------
+ drivers/tty/serial/serial_core.c              |   71 +++++--
+ include/linux/serial_core.h                   |    6 +
+ scripts/sortextable.c                         |    1 +
+ 20 files changed, 742 insertions(+), 423 deletions(-)
+ create mode 100644 arch/arm/mm/cache-aurora-l2.h
+Merging arm-perf/for-next/perf (85776d5 Merge branch 'hw-breakpoint' into for-next/perf)
+$ git merge arm-perf/for-next/perf
+Auto-merging arch/arm/kernel/perf_event.c
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/hw_breakpoint.h |    8 +-
+ arch/arm/include/asm/perf_event.h    |    5 +
+ arch/arm/include/asm/pmu.h           |   28 ++--
+ arch/arm/kernel/hw_breakpoint.c      |  154 +++++++++++----------
+ arch/arm/kernel/perf_event.c         |   85 ++++++++----
+ arch/arm/kernel/perf_event_cpu.c     |   74 ++++++----
+ arch/arm/kernel/perf_event_v6.c      |  126 ++++++++---------
+ arch/arm/kernel/perf_event_v7.c      |  246 ++++++++++++++++------------------
+ arch/arm/kernel/perf_event_xscale.c  |  157 +++++++++++-----------
+ arch/arm/mach-omap2/pmu.c            |    2 -
+ 10 files changed, 474 insertions(+), 411 deletions(-)
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging xilinx/arm-next (aaf5e0b ARM: zynq: Allow UART1 to be used as DEBUG_LL console.)
+$ git merge xilinx/arm-next
+Removing arch/arm/mach-zynq/include/mach/clkdev.h
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig                           |    1 -
+ arch/arm/Kconfig.debug                     |   17 +++++++++++
+ arch/arm/Makefile                          |    1 -
+ arch/arm/boot/dts/zynq-ep107.dts           |   26 +++++++++++++---
+ arch/arm/mach-zynq/common.c                |   40 +++++++++++++++----------
+ arch/arm/mach-zynq/common.h                |    4 +--
+ arch/arm/mach-zynq/include/mach/clkdev.h   |   32 --------------------
+ arch/arm/mach-zynq/include/mach/zynq_soc.h |   45 +++++++++++++++-------------
+ arch/arm/mach-zynq/timer.c                 |   10 +------
+ 9 files changed, 91 insertions(+), 85 deletions(-)
+ delete mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
+Merging arm64/upstream (42656f6 Merge branch 'execve' into upstream)
+$ git merge arm64/upstream
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/memory.txt     |   12 ++---
+ arch/arm64/Kconfig                 |    3 ++
+ arch/arm64/include/asm/elf.h       |    5 +-
+ arch/arm64/include/asm/fpsimd.h    |    5 +-
+ arch/arm64/include/asm/io.h        |    8 +--
+ arch/arm64/include/asm/processor.h |    7 +--
+ arch/arm64/include/asm/syscalls.h  |    3 --
+ arch/arm64/include/asm/unistd.h    |    2 +-
+ arch/arm64/include/asm/unistd32.h  |    2 +-
+ arch/arm64/kernel/entry.S          |   12 ++---
+ arch/arm64/kernel/perf_event.c     |   10 +---
+ arch/arm64/kernel/process.c        |   95 +++++++++---------------------------
+ arch/arm64/kernel/smp.c            |    3 +-
+ arch/arm64/kernel/sys.c            |   65 ------------------------
+ arch/arm64/kernel/sys32.S          |    5 --
+ arch/arm64/kernel/sys_compat.c     |   18 -------
+ arch/arm64/mm/fault.c              |   13 ++++-
+ arch/arm64/mm/init.c               |    2 +-
+ 18 files changed, 64 insertions(+), 206 deletions(-)
+Merging blackfin/for-linus (9d84601 Blackfin: dpmc: use module_platform_driver macro)
+$ git merge blackfin/for-linus
+Removing arch/blackfin/include/asm/kvm_para.h
+Merge made by the 'recursive' strategy.
+ arch/blackfin/include/asm/Kbuild                   |    6 +-
+ arch/blackfin/include/asm/bfin_sport.h             |  128 +-----
+ arch/blackfin/include/asm/bfin_twi.h               |    2 +-
+ arch/blackfin/include/asm/fixed_code.h             |   30 +-
+ arch/blackfin/include/asm/kvm_para.h               |    1 -
+ arch/blackfin/include/asm/pgtable.h                |    2 -
+ arch/blackfin/include/asm/ptrace.h                 |  161 +-------
+ arch/blackfin/include/asm/uaccess.h                |   41 +-
+ arch/blackfin/include/asm/unistd.h                 |  430 +------------------
+ arch/blackfin/include/uapi/asm/Kbuild              |   16 +
+ arch/blackfin/include/uapi/asm/bfin_sport.h        |  136 ++++++
+ arch/blackfin/include/{ => uapi}/asm/byteorder.h   |    0
+ arch/blackfin/include/{ => uapi}/asm/cachectl.h    |    0
+ arch/blackfin/include/{ => uapi}/asm/fcntl.h       |    0
+ arch/blackfin/include/uapi/asm/fixed_code.h        |   38 ++
+ arch/blackfin/include/{ => uapi}/asm/ioctls.h      |    0
+ arch/blackfin/include/{ => uapi}/asm/poll.h        |    0
+ arch/blackfin/include/{ => uapi}/asm/posix_types.h |    0
+ arch/blackfin/include/uapi/asm/ptrace.h            |  170 ++++++++
+ arch/blackfin/include/{ => uapi}/asm/sigcontext.h  |    0
+ arch/blackfin/include/{ => uapi}/asm/siginfo.h     |    0
+ arch/blackfin/include/{ => uapi}/asm/signal.h      |    0
+ arch/blackfin/include/{ => uapi}/asm/stat.h        |    0
+ arch/blackfin/include/{ => uapi}/asm/swab.h        |    0
+ arch/blackfin/include/uapi/asm/unistd.h            |  437 ++++++++++++++++++++
+ arch/blackfin/mach-common/dpmc.c                   |   19 +-
+ 26 files changed, 817 insertions(+), 800 deletions(-)
+ delete mode 100644 arch/blackfin/include/asm/kvm_para.h
+ create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
+ rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
+ rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
+ rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
+Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
+$ git merge cris/for-next
+Auto-merging arch/cris/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/cris/include/arch-v10/arch/Kbuild             |    5 +-
+ arch/cris/include/arch-v32/arch/Kbuild             |    3 +-
+ arch/cris/include/arch-v32/arch/cryptocop.h        |  116 +------
+ arch/cris/include/arch-v32/arch/spinlock.h         |    2 +-
+ arch/cris/include/asm/Kbuild                       |    5 -
+ arch/cris/include/asm/ptrace.h                     |    5 +-
+ arch/cris/include/asm/signal.h                     |  122 +------
+ arch/cris/include/asm/swab.h                       |    3 +-
+ arch/cris/include/asm/termios.h                    |   43 +--
+ arch/cris/include/asm/types.h                      |    5 +-
+ arch/cris/include/asm/unistd.h                     |  342 +------------------
+ arch/cris/include/uapi/arch-v10/arch/Kbuild        |    4 +
+ .../include/{ => uapi}/arch-v10/arch/sv_addr.agh   |    0
+ .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h  |    0
+ .../cris/include/{ => uapi}/arch-v10/arch/svinto.h |    0
+ arch/cris/include/{ => uapi}/arch-v10/arch/user.h  |    0
+ arch/cris/include/uapi/arch-v32/arch/Kbuild        |    2 +
+ arch/cris/include/uapi/arch-v32/arch/cryptocop.h   |  122 +++++++
+ arch/cris/include/{ => uapi}/arch-v32/arch/user.h  |    0
+ arch/cris/include/uapi/asm/Kbuild                  |   34 ++
+ arch/cris/include/{ => uapi}/asm/auxvec.h          |    0
+ arch/cris/include/{ => uapi}/asm/bitsperlong.h     |    0
+ arch/cris/include/{ => uapi}/asm/byteorder.h       |    0
+ arch/cris/include/{ => uapi}/asm/errno.h           |    0
+ arch/cris/include/{ => uapi}/asm/ethernet.h        |    0
+ arch/cris/include/{ => uapi}/asm/etraxgpio.h       |    0
+ arch/cris/include/{ => uapi}/asm/fcntl.h           |    0
+ arch/cris/include/{ => uapi}/asm/ioctl.h           |    0
+ arch/cris/include/{ => uapi}/asm/ioctls.h          |    0
+ arch/cris/include/{ => uapi}/asm/ipcbuf.h          |    0
+ arch/cris/include/{ => uapi}/asm/mman.h            |    0
+ arch/cris/include/{ => uapi}/asm/msgbuf.h          |    0
+ arch/cris/include/{ => uapi}/asm/param.h           |    0
+ arch/cris/include/{ => uapi}/asm/poll.h            |    0
+ arch/cris/include/{ => uapi}/asm/posix_types.h     |    0
+ arch/cris/include/uapi/asm/ptrace.h                |    1 +
+ arch/cris/include/{ => uapi}/asm/resource.h        |    0
+ arch/cris/include/{ => uapi}/asm/rs485.h           |    0
+ arch/cris/include/{ => uapi}/asm/sembuf.h          |    0
+ arch/cris/include/{ => uapi}/asm/setup.h           |    0
+ arch/cris/include/{ => uapi}/asm/shmbuf.h          |    0
+ arch/cris/include/{ => uapi}/asm/sigcontext.h      |    0
+ arch/cris/include/{ => uapi}/asm/siginfo.h         |    0
+ arch/cris/include/uapi/asm/signal.h                |  122 +++++++
+ arch/cris/include/{ => uapi}/asm/socket.h          |    0
+ arch/cris/include/{ => uapi}/asm/sockios.h         |    0
+ arch/cris/include/{ => uapi}/asm/stat.h            |    0
+ arch/cris/include/{ => uapi}/asm/statfs.h          |    0
+ arch/cris/include/uapi/asm/swab.h                  |    3 +
+ arch/cris/include/{ => uapi}/asm/sync_serial.h     |    0
+ arch/cris/include/{ => uapi}/asm/termbits.h        |    0
+ arch/cris/include/uapi/asm/termios.h               |   45 +++
+ arch/cris/include/uapi/asm/types.h                 |    1 +
+ arch/cris/include/uapi/asm/unistd.h                |  344 ++++++++++++++++++++
+ arch/cris/kernel/asm-offsets.c                     |    6 +-
+ 55 files changed, 689 insertions(+), 646 deletions(-)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
+ rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
+ create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
+ rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/param.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/ptrace.h
+ rename arch/cris/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/rs485.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/signal.h
+ rename arch/cris/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/statfs.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/swab.h
+ rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%)
+ rename arch/cris/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/cris/include/uapi/asm/termios.h
+ create mode 100644 arch/cris/include/uapi/asm/types.h
+ create mode 100644 arch/cris/include/uapi/asm/unistd.h
+Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (4fafc8c [IA64] Resolve name space collision for cache_show())
+$ git merge ia64/next
+Merge made by the 'recursive' strategy.
+ arch/ia64/kernel/topology.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (6762976 m68knommu: merge ColdFire 5249 and 525x definitions)
+$ git merge m68knommu/for-next
+Removing arch/m68k/include/asm/m5249sim.h
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.cpu                   |    3 +-
+ arch/m68k/include/asm/m5249sim.h        |  269 -------------------------------
+ arch/m68k/include/asm/m525xsim.h        |  116 ++++++++++++-
+ arch/m68k/include/asm/mcfsim.h          |    5 +-
+ arch/m68k/platform/coldfire/intc-5249.c |    8 +-
+ arch/m68k/platform/coldfire/m5249.c     |    8 +-
+ 6 files changed, 126 insertions(+), 283 deletions(-)
+ delete mode 100644 arch/m68k/include/asm/m5249sim.h
+$ git am -3 ../patches/0001-m68k-fix-up-for-UAPI-changes.patch
+Applying: m68k: fix up for UAPI changes
+$ git reset HEAD^
+Unstaged changes after reset:
+M      arch/m68k/include/uapi/asm/Kbuild
+$ git add -A .
+$ git commit -v -a --amend
+[master 1a71aff] Merge remote-tracking branch 'm68knommu/for-next'
+Merging microblaze/next (f229605 microblaze: dma-mapping: Support debug_dma_mapping_error)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/Kbuild                 |    2 -
+ arch/microblaze/include/asm/dma-mapping.h          |    2 +
+ arch/microblaze/include/asm/elf.h                  |   97 +----
+ arch/microblaze/include/asm/ptrace.h               |   62 +--
+ arch/microblaze/include/asm/setup.h                |    6 +-
+ arch/microblaze/include/asm/uaccess.h              |    3 +-
+ arch/microblaze/include/asm/unistd.h               |  390 +------------------
+ arch/microblaze/include/uapi/asm/Kbuild            |   32 ++
+ arch/microblaze/include/{ => uapi}/asm/auxvec.h    |    0
+ .../include/{ => uapi}/asm/bitsperlong.h           |    0
+ arch/microblaze/include/{ => uapi}/asm/byteorder.h |    0
+ arch/microblaze/include/uapi/asm/elf.h             |  121 ++++++
+ arch/microblaze/include/{ => uapi}/asm/errno.h     |    0
+ arch/microblaze/include/{ => uapi}/asm/fcntl.h     |    0
+ arch/microblaze/include/{ => uapi}/asm/ioctl.h     |    0
+ arch/microblaze/include/{ => uapi}/asm/ioctls.h    |    0
+ arch/microblaze/include/{ => uapi}/asm/ipcbuf.h    |    0
+ arch/microblaze/include/{ => uapi}/asm/kvm_para.h  |    0
+ arch/microblaze/include/{ => uapi}/asm/mman.h      |    0
+ arch/microblaze/include/{ => uapi}/asm/msgbuf.h    |    0
+ arch/microblaze/include/{ => uapi}/asm/param.h     |    0
+ arch/microblaze/include/{ => uapi}/asm/poll.h      |    0
+ .../include/{ => uapi}/asm/posix_types.h           |    0
+ arch/microblaze/include/uapi/asm/ptrace.h          |   72 ++++
+ arch/microblaze/include/{ => uapi}/asm/resource.h  |    0
+ arch/microblaze/include/{ => uapi}/asm/sembuf.h    |    0
+ arch/microblaze/include/uapi/asm/setup.h           |   19 +
+ arch/microblaze/include/{ => uapi}/asm/shmbuf.h    |    0
+ .../microblaze/include/{ => uapi}/asm/sigcontext.h |    0
+ arch/microblaze/include/{ => uapi}/asm/siginfo.h   |    0
+ arch/microblaze/include/{ => uapi}/asm/signal.h    |    0
+ arch/microblaze/include/{ => uapi}/asm/socket.h    |    0
+ arch/microblaze/include/{ => uapi}/asm/sockios.h   |    0
+ arch/microblaze/include/{ => uapi}/asm/stat.h      |    0
+ arch/microblaze/include/{ => uapi}/asm/statfs.h    |    0
+ arch/microblaze/include/{ => uapi}/asm/swab.h      |    0
+ arch/microblaze/include/{ => uapi}/asm/termbits.h  |    0
+ arch/microblaze/include/{ => uapi}/asm/termios.h   |    0
+ arch/microblaze/include/{ => uapi}/asm/types.h     |    0
+ arch/microblaze/include/uapi/asm/unistd.h          |  400 ++++++++++++++++++++
+ arch/microblaze/kernel/entry-nommu.S               |    1 -
+ arch/microblaze/kernel/entry.S                     |    2 +-
+ arch/microblaze/kernel/process.c                   |    1 -
+ 43 files changed, 653 insertions(+), 557 deletions(-)
+ rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/elf.h
+ rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
+ rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/setup.h
+ rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
+Merging mips/mips-for-linux-next (99a83df MIPS: Fix harmlessly missing else statement.)
+$ git merge mips/mips-for-linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                               |    9 ++
+ arch/mips/Kconfig                         |   17 ++-
+ arch/mips/cavium-octeon/octeon-memcpy.S   |   27 -----
+ arch/mips/cavium-octeon/setup.c           |   40 +++++--
+ arch/mips/configs/cavium_octeon_defconfig |   98 ++++++++++++++---
+ arch/mips/include/asm/cpu.h               |    6 +-
+ arch/mips/include/asm/mipsregs.h          |    2 +-
+ arch/mips/include/asm/page.h              |    8 +-
+ arch/mips/include/asm/pgtable-64.h        |    2 +-
+ arch/mips/include/asm/pgtable-bits.h      |   13 ++-
+ arch/mips/include/asm/pgtable.h           |  168 ++++++++++++++++++++++++++++-
+ arch/mips/include/asm/processor.h         |    4 -
+ arch/mips/include/asm/sparsemem.h         |    2 +-
+ arch/mips/include/asm/tlbdebug.h          |    1 +
+ arch/mips/kernel/asm-offsets.c            |    4 -
+ arch/mips/kernel/mips_ksyms.c             |    2 +-
+ arch/mips/kernel/scall64-n32.S            |    6 --
+ arch/mips/kernel/signal.c                 |   13 ++-
+ arch/mips/lib/dump_tlb.c                  |   47 ++++++++
+ arch/mips/mm/c-octeon.c                   |   46 ++++----
+ arch/mips/mm/pgtable-64.c                 |   31 ++++++
+ arch/mips/mm/tlb-r4k.c                    |   22 +++-
+ arch/mips/mm/tlbex.c                      |   93 +++++++++++-----
+ arch/mips/pci/pci-octeon.c                |    4 +
+ drivers/edac/Kconfig                      |   33 +++++-
+ drivers/edac/Makefile                     |    5 +
+ drivers/edac/octeon_edac-l2c.c            |  118 ++++++++++++++++++++
+ drivers/edac/octeon_edac-lmc.c            |  150 ++++++++++++++++++++++++++
+ drivers/edac/octeon_edac-lmc.h            |   78 ++++++++++++++
+ drivers/edac/octeon_edac-pc.c             |  140 ++++++++++++++++++++++++
+ drivers/edac/octeon_edac-pci.c            |  135 +++++++++++++++++++++++
+ 31 files changed, 1182 insertions(+), 142 deletions(-)
+ create mode 100644 drivers/edac/octeon_edac-l2c.c
+ create mode 100644 drivers/edac/octeon_edac-lmc.c
+ create mode 100644 drivers/edac/octeon_edac-lmc.h
+ create mode 100644 drivers/edac/octeon_edac-pc.c
+ create mode 100644 drivers/edac/octeon_edac-pci.c
+Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
+$ git merge openrisc/for-upstream
+Removing arch/openrisc/include/uapi/asm/kvm_para.h
+Merge made by the 'recursive' strategy.
+ arch/openrisc/include/asm/Kbuild          |    1 +
+ arch/openrisc/include/uapi/asm/kvm_para.h |    1 -
+ arch/openrisc/kernel/asm-offsets.c        |    6 +-----
+ 3 files changed, 2 insertions(+), 6 deletions(-)
+ delete mode 100644 arch/openrisc/include/uapi/asm/kvm_para.h
+Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
+$ git merge parisc/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/boot/dts/mpc5200b.dtsi       |    6 ++++++
+ arch/powerpc/boot/dts/o2d.dtsi            |    6 ------
+ arch/powerpc/boot/dts/pcm030.dts          |    7 ++++++-
+ arch/powerpc/platforms/52xx/mpc52xx_pic.c |    9 +++++----
+ 4 files changed, 17 insertions(+), 11 deletions(-)
+Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (3256ce0 s390/mm: move kernel_page_present/kernel_map_pages to page_attr.c)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/crypto/aes_s390.c            |   18 ++--
+ arch/s390/crypto/des_s390.c            |   12 ++-
+ arch/s390/crypto/ghash_s390.c          |   21 +++--
+ arch/s390/crypto/sha_common.c          |    9 +-
+ arch/s390/include/asm/ccwdev.h         |    6 +-
+ arch/s390/include/asm/cio.h            |    2 +
+ arch/s390/include/asm/page.h           |    2 +
+ arch/s390/include/asm/pgtable.h        |   46 +++++++---
+ arch/s390/kernel/Makefile              |    2 +-
+ arch/s390/kernel/entry.h               |   21 ++++-
+ arch/s390/kernel/entry64.S             |    4 +-
+ arch/s390/kernel/pgm_check.S           |  152 ++++++++++++++++++++++++++++++++
+ arch/s390/kernel/sclp.S                |    8 +-
+ arch/s390/kernel/setup.c               |   36 +-------
+ arch/s390/kernel/traps.c               |   52 ++---------
+ arch/s390/lib/uaccess_pt.c             |    2 +-
+ arch/s390/mm/Makefile                  |   12 +--
+ arch/s390/mm/dump_pagetables.c         |    7 +-
+ arch/s390/mm/fault.c                   |   12 ++-
+ arch/s390/mm/gup.c                     |    2 +-
+ arch/s390/mm/init.c                    |   29 ------
+ arch/s390/mm/pageattr.c                |   82 ++++++++++++++++-
+ arch/s390/mm/pgtable.c                 |   16 ----
+ arch/s390/mm/vmem.c                    |   46 ++++++++--
+ drivers/s390/block/dasd_eckd.c         |   76 ++++++++--------
+ drivers/s390/block/dasd_fba.c          |   23 +++--
+ drivers/s390/block/dasd_ioctl.c        |   11 ++-
+ drivers/s390/char/sclp_cmd.c           |   17 ++--
+ drivers/s390/cio/css.h                 |    3 -
+ drivers/s390/cio/device.c              |   19 +---
+ drivers/s390/cio/device.h              |    2 -
+ drivers/s390/cio/device_ops.c          |   17 ++--
+ drivers/s390/cio/idset.c               |    3 +-
+ drivers/s390/cio/qdio_main.c           |   52 +++--------
+ drivers/s390/cio/qdio_setup.c          |    7 +-
+ drivers/s390/cio/qdio_thinint.c        |    2 -
+ drivers/s390/crypto/zcrypt_msgtype50.c |   68 ++++++--------
+ drivers/s390/crypto/zcrypt_msgtype50.h |    2 +
+ 38 files changed, 529 insertions(+), 372 deletions(-)
+ create mode 100644 arch/s390/kernel/pgm_check.S
+Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (ddffeb8 Linux 3.7-rc1)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (7bf2799 arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Auto-merging arch/unicore32/include/uapi/asm/unistd.h
+Removing arch/unicore32/include/asm/kvm_para.h
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig                             |    7 +-
+ arch/unicore32/include/asm/Kbuild                  |    1 -
+ arch/unicore32/include/asm/bug.h                   |    5 --
+ arch/unicore32/include/asm/cmpxchg.h               |    2 +-
+ arch/unicore32/include/asm/kvm_para.h              |    1 -
+ arch/unicore32/include/asm/processor.h             |    5 --
+ arch/unicore32/include/asm/ptrace.h                |   76 +----------------
+ arch/unicore32/include/uapi/asm/Kbuild             |    7 ++
+ arch/unicore32/include/{ => uapi}/asm/byteorder.h  |    0
+ arch/unicore32/include/uapi/asm/ptrace.h           |   90 ++++++++++++++++++++
+ arch/unicore32/include/{ => uapi}/asm/sigcontext.h |    0
+ arch/unicore32/include/{ => uapi}/asm/unistd.h     |    1 +
+ arch/unicore32/kernel/entry.S                      |   20 ++---
+ arch/unicore32/kernel/process.c                    |   58 +++----------
+ arch/unicore32/kernel/setup.h                      |    6 ++
+ arch/unicore32/kernel/sys.c                        |   63 --------------
+ arch/unicore32/mm/fault.c                          |   37 +++++---
+ 17 files changed, 160 insertions(+), 219 deletions(-)
+ delete mode 100644 arch/unicore32/include/asm/kvm_para.h
+ rename arch/unicore32/include/{ => uapi}/asm/byteorder.h (100%)
+ create mode 100644 arch/unicore32/include/uapi/asm/ptrace.h
+ rename arch/unicore32/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/unicore32/include/{ => uapi}/asm/unistd.h (92%)
+Merging xtensa/for_next (d83ac75 xtensa: add xtavnet DTS)
+$ git merge xtensa/for_next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig                                |   26 ++++
+ arch/xtensa/Makefile                               |    6 +
+ arch/xtensa/boot/Makefile                          |   23 +++-
+ arch/xtensa/boot/boot-elf/Makefile                 |   24 ++--
+ arch/xtensa/boot/boot-redboot/Makefile             |   25 ++--
+ arch/xtensa/boot/boot-uboot/Makefile               |   13 ++
+ arch/xtensa/boot/dts/xtavnet.dts                   |   47 +++++++
+ arch/xtensa/include/asm/bootparam.h                |    1 +
+ arch/xtensa/include/asm/prom.h                     |    1 +
+ arch/xtensa/kernel/irq.c                           |   99 +++++++++-----
+ arch/xtensa/kernel/setup.c                         |  143 ++++++++++++++++----
+ arch/xtensa/kernel/time.c                          |    5 +-
+ arch/xtensa/platforms/xtavnet/Makefile             |    9 ++
+ .../platforms/xtavnet/include/platform/hardware.h  |   52 +++++++
+ .../platforms/xtavnet/include/platform/lcd.h       |   20 +++
+ .../platforms/xtavnet/include/platform/serial.h    |   38 ++++++
+ .../platforms/xtavnet/include/platform/system.h    |   12 ++
+ arch/xtensa/platforms/xtavnet/lcd.c                |   75 ++++++++++
+ arch/xtensa/platforms/xtavnet/setup.c              |   88 ++++++++++++
+ 19 files changed, 616 insertions(+), 91 deletions(-)
+ create mode 100644 arch/xtensa/boot/boot-uboot/Makefile
+ create mode 100644 arch/xtensa/boot/dts/xtavnet.dts
+ create mode 100644 arch/xtensa/include/asm/prom.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
+ create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/system.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
+ create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
+Merging btrfs/next (c37b2b6 Btrfs: do not bug when we fail to commit the transaction)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (3515297 rbd: activate v2 image support)
+$ git merge ceph/master
+Auto-merging net/ceph/messenger.c
+Merge made by the 'recursive' strategy.
+ drivers/block/rbd.c  |  100 +++++++++++++++++++++++++++++++++++++++-----------
+ net/ceph/messenger.c |   58 +++++++++++++----------------
+ 2 files changed, 104 insertions(+), 54 deletions(-)
+Merging cifs/for-next (5004f80 cifs: fix SID binary to string conversion)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsacl.c   |  767 ++++++++++++++++-----------------------------------
+ fs/cifs/cifsacl.h   |   66 +++--
+ fs/cifs/cifsfs.c    |   12 +-
+ fs/cifs/cifsproto.h |    1 -
+ fs/cifs/dir.c       |   11 +-
+ fs/cifs/inode.c     |    7 +-
+ fs/cifs/readdir.c   |   10 +
+ 7 files changed, 294 insertions(+), 580 deletions(-)
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (e4bc652 eCryptfs: Avoid unnecessary disk read and data decryption during writing)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/mmap.c |   12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (ffb5387 ext4: fix unjournaled inode bitmap modification)
+$ git merge ext4/dev
+Already up-to-date.
+Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
+$ git merge fuse/for-next
+Auto-merging include/uapi/linux/fuse.h
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/dev.c
+Merge made by the 'recursive' strategy.
+ fs/Kconfig                |   10 ---
+ fs/fuse/Kconfig           |   16 ++++-
+ fs/fuse/dev.c             |   19 ++++++
+ fs/fuse/dir.c             |  160 +++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/fuse_i.h          |    6 ++
+ fs/fuse/inode.c           |    5 +-
+ include/uapi/linux/fuse.h |   12 ++++
+ 7 files changed, 211 insertions(+), 17 deletions(-)
+Merging gfs2/master (9dbe961 GFS2: Add Orlov allocator)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c       |    2 +-
+ fs/gfs2/bmap.c       |    2 +-
+ fs/gfs2/file.c       |    4 +-
+ fs/gfs2/glock.c      |   14 ++--
+ fs/gfs2/glock.h      |   54 +++++++--------
+ fs/gfs2/glops.c      |   16 ++---
+ fs/gfs2/incore.h     |    3 +-
+ fs/gfs2/inode.c      |  182 +++++++++++++++++++++++++++-----------------------
+ fs/gfs2/ops_fstype.c |    3 +
+ fs/gfs2/quota.c      |    4 +-
+ fs/gfs2/rgrp.c       |  134 +++++++++++++++++++++++++++++++++----
+ fs/gfs2/rgrp.h       |    3 +-
+ fs/gfs2/xattr.c      |    2 +-
+ 13 files changed, 275 insertions(+), 148 deletions(-)
+Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
+$ git merge logfs/master
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nfs/linux-next (8ede994 Merge branch 'bugfixes' into linux-next)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/lockd/clnt4xdr.c           |    8 --
+ fs/lockd/clntproc.c           |    3 +-
+ fs/lockd/clntxdr.c            |    8 --
+ fs/lockd/host.c               |   15 +--
+ fs/lockd/mon.c                |    3 -
+ fs/nfs/cache_lib.c            |    1 -
+ fs/nfs/callback_proc.c        |    1 -
+ fs/nfs/client.c               |    6 +-
+ fs/nfs/inode.c                |    4 +-
+ fs/nfs/internal.h             |   12 --
+ fs/nfs/mount_clnt.c           |    7 +-
+ fs/nfs/nfs2xdr.c              |    4 +-
+ fs/nfs/nfs3xdr.c              |    7 +-
+ fs/nfs/nfs4_fs.h              |    5 +-
+ fs/nfs/nfs4client.c           |    4 -
+ fs/nfs/nfs4file.c             |    1 -
+ fs/nfs/nfs4filelayout.c       |   43 +++----
+ fs/nfs/nfs4filelayoutdev.c    |    2 -
+ fs/nfs/nfs4proc.c             |  286 ++++++++++++++++-------------------------
+ fs/nfs/nfs4state.c            |    5 +-
+ fs/nfs/nfs4xdr.c              |    6 +-
+ fs/nfs/objlayout/objlayout.c  |   11 --
+ fs/nfs/pnfs.c                 |   17 +--
+ fs/nfs/write.c                |   26 ++--
+ include/linux/nfs_xdr.h       |    3 +-
+ net/sunrpc/backchannel_rqst.c |    9 +-
+ net/sunrpc/bc_svc.c           |    2 +-
+ net/sunrpc/cache.c            |    4 +-
+ net/sunrpc/clnt.c             |   45 ++++---
+ net/sunrpc/rpc_pipe.c         |    9 +-
+ net/sunrpc/rpcb_clnt.c        |    5 +-
+ net/sunrpc/sched.c            |   27 +++-
+ net/sunrpc/svc.c              |   12 +-
+ net/sunrpc/svc_xprt.c         |   11 +-
+ net/sunrpc/svcsock.c          |    6 +-
+ net/sunrpc/xdr.c              |    5 +-
+ net/sunrpc/xprtsock.c         |   13 +-
+ 37 files changed, 269 insertions(+), 367 deletions(-)
+Merging nfsd/nfsd-next (3c40794 nfs: fix wrong object type in lockowner_slab)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/exportfs/expfs.c      |    4 ++--
+ fs/fhandle.c             |    2 +-
+ fs/nfsd/nfs4state.c      |    4 +---
+ fs/nfsd/nfsfh.c          |    4 ++--
+ include/linux/exportfs.h |    5 +++++
+ 5 files changed, 11 insertions(+), 8 deletions(-)
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c |   40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h   |    3 ++-
+ fs/ocfs2/dlm/dlmmaster.c     |   10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c   |    7 +++++++
+ fs/ocfs2/symlink.c           |    2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
+$ git merge v9fs/for-next
+Merge made by the 'recursive' strategy.
+Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/ubifs/find.c   |   12 ++++++++++--
+ fs/ubifs/lprops.c |    6 ++++++
+ fs/ubifs/ubifs.h  |    3 +++
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+Merging xfs/for-next (69a58a4 xfs: report projid32bit feature in geometry call)
+$ git merge xfs/for-next
+Removing fs/xfs/xfs_iget.c
+Auto-merging fs/xfs/xfs_icache.h
+Auto-merging fs/xfs/xfs_icache.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/xfs.txt   |   11 +-
+ fs/xfs/Makefile                     |    3 +-
+ fs/xfs/xfs_alloc.c                  |   43 +--
+ fs/xfs/xfs_alloc.h                  |    3 -
+ fs/xfs/xfs_alloc_btree.c            |    2 +
+ fs/xfs/xfs_bmap.c                   |   63 +++-
+ fs/xfs/xfs_bmap.h                   |    9 +-
+ fs/xfs/xfs_buf_item.c               |   18 +
+ fs/xfs/xfs_export.c                 |    1 +
+ fs/xfs/xfs_file.c                   |   13 +-
+ fs/xfs/xfs_fs.h                     |    3 +-
+ fs/xfs/xfs_fsops.c                  |   25 +-
+ fs/xfs/xfs_ialloc.c                 |    7 +-
+ fs/xfs/{xfs_sync.c => xfs_icache.c} |  701 ++++++++++++++++++++--------------
+ fs/xfs/{xfs_sync.h => xfs_icache.h} |   14 +-
+ fs/xfs/xfs_iget.c                   |  705 -----------------------------------
+ fs/xfs/xfs_inode.c                  |  272 +++++++++++++-
+ fs/xfs/xfs_inode.h                  |   10 +-
+ fs/xfs/xfs_ioctl.c                  |    2 +-
+ fs/xfs/xfs_iomap.c                  |   27 +-
+ fs/xfs/xfs_itable.c                 |    1 +
+ fs/xfs/xfs_log.c                    |  122 +++++-
+ fs/xfs/xfs_log.h                    |    4 +
+ fs/xfs/xfs_log_priv.h               |    1 +
+ fs/xfs/xfs_log_recover.c            |    3 +-
+ fs/xfs/xfs_mount.c                  |   31 +-
+ fs/xfs/xfs_mount.h                  |    6 +-
+ fs/xfs/xfs_qm.c                     |    1 +
+ fs/xfs/xfs_qm_syscalls.c            |    1 +
+ fs/xfs/xfs_rtalloc.c                |    1 +
+ fs/xfs/xfs_super.c                  |  139 ++++---
+ fs/xfs/xfs_super.h                  |    1 +
+ fs/xfs/xfs_vnodeops.c               |    3 +-
+ 33 files changed, 1056 insertions(+), 1190 deletions(-)
+ rename fs/xfs/{xfs_sync.c => xfs_icache.c} (64%)
+ rename fs/xfs/{xfs_sync.h => xfs_icache.h} (73%)
+ delete mode 100644 fs/xfs/xfs_iget.c
+Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
+$ git merge vfs/for-next
+Auto-merging arch/alpha/kernel/osf_sys.c
+Merge made by the 'recursive' strategy.
+ arch/alpha/kernel/osf_sys.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging pci/next (1800377 Merge branch 'pci/mike-x86-tra' into next)
+$ git merge pci/next
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci-driver.c
+Merge made by the 'recursive' strategy.
+ arch/x86/pci/acpi.c         |   46 ++++++++++--
+ arch/x86/pci/common.c       |    2 +-
+ drivers/acpi/pci_bind.c     |   10 +--
+ drivers/acpi/pci_irq.c      |   17 +++--
+ drivers/acpi/pci_root.c     |  165 +++++++++++++++++++++++++------------------
+ drivers/pci/irq.c           |   10 +--
+ drivers/pci/pci-driver.c    |    6 +-
+ drivers/pci/pci-stub.c      |    2 +-
+ drivers/pci/pci.c           |   33 +++++----
+ drivers/pci/pcie/aspm.c     |    7 +-
+ drivers/pci/probe.c         |   22 ++++++
+ drivers/pci/quirks.c        |   39 ++++++++++
+ drivers/pci/remove.c        |   36 ++++++++++
+ drivers/pci/setup-bus.c     |   22 +-----
+ include/acpi/acpi_drivers.h |    4 +-
+ include/linux/pci.h         |    5 +-
+ 16 files changed, 286 insertions(+), 140 deletions(-)
+$ git am -3 ../patches/0001-PCI-fixups-for-pci_resource_start-conversion.patch
+Applying: PCI: fixups for pci_resource_start conversion
+$ git reset HEAD^
+Unstaged changes after reset:
+M      drivers/scsi/gdth.c
+M      drivers/staging/telephony/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master c961c48] Merge remote-tracking branch 'pci/next'
+Merging hid/for-next (71bca10 Merge branch 'for-3.8/upstream' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/hid/hid-ids.h
+Auto-merging drivers/hid/hid-core.c
+Auto-merging drivers/hid/hid-apple.c
+Merge made by the 'recursive' strategy.
+ .../ABI/obsolete/sysfs-driver-hid-roccat-koneplus  |   11 +
+ .../ABI/testing/sysfs-driver-hid-roccat-koneplus   |   19 +-
+ .../ABI/testing/sysfs-driver-hid-roccat-lua        |    7 +
+ .../ABI/testing/sysfs-driver-hid-roccat-savu       |    3 +-
+ drivers/hid/Kconfig                                |    9 +
+ drivers/hid/Makefile                               |    5 +-
+ drivers/hid/hid-apple.c                            |    3 +-
+ drivers/hid/hid-core.c                             |   13 +-
+ drivers/hid/hid-icade.c                            |  259 +++++++++++++++
+ drivers/hid/hid-ids.h                              |    6 +
+ drivers/hid/hid-input.c                            |    9 +-
+ drivers/hid/hid-roccat-koneplus.c                  |  346 ++++++--------------
+ drivers/hid/hid-roccat-koneplus.h                  |   99 +-----
+ drivers/hid/hid-roccat-lua.c                       |  227 +++++++++++++
+ drivers/hid/hid-roccat-lua.h                       |   29 ++
+ drivers/hid/hid-roccat-savu.c                      |    4 +-
+ 16 files changed, 689 insertions(+), 360 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-lua
+ create mode 100644 drivers/hid/hid-icade.c
+ create mode 100644 drivers/hid/hid-roccat-lua.c
+ create mode 100644 drivers/hid/hid-roccat-lua.h
+Merging i2c/master (100b210 MAINTAINERS: i2c: 7 years, this is it)
+$ git merge i2c/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/i2c/smbus-protocol |   40 +++++++++++++++++++------
+ MAINTAINERS                      |   60 ++++++++++++++++++++++++++++++++------
+ drivers/i2c/busses/i2c-i801.c    |   13 ++-------
+ drivers/i2c/busses/i2c-piix4.c   |    5 ++--
+ 4 files changed, 87 insertions(+), 31 deletions(-)
+Merging i2c-embedded/i2c-embedded/for-next (60f0a25 i2c: tegra: set irq name as device name)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Merge made by the 'recursive' strategy.
+Merging jdelvare-hwmon/master (a196a0c hwmon: (it87) Support PECI for additional chips)
+$ git merge jdelvare-hwmon/master
+Auto-merging drivers/hwmon/w83627hf.c
+Auto-merging drivers/hwmon/w83627ehf.c
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/it87  |   10 +
+ drivers/hwmon/it87.c      |  918 +++++++++++++++++++++++----------------------
+ drivers/hwmon/w83627ehf.c |   99 ++++-
+ drivers/hwmon/w83627hf.c  |   81 +++-
+ 4 files changed, 665 insertions(+), 443 deletions(-)
+Merging hwmon-staging/hwmon-next (d29d75d hwmon: (da9055) Fix chan_mux[DA9055_ADC_ADCIN3] setting)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/ads7828           |   46 +++--
+ Documentation/hwmon/coretemp          |    2 +
+ Documentation/hwmon/da9055            |   47 +++++
+ drivers/hwmon/Kconfig                 |   19 +-
+ drivers/hwmon/Makefile                |    1 +
+ drivers/hwmon/ads7828.c               |  247 ++++++++++--------------
+ drivers/hwmon/coretemp.c              |   60 +++---
+ drivers/hwmon/da9052-hwmon.c          |   27 +--
+ drivers/hwmon/da9055-hwmon.c          |  336 +++++++++++++++++++++++++++++++++
+ drivers/hwmon/ina2xx.c                |   13 +-
+ include/linux/platform_data/ads7828.h |   29 +++
+ 11 files changed, 603 insertions(+), 224 deletions(-)
+ create mode 100644 Documentation/hwmon/da9055
+ create mode 100644 drivers/hwmon/da9055-hwmon.c
+ create mode 100644 include/linux/platform_data/ads7828.h
+Merging v4l-dvb/master (c616352 Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Removing include/linux/dvb/video.h
+Removing include/linux/dvb/dmx.h
+Removing include/linux/dvb/Kbuild
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/v4l/io.xml             |    4 +-
+ MAINTAINERS                                        |  125 +++++++++---
+ drivers/hid/hid-picolcd_cir.c                      |    2 +-
+ drivers/media/common/Kconfig                       |    7 +
+ drivers/media/common/b2c2/Kconfig                  |    5 -
+ drivers/media/common/siano/Kconfig                 |   17 +-
+ drivers/media/common/siano/Makefile                |    3 +-
+ drivers/media/common/siano/smscoreapi.c            |    2 +-
+ drivers/media/common/siano/smsir.c                 |    2 +-
+ drivers/media/common/siano/smsir.h                 |    9 +
+ drivers/media/dvb-core/dmxdev.c                    |    2 +-
+ drivers/media/dvb-core/dmxdev.h                    |    1 +
+ drivers/media/dvb-core/dvb_frontend.c              |   10 -
+ drivers/media/dvb-frontends/cx22700.c              |    4 +-
+ drivers/media/dvb-frontends/cx24123.c              |    2 +-
+ drivers/media/dvb-frontends/dib9000.h              |    2 +-
+ drivers/media/dvb-frontends/drxd_hard.c            |    8 +-
+ drivers/media/dvb-frontends/drxk_hard.c            |   24 +--
+ drivers/media/dvb-frontends/drxk_hard.h            |    6 +-
+ drivers/media/dvb-frontends/l64781.c               |    4 +-
+ drivers/media/dvb-frontends/mt312.c                |    4 +-
+ drivers/media/dvb-frontends/rtl2830.c              |    6 +-
+ drivers/media/dvb-frontends/rtl2832.c              |    6 +-
+ drivers/media/dvb-frontends/stb0899_drv.c          |    2 +-
+ drivers/media/dvb-frontends/stv0367.c              |   19 +-
+ drivers/media/dvb-frontends/stv0900_core.c         |    6 +-
+ drivers/media/dvb-frontends/tda10071.c             |    6 +-
+ drivers/media/dvb-frontends/tda18271c2dd.c         |    1 +
+ drivers/media/firewire/firedtv.h                   |    1 +
+ drivers/media/i2c/adv7183.c                        |   13 +-
+ drivers/media/i2c/cx25840/cx25840-core.c           |    2 +-
+ drivers/media/i2c/ir-kbd-i2c.c                     |   14 +-
+ drivers/media/i2c/s5k4ecgx.c                       |    2 +-
+ drivers/media/i2c/smiapp-pll.c                     |  215 +++++++++++---------
+ drivers/media/i2c/smiapp-pll.h                     |   59 +++---
+ drivers/media/i2c/smiapp/smiapp-core.c             |   68 +++----
+ drivers/media/i2c/soc_camera/ov2640.c              |    6 +-
+ drivers/media/i2c/vs6624.c                         |   13 +-
+ drivers/media/mmc/siano/Kconfig                    |    1 +
+ drivers/media/pci/bt8xx/bttv-driver.c              |    7 +-
+ drivers/media/pci/cx18/cx18-alsa-main.c            |    2 +-
+ drivers/media/pci/cx18/cx18-alsa-pcm.c             |    1 +
+ drivers/media/pci/cx18/cx18-i2c.c                  |    2 +-
+ drivers/media/pci/cx18/cx18-streams.c              |    2 +-
+ drivers/media/pci/cx23885/altera-ci.c              |   45 ++--
+ drivers/media/pci/cx23885/cimax2.c                 |   17 +-
+ drivers/media/pci/cx23885/cx23885-alsa.c           |    6 +-
+ drivers/media/pci/cx23885/cx23885-av.c             |    1 +
+ drivers/media/pci/cx23885/cx23885-cards.c          |    2 +-
+ drivers/media/pci/cx23885/cx23885-core.c           |    8 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c            |    2 +-
+ drivers/media/pci/cx23885/cx23885-f300.c           |    1 +
+ drivers/media/pci/cx23885/cx23885-input.c          |    7 +-
+ drivers/media/pci/cx23885/cx23885-input.h          |    2 +-
+ drivers/media/pci/cx23885/cx23885-ioctl.c          |    2 +
+ drivers/media/pci/cx23885/cx23885-ir.c             |    1 +
+ drivers/media/pci/cx23885/cx23888-ir.c             |    1 +
+ drivers/media/pci/cx23885/netup-init.c             |    1 +
+ drivers/media/pci/cx25821/cx25821-audio-upstream.c |   16 +-
+ drivers/media/pci/cx25821/cx25821-biffuncs.h       |    6 +-
+ drivers/media/pci/cx25821/cx25821-i2c.c            |    4 +-
+ .../media/pci/cx25821/cx25821-video-upstream-ch2.c |   24 ++-
+ drivers/media/pci/cx25821/cx25821-video-upstream.c |   32 +--
+ drivers/media/pci/cx25821/cx25821-video.c          |    8 +-
+ drivers/media/pci/cx88/cx88-alsa.c                 |   14 +-
+ drivers/media/pci/cx88/cx88-blackbird.c            |    7 +-
+ drivers/media/pci/cx88/cx88-core.c                 |   12 +-
+ drivers/media/pci/cx88/cx88-input.c                |    8 +-
+ drivers/media/pci/cx88/cx88-mpeg.c                 |   18 +-
+ drivers/media/pci/cx88/cx88.h                      |    4 +-
+ drivers/media/pci/dm1105/dm1105.c                  |    4 +-
+ drivers/media/pci/ivtv/ivtv-alsa-main.c            |    2 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.c             |    6 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.h             |    4 -
+ drivers/media/pci/ivtv/ivtv-firmware.c             |    2 +-
+ drivers/media/pci/ivtv/ivtv-i2c.c                  |    8 +-
+ drivers/media/pci/ivtv/ivtv-ioctl.c                |    4 +-
+ drivers/media/pci/mantis/mantis_input.c            |    5 +-
+ drivers/media/pci/mantis/mantis_uart.c             |    2 +-
+ drivers/media/pci/mantis/mantis_vp1033.c           |    6 +-
+ drivers/media/pci/meye/meye.c                      |    2 +-
+ drivers/media/pci/ngene/ngene-cards.c              |    4 +-
+ drivers/media/pci/ngene/ngene-core.c               |    4 +-
+ drivers/media/pci/saa7134/saa7134-core.c           |    3 +-
+ drivers/media/pci/saa7134/saa7134-input.c          |    2 +-
+ drivers/media/pci/saa7134/saa7134-video.c          |    2 +-
+ drivers/media/pci/saa7164/saa7164-api.c            |   26 +--
+ drivers/media/pci/saa7164/saa7164-bus.c            |    6 +-
+ drivers/media/pci/saa7164/saa7164-cmd.c            |   16 +-
+ drivers/media/pci/saa7164/saa7164-core.c           |    4 +-
+ drivers/media/pci/saa7164/saa7164-encoder.c        |   15 +-
+ drivers/media/pci/saa7164/saa7164-fw.c             |    8 +-
+ drivers/media/pci/saa7164/saa7164-vbi.c            |    6 +-
+ drivers/media/pci/ttpci/av7110.h                   |    1 +
+ drivers/media/platform/blackfin/bfin_capture.c     |   14 +-
+ drivers/media/platform/coda.c                      |    4 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c       |    8 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c        |    2 +-
+ drivers/media/platform/fsl-viu.c                   |    6 +-
+ drivers/media/platform/m2m-deinterlace.c           |   24 +--
+ drivers/media/platform/mx2_emmaprp.c               |   14 +-
+ drivers/media/platform/omap/omap_vout.c            |   36 +---
+ drivers/media/platform/omap3isp/ispccdc.c          |    4 +-
+ drivers/media/platform/omap3isp/ispstat.c          |    4 +-
+ drivers/media/platform/omap3isp/ispstat.h          |    4 +-
+ drivers/media/platform/omap3isp/ispvideo.c         |    2 +-
+ drivers/media/platform/s5p-fimc/Kconfig            |    1 +
+ drivers/media/platform/s5p-fimc/fimc-capture.c     |    4 +-
+ drivers/media/platform/s5p-fimc/fimc-lite.c        |    4 +-
+ drivers/media/platform/s5p-fimc/fimc-m2m.c         |    2 +-
+ drivers/media/platform/s5p-fimc/fimc-mdevice.c     |   45 ++--
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |    2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c        |    2 +-
+ drivers/media/platform/s5p-tv/mixer_video.c        |    1 -
+ drivers/media/platform/soc_camera/soc_camera.c     |    4 +-
+ drivers/media/platform/vivi.c                      |    1 -
+ drivers/media/radio/radio-aimslab.c                |    2 +-
+ drivers/media/radio/radio-isa.c                    |   10 +-
+ drivers/media/radio/radio-sf16fmi.c                |    2 +-
+ drivers/media/radio/radio-tea5764.c                |    4 +-
+ drivers/media/radio/si4713-i2c.c                   |    2 +-
+ drivers/media/radio/wl128x/fmdrv.h                 |    2 +-
+ drivers/media/radio/wl128x/fmdrv_common.c          |    2 +-
+ drivers/media/radio/wl128x/fmdrv_rx.c              |    2 +-
+ drivers/media/rc/ati_remote.c                      |    2 +-
+ drivers/media/rc/ene_ir.c                          |   33 ++-
+ drivers/media/rc/fintek-cir.c                      |    6 +-
+ drivers/media/rc/gpio-ir-recv.c                    |    2 +-
+ drivers/media/rc/iguanair.c                        |    2 +-
+ drivers/media/rc/imon.c                            |   40 ++--
+ drivers/media/rc/ir-jvc-decoder.c                  |    4 +-
+ drivers/media/rc/ir-lirc-codec.c                   |    4 +-
+ drivers/media/rc/ir-mce_kbd-decoder.c              |    4 +-
+ drivers/media/rc/ir-nec-decoder.c                  |    4 +-
+ drivers/media/rc/ir-rc5-decoder.c                  |   14 +-
+ drivers/media/rc/ir-rc5-sz-decoder.c               |    6 +-
+ drivers/media/rc/ir-rc6-decoder.c                  |    8 +-
+ drivers/media/rc/ir-rx51.c                         |   13 +-
+ drivers/media/rc/ir-sanyo-decoder.c                |    4 +-
+ drivers/media/rc/ir-sony-decoder.c                 |   17 +-
+ drivers/media/rc/ite-cir.c                         |    6 +-
+ drivers/media/rc/keymaps/rc-imon-mce.c             |    2 +-
+ drivers/media/rc/keymaps/rc-rc6-mce.c              |    2 +-
+ drivers/media/rc/mceusb.c                          |    2 +-
+ drivers/media/rc/nuvoton-cir.c                     |   13 +-
+ drivers/media/rc/nuvoton-cir.h                     |    1 -
+ drivers/media/rc/rc-loopback.c                     |    2 +-
+ drivers/media/rc/rc-main.c                         |   73 ++++---
+ drivers/media/rc/redrat3.c                         |    2 +-
+ drivers/media/rc/streamzap.c                       |    2 +-
+ drivers/media/rc/ttusbir.c                         |    2 +-
+ drivers/media/rc/winbond-cir.c                     |    6 +-
+ drivers/media/tuners/max2165.c                     |    2 +-
+ drivers/media/tuners/tua9001.c                     |    2 +-
+ drivers/media/tuners/xc4000.c                      |    2 +-
+ drivers/media/usb/au0828/au0828-cards.c            |    2 +-
+ drivers/media/usb/au0828/au0828-dvb.c              |    5 +-
+ drivers/media/usb/au0828/au0828-video.c            |   16 +-
+ drivers/media/usb/cx231xx/cx231xx-avcore.c         |    9 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c          |    8 +-
+ drivers/media/usb/cx231xx/cx231xx-i2c.c            |    4 +-
+ drivers/media/usb/cx231xx/cx231xx-input.c          |    2 +-
+ drivers/media/usb/dvb-usb-v2/af9015.c              |    2 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c              |    4 +-
+ drivers/media/usb/dvb-usb-v2/anysee.c              |    4 +-
+ drivers/media/usb/dvb-usb-v2/az6007.c              |    2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h             |    2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c        |   14 +-
+ drivers/media/usb/dvb-usb-v2/it913x.c              |   12 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c             |    4 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |    4 +-
+ drivers/media/usb/dvb-usb-v2/usb_urb.c             |    8 +-
+ drivers/media/usb/dvb-usb/az6027.c                 |   11 +-
+ drivers/media/usb/dvb-usb/dib0700.h                |    2 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c           |   16 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c        |  146 ++++++-------
+ drivers/media/usb/dvb-usb/dvb-usb.h                |    2 +-
+ drivers/media/usb/dvb-usb/pctv452e.c               |    4 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c         |    2 +-
+ drivers/media/usb/dvb-usb/ttusb2.c                 |    2 +-
+ drivers/media/usb/dvb-usb/vp702x.c                 |    8 +-
+ drivers/media/usb/em28xx/em28xx-cards.c            |   15 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c              |   84 +++++++-
+ drivers/media/usb/em28xx/em28xx-input.c            |   16 +-
+ drivers/media/usb/em28xx/em28xx.h                  |    1 +
+ drivers/media/usb/gspca/gspca.c                    |    3 +-
+ drivers/media/usb/gspca/gspca.h                    |    2 +-
+ drivers/media/usb/gspca/jeilinj.c                  |    6 +-
+ drivers/media/usb/gspca/m5602/m5602_s5k4aa.c       |    6 +
+ drivers/media/usb/hdpvr/hdpvr-i2c.c                |    2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c       |    4 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c           |    4 +-
+ drivers/media/usb/pwc/pwc-if.c                     |    8 +-
+ drivers/media/usb/s2255/s2255drv.c                 |    2 +-
+ drivers/media/usb/siano/Kconfig                    |    1 +
+ drivers/media/usb/stk1160/stk1160-i2c.c            |    2 +-
+ drivers/media/usb/tlg2300/pd-dvb.c                 |    1 +
+ drivers/media/usb/tlg2300/pd-video.c               |    4 +-
+ drivers/media/usb/tm6000/tm6000-input.c            |   20 +-
+ drivers/media/usb/usbvision/usbvision.h            |    2 +-
+ drivers/media/usb/zr364xx/zr364xx.c                |    3 +-
+ drivers/media/v4l2-core/v4l2-common.c              |    3 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c             |    6 +-
+ drivers/staging/media/dt3155v4l/dt3155v4l.c        |    4 +-
+ drivers/staging/media/go7007/go7007-v4l2.c         |    2 +-
+ drivers/staging/media/go7007/s2250-board.c         |   13 +-
+ drivers/staging/media/go7007/wis-ov7640.c          |   13 +-
+ drivers/staging/media/go7007/wis-saa7113.c         |   13 +-
+ drivers/staging/media/go7007/wis-saa7115.c         |   13 +-
+ drivers/staging/media/go7007/wis-sony-tuner.c      |   13 +-
+ drivers/staging/media/go7007/wis-tw2804.c          |   13 +-
+ drivers/staging/media/go7007/wis-tw9903.c          |   13 +-
+ drivers/staging/media/go7007/wis-uda1342.c         |   13 +-
+ drivers/staging/media/lirc/lirc_serial.c           |    6 +-
+ include/linux/dvb/dmx.h                            |   29 ---
+ include/linux/dvb/video.h                          |   29 ---
+ include/media/ir-kbd-i2c.h                         |    2 +-
+ include/media/rc-core.h                            |    4 +-
+ include/media/rc-map.h                             |   64 ++++--
+ include/uapi/linux/videodev2.h                     |    2 +-
+ 220 files changed, 1188 insertions(+), 1132 deletions(-)
+ delete mode 100644 include/linux/dvb/Kbuild
+ delete mode 100644 include/linux/dvb/dmx.h
+ delete mode 100644 include/linux/dvb/video.h
+$ git reset --hard HEAD^
+HEAD is now at bf98dbc Merge remote-tracking branch 'hwmon-staging/hwmon-next'
+Merging refs/next/20121026/v4l-dvb
+$ git merge refs/next/20121026/v4l-dvb
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging kbuild/for-next (c582d2a Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
+$ git merge kbuild/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
+$ git merge pstore/master
+Already up-to-date.
+Merging acpi/next (afee985 tools/power turbostat: print Processor TDP in Watts, when available)
+$ git merge acpi/next
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/msr-index.h                |   35 ++++++
+ tools/power/x86/turbostat/Makefile              |    7 +-
+ tools/power/x86/turbostat/turbostat.c           |  145 ++++++++++++++++++-----
+ tools/power/x86/x86_energy_perf_policy/Makefile |    6 +-
+ 4 files changed, 161 insertions(+), 32 deletions(-)
+Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
+$ git merge cpuidle/cpuidle-next
+Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
+Resolved 'include/linux/cpuidle.h' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+CONFLICT (content): Merge conflict in include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/coupled.c
+CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f1f375e] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+$ git diff -M --stat --summary HEAD^..
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (160b7d8 Thermal: Remove the cooling_cpufreq_list.)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ Documentation/thermal/sysfs-api.txt                |   64 ++
+ drivers/acpi/thermal.c                             |    6 +-
+ drivers/platform/x86/acerhdf.c                     |    2 +-
+ drivers/platform/x86/intel_mid_thermal.c           |    2 +-
+ drivers/power/power_supply_core.c                  |    2 +-
+ drivers/staging/omap-thermal/omap-thermal-common.c |    2 +-
+ drivers/thermal/Kconfig                            |   49 ++
+ drivers/thermal/Makefile                           |    3 +
+ drivers/thermal/cpu_cooling.c                      |  103 +--
+ drivers/thermal/exynos_thermal.c                   |    2 +-
+ drivers/thermal/fair_share.c                       |  133 ++++
+ drivers/thermal/rcar_thermal.c                     |   20 +-
+ drivers/thermal/spear_thermal.c                    |    2 +-
+ drivers/thermal/step_wise.c                        |  194 ++++++
+ drivers/thermal/thermal_core.h                     |   53 ++
+ drivers/thermal/thermal_sys.c                      |  700 +++++++++++++-------
+ drivers/thermal/user_space.c                       |   68 ++
+ include/linux/thermal.h                            |  128 +++-
+ 18 files changed, 1152 insertions(+), 381 deletions(-)
+ create mode 100644 drivers/thermal/fair_share.c
+ create mode 100644 drivers/thermal/step_wise.c
+ create mode 100644 drivers/thermal/thermal_core.h
+ create mode 100644 drivers/thermal/user_space.c
+Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (6a059ab UBI: use list_move_tail instead of list_del/list_add_tail)
+$ git merge ubi/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/fastmap.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+Merging dlm/next (a3de56b fs/dlm: remove CONFIG_EXPERIMENTAL)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/Kconfig    |    2 +-
+ fs/dlm/lowcomms.c |    5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/xen/swiotlb-xen.c |   25 ++---
+ include/linux/swiotlb.h   |   20 ++--
+ lib/swiotlb.c             |  269 +++++++++++++++++++++++----------------------
+ 3 files changed, 163 insertions(+), 151 deletions(-)
+Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
+$ git merge scsi/for-next
+Already up-to-date.
+Merging target-updates/for-next (da97b66 target/iblock: Add WRITE_SAME w/ UNMAP=0 emulation support)
+$ git merge target-updates/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/ulp/srpt/ib_srpt.c        |   43 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c           |    4 +-
+ drivers/target/iscsi/iscsi_target.c          |   82 +-
+ drivers/target/iscsi/iscsi_target_core.h     |    2 +-
+ drivers/target/iscsi/iscsi_target_erl1.c     |   11 +-
+ drivers/target/iscsi/iscsi_target_erl2.c     |    2 +-
+ drivers/target/iscsi/iscsi_target_login.c    |   12 +-
+ drivers/target/iscsi/iscsi_target_nego.c     |   10 +-
+ drivers/target/iscsi/iscsi_target_tmr.c      |    4 +-
+ drivers/target/iscsi/iscsi_target_tq.c       |    3 +-
+ drivers/target/iscsi/iscsi_target_util.c     |    8 +-
+ drivers/target/loopback/tcm_loop.h           |    1 -
+ drivers/target/sbp/Kconfig                   |    2 +-
+ drivers/target/target_core_alua.c            |  343 +++-----
+ drivers/target/target_core_alua.h            |    9 +-
+ drivers/target/target_core_configfs.c        |  686 +++++----------
+ drivers/target/target_core_device.c          |  704 +++++++--------
+ drivers/target/target_core_fabric_configfs.c |   14 +-
+ drivers/target/target_core_file.c            |  185 ++--
+ drivers/target/target_core_file.h            |    2 +
+ drivers/target/target_core_hba.c             |    4 +-
+ drivers/target/target_core_iblock.c          |  331 +++----
+ drivers/target/target_core_iblock.h          |    1 +
+ drivers/target/target_core_internal.h        |   16 +-
+ drivers/target/target_core_pr.c              | 1222 +++++++++++---------------
+ drivers/target/target_core_pr.h              |   10 +-
+ drivers/target/target_core_pscsi.c           |  344 +++-----
+ drivers/target/target_core_pscsi.h           |    2 +-
+ drivers/target/target_core_rd.c              |  121 +--
+ drivers/target/target_core_rd.h              |    1 +
+ drivers/target/target_core_sbc.c             |  151 ++--
+ drivers/target/target_core_spc.c             |  567 ++++++++----
+ drivers/target/target_core_stat.c            |  307 ++-----
+ drivers/target/target_core_tmr.c             |    6 +-
+ drivers/target/target_core_transport.c       |  635 ++++---------
+ drivers/target/target_core_ua.c              |   17 +-
+ drivers/target/target_core_ua.h              |    2 +-
+ drivers/vhost/tcm_vhost.c                    |    4 -
+ include/target/target_core_backend.h         |   46 +-
+ include/target/target_core_base.h            |  207 ++---
+ include/target/target_core_fabric.h          |   13 +-
+ 41 files changed, 2493 insertions(+), 3641 deletions(-)
+Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging slave-dma/next (8007644 async_tx: use memchr_inv)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/dma/snps-dma.txt |   44 ++++++
+ arch/arm/boot/dts/spear1340.dtsi                   |   19 +++
+ arch/arm/boot/dts/spear13xx.dtsi                   |   38 +++++
+ arch/arm/mach-spear13xx/include/mach/spear.h       |    2 -
+ arch/arm/mach-spear13xx/spear1310.c                |    4 +-
+ arch/arm/mach-spear13xx/spear1340.c                |   27 +---
+ arch/arm/mach-spear13xx/spear13xx.c                |   54 +------
+ crypto/async_tx/async_xor.c                        |    4 +-
+ drivers/dma/Kconfig                                |    3 +-
+ drivers/dma/amba-pl08x.c                           |    8 +-
+ drivers/dma/at_hdmac_regs.h                        |    8 +-
+ drivers/dma/dmatest.c                              |   16 +-
+ drivers/dma/dw_dmac.c                              |  167 +++++++++++++++++---
+ drivers/dma/dw_dmac_regs.h                         |    6 +
+ drivers/dma/iop-adma.c                             |   45 +++---
+ drivers/dma/mv_xor.c                               |   62 ++++----
+ drivers/dma/pch_dma.c                              |   13 +-
+ include/linux/dmaengine.h                          |   18 +--
+ include/linux/dw_dmac.h                            |   45 ++++--
+ 19 files changed, 362 insertions(+), 221 deletions(-)
+Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (f1e0b5b Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge)
+$ git merge net-next/master
+Recorded preimage for 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c'
+Auto-merging net/sctp/socket.c
+Auto-merging net/ipv6/route.c
+Auto-merging net/ipv4/tcp_timer.c
+Auto-merging net/ipv4/tcp_minisocks.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/ipv4/tcp_input.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/ipv4/inet_diag.c
+Auto-merging net/core/skbuff.c
+Auto-merging net/core/rtnetlink.c
+Auto-merging net/core/dev.c
+Removing kernel/time/timecompare.c
+Auto-merging include/uapi/linux/usb/cdc.h
+Removing include/linux/timecompare.h
+Auto-merging drivers/vhost/tcm_vhost.c
+Auto-merging drivers/vhost/net.c
+Auto-merging drivers/net/vxlan.c
+Auto-merging drivers/net/usb/usbnet.c
+Auto-merging drivers/net/usb/smsc95xx.c
+Auto-merging drivers/net/ethernet/ti/Kconfig
+Auto-merging drivers/net/ethernet/realtek/r8169.c
+Auto-merging drivers/net/ethernet/qlogic/qla3xxx.c
+Auto-merging drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+Auto-merging drivers/net/ethernet/micrel/ksz884x.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+Removing drivers/net/ethernet/cadence/at91_ether.h
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+Auto-merging arch/xtensa/include/uapi/asm/socket.h
+Auto-merging arch/parisc/include/uapi/asm/socket.h
+Auto-merging arch/m68k/include/uapi/asm/socket.h
+Auto-merging arch/cris/include/uapi/asm/socket.h
+Removing arch/arm/mach-at91/include/mach/at91rm9200_emac.h
+Auto-merging arch/arm/mach-at91/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c'.
+[master 9bd92e2] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/net/cdns-emac.txt          |   23 +
+ Documentation/devicetree/bindings/net/cpsw.txt     |   20 +-
+ Documentation/networking/batman-adv.txt            |    3 +-
+ Documentation/networking/ip-sysctl.txt             |   14 +
+ Documentation/networking/packet_mmap.txt           |   13 +
+ MAINTAINERS                                        |    3 +
+ arch/alpha/include/asm/socket.h                    |    1 +
+ arch/arm/boot/dts/imx6q.dtsi                       |    5 +-
+ arch/arm/mach-at91/Kconfig                         |    4 -
+ arch/arm/mach-at91/board-csb337.c                  |    2 +
+ arch/arm/mach-at91/include/mach/at91rm9200_emac.h  |  138 --
+ arch/arm/mach-imx/mach-imx6q.c                     |   12 +
+ arch/avr32/Kconfig                                 |    1 -
+ arch/avr32/include/uapi/asm/socket.h               |    1 +
+ arch/cris/include/uapi/asm/socket.h                |    1 +
+ arch/frv/include/uapi/asm/socket.h                 |    1 +
+ arch/h8300/include/asm/socket.h                    |    1 +
+ arch/ia64/include/uapi/asm/socket.h                |    1 +
+ arch/m32r/include/asm/socket.h                     |    1 +
+ arch/m68k/include/uapi/asm/socket.h                |    1 +
+ arch/mips/include/uapi/asm/socket.h                |    1 +
+ arch/mn10300/include/uapi/asm/socket.h             |    1 +
+ arch/parisc/include/uapi/asm/socket.h              |    1 +
+ arch/powerpc/include/uapi/asm/socket.h             |    1 +
+ arch/s390/include/uapi/asm/socket.h                |    1 +
+ arch/sparc/include/uapi/asm/socket.h               |    1 +
+ arch/sparc/net/bpf_jit_comp.c                      |   19 +
+ arch/x86/net/bpf_jit_comp.c                        |   21 +
+ arch/xtensa/include/uapi/asm/socket.h              |    1 +
+ drivers/isdn/mISDN/l1oip_core.c                    |    5 +-
+ drivers/net/ethernet/adi/Kconfig                   |    2 +-
+ drivers/net/ethernet/adi/bfin_mac.c                |  259 +++-
+ drivers/net/ethernet/adi/bfin_mac.h                |   13 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |  132 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  460 ++++---
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |   87 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c    |    8 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h    |   21 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h   |   29 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |    2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h   |    3 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  837 +++++++-----
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |   16 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |   59 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |   12 +
+ drivers/net/ethernet/broadcom/tg3.c                |   17 +-
+ drivers/net/ethernet/broadcom/tg3.h                |    2 +
+ drivers/net/ethernet/cadence/Kconfig               |    9 +-
+ drivers/net/ethernet/cadence/at91_ether.c          | 1276 ++++---------------
+ drivers/net/ethernet/cadence/at91_ether.h          |  112 --
+ drivers/net/ethernet/cadence/macb.c                |  524 +++++---
+ drivers/net/ethernet/cadence/macb.h                |   50 +-
+ drivers/net/ethernet/calxeda/xgmac.c               |   59 +-
+ drivers/net/ethernet/chelsio/cxgb3/common.h        |    7 +-
+ drivers/net/ethernet/dlink/dl2k.c                  |   16 +-
+ drivers/net/ethernet/emulex/benet/be.h             |   51 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c        |  409 +++++-
+ drivers/net/ethernet/emulex/benet/be_cmds.h        |  177 ++-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c     |   80 +-
+ drivers/net/ethernet/emulex/benet/be_hw.h          |   20 +-
+ drivers/net/ethernet/emulex/benet/be_main.c        |  779 +++++++-----
+ drivers/net/ethernet/emulex/benet/be_roce.c        |    5 +-
+ drivers/net/ethernet/freescale/Kconfig             |    9 +
+ drivers/net/ethernet/freescale/Makefile            |    1 +
+ drivers/net/ethernet/freescale/fec.c               |  161 +--
+ drivers/net/ethernet/freescale/fec.h               |  119 ++
+ drivers/net/ethernet/freescale/fec_ptp.c           |  383 ++++++
+ drivers/net/ethernet/ibm/emac/mal.c                |    6 +-
+ drivers/net/ethernet/intel/Kconfig                 |   28 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c        |   17 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c         |   11 +
+ drivers/net/ethernet/intel/igb/Makefile            |    4 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c       |   20 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h       |    3 +
+ drivers/net/ethernet/intel/igb/e1000_defines.h     |   14 +
+ drivers/net/ethernet/intel/igb/e1000_i210.c        |   94 ++
+ drivers/net/ethernet/intel/igb/e1000_i210.h        |   11 +
+ drivers/net/ethernet/intel/igb/e1000_mac.c         |    4 +
+ drivers/net/ethernet/intel/igb/e1000_mac.h         |    1 +
+ drivers/net/ethernet/intel/igb/e1000_nvm.c         |   71 ++
+ drivers/net/ethernet/intel/igb/e1000_nvm.h         |   16 +
+ drivers/net/ethernet/intel/igb/e1000_phy.c         |   49 +-
+ drivers/net/ethernet/intel/igb/igb.h               |   76 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c       |   55 +-
+ drivers/net/ethernet/intel/igb/igb_main.c          | 1340 ++++++++++++--------
+ drivers/net/ethernet/intel/igb/igb_ptp.c           |   55 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c          |   13 +
+ drivers/net/ethernet/intel/ixgbe/Makefile          |    3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h           |   14 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |  158 ++-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |   73 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |    1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |  104 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c      |    4 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |   22 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  277 ++--
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h       |   31 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       |  124 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |  469 ++++---
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |    1 +
+ drivers/net/ethernet/intel/ixgbevf/defines.h       |    7 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    4 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |  225 +++-
+ drivers/net/ethernet/intel/ixgbevf/mbx.h           |   10 +
+ drivers/net/ethernet/intel/ixgbevf/vf.c            |   61 +
+ drivers/net/ethernet/intel/ixgbevf/vf.h            |    2 +
+ drivers/net/ethernet/marvell/pxa168_eth.c          |    7 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |    2 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |    2 +-
+ drivers/net/ethernet/micrel/ksz884x.c              |   13 +-
+ drivers/net/ethernet/neterion/s2io.c               |    3 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   16 -
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |    2 -
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |   14 -
+ .../ethernet/qlogic/netxen/netxen_nic_ethtool.c    |   93 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c              |   16 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_dbg.c        |   16 +-
+ drivers/net/ethernet/realtek/atp.c                 |   58 +-
+ drivers/net/ethernet/realtek/atp.h                 |    2 -
+ drivers/net/ethernet/realtek/r8169.c               |  100 +-
+ drivers/net/ethernet/renesas/sh_eth.c              |    2 +-
+ drivers/net/ethernet/sfc/Kconfig                   |    8 +-
+ drivers/net/ethernet/sfc/Makefile                  |    3 +-
+ drivers/net/ethernet/sfc/net_driver.h              |    2 -
+ drivers/net/ethernet/sfc/nic.h                     |   26 -
+ drivers/net/ethernet/ti/Kconfig                    |    8 +
+ drivers/net/ethernet/ti/Makefile                   |    2 +-
+ drivers/net/ethernet/ti/cpsw.c                     |  412 +++++-
+ drivers/net/ethernet/ti/cpsw_ale.c                 |   31 +-
+ drivers/net/ethernet/ti/cpsw_ale.h                 |    1 +
+ drivers/net/ethernet/ti/cpts.c                     |  427 +++++++
+ drivers/net/ethernet/ti/cpts.h                     |  146 +++
+ drivers/net/hyperv/rndis_filter.c                  |    5 -
+ drivers/net/ppp/ppp_generic.c                      |    2 +-
+ drivers/net/tun.c                                  |  840 ++++++++----
+ drivers/net/usb/Kconfig                            |   22 +
+ drivers/net/usb/Makefile                           |    1 +
+ drivers/net/usb/asix_common.c                      |  117 +-
+ drivers/net/usb/cdc_mbim.c                         |  412 ++++++
+ drivers/net/usb/cdc_ncm.c                          |  645 +++++-----
+ drivers/net/usb/dm9601.c                           |  107 +-
+ drivers/net/usb/int51x1.c                          |   52 +-
+ drivers/net/usb/mcs7830.c                          |   85 +-
+ drivers/net/usb/net1080.c                          |  110 +-
+ drivers/net/usb/plusb.c                            |   11 +-
+ drivers/net/usb/sierra_net.c                       |   47 +-
+ drivers/net/usb/smsc75xx.c                         |  297 +++--
+ drivers/net/usb/smsc95xx.c                         |  343 +++--
+ drivers/net/usb/smsc95xx.h                         |    5 +
+ drivers/net/usb/usbnet.c                           |  196 +++
+ drivers/net/veth.c                                 |    1 +
+ drivers/net/vxlan.c                                |    3 +
+ drivers/pps/Kconfig                                |    1 -
+ drivers/ptp/Kconfig                                |   19 +-
+ drivers/ptp/ptp_chardev.c                          |   32 +
+ drivers/vhost/net.c                                |  111 +-
+ drivers/vhost/tcm_vhost.c                          |    1 +
+ drivers/vhost/vhost.c                              |   52 +-
+ drivers/vhost/vhost.h                              |   11 +-
+ include/linux/etherdevice.h                        |   20 +
+ include/linux/filter.h                             |    3 +
+ include/linux/ktime.h                              |   19 +
+ include/linux/netdevice.h                          |   10 +
+ include/linux/platform_data/cpsw.h                 |    4 +
+ include/linux/platform_data/macb.h                 |    1 +
+ include/linux/rtnetlink.h                          |    3 +
+ include/linux/skbuff.h                             |    7 +-
+ include/linux/timecompare.h                        |  125 --
+ include/linux/usb/cdc_ncm.h                        |  134 ++
+ include/linux/usb/usbnet.h                         |   10 +
+ include/net/af_unix.h                              |    1 -
+ include/net/cls_cgroup.h                           |    6 +-
+ include/net/ip6_fib.h                              |   19 +
+ include/net/ip_vs.h                                |  195 ++-
+ include/net/netns/sctp.h                           |    3 +
+ include/net/request_sock.h                         |   12 +-
+ include/net/route.h                                |    9 +-
+ include/net/sctp/command.h                         |   38 +-
+ include/net/sctp/constants.h                       |    8 -
+ include/net/sctp/structs.h                         |    1 +
+ include/net/sctp/ulpqueue.h                        |    2 +-
+ include/uapi/asm-generic/socket.h                  |    1 +
+ include/uapi/linux/filter.h                        |    4 +-
+ include/uapi/linux/if_bridge.h                     |   18 +
+ include/uapi/linux/if_ether.h                      |    1 +
+ include/uapi/linux/if_packet.h                     |    1 +
+ include/uapi/linux/if_tun.h                        |    5 +
+ include/uapi/linux/inet_diag.h                     |    3 +-
+ include/uapi/linux/netconf.h                       |   23 +
+ include/uapi/linux/ptp_clock.h                     |   14 +
+ include/uapi/linux/rtnetlink.h                     |    9 +
+ include/uapi/linux/unix_diag.h                     |    1 +
+ include/uapi/linux/usb/cdc.h                       |   23 +
+ kernel/time/Makefile                               |    2 +-
+ kernel/time/timecompare.c                          |  193 ---
+ net/8021q/vlan.c                                   |    2 +-
+ net/8021q/vlan_dev.c                               |    6 +-
+ net/batman-adv/Kconfig                             |   10 +
+ net/batman-adv/Makefile                            |    1 +
+ net/batman-adv/bat_iv_ogm.c                        |   51 +-
+ net/batman-adv/bitarray.c                          |   23 +-
+ net/batman-adv/bridge_loop_avoidance.c             |   36 +-
+ net/batman-adv/debugfs.c                           |   26 +-
+ net/batman-adv/distributed-arp-table.c             | 1066 ++++++++++++++++
+ net/batman-adv/distributed-arp-table.h             |  167 +++
+ net/batman-adv/gateway_client.c                    |   19 +-
+ net/batman-adv/hard-interface.c                    |    7 +-
+ net/batman-adv/icmp_socket.c                       |   16 +-
+ net/batman-adv/main.c                              |   55 +-
+ net/batman-adv/main.h                              |   32 +-
+ net/batman-adv/originator.c                        |   21 +-
+ net/batman-adv/packet.h                            |   68 +-
+ net/batman-adv/routing.c                           |  105 +-
+ net/batman-adv/send.c                              |    4 +
+ net/batman-adv/soft-interface.c                    |   84 +-
+ net/batman-adv/sysfs.c                             |   56 +-
+ net/batman-adv/translation-table.c                 |   97 +-
+ net/batman-adv/translation-table.h                 |    6 +-
+ net/batman-adv/types.h                             |   89 +-
+ net/batman-adv/unicast.c                           |  135 +-
+ net/batman-adv/unicast.h                           |   36 +-
+ net/batman-adv/vis.c                               |    9 +-
+ net/bridge/br_device.c                             |    4 +-
+ net/bridge/br_input.c                              |   17 +-
+ net/bridge/br_netlink.c                            |   75 +-
+ net/bridge/br_private.h                            |   16 +-
+ net/bridge/br_sysfs_br.c                           |   12 +-
+ net/core/dev.c                                     |    1 -
+ net/core/filter.c                                  |  139 ++
+ net/core/netprio_cgroup.c                          |    2 +-
+ net/core/pktgen.c                                  |   47 +-
+ net/core/rtnetlink.c                               |  214 +++-
+ net/core/skbuff.c                                  |   24 +-
+ net/core/sock.c                                    |   17 +-
+ net/dccp/minisocks.c                               |    3 +-
+ net/ipv4/devinet.c                                 |  188 ++-
+ net/ipv4/fib_semantics.c                           |    2 +-
+ net/ipv4/inet_connection_sock.c                    |   25 +-
+ net/ipv4/inet_diag.c                               |    5 +-
+ net/ipv4/ipconfig.c                                |    6 +-
+ net/ipv4/syncookies.c                              |    2 +-
+ net/ipv4/tcp.c                                     |    5 +-
+ net/ipv4/tcp_input.c                               |   45 +-
+ net/ipv4/tcp_ipv4.c                                |   25 +-
+ net/ipv4/tcp_minisocks.c                           |    8 +-
+ net/ipv4/tcp_timer.c                               |    8 +-
+ net/ipv6/addrconf.c                                |  177 ++-
+ net/ipv6/ah6.c                                     |   10 +-
+ net/ipv6/anycast.c                                 |    2 +-
+ net/ipv6/datagram.c                                |    2 +-
+ net/ipv6/exthdrs.c                                 |   18 +-
+ net/ipv6/fib6_rules.c                              |    2 +-
+ net/ipv6/icmp.c                                    |    2 +-
+ net/ipv6/ip6_fib.c                                 |   57 +
+ net/ipv6/ip6_gre.c                                 |    2 +-
+ net/ipv6/ip6_output.c                              |    9 +-
+ net/ipv6/ip6_tunnel.c                              |    5 +-
+ net/ipv6/ipv6_sockglue.c                           |    2 +-
+ net/ipv6/mcast.c                                   |    4 +-
+ net/ipv6/ndisc.c                                   |    9 +-
+ net/ipv6/netfilter/ip6_tables.c                    |    6 +-
+ net/ipv6/netfilter/ip6t_rpfilter.c                 |    2 +-
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |    4 +-
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c     |    4 +-
+ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |    6 +-
+ net/ipv6/netfilter/nf_nat_proto_icmpv6.c           |    2 +-
+ net/ipv6/raw.c                                     |    6 +-
+ net/ipv6/route.c                                   |  156 ++-
+ net/ipv6/syncookies.c                              |    2 +-
+ net/ipv6/tcp_ipv6.c                                |   15 +-
+ net/ipv6/xfrm6_policy.c                            |    4 +-
+ net/ipv6/xfrm6_state.c                             |    4 +-
+ net/l2tp/l2tp_netlink.c                            |    2 +-
+ net/netfilter/ipvs/Kconfig                         |    7 +-
+ net/netfilter/ipvs/ip_vs_conn.c                    |   15 +-
+ net/netfilter/ipvs/ip_vs_core.c                    |  404 +++---
+ net/netfilter/ipvs/ip_vs_dh.c                      |    2 +-
+ net/netfilter/ipvs/ip_vs_lblc.c                    |    2 +-
+ net/netfilter/ipvs/ip_vs_lblcr.c                   |    2 +-
+ net/netfilter/ipvs/ip_vs_pe_sip.c                  |   18 +-
+ net/netfilter/ipvs/ip_vs_proto.c                   |    6 +-
+ net/netfilter/ipvs/ip_vs_proto_ah_esp.c            |    9 +-
+ net/netfilter/ipvs/ip_vs_proto_sctp.c              |   42 +-
+ net/netfilter/ipvs/ip_vs_proto_tcp.c               |   40 +-
+ net/netfilter/ipvs/ip_vs_proto_udp.c               |   41 +-
+ net/netfilter/ipvs/ip_vs_sched.c                   |    2 +-
+ net/netfilter/ipvs/ip_vs_sh.c                      |    2 +-
+ net/netfilter/ipvs/ip_vs_xmit.c                    |   73 +-
+ net/netfilter/xt_ipvs.c                            |    4 +-
+ net/packet/af_packet.c                             |   48 +-
+ net/packet/internal.h                              |    1 +
+ net/sched/cls_cgroup.c                             |   24 +
+ net/sched/sch_api.c                                |    9 +-
+ net/sched/sch_cbq.c                                |    3 +-
+ net/sched/sch_htb.c                                |  139 +-
+ net/sctp/Kconfig                                   |   39 +-
+ net/sctp/protocol.c                                |    9 +
+ net/sctp/sm_sideeffect.c                           |   45 +-
+ net/sctp/socket.c                                  |   11 +-
+ net/sctp/sysctl.c                                  |   59 +
+ net/sctp/ulpqueue.c                                |    3 +-
+ net/socket.c                                       |    8 -
+ net/unix/diag.c                                    |    3 +
+ 304 files changed, 13805 insertions(+), 6750 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/cdns-emac.txt
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_emac.h
+ delete mode 100644 drivers/net/ethernet/cadence/at91_ether.h
+ create mode 100644 drivers/net/ethernet/freescale/fec_ptp.c
+ create mode 100644 drivers/net/ethernet/ti/cpts.c
+ create mode 100644 drivers/net/ethernet/ti/cpts.h
+ create mode 100644 drivers/net/usb/cdc_mbim.c
+ delete mode 100644 include/linux/timecompare.h
+ create mode 100644 include/linux/usb/cdc_ncm.h
+ create mode 100644 include/uapi/linux/netconf.h
+ delete mode 100644 kernel/time/timecompare.c
+ create mode 100644 net/batman-adv/distributed-arp-table.c
+ create mode 100644 net/batman-adv/distributed-arp-table.h
+Merging wireless-next/master (38141fc ar5523: make buffer size variable unsigned)
+$ git merge wireless-next/master
+Auto-merging drivers/nfc/pn544/pn544.c
+Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                        |    6 +
+ arch/mips/bcm47xx/nvram.c                          |    4 +-
+ arch/mips/bcm47xx/wgt634u.c                        |    8 +-
+ drivers/bcma/driver_chipcommon.c                   |   23 +-
+ drivers/bcma/driver_chipcommon_nflash.c            |    3 +
+ drivers/bcma/driver_chipcommon_pmu.c               |    5 +-
+ drivers/bcma/driver_chipcommon_sflash.c            |   35 +-
+ drivers/bcma/driver_mips.c                         |   48 +-
+ drivers/bcma/driver_pci_host.c                     |   14 +-
+ drivers/bcma/host_pci.c                            |    6 +-
+ drivers/bcma/main.c                                |   54 +-
+ drivers/bcma/sprom.c                               |    5 +-
+ drivers/bluetooth/btmrvl_sdio.c                    |   28 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_wireless.c  |    4 +-
+ drivers/net/wireless/airo.c                        |    2 +-
+ drivers/net/wireless/ath/Kconfig                   |    1 +
+ drivers/net/wireless/ath/Makefile                  |    1 +
+ drivers/net/wireless/ath/ar5523/Kconfig            |    7 +
+ drivers/net/wireless/ath/ar5523/Makefile           |    1 +
+ drivers/net/wireless/ath/ar5523/ar5523.c           | 1806 +++++++++++++++
+ drivers/net/wireless/ath/ar5523/ar5523.h           |  152 ++
+ drivers/net/wireless/ath/ar5523/ar5523_hw.h        |  431 ++++
+ drivers/net/wireless/ath/ath6kl/cfg80211.c         |    4 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c      |    5 +
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   22 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c         |    8 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mci.c        |   70 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mci.h        |    8 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    1 +
+ .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h   |    4 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h             |    9 +
+ drivers/net/wireless/ath/ath9k/btcoex.c            |   62 +-
+ drivers/net/wireless/ath/ath9k/btcoex.h            |    7 +
+ drivers/net/wireless/ath/ath9k/calib.c             |    1 +
+ drivers/net/wireless/ath/ath9k/debug.c             |   34 +-
+ drivers/net/wireless/ath/ath9k/gpio.c              |  110 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   17 +
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   20 -
+ drivers/net/wireless/ath/ath9k/hw.c                |    6 +-
+ drivers/net/wireless/ath/ath9k/hw.h                |    2 +
+ drivers/net/wireless/ath/ath9k/init.c              |    1 +
+ drivers/net/wireless/ath/ath9k/link.c              |   12 +-
+ drivers/net/wireless/ath/ath9k/main.c              |   12 +-
+ drivers/net/wireless/ath/ath9k/mci.c               |  171 +-
+ drivers/net/wireless/ath/ath9k/mci.h               |   36 +
+ drivers/net/wireless/ath/ath9k/recv.c              |    5 +-
+ drivers/net/wireless/ath/ath9k/reg.h               |   13 +-
+ drivers/net/wireless/ath/ath9k/wow.c               |    2 +-
+ drivers/net/wireless/ath/carl9170/mac.c            |   21 +-
+ drivers/net/wireless/ath/carl9170/rx.c             |   51 +-
+ drivers/net/wireless/ath/carl9170/usb.c            |    7 +
+ drivers/net/wireless/ath/hw.c                      |   20 +-
+ drivers/net/wireless/b43/main.c                    |    2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile   |    1 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |   73 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |    3 -
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |   29 -
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |  453 ++--
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c  |    2 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h  |    3 +
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    |  198 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_proto.h    |    8 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c |  174 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.c     |  336 +++
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.h     |   39 +
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c      |   41 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  | 1218 +++++------
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |  145 +-
+ drivers/net/wireless/brcm80211/brcmsmac/aiutils.c  |    4 +-
+ drivers/net/wireless/brcm80211/brcmsmac/main.c     |    2 +-
+ drivers/net/wireless/hostap/hostap_80211_rx.c      |    2 +-
+ drivers/net/wireless/ipw2x00/libipw_rx.c           |    6 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c            |    9 +-
+ drivers/net/wireless/iwlwifi/iwl-devtrace.h        |   95 +-
+ drivers/net/wireless/iwlwifi/iwl-io.c              |    4 +-
+ drivers/net/wireless/iwlwifi/iwl-io.h              |    2 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h            |    3 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h           |    8 +
+ drivers/net/wireless/iwlwifi/pcie/rx.c             |    3 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c          |    9 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c             |   18 +-
+ drivers/net/wireless/libertas/mesh.c               |    2 +-
+ drivers/net/wireless/mwifiex/11n_rxreorder.c       |    8 +-
+ drivers/net/wireless/mwifiex/cfg80211.c            |   20 +-
+ drivers/net/wireless/mwifiex/cmdevt.c              |   21 +-
+ drivers/net/wireless/mwifiex/init.c                |   19 +-
+ drivers/net/wireless/mwifiex/main.c                |    8 +
+ drivers/net/wireless/mwifiex/main.h                |   13 +-
+ drivers/net/wireless/mwifiex/scan.c                |   55 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c         |    4 -
+ drivers/net/wireless/mwifiex/sta_ioctl.c           |    4 +-
+ drivers/net/wireless/mwifiex/sta_rx.c              |   26 +-
+ drivers/net/wireless/mwifiex/txrx.c                |   10 +-
+ drivers/net/wireless/mwifiex/uap_cmd.c             |   11 +-
+ drivers/net/wireless/mwifiex/uap_txrx.c            |   17 +-
+ drivers/net/wireless/mwifiex/util.c                |   19 +-
+ drivers/net/wireless/orinoco/main.h                |    2 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c         |    9 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c            |  100 +-
+ drivers/net/wireless/rtlwifi/cam.c                 |    7 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |  227 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |   88 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |    3 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/dm.c        |   30 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |   93 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       |    2 +
+ drivers/net/wireless/rtlwifi/rtl8192ce/rf.c        |   23 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    6 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |   46 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/dm.c        |   30 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |   16 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       |   25 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |   22 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/dm.c        |   95 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.c       |   65 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/rf.c        |   18 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c       |   39 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/dm.c        |   89 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/hw.c        |    6 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/phy.c       |   64 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/rf.c        |   11 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |   21 +-
+ drivers/net/wireless/rtlwifi/wifi.h                |   53 +-
+ drivers/nfc/Makefile                               |    2 +-
+ drivers/nfc/pn533.c                                |   18 +-
+ drivers/nfc/pn544/Makefile                         |    7 +
+ drivers/nfc/pn544/i2c.c                            |  500 +++++
+ drivers/nfc/{pn544_hci.c => pn544/pn544.c}         |  679 +++---
+ drivers/nfc/pn544/pn544.h                          |   32 +
+ drivers/ssb/b43_pci_bridge.c                       |    1 +
+ drivers/ssb/driver_chipcommon_pmu.c                |    3 +
+ drivers/ssb/driver_mipscore.c                      |   16 +-
+ include/linux/bcma/bcma.h                          |    2 +-
+ include/linux/bcma/bcma_driver_chipcommon.h        |    5 +
+ include/linux/bcma/bcma_driver_mips.h              |    3 +
+ include/linux/bcma/bcma_regs.h                     |    5 +-
+ include/linux/ieee80211.h                          |   47 +-
+ include/linux/ssb/ssb_driver_mips.h                |   10 +-
+ include/net/bluetooth/a2mp.h                       |   24 +-
+ include/net/bluetooth/amp.h                        |   50 +
+ include/net/bluetooth/bluetooth.h                  |    1 -
+ include/net/bluetooth/hci.h                        |   40 +-
+ include/net/bluetooth/hci_core.h                   |   48 +-
+ include/net/bluetooth/l2cap.h                      |   14 +-
+ include/net/cfg80211.h                             |   14 +
+ include/net/mac80211.h                             |  114 +-
+ include/net/nfc/hci.h                              |   18 +-
+ include/net/nfc/nfc.h                              |    2 +-
+ include/uapi/linux/nfc.h                           |   15 +
+ include/uapi/linux/nl80211.h                       |   48 +
+ net/bluetooth/Kconfig                              |    1 +
+ net/bluetooth/Makefile                             |    2 +-
+ net/bluetooth/a2mp.c                               |  459 +++-
+ net/bluetooth/af_bluetooth.c                       |   10 +-
+ net/bluetooth/amp.c                                |  374 ++++
+ net/bluetooth/bnep/core.c                          |    3 +-
+ net/bluetooth/cmtp/core.c                          |    2 +-
+ net/bluetooth/hci_conn.c                           |   70 +-
+ net/bluetooth/hci_core.c                           |   65 +-
+ net/bluetooth/hci_event.c                          |  167 +-
+ net/bluetooth/hci_sysfs.c                          |   10 +-
+ net/bluetooth/hidp/core.c                          |    8 +-
+ net/bluetooth/l2cap_core.c                         |  503 +++--
+ net/bluetooth/l2cap_sock.c                         |   89 +-
+ net/bluetooth/lib.c                                |   14 -
+ net/bluetooth/mgmt.c                               |    5 +-
+ net/bluetooth/rfcomm/core.c                        |   19 +-
+ net/bluetooth/rfcomm/sock.c                        |    9 +-
+ net/bluetooth/rfcomm/tty.c                         |    6 +-
+ net/bluetooth/sco.c                                |   12 +-
+ net/bluetooth/smp.c                                |    2 +-
+ net/mac80211/Kconfig                               |    2 +-
+ net/mac80211/Makefile                              |    1 +
+ net/mac80211/aes_cmac.c                            |   17 +
+ net/mac80211/cfg.c                                 |  284 +--
+ net/mac80211/chan.c                                |  455 +++-
+ net/mac80211/debugfs.h                             |    6 +-
+ net/mac80211/debugfs_netdev.c                      |   10 +-
+ net/mac80211/driver-ops.h                          |   65 +
+ net/mac80211/ibss.c                                |   88 +-
+ net/mac80211/ieee80211_i.h                         |  171 +-
+ net/mac80211/iface.c                               |   44 +-
+ net/mac80211/main.c                                |  105 +-
+ net/mac80211/mesh.c                                |   52 +-
+ net/mac80211/mesh.h                                |    4 +-
+ net/mac80211/mesh_plink.c                          |   14 +-
+ net/mac80211/mesh_sync.c                           |   55 +-
+ net/mac80211/mlme.c                                |  228 +-
+ net/mac80211/offchannel.c                          |    9 +-
+ net/mac80211/pm.c                                  |    2 +
+ net/mac80211/rate.h                                |   12 +-
+ net/mac80211/rx.c                                  |   32 +-
+ net/mac80211/scan.c                                |   29 +-
+ net/mac80211/sta_info.c                            |   59 +-
+ net/mac80211/status.c                              |   15 +-
+ net/mac80211/trace.h                               |  146 +-
+ net/mac80211/tx.c                                  |  281 ++-
+ net/mac80211/util.c                                |  145 +-
+ net/mac80211/vht.c                                 |   35 +
+ net/nfc/Kconfig                                    |    4 +-
+ net/nfc/core.c                                     |   33 +-
+ net/nfc/hci/command.c                              |   24 +-
+ net/nfc/hci/core.c                                 |   71 +-
+ net/nfc/hci/llc.c                                  |    2 +-
+ net/nfc/hci/llc_shdlc.c                            |    7 +-
+ net/nfc/llcp/Kconfig                               |    4 +-
+ net/nfc/llcp/commands.c                            |  120 +-
+ net/nfc/llcp/llcp.c                                |  226 +-
+ net/nfc/llcp/llcp.h                                |   13 +
+ net/nfc/llcp/sock.c                                |   42 +-
+ net/nfc/nci/Kconfig                                |    4 +-
+ net/nfc/nci/core.c                                 |   29 +-
+ net/nfc/netlink.c                                  |  157 +-
+ net/nfc/nfc.h                                      |    6 +
+ net/nfc/rawsock.c                                  |    1 -
+ net/wireless/Makefile                              |    4 +-
+ net/wireless/ap.c                                  |    3 +-
+ net/wireless/chan.c                                |   16 +-
+ net/wireless/core.c                                |   16 +-
+ net/wireless/core.h                                |    6 +-
+ net/wireless/ethtool.c                             |   15 +-
+ net/wireless/ibss.c                                |    9 +-
+ net/wireless/mesh.c                                |   11 +-
+ net/wireless/mlme.c                                |   92 +-
+ net/wireless/nl80211.c                             |  259 ++-
+ net/wireless/rdev-ops.h                            |  879 ++++++++
+ net/wireless/scan.c                                |  138 +-
+ net/wireless/sme.c                                 |   12 +-
+ net/wireless/sysfs.c                               |    5 +-
+ net/wireless/trace.c                               |    7 +
+ net/wireless/trace.h                               | 2296 ++++++++++++++++++++
+ net/wireless/util.c                                |   14 +-
+ net/wireless/wext-compat.c                         |   48 +-
+ 233 files changed, 13900 insertions(+), 4289 deletions(-)
+ create mode 100644 drivers/net/wireless/ath/ar5523/Kconfig
+ create mode 100644 drivers/net/wireless/ath/ar5523/Makefile
+ create mode 100644 drivers/net/wireless/ath/ar5523/ar5523.c
+ create mode 100644 drivers/net/wireless/ath/ar5523/ar5523.h
+ create mode 100644 drivers/net/wireless/ath/ar5523/ar5523_hw.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil.h
+ create mode 100644 drivers/nfc/pn544/Makefile
+ create mode 100644 drivers/nfc/pn544/i2c.c
+ rename drivers/nfc/{pn544_hci.c => pn544/pn544.c} (58%)
+ create mode 100644 drivers/nfc/pn544/pn544.h
+ create mode 100644 include/net/bluetooth/amp.h
+ create mode 100644 net/bluetooth/amp.c
+ create mode 100644 net/mac80211/vht.c
+ create mode 100644 net/wireless/rdev-ops.h
+ create mode 100644 net/wireless/trace.c
+ create mode 100644 net/wireless/trace.h
+Merging bluetooth/master (0c0afed Bluetooth: Fix parameter order of hci_get_route)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ include/net/bluetooth/amp.h      |    4 +
+ include/net/bluetooth/hci.h      |    7 +
+ include/net/bluetooth/hci_core.h |   44 +-
+ include/net/bluetooth/l2cap.h    |   38 +-
+ net/bluetooth/Kconfig            |    1 -
+ net/bluetooth/a2mp.c             |    4 +-
+ net/bluetooth/amp.c              |   93 ++++
+ net/bluetooth/bnep/netdev.c      |    1 -
+ net/bluetooth/cmtp/capi.c        |    2 +-
+ net/bluetooth/cmtp/sock.c        |    2 +-
+ net/bluetooth/hci_conn.c         |    6 +
+ net/bluetooth/hci_core.c         |   65 +--
+ net/bluetooth/hci_event.c        |  309 +++++++++++-
+ net/bluetooth/l2cap_core.c       | 1000 +++++++++++++++++++++++++++++++++++---
+ net/bluetooth/l2cap_sock.c       |    5 +
+ net/bluetooth/mgmt.c             |   98 ++--
+ 16 files changed, 1486 insertions(+), 193 deletions(-)
+Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
+$ git merge mtd/master
+Merge made by the 'recursive' strategy.
+ drivers/mtd/nand/nand_base.c |    9 +++++----
+ drivers/mtd/ofpart.c         |    2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+Merging l2-mtd/master (2c5e1925 mtd: mtd_oobtest: printk -> pr_{info,err,crit})
+$ git merge l2-mtd/master
+Removing include/linux/platform_data/mtd-nomadik-nand.h
+Removing drivers/mtd/nand/nomadik_nand.c
+Removing arch/arm/mach-nomadik/include/mach/fsmc.h
+Auto-merging arch/arm/boot/dts/spear13xx.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/denali-nand.txt        |   23 ++
+ .../devicetree/bindings/mtd/fsmc-nand.txt          |   12 +-
+ Documentation/devicetree/bindings/mtd/m25p80.txt   |   29 +++
+ arch/arm/boot/dts/spear13xx.dtsi                   |   10 +-
+ arch/arm/boot/dts/spear300.dtsi                    |    8 +-
+ arch/arm/boot/dts/spear310.dtsi                    |    8 +-
+ arch/arm/boot/dts/spear320.dtsi                    |    8 +-
+ arch/arm/boot/dts/spear600.dtsi                    |    8 +-
+ arch/arm/configs/nhk8815_defconfig                 |    2 +-
+ arch/arm/mach-nomadik/board-nhk8815.c              |   73 +++---
+ arch/arm/mach-nomadik/include/mach/fsmc.h          |   29 ---
+ arch/arm/mach-u300/core.c                          |   14 +-
+ drivers/clk/clk-nomadik.c                          |    1 +
+ drivers/mtd/cmdlinepart.c                          |   80 +++----
+ drivers/mtd/devices/m25p80.c                       |   36 +--
+ drivers/mtd/devices/slram.c                        |    2 +-
+ drivers/mtd/devices/spear_smi.c                    |   13 +-
+ drivers/mtd/nand/Kconfig                           |   26 ++-
+ drivers/mtd/nand/Makefile                          |    3 +-
+ drivers/mtd/nand/denali.c                          |  162 +++-----------
+ drivers/mtd/nand/denali.h                          |    5 +
+ drivers/mtd/nand/denali_dt.c                       |  167 ++++++++++++++
+ drivers/mtd/nand/denali_pci.c                      |  144 ++++++++++++
+ drivers/mtd/nand/fsl_elbc_nand.c                   |   15 --
+ drivers/mtd/nand/fsmc_nand.c                       |  102 ++++-----
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |   14 +-
+ drivers/mtd/nand/nomadik_nand.c                    |  235 --------------------
+ drivers/mtd/onenand/onenand_base.c                 |    2 +-
+ drivers/mtd/tests/mtd_nandbiterrs.c                |   73 +++---
+ drivers/mtd/tests/mtd_nandecctest.c                |    6 +-
+ drivers/mtd/tests/mtd_oobtest.c                    |  171 +++++++-------
+ drivers/mtd/tests/mtd_pagetest.c                   |  152 ++++++-------
+ drivers/mtd/tests/mtd_readtest.c                   |   42 ++--
+ drivers/mtd/tests/mtd_speedtest.c                  |   88 ++++----
+ drivers/mtd/tests/mtd_stresstest.c                 |   44 ++--
+ drivers/mtd/tests/mtd_subpagetest.c                |  124 +++++------
+ drivers/mtd/tests/mtd_torturetest.c                |   73 +++---
+ fs/jffs2/file.c                                    |   39 ++--
+ include/linux/mtd/fsmc.h                           |    3 -
+ include/linux/mtd/mtd.h                            |    2 +-
+ include/linux/platform_data/mtd-nomadik-nand.h     |   16 --
+ 41 files changed, 1023 insertions(+), 1041 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
+ delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
+ create mode 100644 drivers/mtd/nand/denali_dt.c
+ create mode 100644 drivers/mtd/nand/denali_pci.c
+ delete mode 100644 drivers/mtd/nand/nomadik_nand.c
+ delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
+Merging crypto/master (3200da8 crypto: tegra - fix missing unlock on error case)
+$ git merge crypto/master
+Auto-merging arch/x86/crypto/crc32c-intel_glue.c
+Merge made by the 'recursive' strategy.
+ arch/x86/crypto/Makefile                           |    2 +
+ arch/x86/crypto/camellia_glue.c                    |   16 +-
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S          |  332 +-
+ arch/x86/crypto/cast5_avx_glue.c                   |   79 +-
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S          |  190 +-
+ arch/x86/crypto/cast6_avx_glue.c                   |   77 +-
+ .../crypto/{crc32c-intel.c => crc32c-intel_glue.c} |   81 +
+ arch/x86/crypto/crc32c-pcl-intel-asm_64.S          |  460 ++
+ arch/x86/crypto/glue_helper-asm-avx.S              |   91 +
+ arch/x86/crypto/glue_helper.c                      |   12 +-
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S        |  166 +-
+ arch/x86/crypto/serpent_avx_glue.c                 |   49 +-
+ arch/x86/crypto/serpent_sse2_glue.c                |   12 +-
+ arch/x86/crypto/twofish-avx-x86_64-asm_64.S        |  208 +-
+ arch/x86/crypto/twofish_avx_glue.c                 |   73 +-
+ arch/x86/crypto/twofish_glue_3way.c                |   20 +-
+ arch/x86/include/asm/crypto/glue_helper.h          |   28 +-
+ arch/x86/include/asm/crypto/serpent-avx.h          |   27 +-
+ arch/x86/include/asm/crypto/twofish.h              |    4 +-
+ crypto/Kconfig                                     |   10 +
+ crypto/tcrypt.c                                    |    6 +
+ crypto/testmgr.c                                   |   30 +
+ crypto/testmgr.h                                   | 5641 +++++++++++++++++++-
+ crypto/vmac.c                                      |   47 +-
+ drivers/crypto/talitos.c                           |    3 +-
+ drivers/crypto/tegra-aes.c                         |    8 +-
+ include/crypto/vmac.h                              |    2 +
+ 27 files changed, 6956 insertions(+), 718 deletions(-)
+ rename arch/x86/crypto/{crc32c-intel.c => crc32c-intel_glue.c} (69%)
+ create mode 100644 arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+ create mode 100644 arch/x86/crypto/glue_helper-asm-avx.S
+Merging drm/drm-next (6380813 gma500: medfield: drop bogus NULL check in mdfld_dsi_output_init())
+$ git merge drm/drm-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_crtc.c                |   13 +-
+ drivers/gpu/drm/drm_modes.c               |    8 +-
+ drivers/gpu/drm/gma500/mdfld_dsi_output.c |    2 +-
+ drivers/gpu/drm/gma500/oaktrail.h         |    6 +
+ drivers/gpu/drm/gma500/oaktrail_crtc.c    |    8 +
+ drivers/gpu/drm/gma500/oaktrail_device.c  |    2 +-
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c    |  365 +++++++++++++++++++++++++++--
+ drivers/gpu/drm/radeon/radeon_gart.c      |    2 +-
+ drivers/gpu/drm/radeon/radeon_object.c    |    6 +-
+ drivers/gpu/drm/radeon/radeon_object.h    |    2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c              |   12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c    |    2 +-
+ include/drm/drm_crtc.h                    |    8 +-
+ include/drm/ttm/ttm_bo_api.h              |   14 ++
+ 14 files changed, 412 insertions(+), 38 deletions(-)
+Merging sound/for-next (ee81abb ALSA: hda - Apply a proper chmap for built-in 2.1 speakers)
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ include/sound/Kbuild                        |   10 -
+ include/sound/asequencer.h                  |  594 +----------------
+ include/sound/asound.h                      |  935 +-------------------------
+ include/sound/emu10k1.h                     |  355 +---------
+ include/sound/pcm.h                         |    3 +
+ include/sound/sb16_csp.h                    |  104 +--
+ include/uapi/sound/Kbuild                   |   10 +
+ include/uapi/sound/asequencer.h             |  614 +++++++++++++++++
+ include/uapi/sound/asound.h                 |  961 +++++++++++++++++++++++++++
+ include/{ => uapi}/sound/asound_fm.h        |    0
+ include/{ => uapi}/sound/compress_offload.h |    0
+ include/{ => uapi}/sound/compress_params.h  |    0
+ include/uapi/sound/emu10k1.h                |  373 +++++++++++
+ include/{ => uapi}/sound/hdsp.h             |    0
+ include/{ => uapi}/sound/hdspm.h            |    0
+ include/uapi/sound/sb16_csp.h               |  122 ++++
+ include/{ => uapi}/sound/sfnt_info.h        |    0
+ sound/core/pcm_compat.c                     |   20 +-
+ sound/core/pcm_lib.c                        |   57 +-
+ sound/core/pcm_native.c                     |    2 +
+ sound/drivers/Kconfig                       |    1 -
+ sound/drivers/aloop.c                       |   36 +-
+ sound/drivers/dummy.c                       |   73 +-
+ sound/isa/Kconfig                           |    4 +-
+ sound/pci/Kconfig                           |    2 +-
+ sound/pci/asihpi/hpidspcd.c                 |   22 +-
+ sound/pci/asihpi/hpioctl.c                  |   17 +-
+ sound/pci/au88x0/au88x0_core.c              |    7 +-
+ sound/pci/hda/Kconfig                       |    5 +-
+ sound/pci/hda/Makefile                      |    1 +
+ sound/pci/hda/hda_codec.c                   |  130 +++-
+ sound/pci/hda/hda_codec.h                   |    6 +
+ sound/pci/hda/hda_intel.c                   |  128 +++-
+ sound/pci/hda/hda_intel_trace.h             |   62 ++
+ sound/pci/hda/hda_jack.c                    |   24 +
+ sound/pci/hda/hda_jack.h                    |    2 +
+ sound/pci/hda/hda_local.h                   |    8 +-
+ sound/pci/hda/patch_cirrus.c                |   16 +-
+ sound/pci/hda/patch_conexant.c              |   77 ++-
+ sound/pci/hda/patch_hdmi.c                  |   15 +-
+ sound/pci/hda/patch_realtek.c               |   11 +-
+ sound/pci/hda/patch_sigmatel.c              |   20 +-
+ sound/pci/hda/patch_via.c                   |   10 +-
+ sound/pci/ice1712/Makefile                  |    2 +-
+ sound/pci/ice1712/amp.c                     |    1 -
+ sound/pci/ice1712/aureon.c                  |    4 +-
+ sound/pci/ice1712/delta.c                   |    1 -
+ sound/pci/ice1712/ews.c                     |    5 +-
+ sound/pci/ice1712/hoontech.c                |    1 -
+ sound/pci/ice1712/ice1712.c                 |    9 +-
+ sound/pci/ice1712/ice1712.h                 |   12 +-
+ sound/pci/ice1712/ice1724.c                 |   19 +-
+ sound/pci/ice1712/juli.c                    |    4 +-
+ sound/pci/ice1712/maya44.c                  |    5 +-
+ sound/pci/ice1712/phase.c                   |    3 +-
+ sound/pci/ice1712/pontis.c                  |    1 -
+ sound/pci/ice1712/prodigy192.c              |    5 +-
+ sound/pci/ice1712/prodigy_hifi.c            |    1 -
+ sound/pci/ice1712/psc724.c                  |  464 +++++++++++++
+ sound/pci/ice1712/psc724.h                  |   13 +
+ sound/pci/ice1712/quartet.c                 |   10 +-
+ sound/pci/ice1712/revo.c                    |    1 -
+ sound/pci/ice1712/se.c                      |   11 +-
+ sound/pci/ice1712/vt1720_mobo.c             |    1 -
+ sound/pci/ice1712/wm8766.c                  |  361 ++++++++++
+ sound/pci/ice1712/wm8766.h                  |  163 +++++
+ sound/pci/ice1712/wm8776.c                  |  633 ++++++++++++++++++
+ sound/pci/ice1712/wm8776.h                  |  226 +++++++
+ sound/pci/ice1712/wtm.c                     |    1 -
+ sound/pci/oxygen/virtuoso.c                 |    1 +
+ sound/pci/oxygen/xonar_wm87x6.c             |    6 +-
+ sound/usb/Kconfig                           |    2 +-
+ sound/usb/pcm.c                             |    3 -
+ sound/usb/quirks-table.h                    |   75 +++
+ 74 files changed, 4715 insertions(+), 2166 deletions(-)
+ create mode 100644 include/uapi/sound/asequencer.h
+ create mode 100644 include/uapi/sound/asound.h
+ rename include/{ => uapi}/sound/asound_fm.h (100%)
+ rename include/{ => uapi}/sound/compress_offload.h (100%)
+ rename include/{ => uapi}/sound/compress_params.h (100%)
+ create mode 100644 include/uapi/sound/emu10k1.h
+ rename include/{ => uapi}/sound/hdsp.h (100%)
+ rename include/{ => uapi}/sound/hdspm.h (100%)
+ create mode 100644 include/uapi/sound/sb16_csp.h
+ rename include/{ => uapi}/sound/sfnt_info.h (100%)
+ create mode 100644 sound/pci/hda/hda_intel_trace.h
+ create mode 100644 sound/pci/ice1712/psc724.c
+ create mode 100644 sound/pci/ice1712/psc724.h
+ create mode 100644 sound/pci/ice1712/wm8766.c
+ create mode 100644 sound/pci/ice1712/wm8766.h
+ create mode 100644 sound/pci/ice1712/wm8776.c
+ create mode 100644 sound/pci/ice1712/wm8776.h
+Merging sound-asoc/for-next (7bbd3b8 Merge branches 'fix/cs42l52', 'fix/mxs', 'fix/samsung', 'fix/wm8978', 'topic/ak4104', 'topic/atmel', 'topic/cs4271', 'topic/da9055', 'topic/davinci', 'topic/fsi', 'topic/fsl', 'topic/jack', 'topic/jz4740', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/wm0010', 'topic/wm2200', 'topic/wm8750', 'topic/wm8770', 'topic/wm8971' and 'topic/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/codecs/wm8994.c
+Auto-merging sound/soc/codecs/cs42l52.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/misc/atmel-ssc.txt         |   15 +
+ Documentation/devicetree/bindings/sound/ak4104.txt |   17 +
+ Documentation/devicetree/bindings/sound/cs4271.txt |    2 +
+ arch/arm/boot/dts/at91sam9260.dtsi                 |    8 +
+ arch/arm/boot/dts/at91sam9263.dtsi                 |   16 +
+ arch/arm/boot/dts/at91sam9g45.dtsi                 |   16 +
+ arch/arm/boot/dts/at91sam9x5.dtsi                  |    8 +
+ arch/arm/mach-at91/at91rm9200.c                    |    9 +-
+ arch/arm/mach-at91/at91rm9200_devices.c            |    6 +-
+ arch/arm/mach-at91/at91sam9260.c                   |    3 +-
+ arch/arm/mach-at91/at91sam9260_devices.c           |   11 +-
+ arch/arm/mach-at91/at91sam9261.c                   |    9 +-
+ arch/arm/mach-at91/at91sam9261_devices.c           |    6 +-
+ arch/arm/mach-at91/at91sam9263.c                   |    6 +-
+ arch/arm/mach-at91/at91sam9263_devices.c           |    4 +-
+ arch/arm/mach-at91/at91sam9g45.c                   |    6 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c           |    4 +-
+ arch/arm/mach-at91/at91sam9rl.c                    |    6 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c            |    4 +-
+ arch/arm/mach-at91/at91sam9x5.c                    |    1 +
+ arch/arm/mach-at91/board-sam9g20ek.c               |   17 +
+ arch/arm/mach-davinci/board-da850-evm.c            |   24 +-
+ drivers/base/regmap/internal.h                     |    2 +
+ drivers/base/regmap/regmap-debugfs.c               |   50 +-
+ drivers/base/regmap/regmap.c                       |  154 +++--
+ drivers/misc/atmel-ssc.c                           |  133 +++--
+ include/linux/atmel-ssc.h                          |    5 +
+ include/linux/mfd/wm8994/pdata.h                   |    5 +
+ include/linux/platform_data/davinci_asp.h          |    3 +
+ include/linux/regmap.h                             |    6 +-
+ include/sound/cs4271.h                             |    1 +
+ include/sound/sh_fsi.h                             |    6 +
+ include/sound/tlv320aic32x4.h                      |    1 +
+ sound/soc/atmel/sam9g20_wm8731.c                   |   51 +-
+ sound/soc/codecs/Kconfig                           |   12 +
+ sound/soc/codecs/Makefile                          |    4 +
+ sound/soc/codecs/ak4104.c                          |   29 +-
+ sound/soc/codecs/arizona.h                         |   47 +-
+ sound/soc/codecs/cs4271.c                          |   21 +-
+ sound/soc/codecs/cs42l52.c                         |    3 +-
+ sound/soc/codecs/da9055.c                          |   43 +-
+ sound/soc/codecs/jz4740.c                          |  142 ++---
+ sound/soc/codecs/si476x.c                          |  255 +++++++++
+ sound/soc/codecs/tlv320aic32x4.c                   |   24 +
+ sound/soc/codecs/tlv320aic32x4.h                   |    3 +
+ sound/soc/codecs/wm0010.c                          |    5 +-
+ sound/soc/codecs/wm2200.c                          |  260 +++++++--
+ sound/soc/codecs/wm5102.c                          |  594 +++++++++++++++++++-
+ sound/soc/codecs/wm8750.c                          |   86 ++-
+ sound/soc/codecs/wm8770.c                          |  217 ++++---
+ sound/soc/codecs/wm8958-dsp2.c                     |   31 +-
+ sound/soc/codecs/wm8971.c                          |   80 ++-
+ sound/soc/codecs/wm8978.c                          |    2 +-
+ sound/soc/codecs/wm8994.c                          |  100 ++--
+ sound/soc/codecs/wm_adsp.c                         |  571 +++++++++++++++++++
+ sound/soc/codecs/wm_adsp.h                         |   54 ++
+ sound/soc/codecs/wmfw.h                            |  128 +++++
+ sound/soc/davinci/davinci-evm.c                    |    5 +
+ sound/soc/davinci/davinci-mcasp.c                  |   93 ++-
+ sound/soc/davinci/davinci-mcasp.h                  |    2 +-
+ sound/soc/davinci/davinci-pcm.c                    |   53 +-
+ sound/soc/davinci/davinci-pcm.h                    |    2 +
+ sound/soc/fsl/Kconfig                              |   16 +-
+ sound/soc/fsl/Makefile                             |    4 +
+ sound/soc/fsl/p1022_rdk.c                          |  392 +++++++++++++
+ sound/soc/fsl/pcm030-audio-fabric.c                |    4 +-
+ sound/soc/mxs/mxs-saif.c                           |   17 +-
+ sound/soc/samsung/Kconfig                          |    2 +
+ sound/soc/samsung/ac97.c                           |    6 +-
+ sound/soc/samsung/bells.c                          |  222 ++++++--
+ sound/soc/samsung/i2s.c                            |    8 +-
+ sound/soc/samsung/pcm.c                            |   12 +-
+ sound/soc/samsung/spdif.c                          |   12 +-
+ sound/soc/sh/fsi.c                                 |  441 +++++++++++++--
+ sound/soc/soc-jack.c                               |    3 -
+ 75 files changed, 3945 insertions(+), 675 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/misc/atmel-ssc.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt
+ create mode 100644 sound/soc/codecs/si476x.c
+ create mode 100644 sound/soc/codecs/wm_adsp.c
+ create mode 100644 sound/soc/codecs/wm_adsp.h
+ create mode 100644 sound/soc/codecs/wmfw.h
+ create mode 100644 sound/soc/fsl/p1022_rdk.c
+Merging modules/modules-next (56713a2 MODSIGN: Add modules_sign make target)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/ima_policy   |    3 +-
+ Makefile                               |    6 +
+ arch/arm/include/uapi/asm/unistd.h     |    1 +
+ arch/arm/kernel/calls.S                |    1 +
+ arch/powerpc/include/asm/systbl.h      |    1 +
+ arch/powerpc/include/asm/unistd.h      |    2 +-
+ arch/powerpc/include/uapi/asm/unistd.h |    1 +
+ arch/x86/syscalls/syscall_32.tbl       |    1 +
+ arch/x86/syscalls/syscall_64.tbl       |    1 +
+ include/linux/ima.h                    |    6 +
+ include/linux/security.h               |   13 ++
+ include/linux/syscalls.h               |    1 +
+ include/uapi/asm-generic/unistd.h      |    4 +-
+ include/uapi/linux/module.h            |    8 +
+ kernel/module.c                        |  402 ++++++++++++++++++++------------
+ kernel/sys_ni.c                        |    1 +
+ scripts/Makefile.modsign               |   32 +++
+ security/capability.c                  |    6 +
+ security/integrity/ima/ima.h           |    2 +-
+ security/integrity/ima/ima_api.c       |    4 +-
+ security/integrity/ima/ima_main.c      |   21 ++
+ security/integrity/ima/ima_policy.c    |    3 +
+ security/security.c                    |   10 +
+ 23 files changed, 370 insertions(+), 160 deletions(-)
+ create mode 100644 include/uapi/linux/module.h
+ create mode 100644 scripts/Makefile.modsign
+Merging virtio/virtio-next (41395df virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>()
+$ git merge virtio/virtio-next
+Merge made by the 'recursive' strategy.
+ drivers/char/virtio_console.c    |   14 ++++---
+ drivers/lguest/core.c            |    2 +-
+ drivers/net/virtio_net.c         |   46 +++++++++------------
+ drivers/rpmsg/virtio_rpmsg_bus.c |    6 +--
+ drivers/scsi/virtio_scsi.c       |   24 ++++++-----
+ drivers/virtio/virtio_balloon.c  |    7 ++--
+ drivers/virtio/virtio_mmio.c     |    4 +-
+ drivers/virtio/virtio_pci.c      |   20 ++-------
+ drivers/virtio/virtio_ring.c     |   46 +++++++++------------
+ include/linux/virtio.h           |   10 ++++-
+ include/linux/virtio_scsi.h      |   28 ++++++++++++-
+ mm/highmem.c                     |    1 +
+ net/9p/trans_virtio.c            |    3 +-
+ tools/lguest/lguest.c            |   84 ++++++++++++++++----------------------
+ tools/virtio/virtio_test.c       |    4 +-
+ 15 files changed, 144 insertions(+), 155 deletions(-)
+Merging input/next (4e99aab Input: nomadik-ske-keypad - fixup use of clk)
+$ git merge input/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/pwm-beeper.txt       |    7 +
+ .../bindings/input/touchscreen/mms114.txt          |   34 +++
+ drivers/input/input-mt.c                           |    2 +-
+ drivers/input/input.c                              |  181 +++++++++++--
+ drivers/input/joystick/as5011.c                    |   19 +-
+ drivers/input/keyboard/Kconfig                     |    2 +-
+ drivers/input/keyboard/nomadik-ske-keypad.c        |   14 +-
+ drivers/input/keyboard/qt2160.c                    |   19 +-
+ drivers/input/misc/Kconfig                         |   19 +-
+ drivers/input/misc/Makefile                        |    1 +
+ drivers/input/misc/da9055_onkey.c                  |  171 ++++++++++++
+ drivers/input/misc/pwm-beeper.c                    |   14 +-
+ drivers/input/misc/wm831x-on.c                     |    5 +-
+ drivers/input/mouse/alps.c                         |   10 +-
+ drivers/input/serio/Kconfig                        |    9 +
+ drivers/input/serio/Makefile                       |    1 +
+ drivers/input/serio/arc_ps2.c                      |  274 ++++++++++++++++++++
+ drivers/input/serio/i8042-io.h                     |    2 +-
+ drivers/input/tablet/wacom_sys.c                   |   58 +++--
+ drivers/input/tablet/wacom_wac.c                   |   21 +-
+ drivers/input/tablet/wacom_wac.h                   |    2 +
+ drivers/input/touchscreen/cy8ctmg110_ts.c          |   13 +-
+ drivers/input/touchscreen/edt-ft5x06.c             |   10 +-
+ drivers/input/touchscreen/mms114.c                 |   62 ++++-
+ drivers/input/touchscreen/wm831x-ts.c              |    6 +-
+ include/linux/input.h                              |    7 +-
+ 26 files changed, 859 insertions(+), 104 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
+ create mode 100644 drivers/input/misc/da9055_onkey.c
+ create mode 100644 drivers/input/serio/arc_ps2.c
+Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (316eb66 cgroup: set 'start' with the right value in cgroup_path.)
+$ git merge cgroup/for-next
+Merge made by the 'recursive' strategy.
+ block/blk-cgroup.c       |    3 +-
+ include/linux/cgroup.h   |   42 +-----
+ include/linux/freezer.h  |   57 ++++++--
+ kernel/cgroup.c          |  322 +++++++++++++---------------------------------
+ kernel/cgroup_freezer.c  |  209 +++++++++++-------------------
+ kernel/fork.c            |    9 +-
+ kernel/freezer.c         |   11 +-
+ kernel/power/process.c   |   13 +-
+ kernel/signal.c          |   20 +--
+ mm/hugetlb_cgroup.c      |   11 +-
+ mm/memcontrol.c          |  181 +++++++++++++-------------
+ security/device_cgroup.c |   30 ++++-
+ 12 files changed, 341 insertions(+), 567 deletions(-)
+Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
+$ git merge block/for-next
+Resolved 'drivers/block/floppy.c' using previous resolution.
+Resolved 'init/Kconfig' using previous resolution.
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging drivers/block/floppy.c
+CONFLICT (content): Merge conflict in drivers/block/floppy.c
+Auto-merging block/genhd.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 093dc2f] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS                      |    5 +
+ block/genhd.c                    |    6 +-
+ drivers/block/floppy.c           |    9 -
+ drivers/memstick/core/Kconfig    |   12 +
+ drivers/memstick/core/Makefile   |    2 +-
+ drivers/memstick/core/ms_block.c | 2395 ++++++++++++++++++++++++++++++++++++++
+ drivers/memstick/core/ms_block.h |  293 +++++
+ 7 files changed, 2709 insertions(+), 13 deletions(-)
+ create mode 100644 drivers/memstick/core/ms_block.c
+ create mode 100644 drivers/memstick/core/ms_block.h
+Merging device-mapper/master (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
+$ git merge device-mapper/master
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-raid1.c                          |   10 ++---
+ drivers/md/dm-snap.c                           |    5 +--
+ drivers/md/persistent-data/dm-btree-internal.h |   16 ++++----
+ drivers/md/persistent-data/dm-btree-remove.c   |   50 ++++++++++++------------
+ drivers/md/persistent-data/dm-btree-spine.c    |    6 +--
+ drivers/md/persistent-data/dm-btree.c          |   22 +++++------
+ 6 files changed, 53 insertions(+), 56 deletions(-)
+Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (ee93e74 mmc: dw_mmc: fix more const pointer warnings)
+$ git merge mmc/mmc-next
+Removing drivers/mmc/host/at91_mci.h
+Removing drivers/mmc/host/at91_mci.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                             |    8 -
+ arch/arm/mach-at91/include/mach/board.h |   10 -
+ drivers/mmc/card/queue.c                |   17 +-
+ drivers/mmc/core/debugfs.c              |   16 +
+ drivers/mmc/host/Kconfig                |   29 +-
+ drivers/mmc/host/Makefile               |    2 +-
+ drivers/mmc/host/at91_mci.c             | 1219 ----------------------------
+ drivers/mmc/host/at91_mci.h             |  115 ---
+ drivers/mmc/host/dw_mmc-exynos.c        |    8 +-
+ drivers/mmc/host/dw_mmc-pci.c           |    2 +-
+ drivers/mmc/host/dw_mmc-pltfm.c         |   22 +-
+ drivers/mmc/host/dw_mmc-pltfm.h         |    2 +-
+ drivers/mmc/host/dw_mmc.c               |   62 +-
+ drivers/mmc/host/mxcmmc.c               |    4 +-
+ drivers/mmc/host/omap_hsmmc.c           |   32 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c       | 1332 +++++++++++++++++++++++++++++++
+ drivers/mmc/host/sdhci-dove.c           |   38 +-
+ drivers/mmc/host/sdhci-of-esdhc.c       |   11 +
+ drivers/mmc/host/sdhci-pci.c            |    2 +-
+ drivers/mmc/host/sdhci-pltfm.c          |    7 +
+ drivers/mmc/host/sdhci-s3c.c            |   30 +-
+ drivers/mmc/host/sdhci.c                |   44 +-
+ drivers/mmc/host/sdhci.h                |    1 +
+ drivers/mmc/host/sh_mmcif.c             |    2 +-
+ include/linux/mmc/dw_mmc.h              |    6 +-
+ include/linux/mmc/sdhci.h               |    1 +
+ 26 files changed, 1527 insertions(+), 1495 deletions(-)
+ delete mode 100644 drivers/mmc/host/at91_mci.c
+ delete mode 100644 drivers/mmc/host/at91_mci.h
+ create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.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 (31841eb Merge branch 'slab/next' into for-next)
+$ git merge slab/for-next
+Resolved 'mm/slob.c' using previous resolution.
+Auto-merging mm/slob.c
+CONFLICT (content): Merge conflict in mm/slob.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3acb0a4] Merge remote-tracking branch 'slab/for-next'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/mm_types.h |    7 +--
+ include/linux/slab.h     |    9 ++-
+ mm/slab.c                |  146 ++++++++-------------------------------------
+ mm/slab.h                |   45 ++++++++++++++
+ mm/slab_common.c         |  116 ++++++++++++++++++++++++++++++++++++
+ mm/slob.c                |   36 ++++--------
+ mm/slub.c                |  147 ++++++++++++----------------------------------
+ 7 files changed, 247 insertions(+), 259 deletions(-)
+Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (79acf8a md:Avoid write invalid address if read_seqretry returned true.)
+$ git merge md/for-next
+Auto-merging block/blk-core.c
+Merge made by the 'recursive' strategy.
+ block/blk-core.c   |    1 +
+ drivers/md/md.c    |   27 +++-
+ drivers/md/md.h    |    8 +
+ drivers/md/raid5.c |  446 +++++++++++++++++++++++++++++++++++++++++++++++++---
+ drivers/md/raid5.h |   19 +++
+ 5 files changed, 469 insertions(+), 32 deletions(-)
+Merging mfd/for-next (45e48aa mfd: Select MFD_CORE for rtsx)
+$ git merge mfd/for-next
+Recorded preimage for 'drivers/mmc/host/Kconfig'
+Recorded preimage for 'drivers/mmc/host/rtsx_pci_sdmmc.c'
+Removing include/linux/input/ti_tscadc.h
+Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c
+CONFLICT (add/add): Merge conflict in drivers/mmc/host/rtsx_pci_sdmmc.c
+Auto-merging drivers/mmc/host/Makefile
+Auto-merging drivers/mmc/host/Kconfig
+CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig
+Removing drivers/input/touchscreen/ti_tscadc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/mmc/host/Kconfig'.
+Recorded resolution for 'drivers/mmc/host/rtsx_pci_sdmmc.c'.
+[master 17cd9d6] Merge remote-tracking branch 'mfd/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/iio/adc/Kconfig                     |    7 +
+ drivers/iio/adc/Makefile                    |    1 +
+ drivers/iio/adc/ti_am335x_adc.c             |  260 ++++++
+ drivers/input/touchscreen/Kconfig           |    6 +-
+ drivers/input/touchscreen/Makefile          |    2 +-
+ drivers/input/touchscreen/ti_am335x_tsc.c   |  398 +++++++++
+ drivers/input/touchscreen/ti_tscadc.c       |  486 -----------
+ drivers/memstick/host/Kconfig               |   10 +
+ drivers/memstick/host/Makefile              |    1 +
+ drivers/memstick/host/rtsx_pci_ms.c         |  641 ++++++++++++++
+ drivers/mfd/Kconfig                         |   21 +
+ drivers/mfd/Makefile                        |    4 +
+ drivers/mfd/mc13xxx-core.c                  |   94 +-
+ drivers/mfd/mc13xxx-i2c.c                   |   22 +-
+ drivers/mfd/mc13xxx-spi.c                   |   29 +-
+ drivers/mfd/mc13xxx.h                       |   18 +-
+ drivers/mfd/rtl8411.c                       |  251 ++++++
+ drivers/mfd/rts5209.c                       |  223 +++++
+ drivers/mfd/rts5229.c                       |  205 +++++
+ drivers/mfd/rtsx_pcr.c                      | 1251 +++++++++++++++++++++++++++
+ drivers/mfd/rtsx_pcr.h                      |   32 +
+ drivers/mfd/ti_am335x_tscadc.c              |  277 ++++++
+ drivers/mmc/host/Makefile                   |    2 +
+ include/linux/input/ti_am335x_tsc.h         |   23 +
+ include/linux/input/ti_tscadc.h             |   17 -
+ include/linux/mfd/rtsx_common.h             |   48 +
+ include/linux/mfd/rtsx_pci.h                |  794 +++++++++++++++++
+ include/linux/mfd/ti_am335x_tscadc.h        |  152 ++++
+ include/linux/platform_data/ti_am335x_adc.h |   14 +
+ 29 files changed, 4709 insertions(+), 580 deletions(-)
+ create mode 100644 drivers/iio/adc/ti_am335x_adc.c
+ create mode 100644 drivers/input/touchscreen/ti_am335x_tsc.c
+ delete mode 100644 drivers/input/touchscreen/ti_tscadc.c
+ create mode 100644 drivers/memstick/host/rtsx_pci_ms.c
+ create mode 100644 drivers/mfd/rtl8411.c
+ create mode 100644 drivers/mfd/rts5209.c
+ create mode 100644 drivers/mfd/rts5229.c
+ create mode 100644 drivers/mfd/rtsx_pcr.c
+ create mode 100644 drivers/mfd/rtsx_pcr.h
+ create mode 100644 drivers/mfd/ti_am335x_tscadc.c
+ create mode 100644 include/linux/input/ti_am335x_tsc.h
+ delete mode 100644 include/linux/input/ti_tscadc.h
+ create mode 100644 include/linux/mfd/rtsx_common.h
+ create mode 100644 include/linux/mfd/rtsx_pci.h
+ create mode 100644 include/linux/mfd/ti_am335x_tscadc.h
+ create mode 100644 include/linux/platform_data/ti_am335x_adc.h
+Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
+$ git merge fbdev/fbdev-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (d4981af Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/max8925', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
+$ git merge regulator/for-next
+Removing include/linux/regulator/tps65090-regulator.h
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/gpio-regulator.txt          |   36 +++
+ .../bindings/regulator/max8925-regulator.txt       |   29 ++
+ .../devicetree/bindings/regulator/vexpress.txt     |   32 ++
+ drivers/regulator/Kconfig                          |   18 ++
+ drivers/regulator/Makefile                         |    2 +
+ drivers/regulator/core.c                           |    8 +-
+ drivers/regulator/gpio-regulator.c                 |   94 ++++++
+ drivers/regulator/lp8788-ldo.c                     |    2 +-
+ drivers/regulator/max77686.c                       |  164 +++++++++-
+ drivers/regulator/max8925-regulator.c              |   72 ++++-
+ drivers/regulator/tps51632-regulator.c             |  332 ++++++++++++++++++++
+ drivers/regulator/tps65090-regulator.c             |  247 +++++++++++----
+ drivers/regulator/vexpress.c                       |  147 +++++++++
+ include/linux/mfd/tps65090.h                       |   35 +++
+ include/linux/regulator/driver.h                   |    3 +
+ include/linux/regulator/tps51632-regulator.h       |   47 +++
+ include/linux/regulator/tps65090-regulator.h       |   50 ---
+ 17 files changed, 1191 insertions(+), 127 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max8925-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt
+ create mode 100644 drivers/regulator/tps51632-regulator.c
+ create mode 100644 drivers/regulator/vexpress.c
+ create mode 100644 include/linux/regulator/tps51632-regulator.h
+ delete mode 100644 include/linux/regulator/tps65090-regulator.h
+Merging security/next (b566650 drivers/char/tpm: remove tasklet and cleanup)
+$ git merge security/next
+Resolved 'fs/cifs/cifsacl.c' using previous resolution.
+Resolved 'net/dns_resolver/dns_key.c' using previous resolution.
+Resolved 'security/keys/keyctl.c' using previous resolution.
+Resolved 'security/keys/keyring.c' using previous resolution.
+Resolved 'security/keys/process_keys.c' using previous resolution.
+Auto-merging security/keys/request_key.c
+Auto-merging security/keys/process_keys.c
+CONFLICT (content): Merge conflict in security/keys/process_keys.c
+Auto-merging security/keys/keyring.c
+CONFLICT (content): Merge conflict in security/keys/keyring.c
+Auto-merging security/keys/keyctl.c
+CONFLICT (content): Merge conflict in security/keys/keyctl.c
+Auto-merging security/keys/key.c
+Auto-merging net/dns_resolver/dns_key.c
+CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
+Auto-merging kernel/cred.c
+Auto-merging include/linux/key.h
+Auto-merging fs/nfs/idmap.c
+Auto-merging fs/cifs/cifsacl.c
+CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
+Auto-merging arch/x86/kernel/vsyscall_64.c
+Auto-merging Documentation/security/keys.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 058514f] Merge remote-tracking branch 'security/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/prctl/seccomp_filter.txt |   74 +++++++++++++++++--
+ Documentation/security/keys.txt        |   17 +++++
+ arch/x86/kernel/vsyscall_64.c          |  110 ++++++++++++++-------------
+ drivers/char/tpm/tpm_ibmvtpm.c         |   81 +++++++-------------
+ drivers/char/tpm/tpm_ibmvtpm.h         |    5 +-
+ fs/nfs/idmap.c                         |   12 +--
+ include/linux/cred.h                   |   17 +----
+ include/linux/key.h                    |    1 +
+ kernel/cred.c                          |  127 ++++----------------------------
+ kernel/seccomp.c                       |   13 +++-
+ net/dns_resolver/dns_key.c             |    9 +--
+ security/keys/key.c                    |    6 +-
+ security/keys/keyctl.c                 |   15 ++--
+ security/keys/keyring.c                |   10 +--
+ security/keys/process_keys.c           |   94 ++++++++++-------------
+ security/keys/request_key.c            |   21 ++++--
+ 16 files changed, 278 insertions(+), 334 deletions(-)
+Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
+$ git merge selinux/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/davinci_wdt.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API-HOWTO.txt    |  126 ++++++++++++++++++++++++
+ Documentation/DMA-API.txt          |   12 +++
+ arch/x86/include/asm/dma-mapping.h |    1 +
+ drivers/iommu/amd_iommu.c          |  184 +++++++++++++++++++++++++++---------
+ drivers/iommu/amd_iommu_types.h    |    1 +
+ include/linux/dma-debug.h          |    7 ++
+ lib/dma-debug.c                    |   71 +++++++++++++-
+ 7 files changed, 355 insertions(+), 47 deletions(-)
+Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
+$ git merge osd/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/scsi/osd/osd_uld.c |   28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+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 (926ccfe Btrfs: Fix printk and variable name)
+$ git merge trivial/for-next
+Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/md.c
+Merge made by the 'recursive' strategy.
+ README                                         |    4 ++++
+ drivers/base/firmware_class.c                  |    2 +-
+ drivers/char/ppdev.c                           |    6 +-----
+ drivers/isdn/hardware/mISDN/mISDNisar.c        |    2 +-
+ drivers/isdn/hisax/amd7930_fn.c                |    2 +-
+ drivers/isdn/hisax/isar.c                      |    2 +-
+ drivers/isdn/pcbit/layer2.c                    |    2 +-
+ drivers/md/md.c                                |    2 +-
+ drivers/md/persistent-data/dm-block-manager.c  |    4 ++--
+ drivers/md/persistent-data/dm-btree.h          |    2 +-
+ drivers/md/raid5.c                             |    2 +-
+ drivers/net/wimax/i2400m/debugfs.c             |    1 +
+ drivers/scsi/qla2xxx/qla_isr.c                 |    4 ++--
+ drivers/scsi/qla2xxx/qla_nx.c                  |    4 ++--
+ drivers/scsi/qla2xxx/qla_target.c              |   12 ++++++------
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c             |    2 +-
+ drivers/target/iscsi/iscsi_target_parameters.c |    1 +
+ drivers/tty/hvc/hvc_opal.c                     |    2 +-
+ drivers/tty/hvc/hvc_vio.c                      |    2 +-
+ drivers/tty/serial/8250/Kconfig                |    2 +-
+ drivers/tty/serial/bfin_uart.c                 |    2 +-
+ drivers/tty/serial/icom.c                      |    2 +-
+ fs/btrfs/ctree.h                               |    2 +-
+ fs/btrfs/extent_map.c                          |    3 +--
+ fs/btrfs/volumes.c                             |    2 +-
+ mm/util.c                                      |    2 +-
+ net/rfkill/core.c                              |    4 ++--
+ 27 files changed, 39 insertions(+), 38 deletions(-)
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (e1424ee Merge branch 'pm-qos-next' into linux-next)
+$ git merge pm/linux-next
+Resolved 'arch/x86/pci/acpi.c' using previous resolution.
+Auto-merging drivers/acpi/pci_irq.c
+Auto-merging arch/x86/pci/acpi.c
+CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f5d372e] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-devfreq |   15 +-
+ Documentation/ABI/testing/sysfs-devices-power |   31 +
+ Documentation/power/pm_qos_interface.txt      |    2 +-
+ arch/ia64/include/asm/device.h                |    3 -
+ arch/ia64/kernel/acpi.c                       |    2 +
+ arch/x86/include/asm/device.h                 |    3 -
+ arch/x86/kernel/acpi/boot.c                   |    6 +
+ arch/x86/kernel/acpi/sleep.c                  |    2 +
+ arch/x86/pci/acpi.c                           |   11 +
+ drivers/acpi/Makefile                         |    4 +-
+ drivers/acpi/acpi_memhotplug.c                |   51 +-
+ drivers/acpi/acpi_pad.c                       |    8 +-
+ drivers/acpi/acpi_platform.c                  |  285 ++++++++++
+ drivers/acpi/acpica/Makefile                  |    3 +
+ drivers/acpi/acpica/acdebug.h                 |   94 ++--
+ drivers/acpi/acpica/acdispat.h                |   11 +-
+ drivers/acpi/acpica/acevents.h                |    6 +-
+ drivers/acpi/acpica/acglobal.h                |   73 +--
+ drivers/acpi/acpica/aclocal.h                 |   16 +-
+ drivers/acpi/acpica/acmacros.h                |  163 ++----
+ drivers/acpi/acpica/acobject.h                |    7 +-
+ drivers/acpi/acpica/acopcode.h                |    6 +-
+ drivers/acpi/acpica/acparser.h                |    3 +-
+ drivers/acpi/acpica/acpredef.h                |   11 +-
+ drivers/acpi/acpica/acstruct.h                |    2 +-
+ drivers/acpi/acpica/acutils.h                 |   58 +-
+ drivers/acpi/acpica/amlresrc.h                |    1 -
+ drivers/acpi/acpica/dscontrol.c               |    2 +-
+ drivers/acpi/acpica/dsfield.c                 |    2 +-
+ drivers/acpi/acpica/dsmethod.c                |    6 +-
+ drivers/acpi/acpica/dsmthdat.c                |   14 +-
+ drivers/acpi/acpica/dsobject.c                |    6 +-
+ drivers/acpi/acpica/dsopcode.c                |    3 +-
+ drivers/acpi/acpica/dsutils.c                 |   33 +-
+ drivers/acpi/acpica/dswexec.c                 |   10 +-
+ drivers/acpi/acpica/dswload2.c                |    4 +-
+ drivers/acpi/acpica/dswstate.c                |   26 +-
+ drivers/acpi/acpica/evgpe.c                   |   20 +-
+ drivers/acpi/acpica/evgpeblk.c                |    3 +-
+ drivers/acpi/acpica/evgpeutil.c               |    3 +-
+ drivers/acpi/acpica/evrgnini.c                |    7 +-
+ drivers/acpi/acpica/evxface.c                 |    2 +-
+ drivers/acpi/acpica/evxfgpe.c                 |   13 +-
+ drivers/acpi/acpica/exconvrt.c                |    4 +-
+ drivers/acpi/acpica/excreate.c                |    9 +-
+ drivers/acpi/acpica/exdebug.c                 |   10 +-
+ drivers/acpi/acpica/exdump.c                  |   20 +-
+ drivers/acpi/acpica/exfield.c                 |    4 +-
+ drivers/acpi/acpica/exfldio.c                 |   15 +-
+ drivers/acpi/acpica/exmisc.c                  |    5 +-
+ drivers/acpi/acpica/exmutex.c                 |    9 +-
+ drivers/acpi/acpica/exnames.c                 |    9 +-
+ drivers/acpi/acpica/exoparg1.c                |   11 +-
+ drivers/acpi/acpica/exoparg2.c                |    2 +-
+ drivers/acpi/acpica/exoparg3.c                |    3 +-
+ drivers/acpi/acpica/exoparg6.c                |    5 +-
+ drivers/acpi/acpica/exprep.c                  |   13 +-
+ drivers/acpi/acpica/exregion.c                |    3 +-
+ drivers/acpi/acpica/exresnte.c                |    9 +-
+ drivers/acpi/acpica/exresolv.c                |    3 +-
+ drivers/acpi/acpica/exresop.c                 |    8 +-
+ drivers/acpi/acpica/exstore.c                 |    4 +-
+ drivers/acpi/acpica/exstoren.c                |   11 +-
+ drivers/acpi/acpica/exstorob.c                |    5 +-
+ drivers/acpi/acpica/exsystem.c                |    9 +-
+ drivers/acpi/acpica/exutils.c                 |    5 +-
+ drivers/acpi/acpica/hwacpi.c                  |    3 +-
+ drivers/acpi/acpica/hwgpe.c                   |    4 +-
+ drivers/acpi/acpica/hwpci.c                   |    4 +-
+ drivers/acpi/acpica/hwregs.c                  |    1 -
+ drivers/acpi/acpica/hwtimer.c                 |    6 +-
+ drivers/acpi/acpica/hwvalid.c                 |    1 -
+ drivers/acpi/acpica/hwxface.c                 |    1 -
+ drivers/acpi/acpica/hwxfsleep.c               |   12 +-
+ drivers/acpi/acpica/nsaccess.c                |    7 +-
+ drivers/acpi/acpica/nsalloc.c                 |    4 +-
+ drivers/acpi/acpica/nsdump.c                  |   10 +-
+ drivers/acpi/acpica/nsinit.c                  |    4 +-
+ drivers/acpi/acpica/nsload.c                  |   10 +-
+ drivers/acpi/acpica/nsnames.c                 |    2 +-
+ drivers/acpi/acpica/nsobject.c                |    8 +-
+ drivers/acpi/acpica/nsparse.c                 |    8 +-
+ drivers/acpi/acpica/nssearch.c                |   17 +-
+ drivers/acpi/acpica/nsutils.c                 |   18 +-
+ drivers/acpi/acpica/nswalk.c                  |   10 +-
+ drivers/acpi/acpica/nsxfeval.c                |   20 +-
+ drivers/acpi/acpica/nsxfname.c                |   66 ++-
+ drivers/acpi/acpica/nsxfobj.c                 |    4 +-
+ drivers/acpi/acpica/psargs.c                  |    8 +-
+ drivers/acpi/acpica/psloop.c                  |   61 +-
+ drivers/acpi/acpica/psopcode.c                |   29 +-
+ drivers/acpi/acpica/psparse.c                 |   13 +-
+ drivers/acpi/acpica/psutils.c                 |    4 +-
+ drivers/acpi/acpica/rscalc.c                  |   14 +-
+ drivers/acpi/acpica/rslist.c                  |    4 +-
+ drivers/acpi/acpica/tbfind.c                  |    2 +-
+ drivers/acpi/acpica/tbinstal.c                |    2 +
+ drivers/acpi/acpica/tbutils.c                 |    2 +-
+ drivers/acpi/acpica/tbxface.c                 |    4 +-
+ drivers/acpi/acpica/tbxfload.c                |    2 +-
+ drivers/acpi/acpica/tbxfroot.c                |    3 +-
+ drivers/acpi/acpica/utcache.c                 |  323 +++++++++++
+ drivers/acpi/acpica/utclib.c                  |  749 +++++++++++++++++++++++++
+ drivers/acpi/acpica/utdebug.c                 |   37 +-
+ drivers/acpi/acpica/utids.c                   |  104 +++-
+ drivers/acpi/acpica/utmath.c                  |    2 +-
+ drivers/acpi/acpica/utmisc.c                  |  150 ++++-
+ drivers/acpi/acpica/utmutex.c                 |   14 +-
+ drivers/acpi/acpica/utobject.c                |    8 +-
+ drivers/acpi/acpica/utstate.c                 |    2 +-
+ drivers/acpi/acpica/uttrack.c                 |  692 +++++++++++++++++++++++
+ drivers/acpi/acpica/utxface.c                 |    5 +-
+ drivers/acpi/acpica/utxferror.c               |    2 +-
+ drivers/acpi/bus.c                            |   15 +-
+ drivers/acpi/container.c                      |   17 +-
+ drivers/acpi/device_pm.c                      |  648 +++++++++++++++++++++
+ drivers/acpi/dock.c                           |   26 +-
+ drivers/acpi/ec.c                             |   97 ++--
+ drivers/acpi/glue.c                           |   14 +-
+ drivers/acpi/internal.h                       |   11 +-
+ drivers/acpi/osl.c                            |   22 +-
+ drivers/acpi/pci_irq.c                        |    5 -
+ drivers/acpi/power.c                          |    2 +-
+ drivers/acpi/processor_driver.c               |   41 +-
+ drivers/acpi/scan.c                           |  102 +++-
+ drivers/acpi/sleep.c                          |  195 +------
+ drivers/acpi/sysfs.c                          |    4 +-
+ drivers/base/core.c                           |    2 +-
+ drivers/base/platform.c                       |    5 +
+ drivers/base/power/clock_ops.c                |    6 +-
+ drivers/base/power/domain.c                   |   11 +-
+ drivers/base/power/opp.c                      |   44 +-
+ drivers/base/power/power.h                    |    6 +-
+ drivers/base/power/qos.c                      |  303 ++++++++--
+ drivers/base/power/sysfs.c                    |   94 +++-
+ drivers/cpufreq/Makefile                      |    4 +-
+ drivers/cpufreq/cpufreq.c                     |   37 +-
+ drivers/cpufreq/cpufreq_conservative.c        |  558 +++++-------------
+ drivers/cpufreq/cpufreq_governor.c            |  318 +++++++++++
+ drivers/cpufreq/cpufreq_governor.h            |  176 ++++++
+ drivers/cpufreq/cpufreq_ondemand.c            |  728 ++++++++----------------
+ drivers/cpufreq/cpufreq_performance.c         |    2 +
+ drivers/cpufreq/cpufreq_powersave.c           |    2 +
+ drivers/cpufreq/cpufreq_stats.c               |    4 +-
+ drivers/cpufreq/cpufreq_userspace.c           |    2 +
+ drivers/cpufreq/freq_table.c                  |    2 +
+ drivers/cpuidle/Kconfig                       |    9 +
+ drivers/cpuidle/cpuidle.c                     |   52 +-
+ drivers/cpuidle/cpuidle.h                     |   13 +-
+ drivers/cpuidle/driver.c                      |  209 ++++++-
+ drivers/cpuidle/governors/menu.c              |  166 +++++-
+ drivers/cpuidle/sysfs.c                       |  201 ++++++-
+ drivers/devfreq/devfreq.c                     |  517 ++++++++---------
+ drivers/devfreq/governor.h                    |   13 +
+ drivers/devfreq/governor_performance.c        |   16 +-
+ drivers/devfreq/governor_powersave.c          |   16 +-
+ drivers/devfreq/governor_simpleondemand.c     |   33 ++
+ drivers/devfreq/governor_userspace.c          |   23 +-
+ drivers/mtd/nand/sh_flctl.c                   |    4 +-
+ drivers/pci/pci-acpi.c                        |   79 +--
+ include/acpi/acconfig.h                       |    1 +
+ include/acpi/acexcep.h                        |    2 +-
+ include/acpi/acnames.h                        |    1 +
+ include/acpi/acpi_bus.h                       |   67 ++-
+ include/acpi/acpiosxf.h                       |    3 +-
+ include/acpi/acpixf.h                         |   18 +-
+ include/acpi/actbl3.h                         |   22 +-
+ include/acpi/actypes.h                        |   42 +-
+ include/linux/acpi.h                          |   68 ++-
+ include/linux/cpufreq.h                       |    5 +-
+ include/linux/cpuidle.h                       |   15 +-
+ include/linux/devfreq.h                       |   49 +-
+ include/linux/device.h                        |    4 +
+ include/linux/pm.h                            |    3 +-
+ include/linux/pm_qos.h                        |   77 ++-
+ include/linux/tick.h                          |    6 +
+ kernel/cpu.c                                  |    8 +-
+ kernel/power/main.c                           |    2 +-
+ kernel/power/qos.c                            |   65 ++-
+ kernel/power/swap.c                           |    2 +-
+ kernel/time/tick-sched.c                      |    4 +
+ 181 files changed, 6474 insertions(+), 2507 deletions(-)
+ create mode 100644 drivers/acpi/acpi_platform.c
+ create mode 100644 drivers/acpi/acpica/utcache.c
+ create mode 100644 drivers/acpi/acpica/utclib.c
+ create mode 100644 drivers/acpi/acpica/uttrack.c
+ create mode 100644 drivers/acpi/device_pm.c
+ create mode 100644 drivers/cpufreq/cpufreq_governor.c
+ create mode 100644 drivers/cpufreq/cpufreq_governor.h
+Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Resolved 'kernel/audit_tree.c' using previous resolution.
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+CONFLICT (content): Merge conflict in kernel/audit_tree.c
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/inotify/inotify_user.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a2ef2cb] Merge remote-tracking branch 'fsnotify/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/notify/dnotify/dnotify.c          |    4 +-
+ fs/notify/fanotify/fanotify.c        |    6 +++
+ fs/notify/fanotify/fanotify_user.c   |   37 +++++++++-----
+ fs/notify/group.c                    |   47 ++++++++++--------
+ fs/notify/inode_mark.c               |   14 ++++--
+ fs/notify/inotify/inotify_fsnotify.c |    4 +-
+ fs/notify/inotify/inotify_user.c     |   34 ++++++-------
+ fs/notify/mark.c                     |   91 +++++++++++++++++++---------------
+ fs/notify/notification.c             |    1 +
+ fs/notify/vfsmount_mark.c            |   14 ++++--
+ include/linux/fsnotify_backend.h     |   31 ++++++++----
+ kernel/audit_tree.c                  |   10 ++--
+ kernel/audit_watch.c                 |    4 +-
+ 13 files changed, 178 insertions(+), 119 deletions(-)
+Merging edac/linux_next (5e75cbb Merge branch 'devel' into next)
+$ git merge edac/linux_next
+Auto-merging drivers/edac/edac_mc.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c      |   21 +-
+ drivers/edac/i7300_edac.c   |    8 +-
+ drivers/edac/i82975x_edac.c |  457 +++++++++++++++++++++++++------------------
+ drivers/edac/sb_edac.c      |    2 +-
+ include/linux/edac.h        |    1 -
+ 5 files changed, 288 insertions(+), 201 deletions(-)
+Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
+$ git merge edac-amd/for-next
+Auto-merging include/linux/edac.h
+Auto-merging drivers/edac/edac_mc.c
+Auto-merging drivers/edac/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/edac/Kconfig            |    8 +-
+ drivers/edac/amd64_edac.c       |  297 +++++++++++++++------------------------
+ drivers/edac/amd64_edac.h       |   59 ++++++--
+ drivers/edac/amd64_edac_inj.c   |  128 +++++++++--------
+ drivers/edac/edac_mc.c          |   57 ++++----
+ drivers/edac/edac_mc_sysfs.c    |   39 +++--
+ drivers/edac/edac_module.c      |   27 +++-
+ drivers/edac/edac_pci.c         |    3 +-
+ drivers/edac/highbank_mc_edac.c |    8 +-
+ drivers/edac/mce_amd.c          |  254 +++++++++++++++++----------------
+ drivers/edac/mce_amd.h          |   11 +-
+ include/linux/edac.h            |    3 +
+ 12 files changed, 456 insertions(+), 438 deletions(-)
+Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (2066306 arm: l2cc: doc: fix device tree example typo)
+$ git merge dt-rh/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/l2cc.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
+$ git merge spi/spi/next
+Already up-to-date.
+Merging spi-mb/spi-next (fad8f9c Merge branch 'spi-fix-s3c64xx' into spi-next)
+$ git merge spi-mb/spi-next
+Auto-merging drivers/spi/spi-s3c64xx.c
+Merge made by the 'recursive' strategy.
+ .../bindings/spi/nvidia,tegra20-slink.txt          |   26 +
+ Documentation/devicetree/bindings/spi/omap-spi.txt |    4 +-
+ drivers/spi/Kconfig                                |    6 +
+ drivers/spi/Makefile                               |    2 +-
+ drivers/spi/spi-omap2-mcspi.c                      |   64 +-
+ drivers/spi/spi-pl022.c                            |   52 +-
+ drivers/spi/spi-s3c64xx.c                          |   34 +-
+ drivers/spi/spi-tegra20-slink.c                    | 1359 ++++++++++++++++++++
+ drivers/spi/spidev.c                               |   10 +
+ include/linux/platform_data/spi-omap2-mcspi.h      |    4 +
+ include/linux/spi/spi-tegra.h                      |   40 +
+ 11 files changed, 1539 insertions(+), 62 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt
+ create mode 100644 drivers/spi/spi-tegra20-slink.c
+ create mode 100644 include/linux/spi/spi-tegra.h
+Merging tip/auto-latest (8a1d31c Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging kernel/time/tick-sched.c
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/kvm_host.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/edac/amd64_edac.h
+Auto-merging drivers/base/core.c
+Auto-merging drivers/acpi/osl.c
+Auto-merging arch/x86/kernel/acpi/boot.c
+Auto-merging arch/s390/include/asm/pgtable.h
+Auto-merging arch/mips/include/asm/pgtable.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ CREDITS                                            |    1 +
+ Documentation/acpi/initrd_table_override.txt       |   94 ++
+ Documentation/scheduler/numa-problem.txt           |  230 +++
+ Documentation/x86/boot.txt                         |    4 +-
+ MAINTAINERS                                        |   22 +-
+ arch/ia64/kernel/time.c                            |    8 +-
+ arch/mips/include/asm/pgtable.h                    |    2 +
+ arch/powerpc/kernel/time.c                         |    4 +-
+ arch/s390/include/asm/pgtable.h                    |   13 +
+ arch/s390/kernel/vtime.c                           |    4 +
+ arch/s390/kvm/kvm-s390.c                           |    4 -
+ arch/sh/mm/Kconfig                                 |    1 +
+ arch/x86/Kconfig                                   |   33 +-
+ arch/x86/include/asm/mce.h                         |   21 +-
+ arch/x86/include/asm/pgtable.h                     |    7 +
+ arch/x86/kernel/Makefile                           |    1 -
+ arch/x86/kernel/acpi/boot.c                        |    6 +
+ arch/x86/kernel/cpu/mcheck/mce-internal.h          |    2 -
+ arch/x86/kernel/cpu/mcheck/mce-severity.c          |    4 +-
+ arch/x86/kernel/cpu/mcheck/mce.c                   |  209 +--
+ arch/x86/kernel/cpu/mcheck/mce_amd.c               |    2 +-
+ arch/x86/kernel/cpu/mcheck/mce_intel.c             |    8 +-
+ arch/x86/kernel/cpu/perf_event.c                   |  121 ++
+ arch/x86/kernel/cpu/perf_event.h                   |    5 +
+ arch/x86/kernel/cpu/perf_event_amd.c               |    9 +
+ arch/x86/kernel/cpu/perf_event_intel.c             |    9 +
+ arch/x86/kernel/cpu/perf_event_p6.c                |    2 +
+ arch/x86/kernel/microcode_amd.c                    |    4 +-
+ arch/x86/kernel/process.c                          |   39 +-
+ arch/x86/kernel/rtc.c                              |    6 -
+ arch/x86/kernel/setup.c                            |    4 +
+ arch/x86/kernel/tsc.c                              |    6 +
+ arch/x86/lguest/boot.c                             |    2 +-
+ arch/x86/lib/copy_page_64.S                        |  120 +-
+ arch/x86/mm/gup.c                                  |   23 +-
+ arch/x86/mm/pgtable.c                              |    8 +-
+ arch/x86/pci/ce4100.c                              |   13 +
+ arch/x86/platform/ce4100/ce4100.c                  |   24 +
+ drivers/acpi/Kconfig                               |    9 +
+ drivers/acpi/osl.c                                 |  202 ++-
+ drivers/base/core.c                                |   21 +
+ drivers/edac/amd64_edac.h                          |    2 +-
+ drivers/edac/edac_stub.c                           |    2 +-
+ drivers/edac/mce_amd_inj.c                         |    4 +-
+ include/asm-generic/pgtable.h                      |    4 +
+ include/linux/acpi.h                               |   16 +
+ include/linux/device.h                             |    7 +
+ include/linux/earlycpio.h                          |   17 +
+ include/linux/hardirq.h                            |   15 +-
+ include/linux/huge_mm.h                            |   19 +
+ include/linux/init_task.h                          |    8 +
+ include/linux/kernel_stat.h                        |    9 +-
+ include/linux/kvm_host.h                           |   12 +-
+ include/linux/mempolicy.h                          |    8 +
+ include/linux/migrate.h                            |    7 +
+ include/linux/migrate_mode.h                       |    3 +
+ include/linux/mm.h                                 |  122 +-
+ include/linux/mm_types.h                           |   10 +
+ include/linux/mmzone.h                             |   14 +-
+ include/linux/page-flags-layout.h                  |   83 ++
+ include/linux/sched.h                              |   66 +-
+ include/linux/vtime.h                              |   47 +
+ include/uapi/linux/mempolicy.h                     |   17 +-
+ init/Kconfig                                       |   14 +
+ kernel/events/hw_breakpoint.c                      |   12 +-
+ kernel/lockdep_proc.c                              |    2 +-
+ kernel/sched/core.c                                |   88 +-
+ kernel/sched/cputime.c                             |   20 +-
+ kernel/sched/debug.c                               |   39 +-
+ kernel/sched/fair.c                                | 1483 ++++++++++++++++---
+ kernel/sched/features.h                            |   19 +
+ kernel/sched/sched.h                               |   96 +-
+ kernel/softirq.c                                   |    6 +-
+ kernel/sysctl.c                                    |   45 +-
+ kernel/time/tick-sched.c                           |  113 +-
+ lib/Makefile                                       |    2 +-
+ lib/earlycpio.c                                    |  145 ++
+ mm/huge_memory.c                                   |  254 +++-
+ mm/memory.c                                        |  132 +-
+ mm/mempolicy.c                                     |  204 ++-
+ mm/migrate.c                                       |   87 +-
+ mm/mprotect.c                                      |   31 +-
+ mm/pgtable-generic.c                               |    9 +-
+ scripts/kconfig/Makefile                           |    7 +-
+ tools/kvm/.gitignore                               |   12 +
+ tools/kvm/CREDITS-Git                              |   30 +
+ tools/kvm/Documentation/kernel-debugging.txt       |   15 +
+ tools/kvm/Documentation/kvm-balloon.txt            |   24 +
+ tools/kvm/Documentation/kvm-debug.txt              |   16 +
+ tools/kvm/Documentation/kvm-list.txt               |   16 +
+ tools/kvm/Documentation/kvm-pause.txt              |   16 +
+ tools/kvm/Documentation/kvm-resume.txt             |   16 +
+ tools/kvm/Documentation/kvm-run.txt                |   62 +
+ tools/kvm/Documentation/kvm-sandbox.txt            |   16 +
+ tools/kvm/Documentation/kvm-setup.txt              |   15 +
+ tools/kvm/Documentation/kvm-stat.txt               |   19 +
+ tools/kvm/Documentation/kvm-stop.txt               |   16 +
+ tools/kvm/Documentation/kvm-version.txt            |   21 +
+ tools/kvm/Documentation/virtio-console.txt         |   41 +
+ tools/kvm/Makefile                                 |  457 ++++++
+ tools/kvm/README                                   |  112 ++
+ tools/kvm/builtin-balloon.c                        |   80 +
+ tools/kvm/builtin-debug.c                          |  110 ++
+ tools/kvm/builtin-help.c                           |   63 +
+ tools/kvm/builtin-list.c                           |  149 ++
+ tools/kvm/builtin-pause.c                          |   88 ++
+ tools/kvm/builtin-resume.c                         |   88 ++
+ tools/kvm/builtin-run.c                            |  697 +++++++++
+ tools/kvm/builtin-sandbox.c                        |    9 +
+ tools/kvm/builtin-setup.c                          |  262 ++++
+ tools/kvm/builtin-stat.c                           |  127 ++
+ tools/kvm/builtin-stop.c                           |   70 +
+ tools/kvm/builtin-version.c                        |   15 +
+ tools/kvm/code16gcc.h                              |   15 +
+ tools/kvm/command-list.txt                         |   15 +
+ tools/kvm/config/feature-tests.mak                 |  177 +++
+ tools/kvm/config/utilities.mak                     |  196 +++
+ tools/kvm/disk/blk.c                               |   76 +
+ tools/kvm/disk/core.c                              |  354 +++++
+ tools/kvm/disk/qcow.c                              | 1529 ++++++++++++++++++++
+ tools/kvm/disk/raw.c                               |  141 ++
+ tools/kvm/framebuffer.c                            |   80 +
+ tools/kvm/guest/init.c                             |   72 +
+ tools/kvm/guest_compat.c                           |   99 ++
+ tools/kvm/hw/i8042.c                               |  355 +++++
+ tools/kvm/hw/pci-shmem.c                           |  405 ++++++
+ tools/kvm/hw/rtc.c                                 |  149 ++
+ tools/kvm/hw/serial.c                              |  452 ++++++
+ tools/kvm/hw/vesa.c                                |   89 ++
+ tools/kvm/include/asm/hweight.h                    |    8 +
+ tools/kvm/include/bios/memcpy.h                    |    9 +
+ tools/kvm/include/kvm/8250-serial.h                |   11 +
+ tools/kvm/include/kvm/apic.h                       |   17 +
+ tools/kvm/include/kvm/brlock.h                     |   41 +
+ tools/kvm/include/kvm/builtin-balloon.h            |    9 +
+ tools/kvm/include/kvm/builtin-debug.h              |   20 +
+ tools/kvm/include/kvm/builtin-help.h               |    6 +
+ tools/kvm/include/kvm/builtin-list.h               |   10 +
+ tools/kvm/include/kvm/builtin-pause.h              |    9 +
+ tools/kvm/include/kvm/builtin-resume.h             |    9 +
+ tools/kvm/include/kvm/builtin-run.h                |   11 +
+ tools/kvm/include/kvm/builtin-sandbox.h            |    6 +
+ tools/kvm/include/kvm/builtin-setup.h              |   11 +
+ tools/kvm/include/kvm/builtin-stat.h               |    9 +
+ tools/kvm/include/kvm/builtin-stop.h               |    9 +
+ tools/kvm/include/kvm/builtin-version.h            |    6 +
+ tools/kvm/include/kvm/compiler.h                   |   10 +
+ tools/kvm/include/kvm/disk-image.h                 |   96 ++
+ tools/kvm/include/kvm/e820.h                       |   13 +
+ tools/kvm/include/kvm/framebuffer.h                |   36 +
+ tools/kvm/include/kvm/guest_compat.h               |    9 +
+ tools/kvm/include/kvm/i8042.h                      |   12 +
+ tools/kvm/include/kvm/ioeventfd.h                  |   28 +
+ tools/kvm/include/kvm/ioport.h                     |   70 +
+ tools/kvm/include/kvm/irq.h                        |   33 +
+ tools/kvm/include/kvm/kvm-cmd.h                    |   17 +
+ tools/kvm/include/kvm/kvm-config.h                 |   60 +
+ tools/kvm/include/kvm/kvm-cpu.h                    |   26 +
+ tools/kvm/include/kvm/kvm-ipc.h                    |   26 +
+ tools/kvm/include/kvm/kvm.h                        |  121 ++
+ tools/kvm/include/kvm/msi.h                        |   10 +
+ tools/kvm/include/kvm/mutex.h                      |   33 +
+ tools/kvm/include/kvm/parse-options.h              |  218 +++
+ tools/kvm/include/kvm/pci-shmem.h                  |   32 +
+ tools/kvm/include/kvm/pci.h                        |   95 ++
+ tools/kvm/include/kvm/qcow.h                       |  133 ++
+ tools/kvm/include/kvm/rbtree-interval.h            |   28 +
+ tools/kvm/include/kvm/read-write.h                 |   43 +
+ tools/kvm/include/kvm/rtc.h                        |    9 +
+ tools/kvm/include/kvm/rwsem.h                      |   39 +
+ tools/kvm/include/kvm/sdl.h                        |   28 +
+ tools/kvm/include/kvm/segment.h                    |   21 +
+ tools/kvm/include/kvm/strbuf.h                     |   20 +
+ tools/kvm/include/kvm/symbol.h                     |   30 +
+ tools/kvm/include/kvm/term.h                       |   24 +
+ tools/kvm/include/kvm/threadpool.h                 |   38 +
+ tools/kvm/include/kvm/types.h                      |    7 +
+ tools/kvm/include/kvm/uip.h                        |  360 +++++
+ tools/kvm/include/kvm/util-init.h                  |   51 +
+ tools/kvm/include/kvm/util.h                       |   97 ++
+ tools/kvm/include/kvm/vesa.h                       |   18 +
+ tools/kvm/include/kvm/virtio-9p.h                  |   76 +
+ tools/kvm/include/kvm/virtio-balloon.h             |    9 +
+ tools/kvm/include/kvm/virtio-blk.h                 |   12 +
+ tools/kvm/include/kvm/virtio-console.h             |   10 +
+ tools/kvm/include/kvm/virtio-mmio.h                |   58 +
+ tools/kvm/include/kvm/virtio-net.h                 |   30 +
+ tools/kvm/include/kvm/virtio-pci-dev.h             |   38 +
+ tools/kvm/include/kvm/virtio-pci.h                 |   49 +
+ tools/kvm/include/kvm/virtio-rng.h                 |    9 +
+ tools/kvm/include/kvm/virtio-scsi.h                |   26 +
+ tools/kvm/include/kvm/virtio.h                     |  102 ++
+ tools/kvm/include/kvm/vnc.h                        |   22 +
+ tools/kvm/include/linux/bitops.h                   |   33 +
+ tools/kvm/include/linux/byteorder.h                |    7 +
+ tools/kvm/include/linux/compiler.h                 |   20 +
+ tools/kvm/include/linux/kernel.h                   |   41 +
+ tools/kvm/include/linux/module.h                   |    6 +
+ tools/kvm/include/linux/prefetch.h                 |    6 +
+ tools/kvm/include/linux/stddef.h                   |   16 +
+ tools/kvm/include/linux/types.h                    |   51 +
+ tools/kvm/ioeventfd.c                              |  216 +++
+ tools/kvm/ioport.c                                 |  198 +++
+ tools/kvm/kvm-cmd.c                                |   91 ++
+ tools/kvm/kvm-cpu.c                                |  242 ++++
+ tools/kvm/kvm-ipc.c                                |  498 +++++++
+ tools/kvm/kvm.c                                    |  458 ++++++
+ tools/kvm/main.c                                   |   19 +
+ tools/kvm/mmio.c                                   |  139 ++
+ tools/kvm/net/uip/arp.c                            |   30 +
+ tools/kvm/net/uip/buf.c                            |  114 ++
+ tools/kvm/net/uip/core.c                           |  190 +++
+ tools/kvm/net/uip/csum.c                           |   92 ++
+ tools/kvm/net/uip/dhcp.c                           |  202 +++
+ tools/kvm/net/uip/icmp.c                           |   29 +
+ tools/kvm/net/uip/ipv4.c                           |   29 +
+ tools/kvm/net/uip/tcp.c                            |  345 +++++
+ tools/kvm/net/uip/udp.c                            |  236 +++
+ tools/kvm/pci.c                                    |  215 +++
+ tools/kvm/powerpc/boot.c                           |    8 +
+ tools/kvm/powerpc/cpu_info.c                       |  195 +++
+ tools/kvm/powerpc/cpu_info.h                       |   42 +
+ tools/kvm/powerpc/include/kvm/barrier.h            |    6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h           |   68 +
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h       |   76 +
+ tools/kvm/powerpc/ioport.c                         |   18 +
+ tools/kvm/powerpc/irq.c                            |   56 +
+ tools/kvm/powerpc/kvm-cpu.c                        |  290 ++++
+ tools/kvm/powerpc/kvm.c                            |  529 +++++++
+ tools/kvm/powerpc/spapr.h                          |   93 ++
+ tools/kvm/powerpc/spapr_hcall.c                    |  134 ++
+ tools/kvm/powerpc/spapr_hvcons.c                   |  108 ++
+ tools/kvm/powerpc/spapr_hvcons.h                   |   19 +
+ tools/kvm/powerpc/spapr_pci.c                      |  423 ++++++
+ tools/kvm/powerpc/spapr_pci.h                      |   57 +
+ tools/kvm/powerpc/spapr_rtas.c                     |  233 +++
+ tools/kvm/powerpc/xics.c                           |  522 +++++++
+ tools/kvm/powerpc/xics.h                           |   18 +
+ tools/kvm/symbol.c                                 |  133 ++
+ tools/kvm/term.c                                   |  171 +++
+ tools/kvm/tests/Makefile                           |   19 +
+ tools/kvm/tests/boot/Makefile                      |   13 +
+ tools/kvm/tests/boot/init.c                        |   11 +
+ tools/kvm/tests/kernel/.gitignore                  |    2 +
+ tools/kvm/tests/kernel/Makefile                    |   20 +
+ tools/kvm/tests/kernel/README                      |   16 +
+ tools/kvm/tests/kernel/kernel.S                    |    8 +
+ tools/kvm/tests/pit/.gitignore                     |    2 +
+ tools/kvm/tests/pit/Makefile                       |   20 +
+ tools/kvm/tests/pit/README                         |   16 +
+ tools/kvm/tests/pit/tick.S                         |  101 ++
+ tools/kvm/ui/sdl.c                                 |  321 ++++
+ tools/kvm/ui/vnc.c                                 |  248 ++++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN                |   40 +
+ tools/kvm/util/generate-cmdlist.sh                 |   23 +
+ tools/kvm/util/init.c                              |   69 +
+ tools/kvm/util/kvm-ifup-vbr0                       |    6 +
+ tools/kvm/util/parse-options.c                     |  577 ++++++++
+ tools/kvm/util/rbtree-interval.c                   |  118 ++
+ tools/kvm/util/read-write.c                        |  354 +++++
+ tools/kvm/util/set_private_br.sh                   |   51 +
+ tools/kvm/util/strbuf.c                            |   62 +
+ tools/kvm/util/threadpool.c                        |  173 +++
+ tools/kvm/util/util.c                              |  133 ++
+ tools/kvm/virtio/9p-pdu.c                          |  287 ++++
+ tools/kvm/virtio/9p.c                              | 1432 ++++++++++++++++++
+ tools/kvm/virtio/balloon.c                         |  270 ++++
+ tools/kvm/virtio/blk.c                             |  315 ++++
+ tools/kvm/virtio/console.c                         |  203 +++
+ tools/kvm/virtio/core.c                            |  233 +++
+ tools/kvm/virtio/mmio.c                            |  264 ++++
+ tools/kvm/virtio/net.c                             |  670 +++++++++
+ tools/kvm/virtio/pci.c                             |  398 +++++
+ tools/kvm/virtio/rng.c                             |  193 +++
+ tools/kvm/virtio/scsi.c                            |  309 ++++
+ tools/kvm/x86/bios.c                               |  174 +++
+ tools/kvm/x86/bios/.gitignore                      |    3 +
+ tools/kvm/x86/bios/bios-rom.S                      |   12 +
+ tools/kvm/x86/bios/e820.c                          |   72 +
+ tools/kvm/x86/bios/entry.S                         |   92 ++
+ tools/kvm/x86/bios/gen-offsets.sh                  |   14 +
+ tools/kvm/x86/bios/int10.c                         |  110 ++
+ tools/kvm/x86/bios/int15.c                         |   18 +
+ tools/kvm/x86/bios/local.S                         |    7 +
+ tools/kvm/x86/bios/macro.S                         |   25 +
+ tools/kvm/x86/bios/memcpy.c                        |   23 +
+ tools/kvm/x86/bios/rom.ld.S                        |   16 +
+ tools/kvm/x86/boot.c                               |   41 +
+ tools/kvm/x86/cpuid.c                              |   60 +
+ tools/kvm/x86/include/kvm/assembly.h               |   24 +
+ tools/kvm/x86/include/kvm/barrier.h                |   20 +
+ tools/kvm/x86/include/kvm/bios-export.h            |   13 +
+ tools/kvm/x86/include/kvm/bios.h                   |   93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h          |   16 +
+ tools/kvm/x86/include/kvm/cpufeature.h             |   41 +
+ tools/kvm/x86/include/kvm/interrupt.h              |   26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h               |   43 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h           |   49 +
+ tools/kvm/x86/include/kvm/mptable.h                |    9 +
+ tools/kvm/x86/interrupt.c                          |   28 +
+ tools/kvm/x86/ioport.c                             |   77 +
+ tools/kvm/x86/irq.c                                |  224 +++
+ tools/kvm/x86/kvm-cpu.c                            |  425 ++++++
+ tools/kvm/x86/kvm.c                                |  362 +++++
+ tools/kvm/x86/mptable.c                            |  289 ++++
+ tools/lib/traceevent/Makefile                      |    2 +-
+ tools/perf/Documentation/Makefile                  |   31 +-
+ tools/perf/Documentation/android.txt               |   75 +
+ tools/perf/Documentation/perf-diff.txt             |   60 +
+ tools/perf/Documentation/perf-inject.txt           |   11 +
+ tools/perf/Documentation/perf-stat.txt             |    5 +
+ tools/perf/Documentation/perf-trace.txt            |    6 +
+ tools/perf/Makefile                                |  123 +-
+ tools/perf/arch/common.c                           |  178 +++
+ tools/perf/arch/common.h                           |   10 +
+ tools/perf/builtin-annotate.c                      |   15 +-
+ tools/perf/builtin-buildid-cache.c                 |    1 +
+ tools/perf/builtin-buildid-list.c                  |    6 +-
+ tools/perf/builtin-diff.c                          |  405 +++++-
+ tools/perf/builtin-evlist.c                        |    5 +-
+ tools/perf/builtin-inject.c                        |  195 ++-
+ tools/perf/builtin-kmem.c                          |    5 +-
+ tools/perf/builtin-kvm.c                           |   35 +-
+ tools/perf/builtin-lock.c                          |    2 -
+ tools/perf/builtin-record.c                        |   40 +-
+ tools/perf/builtin-report.c                        |   24 +-
+ tools/perf/builtin-sched.c                         |    8 +-
+ tools/perf/builtin-script.c                        |   87 +-
+ tools/perf/builtin-stat.c                          |   42 +-
+ tools/perf/builtin-test.c                          |   20 +-
+ tools/perf/builtin-timechart.c                     |    5 +-
+ tools/perf/builtin-top.c                           |    7 +-
+ tools/perf/builtin-trace.c                         |  403 +++++-
+ tools/perf/config/feature-tests.mak                |   25 +-
+ tools/perf/config/utilities.mak                    |   10 +-
+ tools/perf/perf.c                                  |    3 +
+ tools/perf/perf.h                                  |    1 +
+ tools/perf/ui/browsers/annotate.c                  |    6 +
+ tools/perf/ui/browsers/hists.c                     |   38 +
+ tools/perf/ui/browsers/scripts.c                   |  189 +++
+ tools/perf/ui/hist.c                               |  134 +-
+ tools/perf/ui/stdio/hist.c                         |    2 +-
+ tools/perf/util/annotate.c                         |    1 +
+ tools/perf/util/annotate.h                         |    1 -
+ tools/perf/util/build-id.c                         |   27 +-
+ tools/perf/util/build-id.h                         |   11 +-
+ tools/perf/util/dso.c                              |  594 ++++++++
+ tools/perf/util/dso.h                              |  148 ++
+ tools/perf/util/event.c                            |  228 +--
+ tools/perf/util/event.h                            |    9 +-
+ tools/perf/util/evlist.c                           |    3 -
+ tools/perf/util/header.c                           |   11 +
+ tools/perf/util/header.h                           |    1 +
+ tools/perf/util/hist.h                             |   15 +
+ tools/perf/util/machine.c                          |  277 ++++
+ tools/perf/util/machine.h                          |   19 +
+ tools/perf/util/map.c                              |    1 +
+ tools/perf/util/parse-events-test.c                |   68 +
+ tools/perf/util/parse-events.c                     |   30 +-
+ tools/perf/util/parse-events.h                     |    2 +
+ tools/perf/util/parse-events.y                     |   18 +
+ tools/perf/util/pmu.c                              |    7 +-
+ tools/perf/util/python.c                           |    2 +
+ tools/perf/util/rblist.c                           |    4 +-
+ .../util/scripting-engines/trace-event-python.c    |    1 -
+ tools/perf/util/session.c                          |    4 +-
+ tools/perf/util/sort.h                             |   18 +
+ tools/perf/util/string.c                           |   18 +
+ tools/perf/util/symbol.c                           |  657 +--------
+ tools/perf/util/symbol.h                           |  141 +-
+ tools/perf/util/thread.c                           |   41 +-
+ tools/perf/util/thread.h                           |    2 +
+ tools/perf/util/trace-event-read.c                 |    2 -
+ tools/perf/util/util.c                             |   35 +
+ tools/perf/util/util.h                             |    8 +
+ 375 files changed, 32716 insertions(+), 2013 deletions(-)
+ create mode 100644 Documentation/acpi/initrd_table_override.txt
+ create mode 100644 Documentation/scheduler/numa-problem.txt
+ create mode 100644 include/linux/earlycpio.h
+ create mode 100644 include/linux/page-flags-layout.h
+ create mode 100644 include/linux/vtime.h
+ create mode 100644 lib/earlycpio.c
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-config.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util-init.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100644 tools/kvm/util/init.c
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/mmio.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/virtio/scsi.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+ create mode 100644 tools/perf/Documentation/android.txt
+ create mode 100644 tools/perf/arch/common.c
+ create mode 100644 tools/perf/arch/common.h
+ create mode 100644 tools/perf/ui/browsers/scripts.c
+ create mode 100644 tools/perf/util/dso.c
+ create mode 100644 tools/perf/util/dso.h
+ create mode 100644 tools/perf/util/machine.c
+ create mode 100644 tools/perf/util/machine.h
+Merging rcu/rcu/next (870a511 rcu: Separate accounting of callbacks from callback-free CPUs)
+$ git merge rcu/rcu/next
+Auto-merging kernel/sched/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/RTFP.txt          |    2 +-
+ Documentation/RCU/checklist.txt     |   17 +-
+ Documentation/RCU/listRCU.txt       |    2 +-
+ Documentation/RCU/rcuref.txt        |   61 ++++-
+ Documentation/RCU/trace.txt         |  396 ++++++++++++++++++---------------
+ Documentation/RCU/whatisRCU.txt     |   17 +-
+ Documentation/kernel-parameters.txt |   21 ++
+ Documentation/memory-barriers.txt   |    9 +-
+ arch/um/drivers/mconsole_kern.c     |    2 +-
+ arch/x86/kernel/ptrace.c            |    7 +
+ include/linux/rculist.h             |   17 --
+ include/linux/rcupdate.h            |   27 +++
+ include/linux/sched.h               |   10 +-
+ include/linux/srcu.h                |   34 +++
+ include/trace/events/rcu.h          |    1 +
+ init/Kconfig                        |   41 +++-
+ kernel/ksysfs.c                     |   18 ++
+ kernel/rcu.h                        |    9 +
+ kernel/rcupdate.c                   |   54 +++++
+ kernel/rcutiny.c                    |    8 +-
+ kernel/rcutiny_plugin.h             |   61 ++++-
+ kernel/rcutorture.c                 |   54 ++---
+ kernel/rcutree.c                    |  327 ++++++++++++++++++---------
+ kernel/rcutree.h                    |   72 +++++-
+ kernel/rcutree_plugin.h             |  415 ++++++++++++++++++++++++++++++++++-
+ kernel/rcutree_trace.c              |  330 ++++++++++++++--------------
+ kernel/sched/core.c                 |    8 +-
+ kernel/srcu.c                       |   16 +-
+ lib/Kconfig.debug                   |    4 +-
+ 29 files changed, 1468 insertions(+), 572 deletions(-)
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (f026399 Merge branch 'for-queue' of https://github.com/agraf/linux-2.6 into queue)
+$ git merge kvm/linux-next
+Auto-merging include/linux/kvm_host.h
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt            |   85 +++-
+ MAINTAINERS                                  |    4 +-
+ arch/ia64/kvm/kvm-ia64.c                     |    2 -
+ arch/powerpc/include/asm/Kbuild              |    1 -
+ arch/powerpc/include/asm/epapr_hcalls.h      |   83 +---
+ arch/powerpc/include/asm/fsl_hcalls.h        |   36 +-
+ arch/powerpc/include/asm/kvm_asm.h           |    1 +
+ arch/powerpc/include/asm/kvm_book3s.h        |    2 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h     |    2 +-
+ arch/powerpc/include/asm/kvm_booke_hv_asm.h  |    4 +-
+ arch/powerpc/include/asm/kvm_host.h          |   55 ++-
+ arch/powerpc/include/asm/kvm_para.h          |   15 +-
+ arch/powerpc/include/asm/kvm_ppc.h           |   64 ++-
+ arch/powerpc/include/asm/reg_booke.h         |    7 +
+ arch/powerpc/include/asm/smp.h               |    8 +
+ arch/powerpc/include/uapi/asm/Kbuild         |    1 +
+ arch/powerpc/include/uapi/asm/epapr_hcalls.h |   98 ++++
+ arch/powerpc/include/uapi/asm/kvm.h          |   59 +++
+ arch/powerpc/include/uapi/asm/kvm_para.h     |    7 +-
+ arch/powerpc/kernel/epapr_hcalls.S           |   28 ++
+ arch/powerpc/kernel/epapr_paravirt.c         |   11 +-
+ arch/powerpc/kernel/kvm.c                    |    2 +-
+ arch/powerpc/kernel/ppc_ksyms.c              |    5 +
+ arch/powerpc/kernel/smp.c                    |   46 ++
+ arch/powerpc/kvm/44x.c                       |    1 +
+ arch/powerpc/kvm/44x_emulate.c               |  112 +++--
+ arch/powerpc/kvm/Kconfig                     |    3 +
+ arch/powerpc/kvm/book3s.c                    |  125 +++++
+ arch/powerpc/kvm/book3s_32_mmu_host.c        |    3 +-
+ arch/powerpc/kvm/book3s_64_mmu_host.c        |    3 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c          |   67 ++-
+ arch/powerpc/kvm/book3s_hv.c                 |  633 +++++++++++++++++++-------
+ arch/powerpc/kvm/book3s_hv_builtin.c         |    4 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c          |    6 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S      |   11 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c           |    5 -
+ arch/powerpc/kvm/book3s_pr.c                 |  180 ++++++--
+ arch/powerpc/kvm/book3s_rmhandlers.S         |   15 +-
+ arch/powerpc/kvm/booke.c                     |  310 +++++++++++--
+ arch/powerpc/kvm/booke_emulate.c             |   22 +-
+ arch/powerpc/kvm/e500.h                      |    3 +-
+ arch/powerpc/kvm/e500_tlb.c                  |   94 +++-
+ arch/powerpc/kvm/emulate.c                   |  221 +++++----
+ arch/powerpc/kvm/powerpc.c                   |  150 +++++-
+ arch/powerpc/kvm/trace.h                     |  200 ++++++--
+ arch/powerpc/platforms/Kconfig               |    1 +
+ arch/powerpc/sysdev/fsl_msi.c                |    9 +-
+ arch/powerpc/sysdev/fsl_soc.c                |    2 +
+ arch/s390/kvm/interrupt.c                    |   19 +-
+ arch/s390/kvm/kvm-s390.c                     |    2 +-
+ arch/x86/kvm/mmu.c                           |   49 +-
+ arch/x86/kvm/paging_tmpl.h                   |  115 ++---
+ arch/x86/kvm/svm.c                           |    7 +-
+ arch/x86/kvm/vmx.c                           |   45 +-
+ arch/x86/kvm/x86.c                           |   16 +-
+ drivers/tty/Kconfig                          |    1 +
+ drivers/virt/Kconfig                         |    1 +
+ include/linux/kvm_host.h                     |   36 +-
+ include/uapi/linux/kvm.h                     |   18 +-
+ virt/kvm/iommu.c                             |   10 +-
+ virt/kvm/kvm_main.c                          |    6 +-
+ 61 files changed, 2347 insertions(+), 784 deletions(-)
+ create mode 100644 arch/powerpc/include/uapi/asm/epapr_hcalls.h
+Merging kvm-ppc/kvm-ppc-next (f534a53 KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte())
+$ git merge kvm-ppc/kvm-ppc-next
+Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/powerpc/include/uapi/asm/Kbuild' using previous resolution.
+Resolved 'arch/powerpc/include/uapi/asm/epapr_hcalls.h' using previous resolution.
+Auto-merging arch/powerpc/include/uapi/asm/epapr_hcalls.h
+CONFLICT (add/add): Merge conflict in arch/powerpc/include/uapi/asm/epapr_hcalls.h
+Auto-merging arch/powerpc/include/uapi/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/powerpc/include/uapi/asm/Kbuild
+Auto-merging arch/powerpc/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 04709ec] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
+$ git diff -M --stat --summary HEAD^..
+Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next (eb827a7 Merge commit 'v3.7-rc4' into linux-next)
+$ git merge xen-two/linux-next
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/xen/interface.h |    1 +
+ arch/arm/xen/enlighten.c             |  125 +++++++++++++++++++++----
+ arch/x86/include/asm/xen/hypercall.h |   21 ++---
+ arch/x86/include/asm/xen/interface.h |   12 ++-
+ arch/x86/include/asm/xen/page.h      |    3 +
+ arch/x86/xen/Kconfig                 |   11 +++
+ arch/x86/xen/enlighten.c             |   76 +++++++++++----
+ arch/x86/xen/irq.c                   |    5 +-
+ arch/x86/xen/mmu.c                   |  170 ++++++++++++++++++++++++++++++++--
+ arch/x86/xen/mmu.h                   |    2 +
+ arch/x86/xen/p2m.c                   |    2 +-
+ arch/x86/xen/setup.c                 |   64 ++++++++++---
+ arch/x86/xen/smp.c                   |   75 +++++++++------
+ arch/x86/xen/xen-head.S              |   11 ++-
+ drivers/net/xen-netback/netback.c    |   11 ++-
+ drivers/xen/Kconfig                  |    3 +
+ drivers/xen/Makefile                 |    5 +-
+ drivers/xen/balloon.c                |   19 ++--
+ drivers/xen/cpu_hotplug.c            |    4 +-
+ drivers/xen/events.c                 |   11 ++-
+ drivers/xen/fallback.c               |   80 ++++++++++++++++
+ drivers/xen/gntdev.c                 |    3 +-
+ drivers/xen/grant-table.c            |   78 +++++-----------
+ drivers/xen/privcmd.c                |   72 +++++++++++++-
+ drivers/xen/xenbus/xenbus_client.c   |    9 +-
+ include/xen/grant_table.h            |   12 ---
+ include/xen/hvm.h                    |   34 ++++++-
+ include/xen/interface/memory.h       |   44 ++++++++-
+ include/xen/interface/physdev.h      |   10 ++
+ include/xen/xen-ops.h                |    8 +-
+ 30 files changed, 785 insertions(+), 196 deletions(-)
+ create mode 100644 drivers/xen/fallback.c
+Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next (b4916cb percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree())
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ mm/percpu.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging workqueues/for-next (b401057 Merge branch 'for-3.8' into for-next)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
+$ git merge drivers-x86/linux-next
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/asus-wmi.c |   76 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 76 insertions(+)
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (516edb8 Merge remote-tracking branches 'regmap/topic/core', 'regmap/topic/domain', 'regmap/topic/lock', 'regmap/topic/range' and 'regmap/topic/type' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h   |    4 +--
+ drivers/base/regmap/regmap-irq.c |   19 ++++++++++
+ drivers/base/regmap/regmap.c     |   71 ++++++++++++++++++++++----------------
+ include/linux/regmap.h           |   18 +++++++++-
+ 4 files changed, 78 insertions(+), 34 deletions(-)
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (c84f14d leds: lm3642: Fix up world writable sysfs files)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/leds-88pm860x.c     |    9 ++-------
+ drivers/leds/leds-bd2802.c       |    4 ++--
+ drivers/leds/leds-cobalt-qube.c  |   11 ++++-------
+ drivers/leds/leds-cobalt-raq.c   |   11 ++++-------
+ drivers/leds/leds-fsg.c          |   15 +++++----------
+ drivers/leds/leds-gpio.c         |   29 ++++++++++++++++-------------
+ drivers/leds/leds-lm355x.c       |    4 ++--
+ drivers/leds/leds-lm3642.c       |   12 ++++++------
+ drivers/leds/leds-lp5523.c       |   20 +++++++++++++++++---
+ drivers/leds/leds-lt3593.c       |    9 +++------
+ drivers/leds/leds-netxbig.c      |    2 +-
+ drivers/leds/leds-ns2.c          |   23 ++++++++---------------
+ drivers/leds/leds-renesas-tpu.c  |   25 ++++++++++---------------
+ drivers/leds/leds-ss4200.c       |    2 +-
+ drivers/leds/ledtrig-backlight.c |    2 +-
+ drivers/leds/ledtrig-gpio.c      |    2 +-
+ 16 files changed, 83 insertions(+), 97 deletions(-)
+Merging driver-core/driver-core-next (bb3215e Documentation: Fixes a term's translation in Documentation/zh_CN/arm64/memory.txt)
+$ git merge driver-core/driver-core-next
+Auto-merging drivers/base/platform.c
+Merge made by the 'recursive' strategy.
+ Documentation/zh_CN/arm64/memory.txt |    2 +-
+ drivers/base/Kconfig                 |    7 +++----
+ drivers/base/attribute_container.c   |    2 +-
+ drivers/base/devres.c                |    4 ++--
+ drivers/base/platform.c              |    2 +-
+ 5 files changed, 8 insertions(+), 9 deletions(-)
+Merging tty/tty-next (76cc438 tty: of_serial: fix return value check in of_platform_serial_setup())
+$ git merge tty/tty-next
+Resolved 'drivers/tty/serial/omap-serial.c' using previous resolution.
+Auto-merging drivers/tty/serial/serial_core.c
+Auto-merging drivers/tty/serial/omap-serial.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
+Auto-merging arch/x86/platform/ce4100/ce4100.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 887d63f] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-tty                |  112 +++
+ .../devicetree/bindings/tty/serial/of-serial.txt   |    5 +-
+ arch/alpha/include/asm/ioctls.h                    |    3 +
+ arch/arm/plat-omap/include/plat/serial.h           |    9 -
+ arch/mips/include/uapi/asm/ioctls.h                |    3 +
+ arch/parisc/include/uapi/asm/ioctls.h              |    3 +
+ arch/powerpc/include/uapi/asm/ioctls.h             |    3 +
+ arch/sh/include/uapi/asm/ioctls.h                  |    3 +
+ arch/sparc/include/uapi/asm/ioctls.h               |    3 +
+ arch/um/drivers/chan_kern.c                        |   17 +-
+ arch/x86/platform/ce4100/ce4100.c                  |    3 +
+ arch/xtensa/include/uapi/asm/ioctls.h              |    3 +
+ drivers/bluetooth/hci_ldisc.c                      |    7 +-
+ drivers/staging/dgrp/dgrp_common.h                 |    1 -
+ drivers/staging/dgrp/dgrp_driver.c                 |    4 -
+ drivers/staging/dgrp/dgrp_net_ops.c                |   67 +-
+ drivers/staging/dgrp/dgrp_specproc.c               |    2 -
+ drivers/staging/dgrp/dgrp_sysfs.c                  |   18 -
+ drivers/tty/hvc/hvcs.c                             |    4 +-
+ drivers/tty/n_tty.c                                |  752 +++++++++++---------
+ drivers/tty/pty.c                                  |   77 +-
+ drivers/tty/serial/8250/8250.c                     |    9 +-
+ drivers/tty/serial/8250/8250.h                     |   36 +
+ drivers/tty/serial/8250/8250_dw.c                  |   25 +
+ drivers/tty/serial/8250/8250_early.c               |    2 +-
+ drivers/tty/serial/8250/8250_pci.c                 |   19 +-
+ drivers/tty/serial/Kconfig                         |   23 +
+ drivers/tty/serial/Makefile                        |    1 +
+ drivers/tty/serial/amba-pl011.c                    |   25 +-
+ drivers/tty/serial/arc_uart.c                      |  746 +++++++++++++++++++
+ drivers/tty/serial/clps711x.c                      |  595 +++++++---------
+ drivers/tty/serial/ifx6x60.c                       |   87 ++-
+ drivers/tty/serial/ifx6x60.h                       |    2 +
+ drivers/tty/serial/jsm/jsm.h                       |    8 +-
+ drivers/tty/serial/jsm/jsm_driver.c                |    3 +-
+ drivers/tty/serial/jsm/jsm_neo.c                   |  116 +--
+ drivers/tty/serial/jsm/jsm_tty.c                   |  102 +--
+ drivers/tty/serial/of_serial.c                     |   32 +-
+ drivers/tty/serial/omap-serial.c                   |   14 +-
+ drivers/tty/serial/pxa.c                           |   55 ++
+ drivers/tty/serial/samsung.c                       |   16 +-
+ drivers/tty/serial/serial_core.c                   |  176 ++++-
+ drivers/tty/serial/vt8500_serial.c                 |    8 +-
+ drivers/tty/tty_audit.c                            |   15 +-
+ drivers/tty/tty_buffer.c                           |  228 +++---
+ drivers/tty/tty_io.c                               |   20 +-
+ drivers/tty/tty_ioctl.c                            |   21 -
+ drivers/tty/tty_ldisc.c                            |   47 +-
+ drivers/tty/tty_mutex.c                            |    4 +-
+ drivers/tty/tty_port.c                             |    2 +
+ drivers/tty/vt/selection.c                         |    9 +-
+ fs/compat_ioctl.c                                  |    3 +
+ fs/devpts/inode.c                                  |   61 +-
+ include/linux/devpts_fs.h                          |   20 +-
+ include/linux/tty.h                                |   44 +-
+ include/linux/tty_flip.h                           |    2 +-
+ include/uapi/asm-generic/ioctls.h                  |    3 +
+ include/uapi/linux/serial_core.h                   |    2 +
+ kernel/auditsc.c                                   |    2 +-
+ kernel/printk.c                                    |   12 +-
+ 60 files changed, 2462 insertions(+), 1232 deletions(-)
+ create mode 100644 drivers/tty/serial/arc_uart.c
+Merging usb/usb-next (cdb2fac USB: EHCI: fix build error in ChipIdea host driver)
+$ git merge usb/usb-next
+Resolved 'drivers/usb/early/ehci-dbgp.c' using previous resolution.
+Auto-merging drivers/usb/serial/usb_wwan.c
+Removing drivers/usb/host/ohci-xls.c
+Removing drivers/usb/host/ohci-sh.c
+Removing drivers/usb/host/ohci-ppc-soc.c
+Removing drivers/usb/host/ohci-pnx8550.c
+Removing drivers/usb/host/ohci-cns3xxx.c
+Removing drivers/usb/host/ohci-au1xxx.c
+Removing drivers/usb/host/ehci-xls.c
+Removing drivers/usb/host/ehci-ls1x.c
+Removing drivers/usb/host/ehci-lpm.c
+Removing drivers/usb/host/ehci-ixp4xx.c
+Removing drivers/usb/host/ehci-cns3xxx.c
+Removing drivers/usb/host/ehci-au1xxx.c
+Auto-merging drivers/usb/early/ehci-dbgp.c
+CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4005ff8] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/usb/error-codes.txt                  |    5 +-
+ arch/arm/mach-cns3xxx/cns3420vb.c                  |   53 ++++-
+ arch/mips/alchemy/common/Makefile                  |    2 +-
+ arch/mips/alchemy/common/platform.c                |   58 ++++-
+ .../mips/alchemy/common/usb.c                      |    0
+ arch/mips/ath79/dev-usb.c                          |    2 -
+ arch/mips/configs/db1000_defconfig                 |    1 +
+ arch/mips/configs/db1235_defconfig                 |    2 +
+ arch/mips/configs/gpr_defconfig                    |    1 +
+ arch/mips/configs/ls1b_defconfig                   |    1 +
+ arch/mips/configs/mtx1_defconfig                   |    1 +
+ arch/mips/loongson1/common/platform.c              |    7 +-
+ arch/mips/netlogic/xlr/platform.c                  |   17 +-
+ arch/mips/pnx8550/common/platform.c                |   31 ++-
+ arch/sh/kernel/cpu/sh3/setup-sh7720.c              |    6 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c             |    6 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7763.c             |    6 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c             |    6 +-
+ drivers/usb/chipidea/Kconfig                       |    1 +
+ drivers/usb/chipidea/host.c                        |   68 +-----
+ drivers/usb/core/devices.c                         |   18 +-
+ drivers/usb/core/hcd.c                             |   19 +-
+ drivers/usb/core/hub.c                             |   81 ++++++-
+ drivers/usb/core/urb.c                             |   22 +-
+ drivers/usb/core/usb.c                             |    4 +-
+ drivers/usb/early/ehci-dbgp.c                      |    4 +-
+ drivers/usb/host/Kconfig                           |   35 +--
+ drivers/usb/host/Makefile                          |    4 +-
+ drivers/usb/host/ehci-atmel.c                      |    9 +-
+ drivers/usb/host/ehci-au1xxx.c                     |  184 ---------------
+ drivers/usb/host/ehci-cns3xxx.c                    |  155 -------------
+ drivers/usb/host/ehci-dbg.c                        |  112 ---------
+ drivers/usb/host/ehci-fsl.c                        |    1 -
+ drivers/usb/host/ehci-grlib.c                      |   18 +-
+ drivers/usb/host/ehci-hcd.c                        |  203 ++++++++--------
+ drivers/usb/host/ehci-hub.c                        |   47 ++--
+ drivers/usb/host/ehci-ixp4xx.c                     |  139 -----------
+ drivers/usb/host/ehci-lpm.c                        |   84 -------
+ drivers/usb/host/ehci-ls1x.c                       |  147 ------------
+ drivers/usb/host/ehci-msm.c                        |    1 -
+ drivers/usb/host/ehci-mxc.c                        |    8 +-
+ drivers/usb/host/ehci-octeon.c                     |    3 -
+ drivers/usb/host/ehci-omap.c                       |    3 -
+ drivers/usb/host/ehci-orion.c                      |   16 +-
+ drivers/usb/host/ehci-pci.c                        |  130 ++++-------
+ drivers/usb/host/ehci-platform.c                   |   97 ++++----
+ drivers/usb/host/ehci-pmcmsp.c                     |    1 -
+ drivers/usb/host/ehci-s5p.c                        |   10 +-
+ drivers/usb/host/ehci-sched.c                      |  132 +++++------
+ drivers/usb/host/ehci-sh.c                         |    9 +-
+ drivers/usb/host/ehci-spear.c                      |    9 +-
+ drivers/usb/host/ehci-tegra.c                      |   13 +-
+ drivers/usb/host/ehci-vt8500.c                     |   21 --
+ drivers/usb/host/ehci-w90x900.c                    |    2 +-
+ drivers/usb/host/ehci-xls.c                        |  142 ------------
+ drivers/usb/host/ehci.h                            |   46 ++--
+ drivers/usb/host/isp1760-if.c                      |    7 +-
+ drivers/usb/host/ohci-at91.c                       |    2 +-
+ drivers/usb/host/ohci-au1xxx.c                     |  234 -------------------
+ drivers/usb/host/ohci-cns3xxx.c                    |  166 -------------
+ drivers/usb/host/ohci-ep93xx.c                     |    2 +-
+ drivers/usb/host/ohci-exynos.c                     |   32 ++-
+ drivers/usb/host/ohci-hcd.c                        |  139 ++++++++---
+ drivers/usb/host/ohci-hub.c                        |   42 ----
+ drivers/usb/host/ohci-omap.c                       |    2 +-
+ drivers/usb/host/ohci-pci.c                        |   47 +---
+ drivers/usb/host/ohci-platform.c                   |   28 +--
+ drivers/usb/host/ohci-pnx8550.c                    |  243 --------------------
+ drivers/usb/host/ohci-ppc-soc.c                    |  216 -----------------
+ drivers/usb/host/ohci-pxa27x.c                     |    2 +-
+ drivers/usb/host/ohci-q.c                          |    4 +-
+ drivers/usb/host/ohci-s3c2410.c                    |   35 +--
+ drivers/usb/host/ohci-sh.c                         |  141 ------------
+ drivers/usb/host/ohci-sm501.c                      |    2 +-
+ drivers/usb/host/ohci-spear.c                      |    2 +-
+ drivers/usb/host/ohci-tmio.c                       |    2 +-
+ drivers/usb/host/ohci-xls.c                        |  152 ------------
+ drivers/usb/host/r8a66597-hcd.c                    |    6 +-
+ drivers/usb/host/uhci-q.c                          |   73 +++---
+ drivers/usb/misc/ezusb.c                           |   38 +--
+ drivers/usb/phy/tegra_usb_phy.c                    |    4 +-
+ drivers/usb/serial/aircable.c                      |    5 -
+ drivers/usb/serial/ark3116.c                       |    5 -
+ drivers/usb/serial/belkin_sa.c                     |    5 -
+ drivers/usb/serial/cp210x.c                        |   36 ++-
+ drivers/usb/serial/cyberjack.c                     |    5 -
+ drivers/usb/serial/cypress_m8.c                    |    5 -
+ drivers/usb/serial/digi_acceleport.c               |    4 -
+ drivers/usb/serial/empeg.c                         |    4 -
+ drivers/usb/serial/ftdi_sio.c                      |   79 ++++++-
+ drivers/usb/serial/generic.c                       |    1 +
+ drivers/usb/serial/hp4x.c                          |    5 -
+ drivers/usb/serial/io_edgeport.c                   |    4 -
+ drivers/usb/serial/io_ti.c                         |    4 -
+ drivers/usb/serial/ipaq.c                          |    5 -
+ drivers/usb/serial/ipw.c                           |    4 -
+ drivers/usb/serial/iuu_phoenix.c                   |    8 +-
+ drivers/usb/serial/keyspan.c                       |    4 -
+ drivers/usb/serial/keyspan_pda.c                   |    4 -
+ drivers/usb/serial/kl5kusb105.c                    |    4 -
+ drivers/usb/serial/kobil_sct.c                     |    2 -
+ drivers/usb/serial/mct_u232.c                      |    4 -
+ drivers/usb/serial/metro-usb.c                     |    2 -
+ drivers/usb/serial/mos7720.c                       |    4 -
+ drivers/usb/serial/mos7840.c                       |    4 -
+ drivers/usb/serial/omninet.c                       |    4 -
+ drivers/usb/serial/option.c                        |   88 +++----
+ drivers/usb/serial/oti6858.c                       |    2 -
+ drivers/usb/serial/quatech2.c                      |    2 -
+ drivers/usb/serial/siemens_mpi.c                   |    2 -
+ drivers/usb/serial/sierra.c                        |    3 +-
+ drivers/usb/serial/spcp8x5.c                       |    4 -
+ drivers/usb/serial/ssu100.c                        |    2 -
+ drivers/usb/serial/usb_wwan.c                      |    2 -
+ drivers/usb/serial/vivopay-serial.c                |    3 -
+ drivers/usb/storage/realtek_cr.c                   |    2 +-
+ drivers/usb/usb-skeleton.c                         |   13 +-
+ drivers/usb/wusbcore/devconnect.c                  |   13 --
+ drivers/uwb/umc-bus.c                              |    2 +-
+ include/linux/usb.h                                |   50 ++--
+ include/linux/usb/ehci_pdriver.h                   |    5 +-
+ include/linux/usb/ezusb.h                          |    8 -
+ include/linux/usb/ohci_pdriver.h                   |    2 +
+ 123 files changed, 1062 insertions(+), 3176 deletions(-)
+ rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%)
+ delete mode 100644 drivers/usb/host/ehci-au1xxx.c
+ delete mode 100644 drivers/usb/host/ehci-cns3xxx.c
+ delete mode 100644 drivers/usb/host/ehci-ixp4xx.c
+ delete mode 100644 drivers/usb/host/ehci-lpm.c
+ delete mode 100644 drivers/usb/host/ehci-ls1x.c
+ delete mode 100644 drivers/usb/host/ehci-xls.c
+ delete mode 100644 drivers/usb/host/ohci-au1xxx.c
+ delete mode 100644 drivers/usb/host/ohci-cns3xxx.c
+ delete mode 100644 drivers/usb/host/ohci-pnx8550.c
+ delete mode 100644 drivers/usb/host/ohci-ppc-soc.c
+ delete mode 100644 drivers/usb/host/ohci-sh.c
+ delete mode 100644 drivers/usb/host/ohci-xls.c
+Merging staging/staging-next (fb7d2eb staging: csr: csr_wifi_hip_unifi_signal_names: Fix pointer position)
+$ git merge staging/staging-next
+Removing drivers/staging/telephony/phonedev.c
+Removing drivers/staging/telephony/ixj_pcmcia.c
+Removing drivers/staging/telephony/ixj.h
+Removing drivers/staging/telephony/ixj.c
+Removing drivers/staging/telephony/ixj-ver.h
+Removing drivers/staging/telephony/TODO
+Removing drivers/staging/telephony/Makefile
+CONFLICT (modify/delete): drivers/staging/telephony/Kconfig deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/telephony/Kconfig left in tree.
+Removing drivers/staging/rts_pstor/xd.h
+Removing drivers/staging/rts_pstor/xd.c
+Removing drivers/staging/rts_pstor/trace.h
+Removing drivers/staging/rts_pstor/spi.h
+Removing drivers/staging/rts_pstor/spi.c
+Removing drivers/staging/rts_pstor/sd.h
+Removing drivers/staging/rts_pstor/sd.c
+Removing drivers/staging/rts_pstor/rtsx_transport.h
+Removing drivers/staging/rts_pstor/rtsx_transport.c
+Removing drivers/staging/rts_pstor/rtsx_sys.h
+Removing drivers/staging/rts_pstor/rtsx_scsi.h
+Removing drivers/staging/rts_pstor/rtsx_scsi.c
+Removing drivers/staging/rts_pstor/rtsx_chip.h
+Removing drivers/staging/rts_pstor/rtsx_chip.c
+Removing drivers/staging/rts_pstor/rtsx_card.h
+Removing drivers/staging/rts_pstor/rtsx_card.c
+Removing drivers/staging/rts_pstor/rtsx.h
+Removing drivers/staging/rts_pstor/rtsx.c
+Removing drivers/staging/rts_pstor/ms.h
+Removing drivers/staging/rts_pstor/ms.c
+Removing drivers/staging/rts_pstor/general.h
+Removing drivers/staging/rts_pstor/general.c
+Removing drivers/staging/rts_pstor/debug.h
+Removing drivers/staging/rts_pstor/TODO
+Removing drivers/staging/rts_pstor/Makefile
+Removing drivers/staging/rts_pstor/Kconfig
+Auto-merging drivers/staging/ipack/carriers/tpci200.h
+Auto-merging drivers/staging/ipack/carriers/tpci200.c
+Removing drivers/staging/ipack/bridges/Kconfig
+Removing drivers/staging/iio/adc/adt7310.c
+Auto-merging drivers/staging/dgrp/dgrp_sysfs.c
+Auto-merging drivers/staging/dgrp/dgrp_net_ops.c
+Removing drivers/staging/csr/csr_panic.h
+Removing drivers/staging/csr/csr_panic.c
+Removing drivers/staging/csr/csr_lib.h
+Removing drivers/staging/comedi/drivers/mpc8260cpm.c
+Removing drivers/staging/comedi/drivers/addi_apci_3001.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
+Removing drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
+Removing drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
+Removing drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
+Removing Documentation/telephony/ixj.txt
+Removing Documentation/telephony/00-INDEX
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/telephony/Kconfig
+drivers/staging/telephony/Kconfig: needs merge
+rm 'drivers/staging/telephony/Kconfig'
+$ git commit -v -a
+[master fa47390] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/telephony/00-INDEX                   |    4 -
+ Documentation/telephony/ixj.txt                    |  394 -
+ arch/arm/mach-omap2/drm.c                          |    7 +
+ drivers/iio/accel/Kconfig                          |    2 +-
+ drivers/iio/adc/at91_adc.c                         |    5 +-
+ drivers/iio/dac/Kconfig                            |   12 +-
+ drivers/iio/dac/Makefile                           |    1 +
+ drivers/iio/dac/ad5449.c                           |  376 +
+ drivers/iio/dac/ad5686.c                           |    2 +-
+ drivers/iio/industrialio-buffer.c                  |    6 +-
+ drivers/iio/industrialio-core.c                    |   11 +-
+ drivers/iio/industrialio-event.c                   |    4 +-
+ drivers/iio/inkern.c                               |    5 +-
+ drivers/staging/Kconfig                            |    4 -
+ drivers/staging/Makefile                           |    2 -
+ drivers/staging/android/Makefile                   |    2 +
+ drivers/staging/android/binder.c                   |  471 +-
+ drivers/staging/android/binder_trace.h             |  327 +
+ drivers/staging/bcm/Bcmchar.c                      |    6 +-
+ drivers/staging/bcm/Bcmnet.c                       |    6 +-
+ drivers/staging/bcm/CmHost.c                       |   88 +-
+ drivers/staging/bcm/CmHost.h                       |  189 +-
+ drivers/staging/bcm/InterfaceAdapter.h             |  142 +-
+ drivers/staging/bcm/InterfaceDld.c                 |    4 +-
+ drivers/staging/bcm/InterfaceIdleMode.c            |    2 +-
+ drivers/staging/bcm/InterfaceIdleMode.h            |    5 +-
+ drivers/staging/bcm/InterfaceInit.c                |   22 +-
+ drivers/staging/bcm/InterfaceInit.h                |    2 +-
+ drivers/staging/bcm/InterfaceIsr.c                 |    6 +-
+ drivers/staging/bcm/InterfaceIsr.h                 |    4 +-
+ drivers/staging/bcm/InterfaceMisc.c                |  124 +-
+ drivers/staging/bcm/InterfaceMisc.h                |    6 +-
+ drivers/staging/bcm/InterfaceRx.c                  |   16 +-
+ drivers/staging/bcm/InterfaceRx.h                  |    2 +-
+ drivers/staging/bcm/InterfaceTx.c                  |   14 +-
+ drivers/staging/bcm/LeakyBucket.c                  |    6 +-
+ drivers/staging/bcm/Misc.c                         |  234 +-
+ drivers/staging/bcm/Prototypes.h                   |    8 +-
+ drivers/staging/bcm/Transmit.c                     |    2 +-
+ drivers/staging/bcm/cntrl_SignalingInterface.h     |  256 +-
+ drivers/staging/ccg/ccg.c                          |    8 +-
+ drivers/staging/ced1401/ced_ioc.c                  |   33 +-
+ drivers/staging/ced1401/usb1401.c                  |   30 +-
+ drivers/staging/comedi/Kconfig                     |   20 +-
+ drivers/staging/comedi/comedi.h                    |   27 +-
+ drivers/staging/comedi/comedidev.h                 |   40 +-
+ drivers/staging/comedi/drivers.c                   |   67 +-
+ drivers/staging/comedi/drivers/8255_pci.c          |   20 +-
+ drivers/staging/comedi/drivers/Makefile            |    1 -
+ .../comedi/drivers/addi-data/APCI1710_82x54.c      |  205 +-
+ .../comedi/drivers/addi-data/APCI1710_82x54.h      |   73 -
+ .../comedi/drivers/addi-data/APCI1710_Chrono.c     |  245 +-
+ .../comedi/drivers/addi-data/APCI1710_Chrono.h     |   74 -
+ .../comedi/drivers/addi-data/APCI1710_Dig_io.c     |   44 +-
+ .../comedi/drivers/addi-data/APCI1710_Dig_io.h     |   46 -
+ .../comedi/drivers/addi-data/APCI1710_INCCPT.c     |  886 +-
+ .../comedi/drivers/addi-data/APCI1710_INCCPT.h     |  271 -
+ .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c    |   39 +-
+ .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h    |   47 -
+ .../comedi/drivers/addi-data/APCI1710_Pwm.c        |  278 +-
+ .../comedi/drivers/addi-data/APCI1710_Pwm.h        |   76 -
+ .../comedi/drivers/addi-data/APCI1710_Ssi.c        |   41 +-
+ .../comedi/drivers/addi-data/APCI1710_Ssi.h        |   43 -
+ .../comedi/drivers/addi-data/APCI1710_Tor.c        |   50 +-
+ .../comedi/drivers/addi-data/APCI1710_Tor.h        |   57 -
+ .../comedi/drivers/addi-data/APCI1710_Ttl.c        |   38 +-
+ .../comedi/drivers/addi-data/APCI1710_Ttl.h        |   44 -
+ .../comedi/drivers/addi-data/addi_amcc_s5933.h     |  469 -
+ .../staging/comedi/drivers/addi-data/addi_common.c | 2033 +---
+ .../staging/comedi/drivers/addi-data/addi_common.h |   32 -
+ .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1367 +--
+ .../comedi/drivers/addi-data/hwdrv_APCI1710.c      |   69 +-
+ .../comedi/drivers/addi-data/hwdrv_APCI1710.h      |   71 -
+ .../comedi/drivers/addi-data/hwdrv_apci035.c       |  116 +-
+ .../comedi/drivers/addi-data/hwdrv_apci035.h       |  109 -
+ .../comedi/drivers/addi-data/hwdrv_apci1032.c      |  287 -
+ .../comedi/drivers/addi-data/hwdrv_apci1032.h      |   64 -
+ .../comedi/drivers/addi-data/hwdrv_apci1500.c      |  119 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1500.h      |  165 -
+ .../comedi/drivers/addi-data/hwdrv_apci1516.c      |   91 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1516.h      |   65 -
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  142 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.h      |  121 -
+ .../comedi/drivers/addi-data/hwdrv_apci16xx.c      |   57 +-
+ .../comedi/drivers/addi-data/hwdrv_apci16xx.h      |   79 -
+ .../comedi/drivers/addi-data/hwdrv_apci2016.c      |   72 +-
+ .../comedi/drivers/addi-data/hwdrv_apci2016.h      |   72 -
+ .../comedi/drivers/addi-data/hwdrv_apci2032.c      |   97 +-
+ .../comedi/drivers/addi-data/hwdrv_apci2032.h      |   83 -
+ .../comedi/drivers/addi-data/hwdrv_apci2200.c      |   91 +-
+ .../comedi/drivers/addi-data/hwdrv_apci2200.h      |   61 -
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c      | 1641 ++-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.h      |  249 -
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c      | 3273 +++---
+ .../comedi/drivers/addi-data/hwdrv_apci3200.h      |  191 -
+ .../comedi/drivers/addi-data/hwdrv_apci3501.c      |  119 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3501.h      |   98 -
+ .../comedi/drivers/addi-data/hwdrv_apci3xxx.c      |   48 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3xxx.h      |   48 -
+ drivers/staging/comedi/drivers/addi_apci_035.c     |   72 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c    |  356 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c    |   72 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c    |   68 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c    |   71 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c    |   72 +-
+ drivers/staging/comedi/drivers/addi_apci_1710.c    |  152 +-
+ drivers/staging/comedi/drivers/addi_apci_2016.c    |   65 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c    |   67 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c    |   67 +-
+ drivers/staging/comedi/drivers/addi_apci_3001.c    |    9 -
+ drivers/staging/comedi/drivers/addi_apci_3120.c    |  277 +-
+ drivers/staging/comedi/drivers/addi_apci_3200.c    |   91 +-
+ drivers/staging/comedi/drivers/addi_apci_3300.c    |   90 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c    |   72 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c    |  836 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c       |   17 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c       |    9 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c       |   21 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c       |   16 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c       |  416 +-
+ drivers/staging/comedi/drivers/adq12b.c            |   46 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c       |   19 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c       |   18 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c       |   19 +-
+ drivers/staging/comedi/drivers/aio_aio12_8.c       |    8 +-
+ drivers/staging/comedi/drivers/aio_iiro_16.c       |   19 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c      | 1428 ++-
+ drivers/staging/comedi/drivers/amplc_pc236.c       |   39 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c       |   17 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c      |   32 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c      |   31 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c       |    5 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c         |   20 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c       | 3011 +++---
+ drivers/staging/comedi/drivers/cb_pcidda.c         |  675 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c        |  115 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c        |   19 +-
+ drivers/staging/comedi/drivers/comedi_bond.c       |    8 +-
+ drivers/staging/comedi/drivers/comedi_parport.c    |    8 +-
+ drivers/staging/comedi/drivers/comedi_test.c       |    8 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c    |    9 +-
+ drivers/staging/comedi/drivers/daqboard2000.c      |   17 +-
+ drivers/staging/comedi/drivers/das08.c             |   31 +-
+ drivers/staging/comedi/drivers/das08_cs.c          |    9 +-
+ drivers/staging/comedi/drivers/das16.c             |   23 +-
+ drivers/staging/comedi/drivers/das16m1.c           |   49 +-
+ drivers/staging/comedi/drivers/das1800.c           |   28 +-
+ drivers/staging/comedi/drivers/das6402.c           |   16 +-
+ drivers/staging/comedi/drivers/das800.c            |   35 +-
+ drivers/staging/comedi/drivers/dmm32at.c           |   27 +-
+ drivers/staging/comedi/drivers/dt2801.c            |   14 +-
+ drivers/staging/comedi/drivers/dt2811.c            |   13 +-
+ drivers/staging/comedi/drivers/dt2814.c            |   12 +-
+ drivers/staging/comedi/drivers/dt2815.c            |    9 +-
+ drivers/staging/comedi/drivers/dt282x.c            |   33 +-
+ drivers/staging/comedi/drivers/dt3000.c            |  561 +-
+ drivers/staging/comedi/drivers/dt9812.c            |   27 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c      |   21 +-
+ drivers/staging/comedi/drivers/fl512.c             |   10 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c          |  490 +-
+ drivers/staging/comedi/drivers/icp_multi.c         |   16 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c        |   51 +-
+ drivers/staging/comedi/drivers/jr3_pci.c           |  641 +-
+ drivers/staging/comedi/drivers/jr3_pci.h           |   12 +-
+ drivers/staging/comedi/drivers/ke_counter.c        |   54 +-
+ drivers/staging/comedi/drivers/me4000.c            |   19 +-
+ drivers/staging/comedi/drivers/me_daq.c            |  633 +-
+ drivers/staging/comedi/drivers/mpc624.c            |   10 +-
+ drivers/staging/comedi/drivers/mpc8260cpm.c        |  164 -
+ drivers/staging/comedi/drivers/multiq3.c           |   11 +-
+ drivers/staging/comedi/drivers/ni_6527.c           |   30 +-
+ drivers/staging/comedi/drivers/ni_65xx.c           |  129 +-
+ drivers/staging/comedi/drivers/ni_660x.c           |  586 +-
+ drivers/staging/comedi/drivers/ni_670x.c           |   16 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c       |   20 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c          |   13 +-
+ drivers/staging/comedi/drivers/ni_atmio.c          |   11 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c       |   15 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c      |   14 +-
+ drivers/staging/comedi/drivers/ni_labpc.c          |   54 +-
+ drivers/staging/comedi/drivers/ni_labpc_cs.c       |    6 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c     |  150 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c         |   29 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c         |   43 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c         |   56 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c         |   20 +-
+ drivers/staging/comedi/drivers/pcl711.c            |   15 +-
+ drivers/staging/comedi/drivers/pcl726.c            |   10 +-
+ drivers/staging/comedi/drivers/pcl812.c            |   27 +-
+ drivers/staging/comedi/drivers/pcl816.c            |   21 +-
+ drivers/staging/comedi/drivers/pcl818.c            |   32 +-
+ drivers/staging/comedi/drivers/pcm3724.c           |   44 +-
+ drivers/staging/comedi/drivers/pcmad.c             |   10 +-
+ drivers/staging/comedi/drivers/pcmda12.c           |   34 +-
+ drivers/staging/comedi/drivers/pcmmio.c            |  124 +-
+ drivers/staging/comedi/drivers/pcmuio.c            |   25 +-
+ drivers/staging/comedi/drivers/poc.c               |   15 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c   |   49 +-
+ drivers/staging/comedi/drivers/rtd520.c            |  872 +-
+ drivers/staging/comedi/drivers/rtd520.h            |  267 +-
+ drivers/staging/comedi/drivers/rti800.c            |   13 +-
+ drivers/staging/comedi/drivers/rti802.c            |    9 +-
+ drivers/staging/comedi/drivers/s526.c              |    8 +-
+ drivers/staging/comedi/drivers/s626.c              |   45 +-
+ drivers/staging/comedi/drivers/serial2002.c        |   44 +-
+ drivers/staging/comedi/drivers/skel.c              |  551 +-
+ drivers/staging/comedi/drivers/ssv_dnp.c           |   26 +-
+ drivers/staging/comedi/drivers/unioxx5.c           |   44 +-
+ drivers/staging/comedi/drivers/usbdux.c            |   17 +-
+ drivers/staging/comedi/drivers/usbduxfast.c        |  171 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c       |   11 +-
+ drivers/staging/comedi/drivers/vmk80xx.c           |   20 +-
+ .../staging/comedi/kcomedilib/kcomedilib_main.c    |    5 +-
+ drivers/staging/crystalhd/crystalhd_cmds.c         |    4 +-
+ drivers/staging/csr/Makefile                       |    3 +-
+ drivers/staging/csr/bh.c                           |   19 +-
+ drivers/staging/csr/csr_framework_ext.c            |   97 -
+ drivers/staging/csr/csr_framework_ext.h            |  213 -
+ drivers/staging/csr/csr_framework_ext_types.h      |   41 +-
+ drivers/staging/csr/csr_lib.h                      |  188 -
+ drivers/staging/csr/csr_log.h                      |  172 +-
+ drivers/staging/csr/csr_log_configure.h            |  105 +-
+ drivers/staging/csr/csr_log_text.h                 |    8 -
+ drivers/staging/csr/csr_macro.h                    |   75 -
+ drivers/staging/csr/csr_msg_transport.h            |    8 -
+ drivers/staging/csr/csr_msgconv.c                  |    1 -
+ drivers/staging/csr/csr_msgconv.h                  |    9 -
+ drivers/staging/csr/csr_panic.c                    |   20 -
+ drivers/staging/csr/csr_panic.h                    |   53 -
+ drivers/staging/csr/csr_prim_defs.h                |    7 -
+ drivers/staging/csr/csr_result.h                   |    8 -
+ drivers/staging/csr/csr_sched.h                    |  215 +-
+ drivers/staging/csr/csr_sdio.h                     |    8 -
+ .../staging/csr/csr_serialize_primitive_types.c    |    1 -
+ drivers/staging/csr/csr_time.c                     |    9 +-
+ drivers/staging/csr/csr_time.h                     |   82 +-
+ drivers/staging/csr/csr_wifi_common.h              |    8 -
+ drivers/staging/csr/csr_wifi_fsm.h                 |    8 -
+ drivers/staging/csr/csr_wifi_fsm_event.h           |    8 -
+ drivers/staging/csr/csr_wifi_fsm_types.h           |   10 -
+ drivers/staging/csr/csr_wifi_hip_card.h            |    9 -
+ drivers/staging/csr/csr_wifi_hip_card_sdio.c       |  162 -
+ drivers/staging/csr/csr_wifi_hip_card_sdio.h       |    8 -
+ drivers/staging/csr/csr_wifi_hip_chiphelper.h      |   64 -
+ .../staging/csr/csr_wifi_hip_chiphelper_private.h  |    8 -
+ drivers/staging/csr/csr_wifi_hip_conversions.h     |    8 -
+ drivers/staging/csr/csr_wifi_hip_download.c        |   18 -
+ drivers/staging/csr/csr_wifi_hip_dump.c            |   32 +-
+ drivers/staging/csr/csr_wifi_hip_send.c            |    2 -
+ drivers/staging/csr/csr_wifi_hip_signals.h         |   17 +-
+ drivers/staging/csr/csr_wifi_hip_sigs.h            |    8 -
+ drivers/staging/csr/csr_wifi_hip_ta_sampling.h     |    9 -
+ drivers/staging/csr/csr_wifi_hip_unifi.h           |   10 +-
+ .../staging/csr/csr_wifi_hip_unifi_signal_names.c  |   45 +-
+ drivers/staging/csr/csr_wifi_hip_unifi_udi.h       |    9 -
+ drivers/staging/csr/csr_wifi_hip_unifihw.h         |    8 -
+ drivers/staging/csr/csr_wifi_hip_unifiversion.h    |    8 -
+ drivers/staging/csr/csr_wifi_hip_xbv.c             |    2 +-
+ drivers/staging/csr/csr_wifi_hip_xbv.h             |    8 -
+ drivers/staging/csr/csr_wifi_hostio_prim.h         |    9 -
+ drivers/staging/csr/csr_wifi_lib.h                 |    9 -
+ drivers/staging/csr/csr_wifi_msgconv.h             |    9 -
+ .../staging/csr/csr_wifi_nme_ap_converter_init.h   |    8 -
+ drivers/staging/csr/csr_wifi_nme_ap_lib.h          |   28 -
+ drivers/staging/csr/csr_wifi_nme_ap_prim.h         |    9 -
+ drivers/staging/csr/csr_wifi_nme_ap_sef.h          |   10 -
+ drivers/staging/csr/csr_wifi_nme_ap_serialize.h    |    9 -
+ drivers/staging/csr/csr_wifi_nme_converter_init.h  |    8 -
+ drivers/staging/csr/csr_wifi_nme_lib.h             |   63 -
+ drivers/staging/csr/csr_wifi_nme_prim.h            |    9 -
+ drivers/staging/csr/csr_wifi_nme_serialize.h       |    8 -
+ drivers/staging/csr/csr_wifi_nme_task.h            |   11 -
+ drivers/staging/csr/csr_wifi_private_common.h      |    8 -
+ drivers/staging/csr/csr_wifi_result.h              |    8 -
+ .../staging/csr/csr_wifi_router_converter_init.h   |    8 -
+ .../csr/csr_wifi_router_ctrl_converter_init.h      |    8 -
+ drivers/staging/csr/csr_wifi_router_ctrl_lib.h     |   10 -
+ drivers/staging/csr/csr_wifi_router_ctrl_prim.h    |    9 -
+ drivers/staging/csr/csr_wifi_router_ctrl_sef.c     |   67 +-
+ drivers/staging/csr/csr_wifi_router_ctrl_sef.h     |    7 -
+ .../staging/csr/csr_wifi_router_ctrl_serialize.h   |    8 -
+ .../csr/csr_wifi_router_free_upstream_contents.c   |   46 +-
+ drivers/staging/csr/csr_wifi_router_lib.h          |   10 -
+ drivers/staging/csr/csr_wifi_router_prim.h         |    9 -
+ drivers/staging/csr/csr_wifi_router_sef.h          |    8 -
+ drivers/staging/csr/csr_wifi_router_serialize.h    |    8 -
+ drivers/staging/csr/csr_wifi_router_task.h         |    8 -
+ drivers/staging/csr/csr_wifi_sme_ap_lib.h          |    9 -
+ drivers/staging/csr/csr_wifi_sme_ap_prim.h         |    8 -
+ drivers/staging/csr/csr_wifi_sme_converter_init.h  |    8 -
+ drivers/staging/csr/csr_wifi_sme_lib.h             |   10 -
+ drivers/staging/csr/csr_wifi_sme_prim.h            |    9 -
+ drivers/staging/csr/csr_wifi_sme_sef.h             |  213 +-
+ drivers/staging/csr/csr_wifi_sme_serialize.h       |  336 +-
+ drivers/staging/csr/csr_wifi_sme_task.h            |   16 +-
+ drivers/staging/csr/csr_wifi_vif_utils.h           |   81 -
+ drivers/staging/csr/data_tx.c                      |   45 +-
+ drivers/staging/csr/drv.c                          |  101 +-
+ drivers/staging/csr/firmware.c                     |    9 -
+ drivers/staging/csr/inet.c                         |   10 +-
+ drivers/staging/csr/io.c                           |  102 +-
+ drivers/staging/csr/mlme.c                         |    3 -
+ drivers/staging/csr/monitor.c                      |   10 -
+ drivers/staging/csr/netdev.c                       |   90 +-
+ drivers/staging/csr/os.c                           |   18 +-
+ drivers/staging/csr/sdio_mmc.c                     |   28 -
+ drivers/staging/csr/sme_blocking.c                 |  307 +-
+ drivers/staging/csr/sme_native.c                   |   21 -
+ drivers/staging/csr/sme_sys.c                      |   17 +-
+ drivers/staging/csr/sme_userspace.h                |    2 +-
+ drivers/staging/csr/sme_wext.c                     |   49 -
+ drivers/staging/csr/ul_int.c                       |    1 -
+ drivers/staging/csr/unifi_event.c                  |    8 -
+ drivers/staging/csr/unifi_os.h                     |   23 -
+ drivers/staging/csr/unifi_pdu_processing.c         |   39 +-
+ drivers/staging/csr/unifi_priv.h                   |    7 +-
+ drivers/staging/csr/unifi_sme.c                    |   15 -
+ drivers/staging/csr/unifi_wext.h                   |    1 -
+ drivers/staging/dgrp/dgrp_dpa_ops.c                |    2 +-
+ drivers/staging/dgrp/dgrp_net_ops.c                |    5 +-
+ drivers/staging/dgrp/dgrp_sysfs.c                  |    3 +-
+ drivers/staging/et131x/README                      |    1 +
+ drivers/staging/et131x/et131x.c                    |  950 +-
+ drivers/staging/et131x/et131x.h                    |    4 -
+ drivers/staging/gdm72xx/gdm_qos.c                  |   33 +-
+ drivers/staging/gdm72xx/gdm_sdio.c                 |   29 +-
+ drivers/staging/gdm72xx/gdm_usb.c                  |   10 +-
+ drivers/staging/gdm72xx/gdm_wimax.c                |   65 +-
+ drivers/staging/gdm72xx/netlink_k.c                |   23 +-
+ drivers/staging/gdm72xx/sdio_boot.c                |  100 +-
+ drivers/staging/gdm72xx/usb_boot.c                 |   49 +-
+ drivers/staging/iio/accel/adis16201_core.c         |    4 +-
+ drivers/staging/iio/accel/adis16203_core.c         |    2 -
+ drivers/staging/iio/accel/adis16204_core.c         |    4 +-
+ drivers/staging/iio/accel/adis16209_core.c         |    6 +-
+ drivers/staging/iio/accel/adis16209_trigger.c      |   11 +-
+ drivers/staging/iio/accel/adis16220_core.c         |    2 -
+ drivers/staging/iio/accel/adis16240_core.c         |    2 -
+ drivers/staging/iio/accel/adis16240_trigger.c      |   11 +-
+ drivers/staging/iio/accel/kxsd9.c                  |    2 +-
+ drivers/staging/iio/accel/lis3l02dq.h              |    1 +
+ drivers/staging/iio/accel/lis3l02dq_core.c         |   10 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c         |    4 +-
+ drivers/staging/iio/adc/Kconfig                    |   13 +-
+ drivers/staging/iio/adc/Makefile                   |    1 -
+ drivers/staging/iio/adc/ad7280a.c                  |    2 +-
+ drivers/staging/iio/adc/adt7310.c                  |  881 --
+ drivers/staging/iio/adc/adt7410.c                  |  458 +-
+ drivers/staging/iio/adc/lpc32xx_adc.c              |    2 +-
+ drivers/staging/iio/adc/mxs-lradc.c                |    2 +-
+ drivers/staging/iio/cdc/ad7150.c                   |   12 +-
+ drivers/staging/iio/cdc/ad7152.c                   |    2 +-
+ drivers/staging/iio/cdc/ad7746.c                   |    2 +-
+ drivers/staging/iio/gyro/adis16260_core.c          |    6 +-
+ drivers/staging/iio/iio_dummy_evgen.c              |    2 +-
+ drivers/staging/iio/imu/adis16400_core.c           |   10 +-
+ drivers/staging/iio/light/isl29018.c               |   45 +
+ drivers/staging/iio/magnetometer/hmc5843.c         |    2 +-
+ drivers/staging/iio/meter/ade7753.h                |    2 -
+ drivers/staging/iio/meter/ade7754.h                |    2 -
+ drivers/staging/iio/meter/ade7758.h                |    3 -
+ drivers/staging/iio/meter/ade7759.h                |    2 -
+ drivers/staging/iio/meter/ade7854.h                |    2 -
+ drivers/staging/imx-drm/Kconfig                    |    2 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c        |   28 +-
+ drivers/staging/ipack/Kconfig                      |   15 +-
+ drivers/staging/ipack/Makefile                     |    2 +-
+ drivers/staging/ipack/bridges/Kconfig              |    8 -
+ drivers/staging/ipack/carriers/Kconfig             |    7 +
+ .../staging/ipack/{bridges => carriers}/Makefile   |    0
+ .../staging/ipack/{bridges => carriers}/tpci200.c  |  309 +-
+ .../staging/ipack/{bridges => carriers}/tpci200.h  |   23 +-
+ drivers/staging/ipack/devices/Kconfig              |    1 -
+ drivers/staging/ipack/devices/ipoctal.c            |  118 +-
+ drivers/staging/ipack/ipack.c                      |   45 +-
+ drivers/staging/ipack/ipack.h                      |   58 +-
+ drivers/staging/line6/audio.c                      |    8 +-
+ drivers/staging/line6/driver.c                     |   20 +-
+ drivers/staging/line6/driver.h                     |    2 -
+ drivers/staging/olpc_dcon/olpc_dcon.c              |   83 +-
+ drivers/staging/olpc_dcon/olpc_dcon.h              |    2 +-
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c       |   30 -
+ drivers/staging/omapdrm/Kconfig                    |    2 +-
+ drivers/staging/omapdrm/omap_crtc.c                |    2 +-
+ drivers/staging/omapdrm/omap_dmm_priv.h            |    9 +-
+ drivers/staging/omapdrm/omap_dmm_tiler.c           |  106 +-
+ drivers/staging/omapdrm/omap_dmm_tiler.h           |    8 +-
+ drivers/staging/omapdrm/omap_drv.c                 |   37 +-
+ drivers/staging/omapdrm/omap_drv.h                 |    2 +
+ drivers/staging/omapdrm/omap_fb.c                  |   14 +-
+ drivers/staging/omapdrm/omap_gem.c                 |    2 +-
+ drivers/staging/omapdrm/omap_plane.c               |   34 +-
+ drivers/staging/ozwpan/ozhcd.c                     |    4 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211.h    |    6 +-
+ drivers/staging/rtl8192e/rtllib.h                  |    6 +-
+ drivers/staging/rtl8192e/rtllib_tx.c               |    2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    5 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c              |    4 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    4 +-
+ drivers/staging/rts5139/Makefile                   |   22 +-
+ drivers/staging/rts5139/ms.c                       |   96 +-
+ drivers/staging/rts5139/ms.h                       |   18 +-
+ drivers/staging/rts5139/ms_mg.c                    |  104 +-
+ drivers/staging/rts5139/ms_mg.h                    |   14 +-
+ drivers/staging/rts5139/rts51x.c                   |   10 +-
+ drivers/staging/rts5139/rts51x_card.c              |   80 +-
+ drivers/staging/rts5139/rts51x_card.h              |   30 +-
+ drivers/staging/rts5139/rts51x_chip.c              |   24 +-
+ drivers/staging/rts5139/rts51x_chip.h              |   16 +-
+ drivers/staging/rts5139/rts51x_fop.c               |    6 +-
+ drivers/staging/rts5139/rts51x_scsi.c              |  238 +-
+ drivers/staging/rts5139/rts51x_scsi.h              |    6 +-
+ drivers/staging/rts5139/sd.c                       |   36 +-
+ drivers/staging/rts5139/sd.h                       |   12 +-
+ drivers/staging/rts5139/sd_cprm.c                  |  124 +-
+ drivers/staging/rts5139/sd_cprm.h                  |   18 +-
+ drivers/staging/rts5139/xd.c                       |   58 +-
+ drivers/staging/rts5139/xd.h                       |   10 +-
+ drivers/staging/rts_pstor/Kconfig                  |   16 -
+ drivers/staging/rts_pstor/Makefile                 |   16 -
+ drivers/staging/rts_pstor/TODO                     |    9 -
+ drivers/staging/rts_pstor/debug.h                  |   43 -
+ drivers/staging/rts_pstor/general.c                |   35 -
+ drivers/staging/rts_pstor/general.h                |   31 -
+ drivers/staging/rts_pstor/ms.c                     | 4051 --------
+ drivers/staging/rts_pstor/ms.h                     |  225 -
+ drivers/staging/rts_pstor/rtsx.c                   | 1105 --
+ drivers/staging/rts_pstor/rtsx.h                   |  186 -
+ drivers/staging/rts_pstor/rtsx_card.c              | 1233 ---
+ drivers/staging/rts_pstor/rtsx_card.h              | 1093 --
+ drivers/staging/rts_pstor/rtsx_chip.c              | 2264 -----
+ drivers/staging/rts_pstor/rtsx_chip.h              |  989 --
+ drivers/staging/rts_pstor/rtsx_scsi.c              | 3137 ------
+ drivers/staging/rts_pstor/rtsx_scsi.h              |  142 -
+ drivers/staging/rts_pstor/rtsx_sys.h               |   50 -
+ drivers/staging/rts_pstor/rtsx_transport.c         |  769 --
+ drivers/staging/rts_pstor/rtsx_transport.h         |   66 -
+ drivers/staging/rts_pstor/sd.c                     | 4570 ---------
+ drivers/staging/rts_pstor/sd.h                     |  300 -
+ drivers/staging/rts_pstor/spi.c                    |  812 --
+ drivers/staging/rts_pstor/spi.h                    |   65 -
+ drivers/staging/rts_pstor/trace.h                  |   93 -
+ drivers/staging/rts_pstor/xd.c                     | 2052 ----
+ drivers/staging/rts_pstor/xd.h                     |  188 -
+ drivers/staging/sbe-2t3e3/cpld.c                   |    2 +-
+ drivers/staging/sbe-2t3e3/main.c                   |    7 +-
+ drivers/staging/sbe-2t3e3/module.c                 |   11 +-
+ drivers/staging/sbe-2t3e3/netdev.c                 |    5 +-
+ drivers/staging/sep/sep_main.c                     |    4 +-
+ drivers/staging/silicom/bp_mod.c                   |  219 +-
+ drivers/staging/silicom/bp_proc.c                  |   85 +-
+ drivers/staging/silicom/bypasslib/bplibk.h         |    9 -
+ drivers/staging/silicom/bypasslib/bypass.c         |    1 -
+ drivers/staging/slicoss/slicoss.c                  |  160 +-
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |   24 +-
+ drivers/staging/telephony/Kconfig                  |   48 -
+ drivers/staging/telephony/Makefile                 |    7 -
+ drivers/staging/telephony/TODO                     |   10 -
+ drivers/staging/telephony/ixj-ver.h                |    4 -
+ drivers/staging/telephony/ixj.c                    |10571 --------------------
+ drivers/staging/telephony/ixj.h                    | 1322 ---
+ drivers/staging/telephony/ixj_pcmcia.c             |  187 -
+ drivers/staging/telephony/phonedev.c               |  166 -
+ drivers/staging/usbip/stub_dev.c                   |   13 +-
+ drivers/staging/usbip/stub_rx.c                    |    5 +-
+ drivers/staging/usbip/stub_tx.c                    |    3 +-
+ drivers/staging/usbip/usbip_common.c               |   40 +-
+ drivers/staging/usbip/usbip_common.h               |    4 +-
+ drivers/staging/usbip/vhci.h                       |    1 -
+ drivers/staging/usbip/vhci_hcd.c                   |   49 +-
+ drivers/staging/usbip/vhci_rx.c                    |    2 +-
+ drivers/staging/usbip/vhci_sysfs.c                 |    6 +-
+ drivers/staging/usbip/vhci_tx.c                    |    2 +-
+ drivers/staging/vt6655/hostap.c                    |    6 +-
+ drivers/staging/vt6655/rxtx.c                      |    2 +-
+ drivers/staging/vt6655/wcmd.c                      |    1 +
+ drivers/staging/vt6656/device.h                    |    1 -
+ drivers/staging/vt6656/firmware.c                  |   22 +-
+ drivers/staging/vt6656/hostap.c                    |    6 +-
+ drivers/staging/vt6656/main_usb.c                  |    1 -
+ drivers/staging/vt6656/rf.c                        |    3 +
+ drivers/staging/vt6656/rxtx.c                      |    2 +-
+ drivers/staging/vt6656/usbpipe.c                   |    1 +
+ drivers/staging/winbond/mds.c                      |    2 +-
+ drivers/staging/winbond/wbhal.h                    |    4 +-
+ drivers/staging/wlags49_h2/man/wlags49.4           |    2 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c              |    6 +-
+ drivers/staging/xgifb/TODO                         |    2 +-
+ drivers/staging/xgifb/vb_setmode.c                 |    4 +-
+ drivers/staging/zram/zram_drv.c                    |  113 +-
+ drivers/staging/zram/zram_drv.h                    |    4 +-
+ drivers/staging/zram/zram_sysfs.c                  |    8 +-
+ drivers/vme/boards/vme_vmivme7805.c                |   15 +-
+ drivers/vme/bridges/vme_ca91cx42.c                 |   15 +-
+ drivers/vme/bridges/vme_tsi148.c                   |   15 +-
+ include/linux/iio/types.h                          |    1 +
+ include/linux/platform_data/ad5449.h               |   40 +
+ include/linux/platform_data/omap_drm.h             |    1 +
+ 498 files changed, 17564 insertions(+), 60145 deletions(-)
+ delete mode 100644 Documentation/telephony/00-INDEX
+ delete mode 100644 Documentation/telephony/ixj.txt
+ create mode 100644 drivers/iio/dac/ad5449.c
+ create mode 100644 drivers/staging/android/binder_trace.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c
+ delete mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c
+ delete mode 100644 drivers/staging/csr/csr_lib.h
+ delete mode 100644 drivers/staging/csr/csr_panic.c
+ delete mode 100644 drivers/staging/csr/csr_panic.h
+ delete mode 100644 drivers/staging/iio/adc/adt7310.c
+ delete mode 100644 drivers/staging/ipack/bridges/Kconfig
+ create mode 100644 drivers/staging/ipack/carriers/Kconfig
+ rename drivers/staging/ipack/{bridges => carriers}/Makefile (100%)
+ rename drivers/staging/ipack/{bridges => carriers}/tpci200.c (68%)
+ rename drivers/staging/ipack/{bridges => carriers}/tpci200.h (89%)
+ delete mode 100644 drivers/staging/rts_pstor/Kconfig
+ delete mode 100644 drivers/staging/rts_pstor/Makefile
+ delete mode 100644 drivers/staging/rts_pstor/TODO
+ delete mode 100644 drivers/staging/rts_pstor/debug.h
+ delete mode 100644 drivers/staging/rts_pstor/general.c
+ delete mode 100644 drivers/staging/rts_pstor/general.h
+ delete mode 100644 drivers/staging/rts_pstor/ms.c
+ delete mode 100644 drivers/staging/rts_pstor/ms.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_card.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_card.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_sys.h
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.c
+ delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.h
+ delete mode 100644 drivers/staging/rts_pstor/sd.c
+ delete mode 100644 drivers/staging/rts_pstor/sd.h
+ delete mode 100644 drivers/staging/rts_pstor/spi.c
+ delete mode 100644 drivers/staging/rts_pstor/spi.h
+ delete mode 100644 drivers/staging/rts_pstor/trace.h
+ delete mode 100644 drivers/staging/rts_pstor/xd.c
+ delete mode 100644 drivers/staging/rts_pstor/xd.h
+ delete mode 100644 drivers/staging/telephony/Kconfig
+ delete mode 100644 drivers/staging/telephony/Makefile
+ delete mode 100644 drivers/staging/telephony/TODO
+ delete mode 100644 drivers/staging/telephony/ixj-ver.h
+ delete mode 100644 drivers/staging/telephony/ixj.c
+ delete mode 100644 drivers/staging/telephony/ixj.h
+ delete mode 100644 drivers/staging/telephony/ixj_pcmcia.c
+ delete mode 100644 drivers/staging/telephony/phonedev.c
+ create mode 100644 include/linux/platform_data/ad5449.h
+Merging char-misc/char-misc-next (ab5c4a5 mei: move amthif specific code from mei_write to mei_amthif_write)
+$ git merge char-misc/char-misc-next
+Auto-merging arch/arm/include/asm/io.h
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/uio-howto.tmpl          |   56 +++
+ arch/arm/include/asm/io.h                     |    2 +-
+ arch/arm/mm/mmap.c                            |    2 +-
+ arch/ia64/include/asm/io.h                    |    2 +-
+ arch/ia64/kernel/efi.c                        |    2 +-
+ arch/sh/include/asm/io.h                      |    2 +-
+ arch/sh/mm/mmap.c                             |    2 +-
+ drivers/char/mem.c                            |   10 +-
+ drivers/char/pc8736x_gpio.c                   |    3 +-
+ drivers/hv/channel.c                          |    8 -
+ drivers/hv/channel_mgmt.c                     |    8 -
+ drivers/misc/mei/Makefile                     |    1 +
+ drivers/misc/mei/amthif.c                     |  605 +++++++++++++++++++++++++
+ drivers/misc/mei/hw.h                         |   14 +-
+ drivers/misc/mei/init.c                       |  128 +-----
+ drivers/misc/mei/interrupt.c                  |  389 ++++------------
+ drivers/misc/mei/iorw.c                       |  435 +++++-------------
+ drivers/misc/mei/main.c                       |  283 +++++-------
+ drivers/misc/mei/mei_dev.h                    |   78 +++-
+ drivers/misc/mei/wd.c                         |    7 +-
+ drivers/misc/ti-st/st_core.c                  |    1 -
+ drivers/uio/Kconfig                           |   16 +
+ drivers/uio/Makefile                          |    1 +
+ drivers/uio/uio_dmem_genirq.c                 |  354 +++++++++++++++
+ drivers/w1/masters/Kconfig                    |    2 +-
+ drivers/w1/masters/ds2482.c                   |   13 +-
+ include/linux/platform_data/uio_dmem_genirq.h |   26 ++
+ tools/hv/hv_kvp_daemon.c                      |   22 +-
+ 28 files changed, 1480 insertions(+), 992 deletions(-)
+ create mode 100644 drivers/misc/mei/amthif.c
+ create mode 100644 drivers/uio/uio_dmem_genirq.c
+ create mode 100644 include/linux/platform_data/uio_dmem_genirq.h
+Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
+$ git merge tmem/linux-next
+Already up-to-date.
+Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (820321c Merge branch 'samsung' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging include/linux/platform_data/pinctrl-nomadik.h
+Auto-merging drivers/pinctrl/mvebu/pinctrl-mvebu.c
+Auto-merging drivers/gpio/gpiolib.c
+Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+Auto-merging arch/arm/mach-u300/core.c
+Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
+Auto-merging arch/arm/mach-at91/at91sam9x5.c
+Auto-merging arch/arm/mach-at91/at91sam9rl.c
+Auto-merging arch/arm/mach-at91/at91sam9g45.c
+Auto-merging arch/arm/mach-at91/at91sam9263.c
+Auto-merging arch/arm/mach-at91/at91sam9261.c
+Auto-merging arch/arm/mach-at91/at91sam9260.c
+Auto-merging arch/arm/mach-at91/at91rm9200.c
+Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/gpio/gpio.txt    |   36 +
+ .../devicetree/bindings/gpio/gpio_atmel.txt        |    5 +
+ .../bindings/pinctrl/atmel,at91-pinctrl.txt        |  136 ++
+ .../bindings/pinctrl/samsung-pinctrl.txt           |  118 +-
+ Documentation/gpio.txt                             |   42 +
+ Documentation/pinctrl.txt                          |    7 +-
+ MAINTAINERS                                        |    6 +
+ arch/arm/Kconfig                                   |    2 +
+ arch/arm/boot/dts/Makefile                         |   44 +-
+ arch/arm/boot/dts/at91sam9260.dtsi                 |  187 ++-
+ arch/arm/boot/dts/at91sam9263.dtsi                 |  173 ++-
+ arch/arm/boot/dts/at91sam9263ek.dts                |    1 +
+ arch/arm/boot/dts/at91sam9g15.dtsi                 |   28 +
+ arch/arm/boot/dts/at91sam9g15ek.dts                |   16 +
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi        |    6 +
+ arch/arm/boot/dts/at91sam9g25.dtsi                 |   28 +
+ arch/arm/boot/dts/at91sam9g25ek.dts                |   49 +-
+ arch/arm/boot/dts/at91sam9g35.dtsi                 |   28 +
+ arch/arm/boot/dts/at91sam9g35ek.dts                |   16 +
+ arch/arm/boot/dts/at91sam9g45.dtsi                 |  189 ++-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts             |    1 +
+ arch/arm/boot/dts/at91sam9n12.dtsi                 |  180 ++-
+ arch/arm/boot/dts/at91sam9x25.dtsi                 |   28 +
+ arch/arm/boot/dts/at91sam9x25ek.dts                |   16 +
+ arch/arm/boot/dts/at91sam9x35.dtsi                 |   28 +
+ arch/arm/boot/dts/at91sam9x35ek.dts                |   16 +
+ arch/arm/boot/dts/at91sam9x5.dtsi                  |  178 ++-
+ arch/arm/boot/dts/at91sam9x5ek.dtsi                |   59 +
+ arch/arm/boot/dts/exynos4210-pinctrl.dtsi          |  278 ++++
+ arch/arm/boot/dts/exynos4210.dtsi                  |  241 +---
+ arch/arm/configs/at91_dt_defconfig                 |    1 +
+ arch/arm/mach-at91/at91rm9200.c                    |    4 +-
+ arch/arm/mach-at91/at91sam9260.c                   |    7 +-
+ arch/arm/mach-at91/at91sam9261.c                   |    4 +-
+ arch/arm/mach-at91/at91sam9263.c                   |    9 +-
+ arch/arm/mach-at91/at91sam9g45.c                   |   10 +-
+ arch/arm/mach-at91/at91sam9n12.c                   |   15 +-
+ arch/arm/mach-at91/at91sam9rl.c                    |    4 +-
+ arch/arm/mach-at91/at91sam9x5.c                    |   19 +-
+ arch/arm/mach-at91/board-dt.c                      |    2 -
+ arch/arm/mach-at91/gpio.c                          |  190 +--
+ arch/arm/mach-at91/setup.c                         |    6 +-
+ arch/arm/mach-at91/soc.h                           |   12 +-
+ arch/arm/mach-nomadik/board-nhk8815.c              |    3 +-
+ arch/arm/mach-nomadik/cpu-8815.c                   |    2 +-
+ arch/arm/mach-nomadik/i2c-8815nhk.c                |    3 +-
+ arch/arm/mach-u300/core.c                          |    3 +-
+ arch/arm/mach-u300/include/mach/irqs.h             |  126 +-
+ arch/arm/mach-ux500/board-mop500-audio.c           |    3 +-
+ arch/arm/mach-ux500/board-mop500-pins.c            |    3 +-
+ arch/arm/mach-ux500/board-mop500.c                 |    2 +-
+ arch/arm/mach-ux500/cpu-db8500.c                   |    6 +-
+ arch/arm/mach-ux500/devices-common.c               |    3 +-
+ arch/arm/mach-ux500/devices-common.h               |    8 +-
+ arch/arm/plat-nomadik/include/plat/gpio-nomadik.h  |  102 --
+ drivers/gpio/gpiolib-of.c                          |   40 +
+ drivers/gpio/gpiolib.c                             |   46 +
+ drivers/mtd/nand/atmel_nand.c                      |    9 +
+ drivers/pinctrl/Kconfig                            |   37 +-
+ drivers/pinctrl/Makefile                           |    7 +-
+ drivers/pinctrl/core.c                             |   29 +
+ drivers/pinctrl/core.h                             |    2 +
+ drivers/pinctrl/devicetree.c                       |   11 +
+ drivers/pinctrl/mvebu/Kconfig                      |   24 +
+ drivers/pinctrl/mvebu/Makefile                     |    5 +
+ drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c   |    0
+ drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c    |    0
+ drivers/pinctrl/{ => mvebu}/pinctrl-dove.c         |    0
+ drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c     |    0
+ drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c        |    1 -
+ drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h        |    0
+ drivers/pinctrl/pinctrl-at91.c                     | 1510 ++++++++++++++++++++
+ drivers/pinctrl/pinctrl-coh901.c                   |  122 +-
+ drivers/pinctrl/pinctrl-exynos.c                   |  368 +++--
+ drivers/pinctrl/pinctrl-exynos.h                   |  170 +--
+ drivers/pinctrl/pinctrl-nomadik-db8500.c           |  108 +-
+ drivers/pinctrl/pinctrl-nomadik-db8540.c           |    4 +-
+ drivers/pinctrl/pinctrl-nomadik-stn8815.c          |    4 +-
+ drivers/pinctrl/pinctrl-nomadik.c                  |  108 +-
+ drivers/pinctrl/pinctrl-nomadik.h                  |   16 +-
+ drivers/pinctrl/pinctrl-samsung.c                  |  203 ++-
+ drivers/pinctrl/pinctrl-samsung.h                  |   29 +-
+ drivers/pinctrl/pinctrl-sirf.c                     |   52 +-
+ drivers/pinctrl/pinctrl-u300.c                     |   42 +-
+ drivers/pinctrl/pinmux.c                           |   67 +-
+ drivers/pinctrl/spear/Kconfig                      |    7 +
+ drivers/pinctrl/spear/Makefile                     |    1 +
+ drivers/pinctrl/spear/pinctrl-plgpio.c             |  746 ++++++++++
+ drivers/pinctrl/spear/pinctrl-spear.c              |    2 +-
+ drivers/pinctrl/spear/pinctrl-spear1310.c          |  365 ++++-
+ drivers/pinctrl/spear/pinctrl-spear1340.c          |   41 +-
+ drivers/pinctrl/spear/pinctrl-spear320.c           |    8 +-
+ drivers/pinctrl/spear/pinctrl-spear3xx.h           |    1 +
+ drivers/tty/serial/atmel_serial.c                  |    8 +
+ include/asm-generic/gpio.h                         |   45 +
+ include/linux/gpio.h                               |   20 +-
+ include/linux/pinctrl/pinctrl.h                    |   16 +
+ include/linux/platform_data/pinctrl-coh901.h       |    2 -
+ .../linux/platform_data/pinctrl-nomadik.h          |  111 +-
+ 99 files changed, 5483 insertions(+), 1593 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
+ create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi
+ delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+ create mode 100644 drivers/pinctrl/mvebu/Kconfig
+ create mode 100644 drivers/pinctrl/mvebu/Makefile
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-dove.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c (100%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c (99%)
+ rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h (100%)
+ create mode 100644 drivers/pinctrl/pinctrl-at91.c
+ create mode 100644 drivers/pinctrl/spear/pinctrl-plgpio.c
+ rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (66%)
+Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
+$ git merge vhost/linux-next
+Resolved 'drivers/net/tun.c' using previous resolution.
+Auto-merging drivers/net/tun.c
+CONFLICT (content): Merge conflict in drivers/net/tun.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 10bdeec] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
+$ git merge irqdomain/irqdomain/next
+Already up-to-date.
+Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging gpio-lw/for-next (b1ffa4b Merge branch 'devel' into for-next)
+$ git merge gpio-lw/for-next
+Auto-merging include/asm-generic/gpio.h
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/gpio-mvebu.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig             |    1 +
+ drivers/gpio/Kconfig         |   17 +++-
+ drivers/gpio/Makefile        |    2 +
+ drivers/gpio/gpio-clps711x.c |  199 ++++++++++++++++++++++++++++++++++++++++
+ drivers/gpio/gpio-da9055.c   |  204 ++++++++++++++++++++++++++++++++++++++++++
+ drivers/gpio/gpio-em.c       |   48 ++--------
+ drivers/gpio/gpio-mvebu.c    |   27 +++++-
+ drivers/gpio/gpio-omap.c     |    2 +-
+ drivers/gpio/gpio-pch.c      |    1 +
+ drivers/gpio/gpio-pl061.c    |   59 +++++-------
+ drivers/gpio/gpio-tc3589x.c  |   20 ++---
+ drivers/gpio/gpio-tegra.c    |   14 ++-
+ drivers/gpio/gpio-vt8500.c   |    2 +
+ drivers/gpio/gpiolib.c       |  124 ++++++++++++++++---------
+ include/asm-generic/gpio.h   |    5 +-
+ 15 files changed, 583 insertions(+), 142 deletions(-)
+ create mode 100644 drivers/gpio/gpio-clps711x.c
+ create mode 100644 drivers/gpio/gpio-da9055.c
+Merging arm-soc/for-next (9367622 Merge branch 'next/fixes-non-critical' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging include/video/omapvrfb.h
+Auto-merging include/linux/platform_data/mmc-omap.h
+Auto-merging include/linux/platform_data/leds-omap.h
+Auto-merging include/linux/platform_data/clocksource-nomadik-mtu.h
+Auto-merging include/linux/mfd/menelaus.h
+Auto-merging include/linux/dma/ipu-dma.h
+Auto-merging drivers/usb/host/ohci-omap.c
+Auto-merging drivers/usb/host/ehci-omap.c
+Auto-merging drivers/usb/host/ehci-mxc.c
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging drivers/mtd/nand/Kconfig
+Auto-merging drivers/mmc/host/omap_hsmmc.c
+Auto-merging drivers/mmc/host/mxcmmc.c
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/irqchip/irq-versatile-fpga.c
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging drivers/hwmon/Makefile
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging drivers/clocksource/nomadik-mtu.c
+Removing arch/arm/plat-omap/include/plat/usb.h
+Removing arch/arm/plat-omap/include/plat/uncompress.h
+Removing arch/arm/plat-omap/include/plat/sram.h
+Removing arch/arm/plat-omap/include/plat/sdrc.h
+Removing arch/arm/plat-omap/include/plat/omap-secure.h
+Removing arch/arm/plat-omap/include/plat/multi.h
+Removing arch/arm/plat-omap/include/plat/fpga.h
+Removing arch/arm/plat-omap/include/plat/dma-44xx.h
+Removing arch/arm/plat-omap/include/plat/clock.h
+Removing arch/arm/plat-omap/include/plat/clkdev_omap.h
+Auto-merging arch/arm/plat-omap/include/plat-omap/dma-omap.h
+Auto-merging arch/arm/plat-omap/common.h
+Removing arch/arm/plat-omap/clock.c
+Removing arch/arm/plat-nomadik/Makefile
+Removing arch/arm/plat-nomadik/Kconfig
+Removing arch/arm/plat-mxc/include/mach/uncompress.h
+Removing arch/arm/plat-mxc/include/mach/timex.h
+Removing arch/arm/plat-mxc/include/mach/irqs.h
+Removing arch/arm/plat-mxc/Makefile
+Removing arch/arm/plat-mxc/Kconfig
+Removing arch/arm/mach-vt8500/include/mach/restart.h
+Removing arch/arm/mach-vt8500/include/mach/i8042.h
+Removing arch/arm/mach-vt8500/include/mach/hardware.h
+Removing arch/arm/mach-vt8500/include/mach/entry-macro.S
+Auto-merging arch/arm/mach-ux500/devices-common.c
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
+Auto-merging arch/arm/mach-ux500/board-mop500-audio.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-audio.c
+Auto-merging arch/arm/mach-socfpga/core.h
+Removing arch/arm/mach-shmobile/setup-sh7377.c
+Removing arch/arm/mach-shmobile/setup-sh7367.c
+Removing arch/arm/mach-shmobile/pfc-sh7377.c
+Removing arch/arm/mach-shmobile/pfc-sh7367.c
+Removing arch/arm/mach-shmobile/intc-sh7377.c
+Removing arch/arm/mach-shmobile/intc-sh7367.c
+Removing arch/arm/mach-shmobile/include/mach/sh7377.h
+Removing arch/arm/mach-shmobile/include/mach/sh7367.h
+Removing arch/arm/mach-shmobile/clock-sh7377.c
+Removing arch/arm/mach-shmobile/clock-sh7367.c
+Removing arch/arm/mach-shmobile/board-g4evm.c
+Removing arch/arm/mach-shmobile/board-g3evm.c
+Auto-merging arch/arm/mach-omap2/serial.h
+Removing arch/arm/mach-omap2/powerdomain44xx.c
+Removing arch/arm/mach-omap2/powerdomain33xx.c
+Removing arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+Auto-merging arch/arm/mach-omap2/pmu.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod.h
+Auto-merging arch/arm/mach-omap2/omap_device.h
+Auto-merging arch/arm/mach-omap2/omap_device.c
+Auto-merging arch/arm/mach-omap2/i2c.h
+Auto-merging arch/arm/mach-omap2/gpmc.h
+Auto-merging arch/arm/mach-omap2/drm.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/drm.c
+Auto-merging arch/arm/mach-omap2/cm3xxx.c
+Removing arch/arm/mach-omap2/clockdomain44xx.c
+Removing arch/arm/mach-omap2/clockdomain33xx.c
+Removing arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
+Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
+CONFLICT (content): Merge conflict in arch/arm/mach-nomadik/board-nhk8815.c
+Auto-merging arch/arm/mach-imx/ulpi.c
+Auto-merging arch/arm/mach-imx/tzic.c
+Auto-merging arch/arm/mach-imx/Recorded preimage for 'drivers/pinctrl/pinctrl-nomadik.c'
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Resolved 'arch/arm/mach-nomadik/board-nhk8815.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/drm.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/board-mop500-audio.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/board-mop500.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
+time.c
+Auto-merging arch/arm/mach-imx/system.c
+Auto-merging arch/arm/mach-imx/mach-imx6q.c
+Auto-merging arch/arm/mach-imx/irq-common.h
+Auto-merging arch/arm/mach-imx/iram_alloc.c
+Auto-merging arch/arm/mach-imx/iomux-v3.c
+Auto-merging arch/arm/mach-imx/iomux-v1.c
+Auto-merging arch/arm/mach-imx/iomux-mx51.h
+Auto-merging arch/arm/mach-imx/iomux-mx50.h
+Auto-merging arch/arm/mach-imx/iomux-mx35.h
+Auto-merging arch/arm/mach-imx/iomux-mx27.h
+Auto-merging arch/arm/mach-imx/iomux-mx25.h
+Auto-merging arch/arm/mach-imx/iomux-mx21.h
+Auto-merging arch/arm/mach-imx/iomux-mx1.h
+Removing arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
+Auto-merging arch/arm/mach-imx/hardware.h
+Auto-merging arch/arm/mach-imx/epit.c
+Auto-merging arch/arm/mach-imx/devices/platform-spi_imx.c
+Auto-merging arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
+Auto-merging arch/arm/mach-imx/devices/platform-pata_imx.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_w1.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_rtc.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_rnga.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_pwm.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc_nand.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc-mmc.c
+Auto-merging arch/arm/mach-imx/devices/platform-mxc-ehci.c
+Auto-merging arch/arm/mach-imx/devices/platform-mx2-camera.c
+Auto-merging arch/arm/mach-imx/devices/platform-mx1-camera.c
+Auto-merging arch/arm/mach-imx/devices/platform-ipu-core.c
+Auto-merging arch/arm/mach-imx/devices/platform-imxdi_rtc.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx_udc.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx27-coda.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx21-hcd.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx2-wdt.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-uart.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-ssi.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-keypad.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-i2c.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-fb.c
+Auto-merging arch/arm/mach-imx/devices/platform-imx-dma.c
+Auto-merging arch/arm/mach-imx/devices/platform-gpio_keys.c
+Auto-merging arch/arm/mach-imx/devices/platform-gpio-mxc.c
+Auto-merging arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
+Auto-merging arch/arm/mach-imx/devices/platform-flexcan.c
+Auto-merging arch/arm/mach-imx/devices/platform-fec.c
+Auto-merging arch/arm/mach-imx/devices/platform-ahci-imx.c
+Auto-merging arch/arm/mach-imx/devices/devices.c
+Auto-merging arch/arm/mach-imx/devices/devices-common.h
+Auto-merging arch/arm/mach-imx/devices/Makefile
+Auto-merging arch/arm/mach-imx/cpufreq.c
+Auto-merging arch/arm/mach-imx/cpu.c
+Auto-merging arch/arm/mach-imx/common.h
+Auto-merging arch/arm/mach-imx/avic.c
+Auto-merging arch/arm/mach-imx/3ds_debugboard.c
+Auto-merging arch/arm/mach-clps711x/edb7211.c
+Removing arch/arm/mach-clps711x/edb7211-mm.c
+Auto-merging arch/arm/kernel/smp_twd.c
+Auto-merging arch/arm/include/debug/imx.S
+Removing arch/arm/configs/g4evm_defconfig
+Removing arch/arm/configs/g3evm_defconfig
+Removing arch/arm/configs/fortunet_defconfig
+Removing arch/arm/configs/edb7211_defconfig
+Auto-merging arch/arm/boot/dts/sh7372-mackerel.dts
+Auto-merging arch/arm/boot/dts/imx6q.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Removing arch/arm/boot/compressed/head-vt8500.S
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/pinctrl/pinctrl-nomadik.c'.
+[master bdca8b9] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/arm/altera/socfpga-reset.txt          |   11 +
+ .../bindings/arm/altera/socfpga-system.txt         |   11 +
+ Documentation/devicetree/bindings/arm/calxeda.txt  |   13 +-
+ .../devicetree/bindings/arm/vexpress-sysreg.txt    |   50 +
+ Documentation/devicetree/bindings/arm/vexpress.txt |   98 +-
+ .../devicetree/bindings/hwmon/vexpress.txt         |   23 +
+ .../devicetree/bindings/i2c/fsl-imx-i2c.txt        |    4 +-
+ .../bindings/input/touchscreen/bu21013.txt         |   28 +
+ Documentation/hwmon/vexpress                       |   34 +
+ MAINTAINERS                                        |    1 -
+ arch/arm/Kconfig                                   |   30 +-
+ arch/arm/Kconfig.debug                             |    8 +
+ arch/arm/Makefile                                  |    2 -
+ arch/arm/arm-soc-for-next-contents.txt             |   65 +
+ arch/arm/boot/compressed/Makefile                  |    4 -
+ arch/arm/boot/compressed/head-vt8500.S             |   46 -
+ arch/arm/boot/dts/Makefile                         |    6 +-
+ arch/arm/boot/dts/ccu9540.dts                      |   72 +
+ arch/arm/boot/dts/dbx5x0.dtsi                      |   57 +-
+ arch/arm/boot/dts/ecx-2000.dts                     |  104 ++
+ arch/arm/boot/dts/ecx-common.dtsi                  |  237 +++
+ arch/arm/boot/dts/highbank.dts                     |  212 +--
+ arch/arm/boot/dts/href.dtsi                        |  273 ++++
+ arch/arm/boot/dts/hrefprev60.dts                   |   41 +
+ arch/arm/boot/dts/hrefv60plus.dts                  |   83 +-
+ arch/arm/boot/dts/imx27.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx51.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx53.dtsi                       |    6 +-
+ arch/arm/boot/dts/imx6q.dtsi                       |    6 +-
+ .../boot/dts/{sh7377.dtsi => sh7372-mackerel.dts}  |   13 +-
+ arch/arm/boot/dts/snowball.dts                     |  140 +-
+ arch/arm/boot/dts/socfpga.dtsi                     |   10 +
+ arch/arm/boot/dts/stuib.dtsi                       |   78 +
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi            |  146 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi                |  146 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts        |  121 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts         |  186 ++-
+ arch/arm/boot/dts/vexpress-v2p-ca5s.dts            |   84 +-
+ arch/arm/boot/dts/vexpress-v2p-ca9.dts             |  136 +-
+ arch/arm/configs/ap4evb_defconfig                  |    1 -
+ arch/arm/configs/armadillo800eva_defconfig         |    3 +-
+ arch/arm/configs/clps711x_defconfig                |   78 +
+ arch/arm/configs/edb7211_defconfig                 |   27 -
+ arch/arm/configs/fortunet_defconfig                |   28 -
+ arch/arm/configs/g3evm_defconfig                   |   57 -
+ arch/arm/configs/g4evm_defconfig                   |   57 -
+ arch/arm/configs/imx_v4_v5_defconfig               |    4 +-
+ arch/arm/configs/imx_v6_v7_defconfig               |    2 +
+ arch/arm/configs/kota2_defconfig                   |    1 -
+ arch/arm/configs/kzm9g_defconfig                   |    5 +-
+ arch/arm/configs/mackerel_defconfig                |   19 +-
+ arch/arm/configs/marzen_defconfig                  |    4 +
+ arch/arm/configs/socfpga_defconfig                 |    5 +-
+ arch/arm/configs/u8500_defconfig                   |    1 +
+ arch/arm/include/asm/hardware/sp810.h              |    6 +-
+ arch/arm/include/asm/mach/map.h                    |    7 +
+ .../mach/debug-macro.S => include/debug/imx.S}     |   33 +-
+ arch/arm/include/debug/vexpress.S                  |   11 +-
+ arch/arm/kernel/debug.S                            |   14 +
+ arch/arm/kernel/smp_twd.c                          |    6 +-
+ arch/arm/mach-clps711x/Makefile                    |    2 +-
+ arch/arm/mach-clps711x/autcpu12.c                  |   15 +-
+ arch/arm/mach-clps711x/cdb89712.c                  |    4 +-
+ arch/arm/mach-clps711x/common.c                    |  113 +-
+ arch/arm/mach-clps711x/edb7211-mm.c                |   82 -
+ .../mach-clps711x/{edb7211-arch.c => edb7211.c}    |   58 +-
+ arch/arm/mach-clps711x/include/mach/autcpu12.h     |   14 +-
+ arch/arm/mach-clps711x/include/mach/clps711x.h     |    3 +
+ arch/arm/mach-clps711x/include/mach/hardware.h     |   56 +-
+ arch/arm/mach-clps711x/include/mach/irqs.h         |    4 -
+ arch/arm/mach-clps711x/include/mach/syspld.h       |    9 +-
+ arch/arm/mach-clps711x/p720t.c                     |   18 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c           |    5 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c           |    2 +-
+ arch/arm/mach-davinci/devices-tnetv107x.c          |    2 +-
+ arch/arm/mach-davinci/include/mach/serial.h        |    2 +-
+ arch/arm/mach-davinci/include/mach/uncompress.h    |    6 +
+ arch/arm/mach-davinci/usb.c                        |    6 -
+ arch/arm/mach-highbank/Kconfig                     |    2 +-
+ arch/arm/mach-highbank/core.h                      |    5 +
+ arch/arm/mach-highbank/highbank.c                  |   27 +-
+ arch/arm/mach-highbank/hotplug.c                   |    6 +-
+ arch/arm/mach-highbank/platsmp.c                   |    7 +-
+ arch/arm/mach-highbank/pm.c                        |    3 -
+ arch/arm/mach-highbank/sysregs.h                   |   19 +
+ arch/arm/mach-highbank/system.c                    |    2 -
+ arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c   |    2 +-
+ .../include/mach => mach-imx}/3ds_debugboard.h     |    0
+ arch/arm/mach-imx/Kconfig                          |   90 +-
+ arch/arm/mach-imx/Makefile                         |   22 +
+ arch/arm/{plat-mxc => mach-imx}/avic.c             |    5 +-
+ .../include/mach => mach-imx}/board-mx31lilly.h    |    0
+ .../include/mach => mach-imx}/board-mx31lite.h     |    0
+ .../include/mach => mach-imx}/board-mx31moboard.h  |    0
+ .../include/mach => mach-imx}/board-pcm038.h       |    0
+ arch/arm/mach-imx/clk-imx1.c                       |   17 +-
+ arch/arm/mach-imx/clk-imx21.c                      |   18 +-
+ arch/arm/mach-imx/clk-imx25.c                      |   26 +-
+ arch/arm/mach-imx/clk-imx27.c                      |   40 +-
+ arch/arm/mach-imx/clk-imx31.c                      |   21 +-
+ arch/arm/mach-imx/clk-imx35.c                      |   13 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c                |   15 +-
+ arch/arm/mach-imx/clk-imx6q.c                      |    3 +-
+ arch/arm/mach-imx/clk-pllv1.c                      |    4 +-
+ .../{plat-mxc/include/mach => mach-imx}/common.h   |    1 +
+ arch/arm/mach-imx/cpu-imx25.c                      |    5 +-
+ arch/arm/mach-imx/cpu-imx27.c                      |    2 +-
+ arch/arm/mach-imx/cpu-imx31.c                      |    7 +-
+ arch/arm/mach-imx/cpu-imx35.c                      |    5 +-
+ arch/arm/mach-imx/cpu-imx5.c                       |    3 +-
+ arch/arm/{plat-mxc => mach-imx}/cpu.c              |    3 +-
+ arch/arm/mach-imx/cpu_op-mx51.c                    |    3 +-
+ arch/arm/{plat-mxc => mach-imx}/cpufreq.c          |    3 +-
+ arch/arm/{plat-mxc => mach-imx}/cpuidle.c          |    0
+ .../{plat-mxc/include/mach => mach-imx}/cpuidle.h  |    0
+ arch/arm/mach-imx/devices-imx1.h                   |    3 +-
+ arch/arm/mach-imx/devices-imx21.h                  |    3 +-
+ arch/arm/mach-imx/devices-imx25.h                  |    3 +-
+ arch/arm/mach-imx/devices-imx27.h                  |    3 +-
+ arch/arm/mach-imx/devices-imx31.h                  |    3 +-
+ arch/arm/mach-imx/devices-imx35.h                  |    3 +-
+ arch/arm/mach-imx/devices-imx50.h                  |    3 +-
+ arch/arm/mach-imx/devices-imx51.h                  |    3 +-
+ arch/arm/{plat-mxc => mach-imx}/devices/Kconfig    |    0
+ arch/arm/{plat-mxc => mach-imx}/devices/Makefile   |    2 +
+ .../mach => mach-imx/devices}/devices-common.h     |    9 +-
+ arch/arm/{plat-mxc => mach-imx/devices}/devices.c  |    4 +-
+ .../devices/platform-ahci-imx.c                    |    5 +-
+ .../{plat-mxc => mach-imx}/devices/platform-fec.c  |    5 +-
+ .../devices/platform-flexcan.c                     |    4 +-
+ .../devices/platform-fsl-usb2-udc.c                |    5 +-
+ .../devices/platform-gpio-mxc.c                    |    2 +-
+ .../devices/platform-gpio_keys.c                   |    5 +-
+ .../devices/platform-imx-dma.c                     |   23 +-
+ .../devices/platform-imx-fb.c                      |   16 +-
+ .../devices/platform-imx-i2c.c                     |   32 +-
+ .../devices/platform-imx-keypad.c                  |    4 +-
+ .../devices/platform-imx-ssi.c                     |    4 +-
+ .../devices/platform-imx-uart.c                    |    4 +-
+ .../devices/platform-imx2-wdt.c                    |    5 +-
+ .../devices/platform-imx21-hcd.c                   |    4 +-
+ .../devices/platform-imx27-coda.c                  |    4 +-
+ .../devices/platform-imx_udc.c                     |    4 +-
+ .../devices/platform-imxdi_rtc.c                   |    5 +-
+ .../devices/platform-ipu-core.c                    |    5 +-
+ .../devices/platform-mx1-camera.c                  |    4 +-
+ .../devices/platform-mx2-camera.c                  |   16 +-
+ .../devices/platform-mxc-ehci.c                    |    5 +-
+ .../devices/platform-mxc-mmc.c                     |   20 +-
+ .../devices/platform-mxc_nand.c                    |   25 +-
+ .../devices/platform-mxc_pwm.c                     |    4 +-
+ .../devices/platform-mxc_rnga.c                    |    4 +-
+ .../devices/platform-mxc_rtc.c                     |   13 +-
+ .../devices/platform-mxc_w1.c                      |    4 +-
+ .../devices/platform-pata_imx.c                    |    4 +-
+ .../devices/platform-sdhci-esdhc-imx.c             |    5 +-
+ .../devices/platform-spi_imx.c                     |    4 +-
+ arch/arm/mach-imx/ehci-imx25.c                     |    4 +-
+ arch/arm/mach-imx/ehci-imx27.c                     |    4 +-
+ arch/arm/mach-imx/ehci-imx31.c                     |    4 +-
+ arch/arm/mach-imx/ehci-imx35.c                     |    4 +-
+ arch/arm/mach-imx/ehci-imx5.c                      |    4 +-
+ arch/arm/{plat-mxc => mach-imx}/epit.c             |    6 +-
+ .../include/mach => mach-imx}/eukrea-baseboards.h  |    0
+ arch/arm/mach-imx/eukrea_mbimx27-baseboard.c       |    7 +-
+ arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c     |    8 +-
+ arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c     |    7 +-
+ arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c     |    7 +-
+ .../{plat-mxc/include/mach => mach-imx}/hardware.h |   26 +-
+ arch/arm/mach-imx/hotplug.c                        |    3 +-
+ arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h |    0
+ arch/arm/mach-imx/imx27-dt.c                       |   11 +-
+ arch/arm/mach-imx/imx31-dt.c                       |    5 +-
+ arch/arm/mach-imx/imx51-dt.c                       |    9 +-
+ arch/arm/mach-imx/include/mach/dma-mx1-mx2.h       |   10 -
+ arch/arm/mach-imx/iomux-imx31.c                    |    5 +-
+ .../include/mach => mach-imx}/iomux-mx1.h          |    2 +-
+ .../include/mach => mach-imx}/iomux-mx21.h         |    4 +-
+ .../include/mach => mach-imx}/iomux-mx25.h         |    2 +-
+ .../include/mach => mach-imx}/iomux-mx27.h         |    4 +-
+ .../include/mach => mach-imx}/iomux-mx2x.h         |    0
+ .../include/mach => mach-imx}/iomux-mx3.h          |    0
+ .../include/mach => mach-imx}/iomux-mx35.h         |    2 +-
+ .../include/mach => mach-imx}/iomux-mx50.h         |    2 +-
+ .../include/mach => mach-imx}/iomux-mx51.h         |    2 +-
+ arch/arm/{plat-mxc => mach-imx}/iomux-v1.c         |    5 +-
+ .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h |    0
+ arch/arm/{plat-mxc => mach-imx}/iomux-v3.c         |    5 +-
+ .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/iram.h |    0
+ arch/arm/{plat-mxc => mach-imx}/iram_alloc.c       |    3 +-
+ arch/arm/{plat-mxc => mach-imx}/irq-common.c       |    0
+ arch/arm/{plat-mxc => mach-imx}/irq-common.h       |    3 +
+ arch/arm/mach-imx/lluart.c                         |    3 +-
+ arch/arm/mach-imx/mach-apf9328.c                   |    7 +-
+ arch/arm/mach-imx/mach-armadillo5x0.c              |    9 +-
+ arch/arm/mach-imx/mach-bug.c                       |    7 +-
+ arch/arm/mach-imx/mach-cpuimx27.c                  |   11 +-
+ arch/arm/mach-imx/mach-cpuimx35.c                  |    9 +-
+ arch/arm/mach-imx/mach-cpuimx51sd.c                |    9 +-
+ arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |   10 +-
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    6 +-
+ arch/arm/mach-imx/mach-imx27ipcam.c                |    6 +-
+ arch/arm/mach-imx/mach-imx27lite.c                 |    6 +-
+ arch/arm/mach-imx/mach-imx53.c                     |   11 +-
+ arch/arm/mach-imx/mach-imx6q.c                     |    6 +-
+ arch/arm/mach-imx/mach-kzm_arm11_01.c              |    7 +-
+ arch/arm/mach-imx/mach-mx1ads.c                    |    7 +-
+ arch/arm/mach-imx/mach-mx21ads.c                   |    6 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c                  |    8 +-
+ arch/arm/mach-imx/mach-mx27_3ds.c                  |   10 +-
+ arch/arm/mach-imx/mach-mx27ads.c                   |    6 +-
+ arch/arm/mach-imx/mach-mx31_3ds.c                  |   12 +-
+ arch/arm/mach-imx/mach-mx31ads.c                   |    5 +-
+ arch/arm/mach-imx/mach-mx31lilly.c                 |   11 +-
+ arch/arm/mach-imx/mach-mx31lite.c                  |   11 +-
+ arch/arm/mach-imx/mach-mx31moboard.c               |   14 +-
+ arch/arm/mach-imx/mach-mx35_3ds.c                  |    8 +-
+ arch/arm/mach-imx/mach-mx50_rdp.c                  |    7 +-
+ arch/arm/mach-imx/mach-mx51_3ds.c                  |    9 +-
+ arch/arm/mach-imx/mach-mx51_babbage.c              |    7 +-
+ arch/arm/mach-imx/mach-mxt_td60.c                  |    6 +-
+ arch/arm/mach-imx/mach-pca100.c                    |    8 +-
+ arch/arm/mach-imx/mach-pcm037.c                    |    8 +-
+ arch/arm/mach-imx/mach-pcm037_eet.c                |    5 +-
+ arch/arm/mach-imx/mach-pcm038.c                    |   13 +-
+ arch/arm/mach-imx/mach-pcm043.c                    |    9 +-
+ arch/arm/mach-imx/mach-qong.c                      |    6 +-
+ arch/arm/mach-imx/mach-scb9328.c                   |    7 +-
+ arch/arm/mach-imx/mach-vpr200.c                    |    7 +-
+ arch/arm/mach-imx/mm-imx1.c                        |    9 +-
+ arch/arm/mach-imx/mm-imx21.c                       |   14 +-
+ arch/arm/mach-imx/mm-imx25.c                       |   12 +-
+ arch/arm/mach-imx/mm-imx27.c                       |   14 +-
+ arch/arm/mach-imx/mm-imx3.c                        |   13 +-
+ arch/arm/mach-imx/mm-imx5.c                        |   12 +-
+ arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h |    0
+ arch/arm/mach-imx/mx31lilly-db.c                   |    9 +-
+ arch/arm/mach-imx/mx31lite-db.c                    |    9 +-
+ arch/arm/mach-imx/mx31moboard-devboard.c           |    9 +-
+ arch/arm/mach-imx/mx31moboard-marxbot.c            |    9 +-
+ arch/arm/mach-imx/mx31moboard-smartbot.c           |   11 +-
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h |    0
+ .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h |    0
+ arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h |    0
+ arch/arm/mach-imx/pcm970-baseboard.c               |    7 +-
+ arch/arm/mach-imx/platsmp.c                        |    5 +-
+ arch/arm/mach-imx/pm-imx27.c                       |    3 +-
+ arch/arm/mach-imx/pm-imx3.c                        |    7 +-
+ arch/arm/mach-imx/pm-imx5.c                        |    7 +-
+ arch/arm/mach-imx/pm-imx6q.c                       |    5 +-
+ arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c     |    0
+ arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S          |    0
+ arch/arm/{plat-mxc => mach-imx}/system.c           |    5 +-
+ arch/arm/{plat-mxc => mach-imx}/time.c             |    5 +-
+ arch/arm/{plat-mxc => mach-imx}/tzic.c             |    6 +-
+ arch/arm/{plat-mxc => mach-imx}/ulpi.c             |    2 +-
+ .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h |    0
+ arch/arm/mach-integrator/include/mach/irqs.h       |  109 +-
+ arch/arm/mach-integrator/integrator_ap.c           |    5 +-
+ arch/arm/mach-integrator/integrator_cp.c           |    6 +-
+ arch/arm/mach-nomadik/Kconfig                      |    2 +-
+ arch/arm/mach-nomadik/board-nhk8815.c              |    7 +-
+ arch/arm/mach-nomadik/include/mach/irqs.h          |    2 +-
+ arch/arm/mach-omap1/board-ams-delta.c              |    1 -
+ arch/arm/mach-omap1/board-fsample.c                |    9 +-
+ arch/arm/mach-omap1/board-generic.c                |    1 -
+ arch/arm/mach-omap1/board-h2-mmc.c                 |    5 +-
+ arch/arm/mach-omap1/board-h2.c                     |    6 +-
+ arch/arm/mach-omap1/board-h3-mmc.c                 |    3 +-
+ arch/arm/mach-omap1/board-h3.c                     |    5 +-
+ arch/arm/mach-omap1/board-htcherald.c              |    3 +-
+ arch/arm/mach-omap1/board-innovator.c              |   31 +-
+ arch/arm/mach-omap1/board-nokia770.c               |    5 +-
+ arch/arm/mach-omap1/board-osk.c                    |    3 +-
+ arch/arm/mach-omap1/board-palmte.c                 |    6 +-
+ arch/arm/mach-omap1/board-palmtt.c                 |    8 +-
+ arch/arm/mach-omap1/board-palmz71.c                |    6 +-
+ arch/arm/mach-omap1/board-perseus2.c               |    9 +-
+ arch/arm/mach-omap1/board-sx1-mmc.c                |    3 +-
+ arch/arm/mach-omap1/board-sx1.c                    |    6 +-
+ arch/arm/mach-omap1/board-voiceblue.c              |    3 +-
+ arch/arm/mach-omap1/clock.c                        |  508 +++++-
+ arch/arm/mach-omap1/clock.h                        |  178 +-
+ arch/arm/mach-omap1/clock_data.c                   |   17 +-
+ arch/arm/mach-omap1/common.h                       |    8 +-
+ arch/arm/mach-omap1/devices.c                      |   15 +-
+ arch/arm/mach-omap1/dma.c                          |    6 +-
+ arch/arm/mach-omap1/dma.h                          |   83 +
+ arch/arm/mach-omap1/flash.c                        |    2 +-
+ arch/arm/mach-omap1/fpga.c                         |    3 +-
+ arch/arm/mach-omap1/i2c.c                          |   61 +-
+ arch/arm/mach-omap1/id.c                           |    2 +-
+ arch/arm/mach-omap1/include/mach/debug-macro.S     |    2 +-
+ arch/arm/mach-omap1/include/mach/hardware.h        |    6 +-
+ arch/arm/mach-omap1/include/mach/memory.h          |    2 +-
+ arch/arm/mach-omap1/include/mach/omap1510.h        |  113 ++
+ arch/arm/mach-omap1/include/mach/serial.h          |   53 +
+ .../include/plat => mach-omap1/include/mach}/tc.h  |    0
+ arch/arm/mach-omap1/include/mach/uncompress.h      |  121 +-
+ arch/arm/mach-omap1/io.c                           |    4 +-
+ arch/arm/mach-omap1/irq.c                          |    2 +-
+ arch/arm/mach-omap1/lcd_dma.c                      |    4 +-
+ arch/arm/mach-omap1/mcbsp.c                        |    5 +-
+ arch/arm/mach-omap1/mmc.h                          |   18 +
+ arch/arm/mach-omap1/opp_data.c                     |    2 +-
+ arch/arm/mach-omap1/pm.c                           |   10 +-
+ arch/arm/mach-omap1/pm_bus.c                       |    3 +-
+ arch/arm/mach-omap1/reset.c                        |   38 +
+ arch/arm/mach-omap1/serial.c                       |    1 -
+ arch/arm/mach-omap1/soc.h                          |  229 +++
+ arch/arm/mach-omap2/Makefile                       |  115 +-
+ arch/arm/mach-omap2/am35xx-emac.c                  |    2 +-
+ arch/arm/mach-omap2/board-2430sdp.c                |    3 +-
+ arch/arm/mach-omap2/board-3430sdp.c                |    6 +-
+ arch/arm/mach-omap2/board-3630sdp.c                |    3 +-
+ arch/arm/mach-omap2/board-4430sdp.c                |    4 +-
+ arch/arm/mach-omap2/board-am3517crane.c            |    1 -
+ arch/arm/mach-omap2/board-am3517evm.c              |    2 +-
+ arch/arm/mach-omap2/board-apollon.c                |    4 +-
+ arch/arm/mach-omap2/board-cm-t35.c                 |    8 +-
+ arch/arm/mach-omap2/board-cm-t3517.c               |    6 +-
+ arch/arm/mach-omap2/board-devkit8000.c             |   11 +-
+ arch/arm/mach-omap2/board-flash.c                  |   52 +-
+ arch/arm/mach-omap2/board-flash.h                  |    8 +-
+ arch/arm/mach-omap2/board-h4.c                     |    6 +-
+ arch/arm/mach-omap2/board-igep0020.c               |    9 +-
+ arch/arm/mach-omap2/board-ldp.c                    |    9 +-
+ arch/arm/mach-omap2/board-n8x0.c                   |    5 +-
+ arch/arm/mach-omap2/board-omap3beagle.c            |   16 +-
+ arch/arm/mach-omap2/board-omap3evm.c               |   11 +-
+ arch/arm/mach-omap2/board-omap3logic.c             |    7 +-
+ arch/arm/mach-omap2/board-omap3pandora.c           |    4 +-
+ arch/arm/mach-omap2/board-omap3stalker.c           |    3 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c         |   11 +-
+ arch/arm/mach-omap2/board-omap4panda.c             |    6 +-
+ arch/arm/mach-omap2/board-overo.c                  |   11 +-
+ arch/arm/mach-omap2/board-rm680.c                  |    9 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c       |    7 +-
+ arch/arm/mach-omap2/board-rx51.c                   |    8 +-
+ arch/arm/mach-omap2/board-ti8168evm.c              |    3 +-
+ arch/arm/mach-omap2/board-zoom-debugboard.c        |    4 +-
+ arch/arm/mach-omap2/board-zoom-display.c           |    3 +-
+ arch/arm/mach-omap2/board-zoom-peripherals.c       |    3 +-
+ arch/arm/mach-omap2/board-zoom.c                   |    8 +-
+ .../arm/mach-omap2/{include/mach => }/board-zoom.h |    0
+ arch/arm/mach-omap2/clkt2xxx_apll.c                |    3 +-
+ arch/arm/mach-omap2/clkt2xxx_dpll.c                |    4 +-
+ arch/arm/mach-omap2/clkt2xxx_dpllcore.c            |    5 +-
+ arch/arm/mach-omap2/clkt2xxx_osc.c                 |    2 -
+ arch/arm/mach-omap2/clkt2xxx_sys.c                 |    2 -
+ arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c       |    5 +-
+ arch/arm/mach-omap2/clkt34xx_dpll3m2.c             |    4 +-
+ arch/arm/mach-omap2/clkt_clksel.c                  |    2 -
+ arch/arm/mach-omap2/clkt_dpll.c                    |    2 -
+ arch/arm/mach-omap2/clkt_iclk.c                    |    1 -
+ arch/arm/mach-omap2/clock.c                        |  521 +++++-
+ arch/arm/mach-omap2/clock.h                        |  317 +++-
+ arch/arm/mach-omap2/clock2420_data.c               |    6 +-
+ arch/arm/mach-omap2/clock2430.c                    |    4 +-
+ arch/arm/mach-omap2/clock2430_data.c               |    6 +-
+ arch/arm/mach-omap2/clock2xxx.c                    |    2 -
+ arch/arm/mach-omap2/clock33xx_data.c               |    5 +-
+ arch/arm/mach-omap2/clock34xx.c                    |    4 +-
+ arch/arm/mach-omap2/clock3517.c                    |    4 +-
+ arch/arm/mach-omap2/clock36xx.c                    |    2 -
+ arch/arm/mach-omap2/clock3xxx.c                    |    2 -
+ arch/arm/mach-omap2/clock3xxx_data.c               |    6 +-
+ arch/arm/mach-omap2/clock44xx_data.c               |    4 -
+ arch/arm/mach-omap2/clockdomain.c                  |    3 +-
+ arch/arm/mach-omap2/clockdomain.h                  |    5 +-
+ arch/arm/mach-omap2/clockdomain2xxx_3xxx.c         |  339 ----
+ arch/arm/mach-omap2/clockdomain33xx.c              |   74 -
+ arch/arm/mach-omap2/clockdomain44xx.c              |  151 --
+ arch/arm/mach-omap2/clockdomains2420_data.c        |    1 +
+ arch/arm/mach-omap2/clockdomains2430_data.c        |    1 +
+ arch/arm/mach-omap2/clockdomains3xxx_data.c        |    1 +
+ arch/arm/mach-omap2/cm.h                           |   12 +
+ arch/arm/mach-omap2/cm2xxx.c                       |  255 +++
+ arch/arm/mach-omap2/cm2xxx.h                       |   66 +
+ arch/arm/mach-omap2/cm2xxx_3xxx.h                  |  119 +-
+ arch/arm/mach-omap2/cm33xx.c                       |   58 +-
+ arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c}    |  307 ++--
+ arch/arm/mach-omap2/cm3xxx.h                       |   86 +
+ arch/arm/mach-omap2/cm_common.c                    |   71 +
+ arch/arm/mach-omap2/cminst44xx.c                   |  142 +-
+ arch/arm/mach-omap2/common-board-devices.c         |   46 -
+ arch/arm/mach-omap2/common-board-devices.h         |    1 -
+ arch/arm/mach-omap2/common.c                       |   22 +-
+ arch/arm/mach-omap2/common.h                       |   12 +-
+ arch/arm/mach-omap2/control.c                      |    8 +-
+ arch/arm/mach-omap2/devices.c                      |    8 +-
+ arch/arm/mach-omap2/display.c                      |   45 +-
+ arch/arm/mach-omap2/dma.c                          |    8 +-
+ arch/arm/mach-omap2/dma.h                          |  131 ++
+ arch/arm/mach-omap2/dpll3xxx.c                     |    2 -
+ arch/arm/mach-omap2/dpll44xx.c                     |    2 -
+ arch/arm/mach-omap2/drm.c                          |    4 +-
+ arch/arm/mach-omap2/dsp.c                          |    2 +-
+ arch/arm/mach-omap2/gpio.c                         |    6 +-
+ arch/arm/mach-omap2/gpmc-nand.c                    |   85 +-
+ arch/arm/mach-omap2/gpmc-nand.h                    |   27 +
+ arch/arm/mach-omap2/gpmc-onenand.c                 |  214 +--
+ arch/arm/mach-omap2/gpmc-onenand.h                 |   24 +
+ arch/arm/mach-omap2/gpmc-smc91x.c                  |    2 +-
+ arch/arm/mach-omap2/gpmc-smsc911x.c                |    2 +-
+ arch/arm/mach-omap2/gpmc.c                         |  464 +-----
+ .../{plat-omap/include/plat => mach-omap2}/gpmc.h  |   61 +-
+ arch/arm/mach-omap2/hdq1w.c                        |    4 +-
+ arch/arm/mach-omap2/hdq1w.h                        |    2 +-
+ arch/arm/mach-omap2/hsmmc.c                        |    7 +-
+ arch/arm/mach-omap2/hwspinlock.c                   |    4 +-
+ arch/arm/mach-omap2/i2c.c                          |   53 +-
+ .../{plat-omap/include/plat => mach-omap2}/i2c.h   |   25 +-
+ arch/arm/mach-omap2/include/mach/debug-macro.S     |    2 +-
+ arch/arm/mach-omap2/include/mach/uncompress.h      |  175 +-
+ arch/arm/mach-omap2/io.c                           |   14 +-
+ arch/arm/mach-omap2/mcbsp.c                        |    7 +-
+ arch/arm/mach-omap2/mmc.h                          |   23 +
+ arch/arm/mach-omap2/msdi.c                         |    7 +-
+ arch/arm/mach-omap2/mux.c                          |    3 +-
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c          |    1 +
+ .../include/plat => mach-omap2}/omap-pm.h          |    0
+ arch/arm/mach-omap2/omap-secure.c                  |    1 -
+ arch/arm/mach-omap2/omap-secure.h                  |    7 +
+ arch/arm/mach-omap2/omap4-common.c                 |    7 +-
+ arch/arm/{plat-omap => mach-omap2}/omap_device.c   |    5 +-
+ .../include/plat => mach-omap2}/omap_device.h      |    2 +-
+ arch/arm/mach-omap2/omap_hwmod.c                   |   55 +-
+ .../include/plat => mach-omap2}/omap_hwmod.h       |    1 -
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   13 +-
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   12 +-
+ .../omap_hwmod_2xxx_3xxx_interconnect_data.c       |    3 +-
+ .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |   11 +-
+ .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |    4 +-
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |    6 +-
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |   10 +-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   14 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   13 +-
+ arch/arm/mach-omap2/omap_hwmod_common_data.c       |    2 +-
+ arch/arm/mach-omap2/omap_hwmod_common_data.h       |    2 +-
+ arch/arm/mach-omap2/omap_opp_data.h                |    2 +-
+ arch/arm/mach-omap2/omap_phy_internal.c            |    4 +-
+ arch/arm/mach-omap2/omap_twl.c                     |    1 +
+ arch/arm/mach-omap2/opp.c                          |    2 +-
+ arch/arm/mach-omap2/opp3xxx_data.c                 |    1 +
+ arch/arm/mach-omap2/pm-debug.c                     |    5 +-
+ arch/arm/mach-omap2/pm.c                           |    5 +-
+ arch/arm/mach-omap2/pm24xx.c                       |   12 +-
+ arch/arm/mach-omap2/pm34xx.c                       |   14 +-
+ arch/arm/mach-omap2/pm44xx.c                       |    1 +
+ arch/arm/mach-omap2/pmu.c                          |    5 +-
+ arch/arm/mach-omap2/powerdomain.h                  |    2 -
+ arch/arm/mach-omap2/powerdomain2xxx_3xxx.c         |  242 ---
+ arch/arm/mach-omap2/powerdomain33xx.c              |  229 ---
+ arch/arm/mach-omap2/powerdomain44xx.c              |  285 ----
+ arch/arm/mach-omap2/powerdomains2xxx_data.c        |    1 +
+ arch/arm/mach-omap2/prcm.c                         |    1 +
+ arch/arm/mach-omap2/prm-regbits-24xx.h             |    6 +-
+ arch/arm/mach-omap2/prm-regbits-34xx.h             |   12 +-
+ arch/arm/mach-omap2/prm.h                          |   53 +
+ arch/arm/mach-omap2/prm2xxx.c                      |  126 ++
+ arch/arm/mach-omap2/prm2xxx.h                      |  132 ++
+ arch/arm/mach-omap2/prm2xxx_3xxx.c                 |  332 ++--
+ arch/arm/mach-omap2/prm2xxx_3xxx.h                 |  277 +---
+ arch/arm/mach-omap2/prm33xx.c                      |  204 ++-
+ arch/arm/mach-omap2/prm3xxx.c                      |  403 +++++
+ arch/arm/mach-omap2/prm3xxx.h                      |  160 ++
+ arch/arm/mach-omap2/prm44xx.c                      |  355 +++-
+ arch/arm/mach-omap2/prm44xx.h                      |    2 +
+ arch/arm/mach-omap2/prm_common.c                   |  106 +-
+ arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h |    2 +-
+ arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h  |    2 +-
+ arch/arm/mach-omap2/sdram-nokia.c                  |    4 +-
+ arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h     |    2 +-
+ .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h    |    2 +-
+ arch/arm/mach-omap2/sdrc.c                         |   23 +-
+ arch/arm/mach-omap2/sdrc.h                         |  146 +-
+ arch/arm/mach-omap2/sdrc2xxx.c                     |    6 +-
+ arch/arm/mach-omap2/serial.c                       |   13 +-
+ .../include/plat => mach-omap2}/serial.h           |   11 -
+ arch/arm/mach-omap2/sleep34xx.S                    |    6 +-
+ arch/arm/mach-omap2/soc.h                          |  468 +++++-
+ arch/arm/mach-omap2/sr_device.c                    |    4 +-
+ arch/arm/mach-omap2/sram242x.S                     |    4 +-
+ arch/arm/mach-omap2/sram243x.S                     |    4 +-
+ arch/arm/mach-omap2/sram34xx.S                     |    2 +-
+ arch/arm/mach-omap2/timer.c                        |    6 +-
+ arch/arm/mach-omap2/twl-common.c                   |    3 -
+ arch/arm/mach-omap2/usb-host.c                     |    6 +-
+ arch/arm/mach-omap2/usb-musb.c                     |    8 +-
+ arch/arm/mach-omap2/usb-tusb6010.c                 |    3 +-
+ arch/arm/mach-omap2/usb.h                          |   82 +
+ arch/arm/mach-omap2/wd_timer.c                     |    2 +-
+ arch/arm/mach-omap2/wd_timer.h                     |    2 +-
+ arch/arm/mach-pxa/pxa3xx-ulpi.c                    |   13 +-
+ arch/arm/mach-shmobile/Kconfig                     |   29 +-
+ arch/arm/mach-shmobile/Makefile                    |    8 -
+ arch/arm/mach-shmobile/board-armadillo800eva.c     |    8 +
+ arch/arm/mach-shmobile/board-g3evm.c               |  343 ----
+ arch/arm/mach-shmobile/board-g4evm.c               |  384 -----
+ arch/arm/mach-shmobile/board-kzm9g.c               |   14 +-
+ arch/arm/mach-shmobile/board-mackerel.c            |    8 +-
+ arch/arm/mach-shmobile/board-marzen.c              |   25 +
+ arch/arm/mach-shmobile/clock-r8a7779.c             |   16 +-
+ arch/arm/mach-shmobile/clock-sh7367.c              |  355 ----
+ arch/arm/mach-shmobile/clock-sh7377.c              |  366 -----
+ arch/arm/mach-shmobile/include/mach/common.h       |   18 -
+ arch/arm/mach-shmobile/include/mach/sh7367.h       |  332 ----
+ arch/arm/mach-shmobile/include/mach/sh7372.h       |    4 +
+ arch/arm/mach-shmobile/include/mach/sh7377.h       |  360 ----
+ arch/arm/mach-shmobile/intc-sh7367.c               |  413 -----
+ arch/arm/mach-shmobile/intc-sh7377.c               |  592 -------
+ arch/arm/mach-shmobile/pfc-sh7367.c                | 1727 --------------------
+ arch/arm/mach-shmobile/pfc-sh7377.c                | 1688 -------------------
+ arch/arm/mach-shmobile/setup-r8a7740.c             |   18 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c             |   77 +
+ arch/arm/mach-shmobile/setup-sh7367.c              |  481 ------
+ arch/arm/mach-shmobile/setup-sh7372.c              |   20 +
+ arch/arm/mach-shmobile/setup-sh7377.c              |  549 -------
+ arch/arm/mach-shmobile/smp-emev2.c                 |   22 +-
+ arch/arm/mach-shmobile/smp-r8a7779.c               |   25 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c                |   23 +-
+ arch/arm/mach-socfpga/Kconfig                      |    1 +
+ arch/arm/mach-socfpga/Makefile                     |    1 +
+ .../include/mach/irqs.h => mach-socfpga/core.h}    |   22 +-
+ arch/arm/mach-socfpga/headsmp.S                    |   25 +
+ arch/arm/mach-socfpga/platsmp.c                    |  116 ++
+ arch/arm/mach-socfpga/socfpga.c                    |   54 +-
+ arch/arm/mach-ux500/Kconfig                        |    2 +-
+ arch/arm/mach-ux500/board-mop500-audio.c           |    3 +-
+ arch/arm/mach-ux500/board-mop500-sdi.c             |    2 +-
+ arch/arm/mach-ux500/board-mop500-stuib.c           |   22 +-
+ arch/arm/mach-ux500/board-mop500.c                 |  156 +-
+ arch/arm/mach-ux500/board-mop500.h                 |    8 +-
+ arch/arm/mach-ux500/cpu-db8500.c                   |  112 +-
+ arch/arm/mach-ux500/cpu.c                          |    3 +
+ arch/arm/mach-ux500/devices-common.c               |    1 +
+ arch/arm/mach-ux500/devices-db8500.c               |    4 +-
+ arch/arm/mach-ux500/devices-db8500.h               |    1 +
+ arch/arm/mach-ux500/include/mach/irqs.h            |    2 +-
+ arch/arm/mach-ux500/include/mach/msp.h             |    2 +-
+ arch/arm/mach-ux500/timer.c                        |    5 +-
+ arch/arm/mach-ux500/usb.c                          |    4 +-
+ arch/arm/mach-versatile/core.c                     |    2 +-
+ arch/arm/mach-vexpress/Kconfig                     |    4 +-
+ arch/arm/mach-vexpress/Makefile                    |    2 +-
+ arch/arm/mach-vexpress/ct-ca9x4.c                  |   41 +-
+ arch/arm/mach-vexpress/include/mach/motherboard.h  |   81 -
+ arch/arm/mach-vexpress/platsmp.c                   |    3 +-
+ arch/arm/mach-vexpress/reset.c                     |  141 ++
+ arch/arm/mach-vexpress/v2m.c                       |  349 +---
+ arch/arm/mach-vt8500/Kconfig                       |   12 +
+ arch/arm/mach-vt8500/common.h                      |    3 +
+ arch/arm/mach-vt8500/include/mach/entry-macro.S    |   26 -
+ arch/arm/mach-vt8500/include/mach/hardware.h       |   12 -
+ arch/arm/mach-vt8500/include/mach/i8042.h          |   18 -
+ arch/arm/mach-vt8500/include/mach/restart.h        |   17 -
+ arch/arm/mach-vt8500/irq.c                         |  108 +-
+ arch/arm/mach-vt8500/timer.c                       |    2 +-
+ arch/arm/mach-vt8500/vt8500.c                      |    3 +-
+ arch/arm/mm/mmu.c                                  |   16 +
+ arch/arm/plat-mxc/Kconfig                          |   89 -
+ arch/arm/plat-mxc/Makefile                         |   24 -
+ arch/arm/plat-mxc/include/mach/irqs.h              |   21 -
+ arch/arm/plat-mxc/include/mach/timex.h             |   22 -
+ arch/arm/plat-mxc/include/mach/uncompress.h        |  132 --
+ arch/arm/plat-nomadik/Kconfig                      |   29 -
+ arch/arm/plat-nomadik/Makefile                     |    5 -
+ arch/arm/plat-omap/Makefile                        |    3 +-
+ arch/arm/plat-omap/clock.c                         |  544 ------
+ arch/arm/plat-omap/common.c                        |   25 +-
+ arch/arm/plat-omap/{include/plat => }/common.h     |   10 +-
+ arch/arm/plat-omap/counter_32k.c                   |    3 +-
+ arch/arm/plat-omap/debug-leds.c                    |    2 +-
+ arch/arm/plat-omap/dma.c                           |   30 +-
+ arch/arm/plat-omap/dmtimer.c                       |    3 +-
+ arch/arm/plat-omap/fb.c                            |   61 +
+ arch/arm/plat-omap/fpga.h                          |   74 +
+ arch/arm/plat-omap/i2c.c                           |  133 +-
+ arch/arm/plat-omap/i2c.h                           |   47 +
+ .../include/{plat/dma.h => plat-omap/dma-omap.h}   |  181 +-
+ arch/arm/plat-omap/include/plat/clkdev_omap.h      |   51 -
+ arch/arm/plat-omap/include/plat/clock.h            |  309 ----
+ arch/arm/plat-omap/include/plat/cpu.h              |  468 +-----
+ arch/arm/plat-omap/include/plat/dma-44xx.h         |  147 --
+ arch/arm/plat-omap/include/plat/fpga.h             |  193 ---
+ arch/arm/plat-omap/include/plat/multi.h            |  120 --
+ arch/arm/plat-omap/include/plat/omap-secure.h      |   14 -
+ arch/arm/plat-omap/include/plat/sdrc.h             |  164 --
+ arch/arm/plat-omap/include/plat/sram.h             |  105 --
+ arch/arm/plat-omap/include/plat/uncompress.h       |  204 ---
+ arch/arm/plat-omap/include/plat/usb.h              |  179 --
+ arch/arm/plat-omap/omap-pm-noop.c                  |    5 +-
+ arch/arm/plat-omap/sram.c                          |    4 +-
+ arch/arm/plat-omap/sram.h                          |  109 +-
+ arch/arm/plat-versatile/Kconfig                    |    9 -
+ arch/arm/plat-versatile/Makefile                   |    1 -
+ drivers/char/hw_random/Kconfig                     |    2 +-
+ drivers/char/hw_random/omap-rng.c                  |    2 -
+ drivers/clk/Kconfig                                |   16 +-
+ drivers/clk/Makefile                               |    1 +
+ drivers/clk/clk-fixed-rate.c                       |    2 +-
+ drivers/clk/clk-prima2.c                           |   84 +-
+ drivers/clk/clk-twl6040.c                          |  126 ++
+ drivers/clk/clk.c                                  |   20 +-
+ drivers/clk/spear/clk-vco-pll.c                    |    2 +-
+ drivers/clk/ux500/clk-prcmu.c                      |   55 +
+ drivers/clk/ux500/clk.h                            |    6 +
+ drivers/clk/ux500/u8500_clk.c                      |    7 +-
+ drivers/clk/versatile/Makefile                     |    2 +
+ drivers/clk/versatile/clk-vexpress-osc.c           |  146 ++
+ drivers/clk/versatile/clk-vexpress.c               |  142 ++
+ drivers/clocksource/Kconfig                        |   17 +-
+ drivers/clocksource/Makefile                       |    1 +
+ .../timer.c => drivers/clocksource/nomadik-mtu.c   |   11 +-
+ drivers/crypto/omap-aes.c                          |    8 +-
+ drivers/crypto/omap-sham.c                         |   10 +-
+ drivers/crypto/ux500/cryp/cryp_core.c              |    3 +-
+ drivers/dma/imx-dma.c                              |  137 +-
+ drivers/dma/imx-sdma.c                             |    1 -
+ drivers/dma/ipu/ipu_idmac.c                        |    3 +-
+ drivers/dma/ipu/ipu_irq.c                          |    3 +-
+ drivers/dma/omap-dma.c                             |   11 +-
+ drivers/dma/ste_dma40.c                            |    3 +-
+ drivers/dma/ste_dma40_ll.c                         |    2 +-
+ drivers/hwmon/Kconfig                              |    8 +
+ drivers/hwmon/Makefile                             |    1 +
+ drivers/hwmon/vexpress.c                           |  229 +++
+ drivers/i2c/busses/i2c-imx.c                       |   40 +-
+ drivers/input/keyboard/Kconfig                     |    2 +-
+ drivers/irqchip/Kconfig                            |    9 +-
+ drivers/irqchip/Makefile                           |    1 +
+ .../irqchip/irq-versatile-fpga.c                   |   54 +-
+ drivers/media/platform/omap/omap_vout.c            |    4 +-
+ drivers/media/platform/omap/omap_vout_vrfb.c       |    6 +-
+ drivers/media/platform/omap/omap_voutdef.h         |    2 +-
+ drivers/media/platform/omap3isp/isphist.c          |    2 +
+ drivers/media/platform/omap3isp/ispstat.h          |    2 +-
+ drivers/media/platform/soc_camera/mx2_camera.c     |   95 +-
+ drivers/media/platform/soc_camera/mx3_camera.c     |    2 +-
+ drivers/media/platform/soc_camera/omap1_camera.c   |    3 +-
+ drivers/media/rc/ir-rx51.c                         |    1 -
+ drivers/mfd/Kconfig                                |    6 +
+ drivers/mfd/Makefile                               |    1 +
+ drivers/mfd/ab8500-core.c                          |   13 +-
+ drivers/mfd/db8500-prcmu.c                         |   16 +-
+ drivers/mfd/menelaus.c                             |    2 +-
+ drivers/mfd/omap-usb-host.c                        |    5 +-
+ drivers/mfd/omap-usb-tll.c                         |    2 +-
+ drivers/mfd/omap-usb.h                             |    2 +
+ drivers/mfd/vexpress-config.c                      |  277 ++++
+ drivers/mfd/vexpress-sysreg.c                      |  552 +++++++
+ drivers/mmc/host/mxcmmc.c                          |   31 +-
+ drivers/mmc/host/omap.c                            |   35 +-
+ drivers/mmc/host/omap_hsmmc.c                      |    4 +-
+ drivers/mtd/nand/Kconfig                           |    2 +-
+ drivers/mtd/nand/mxc_nand.c                        |   96 +-
+ drivers/mtd/nand/omap2.c                           |  129 +-
+ drivers/mtd/onenand/omap2.c                        |   47 +-
+ drivers/pcmcia/omap_cf.c                           |    2 +-
+ drivers/pinctrl/pinctrl-nomadik.c                  |    3 +-
+ drivers/rtc/rtc-mxc.c                              |   34 +-
+ .../tidspbridge/include/dspbridge/host_os.h        |    1 -
+ drivers/usb/gadget/omap_udc.c                      |    4 +-
+ drivers/usb/host/ehci-mxc.c                        |    1 -
+ drivers/usb/host/ehci-omap.c                       |    3 +-
+ drivers/usb/host/ohci-omap.c                       |    5 +-
+ drivers/usb/host/ohci-omap3.c                      |    1 -
+ drivers/usb/musb/am35x.c                           |    3 +-
+ drivers/usb/musb/musb_dsps.c                       |    3 +-
+ drivers/usb/musb/omap2430.h                        |    2 +-
+ drivers/usb/musb/tusb6010_omap.c                   |    9 +-
+ drivers/video/imxfb.c                              |   38 +-
+ drivers/video/mx3fb.c                              |    3 +-
+ drivers/video/omap/lcd_inn1510.c                   |    7 +-
+ drivers/video/omap/lcdc.c                          |    2 +-
+ drivers/video/omap/omapfb_main.c                   |    2 +-
+ drivers/video/omap/sossi.c                         |    2 +-
+ drivers/video/omap2/dss/core.c                     |    2 +-
+ drivers/video/omap2/dss/dispc.c                    |   43 +-
+ drivers/video/omap2/dss/dss.c                      |   39 +-
+ drivers/video/omap2/dss/dss_features.c             |   64 +-
+ drivers/video/omap2/dss/dss_features.h             |    5 +-
+ drivers/video/omap2/dss/hdmi.c                     |    3 +-
+ drivers/video/omap2/omapfb/omapfb-ioctl.c          |    2 +-
+ drivers/video/omap2/omapfb/omapfb-main.c           |    8 +-
+ drivers/video/omap2/omapfb/omapfb-sysfs.c          |    2 +-
+ drivers/video/omap2/vrfb.c                         |  142 +-
+ drivers/watchdog/imx2_wdt.c                        |    1 -
+ include/linux/clk-provider.h                       |   16 +-
+ .../mach/ipu.h => include/linux/dma/ipu-dma.h      |    6 +-
+ .../linux/irqchip/versatile-fpga.h                 |    0
+ include/linux/mfd/db8500-prcmu.h                   |    4 +-
+ include/linux/mfd/dbx500-prcmu.h                   |   10 +
+ .../include/plat => include/linux/mfd}/menelaus.h  |    2 -
+ include/linux/platform_data/asoc-imx-ssi.h         |    2 +
+ .../linux/platform_data/clocksource-nomadik-mtu.h  |    2 +-
+ include/linux/platform_data/crypto-ux500.h         |    2 +-
+ include/linux/platform_data/dma-imx.h              |    4 +-
+ .../linux/platform_data/dma-ste-dma40.h            |    0
+ .../linux/platform_data/leds-omap.h                |    2 -
+ .../linux/platform_data/mmc-omap.h                 |   48 +-
+ include/linux/platform_data/mtd-nand-omap2.h       |   46 +-
+ include/linux/platform_data/mtd-onenand-omap2.h    |   28 +-
+ include/linux/platform_data/usb-omap.h             |   80 +
+ include/linux/vexpress.h                           |  121 ++
+ include/video/omapdss.h                            |   14 +
+ .../plat/vrfb.h => include/video/omapvrfb.h        |    2 +
+ sound/soc/fsl/imx-pcm-fiq.c                        |    1 -
+ sound/soc/fsl/imx-ssi.c                            |    1 -
+ sound/soc/omap/omap-pcm.c                          |    9 +-
+ sound/soc/ux500/ux500_pcm.c                        |    3 +-
+ 722 files changed, 14020 insertions(+), 16974 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
+ create mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21013.txt
+ create mode 100644 Documentation/hwmon/vexpress
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
+ create mode 100644 arch/arm/boot/dts/ccu9540.dts
+ create mode 100644 arch/arm/boot/dts/ecx-2000.dts
+ create mode 100644 arch/arm/boot/dts/ecx-common.dtsi
+ create mode 100644 arch/arm/boot/dts/href.dtsi
+ create mode 100644 arch/arm/boot/dts/hrefprev60.dts
+ rename arch/arm/boot/dts/{sh7377.dtsi => sh7372-mackerel.dts} (59%)
+ create mode 100644 arch/arm/boot/dts/stuib.dtsi
+ create mode 100644 arch/arm/configs/clps711x_defconfig
+ delete mode 100644 arch/arm/configs/edb7211_defconfig
+ delete mode 100644 arch/arm/configs/fortunet_defconfig
+ delete mode 100644 arch/arm/configs/g3evm_defconfig
+ delete mode 100644 arch/arm/configs/g4evm_defconfig
+ rename arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%)
+ delete mode 100644 arch/arm/mach-clps711x/edb7211-mm.c
+ rename arch/arm/mach-clps711x/{edb7211-arch.c => edb7211.c} (56%)
+ rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (99%)
+ rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%)
+ rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (98%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (97%)
+ rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%)
+ delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%)
+ rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%)
+ rename arch/arm/{plat-mxc => mach-imx}/system.c (97%)
+ rename arch/arm/{plat-mxc => mach-imx}/time.c (99%)
+ rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%)
+ rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%)
+ rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%)
+ create mode 100644 arch/arm/mach-omap1/dma.h
+ create mode 100644 arch/arm/mach-omap1/include/mach/serial.h
+ rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/tc.h (100%)
+ create mode 100644 arch/arm/mach-omap1/mmc.h
+ create mode 100644 arch/arm/mach-omap1/soc.h
+ rename arch/arm/mach-omap2/{include/mach => }/board-zoom.h (100%)
+ delete mode 100644 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
+ delete mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
+ delete mode 100644 arch/arm/mach-omap2/clockdomain44xx.c
+ create mode 100644 arch/arm/mach-omap2/cm2xxx.c
+ create mode 100644 arch/arm/mach-omap2/cm2xxx.h
+ rename arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (72%)
+ create mode 100644 arch/arm/mach-omap2/cm3xxx.h
+ create mode 100644 arch/arm/mach-omap2/cm_common.c
+ create mode 100644 arch/arm/mach-omap2/dma.h
+ create mode 100644 arch/arm/mach-omap2/gpmc-nand.h
+ create mode 100644 arch/arm/mach-omap2/gpmc-onenand.h
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc.h (67%)
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/i2c.h (66%)
+ create mode 100644 arch/arm/mach-omap2/mmc.h
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap-pm.h (100%)
+ rename arch/arm/{plat-omap => mach-omap2}/omap_device.c (99%)
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_device.h (99%)
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_hwmod.h (99%)
+ delete mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+ delete mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
+ delete mode 100644 arch/arm/mach-omap2/powerdomain44xx.c
+ create mode 100644 arch/arm/mach-omap2/prm2xxx.c
+ create mode 100644 arch/arm/mach-omap2/prm2xxx.h
+ create mode 100644 arch/arm/mach-omap2/prm3xxx.c
+ create mode 100644 arch/arm/mach-omap2/prm3xxx.h
+ rename arch/arm/{plat-omap/include/plat => mach-omap2}/serial.h (91%)
+ create mode 100644 arch/arm/mach-omap2/usb.h
+ delete mode 100644 arch/arm/mach-shmobile/board-g3evm.c
+ delete mode 100644 arch/arm/mach-shmobile/board-g4evm.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-sh7377.c
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7367.h
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7377.h
+ delete mode 100644 arch/arm/mach-shmobile/intc-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/intc-sh7377.c
+ delete mode 100644 arch/arm/mach-shmobile/pfc-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/pfc-sh7377.c
+ delete mode 100644 arch/arm/mach-shmobile/setup-sh7367.c
+ delete mode 100644 arch/arm/mach-shmobile/setup-sh7377.c
+ rename arch/arm/{mach-vt8500/include/mach/irqs.h => mach-socfpga/core.h} (61%)
+ create mode 100644 arch/arm/mach-socfpga/headsmp.S
+ create mode 100644 arch/arm/mach-socfpga/platsmp.c
+ create mode 100644 arch/arm/mach-vexpress/reset.c
+ create mode 100644 arch/arm/mach-vt8500/Kconfig
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h
+ delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h
+ delete mode 100644 arch/arm/plat-mxc/Kconfig
+ delete mode 100644 arch/arm/plat-mxc/Makefile
+ delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h
+ delete mode 100644 arch/arm/plat-mxc/include/mach/timex.h
+ delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h
+ delete mode 100644 arch/arm/plat-nomadik/Kconfig
+ delete mode 100644 arch/arm/plat-nomadik/Makefile
+ delete mode 100644 arch/arm/plat-omap/clock.c
+ rename arch/arm/plat-omap/{include/plat => }/common.h (89%)
+ create mode 100644 arch/arm/plat-omap/fpga.h
+ create mode 100644 arch/arm/plat-omap/i2c.h
+ rename arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} (61%)
+ delete mode 100644 arch/arm/plat-omap/include/plat/clkdev_omap.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/clock.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/dma-44xx.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/fpga.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/multi.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/sdrc.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/sram.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/usb.h
+ create mode 100644 drivers/clk/clk-twl6040.c
+ create mode 100644 drivers/clk/versatile/clk-vexpress-osc.c
+ create mode 100644 drivers/clk/versatile/clk-vexpress.c
+ rename arch/arm/plat-nomadik/timer.c => drivers/clocksource/nomadik-mtu.c (95%)
+ create mode 100644 drivers/hwmon/vexpress.c
+ rename arch/arm/plat-versatile/fpga-irq.c => drivers/irqchip/irq-versatile-fpga.c (83%)
+ create mode 100644 drivers/mfd/omap-usb.h
+ create mode 100644 drivers/mfd/vexpress-config.c
+ create mode 100644 drivers/mfd/vexpress-sysreg.c
+ rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%)
+ rename arch/arm/plat-versatile/include/plat/fpga-irq.h => include/linux/irqchip/versatile-fpga.h (100%)
+ rename {arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%)
+ rename arch/arm/plat-nomadik/include/plat/mtu.h => include/linux/platform_data/clocksource-nomadik-mtu.h (71%)
+ rename arch/arm/plat-nomadik/include/plat/ste_dma40.h => include/linux/platform_data/dma-ste-dma40.h (100%)
+ rename arch/arm/plat-omap/include/plat/led.h => include/linux/platform_data/leds-omap.h (91%)
+ rename arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h (80%)
+ create mode 100644 include/linux/platform_data/usb-omap.h
+ create mode 100644 include/linux/vexpress.h
+ rename arch/arm/plat-omap/include/plat/vrfb.h => include/video/omapvrfb.h (95%)
+Merging bcm2835/for-next (d7f292e Merge branch 'for-3.8/defconfig' into for-next)
+$ git merge bcm2835/for-next
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/watchdog/brcm,bcm2835-pm-wdog.txt     |   13 +++++
+ arch/arm/Kconfig                                   |    5 +-
+ arch/arm/boot/dts/bcm2835-rpi-b.dts                |   15 ++++++
+ arch/arm/boot/dts/bcm2835.dtsi                     |   28 +++++++++++
+ arch/arm/configs/bcm2835_defconfig                 |    2 -
+ arch/arm/mach-bcm2835/Makefile.boot                |    4 +-
+ arch/arm/mach-bcm2835/bcm2835.c                    |   50 +++++++++++++++++++-
+ arch/arm/mach-bcm2835/include/mach/gpio.h          |    1 +
+ drivers/clk/clk-bcm2835.c                          |    2 +-
+ 9 files changed, 111 insertions(+), 9 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt
+ create mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h
+Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
+$ git merge cortex/for-next
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm/mm/alignment.c
+Auto-merging arch/arm/kernel/process.c
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/assembler.h   |   13 ++-
+ arch/arm/include/asm/cp15.h        |   11 ++-
+ arch/arm/include/asm/cputype.h     |    3 +
+ arch/arm/include/asm/glue-cache.h  |   25 ++++++
+ arch/arm/include/asm/glue-df.h     |    8 ++
+ arch/arm/include/asm/glue-proc.h   |    9 ++
+ arch/arm/include/asm/irqflags.h    |   22 +++--
+ arch/arm/include/asm/processor.h   |    7 ++
+ arch/arm/include/asm/ptrace.h      |    8 ++
+ arch/arm/include/asm/system_info.h |    1 +
+ arch/arm/include/uapi/asm/ptrace.h |   36 ++++++--
+ arch/arm/kernel/asm-offsets.c      |    3 +
+ arch/arm/kernel/entry-common.S     |    4 +
+ arch/arm/kernel/entry-header.S     |  148 +++++++++++++++++++++++++++++++++
+ arch/arm/kernel/entry-v7m.S        |  134 ++++++++++++++++++++++++++++++
+ arch/arm/kernel/head-common.S      |    9 +-
+ arch/arm/kernel/head-nommu.S       |    9 +-
+ arch/arm/kernel/process.c          |    4 +
+ arch/arm/kernel/ptrace.c           |    3 +
+ arch/arm/kernel/setup.c            |   13 ++-
+ arch/arm/kernel/traps.c            |    2 +
+ arch/arm/mm/alignment.c            |    2 +
+ arch/arm/mm/mmu.c                  |   17 ++++
+ arch/arm/mm/nommu.c                |    2 +
+ arch/arm/mm/proc-v7m.S             |  161 ++++++++++++++++++++++++++++++++++++
+ 25 files changed, 632 insertions(+), 22 deletions(-)
+ create mode 100644 arch/arm/kernel/entry-v7m.S
+ create mode 100644 arch/arm/mm/proc-v7m.S
+Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
+$ git merge ixp4xx/next
+Auto-merging drivers/char/hw_random/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-ixp4xx/common-pci.c               |    1 +
+ arch/arm/mach-ixp4xx/common.c                   |   13 +++----
+ arch/arm/mach-ixp4xx/goramo_mlr.c               |    3 +-
+ arch/arm/mach-ixp4xx/include/mach/debug-macro.S |    4 +-
+ arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h |   46 ++++++++++-------------
+ arch/arm/mach-ixp4xx/include/mach/qmgr.h        |   12 +++---
+ arch/arm/mach-ixp4xx/ixp4xx_npe.c               |    9 ++++-
+ arch/arm/mach-ixp4xx/ixp4xx_qmgr.c              |   12 +-----
+ drivers/char/hw_random/Kconfig                  |    6 +--
+ drivers/char/hw_random/ixp4xx-rng.c             |    5 ++-
+ drivers/crypto/Kconfig                          |    2 +-
+ drivers/crypto/ixp4xx_crypto.c                  |   12 +++---
+ drivers/net/wan/ixp4xx_hss.c                    |    2 +-
+ 13 files changed, 59 insertions(+), 68 deletions(-)
+Merging msm/for-next (a0d271c Linux 3.6)
+$ git merge msm/for-next
+Already up-to-date.
+Merging renesas/next (07efb0c Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/soc2' into next)
+$ git merge renesas/next
+Auto-merging arch/arm/configs/marzen_defconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/marzen_defconfig              |   14 +-
+ arch/arm/mach-shmobile/Kconfig                 |    2 +
+ arch/arm/mach-shmobile/board-ap4evb.c          |  139 +-----------------
+ arch/arm/mach-shmobile/board-armadillo800eva.c |   38 +----
+ arch/arm/mach-shmobile/board-mackerel.c        |   74 +---------
+ arch/arm/mach-shmobile/board-marzen.c          |  186 +++++++++++++++++++++++-
+ arch/arm/mach-shmobile/clock-r8a7740.c         |   34 +++++
+ arch/arm/mach-shmobile/clock-r8a7779.c         |    7 +
+ arch/arm/mach-shmobile/clock-sh7372.c          |  106 +++-----------
+ arch/arm/mach-shmobile/include/mach/r8a7779.h  |    2 +-
+ arch/arm/mach-shmobile/include/mach/sh7372.h   |    4 -
+ arch/arm/mach-shmobile/pfc-r8a7779.c           |   16 +-
+ drivers/sh/clk/cpg.c                           |   86 +++++++++++
+ include/linux/sh_clk.h                         |    9 ++
+ 14 files changed, 368 insertions(+), 349 deletions(-)
+Merging samsung/for-next (a9fe9f0 Merge branch 'next/cleanup-samsung-2' into for-next)
+$ git merge samsung/for-next
+Auto-merging drivers/pinctrl/pinctrl-exynos.c
+Removing arch/arm/mach-exynos/dev-drm.c
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/drm/exynos/hdmi.txt        |   22 +
+ .../devicetree/bindings/drm/exynos/hdmiddc.txt     |   12 +
+ .../devicetree/bindings/drm/exynos/hdmiphy.txt     |   12 +
+ .../devicetree/bindings/drm/exynos/mixer.txt       |   15 +
+ .../devicetree/bindings/media/s5p-mfc.txt          |   23 +
+ .../bindings/pinctrl/samsung-pinctrl.txt           |    1 +
+ arch/arm/boot/dts/Makefile                         |    1 +
+ arch/arm/boot/dts/exynos4210-origen.dts            |   16 +
+ arch/arm/boot/dts/exynos4210-smdkv310.dts          |   16 +
+ arch/arm/boot/dts/exynos4210.dtsi                  |    7 +
+ arch/arm/boot/dts/exynos4212.dtsi                  |   28 +
+ arch/arm/boot/dts/exynos4412-smdk4412.dts          |   45 +
+ arch/arm/boot/dts/exynos4412.dtsi                  |   28 +
+ arch/arm/boot/dts/exynos4x12-pinctrl.dtsi          |  965 ++++++++++++++++++++
+ arch/arm/boot/dts/exynos4x12.dtsi                  |   69 ++
+ arch/arm/boot/dts/exynos5250-smdk5250.dts          |   29 +-
+ arch/arm/boot/dts/exynos5250.dtsi                  |   32 +
+ arch/arm/mach-exynos/Kconfig                       |    1 +
+ arch/arm/mach-exynos/Makefile                      |    1 -
+ arch/arm/mach-exynos/clock-exynos4.c               |    9 +-
+ arch/arm/mach-exynos/clock-exynos5.c               |   44 +-
+ arch/arm/mach-exynos/common.c                      |   39 +-
+ arch/arm/mach-exynos/dev-audio.c                   |    2 +-
+ arch/arm/mach-exynos/dev-drm.c                     |   29 -
+ arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
+ arch/arm/mach-exynos/dev-uart.c                    |   24 -
+ arch/arm/mach-exynos/include/mach/irqs.h           |    8 +-
+ arch/arm/mach-exynos/include/mach/map.h            |    3 +-
+ arch/arm/mach-exynos/include/mach/regs-pmu.h       |    2 -
+ arch/arm/mach-exynos/mach-exynos4-dt.c             |    4 +
+ arch/arm/mach-exynos/mach-exynos5-dt.c             |   26 +
+ arch/arm/mach-exynos/mach-nuri.c                   |   10 +-
+ arch/arm/mach-exynos/mach-origen.c                 |    9 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c               |    5 +-
+ arch/arm/mach-exynos/mach-smdkv310.c               |    9 +-
+ arch/arm/mach-exynos/mach-universal_c210.c         |    8 +-
+ arch/arm/mach-s3c64xx/clock.c                      |    4 -
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c       |  141 ++-
+ arch/arm/mach-s3c64xx/mach-crag6410.c              |   29 +-
+ arch/arm/mach-s5pv210/mach-goni.c                  |    1 -
+ arch/arm/plat-samsung/clock.c                      |   75 +-
+ arch/arm/plat-samsung/devs.c                       |    5 +-
+ arch/arm/plat-samsung/include/plat/devs.h          |    2 -
+ arch/arm/plat-samsung/include/plat/gpio-core.h     |    2 +
+ arch/arm/plat-samsung/include/plat/mfc.h           |   11 +
+ arch/arm/plat-samsung/s5p-dev-mfc.c                |   34 +
+ arch/arm/plat-samsung/s5p-irq-gpioint.c            |    8 +-
+ drivers/gpio/gpio-samsung.c                        |   68 +-
+ drivers/pinctrl/pinctrl-exynos.c                   |  110 +++
+ drivers/pinctrl/pinctrl-samsung.c                  |    2 +
+ drivers/pinctrl/pinctrl-samsung.h                  |    1 +
+ 51 files changed, 1835 insertions(+), 214 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
+ create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt
+ create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
+ create mode 100644 arch/arm/boot/dts/exynos4212.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4412-smdk4412.dts
+ create mode 100644 arch/arm/boot/dts/exynos4412.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos4x12.dtsi
+ delete mode 100644 arch/arm/mach-exynos/dev-drm.c
+Merging tegra/for-next (c76dbd0 Merge branch 'for-3.8/defconfig' into for-next)
+$ git merge tegra/for-next
+Auto-merging include/linux/tegra-ahb.h
+Auto-merging drivers/crypto/tegra-aes.c
+Auto-merging arch/arm/mach-tegra/sleep-tegra30.S
+Auto-merging arch/arm/mach-tegra/sleep-tegra20.S
+Auto-merging arch/arm/mach-tegra/irammap.h
+Auto-merging arch/arm/mach-tegra/iomap.h
+Removing arch/arm/mach-tegra/include/mach/irqs.h
+Removing arch/arm/mach-tegra/include/mach/dma.h
+Removing arch/arm/mach-tegra/include/mach/debug-macro.S
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt |   19 ++
+ .../bindings/timer/nvidia,tegra20-timer.txt        |   21 ++
+ .../bindings/timer/nvidia,tegra30-timer.txt        |   23 ++
+ .../devicetree/bindings/vendor-prefixes.txt        |    1 +
+ arch/arm/Kconfig                                   |    1 +
+ arch/arm/Kconfig.debug                             |   38 ++++
+ arch/arm/boot/dts/tegra20-harmony.dts              |   63 ++----
+ arch/arm/boot/dts/tegra20-paz00.dts                |   59 ++----
+ arch/arm/boot/dts/tegra20-seaboard.dts             |   65 ++----
+ arch/arm/boot/dts/tegra20-tamonten.dtsi            |   63 ++----
+ arch/arm/boot/dts/tegra20-ventana.dts              |  144 ++++++++-----
+ arch/arm/boot/dts/tegra20-whistler.dts             |  119 +++--------
+ arch/arm/boot/dts/tegra20.dtsi                     |   70 ++++++
+ arch/arm/boot/dts/tegra30-cardhu-a02.dts           |    6 +
+ arch/arm/boot/dts/tegra30-cardhu-a04.dts           |    6 +
+ arch/arm/boot/dts/tegra30-cardhu.dtsi              |   84 ++++----
+ arch/arm/boot/dts/tegra30.dtsi                     |   96 ++++++++-
+ arch/arm/configs/tegra_defconfig                   |    6 +-
+ arch/arm/include/debug/tegra.S                     |  223 ++++++++++++++++++++
+ arch/arm/mach-tegra/Kconfig                        |   51 -----
+ arch/arm/mach-tegra/Makefile                       |   11 +-
+ arch/arm/mach-tegra/apbio.c                        |    5 +-
+ arch/arm/mach-tegra/board-dt-tegra20.c             |   16 +-
+ arch/arm/mach-tegra/board-dt-tegra30.c             |   19 +-
+ arch/arm/mach-tegra/clock.c                        |    2 -
+ arch/arm/mach-tegra/common.c                       |   27 +--
+ arch/arm/mach-tegra/cpu-tegra.c                    |    3 -
+ arch/arm/mach-tegra/cpuidle-tegra20.c              |   66 ++++++
+ arch/arm/mach-tegra/cpuidle-tegra30.c              |  188 +++++++++++++++++
+ arch/arm/mach-tegra/cpuidle.c                      |   85 ++------
+ arch/arm/mach-tegra/cpuidle.h                      |   32 +++
+ arch/arm/mach-tegra/flowctrl.c                     |   50 ++++-
+ arch/arm/mach-tegra/flowctrl.h                     |    8 +
+ arch/arm/mach-tegra/fuse.c                         |    3 +-
+ arch/arm/mach-tegra/headsmp.S                      |   63 +++++-
+ arch/arm/mach-tegra/include/mach/debug-macro.S     |  100 ---------
+ arch/arm/mach-tegra/include/mach/dma.h             |   54 -----
+ arch/arm/mach-tegra/include/mach/irqs.h            |  182 ----------------
+ arch/arm/mach-tegra/include/mach/powergate.h       |    2 +
+ arch/arm/mach-tegra/include/mach/uncompress.h      |   67 +-----
+ arch/arm/mach-tegra/io.c                           |    3 +-
+ arch/arm/mach-tegra/{include/mach => }/iomap.h     |   16 --
+ arch/arm/mach-tegra/{include/mach => }/irammap.h   |    9 -
+ arch/arm/mach-tegra/irq.c                          |    3 +-
+ arch/arm/mach-tegra/pcie.c                         |    5 +-
+ arch/arm/mach-tegra/platsmp.c                      |    3 +-
+ arch/arm/mach-tegra/pm.c                           |  218 +++++++++++++++++++
+ arch/arm/mach-tegra/pm.h                           |   33 +++
+ arch/arm/mach-tegra/pmc.c                          |    2 +-
+ arch/arm/mach-tegra/powergate.c                    |    2 +-
+ arch/arm/mach-tegra/reset.c                        |   11 +-
+ arch/arm/mach-tegra/reset.h                        |    9 +
+ .../mach-tegra/{sleep-t20.S => sleep-tegra20.S}    |    2 -
+ .../mach-tegra/{sleep-t30.S => sleep-tegra30.S}    |   68 +++++-
+ arch/arm/mach-tegra/sleep.S                        |   73 ++++++-
+ arch/arm/mach-tegra/sleep.h                        |    7 +-
+ arch/arm/mach-tegra/tegra20_clocks.c               |    3 +-
+ arch/arm/mach-tegra/tegra20_clocks_data.c          |    2 -
+ arch/arm/mach-tegra/tegra2_emc.c                   |    2 -
+ arch/arm/mach-tegra/tegra30_clocks.c               |  215 ++++++++++++++++++-
+ arch/arm/mach-tegra/tegra30_clocks.h               |    1 +
+ arch/arm/mach-tegra/tegra30_clocks_data.c          |   46 ++++
+ arch/arm/mach-tegra/tegra_cpu_car.h                |   37 ++++
+ arch/arm/mach-tegra/timer.c                        |   78 ++++---
+ drivers/amba/tegra-ahb.c                           |    1 +
+ drivers/crypto/tegra-aes.c                         |    2 -
+ drivers/iommu/tegra-smmu.c                         |    4 +-
+ drivers/staging/nvec/nvec.c                        |    1 -
+ .../include/mach => include/linux}/tegra-ahb.h     |    6 +-
+ sound/soc/tegra/tegra30_ahub.c                     |    1 -
+ sound/soc/tegra/tegra_pcm.h                        |    2 -
+ 71 files changed, 1999 insertions(+), 1007 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
+ create mode 100644 arch/arm/include/debug/tegra.S
+ create mode 100644 arch/arm/mach-tegra/cpuidle-tegra20.c
+ create mode 100644 arch/arm/mach-tegra/cpuidle-tegra30.c
+ create mode 100644 arch/arm/mach-tegra/cpuidle.h
+ delete mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-tegra/include/mach/dma.h
+ delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
+ rename arch/arm/mach-tegra/{include/mach => }/iomap.h (93%)
+ rename arch/arm/mach-tegra/{include/mach => }/irammap.h (73%)
+ create mode 100644 arch/arm/mach-tegra/pm.c
+ create mode 100644 arch/arm/mach-tegra/pm.h
+ rename arch/arm/mach-tegra/{sleep-t20.S => sleep-tegra20.S} (98%)
+ rename arch/arm/mach-tegra/{sleep-t30.S => sleep-tegra30.S} (63%)
+ rename {arch/arm/mach-tegra/include/mach => include/linux}/tegra-ahb.h (86%)
+Merging kvmtool/master (cfb8234 kvm tools: Fast A20 gate emulation)
+$ git merge kvmtool/master
+Merge made by the 'recursive' strategy.
+ tools/kvm/Makefile                      |    3 +++
+ tools/kvm/builtin-balloon.c             |    4 ++--
+ tools/kvm/builtin-run.c                 |   17 +++++++++++++++--
+ tools/kvm/builtin-setup.c               |    4 ----
+ tools/kvm/disk/core.c                   |    2 ++
+ tools/kvm/hw/rtc.c                      |   30 ++++++++++++++++++------------
+ tools/kvm/hw/serial.c                   |   10 +++++-----
+ tools/kvm/include/kvm/kvm.h             |    6 ++++++
+ tools/kvm/include/kvm/mutex.h           |   20 +++++++++++++-------
+ tools/kvm/include/kvm/parse-options.h   |   22 +++++++++++-----------
+ tools/kvm/include/kvm/qcow.h            |    2 +-
+ tools/kvm/include/kvm/rbtree-interval.h |    3 ++-
+ tools/kvm/include/kvm/threadpool.h      |    4 ++--
+ tools/kvm/include/kvm/uip.h             |   10 +++++-----
+ tools/kvm/ioeventfd.c                   |    2 ++
+ tools/kvm/kvm-ipc.c                     |    2 ++
+ tools/kvm/net/uip/buf.c                 |    4 ++--
+ tools/kvm/net/uip/core.c                |    6 +++---
+ tools/kvm/net/uip/tcp.c                 |    9 ++++++---
+ tools/kvm/net/uip/udp.c                 |    5 ++++-
+ tools/kvm/pci.c                         |    4 ++--
+ tools/kvm/ui/sdl.c                      |    2 ++
+ tools/kvm/ui/vnc.c                      |    2 ++
+ tools/kvm/util/rbtree-interval.c        |    6 +++++-
+ tools/kvm/util/threadpool.c             |   10 ++++++----
+ tools/kvm/virtio/blk.c                  |    6 ++++--
+ tools/kvm/virtio/console.c              |    4 ++--
+ tools/kvm/virtio/net.c                  |   18 +++++++++++-------
+ tools/kvm/virtio/pci.c                  |   11 ++++++++---
+ tools/kvm/x86/ioport.c                  |   22 ++++++++++++++++++++++
+ 30 files changed, 168 insertions(+), 82 deletions(-)
+Merging dma-mapping/dma-mapping-next (8f0d816 Linux 3.7-rc3)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (d5da78e PWM: Add SPEAr PWM chip driver support)
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/spear-pwm.txt          |   18 ++
+ .../devicetree/bindings/pwm/vt8500-pwm.txt         |   17 ++
+ drivers/pwm/Kconfig                                |   11 +
+ drivers/pwm/Makefile                               |    1 +
+ drivers/pwm/pwm-spear.c                            |  276 ++++++++++++++++++++
+ drivers/pwm/pwm-vt8500.c                           |   86 ++++--
+ 6 files changed, 386 insertions(+), 23 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/spear-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/vt8500-pwm.txt
+ create mode 100644 drivers/pwm/pwm-spear.c
+Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
+$ git merge dma-buf/for-next
+Auto-merging drivers/base/dma-buf.c
+Merge made by the 'recursive' strategy.
+ drivers/base/dma-buf.c |    2 ++
+ 1 file changed, 2 insertions(+)
+Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (f899e0f frv: switch to generic fork/vfork/clone)
+$ git merge signal/for-next
+Resolved 'arch/arm/kernel/process.c' using previous resolution.
+Resolved 'arch/sparc/kernel/sys_sparc_64.c' using previous resolution.
+Auto-merging kernel/fork.c
+Auto-merging kernel/auditsc.c
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/sched.h
+Auto-merging drivers/staging/gdm72xx/gdm_usb.c
+Auto-merging arch/x86/syscalls/syscall_32.tbl
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/sparc/kernel/systbls_64.S
+Auto-merging arch/sparc/kernel/sys_sparc_64.c
+CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc_64.c
+Auto-merging arch/sparc/kernel/process_64.c
+Auto-merging arch/sparc/include/asm/thread_info_64.h
+Auto-merging arch/sparc/include/asm/processor_64.h
+Removing arch/sh/kernel/sys_sh64.c
+Auto-merging arch/s390/kernel/entry64.S
+Auto-merging arch/powerpc/include/asm/unistd.h
+Auto-merging arch/mips/kernel/scall64-n32.S
+Auto-merging arch/mips/kernel/mips_ksyms.c
+Auto-merging arch/mips/include/asm/processor.h
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/microblaze/kernel/process.c
+Auto-merging arch/microblaze/kernel/entry.S
+Auto-merging arch/microblaze/kernel/entry-nommu.S
+Auto-merging arch/microblaze/include/asm/unistd.h
+Auto-merging arch/cris/include/asm/unistd.h
+Auto-merging arch/blackfin/include/asm/unistd.h
+Removing arch/avr32/kernel/sys_avr32.c
+Auto-merging arch/avr32/Kconfig
+Auto-merging arch/arm64/kernel/process.c
+Auto-merging arch/arm/kernel/process.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/kernel/calls.S
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5c713b9] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig                            |   11 ++
+ arch/alpha/include/asm/unistd.h         |    3 +
+ arch/alpha/kernel/binfmt_loader.c       |    4 +-
+ arch/alpha/kernel/entry.S               |   51 ++------
+ arch/alpha/kernel/process.c             |   62 ++-------
+ arch/alpha/kernel/signal.c              |   16 +--
+ arch/alpha/kernel/systbls.S             |    6 +-
+ arch/arm/Kconfig                        |    1 +
+ arch/arm/include/asm/unistd.h           |    3 +
+ arch/arm/kernel/calls.S                 |    6 +-
+ arch/arm/kernel/entry-common.S          |   16 ---
+ arch/arm/kernel/process.c               |   11 +-
+ arch/arm/kernel/sys_arm.c               |   31 -----
+ arch/arm64/include/asm/syscalls.h       |   11 +-
+ arch/arm64/include/asm/unistd32.h       |    6 +-
+ arch/arm64/kernel/entry.S               |    5 -
+ arch/arm64/kernel/process.c             |   10 +-
+ arch/arm64/kernel/sys.c                 |   11 +-
+ arch/arm64/kernel/sys32.S               |   14 --
+ arch/arm64/kernel/sys_compat.c          |   20 +--
+ arch/avr32/Kconfig                      |    2 +
+ arch/avr32/include/asm/processor.h      |    3 -
+ arch/avr32/include/asm/unistd.h         |    1 +
+ arch/avr32/kernel/Makefile              |    2 +-
+ arch/avr32/kernel/entry-avr32b.S        |   14 +-
+ arch/avr32/kernel/process.c             |   88 +++----------
+ arch/avr32/kernel/sys_avr32.c           |   24 ----
+ arch/avr32/kernel/syscall-stubs.S       |    6 -
+ arch/avr32/kernel/syscall_table.S       |    2 +-
+ arch/blackfin/Kconfig                   |    2 +
+ arch/blackfin/include/asm/processor.h   |    2 -
+ arch/blackfin/include/asm/unistd.h      |    1 +
+ arch/blackfin/kernel/entry.S            |   22 ++--
+ arch/blackfin/kernel/process.c          |   75 +++--------
+ arch/blackfin/mach-common/entry.S       |   55 --------
+ arch/c6x/Kconfig                        |    1 +
+ arch/c6x/include/uapi/asm/unistd.h      |    1 -
+ arch/c6x/kernel/entry.S                 |   12 +-
+ arch/cris/Kconfig                       |    2 +
+ arch/cris/arch-v10/kernel/entry.S       |   17 +--
+ arch/cris/arch-v10/kernel/process.c     |  106 ++++-----------
+ arch/cris/arch-v32/kernel/entry.S       |   22 ++--
+ arch/cris/arch-v32/kernel/process.c     |   96 ++++----------
+ arch/cris/include/asm/processor.h       |    2 -
+ arch/cris/include/asm/unistd.h          |    1 +
+ arch/cris/kernel/crisksyms.c            |    1 -
+ arch/frv/include/asm/unistd.h           |    3 +
+ arch/frv/kernel/process.c               |   45 +------
+ arch/h8300/Kconfig                      |    2 +
+ arch/h8300/include/asm/processor.h      |    2 -
+ arch/h8300/include/asm/ptrace.h         |    2 +
+ arch/h8300/include/asm/unistd.h         |    1 +
+ arch/h8300/kernel/entry.S               |    9 ++
+ arch/h8300/kernel/h8300_ksyms.c         |    1 -
+ arch/h8300/kernel/process.c             |   62 ++-------
+ arch/h8300/kernel/sys_h8300.c           |   26 ----
+ arch/hexagon/Kconfig                    |    2 +
+ arch/hexagon/include/asm/processor.h    |    1 -
+ arch/hexagon/include/asm/syscall.h      |    3 -
+ arch/hexagon/include/uapi/asm/ptrace.h  |    4 +
+ arch/hexagon/include/uapi/asm/unistd.h  |    1 +
+ arch/hexagon/kernel/process.c           |  102 +++++----------
+ arch/hexagon/kernel/signal.c            |    4 +-
+ arch/hexagon/kernel/syscall.c           |   44 +------
+ arch/hexagon/kernel/vm_entry.S          |    4 +
+ arch/ia64/Kconfig                       |    2 +
+ arch/ia64/include/asm/processor.h       |   16 ---
+ arch/ia64/include/asm/unistd.h          |    1 +
+ arch/ia64/kernel/entry.S                |   39 +++---
+ arch/ia64/kernel/head.S                 |   13 --
+ arch/ia64/kernel/process.c              |  158 +++++++++-------------
+ arch/m32r/Kconfig                       |    2 +
+ arch/m32r/include/asm/processor.h       |    5 -
+ arch/m32r/include/asm/ptrace.h          |    2 +
+ arch/m32r/include/asm/unistd.h          |    1 +
+ arch/m32r/kernel/entry.S                |    9 ++
+ arch/m32r/kernel/m32r_ksyms.c           |    1 -
+ arch/m32r/kernel/process.c              |  106 ++++-----------
+ arch/m32r/kernel/sys_m32r.c             |   21 ---
+ arch/m68k/Kconfig                       |    1 +
+ arch/m68k/include/asm/unistd.h          |    3 +-
+ arch/m68k/kernel/entry.S                |   30 ++---
+ arch/m68k/kernel/process.c              |   86 +++++-------
+ arch/m68k/kernel/syscalltable.S         |    6 +-
+ arch/microblaze/Kconfig                 |    2 +
+ arch/microblaze/include/asm/processor.h |    8 +-
+ arch/microblaze/include/asm/unistd.h    |    1 +
+ arch/microblaze/kernel/entry-nommu.S    |   12 +-
+ arch/microblaze/kernel/entry.S          |   13 +-
+ arch/microblaze/kernel/process.c        |   72 +++-------
+ arch/microblaze/kernel/sys_microblaze.c |   39 ------
+ arch/mips/Kconfig                       |    2 +
+ arch/mips/include/asm/processor.h       |    2 -
+ arch/mips/include/asm/ptrace.h          |    6 +
+ arch/mips/include/asm/unistd.h          |    1 +
+ arch/mips/kernel/entry.S                |    6 +
+ arch/mips/kernel/linux32.c              |   21 ---
+ arch/mips/kernel/mips_ksyms.c           |    2 -
+ arch/mips/kernel/process.c              |   62 ++++-----
+ arch/mips/kernel/scall64-n32.S          |    2 +-
+ arch/mips/kernel/scall64-o32.S          |    2 +-
+ arch/mips/kernel/syscall.c              |   53 --------
+ arch/mn10300/Kconfig                    |    1 +
+ arch/mn10300/include/asm/unistd.h       |    1 -
+ arch/mn10300/kernel/entry.S             |    7 +-
+ arch/openrisc/Kconfig                   |    2 +
+ arch/openrisc/include/asm/processor.h   |    2 -
+ arch/openrisc/include/uapi/asm/unistd.h |    2 +
+ arch/openrisc/kernel/entry.S            |   43 +++---
+ arch/openrisc/kernel/process.c          |  163 ++++++++---------------
+ arch/parisc/Kconfig                     |    2 +
+ arch/parisc/include/asm/processor.h     |    1 -
+ arch/parisc/include/asm/unistd.h        |    1 +
+ arch/parisc/kernel/entry.S              |  217 +++----------------------------
+ arch/parisc/kernel/process.c            |   96 +++-----------
+ arch/parisc/kernel/sys_parisc32.c       |   22 ----
+ arch/parisc/kernel/syscall_table.S      |    2 +-
+ arch/powerpc/Kconfig                    |    2 +
+ arch/powerpc/include/asm/syscalls.h     |    9 --
+ arch/powerpc/include/asm/unistd.h       |    4 +-
+ arch/powerpc/kernel/entry_32.S          |    5 -
+ arch/powerpc/kernel/entry_64.S          |    8 +-
+ arch/powerpc/kernel/process.c           |   60 +--------
+ arch/s390/Kconfig                       |    2 +
+ arch/s390/include/asm/unistd.h          |    4 +-
+ arch/s390/kernel/entry.S                |   32 +----
+ arch/s390/kernel/entry64.S              |   26 +---
+ arch/s390/kernel/process.c              |   52 ++------
+ arch/score/Kconfig                      |    2 +
+ arch/score/include/asm/processor.h      |    1 -
+ arch/score/include/asm/syscalls.h       |    1 -
+ arch/score/include/asm/unistd.h         |    1 +
+ arch/score/kernel/entry.S               |   12 +-
+ arch/score/kernel/process.c             |   55 ++------
+ arch/score/kernel/sys_score.c           |   54 --------
+ arch/sh/Kconfig                         |    2 +
+ arch/sh/include/asm/processor_32.h      |    5 -
+ arch/sh/include/asm/processor_64.h      |    5 -
+ arch/sh/include/asm/syscalls_32.h       |    4 -
+ arch/sh/include/asm/syscalls_64.h       |    4 -
+ arch/sh/include/asm/unistd.h            |    1 +
+ arch/sh/kernel/Makefile                 |    3 +-
+ arch/sh/kernel/cpu/sh5/entry.S          |   19 +++
+ arch/sh/kernel/entry-common.S           |   13 ++
+ arch/sh/kernel/process_32.c             |   87 +++----------
+ arch/sh/kernel/process_64.c             |   85 +++---------
+ arch/sh/kernel/sys_sh32.c               |   24 ----
+ arch/sh/kernel/sys_sh64.c               |   50 -------
+ arch/sparc/Kconfig                      |    2 +
+ arch/sparc/include/asm/processor_32.h   |    1 -
+ arch/sparc/include/asm/processor_64.h   |   11 +-
+ arch/sparc/include/asm/ptrace.h         |   10 +-
+ arch/sparc/include/asm/switch_to_64.h   |    2 +-
+ arch/sparc/include/asm/syscalls.h       |    2 -
+ arch/sparc/include/asm/thread_info_64.h |   25 ++--
+ arch/sparc/include/asm/uaccess_64.h     |    4 +-
+ arch/sparc/include/asm/unistd.h         |    1 +
+ arch/sparc/kernel/entry.S               |   51 ++++----
+ arch/sparc/kernel/etrap_64.S            |    8 +-
+ arch/sparc/kernel/process_32.c          |  152 +++++++---------------
+ arch/sparc/kernel/process_64.c          |  143 +++++---------------
+ arch/sparc/kernel/sys_sparc32.c         |   36 -----
+ arch/sparc/kernel/sys_sparc_32.c        |   24 ----
+ arch/sparc/kernel/sys_sparc_64.c        |   22 ----
+ arch/sparc/kernel/syscalls.S            |   30 ++---
+ arch/sparc/kernel/systbls_64.S          |    2 +-
+ arch/sparc/kernel/traps_64.c            |    4 +-
+ arch/sparc/mm/init_64.c                 |    2 +-
+ arch/tile/Kconfig                       |    2 +
+ arch/tile/include/asm/compat.h          |   15 +--
+ arch/tile/include/asm/elf.h             |    1 +
+ arch/tile/include/asm/processor.h       |    6 +-
+ arch/tile/include/asm/switch_to.h       |    5 +-
+ arch/tile/include/asm/syscalls.h        |   16 ++-
+ arch/tile/include/asm/unistd.h          |    1 +
+ arch/tile/kernel/compat.c               |    5 +-
+ arch/tile/kernel/compat_signal.c        |   10 +-
+ arch/tile/kernel/entry.S                |   11 --
+ arch/tile/kernel/intvec_32.S            |   29 +++--
+ arch/tile/kernel/intvec_64.S            |   30 +++--
+ arch/tile/kernel/process.c              |  170 +++++++-----------------
+ arch/tile/kernel/signal.c               |    9 +-
+ arch/tile/kernel/sys.c                  |    9 +-
+ arch/tile/mm/fault.c                    |    5 +-
+ arch/um/kernel/process.c                |    2 +-
+ arch/um/kernel/syscall.c                |   23 ----
+ arch/x86/Kconfig                        |    1 +
+ arch/x86/ia32/ia32_aout.c               |    5 +-
+ arch/x86/ia32/ia32entry.S               |    2 +-
+ arch/x86/ia32/sys_ia32.c                |   11 --
+ arch/x86/include/asm/sys_ia32.h         |    2 -
+ arch/x86/include/asm/syscalls.h         |   14 +-
+ arch/x86/include/asm/unistd.h           |    3 +
+ arch/x86/kernel/entry_32.S              |   18 ---
+ arch/x86/kernel/process.c               |   30 -----
+ arch/x86/kernel/process_32.c            |   11 +-
+ arch/x86/kernel/process_64.c            |    7 +-
+ arch/x86/syscalls/syscall_32.tbl        |    6 +-
+ arch/x86/um/Kconfig                     |    1 +
+ arch/x86/um/sys_call_table_32.c         |    3 -
+ arch/x86/um/syscalls_32.c               |   15 ---
+ arch/xtensa/include/asm/syscall.h       |    1 -
+ drivers/staging/gdm72xx/gdm_usb.c       |    4 +-
+ fs/binfmt_aout.c                        |    5 +-
+ fs/binfmt_elf.c                         |    5 +-
+ fs/binfmt_elf_fdpic.c                   |    6 +-
+ fs/binfmt_em86.c                        |    4 +-
+ fs/binfmt_flat.c                        |    5 +-
+ fs/binfmt_misc.c                        |    4 +-
+ fs/binfmt_script.c                      |    4 +-
+ fs/binfmt_som.c                         |    5 +-
+ fs/exec.c                               |   37 +++---
+ fs/file.c                               |    6 -
+ fs/fs_struct.c                          |   24 ----
+ include/asm-generic/syscalls.h          |   14 +-
+ include/linux/binfmts.h                 |    4 +-
+ include/linux/compat.h                  |    4 -
+ include/linux/fdtable.h                 |    1 -
+ include/linux/fs_struct.h               |    1 -
+ include/linux/sched.h                   |    3 +-
+ include/linux/syscalls.h                |    6 +-
+ kernel/auditsc.c                        |  102 +++------------
+ kernel/exit.c                           |   92 -------------
+ kernel/fork.c                           |   43 ++++++
+ 224 files changed, 1224 insertions(+), 3344 deletions(-)
+ delete mode 100644 arch/avr32/kernel/sys_avr32.c
+ delete mode 100644 arch/sh/kernel/sys_sh64.c
+Merging clk/clk-next (9be9d48 clk: wm831x: Use devm_clk_register() to simplify code)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/clk-wm831x.c     |   34 ++++---------
+ drivers/clk/clk.c            |  111 ++++++++++++++++++++++++++++++++++--------
+ include/linux/clk-provider.h |    2 +
+ 3 files changed, 101 insertions(+), 46 deletions(-)
+Merging random/dev (c5c1244 random: fix debug format strings)
+$ git merge random/dev
+Merge made by the 'recursive' strategy.
+ drivers/char/random.c |   14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
+$ git merge lzo-update/lzo-update
+Removing lib/lzo/lzo1x_decompress.c
+Auto-merging crypto/testmgr.h
+Merge made by the 'recursive' strategy.
+ crypto/testmgr.h                |   38 ++---
+ include/linux/lzo.h             |   15 +-
+ lib/decompress_unlzo.c          |    2 +-
+ lib/lzo/Makefile                |    2 +-
+ lib/lzo/lzo1x_compress.c        |  335 +++++++++++++++++++++++----------------
+ lib/lzo/lzo1x_decompress.c      |  255 -----------------------------
+ lib/lzo/lzo1x_decompress_safe.c |  237 +++++++++++++++++++++++++++
+ lib/lzo/lzodefs.h               |   34 +++-
+ 8 files changed, 488 insertions(+), 430 deletions(-)
+ delete mode 100644 lib/lzo/lzo1x_decompress.c
+ create mode 100644 lib/lzo/lzo1x_decompress_safe.c
+Merging drop-experimental/linux-next (9687bc4 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
+$ git merge drop-experimental/linux-next
+Resolved 'drivers/net/ethernet/intel/Kconfig' using previous resolution.
+Resolved 'drivers/ptp/Kconfig' using previous resolution.
+Auto-merging net/sctp/Kconfig
+Auto-merging net/mac80211/Kconfig
+Auto-merging init/Kconfig
+Auto-merging drivers/ptp/Kconfig
+CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
+Auto-merging drivers/net/usb/Kconfig
+Auto-merging drivers/net/ethernet/ti/Kconfig
+Auto-merging drivers/net/ethernet/intel/Kconfig
+CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
+Auto-merging drivers/mmc/host/Kconfig
+Auto-merging crypto/Kconfig
+Auto-merging arch/x86/um/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/m68k/Kconfig.cpu
+Auto-merging arch/ia64/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 69ad6bc] Merge remote-tracking branch 'drop-experimental/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/CodingStyle                  |   10 +-----
+ Documentation/DocBook/kernel-hacking.tmpl  |    7 ----
+ Documentation/DocBook/kgdb.tmpl            |    6 ++--
+ Documentation/intel_txt.txt                |    2 +-
+ Documentation/zh_CN/CodingStyle            |    7 ----
+ arch/cris/arch-v32/drivers/Kconfig         |    4 +--
+ arch/ia64/Kconfig                          |    8 ++---
+ arch/ia64/kvm/Kconfig                      |    2 +-
+ arch/ia64/xen/Kconfig                      |    2 +-
+ arch/m68k/Kconfig.bus                      |    4 +--
+ arch/m68k/Kconfig.cpu                      |    3 +-
+ arch/m68k/Kconfig.debug                    |    2 +-
+ arch/m68k/Kconfig.devices                  |    6 ++--
+ arch/powerpc/platforms/ps3/Kconfig         |    2 +-
+ arch/s390/kvm/Kconfig                      |    2 +-
+ arch/um/Kconfig.net                        |    2 +-
+ arch/um/Kconfig.um                         |    8 ++---
+ arch/x86/Kconfig                           |   22 ++++++------
+ arch/x86/um/Kconfig                        |    3 +-
+ crypto/Kconfig                             |   15 +++-----
+ drivers/gpu/drm/udl/Kconfig                |    2 +-
+ drivers/i2c/muxes/Kconfig                  |    2 --
+ drivers/ide/Kconfig                        |    8 ++---
+ drivers/lguest/Kconfig                     |    2 +-
+ drivers/media/Kconfig                      |    7 ++--
+ drivers/media/pci/cx25821/Kconfig          |    2 +-
+ drivers/media/platform/s5p-fimc/Kconfig    |    1 -
+ drivers/media/platform/s5p-tv/Kconfig      |    3 +-
+ drivers/media/usb/pvrusb2/Kconfig          |    8 ++---
+ drivers/mmc/core/Kconfig                   |    3 +-
+ drivers/mmc/host/Kconfig                   |   20 +++++------
+ drivers/net/Kconfig                        |    9 +++--
+ drivers/net/ethernet/8390/Kconfig          |   21 +++++------
+ drivers/net/ethernet/atheros/Kconfig       |    8 ++---
+ drivers/net/ethernet/dec/tulip/Kconfig     |    4 +--
+ drivers/net/ethernet/i825xx/Kconfig        |   12 +++----
+ drivers/net/ethernet/intel/Kconfig         |    5 ---
+ drivers/net/ethernet/natsemi/Kconfig       |    3 --
+ drivers/net/ethernet/packetengines/Kconfig |    4 +--
+ drivers/net/ethernet/realtek/Kconfig       |    4 +--
+ drivers/net/ethernet/silan/Kconfig         |    6 ++--
+ drivers/net/ethernet/ti/Kconfig            |    4 +--
+ drivers/net/team/Kconfig                   |    3 +-
+ drivers/net/usb/Kconfig                    |   16 ++++-----
+ drivers/net/wan/Kconfig                    |    8 ++---
+ drivers/rpmsg/Kconfig                      |    3 +-
+ drivers/sbus/char/Kconfig                  |    7 ++--
+ drivers/virtio/Kconfig                     |    8 ++---
+ fs/ceph/Kconfig                            |    4 +--
+ fs/ecryptfs/Kconfig                        |    4 +--
+ fs/nilfs2/Kconfig                          |    3 +-
+ fs/xfs/Kconfig                             |    4 +--
+ init/Kconfig                               |   54 +++++++---------------------
+ 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/dsa/Kconfig                            |    2 +-
+ net/ieee802154/Kconfig                     |    3 +-
+ net/ipv4/Kconfig                           |   11 +-----
+ net/ipv4/netfilter/Kconfig                 |    4 +--
+ net/ipv6/Kconfig                           |   24 ++++++-------
+ net/l2tp/Kconfig                           |    4 +--
+ net/lapb/Kconfig                           |    3 +-
+ net/mac80211/Kconfig                       |    2 +-
+ net/mac802154/Kconfig                      |    2 +-
+ net/netfilter/Kconfig                      |   24 +++++--------
+ net/rds/Kconfig                            |    4 +--
+ net/rxrpc/Kconfig                          |    2 +-
+ net/sctp/Kconfig                           |    4 +--
+ net/sunrpc/Kconfig                         |    2 +-
+ net/tipc/Kconfig                           |    4 +--
+ net/wanrouter/Kconfig                      |    1 -
+ net/x25/Kconfig                            |    3 +-
+ net/xfrm/Kconfig                           |   16 ++++-----
+ tools/lguest/lguest.txt                    |    8 ++---
+ 79 files changed, 196 insertions(+), 322 deletions(-)
+Merging scsi-post-merge/merge-base:master ()
+Merging akpm-current/current (d715ab1 h8300: add missing L1_CACHE_SHIFT)
+$ git merge akpm-current/current
+Removing tools/testing/selftests/epoll/test_epoll.c
+Removing tools/testing/selftests/epoll/Makefile
+Auto-merging fs/notify/fanotify/fanotify.c
+Merge made by the 'recursive' strategy.
+ arch/h8300/include/asm/cache.h             |    3 +-
+ fs/eventpoll.c                             |   38 +--
+ fs/notify/fanotify/fanotify.c              |    1 +
+ include/uapi/linux/eventpoll.h             |    1 -
+ mm/vmscan.c                                |    2 +
+ scripts/checkpatch.pl                      |    6 +-
+ tools/testing/selftests/Makefile           |    2 +-
+ tools/testing/selftests/epoll/Makefile     |   11 -
+ tools/testing/selftests/epoll/test_epoll.c |  344 ----------------------------
+ 9 files changed, 13 insertions(+), 395 deletions(-)
+ delete mode 100644 tools/testing/selftests/epoll/Makefile
+ delete mode 100644 tools/testing/selftests/epoll/test_epoll.c
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/akpm/master:akpm
+From ../next
+ * [new branch]      akpm/master -> akpm
+$ git fetch --no-tags ../next refs/heads/akpm/master-base:akpm-base
+From ../next
+ * [new branch]      akpm/master-base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: tmpfs: fix shmem_getpage_gfp VM_BUG_ON
+Applying: tmpfs: change final i_blocks BUG to WARNING
+Applying: mm: add anon_vma_lock to validate_mm()
+Applying: mm: fix build warning for uninitialized value
+Applying: memcg: oom: fix totalpages calculation for memory.swappiness==0
+Applying: doc: describe memcg swappiness more precisely
+Applying: mm: fix a regression with HIGHMEM
+Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
+Applying: proc: check vma->vm_file before dereferencing
+Applying: memstick: remove unused field from state struct
+Applying: memstick: ms_block: fix compile issue
+Applying: memstick: use after free in msb_disk_release()
+Applying: memstick: memory leak on error in msb_ftl_scan()
+Applying: CRIS: Fix I/O macros
+Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
+Applying: vfs: d_obtain_alias() needs to use "/" as default name.
+Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
+Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
+Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: arch/x86/tools/insn_sanity.c: identify source of messages
+Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
+Applying: olpc: fix olpc-xo1-sci.c build errors
+Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
+Applying: irq: tsk->comm is an array
+Applying: irq-tsk-comm-is-an-array-fix
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: fs/pstore/ram.c: fix up section annotations
+Applying: h8300: select generic atomic64_t support
+Applying: drivers/tty/serial/serial_core.c: fix uart_get_attr_port() shift
+Applying: tasklet: ignore disabled tasklet in tasklet_action()
+Applying: tasklet: ignore disabled tasklet in tasklet_action v2
+Applying: drivers/message/fusion/mptscsih.c: missing break
+Applying: drivers/scsi/hptiop: support HighPoint RR4520/RR4522 HBA
+Applying: cciss: cleanup bitops usage
+Applying: cciss: use check_signature()
+Applying: block: store partition_meta_info.uuid as a string
+Applying: init: reduce PARTUUID min length to 1 from 36
+Applying: block: partition: msdos: provide UUIDs for partitions
+Applying: drbd: use copy_highpage
+Applying: vfs: increment iversion when a file is truncated
+Applying: fs: change return values from -EACCES to -EPERM
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: mm/page_alloc.c: remove duplicate check
+Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
+Applying: mm: show migration types in show_mem
+Applying: mm, memcg: make mem_cgroup_out_of_memory() static
+Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
+Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
+Applying: thp: clean up __collapse_huge_page_isolate
+Applying: thp-clean-up-__collapse_huge_page_isolate v2
+Applying: mm: introduce mm_find_pmd()
+Applying: mm-introduce-mm_find_pmd-fix
+Applying: thp: introduce hugepage_vma_check()
+Applying: thp: cleanup: introduce mk_huge_pmd()
+Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
+Applying: memory-hotplug: skip HWPoisoned page when offlining pages
+Applying: memory-hotplug: update mce_bad_pages when removing the memory
+Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
+Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
+Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
+Applying: memory-hotplug: fix NR_FREE_PAGES mismatch's fix
+Applying: numa: convert static memory to dynamically allocated memory for per node device
+Applying: memory-hotplug: suppress "Device nodeX does not have a release() function" warning
+Applying: memory-hotplug, mm/sparse.c: clear the memory to store struct page
+Applying: memory-hotplug: allocate zone's pcp before onlining pages
+Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
+Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
+Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
+Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
+Applying: mm/memory_hotplug.c: update start_pfn in zone and pg_data when spanned_pages == 0.
+Applying: mm: add comment on storage key dirty bit semantics
+Applying: mm,vmscan: only evict file pages when we have plenty
+Applying: mmvmscan-only-evict-file-pages-when-we-have-plenty-fix
+Applying: mm: refactor reinsert of swap_info in sys_swapoff()
+Applying: mm: do not call frontswap_init() during swapoff
+Applying: mm, highmem: use PKMAP_NR() to calculate an index of pkmap
+Applying: mm, highmem: remove useless pool_lock
+Applying: mm, highmem: remove page_address_pool list
+Applying: mm-highmem-remove-page_address_pool-list-v2
+Applying: mm, highmem: makes flush_all_zero_pkmaps() return index of last flushed entry
+Applying: mm-highmem-makes-flush_all_zero_pkmaps-return-index-of-last-flushed-entry-v2
+Applying: mm, highmem: get virtual address of the page using PKMAP_ADDR()
+Applying: mm: thp: set the accessed flag for old pages on access fault
+Applying: mm: memmap_init_zone() performance improvement
+Applying: Documentation/cgroups/memory.txt: s/mem_cgroup_charge/mem_cgroup_change_common/
+Applying: mm, oom: allow exiting threads to have access to memory reserves
+Applying: memcg: make it possible to use the stock for more than one page
+Applying: memcg: reclaim when more than one page needed
+Applying: memcg: change defines to an enum
+Applying: memcg: kmem accounting basic infrastructure
+Applying: mm: add a __GFP_KMEMCG flag
+Applying: memcg: kmem controller infrastructure
+Applying: mm: allocate kernel pages to the right memcg
+Applying: res_counter: return amount of charges after res_counter_uncharge()
+Applying: memcg: kmem accounting lifecycle management
+Applying: memcg: use static branches when code not in use
+Applying: memcg: allow a memcg with kmem charges to be destructed
+Applying: memcg: execute the whole memcg freeing in free_worker()
+Applying: fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
+Applying: memcg: add documentation about the kmem controller
+Applying: slab/slub: struct memcg_params
+Applying: slab: annotate on-slab caches nodelist locks
+Applying: slab/slub: consider a memcg parameter in kmem_create_cache
+Applying: memcg: allocate memory for memcg caches whenever a new memcg appears
+Applying: memcg: infrastructure to match an allocation to the right cache
+Applying: memcg: skip memcg kmem allocations in specified code regions
+Applying: sl[au]b: always get the cache from its page in kmem_cache_free()
+Applying: sl[au]b: allocate objects from memcg cache
+Applying: memcg: destroy memcg caches
+Applying: memcg/sl[au]b: track all the memcg children of a kmem_cache
+Applying: memcg/sl[au]b: shrink dead caches
+Applying: memcg: aggregate memcg cache values in slabinfo
+Applying: slab: propagate tunable values
+Applying: slub: slub-specific propagation changes
+Applying: slub-slub-specific-propagation-changes-fix
+Applying: kmem: add slab-specific documentation about the kmem controller
+Applying: dmapool: make DMAPOOL_DEBUG detect corruption of free marker
+Applying: dmapool-make-dmapool_debug-detect-corruption-of-free-marker-fix
+Applying: mm: hwpoison: fix action_result() to print out dirty/clean
+Applying: mm: print out information of file affected by memory error
+Applying: mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB
+Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix
+Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix
+Applying: selftests: add a test program for variable huge page sizes in mmap/shmget
+Applying: mm: augment vma rbtree with rb_subtree_gap
+Applying: mm: check rb_subtree_gap correctness
+Applying: mm-check-rb_subtree_gap-correctness-fix
+Applying: mm: rearrange vm_area_struct for fewer cache misses
+Applying: mm-rearrange-vm_area_struct-for-fewer-cache-misses-checkpatch-fixes
+Applying: mm: vm_unmapped_area() lookup function
+Applying: mm-vm_unmapped_area-lookup-function-checkpatch-fixes
+Applying: mm: use vm_unmapped_area() on x86_64 architecture
+Applying: mm: fix cache coloring on x86_64 architecture
+Applying: mm: use vm_unmapped_area() in hugetlbfs
+Applying: mm: use vm_unmapped_area() in hugetlbfs on i386 architecture
+Applying: mm: use vm_unmapped_area() on mips architecture
+Applying: mm-use-vm_unmapped_area-on-mips-architecture-fix
+Applying: mm: use vm_unmapped_area() on arm architecture
+Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix
+Applying: mm: use vm_unmapped_area() on sh architecture
+Applying: mm-use-vm_unmapped_area-on-sh-architecture-fix
+Applying: mm: use vm_unmapped_area() on sparc64 architecture
+Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix
+Applying: mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
+Applying: mm: use vm_unmapped_area() on sparc32 architecture
+Applying: mm: use vm_unmapped_area() in hugetlbfs on tile architecture
+Applying: mm/vmscan.c: try_to_freeze() returns boolean
+Applying: mm, mempolicy: remove duplicate code
+Applying: mm: adjust address_space_operations.migratepage() return code
+Applying: mm-adjust-address_space_operationsmigratepage-return-code-fix
+Applying: mm: redefine address_space.assoc_mapping
+Applying: mm: introduce a common interface for balloon pages mobility
+Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix
+Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix
+Applying: mm: introduce compaction and migration for ballooned pages
+Applying: virtio_balloon: introduce migration primitives to balloon pages
+Applying: mm: introduce putback_movable_pages()
+Applying: mm: add vm event counters for balloon pages compaction
+Applying: mm: fix slab.c kernel-doc warnings
+Applying: mm: cleanup register_node()
+Applying: mm, oom: change type of oom_score_adj to short
+Applying: mm, oom: fix race when specifying a thread as the oom origin
+Applying: mm: cma: skip watermarks check for already isolated blocks in split_free_page()
+Applying: mm: cma: remove watermark hacks
+Applying: drop_caches: add some documentation and info message
+Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
+Applying: swap: add a simple detector for inappropriate swapin readahead
+Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
+Applying: mm/memblock: reduce overhead in binary search
+Applying: scripts/pnmtologo: fix for plain PBM
+Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
+Applying: Documentation/kernel-parameters.txt: update mem= option's spec according to its implementation
+Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
+Applying: scripts/tags.sh: add magic for declarations of popular kernel type
+Applying: Documentation: remove reference to feature-removal-schedule.txt
+Applying: kernel: remove reference to feature-removal-schedule.txt
+Applying: sound: remove reference to feature-removal-schedule.txt
+Applying: drivers: remove reference to feature-removal-schedule.txt
+Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
+Applying: backlight: 88pm860x_bl: fix checkpatch warning
+Applying: backlight: atmel-pwm-bl: fix checkpatch warning
+Applying: backlight: corgi_lcd: fix checkpatch error and warning
+Applying: backlight: da903x_bl: fix checkpatch warning
+Applying: backlight: generic_bl: fix checkpatch warning
+Applying: backlight: hp680_bl: fix checkpatch error and warning
+Applying: backlight: ili9320: fix checkpatch error and warning
+Applying: backlight: jornada720: fix checkpatch error and warning
+Applying: backlight: l4f00242t03: fix checkpatch warning
+Applying: backlight: lm3630: fix checkpatch warning
+Applying: backlight: locomolcd: fix checkpatch error and warning
+Applying: backlight: omap1: fix checkpatch warning
+Applying: backlight: pcf50633: fix checkpatch warning
+Applying: backlight: platform_lcd: fix checkpatch error
+Applying: backlight: tdo24m: fix checkpatch warning
+Applying: backlight: tosa: fix checkpatch error and warning
+Applying: backlight: vgg2432a4: fix checkpatch warning
+Applying: backlight: lms283gf05: use devm_gpio_request_one
+Applying: backlight: tosa: use devm_gpio_request_one
+Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
+Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
+Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
+Applying: drivers/video/backlight/da9052_bl.c: add missing const
+Applying: drivers/video/backlight/lms283gf05.c: add missing const
+Applying: drivers/video/backlight/tdo24m.c: add missing const
+Applying: drivers/video/backlight/vgg2432a4.c: add missing const
+Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
+Applying: drivers/video/backlight/88pm860x_bl.c: drop devm_kfree of devm_kzalloc'd data
+Applying: drivers/video/backlight/max8925_bl.c: drop devm_kfree of devm_kzalloc'd data
+Applying: drivers/video/backlight/lm3639_bl.c: fix up world writable sysfs file
+Applying: drivers/video/backlight/ep93xx_bl.c: fix section mismatch
+Applying: drivers/video/backlight/hp680_bl.c: add missing __devexit macros for remove
+Applying: drivers/video/backlight/ili9320.c: add missing __devexit macros for remove
+Applying: string: introduce helper to get base file name from given path
+Applying: lib: dynamic_debug: use kbasename()
+Applying: mm: use kbasename()
+Applying: procfs: use kbasename()
+Applying: proc_devtree: remove duplicated include from proc_devtree.c
+Applying: trace: use kbasename()
+Applying: drivers/of/fdt.c: re-use kernel's kbasename()
+Applying: sscanf: don't ignore field widths for numeric conversions
+Applying: percpu_rw_semaphore: reimplement to not block the readers unnecessarily
+Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
+Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
+Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
+Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
+Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
+Applying: checkpatch: warn on unnecessary line continuations
+Applying: epoll: support for disabling items, and a self-test app
+Applying: binfmt_elf: fix corner case kfree of uninitialized data
+Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
+Applying: rtc: omap: kicker mechanism support
+Applying: ARM: davinci: remove rtc kicker release
+Applying: rtc: omap: dt support
+Applying: rtc: omap: depend on am33xx
+Applying: rtc: omap: add runtime pm support
+Applying: drivers/rtc/rtc-imxdi: support for i.MX53
+Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
+Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
+Applying: drivers/rtc/rtc-vt8500.c: convert to use devm_kzalloc
+Applying: drivers/rtc/rtc-test.c: avoid calling platform_device_put() twice
+Applying: rtc-avoid-calling-platform_device_put-twice-in-test_init-fix
+Applying: rtc: rtc-spear: use devm_*() routines
+Applying: rtc: rtc-spear: Add clk_{un}prepare() support
+Applying: rtc: rtc-spear: Provide flag for no support of UIE mode
+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: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
+Applying: hfsplus: code style fixes - reworked support of extended attributes
+Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
+Applying: Documentation: fix Documentation/security/00-INDEX
+Applying: kstrto*: add documentation
+Applying: simple_strto*: annotate function as obsolete
+Applying: proc: don't show nonexistent capabilities
+Applying: procfs: add VmFlags field in smaps output
+Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
+Applying: /proc/pid/status: add "Seccomp" field
+Applying: fork: unshare: remove dead code
+Applying: ipc: remove forced assignment of selected message
+Applying: ipc: add sysctl to specify desired next object id
+Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
+Applying: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
+Applying: Documentation: update sysctl/kernel.txt
+Applying: ipc: message queue receive cleanup
+Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
+Applying: ipc: introduce message queue copy feature
+Applying: ipc: remove redundant MSG_COPY check
+Applying: ipc: cleanup do_msgrcv() around MSG_COPY feature
+Applying: selftests: IPC message queue copy feature test
+Applying: test: IPC message queue copy feature test update
+Applying: ipc: simplify free_copy() call
+Applying: ipc: convert prepare_copy() from macro to function
+Applying: ipc-convert-prepare_copy-from-macro-to-function-fix
+Applying: ipc: simplify message copying
+Applying: ipc: add more comments to message copying related code
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
+Applying: binfmt_elfc-use-get_random_int-to-fix-entropy-depleting-fix
+Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
+Applying: Documentation/sparse.txt: document context annotations for lock checking
+Applying: aoe: describe the behavior of the "err" character device
+Applying: aoe: print warning regarding a common reason for dropped transmits
+Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
+Applying: aoe: avoid using skb member after dev_queue_xmit
+Applying: aoe: update cap on outstanding commands based on config query response
+Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
+Applying: aoe: support larger I/O requests via aoe_maxsectors module param
+Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
+Applying: aoe: cleanup: remove unused ata_scnt function
+Applying: aoe: whitespace cleanup
+Applying: aoe: update driver-internal version number to 60
+Applying: aoe: avoid running request handler on plugged queue
+Applying: aoe: provide ATA identify device content to user on request
+Applying: aoe: improve network congestion handling
+Applying: aoe: err device: include MAC addresses for unexpected responses
+Applying: aoe: manipulate aoedev network stats under lock
+Applying: aoe: use high-resolution RTTs with fallback to low-res
+Applying: aoe: commands in retransmit queue use new destination on failure
+Applying: aoe: update driver-internal version to 64+
+Applying: Documentation/DMA-API-HOWTO.txt: fix typo
+Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 554638f...6703d59 akpm       -> akpm/master  (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (6703d59 tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/00-INDEX                             |    2 -
+ Documentation/ABI/README                           |    3 -
+ Documentation/DMA-API-HOWTO.txt                    |    9 +-
+ Documentation/DocBook/kernel-api.tmpl              |    3 +
+ Documentation/backlight/lp855x-driver.txt          |   10 +-
+ Documentation/cgroups/memory.txt                   |   76 +-
+ Documentation/cgroups/resource_counter.txt         |    7 +-
+ .../devicetree/bindings/rtc/imxdi-rtc.txt          |   17 +
+ Documentation/devicetree/bindings/rtc/rtc-omap.txt |   17 +
+ Documentation/filesystems/proc.txt                 |   42 +-
+ Documentation/kernel-parameters.txt                |    7 +-
+ Documentation/memory-hotplug.txt                   |    5 +-
+ Documentation/scsi/hptiop.txt                      |   69 +-
+ Documentation/security/00-INDEX                    |    2 +
+ Documentation/sparse.txt                           |   18 +
+ Documentation/sysctl/kernel.txt                    |   19 +
+ Documentation/sysctl/vm.txt                        |   33 +-
+ arch/arm/mach-davinci/devices-da8xx.c              |   13 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c                |    1 +
+ arch/arm/mm/mmap.c                                 |  131 +-
+ arch/arm64/include/asm/unistd.h                    |    1 +
+ arch/arm64/kernel/sys_compat.c                     |   15 -
+ arch/cris/include/asm/io.h                         |   39 +-
+ arch/h8300/Kconfig                                 |    1 +
+ arch/mips/mm/mmap.c                                |  111 +-
+ arch/powerpc/include/asm/machdep.h                 |   36 +-
+ arch/powerpc/include/asm/systbl.h                  |    2 +-
+ arch/powerpc/include/asm/unistd.h                  |    1 +
+ arch/powerpc/kernel/sys_ppc32.c                    |   17 +-
+ arch/powerpc/kernel/sysfs.c                        |    4 +-
+ arch/s390/include/asm/page.h                       |    3 +
+ arch/sh/mm/mmap.c                                  |  136 +-
+ arch/sparc/include/asm/unistd.h                    |    1 +
+ arch/sparc/kernel/sys_sparc32.c                    |   14 -
+ arch/sparc/kernel/sys_sparc_32.c                   |   24 +-
+ arch/sparc/kernel/sys_sparc_64.c                   |  143 +-
+ arch/sparc/mm/hugetlbpage.c                        |  123 +-
+ arch/tile/include/asm/compat.h                     |    2 -
+ arch/tile/include/asm/unistd.h                     |    1 +
+ arch/tile/kernel/compat.c                          |   18 -
+ arch/tile/mm/hugetlbpage.c                         |  139 +-
+ arch/x86/Kconfig                                   |    1 +
+ arch/x86/include/asm/elf.h                         |    6 +-
+ arch/x86/include/asm/mman.h                        |    3 +
+ arch/x86/include/asm/uv/uv.h                       |    2 +-
+ arch/x86/kernel/acpi/boot.c                        |    7 +-
+ arch/x86/kernel/sys_x86_64.c                       |  151 +-
+ arch/x86/mm/hugetlbpage.c                          |  130 +-
+ arch/x86/mm/numa.c                                 |    3 +-
+ arch/x86/platform/iris/iris.c                      |   67 +-
+ arch/x86/platform/uv/tlb_uv.c                      |   10 +-
+ arch/x86/tools/insn_sanity.c                       |   10 +-
+ arch/x86/vdso/vma.c                                |    2 +-
+ block/genhd.c                                      |    8 +-
+ block/partitions/efi.c                             |    7 +-
+ block/partitions/msdos.c                           |   21 +-
+ drivers/base/memory.c                              |    9 +-
+ drivers/base/node.c                                |   58 +-
+ drivers/block/aoe/aoe.h                            |   32 +-
+ drivers/block/aoe/aoeblk.c                         |   49 +
+ drivers/block/aoe/aoechr.c                         |    7 +-
+ drivers/block/aoe/aoecmd.c                         |  331 +++--
+ drivers/block/aoe/aoedev.c                         |   82 +-
+ drivers/block/aoe/aoemain.c                        |    2 +-
+ drivers/block/aoe/aoenet.c                         |   13 +-
+ drivers/block/cciss.c                              |   21 +-
+ drivers/block/drbd/drbd_bitmap.c                   |    7 +-
+ drivers/firmware/dmi_scan.c                        |   78 +-
+ drivers/gpu/drm/i915/intel_pm.c                    |    3 +-
+ drivers/memstick/core/ms_block.c                   |    8 +-
+ drivers/memstick/core/ms_block.h                   |    5 +-
+ drivers/message/fusion/mptscsih.c                  |    1 +
+ drivers/net/ethernet/jme.c                         |   16 +-
+ drivers/net/wireless/Kconfig                       |    6 +-
+ drivers/of/fdt.c                                   |   10 +-
+ drivers/pcmcia/cs.c                                |   37 +-
+ drivers/rtc/Kconfig                                |   12 +-
+ drivers/rtc/rtc-imxdi.c                            |   11 +
+ drivers/rtc/rtc-omap.c                             |   80 +-
+ drivers/rtc/rtc-spear.c                            |   89 +-
+ drivers/rtc/rtc-test.c                             |   14 +-
+ drivers/rtc/rtc-vt8500.c                           |   15 +-
+ drivers/scsi/hptiop.c                              |  413 +++++-
+ drivers/scsi/hptiop.h                              |   72 +-
+ drivers/staging/android/lowmemorykiller.c          |   16 +-
+ drivers/tty/serial/serial_core.c                   |    6 +-
+ drivers/video/backlight/88pm860x_bl.c              |   15 +-
+ drivers/video/backlight/atmel-pwm-bl.c             |    7 +-
+ drivers/video/backlight/corgi_lcd.c                |   16 +-
+ drivers/video/backlight/da903x_bl.c                |   15 +-
+ drivers/video/backlight/da9052_bl.c                |    2 +-
+ drivers/video/backlight/ep93xx_bl.c                |    4 +-
+ drivers/video/backlight/generic_bl.c               |    4 +-
+ drivers/video/backlight/hp680_bl.c                 |    8 +-
+ drivers/video/backlight/ili9320.c                  |   16 +-
+ drivers/video/backlight/ili9320.h                  |    2 +-
+ drivers/video/backlight/jornada720_bl.c            |   34 +-
+ drivers/video/backlight/jornada720_lcd.c           |    3 +-
+ drivers/video/backlight/l4f00242t03.c              |    3 +-
+ drivers/video/backlight/lm3630_bl.c                |    2 +-
+ drivers/video/backlight/lm3639_bl.c                |    2 +-
+ drivers/video/backlight/lms283gf05.c               |   16 +-
+ drivers/video/backlight/locomolcd.c                |   65 +-
+ drivers/video/backlight/lp855x_bl.c                |   51 +-
+ drivers/video/backlight/max8925_bl.c               |   11 +-
+ drivers/video/backlight/omap1_bl.c                 |    4 +-
+ drivers/video/backlight/pcf50633-backlight.c       |    8 +-
+ drivers/video/backlight/platform_lcd.c             |    2 +-
+ drivers/video/backlight/s6e63m0.c                  |    2 +-
+ drivers/video/backlight/tdo24m.c                   |   33 +-
+ drivers/video/backlight/tosa_bl.c                  |   10 +-
+ drivers/video/backlight/tosa_lcd.c                 |   24 +-
+ drivers/video/backlight/vgg2432a4.c                |   10 +-
+ drivers/virtio/virtio_balloon.c                    |  132 +-
+ fs/attr.c                                          |    5 +
+ fs/autofs4/root.c                                  |    2 +-
+ fs/binfmt_elf.c                                    |   28 +-
+ fs/block_dev.c                                     |    9 +-
+ fs/btrfs/disk-io.c                                 |    8 +-
+ fs/btrfs/file.c                                    |    3 +-
+ fs/btrfs/ioctl.c                                   |    2 +-
+ fs/buffer.c                                        |   12 +-
+ fs/dcache.c                                        |    2 +-
+ fs/debugfs/inode.c                                 |    1 -
+ fs/dlm/config.c                                    |    2 +-
+ fs/drop_caches.c                                   |    2 +
+ fs/eventpoll.c                                     |   40 +-
+ fs/gfs2/glock.c                                    |    2 +-
+ fs/gfs2/sys.c                                      |   18 +-
+ fs/hfsplus/Makefile                                |    3 +-
+ fs/hfsplus/attributes.c                            |  399 +++++
+ fs/hfsplus/bfind.c                                 |   79 +-
+ fs/hfsplus/bnode.c                                 |    6 +-
+ fs/hfsplus/brec.c                                  |   23 +-
+ fs/hfsplus/btree.c                                 |    8 +
+ fs/hfsplus/catalog.c                               |   36 +-
+ fs/hfsplus/dir.c                                   |    6 +-
+ fs/hfsplus/extents.c                               |    4 +-
+ fs/hfsplus/hfsplus_fs.h                            |   41 +-
+ fs/hfsplus/hfsplus_raw.h                           |   68 +-
+ fs/hfsplus/inode.c                                 |   13 +
+ fs/hfsplus/ioctl.c                                 |  542 ++++++-
+ fs/hfsplus/super.c                                 |   33 +-
+ fs/hfsplus/unicode.c                               |    7 +-
+ fs/hugetlbfs/inode.c                               |  109 +-
+ fs/inode.c                                         |    2 +-
+ fs/ncpfs/ioctl.c                                   |    2 +-
+ fs/nilfs2/page.c                                   |    2 +-
+ fs/ocfs2/file.c                                    |    5 +-
+ fs/proc/array.c                                    |   17 +
+ fs/proc/base.c                                     |   21 +-
+ fs/proc/proc_devtree.c                             |    6 +-
+ fs/proc/task_mmu.c                                 |   53 +
+ fs/pstore/ram.c                                    |   12 +-
+ fs/splice.c                                        |    5 +-
+ fs/udf/file.c                                      |    2 +-
+ include/linux/balloon_compaction.h                 |  218 +++
+ include/linux/compat.h                             |    3 +
+ include/linux/compiler.h                           |    2 +
+ include/linux/fs.h                                 |    2 +-
+ include/linux/genhd.h                              |    8 +-
+ include/linux/gfp.h                                |    8 +-
+ include/linux/highmem.h                            |    1 +
+ include/linux/huge_mm.h                            |    4 +
+ include/linux/hugetlb.h                            |    7 +-
+ include/linux/init.h                               |   40 +-
+ include/linux/interrupt.h                          |   18 +-
+ include/linux/ipc_namespace.h                      |    1 +
+ include/linux/kernel.h                             |   47 +-
+ include/linux/memcontrol.h                         |  203 +++
+ include/linux/memory.h                             |    1 +
+ include/linux/migrate.h                            |   19 +
+ include/linux/mm.h                                 |   31 +
+ include/linux/mm_types.h                           |   19 +-
+ include/linux/mmzone.h                             |    9 -
+ include/linux/msg.h                                |    6 +-
+ include/linux/node.h                               |    3 +-
+ include/linux/oom.h                                |   21 +-
+ include/linux/page-isolation.h                     |   10 +-
+ include/linux/pagemap.h                            |   16 +
+ include/linux/percpu-rwsem.h                       |   83 +-
+ include/linux/platform_data/lp855x.h               |    9 +-
+ include/linux/res_counter.h                        |   12 +-
+ include/linux/rmap.h                               |    3 +
+ include/linux/sched.h                              |    8 +-
+ include/linux/shm.h                                |   19 +
+ include/linux/slab.h                               |   48 +
+ include/linux/slab_def.h                           |    3 +
+ include/linux/slub_def.h                           |    9 +-
+ include/linux/string.h                             |   11 +
+ include/linux/thread_info.h                        |    2 +
+ include/linux/types.h                              |    1 +
+ include/linux/vm_event_item.h                      |    8 +-
+ include/linux/writeback.h                          |    9 +-
+ include/trace/events/gfpflags.h                    |    1 +
+ include/trace/events/oom.h                         |    4 +-
+ include/trace/events/task.h                        |    8 +-
+ include/uapi/asm-generic/mman.h                    |   13 +
+ include/uapi/linux/eventpoll.h                     |    1 +
+ include/uapi/linux/msg.h                           |    1 +
+ init/Kconfig                                       |    3 +-
+ init/do_mounts.c                                   |   61 +-
+ ipc/compat.c                                       |   46 +-
+ ipc/ipc_sysctl.c                                   |   32 +
+ ipc/msg.c                                          |  123 +-
+ ipc/msgutil.c                                      |   43 +
+ ipc/sem.c                                          |  250 +++-
+ ipc/shm.c                                          |    3 +-
+ ipc/util.c                                         |   16 +-
+ ipc/util.h                                         |    2 +
+ kernel/cgroup.c                                    |    1 -
+ kernel/compat.c                                    |   17 +
+ kernel/fork.c                                      |   11 +-
+ kernel/irq/manage.c                                |    2 +-
+ kernel/module.c                                    |    3 -
+ kernel/res_counter.c                               |   20 +-
+ kernel/softirq.c                                   |    9 +-
+ kernel/time.c                                      |    4 +-
+ kernel/timeconst.pl                                |    2 +-
+ kernel/trace/trace_uprobe.c                        |    8 +-
+ lib/Makefile                                       |    2 +-
+ lib/dynamic_debug.c                                |    9 +-
+ lib/kstrtox.c                                      |   64 +
+ lib/percpu-rwsem.c                                 |  123 ++
+ lib/vsprintf.c                                     |  104 +-
+ mm/Kconfig                                         |   15 +
+ mm/Makefile                                        |    3 +-
+ mm/balloon_compaction.c                            |  271 ++++
+ mm/compaction.c                                    |   27 +-
+ mm/dmapool.c                                       |   24 +
+ mm/highmem.c                                       |  108 +-
+ mm/huge_memory.c                                   |  174 +--
+ mm/hugetlb.c                                       |    4 +-
+ mm/internal.h                                      |   53 +
+ mm/ksm.c                                           |   21 +-
+ mm/memblock.c                                      |    5 +
+ mm/memcontrol.c                                    | 1551 +++++++++++++++++---
+ mm/memory-failure.c                                |   28 +-
+ mm/memory.c                                        |   28 +-
+ mm/memory_hotplug.c                                |  153 +-
+ mm/mempolicy.c                                     |   21 +-
+ mm/migrate.c                                       |  100 +-
+ mm/mmap.c                                          |  486 ++++--
+ mm/oom_kill.c                                      |   86 +-
+ mm/page-writeback.c                                |   11 +-
+ mm/page_alloc.c                                    |  219 +--
+ mm/page_cgroup.c                                   |    3 +
+ mm/page_isolation.c                                |   27 +-
+ mm/rmap.c                                          |   59 +-
+ mm/shmem.c                                         |   21 +-
+ mm/slab.c                                          |   98 +-
+ mm/slab.h                                          |  137 +-
+ mm/slab_common.c                                   |  118 +-
+ mm/slob.c                                          |    2 +-
+ mm/slub.c                                          |  128 +-
+ mm/sparse.c                                        |   25 +-
+ mm/swap_state.c                                    |    6 +
+ mm/swapfile.c                                      |   31 +-
+ mm/truncate.c                                      |    8 +-
+ mm/vmalloc.c                                       |    4 +-
+ mm/vmscan.c                                        |   35 +-
+ mm/vmstat.c                                        |   10 +-
+ scripts/checkpatch.pl                              |    9 +
+ scripts/pnmtologo.c                                |    9 +
+ scripts/tags.sh                                    |   41 +-
+ security/selinux/netnode.c                         |    3 +-
+ sound/Kconfig                                      |    3 -
+ sound/sound_core.c                                 |    3 +-
+ tools/testing/selftests/Makefile                   |    2 +-
+ tools/testing/selftests/epoll/Makefile             |   11 +
+ tools/testing/selftests/epoll/test_epoll.c         |  364 +++++
+ tools/testing/selftests/ipc/Makefile               |   25 +
+ tools/testing/selftests/ipc/msgque.c               |  246 ++++
+ tools/testing/selftests/kcmp/kcmp_test.c           |    6 +-
+ tools/testing/selftests/vm/Makefile                |    4 +-
+ tools/testing/selftests/vm/thuge-gen.c             |  254 ++++
+ 276 files changed, 9234 insertions(+), 3141 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt
+ create mode 100644 fs/hfsplus/attributes.c
+ create mode 100644 include/linux/balloon_compaction.h
+ create mode 100644 lib/percpu-rwsem.c
+ create mode 100644 mm/balloon_compaction.c
+ create mode 100644 tools/testing/selftests/epoll/Makefile
+ create mode 100644 tools/testing/selftests/epoll/test_epoll.c
+ create mode 100644 tools/testing/selftests/ipc/Makefile
+ create mode 100644 tools/testing/selftests/ipc/msgque.c
+ create mode 100644 tools/testing/selftests/vm/thuge-gen.c
+$ git revert bd6218c7e380
+[master 7401e29] Revert "mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix"
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+$ git revert 40a20b352c0b
+[master b318a06] Revert "mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix"
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+$ git revert 160b36937ca2
+[master 574aae0] Revert "mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB"
+ 7 files changed, 19 insertions(+), 97 deletions(-)
+$ git revert a7bf5436545c
+[master 21d60d7] Revert "mm: use vm_unmapped_area() in hugetlbfs on i386 architecture"
+ 1 file changed, 105 insertions(+), 25 deletions(-)
+$ git revert fd7fc54606ba
+[master 532406f] Revert "mm-use-vm_unmapped_area-on-sparc64-architecture-fix"
+ 1 file changed, 11 insertions(+)
+$ git revert f794b36b1a4f
+[master 7ac4021] Revert "mm: use vm_unmapped_area() on sparc64 architecture"
+ 1 file changed, 102 insertions(+), 30 deletions(-)
+$ git revert 22a938b2ae1e
+[master 52a3a2c] Revert "mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture"
+ 1 file changed, 93 insertions(+), 30 deletions(-)
+$ git revert 333b23b2450b
+[master 1bf3e8b] Revert "mm: use vm_unmapped_area() on sparc32 architecture"
+ 1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644 (file)
index 0000000..8078e93
--- /dev/null
@@ -0,0 +1,23 @@
+Importing i2c based on 0e4a43ed08e2f44aa7b96aa95d0a540d675483e1
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard 0e4a43ed08e2f44aa7b96aa95d0a540d675483e1
+HEAD is now at 0e4a43e Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
+$ git am ../quilt/i2c/i2c-i801-01-add-device-tree-support.patch
+Applying: i2c-i801: Add device tree support
+$ git am ../quilt/i2c/i2c-i801-02-enable-interrupts-for-all.patch
+Applying: i2c-i801: Enable interrupts for all post-ICH5 chips
+$ git am ../quilt/i2c/i2c-piix4-convert-dev_printk-kern_-level-to-dev_-level.patch
+Applying: i2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
+$ git am ../quilt/i2c/i2c-mention-func-flags-in-smbus-documentation.patch
+Applying: i2c: Mention functionality flags in SMBus protocol documentation
+$ git am ../quilt/i2c/i2c-new-subsystem-maintainer.patch
+Applying: MAINTAINERS: i2c: 7 years, this is it
+$ cd /home/sfr/kernels/next/next
+$ git fetch -f ../quilt-tmp master:i2c/master
+From ../quilt-tmp
+ + 5e9c4fe...100b210 master     -> i2c/master  (forced update)
+Importing jdelvare-hwmon based on 3.7-rc4
+Unchanged quilt series jdelvare-hwmon
+Importing device-mapper based on v3.7-rc1
+Unchanged quilt series device-mapper
diff --git a/localversion-next b/localversion-next
new file mode 100644 (file)
index 0000000..908b2b2
--- /dev/null
@@ -0,0 +1 @@
+-next-20121109