diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-08 13:24:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-08 13:24:48 +1000 |
| commit | a554915abb994cb43b9015a7803669e824066ee4 (patch) | |
| tree | 69ec38ca501cd1039537fe21956ceeb5c843e291 | |
| parent | 738d377b7ad0623d19d58396e67b80c04f3a667f (diff) | |
Add linux-next specific files for 20140408next-20140408
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 213 | ||||
| -rw-r--r-- | Next/Trees | 217 | ||||
| -rw-r--r-- | Next/merge.log | 4004 | ||||
| -rw-r--r-- | Next/quilt-import.log | 6 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4441 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7c4bd6ed10c0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,213 @@ +Name SHA1 +---- ---- +origin dc5ed40686a4da95881c35d913b60f867755cbe2 +fixes b0031f227e47919797dc0e1c1990f3ef151ff0cc +kbuild-current 38dbfb59d1175ef458d006556061adeaa8751b72 +arc-current 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb +arm-current c9d347e0277696c80496161cbef47393b850a0aa +m68k-current 50be9eba831da114e1979726f4119d342698e651 +metag-fixes 0414855fdc4a40da05221fc6062cccbc0c30f169 +powerpc-merge 27143b9a0da7ef60db5c3e816a04a20454f4a1cc +sparc 455c6fdbd219161bd09b1165f11699d6d73de11c +net 6859e7df6d9045a461412777e63bd8cef12f9705 +ipsec d80e773f16f66a610e04f6875d4da84e74a8fb6c +sound-current de9481cb40339d9bfc1104b53649876fc5f3d432 +pci-current 707d4eefbdb31f8e588277157056b0ce637d6c68 +wireless 584221918925f0d3bbc8ff6de9cfdb703c06a29c +driver-core.current b33ce442993865180292df2a314ee5251ba38b50 +tty.current b33ce442993865180292df2a314ee5251ba38b50 +usb.current b33ce442993865180292df2a314ee5251ba38b50 +staging.current 8e0c0832348c7fda1c85d67697cfe4adf077344c +char-misc.current b33ce442993865180292df2a314ee5251ba38b50 +input-current 692d96552c9a86a919fe6b5b82288a6c77c015a5 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current 8ceee72808d1ae3fb191284afc2257a2be964725 +ide 5b40dd30bbfaa7fcba0cd945a4852a146c552ea7 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 1f42e5dd5065963979bb53daadf5d4f1e71f0c5f +rr-fixes 7122c3e9154b5d9a7422f68f02d8acf050fad2b0 +mfd-fixes 73beb63d290f961c299526852884846b0d868840 +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes 9db32cb625a500acf5849be352fb9d8b9709c529 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc b098d6726bbfb94c06d6e1097466187afddae61f +arm 2434eadb5f53ba3c19e3f6e9baa4ab5cd184b2dd +arm-kvm-cpuresume 91a3f6af430d81c5f855f3f1ff0f3715e064f342 +arm-perf 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 +arm-soc 64a5445b2b9ebd5d0d82cdf816dd56ba02f757c6 +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs ec75de15f440d9ac95f8143ddc429bb0de1921c9 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone 47fc77cc704ea0ff839f8240894ed8e0be398adf +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 6412d6635b676c8fc862f5c71bc1eb3be9ddf7b6 +renesas 68d1f3aad83a8187476aa22c33d2b87dbf2d2e62 +samsung 82cd4473bde8d91951b608a0e4c4f3445928f277 +tegra dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 +arm64 0420fa9426ed795eee6a5a4656da6c578b0425a9 +blackfin 58095fdaaf1cee12d8e01aa20f94b976e3137d27 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 e32634f5d57f1dce88624b70a6d625915f6ea09e +m68k 50be9eba831da114e1979726f4119d342698e651 +m68knommu 4dc5aa2172373fe7ccc25bc22fc21fcf150a66c5 +metag 2aca46ce1b5c4b7d76566de72b16640ec674c008 +microblaze a66a626538af65cbfc611e2b2fce500ed3f24518 +mips 75d61b3bbd4c51e39ee953ef92965d55b851bcba +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 496252f787560df18a65fdc74dc3180f7cd2c723 +powerpc cd427485357c0c4b99f69719251baacf25946e11 +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 457f2180951cdcbfb4657ddcc83b486e93497f56 +sparc-next 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8 +tile 5eb0bdf84433eb7b7ad4ba92a80aac57ad4b46ea +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa b3fdfc1b4b641d372e35ced98814289bc60bc5d1 +btrfs 00fdf13a2e9f313a044288aa59d3b8ec29ff904a +ceph a30be7cb2ccb995ad5e67fd4b548f11fe37fc8b1 +cifs a5a64da8c4e584450bb1485463ce343316426e22 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 9e78d14a9f641c0476f733f6fc559ba5cac6f52b +ext3 01d8885785a60ae8f4c37b0ed75bdc96d0fc6a44 +ext4 ad6599ab3ac98a4474544086e048ce86ec15a4d1 +f2fs 48b230a583965d33c32b4e3c29a1e5e15d7e55de +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse f3846266f593595632a07242fcbc6c24bc2ade68 +gfs2 1b2ad41214c9bf6e8befa000f0522629194bf540 +jfs 844fa1b5f8493cff4b976fa7a5b9ebeeafdd75cc +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 2b3a8fd735f86ebeb2b9d061054003000c36b654 +nfsd 06f9cc12caa862f5bc86ebdb4f77568a4bef0167 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs 8a5daf1e2c199746767d94b4036638ba11d528b3 +ubifs d56030ac25d383218045c5d87e98e0494d6af3ad +xfs a6cf33bc566c5fe888bfa9cf6448037c90661f67 +file-private-locks 18a1a7a1d862ae0794a0179473d08a414dd49234 +vfs 527d1511310a89650000081869260394e20c7013 +pci 30723cbf6f7aec2ab4810bdc4bf12c5749a09e33 +hid d1443c96d663037846fca3faa165a96135c9566a +i2c 1fbeab0b8fd5e655ffef8a793b869eb7dffe0337 +jdelvare-hwmon 455c6fdbd219161bd09b1165f11699d6d73de11c +hwmon-staging ec0159503ae74aeb834e78366bdf4b9663ca1129 +v4l-dvb 83701d7a7094f0428984e9776386d76ee7d950a9 +kbuild b072b79f07d2ac3be7d0dca2833985bc21e09ccd +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata 27aa64b9d1bd0d23fd692c91763a48309b694311 +pm 22b38e4f3729774423bf829c37307dbc2c3e3c46 +idle 23a299cd93781a190cdca0d7d16034837b7dfd86 +apm 158204397034f088bfd505eeee281f7072da1c24 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal e79ca84d62d289b90cb39c80df83acf9f315a25c +ieee1394 0ca49345b6f489e95f8d6edeb0b092e257475b2a +dlm 075f01775f53640af4a2ca3ed8cbc71de6e37582 +swiotlb 0cb637bff80d5ba2b916bb19f19ffd59cd4079fd +slave-dma 420598e2a08818d04b320358ac251ad15941460d +dmaengine 77873803363c9e831fc1d1e6895c084279090c22 +net-next cd6362befe4cc7bf589a5236d2a780af2d47bcc9 +ipsec-next cd6362befe4cc7bf589a5236d2a780af2d47bcc9 +wireless-next a31267c30880ebdc73e6815f58c69a665052fab8 +bluetooth 5c5b93e4be2fb52dca055e32e235453aa172500b +infiniband f7eaa7ed8fd46542275cf249cd934a366f6556bb +mtd 4a4163caccae97a23d97c29032664ee7b7a498d0 +l2-mtd 4a4163caccae97a23d97c29032664ee7b7a498d0 +crypto 0ea481466d1c7cbd9d8f70ddc17a443a6c6fc09b +drm 9f97ba806a9cb8e828baca71eca8b684939053d8 +drm-intel 10b6ee4a87811a110cb01eaca01eb04da6801baf +drm-tegra 3d1c1474386e3714c05beef07abe3142e0dd822d +sound a4b7f21d7b42b33609df3f86992a8deff80abfaf +sound-asoc 821d8eed3aed70b38f9c475b1ea7f8596f511d32 +modules 22c9bcad859d5c969289b3b37084a96c621f8f2c +virtio fc4324b4597c4eb8907207e82f9a6acec84dd335 +input e2c3ecf0ea8e87c5209371af7da107ebc47a5639 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block bccb5f7c8bdfe460d95f986c6edf2e75d8052897 +device-mapper 303d4a25d8a276a8028f7251ae177625a46214e1 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 5491ce3f79eed79f68fcc2dc4c10aeafe00215a6 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 5f0985bb1123b48bbfc632006bdbe76d3dfea76b +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 789b5e0315284463617e106baad360cb9e8db3ac +mfd 90b128ed1557c2f523995a379a53e5105891ecf8 +mfd-lj 2d28ca731b9bb6262f7711241628c7844b0cf7dc +battery ac323d8d807060f7c95a685a9fe861e7b6300993 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 d754589d80447da9ed23426d3861e33df43dbda7 +regulator ecf0b537f0dd96527662deee2cfdde198cf13d98 +security f64410ec665479d7b4b77b7519e814253ed0f686 +selinux eee3094683fbc7fe6bcdaef58c1ef31f8460cdca +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog fa62c102a75e7f55ef74f9a5fd8885cf5228e27c +iommu e172b81222548b856ecbe59b305d2cb733d512c4 +dwmw2-iommu 7713ec066ae8adc49dd8daa02a73e6b60af6ee5f +vfio 4379d2ae152860e023b42257fd60b5e235047f63 +osd f1f6630b53e702648a248fecd881f3df5968a31a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a +audit e231d54c1239ccf31aaee311bed0c4d1937cae2c +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree d88cf7d7b4240b8df170ba105e414e476fb51cce +dt-rh 6f976267da0e2c873c4b4aaacaf08266d1d1797d +spi 577d0b6ca192179f41f05349b69e78b66c9b22ba +tip 309ba7457356b8a364f2be304f5058a54f170abe +clockevents 09e15176ded1faa7bd685b3b5b1213cf0240566e +edac 49856dc973cd95d85ac1cab6c70410d8331e5c04 +edac-amd c045ebdf6079b79ac4b4dd16ff37f93ae0bd5190 +ftrace 3862807880acc0adaef6749738d210c9f45c3049 +rcu 765a3f4fed708ae429ee095914a7897acb3a65bd +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 7cbb39d4d4d530dff12f2ff06ed6c85c504ba91a +kvm-arm b73117c49364551ff789db7c424a115ac5b77850 +kvm-ppc 7227fc0666606b0df2c0d2966a7f4859b01bdf74 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 0a25e113b480694a0af716f33d2edd243b6a8764 +percpu 21ddfd38ee9aac804d22beaceed4c7b903cca234 +workqueues c4b75dadde829d3cbdb55bab88b67c1fb5cde3cc +drivers-x86 d17a5ee1297320f37542075a8b715c4e3674ca31 +chrome-platform 2b8454a75b90d7cd1ac325a0baba77244733354f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 64ca15fdcaa96305dbe862e6cc93283768779c46 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 0016db26c093798632ea741402215a31af447704 +driver-core b33ce442993865180292df2a314ee5251ba38b50 +tty b33ce442993865180292df2a314ee5251ba38b50 +usb b33ce442993865180292df2a314ee5251ba38b50 +usb-gadget 4b76e14d95f7b69e71eabc002dcb0dcb9ebb5340 +staging dda26427bd5252cbea876fe8a80050943c0dc642 +char-misc b33ce442993865180292df2a314ee5251ba38b50 +cgroup 49957f8e2a43035a97d05bddefa394492a969c0d +scsi b2bff6ceb61a9a21294f04057d30c9bb4910a88f +target-updates 17411c8da35667d53b3bbe82362c7de19c2d4ff7 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 69c0f2a16ab4e6048d252b9e4cba42b77b3c7967 +vhost d3d665a654a35c47463d2aa6353bac3ce293f4f5 +remoteproc bd88acba5f9809af48f66267bb16024b9e33cf2b +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio b22978fc33dec72e5f8e17f90eb63ea9137aafd5 +dma-mapping 68efd7d2fb32c2606f1da318b6a851d933813f27 +pwm 2ae69a460413615c82381b240df3800a909100d3 +dma-buf dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 +userns d211f177b28ec070c25b3d0b960aa55f352f731f +ktest 62183dcac539a14ed0a820b8392db353d72a7d7e +signal 20b4fb485227404329e41ad15588afad3df23050 +clk e44df332f30bf3040c60c1ed6674d1431fdb48b9 +random 7b878d4b48c4e04b936918bb83836a107ba453b3 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +aio fa8a53c39f3fdde98c9eace6a9b412143f0f6ed6 +llvmlinux fbc151c073f42fd5c5f12b61a1a246ab5721e741 +powernv-cpuidle 0888839c5b62c44a55ac9d28acc273ba663c65ea +rd-docs dc5ed40686a4da95881c35d913b60f867755cbe2 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e9b5201b655c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,217 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +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 +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-kvm-cpuresume git git://linux-arm.org/linux-2.6-lp.git#arm-kvm-cpuresume +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +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-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.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 +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 +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +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 +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 +file-private-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +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 +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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/for-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 +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git#master +mfd-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/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/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +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.infradead.org/users/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/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 +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +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-arm git git://github.com/columbia/linux-kvm-arm.git#kvm-arm-next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.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 +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-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 +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-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 +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/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 +arm64-hugepages git git://git.linaro.org/people/stevecapper/linux.git#for-next/hugepages +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +powernv-cpuidle git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#powernv-cpuidle +rd-docs quilt http://www.infradead.org/~rdunlap/Doc/patches/ +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..7e45b3426c61 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4004 @@ +$ date +Tuesday 8 April 09:45:40 EST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 18a1a7a1d862 Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile +Merging origin/master (dc5ed40686a4 Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge origin/master +Updating 18a1a7a1d862..dc5ed40686a4 +Fast-forward + Documentation/ABI/testing/sysfs-fs-f2fs | 12 + + Documentation/ABI/testing/sysfs-module | 1 + + Documentation/DocBook/kernel-hacking.tmpl | 10 - + Documentation/cpu-hotplug.txt | 45 + + .../devicetree/bindings/iio/adc/twl4030-madc.txt | 24 + + Documentation/devicetree/bindings/mfd/arizona.txt | 23 +- + Documentation/devicetree/bindings/mfd/bcm590xx.txt | 37 + + Documentation/devicetree/bindings/mfd/da9055.txt | 72 + + .../devicetree/bindings/mfd/omap-usb-host.txt | 23 + + .../devicetree/bindings/mfd/omap-usb-tll.txt | 10 + + .../devicetree/bindings/mfd/qcom,pm8xxx.txt | 96 + + Documentation/devicetree/bindings/mfd/s2mps11.txt | 24 +- + Documentation/devicetree/bindings/mtd/nand.txt | 14 + + Documentation/devicetree/bindings/mtd/st-fsm.txt | 26 + + .../bindings/video/analog-tv-connector.txt | 25 + + .../devicetree/bindings/video/dvi-connector.txt | 35 + + .../devicetree/bindings/video/hdmi-connector.txt | 28 + + .../devicetree/bindings/video/panel-dsi-cm.txt | 29 + + .../devicetree/bindings/video/sony,acx565akm.txt | 30 + + .../devicetree/bindings/video/ti,omap-dss.txt | 211 ++ + .../devicetree/bindings/video/ti,omap2-dss.txt | 54 + + .../devicetree/bindings/video/ti,omap3-dss.txt | 83 + + .../devicetree/bindings/video/ti,omap4-dss.txt | 111 ++ + .../devicetree/bindings/video/ti,tfp410.txt | 41 + + .../devicetree/bindings/video/ti,tpd12s015.txt | 44 + + Documentation/filesystems/f2fs.txt | 29 +- + Documentation/module-signing.txt | 3 +- + Documentation/oops-tracing.txt | 3 + + Documentation/sysctl/kernel.txt | 2 + + arch/arm/boot/dts/omap2.dtsi | 31 + + arch/arm/boot/dts/omap3-beagle-xm.dts | 138 +- + arch/arm/boot/dts/omap3-beagle.dts | 135 ++ + arch/arm/boot/dts/omap3-igep0020.dts | 58 +- + arch/arm/boot/dts/omap3-n900.dts | 77 +- + arch/arm/boot/dts/omap3.dtsi | 52 + + arch/arm/boot/dts/omap3430es1-clocks.dtsi | 6 +- + .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 6 +- + arch/arm/boot/dts/omap36xx-clocks.dtsi | 20 + + arch/arm/boot/dts/omap36xx.dtsi | 8 +- + arch/arm/boot/dts/omap3xxx-clocks.dtsi | 8 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 115 ++ + arch/arm/boot/dts/omap4-sdp.dts | 113 ++ + arch/arm/boot/dts/omap4.dtsi | 85 + + arch/arm/boot/dts/omap5.dtsi | 6 + + arch/arm/kernel/hw_breakpoint.c | 8 +- + arch/arm/kvm/arm.c | 7 +- + arch/arm/mach-omap2/board-generic.c | 4 + + arch/arm/mach-omap2/cclock3xxx_data.c | 4 - + arch/arm/mach-omap2/common.h | 3 + + arch/arm/mach-omap2/display.c | 166 ++ + arch/arm/mach-omap2/display.h | 3 + + arch/arm/mach-omap2/dss-common.c | 224 +-- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 - + arch/arm/mach-omap2/pdata-quirks.c | 3 - + arch/arm64/kernel/debug-monitors.c | 6 +- + arch/arm64/kernel/hw_breakpoint.c | 7 +- + arch/ia64/kernel/err_inject.c | 15 +- + arch/ia64/kernel/palinfo.c | 6 +- + arch/ia64/kernel/salinfo.c | 6 +- + arch/ia64/kernel/topology.c | 6 +- + arch/powerpc/kernel/sysfs.c | 8 +- + arch/s390/kernel/cache.c | 5 +- + arch/s390/kernel/smp.c | 13 +- + arch/sparc/kernel/sysfs.c | 6 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 13 +- + arch/x86/kernel/cpu/mcheck/mce.c | 8 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 18 +- + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 6 +- + arch/x86/kernel/cpu/perf_event_amd_uncore.c | 7 +- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 9 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 6 +- + arch/x86/kernel/cpuid.c | 15 +- + arch/x86/kernel/hpet.c | 4 +- + arch/x86/kernel/msr.c | 16 +- + arch/x86/kernel/vsyscall_64.c | 6 +- + arch/x86/kvm/x86.c | 7 +- + arch/x86/oprofile/nmi_int.c | 15 +- + arch/x86/pci/amd_bus.c | 5 +- + drivers/base/topology.c | 12 +- + drivers/block/rbd.c | 87 +- + drivers/clk/ti/clk-3xxx.c | 4 - + drivers/clocksource/dummy_timer.c | 11 +- + drivers/cpufreq/acpi-cpufreq.c | 7 +- + drivers/gpio/gpio-ich.c | 26 +- + drivers/hwmon/coretemp.c | 14 +- + drivers/hwmon/via-cputemp.c | 14 +- + drivers/idle/intel_idle.c | 12 +- + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/{mfd => iio/adc}/twl4030-madc.c | 321 +-- + drivers/mfd/88pm800.c | 3 +- + drivers/mfd/88pm860x-core.c | 6 + + drivers/mfd/Kconfig | 98 +- + drivers/mfd/Makefile | 6 +- + drivers/mfd/adp5520.c | 1 - + drivers/mfd/as3722.c | 1 + + drivers/mfd/bcm590xx.c | 93 + + drivers/mfd/cs5535-mfd.c | 1 - + drivers/mfd/da9052-core.c | 3 + + drivers/mfd/da9052-i2c.c | 5 +- + drivers/mfd/da9052-spi.c | 1 + + drivers/mfd/da9055-i2c.c | 8 + + drivers/mfd/da9063-core.c | 25 +- + drivers/mfd/janz-cmodio.c | 1 - + drivers/mfd/kempld-core.c | 31 +- + drivers/mfd/lpc_ich.c | 151 +- + drivers/mfd/lpc_sch.c | 1 - + drivers/mfd/max14577.c | 6 +- + drivers/mfd/max77686.c | 4 + + drivers/mfd/max77693.c | 12 +- + drivers/mfd/max8925-i2c.c | 9 + + drivers/mfd/max8997.c | 18 + + drivers/mfd/max8998.c | 4 + + drivers/mfd/mc13xxx-spi.c | 5 + + drivers/mfd/mcp-sa11x0.c | 1 - + drivers/mfd/omap-usb-host.c | 189 +- + drivers/mfd/omap-usb-tll.c | 2 +- + drivers/mfd/pcf50633-adc.c | 1 - + drivers/mfd/pm8921-core.c | 419 +++- + drivers/mfd/pm8xxx-irq.c | 371 ---- + drivers/mfd/rc5t583-irq.c | 1 - + drivers/mfd/rdc321x-southbridge.c | 1 - + drivers/mfd/retu-mfd.c | 1 - + drivers/mfd/rtsx_usb.c | 760 +++++++ + drivers/mfd/sec-core.c | 17 +- + drivers/mfd/smsc-ece1099.c | 1 - + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/stw481x.c | 8 +- + drivers/mfd/syscon.c | 9 +- + drivers/mfd/tc3589x.c | 84 +- + drivers/mfd/ti-ssp.c | 465 ----- + drivers/mfd/ti_am335x_tscadc.c | 24 +- + drivers/mfd/timberdale.c | 2 +- + drivers/mfd/tps65218.c | 282 +++ + drivers/mfd/tps65910.c | 5 +- + drivers/mfd/tps65912-core.c | 1 - + drivers/mfd/tps65912-irq.c | 1 - + drivers/mfd/twl-core.c | 10 +- + drivers/mfd/twl4030-irq.c | 1 - + drivers/mfd/twl6030-irq.c | 1 - + drivers/mfd/twl6040.c | 6 +- + drivers/mfd/ucb1x00-core.c | 4 +- + drivers/mfd/vexpress-config.c | 3 +- + drivers/mfd/vexpress-sysreg.c | 2 +- + drivers/mfd/wm5102-tables.c | 36 + + drivers/mfd/wm5110-tables.c | 174 +- + drivers/mfd/wm8350-core.c | 1 - + drivers/mfd/wm8350-irq.c | 1 - + drivers/mfd/wm8400-core.c | 22 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/bcm47xxpart.c | 11 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 40 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 9 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 3 - + drivers/mtd/chips/cfi_probe.c | 4 +- + drivers/mtd/chips/cfi_util.c | 4 +- + drivers/mtd/chips/gen_probe.c | 2 - + drivers/mtd/devices/Kconfig | 8 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/block2mtd.c | 19 +- + drivers/mtd/devices/elm.c | 49 +- + drivers/mtd/devices/m25p80.c | 35 +- + drivers/mtd/devices/mtd_dataflash.c | 24 +- + drivers/mtd/devices/phram.c | 41 +- + drivers/mtd/devices/pmc551.c | 7 +- + drivers/mtd/devices/serial_flash_cmds.h | 81 + + drivers/mtd/devices/spear_smi.c | 2 - + drivers/mtd/devices/sst25l.c | 1 - + drivers/mtd/devices/st_spi_fsm.c | 2108 ++++++++++++++++++++ + drivers/mtd/inftlmount.c | 1 - + drivers/mtd/lpddr/lpddr_cmds.c | 4 +- + drivers/mtd/lpddr/qinfo_probe.c | 5 +- + drivers/mtd/maps/Kconfig | 10 +- + drivers/mtd/maps/bfin-async-flash.c | 1 - + drivers/mtd/maps/gpio-addr-flash.c | 1 - + drivers/mtd/maps/intel_vr_nor.c | 1 - + drivers/mtd/maps/ixp4xx.c | 1 - + drivers/mtd/maps/lantiq-flash.c | 1 - + drivers/mtd/maps/latch-addr-flash.c | 1 - + drivers/mtd/maps/pci.c | 1 - + drivers/mtd/maps/physmap_of.c | 1 - + drivers/mtd/maps/plat-ram.c | 2 - + drivers/mtd/maps/pxa2xx-flash.c | 1 - + drivers/mtd/maps/rbtx4939-flash.c | 1 - + drivers/mtd/maps/scb2_flash.c | 1 - + drivers/mtd/maps/sun_uflash.c | 1 - + drivers/mtd/mtd_blkdevs.c | 1 - + drivers/mtd/mtdchar.c | 20 +- + drivers/mtd/mtdcore.c | 24 +- + drivers/mtd/mtdpart.c | 14 +- + drivers/mtd/nand/Kconfig | 2 + + drivers/mtd/nand/ams-delta.c | 1 - + drivers/mtd/nand/atmel_nand.c | 14 +- + drivers/mtd/nand/au1550nd.c | 4 +- + drivers/mtd/nand/bf5xx_nand.c | 1 - + drivers/mtd/nand/cafe_nand.c | 68 +- + drivers/mtd/nand/davinci_nand.c | 1 - + drivers/mtd/nand/denali_dt.c | 39 +- + drivers/mtd/nand/diskonchip.c | 5 +- + drivers/mtd/nand/fsl_elbc_nand.c | 1 - + drivers/mtd/nand/fsl_ifc_nand.c | 1 - + drivers/mtd/nand/gpio.c | 1 - + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 102 +- + drivers/mtd/nand/mpc5121_nfc.c | 1 - + drivers/mtd/nand/mxc_nand.c | 2 + + drivers/mtd/nand/nand_base.c | 165 +- + drivers/mtd/nand/nand_ids.c | 3 + + drivers/mtd/nand/nuc900_nand.c | 6 +- + drivers/mtd/nand/omap2.c | 512 ++--- + drivers/mtd/nand/pasemi_nand.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 3 +- + drivers/mtd/nand/s3c2410.c | 1 - + drivers/mtd/onenand/generic.c | 1 - + drivers/mtd/onenand/omap2.c | 1 - + drivers/mtd/onenand/onenand_base.c | 38 +- + drivers/mtd/onenand/samsung.c | 4 +- + drivers/mtd/rfd_ftl.c | 9 +- + drivers/mtd/sm_ftl.c | 11 +- + drivers/mtd/tests/mtd_test.c | 1 - + drivers/mtd/ubi/ubi.h | 1 - + drivers/of/of_mtd.c | 34 + + drivers/oprofile/nmi_timer_int.c | 23 +- + drivers/pci/slot.c | 6 +- + drivers/powercap/intel_rapl.c | 10 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 12 +- + drivers/scsi/bnx2i/bnx2i_init.c | 12 +- + drivers/scsi/fcoe/fcoe.c | 15 +- + drivers/staging/speakup/kobjects.c | 62 +- + drivers/staging/speakup/speakup.h | 2 - + drivers/staging/speakup/speakup_acntpc.c | 22 +- + drivers/staging/speakup/speakup_acntsa.c | 22 +- + drivers/staging/speakup/speakup_apollo.c | 24 +- + drivers/staging/speakup/speakup_audptr.c | 24 +- + drivers/staging/speakup/speakup_bns.c | 22 +- + drivers/staging/speakup/speakup_decext.c | 24 +- + drivers/staging/speakup/speakup_decpc.c | 24 +- + drivers/staging/speakup/speakup_dectlk.c | 24 +- + drivers/staging/speakup/speakup_dtlk.c | 28 +- + drivers/staging/speakup/speakup_dummy.c | 22 +- + drivers/staging/speakup/speakup_keypc.c | 18 +- + drivers/staging/speakup/speakup_ltlk.c | 28 +- + drivers/staging/speakup/speakup_soft.c | 30 +- + drivers/staging/speakup/speakup_spkout.c | 24 +- + drivers/staging/speakup/speakup_txprt.c | 22 +- + drivers/thermal/x86_pkg_temp_thermal.c | 14 +- + .../video/omap2/displays-new/connector-analog-tv.c | 43 +- + drivers/video/omap2/displays-new/connector-dvi.c | 43 + + drivers/video/omap2/displays-new/connector-hdmi.c | 30 + + drivers/video/omap2/displays-new/encoder-tfp410.c | 43 +- + .../video/omap2/displays-new/encoder-tpd12s015.c | 56 + + drivers/video/omap2/displays-new/panel-dsi-cm.c | 60 +- + .../omap2/displays-new/panel-sony-acx565akm.c | 33 +- + drivers/video/omap2/dss/Makefile | 2 +- + drivers/video/omap2/dss/dispc.c | 8 + + drivers/video/omap2/dss/display.c | 28 +- + drivers/video/omap2/dss/dpi.c | 47 + + drivers/video/omap2/dss/dsi.c | 147 +- + drivers/video/omap2/dss/dss-of.c | 159 ++ + drivers/video/omap2/dss/dss.c | 66 + + drivers/video/omap2/dss/dss.h | 6 + + drivers/video/omap2/dss/hdmi4.c | 14 +- + drivers/video/omap2/dss/hdmi_wp.c | 2 + + drivers/video/omap2/dss/sdi.c | 45 + + drivers/video/omap2/dss/venc.c | 66 +- + drivers/video/omap2/omapfb/omapfb-main.c | 67 +- + drivers/watchdog/iTCO_wdt.c | 137 +- + drivers/watchdog/octeon-wdt-main.c | 11 +- + drivers/xen/balloon.c | 36 +- + fs/ceph/cache.c | 1 + + fs/ceph/cache.h | 10 + + fs/ceph/caps.c | 9 +- + fs/ceph/debugfs.c | 5 +- + fs/ceph/dir.c | 53 +- + fs/ceph/export.c | 267 ++- + fs/ceph/file.c | 8 +- + fs/ceph/inode.c | 76 +- + fs/ceph/ioctl.c | 5 +- + fs/ceph/locks.c | 98 +- + fs/ceph/mds_client.c | 97 +- + fs/ceph/mds_client.h | 4 +- + fs/ceph/strings.c | 1 + + fs/ceph/super.c | 1 + + fs/ceph/super.h | 3 +- + fs/ceph/xattr.c | 48 +- + fs/f2fs/acl.c | 8 +- + fs/f2fs/checkpoint.c | 208 +- + fs/f2fs/data.c | 106 +- + fs/f2fs/debug.c | 12 +- + fs/f2fs/dir.c | 85 +- + fs/f2fs/f2fs.h | 105 +- + fs/f2fs/file.c | 31 +- + fs/f2fs/gc.c | 16 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 27 +- + fs/f2fs/namei.c | 9 + + fs/f2fs/node.c | 334 ++-- + fs/f2fs/node.h | 25 +- + fs/f2fs/recovery.c | 37 +- + fs/f2fs/segment.c | 222 ++- + fs/f2fs/segment.h | 75 +- + fs/f2fs/super.c | 97 +- + fs/f2fs/xattr.c | 7 +- + fs/fuse/cuse.c | 4 +- + fs/jffs2/compr_rtime.c | 4 +- + fs/jffs2/fs.c | 9 +- + fs/jffs2/nodelist.h | 2 +- + fs/jffs2/nodemgmt.c | 14 +- + fs/nfs/callback_proc.c | 19 +- + fs/nfs/dir.c | 62 +- + fs/nfs/inode.c | 34 +- + fs/nfs/internal.h | 8 + + fs/nfs/nfs3proc.c | 36 - + fs/nfs/nfs4_fs.h | 11 + + fs/nfs/nfs4client.c | 7 + + fs/nfs/nfs4proc.c | 197 +- + fs/nfs/nfs4state.c | 6 +- + fs/nfs/nfs4xdr.c | 3 +- + fs/nfs/pnfs.c | 17 +- + fs/nfs/proc.c | 25 - + fs/nfs/unlink.c | 35 +- + fs/ocfs2/cluster/sys.c | 2 +- + fs/ocfs2/stackglue.c | 8 +- + include/linux/ceph/ceph_features.h | 12 +- + include/linux/ceph/ceph_fs.h | 5 +- + include/linux/ceph/osd_client.h | 11 +- + include/linux/ceph/osdmap.h | 50 +- + include/linux/ceph/rados.h | 18 +- + include/linux/cpu.h | 47 + + include/linux/crush/crush.h | 7 + + include/linux/f2fs_fs.h | 2 +- + include/linux/i2c/twl.h | 12 + + include/linux/i2c/twl4030-madc.h | 2 +- + include/linux/isapnp.h | 4 - + include/linux/kernel.h | 9 + + include/linux/mfd/arizona/registers.h | 84 + + include/linux/mfd/bcm590xx.h | 31 + + include/linux/mfd/da9052/da9052.h | 1 + + include/linux/mfd/da9063/core.h | 6 +- + include/linux/mfd/da9063/registers.h | 120 +- + include/linux/mfd/lpc_ich.h | 25 +- + include/linux/mfd/max14577-private.h | 8 - + include/linux/mfd/max14577.h | 5 - + include/linux/mfd/pm8xxx/irq.h | 59 - + include/linux/mfd/pm8xxx/pm8921.h | 30 - + include/linux/mfd/rtsx_usb.h | 628 ++++++ + include/linux/mfd/tps65218.h | 284 +++ + include/linux/module.h | 19 +- + include/linux/moduleparam.h | 10 +- + include/linux/mtd/mtd.h | 16 +- + include/linux/mtd/nand.h | 135 +- + include/linux/nfs_fs.h | 2 +- + include/linux/nfs_xdr.h | 3 +- + include/linux/of_mtd.h | 12 + + include/linux/perf_event.h | 16 +- + include/linux/platform_data/elm.h | 10 +- + include/linux/platform_data/mtd-nand-s3c2410.h | 8 +- + include/linux/ssbi.h | 20 + + include/linux/sunrpc/bc_xprt.h | 3 +- + include/linux/sysfs.h | 3 +- + include/linux/wait.h | 11 - + include/trace/events/module.h | 4 +- + include/video/omapdss.h | 14 + + kernel/cgroup.c | 32 +- + kernel/cpu.c | 38 +- + kernel/module.c | 10 +- + kernel/panic.c | 2 + + kernel/profile.c | 20 +- + kernel/sched/core.c | 46 - + kernel/trace/ring_buffer.c | 19 +- + kernel/tracepoint.c | 5 +- + mm/vmstat.c | 6 +- + mm/zsmalloc.c | 17 +- + mm/zswap.c | 8 +- + net/ceph/crush/mapper.c | 85 +- + net/ceph/debugfs.c | 55 +- + net/ceph/messenger.c | 6 + + net/ceph/osd_client.c | 41 +- + net/ceph/osdmap.c | 993 ++++++--- + net/core/flow.c | 8 +- + net/iucv/iucv.c | 121 +- + net/sunrpc/backchannel_rqst.c | 93 +- + net/sunrpc/clnt.c | 23 +- + net/sunrpc/sched.c | 3 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 4 +- + net/sunrpc/xprtrdma/transport.c | 10 +- + net/sunrpc/xprtsock.c | 28 +- + scripts/kallsyms.c | 74 +- + scripts/link-vmlinux.sh | 4 + + scripts/mod/file2alias.c | 14 +- + 389 files changed, 13402 insertions(+), 4511 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/bcm590xx.txt + create mode 100644 Documentation/devicetree/bindings/mfd/da9055.txt + create mode 100644 Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt + create mode 100644 Documentation/devicetree/bindings/mtd/st-fsm.txt + create mode 100644 Documentation/devicetree/bindings/video/analog-tv-connector.txt + create mode 100644 Documentation/devicetree/bindings/video/dvi-connector.txt + create mode 100644 Documentation/devicetree/bindings/video/hdmi-connector.txt + create mode 100644 Documentation/devicetree/bindings/video/panel-dsi-cm.txt + create mode 100644 Documentation/devicetree/bindings/video/sony,acx565akm.txt + create mode 100644 Documentation/devicetree/bindings/video/ti,omap-dss.txt + create mode 100644 Documentation/devicetree/bindings/video/ti,omap2-dss.txt + create mode 100644 Documentation/devicetree/bindings/video/ti,omap3-dss.txt + create mode 100644 Documentation/devicetree/bindings/video/ti,omap4-dss.txt + create mode 100644 Documentation/devicetree/bindings/video/ti,tfp410.txt + create mode 100644 Documentation/devicetree/bindings/video/ti,tpd12s015.txt + rename drivers/{mfd => iio/adc}/twl4030-madc.c (74%) + create mode 100644 drivers/mfd/bcm590xx.c + delete mode 100644 drivers/mfd/pm8xxx-irq.c + create mode 100644 drivers/mfd/rtsx_usb.c + delete mode 100644 drivers/mfd/ti-ssp.c + create mode 100644 drivers/mfd/tps65218.c + create mode 100644 drivers/mtd/devices/serial_flash_cmds.h + create mode 100644 drivers/mtd/devices/st_spi_fsm.c + create mode 100644 drivers/video/omap2/dss/dss-of.c + create mode 100644 include/linux/mfd/bcm590xx.h + delete mode 100644 include/linux/mfd/pm8xxx/irq.h + delete mode 100644 include/linux/mfd/pm8xxx/pm8921.h + create mode 100644 include/linux/mfd/rtsx_usb.h + create mode 100644 include/linux/mfd/tps65218.h +Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (61fb4bfc010b ARC: [nsimosci] Unbork console) +$ git merge arc-current/for-curr +Removing arch/arc/boot/dts/skeleton.dts +Merge made by the 'recursive' strategy. + arch/arc/boot/.gitignore | 1 + + arch/arc/boot/dts/nsimosci.dts | 12 +++++---- + arch/arc/boot/dts/skeleton.dts | 10 ------- + arch/arc/configs/nsimosci_defconfig | 1 + + arch/arc/include/asm/linkage.h | 14 ---------- + arch/arc/kernel/ctx_sw_asm.S | 2 +- + arch/arc/kernel/entry.S | 52 ++++++++++++++++++------------------- + arch/arc/kernel/head.S | 7 ++--- + arch/arc/kernel/time.c | 37 ++++++++++++-------------- + arch/arc/lib/memcmp.S | 6 ++--- + arch/arc/lib/memcpy-700.S | 6 ++--- + arch/arc/lib/memset.S | 10 +++---- + arch/arc/lib/strchr-700.S | 6 ++--- + arch/arc/lib/strcmp.S | 6 ++--- + arch/arc/lib/strcpy-700.S | 6 ++--- + arch/arc/lib/strlen.S | 6 ++--- + arch/arc/mm/cache_arc700.c | 3 +-- + arch/arc/mm/init.c | 27 +++++++++++++++++++ + arch/arc/mm/tlbex.S | 10 +++---- + arch/arc/plat-arcfpga/Kconfig | 1 - + arch/arc/plat-arcfpga/platform.c | 6 ++--- + 21 files changed, 114 insertions(+), 115 deletions(-) + delete mode 100644 arch/arc/boot/dts/skeleton.dts +Merging arm-current/fixes (c9d347e02776 ARM: 8009/1: dcscb.c: remove call to outer_flush_all()) +$ git merge arm-current/fixes +Auto-merging arch/arm/kernel/process.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/crash_dump.c | 2 +- + arch/arm/kernel/process.c | 2 +- + arch/arm/mach-vexpress/dcscb.c | 13 ++++++++---- + arch/arm/mm/dump.c | 47 ++++++++++++++++++++++++++++-------------- + 4 files changed, 43 insertions(+), 21 deletions(-) +Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (27143b9a0da7 powerpc/le: Avoid creatng R_PPC64_TOCSAVE relocations for modules.) +$ git merge powerpc-merge/merge +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 1 + + arch/powerpc/include/asm/emulated_ops.h | 1 + + arch/powerpc/include/asm/opal.h | 19 +++- + arch/powerpc/include/asm/rtas.h | 127 ++++++++++++++++++------- + arch/powerpc/kernel/align.c | 52 ++++++++-- + arch/powerpc/kernel/cpu_setup_power.S | 2 - + arch/powerpc/kernel/exceptions-64s.S | 8 -- + arch/powerpc/kernel/paca.c | 3 +- + arch/powerpc/kernel/process.c | 34 +++++-- + arch/powerpc/kernel/prom.c | 58 +++++------ + arch/powerpc/kernel/rtas.c | 15 +-- + arch/powerpc/kernel/rtasd.c | 24 ++--- + arch/powerpc/kernel/setup-common.c | 3 + + arch/powerpc/kernel/setup_32.c | 2 - + arch/powerpc/kernel/setup_64.c | 28 +++++- + arch/powerpc/kernel/signal_32.c | 2 + + arch/powerpc/kernel/signal_64.c | 2 + + arch/powerpc/kernel/tm.S | 2 +- + arch/powerpc/kernel/traps.c | 1 + + arch/powerpc/math-emu/mtfsf.c | 58 +++++------ + arch/powerpc/mm/gup.c | 13 +++ + arch/powerpc/platforms/cell/spu_syscalls.c | 2 +- + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/powernv/opal-async.c | 7 +- + arch/powerpc/platforms/powernv/opal-msglog.c | 120 +++++++++++++++++++++++ + arch/powerpc/platforms/powernv/opal-sensor.c | 6 +- + arch/powerpc/platforms/powernv/opal-sysparam.c | 4 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + + arch/powerpc/platforms/powernv/opal.c | 59 +++++++++--- + arch/powerpc/platforms/pseries/io_event_irq.c | 6 +- + arch/powerpc/platforms/pseries/nvram.c | 11 +-- + arch/powerpc/platforms/pseries/ras.c | 17 ++-- + arch/powerpc/sysdev/msi_bitmap.c | 2 +- + drivers/hwmon/ibmpowernv.c | 7 +- + drivers/tty/hvc/hvc_opal.c | 22 ++++- + 35 files changed, 530 insertions(+), 190 deletions(-) + create mode 100644 arch/powerpc/platforms/powernv/opal-msglog.c +Merging sparc/master (455c6fdbd219 Linux 3.14) +$ git merge sparc/master +Already up-to-date. +Merging net/master (6859e7df6d90 netdev: remove potentially harmful checks) +$ git merge net/master +Removing drivers/net/ethernet/samsung/sxgbe/Kconfig +Merge made by the 'recursive' strategy. + drivers/isdn/isdnloop/isdnloop.c | 6 + + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 1 + + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - + drivers/net/ethernet/cadence/at91_ether.c | 3 + + drivers/net/ethernet/cisco/enic/enic.h | 1 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 1 + + drivers/net/ethernet/samsung/Kconfig | 24 +++- + drivers/net/ethernet/samsung/sxgbe/Kconfig | 9 -- + drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c | 1 - + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 27 +++-- + drivers/net/ethernet/smsc/smc911x.c | 1 - + drivers/net/ethernet/ti/cpts.c | 2 + + drivers/net/ieee802154/at86rf230.c | 2 +- + drivers/net/phy/spi_ks8995.c | 52 +++++++-- + drivers/net/vxlan.c | 6 +- + drivers/net/xen-netback/common.h | 1 + + drivers/net/xen-netback/netback.c | 146 +++++++++++++----------- + include/linux/netdev_features.h | 2 + + include/linux/netdevice.h | 24 +++- + include/net/netfilter/nf_conntrack_extend.h | 4 +- + net/bridge/netfilter/ebtables.c | 5 +- + net/core/dev.c | 14 ++- + net/core/ethtool.c | 1 + + net/core/filter.c | 32 +++--- + net/core/pktgen.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 6 +- + net/ipv4/netfilter/ip_tables.c | 6 +- + net/ipv6/netfilter/ip6_tables.c | 6 +- + net/mac802154/mib.c | 1 - + net/netfilter/nf_tables_api.c | 7 +- + net/netfilter/xt_cgroup.c | 3 +- + net/netfilter/xt_connlimit.c | 25 ++-- + net/netfilter/xt_osf.c | 2 + + net/packet/af_packet.c | 3 +- + net/tipc/net.c | 3 + + net/tipc/socket.c | 3 +- + 37 files changed, 276 insertions(+), 159 deletions(-) + delete mode 100644 drivers/net/ethernet/samsung/sxgbe/Kconfig +Merging ipsec/master (d80e773f16f6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (de9481cb4033 ALSA: hda/realtek - Improve HP depop when system change power state on Chromebook) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/cs8427.h | 1 + + sound/i2c/cs8427.c | 57 ++++++++++++++++++++++++++++--------------- + sound/oss/ad1848.c | 4 --- + sound/oss/opl3.c | 3 --- + sound/oss/pas2_mixer.c | 9 ------- + sound/oss/pas2_pcm.c | 18 -------------- + sound/oss/sb_common.c | 4 --- + sound/oss/sb_ess.c | 4 --- + sound/oss/sequencer.c | 6 ----- + sound/oss/sound_config.h | 4 --- + sound/oss/soundcard.c | 6 ----- + sound/oss/uart401.c | 11 ++------- + sound/pci/hda/patch_realtek.c | 19 +++++++++++++-- + sound/pci/ice1712/delta.c | 31 ++++++++++++++++++++--- + sound/pci/ice1712/ice1712.c | 32 ++++++++++++++++++++++++ + 15 files changed, 118 insertions(+), 91 deletions(-) +Merging pci-current/for-linus (707d4eefbdb3 Revert "[PATCH] Insert GART region into resource map") +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (584221918925 Revert "rt2x00: rt2800lib: Update BBP register initialization for RT53xx") +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (8e0c0832348c Merge tag 'fbdev-main-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (692d96552c9a Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (8ceee72808d1 crypto: ghash-clmulni-intel - use C implementation for setkey()) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 5 ++++- + drivers/ide/ide-probe.c | 8 +++++--- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test for of_match_node()) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) +$ git merge mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (9db32cb625a5 drm/i915: Undo gtt scratch pte unmapping again) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (b098d6726bbf Linux 3.14-rc8) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (2434eadb5f53 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/kernel/kprobes-common.c | 4 +- + arch/arm/kernel/kprobes-test-arm.c | 603 ++++++++++++++++++----------------- + arch/arm/kernel/kprobes-test-thumb.c | 447 +++++++++++++------------- + arch/arm/kernel/kprobes-test.c | 13 +- + arch/arm/kernel/kprobes-test.h | 2 +- + arch/arm/kernel/kprobes-thumb.c | 20 +- + arch/arm/kernel/kprobes.c | 9 +- + arch/arm/kernel/probes.c | 15 +- + 8 files changed, 562 insertions(+), 551 deletions(-) +Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: sleep: restore HYP mode configuration in cpu_resume) +$ git merge arm-kvm-cpuresume/arm-kvm-cpuresume +Auto-merging arch/arm/include/asm/assembler.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/assembler.h | 2 +- + arch/arm/kernel/sleep.S | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging arm-perf/for-next/perf (6d0abeca3242 Linux 3.14-rc3) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (64a5445b2b9e arm-soc: add contents file) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/qcom-msm8960.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/qcom-msm8974.dtsi' using previous resolution. +Resolved 'arch/arm/mach-omap2/pdata-quirks.c' using previous resolution. +Resolved 'arch/arm/mach-zynq/Kconfig' using previous resolution. +Resolved 'drivers/watchdog/Kconfig' using previous resolution. +Resolved 'sound/soc/kirkwood/Kconfig' using previous resolution. +Auto-merging sound/soc/kirkwood/Kconfig +CONFLICT (content): Merge conflict in sound/soc/kirkwood/Kconfig +Auto-merging drivers/watchdog/Kconfig +CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig +Auto-merging arch/arm/mach-zynq/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-zynq/Kconfig +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pdata-quirks.c +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/qcom-msm8974.dtsi +Auto-merging arch/arm/boot/dts/qcom-msm8960.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/qcom-msm8960.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8732f79d3f3b] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/arm-soc-for-next-contents.txt | 505 +++++++++++++++++++++++++++++++++ + arch/arm/configs/multi_v7_defconfig | 4 - + 2 files changed, 505 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +$ git am -3 ../patches/0001-arm-Replace-various-irq_desc-accesses-fix-for-file-m.patch +Applying: arm: Replace various irq_desc accesses fix for file move +Using index info to reconstruct a base tree... +M arch/arm/mach-imx/pm-imx6.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +$ git am -3 ../patches/0001-ARM-dts-i.MX53-merge-fix-patch.patch +Applying: ARM: dts: i.MX53: merge fix patch +Using index info to reconstruct a base tree... +M arch/arm/boot/dts/imx53-qsb-common.dtsi +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) +$ git merge cortex-m/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (ec75de15f440 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx6qdl.dtsi +Auto-merging arch/arm/boot/dts/imx53.dtsi +Auto-merging arch/arm/boot/dts/imx53-qsb-common.dtsi +Auto-merging arch/arm/boot/dts/imx53-m53evk.dts +Auto-merging arch/arm/boot/dts/imx51.dtsi +Auto-merging arch/arm/boot/dts/imx51-babbage.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig.debug +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx25-clock.txt | 3 + + arch/arm/Kconfig.debug | 9 + + arch/arm/boot/dts/Makefile | 1 + + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 13 ++ + arch/arm/boot/dts/imx25-pdk.dts | 217 ++++++++++++++++++++- + arch/arm/boot/dts/imx25.dtsi | 39 ++-- + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 75 +++++++ + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 16 ++ + arch/arm/boot/dts/imx27.dtsi | 1 + + arch/arm/boot/dts/imx28-duckbill.dts | 12 +- + arch/arm/boot/dts/imx28.dtsi | 1 + + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 22 +++ + arch/arm/boot/dts/imx35-pdk.dts | 67 +++++++ + arch/arm/boot/dts/imx35.dtsi | 25 ++- + arch/arm/boot/dts/imx50.dtsi | 1 + + arch/arm/boot/dts/imx51-babbage.dts | 62 ++++++ + arch/arm/boot/dts/imx51.dtsi | 1 + + arch/arm/boot/dts/imx53-m53evk.dts | 23 +-- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 3 +- + arch/arm/boot/dts/imx53.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 11 +- + arch/arm/boot/dts/imx6sl.dtsi | 3 +- + arch/arm/boot/dts/vf610-twr.dts | 36 ++++ + arch/arm/boot/dts/vf610.dtsi | 24 +++ + arch/arm/configs/imx_v4_v5_defconfig | 6 + + arch/arm/include/debug/vf.S | 15 +- + arch/arm/mach-imx/clk-imx25.c | 15 +- + arch/arm/mach-imx/clk-imx51-imx53.c | 2 - + arch/arm/mach-imx/clk-imx6q.c | 4 +- + arch/arm/mach-imx/mach-mx21ads.c | 173 ++++++++-------- + 32 files changed, 767 insertions(+), 137 deletions(-) + create mode 100644 arch/arm/boot/dts/imx35-pdk.dts +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (47fc77cc704e Merge branch 'for_3.15/fixes' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (6412d6635b67 Merge branch 'mvebu/dt-fixes-non-critical' into for-next) +$ git merge mvebu/for-next +Resolved 'arch/arm/boot/dts/Makefile' using previous resolution. +Auto-merging arch/arm/boot/dts/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da4fad03ffb0] Merge remote-tracking branch 'mvebu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/Makefile | 5 ++++- + arch/arm/boot/dts/armada-370-xp.dtsi | 1 + + arch/arm/boot/dts/armada-38x.dtsi | 1 + + arch/arm/boot/dts/kirkwood-b3.dts | 2 +- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-laplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 ++-- + arch/arm/boot/dts/kirkwood-nsa310.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa310a.dts | 2 +- + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +- + arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +- + 13 files changed, 17 insertions(+), 12 deletions(-) +Merging renesas/next (68d1f3aad83a Merge branch 'heads/clock-for-v3.15' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging samsung/for-next (82cd4473bde8 Merge branch 'v3.15-next/cleanup-exynos' into for-next) +$ git merge samsung/for-next +Resolved 'arch/arm/mach-exynos/exynos.c' using previous resolution. +Removing arch/arm/mach-s3c24xx/common-s3c2443.c +Removing arch/arm/mach-s3c24xx/clock-s3c2443.c +Removing arch/arm/mach-s3c24xx/clock-s3c2416.c +Removing arch/arm/mach-s3c24xx/clock-s3c2412.c +Auto-merging arch/arm/mach-s3c24xx/Kconfig +Auto-merging arch/arm/mach-exynos/exynos.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/exynos.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 55832c6bd723] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/samsung,s3c2412-clock.txt | 50 ++ + .../bindings/clock/samsung,s3c2443-clock.txt | 56 ++ + arch/arm/boot/dts/s3c2416-smdk2416.dts | 13 + + arch/arm/boot/dts/s3c2416.dtsi | 42 ++ + arch/arm/mach-s3c24xx/Kconfig | 24 +- + arch/arm/mach-s3c24xx/Makefile | 7 +- + arch/arm/mach-s3c24xx/clock-s3c2412.c | 760 --------------------- + arch/arm/mach-s3c24xx/clock-s3c2416.c | 171 ----- + arch/arm/mach-s3c24xx/clock-s3c2443.c | 212 ------ + arch/arm/mach-s3c24xx/common-s3c2443.c | 675 ------------------ + arch/arm/mach-s3c24xx/common.c | 27 +- + arch/arm/mach-s3c24xx/common.h | 10 + + arch/arm/mach-s3c24xx/mach-jive.c | 9 +- + arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 38 +- + arch/arm/mach-s3c24xx/mach-smdk2413.c | 9 +- + arch/arm/mach-s3c24xx/mach-smdk2416.c | 9 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 9 +- + arch/arm/mach-s3c24xx/pm.c | 13 +- + arch/arm/mach-s3c24xx/s3c2412.c | 43 -- + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-pll.c | 266 +++++++- + drivers/clk/samsung/clk-pll.h | 6 + + drivers/clk/samsung/clk-s3c2412.c | 269 ++++++++ + drivers/clk/samsung/clk-s3c2443.c | 462 +++++++++++++ + include/dt-bindings/clock/s3c2412.h | 73 ++ + include/dt-bindings/clock/s3c2443.h | 92 +++ + 27 files changed, 1428 insertions(+), 1928 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt + delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2412.c + delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2416.c + delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2443.c + delete mode 100644 arch/arm/mach-s3c24xx/common-s3c2443.c + create mode 100644 drivers/clk/samsung/clk-s3c2412.c + create mode 100644 drivers/clk/samsung/clk-s3c2443.c + create mode 100644 include/dt-bindings/clock/s3c2412.h + create mode 100644 include/dt-bindings/clock/s3c2443.h +Merging tegra/for-next (dcb99fd9b08c Linux 3.14-rc7) +$ git merge tegra/for-next +Already up-to-date. +Merging arm64/for-next/core (0420fa9426ed arm64: Clean up the default pgprot setting) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/include/asm/pgtable.h +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.txt | 10 ++++- + Documentation/devicetree/bindings/arm/topology.txt | 7 ++-- + arch/arm64/Kconfig.debug | 14 +++++++ + arch/arm64/include/asm/io.h | 8 ---- + arch/arm64/include/asm/pgtable-hwdef.h | 6 ++- + arch/arm64/include/asm/pgtable.h | 43 +++++++++++----------- + arch/arm64/include/asm/virt.h | 13 ------- + arch/arm64/kernel/head.S | 30 ++++++++++++++- + arch/arm64/kernel/perf_event.c | 4 ++ + arch/arm64/kernel/perf_regs.c | 2 + + arch/arm64/mm/cache.S | 9 +++++ + arch/arm64/mm/dma-mapping.c | 2 +- + arch/arm64/mm/mmu.c | 37 +------------------ + arch/arm64/mm/proc.S | 25 +++++++------ + 14 files changed, 112 insertions(+), 98 deletions(-) +Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@samsung.com>) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (50be9eba831d m68k: Update defconfigs for v3.14-rc1) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (4dc5aa217237 m68knommu: fix arg types for outs* functions) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (a66a626538af microblaze: Use asm-generic/io.h) +$ git merge microblaze/next +Removing arch/microblaze/platform/generic/system.dts +Removing arch/microblaze/platform/generic/Makefile +Removing arch/microblaze/platform/generic/Kconfig.auto +Removing arch/microblaze/platform/Makefile +Auto-merging arch/microblaze/Kconfig.platform +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 54 ++-- + arch/microblaze/{platform => }/Kconfig.platform | 55 +++- + arch/microblaze/Makefile | 1 - + arch/microblaze/boot/dts/system.dts | 367 +++++++++++++++++++++++- + arch/microblaze/include/asm/io.h | 302 +------------------ + arch/microblaze/include/asm/processor.h | 2 +- + arch/microblaze/include/asm/setup.h | 6 +- + arch/microblaze/include/uapi/asm/unistd.h | 6 +- + arch/microblaze/kernel/Makefile | 2 +- + arch/microblaze/kernel/heartbeat.c | 4 +- + arch/microblaze/kernel/intc.c | 51 +++- + arch/microblaze/{platform => kernel}/platform.c | 0 + arch/microblaze/kernel/process.c | 1 + + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/kernel/syscall_table.S | 8 +- + arch/microblaze/kernel/timer.c | 66 +++-- + arch/microblaze/mm/consistent.c | 2 +- + arch/microblaze/mm/init.c | 2 +- + arch/microblaze/mm/pgtable.c | 5 +- + arch/microblaze/platform/Makefile | 6 - + arch/microblaze/platform/generic/Kconfig.auto | 61 ---- + arch/microblaze/platform/generic/Makefile | 3 - + arch/microblaze/platform/generic/system.dts | 366 ----------------------- + 23 files changed, 558 insertions(+), 814 deletions(-) + rename arch/microblaze/{platform => }/Kconfig.platform (51%) + mode change 120000 => 100644 arch/microblaze/boot/dts/system.dts + rename arch/microblaze/{platform => kernel}/platform.c (100%) + delete mode 100644 arch/microblaze/platform/Makefile + delete mode 100644 arch/microblaze/platform/generic/Kconfig.auto + delete mode 100644 arch/microblaze/platform/generic/Makefile + delete mode 100644 arch/microblaze/platform/generic/system.dts +Merging mips/mips-for-linux-next (75d61b3bbd4c Merge branch '3.15-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/dec/prom/call_o32.S +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++ + arch/mips/dec/ecc-berr.c | 1 + + arch/mips/dec/kn02xa-berr.c | 1 + + arch/mips/dec/prom/Makefile | 1 - + arch/mips/dec/prom/call_o32.S | 89 ------------------------------------ + arch/mips/fw/lib/call_o32.S | 57 ++++++++++++++--------- + arch/mips/fw/sni/sniprom.c | 3 +- + arch/mips/include/asm/dec/prom.h | 48 +++++++++---------- + arch/mips/kernel/proc.c | 9 +--- + arch/mips/lib/csum_partial.S | 9 ++++ + arch/mips/lib/delay.c | 14 ++++-- + arch/mips/lib/strncpy_user.S | 13 +++--- + arch/mips/loongson/Kconfig | 1 - + arch/mips/loongson/lemote-2f/clock.c | 5 +- + drivers/cpufreq/loongson2_cpufreq.c | 4 +- + 15 files changed, 97 insertions(+), 161 deletions(-) + delete mode 100644 arch/mips/dec/prom/call_o32.S +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (496252f78756 parisc: Replace __get_cpu_var uses for address calculation) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/lib/memcpy.c | 2 +- + arch/parisc/mm/fault.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging powerpc/next (cd427485357c Merge remote-tracking branch 'scott/next' into next) +$ git merge powerpc/next +Already up-to-date. +Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) +$ git merge mpc5xxx/next +Already up-to-date. +Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge galak/next +Already up-to-date. +Merging s390/features (457f2180951c s390/uaccess: rework uaccess code - fix locking issues) +$ git merge s390/features +Auto-merging net/iucv/iucv.c +Auto-merging arch/s390/mm/fault.c +Removing arch/s390/lib/uaccess_pt.c +Removing arch/s390/lib/uaccess_mvcos.c +Removing arch/s390/lib/uaccess.h +Auto-merging arch/s390/kvm/diag.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/s390/kernel/irq.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/irq.h +Merge made by the 'recursive' strategy. + arch/s390/include/asm/atomic.h | 70 +++-- + arch/s390/include/asm/bitops.h | 41 +-- + arch/s390/include/asm/futex.h | 66 ++++- + arch/s390/include/asm/irq.h | 18 +- + arch/s390/include/asm/mmu.h | 2 + + arch/s390/include/asm/mmu_context.h | 45 +++- + arch/s390/include/asm/pgtable.h | 128 ++++++--- + arch/s390/include/asm/setup.h | 3 + + arch/s390/include/asm/switch_to.h | 1 + + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/include/asm/tlb.h | 14 +- + arch/s390/include/asm/tlbflush.h | 115 +++++++-- + arch/s390/include/asm/uaccess.h | 2 - + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/early.c | 2 + + arch/s390/kernel/entry.S | 24 +- + arch/s390/kernel/entry64.S | 24 +- + arch/s390/kernel/irq.c | 10 +- + arch/s390/kernel/perf_cpum_cf.c | 6 +- + arch/s390/kernel/perf_cpum_sf.c | 6 +- + arch/s390/kernel/runtime_instr.c | 3 +- + arch/s390/kernel/sclp.S | 5 +- + arch/s390/kernel/smp.c | 10 +- + arch/s390/kernel/time.c | 6 +- + arch/s390/kvm/diag.c | 4 + + arch/s390/lib/Makefile | 2 +- + arch/s390/lib/uaccess.c | 407 +++++++++++++++++++++++++++++ + arch/s390/lib/uaccess.h | 16 -- + arch/s390/lib/uaccess_mvcos.c | 263 ------------------- + arch/s390/lib/uaccess_pt.c | 471 ---------------------------------- + arch/s390/mm/fault.c | 53 ++-- + arch/s390/mm/hugetlbpage.c | 5 +- + arch/s390/mm/init.c | 7 +- + arch/s390/mm/pgtable.c | 12 +- + arch/s390/mm/vmem.c | 2 - + arch/s390/oprofile/hwsampler.c | 4 +- + drivers/s390/block/dasd_diag.c | 4 +- + drivers/s390/char/raw3270.c | 9 +- + drivers/s390/char/sclp.c | 88 ++++++- + drivers/s390/char/sclp.h | 9 + + drivers/s390/char/sclp_cmd.c | 17 +- + drivers/s390/char/tape_std.c | 3 +- + drivers/s390/crypto/zcrypt_api.c | 4 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 18 +- + drivers/s390/kvm/kvm_virtio.c | 2 +- + drivers/s390/net/lcs.c | 1 + + net/iucv/iucv.c | 6 +- + 47 files changed, 1032 insertions(+), 979 deletions(-) + create mode 100644 arch/s390/lib/uaccess.c + delete mode 100644 arch/s390/lib/uaccess.h + delete mode 100644 arch/s390/lib/uaccess_mvcos.c + delete mode 100644 arch/s390/lib/uaccess_pt.c +Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (5eb0bdf84433 arch/tile: remove unused variable 'devcap') +$ git merge tile/master +Already up-to-date. +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 28f1dd8f5d68] Merge remote-tracking branch 'uml/next' +$ git diff -M --stat --summary HEAD^.. + arch/um/include/shared/os.h | 2 - + arch/um/include/shared/skas/proc_mm.h | 44 ------ + arch/um/include/shared/skas/skas.h | 3 - + arch/um/include/shared/skas_ptrace.h | 14 -- + arch/um/kernel/ptrace.c | 32 ---- + arch/um/kernel/reboot.c | 35 ++--- + arch/um/kernel/skas/mmu.c | 68 +++------ + arch/um/kernel/skas/process.c | 27 ---- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 10 -- + arch/um/os-Linux/process.c | 16 -- + arch/um/os-Linux/skas/mem.c | 100 ++---------- + arch/um/os-Linux/skas/process.c | 200 ++++++------------------ + arch/um/os-Linux/start_up.c | 154 ------------------- + arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- + arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- + arch/x86/um/ldt.c | 227 ++++++---------------------- + arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - + arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - + arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- + 20 files changed, 148 insertions(+), 858 deletions(-) + delete mode 100644 arch/um/include/shared/skas/proc_mm.h + delete mode 100644 arch/um/include/shared/skas_ptrace.h + delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h + delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h + delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h +Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (b3fdfc1b4b64 Merge tag 'xtensa-for-next-20140221-1' into for_next) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache readdir) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (a5a64da8c4e5 fs: cifs: remove unused variable.) +$ git merge cifs/for-next +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 14 +++++++++- + fs/cifs/cifsglob.h | 8 ++++++ + fs/cifs/cifsproto.h | 3 +++ + fs/cifs/cifssmb.c | 3 +++ + fs/cifs/file.c | 31 +++++++++++++++++++--- + fs/cifs/misc.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++-- + fs/cifs/smb1ops.c | 11 ++++++++ + fs/cifs/smb2misc.c | 18 ++++++++++--- + fs/cifs/smb2ops.c | 14 ++++++++++ + fs/cifs/smb2pdu.c | 2 -- + 10 files changed, 167 insertions(+), 11 deletions(-) +Merging configfs/linux-next (b930c26416c4 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 (9e78d14a9f64 Use %pd in eCryptFS) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/inode.c | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) +Merging ext3/for_next (01d8885785a6 reiserfs: fix race in readdir) +$ git merge ext3/for_next +Auto-merging fs/udf/super.c +Auto-merging fs/isofs/inode.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext2/super.c +Merge made by the 'recursive' strategy. + fs/ext2/acl.c | 1 - + fs/ext2/ialloc.c | 2 +- + fs/ext2/super.c | 2 +- + fs/ext2/xattr_security.c | 4 +-- + fs/ext3/balloc.c | 5 +-- + fs/ext3/dir.c | 2 +- + fs/ext3/ialloc.c | 2 +- + fs/ext3/inode.c | 86 ++++++++++++++---------------------------------- + fs/ext3/super.c | 2 +- + fs/ext3/xattr_security.c | 5 +-- + fs/isofs/inode.c | 2 +- + fs/quota/Kconfig | 7 ++-- + fs/reiserfs/dir.c | 6 ++-- + fs/udf/super.c | 8 +++-- + 14 files changed, 51 insertions(+), 83 deletions(-) +Merging ext4/dev (ad6599ab3ac9 ext4: fix premature freeing of partial clusters split across leaf blocks) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (48b230a58396 f2fs: fix wrong statistics of inline data) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (f3846266f593 fuse: fix "uninitialized variable" warning) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (1b2ad41214c9 GFS2: Fix address space from page function) +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (844fa1b5f849 jfs: set i_ctime when setting ACL) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (2b3a8fd735f8 Merge tag 'nfs-for-3.15-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (06f9cc12caa8 nfsd4: don't create unnecessary mask acl) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/clnt.c +Auto-merging fs/nfsd/vfs.c +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 1 + + fs/nfsd/acl.h | 10 ++++-- + fs/nfsd/nfs4acl.c | 13 ++++--- + fs/nfsd/nfs4callback.c | 19 ++++++++++- + fs/nfsd/nfs4proc.c | 39 +++++++++++++-------- + fs/nfsd/nfs4state.c | 28 +++++++-------- + fs/nfsd/nfs4xdr.c | 30 +++++++++++++---- + fs/nfsd/nfsctl.c | 5 +++ + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsfh.h | 14 +++++++- + fs/nfsd/nfsxdr.c | 2 +- + fs/nfsd/vfs.c | 15 +++++++-- + fs/nfsd/xdr4.h | 2 -- + include/linux/sunrpc/clnt.h | 2 ++ + include/linux/sunrpc/svcsock.h | 1 + + include/linux/sunrpc/xprt.h | 13 ++++++- + net/sunrpc/Kconfig | 39 ++++++++++++++------- + net/sunrpc/Makefile | 3 +- + net/sunrpc/clnt.c | 58 ++++++++++++++++++-------------- + net/sunrpc/svcsock.c | 16 +++++++++ + net/sunrpc/xdr.c | 22 ++++++++---- + net/sunrpc/xprt.c | 12 ------- + net/sunrpc/xprtrdma/Makefile | 4 +-- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 12 +++---- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 ++ + net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +- + net/sunrpc/xprtsock.c | 34 +++++++++---------- + 27 files changed, 264 insertions(+), 137 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (8a5daf1e2c19 9pnet_rdma: check token type before int conversion) +$ git merge v9fs/for-next +Auto-merging net/9p/trans_virtio.c +Auto-merging net/9p/client.c +Merge made by the 'recursive' strategy. + include/net/9p/client.h | 6 +-- + include/net/9p/transport.h | 3 ++ + net/9p/client.c | 25 ++++++++--- + net/9p/trans_fd.c | 110 +++++++++++++++++++++------------------------ + net/9p/trans_rdma.c | 26 +++++++++-- + net/9p/trans_virtio.c | 3 +- + 6 files changed, 96 insertions(+), 77 deletions(-) +Merging ubifs/linux-next (d56030ac25d3 UBI: block: Remove __initdata from ubiblock_param_ops) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (a6cf33bc566c Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-private-locks/linux-next (18a1a7a1d862 Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) +$ git merge file-private-locks/linux-next +Already up-to-date. +Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (30723cbf6f7a Merge branch 'pci/resource' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (d1443c96d663 Merge branch 'for-3.15/sony' into for-next) +$ git merge hid/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (1fbeab0b8fd5 i2c: cadence: fix Kconfig dependency) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 + + .../devicetree/bindings/i2c/i2c-cadence.txt | 24 + + .../devicetree/bindings/i2c/i2c-designware.txt | 8 + + .../devicetree/bindings/i2c/i2c-efm32.txt | 34 + + .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 20 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 14 +- + .../devicetree/bindings/i2c/qcom,i2c-qup.txt | 40 + + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/functionality | 2 +- + Documentation/i2c/i2c-protocol | 35 +- + MAINTAINERS | 4 +- + arch/blackfin/include/asm/bfin_twi.h | 143 +--- + arch/blackfin/kernel/debug-mmrs.c | 1 + + drivers/i2c/busses/Kconfig | 27 +- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali1563.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-amd756.c | 2 +- + drivers/i2c/busses/i2c-amd8111.c | 2 +- + drivers/i2c/busses/i2c-at91.c | 12 +- + drivers/i2c/busses/i2c-bcm2835.c | 26 +- + drivers/i2c/busses/i2c-bfin-twi.c | 20 +- + drivers/i2c/busses/i2c-cadence.c | 905 +++++++++++++++++++++ + drivers/i2c/busses/i2c-davinci.c | 2 +- + drivers/i2c/busses/i2c-designware-core.c | 27 +- + drivers/i2c/busses/i2c-designware-core.h | 2 + + drivers/i2c/busses/i2c-designware-pcidrv.c | 125 +-- + drivers/i2c/busses/i2c-designware-platdrv.c | 9 +- + drivers/i2c/busses/i2c-efm32.c | 481 +++++++++++ + drivers/i2c/busses/i2c-eg20t.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 4 +- + drivers/i2c/busses/i2c-gpio.c | 3 + + drivers/i2c/busses/i2c-hydra.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 5 +- + drivers/i2c/busses/i2c-ismt.c | 2 +- + drivers/i2c/busses/i2c-mv64xxx.c | 83 +- + drivers/i2c/busses/i2c-mxs.c | 18 +- + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-nomadik.c | 253 +++--- + drivers/i2c/busses/i2c-ocores.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 8 +- + drivers/i2c/busses/i2c-pasemi.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 2 +- + drivers/i2c/busses/i2c-pxa-pci.c | 2 +- + drivers/i2c/busses/i2c-qup.c | 768 +++++++++++++++++ + drivers/i2c/busses/i2c-rcar.c | 3 +- + drivers/i2c/busses/i2c-s3c2410.c | 39 +- + drivers/i2c/busses/i2c-sirf.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 2 +- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-sis96x.c | 2 +- + drivers/i2c/busses/i2c-st.c | 2 +- + drivers/i2c/busses/i2c-stu300.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 2 +- + drivers/i2c/busses/i2c-via.c | 2 +- + drivers/i2c/busses/i2c-viapro.c | 2 +- + drivers/i2c/busses/i2c-xiic.c | 2 +- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/i2c-core.c | 67 +- + include/linux/i2c.h | 1 + + include/linux/i2c/bfin_twi.h | 145 ++++ + include/linux/platform_data/i2c-s3c2410.h | 9 +- + include/trace/events/i2c.h | 372 +++++++++ + 64 files changed, 3292 insertions(+), 501 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-cadence.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-efm32.txt + create mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt + create mode 100644 drivers/i2c/busses/i2c-cadence.c + create mode 100644 drivers/i2c/busses/i2c-efm32.c + create mode 100644 drivers/i2c/busses/i2c-qup.c + create mode 100644 include/linux/i2c/bfin_twi.h + create mode 100644 include/trace/events/i2c.h +Merging jdelvare-hwmon/master (455c6fdbd219 Linux 3.14) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (ec0159503ae7 hwmon: (k10temp) Add support for AMD F16 M30h processor) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (83701d7a7094 Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (b072b79f07d2 Merge branch 'kbuild/lto' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Removing scripts/coccinelle/misc/memcpy-assign.cocci +Auto-merging scripts/Makefile.lib +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Auto-merging Documentation/DocBook/Makefile +Merge made by the 'recursive' strategy. + Documentation/DocBook/Makefile | 25 ++-- + Documentation/lto-build | 173 ++++++++++++++++++++++++++++ + Makefile | 35 ++++-- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Kbuild.include | 1 + + scripts/Makefile | 6 +- + scripts/Makefile.lib | 4 - + scripts/Makefile.lto | 84 ++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/coccinelle/misc/memcpy-assign.cocci | 103 ----------------- + scripts/link-vmlinux.sh | 2 +- + scripts/tags.sh | 9 +- + 15 files changed, 380 insertions(+), 148 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + delete mode 100644 scripts/coccinelle/misc/memcpy-assign.cocci +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (27aa64b9d1bd pata_at91: fix ata_host_activate() failure handling) +$ git merge libata/for-next +Auto-merging drivers/ata/libata-core.c +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 3 +-- + drivers/ata/libata-core.c | 6 ++++-- + drivers/ata/pata_at91.c | 11 ++++++----- + 3 files changed, 11 insertions(+), 9 deletions(-) +Merging pm/linux-next (22b38e4f3729 Merge branch 'cpu-hotplug' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. +Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release) +$ git merge idle/next +Auto-merging drivers/idle/intel_idle.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/acpi/cstate.c | 4 +- + drivers/idle/intel_idle.c | 204 ++++++++++++++++++++++++++++- + tools/power/x86/turbostat/turbostat.8 | 127 +++++++----------- + tools/power/x86/turbostat/turbostat.c | 240 ++++++++++++++++------------------ + 4 files changed, 362 insertions(+), 213 deletions(-) +Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (e79ca84d62d2 Merge branches 'soc-fix' and 'thermal-core-fix' of .git into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/imx_thermal.c | 39 +++++++++++++++++++---------- + drivers/thermal/rcar_thermal.c | 9 +++++-- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 6 ++--- + 3 files changed, 35 insertions(+), 19 deletions(-) +Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure with Agere/LSI controllers) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2)) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (420598e2a088 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/omap-dma.c +Auto-merging arch/arm/boot/dts/prima2.dtsi +Auto-merging arch/arm/boot/dts/atlas6.dtsi +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/fsl-edma.txt | 76 ++ + .../devicetree/bindings/dma/qcom_bam_dma.txt | 41 + + .../devicetree/bindings/dma/sirfsoc-dma.txt | 43 + + arch/arm/boot/dts/atlas6.dtsi | 2 + + arch/arm/boot/dts/prima2.dtsi | 2 + + drivers/dma/Kconfig | 21 +- + drivers/dma/Makefile | 2 + + drivers/dma/acpi-dma.c | 17 +- + drivers/dma/at_hdmac.c | 1 - + drivers/dma/cppi41.c | 7 +- + drivers/dma/dmaengine.c | 9 +- + drivers/dma/dmatest.c | 4 +- + drivers/dma/dw/core.c | 21 +- + drivers/dma/dw/pci.c | 36 + + drivers/dma/dw/regs.h | 4 +- + drivers/dma/edma.c | 5 +- + drivers/dma/fsl-edma.c | 975 +++++++++++++++++ + drivers/dma/imx-dma.c | 13 +- + drivers/dma/mmp_pdma.c | 8 +- + drivers/dma/mmp_tdma.c | 50 + + drivers/dma/omap-dma.c | 18 + + drivers/dma/pch_dma.c | 4 +- + drivers/dma/qcom_bam_dma.c | 1111 ++++++++++++++++++++ + drivers/dma/s3c24xx-dma.c | 2 +- + drivers/dma/sh/Kconfig | 6 + + drivers/dma/sh/Makefile | 1 + + drivers/dma/sh/rcar-audmapp.c | 320 ++++++ + drivers/dma/sh/shdma-base.c | 10 +- + drivers/dma/sh/shdma-of.c | 3 +- + drivers/dma/sh/shdmac.c | 13 +- + drivers/dma/sh/sudmac.c | 4 +- + drivers/dma/sirf-dma.c | 23 + + include/linux/acpi_dma.h | 5 +- + include/linux/dmaengine.h | 14 +- + include/linux/dw_dmac.h | 5 +- + include/linux/platform_data/dma-rcar-audmapp.h | 34 + + 36 files changed, 2837 insertions(+), 73 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl-edma.txt + create mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/sirfsoc-dma.txt + create mode 100644 drivers/dma/fsl-edma.c + create mode 100644 drivers/dma/qcom_bam_dma.c + create mode 100644 drivers/dma/sh/rcar-audmapp.c + create mode 100644 include/linux/platform_data/dma-rcar-audmapp.h +Merging dmaengine/next (77873803363c net_dma: mark broken) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (cd6362befe4c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cd6362befe4c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (a31267c30880 rtl8187: fix use after free on failure path in rtl8187_probe()) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (5c5b93e4be2f Bluetooth: Fix address in unmergeable device found events) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_drv.h | 2 + + drivers/bluetooth/btmrvl_main.c | 17 ++++ + drivers/bluetooth/btmrvl_sdio.c | 103 +++++++++++++++----- + drivers/bluetooth/btmrvl_sdio.h | 3 + + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 13 ++- + net/bluetooth/hci_conn.c | 81 ++++++++++++++-- + net/bluetooth/hci_core.c | 20 ++-- + net/bluetooth/hci_event.c | 198 +++++++++++++++++++++++++++++++-------- + net/bluetooth/lib.c | 1 + + net/bluetooth/mgmt.c | 31 ++++-- + 11 files changed, 376 insertions(+), 94 deletions(-) +Merging infiniband/for-next (f7eaa7ed8fd4 Merge branches 'core', 'cxgb4', 'ip-roce', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'sgwrapper', 'srp' and 'usnic' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (4a4163caccae Fix index regression in nand_read_subpage) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (4a4163caccae Fix index regression in nand_read_subpage) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (0ea481466d1c crypto: ghash-clmulni-intel - Use u128 instead of be128 for internal key) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 ++-- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) +Merging drm/drm-next (9f97ba806a9c Merge tag 'drm-intel-fixes-2014-04-04' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/gma500/mmu.c' using previous resolution. +Resolved 'drivers/staging/imx-drm/imx-hdmi.c' using previous resolution. +Resolved 'drivers/staging/imx-drm/imx-ldb.c' using previous resolution. +Resolved 'drivers/staging/imx-drm/imx-tve.c' using previous resolution. +Resolved 'drivers/staging/imx-drm/parallel-display.c' using previous resolution. +Resolved 'drivers/video/exynos/Kconfig' using previous resolution. +Auto-merging include/drm/drm_fb_helper.h +Auto-merging fs/dcache.c +Auto-merging drivers/video/exynos/Kconfig +CONFLICT (content): Merge conflict in drivers/video/exynos/Kconfig +Auto-merging drivers/staging/imx-drm/parallel-display.c +CONFLICT (content): Merge conflict in drivers/staging/imx-drm/parallel-display.c +Auto-merging drivers/staging/imx-drm/ipuv3-plane.c +Auto-merging drivers/staging/imx-drm/ipuv3-crtc.c +Auto-merging drivers/staging/imx-drm/imx-tve.c +CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-tve.c +Auto-merging drivers/staging/imx-drm/imx-ldb.c +CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-ldb.c +Auto-merging drivers/staging/imx-drm/imx-hdmi.c +CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-hdmi.c +Auto-merging drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/graph/nvc4.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c +Auto-merging drivers/gpu/drm/gma500/mmu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/mmu.c +Removing drivers/gpu/drm/exynos/exynos_drm_hdmi.h +Removing drivers/gpu/drm/exynos/exynos_drm_hdmi.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.h +Auto-merging drivers/gpu/drm/exynos/exynos_dp_core.h +Auto-merging drivers/gpu/drm/exynos/exynos_dp_core.c +Auto-merging drivers/gpu/drm/drm_prime.c +Auto-merging drivers/gpu/drm/drm_fops.c +Auto-merging drivers/gpu/drm/drm_crtc_helper.c +Auto-merging arch/arm/boot/dts/exynos4412-trats2.dts +Auto-merging arch/arm/boot/dts/exynos4210-universal_c210.dts +Auto-merging arch/arm/boot/dts/exynos4210-trats.dts +Auto-merging arch/arm/boot/dts/exynos4.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8394001edd84] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 550 ++++--- + .../devicetree/bindings/drm/bridge/ptn3460.txt | 27 + + .../devicetree/bindings/drm/i2c/tda998x.txt | 27 + + .../bindings/gpu/nvidia,tegra20-host1x.txt | 42 + + .../devicetree/bindings/panel/lg,ld070wx3-sl01.txt | 7 + + .../devicetree/bindings/panel/lg,lh500wx1-sd03.txt | 7 + + .../devicetree/bindings/panel/lg,lp129qe.txt | 7 + + .../devicetree/bindings/panel/samsung,ld9040.txt | 66 + + .../devicetree/bindings/panel/samsung,s6e8aa0.txt | 56 + + .../devicetree/bindings/video/exynos_dp.txt | 17 + + .../devicetree/bindings/video/exynos_dsim.txt | 80 + + .../devicetree/bindings/video/exynos_hdmi.txt | 5 + + .../devicetree/bindings/video/samsung-fimd.txt | 17 + + MAINTAINERS | 16 +- + arch/arm/boot/dts/exynos4.dtsi | 14 + + arch/arm/boot/dts/exynos4210-trats.dts | 61 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 64 + + arch/arm/boot/dts/exynos4412-trats2.dts | 70 + + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/armada/armada_crtc.c | 23 +- + drivers/gpu/drm/ast/ast_mode.c | 12 +- + drivers/gpu/drm/ast/ast_ttm.c | 5 +- + drivers/gpu/drm/bochs/bochs_kms.c | 4 +- + drivers/gpu/drm/bochs/bochs_mm.c | 6 +- + drivers/gpu/drm/bridge/Kconfig | 5 + + drivers/gpu/drm/bridge/Makefile | 3 + + drivers/gpu/drm/bridge/ptn3460.c | 350 +++++ + drivers/gpu/drm/cirrus/cirrus_mode.c | 10 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 5 +- + drivers/gpu/drm/drm_crtc.c | 936 +++++++++--- + drivers/gpu/drm/drm_crtc_helper.c | 245 ++- + drivers/gpu/drm/drm_crtc_internal.h | 38 + + drivers/gpu/drm/drm_dp_helper.c | 396 +++++ + drivers/gpu/drm/drm_drv.c | 136 +- + drivers/gpu/drm/drm_edid.c | 34 +- + drivers/gpu/drm/drm_fb_helper.c | 45 +- + drivers/gpu/drm/drm_fops.c | 121 +- + drivers/gpu/drm/drm_gem.c | 71 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 38 +- + drivers/gpu/drm/drm_ioctl.c | 7 + + drivers/gpu/drm/drm_mipi_dsi.c | 6 +- + drivers/gpu/drm/drm_mm.c | 285 +++- + drivers/gpu/drm/drm_modes.c | 346 +++-- + drivers/gpu/drm/drm_pci.c | 2 +- + drivers/gpu/drm/drm_plane_helper.c | 333 ++++ + drivers/gpu/drm/drm_platform.c | 2 +- + drivers/gpu/drm/drm_prime.c | 110 +- + drivers/gpu/drm/drm_stub.c | 503 +++++-- + drivers/gpu/drm/drm_usb.c | 2 +- + drivers/gpu/drm/exynos/Kconfig | 24 + + drivers/gpu/drm/exynos/Makefile | 9 +- + drivers/{video => gpu/drm}/exynos/exynos_dp_core.c | 304 +++- + drivers/{video => gpu/drm}/exynos/exynos_dp_core.h | 9 + + drivers/{video => gpu/drm}/exynos/exynos_dp_reg.c | 0 + drivers/{video => gpu/drm}/exynos/exynos_dp_reg.h | 0 + drivers/gpu/drm/exynos/exynos_drm_connector.c | 92 +- + drivers/gpu/drm/exynos/exynos_drm_connector.h | 4 - + drivers/gpu/drm/exynos/exynos_drm_core.c | 193 ++- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 159 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 20 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 339 +++++ + drivers/gpu/drm/exynos/exynos_drm_drv.c | 197 ++- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 163 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1524 +++++++++++++++++++ + drivers/gpu/drm/exynos/exynos_drm_encoder.c | 359 +---- + drivers/gpu/drm/exynos/exynos_drm_encoder.h | 18 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 23 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 700 ++++----- + drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 439 ------ + drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 67 - + drivers/gpu/drm/exynos/exynos_drm_plane.c | 19 +- + drivers/gpu/drm/exynos/exynos_drm_plane.h | 2 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 441 +++--- + drivers/gpu/drm/exynos/exynos_hdmi.c | 472 +++--- + drivers/gpu/drm/exynos/exynos_mixer.c | 573 ++++--- + drivers/gpu/drm/exynos/exynos_mixer.h | 20 + + drivers/gpu/drm/gma500/Makefile | 2 + + drivers/gpu/drm/gma500/blitter.c | 51 + + drivers/gpu/drm/gma500/blitter.h | 22 + + drivers/gpu/drm/gma500/cdv_device.c | 40 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 73 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 11 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/gma500/gem.c | 56 +- + drivers/gpu/drm/gma500/gem.h | 21 + + drivers/gpu/drm/gma500/gma_device.c | 56 + + drivers/gpu/drm/gma500/gma_device.h | 21 + + drivers/gpu/drm/gma500/gma_display.c | 23 +- + drivers/gpu/drm/gma500/gma_display.h | 3 + + drivers/gpu/drm/gma500/gtt.c | 45 +- + drivers/gpu/drm/gma500/gtt.h | 3 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 16 +- + drivers/gpu/drm/gma500/mmu.c | 297 ++-- + drivers/gpu/drm/gma500/mmu.h | 93 ++ + drivers/gpu/drm/gma500/oaktrail_crtc.c | 12 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 9 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 5 + + drivers/gpu/drm/gma500/opregion.c | 25 +- + drivers/gpu/drm/gma500/psb_device.c | 42 +- + drivers/gpu/drm/gma500/psb_drv.c | 404 ++--- + drivers/gpu/drm/gma500/psb_drv.h | 203 +-- + drivers/gpu/drm/gma500/psb_intel_display.c | 32 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 - + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 22 +- + drivers/gpu/drm/gma500/psb_irq.c | 81 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 602 +++++--- + drivers/gpu/drm/i915/Makefile | 80 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +- + drivers/gpu/drm/i915/dvo_ivch.c | 30 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 10 +- + drivers/gpu/drm/i915/dvo_sil164.c | 10 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 24 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 485 ++++++ + drivers/gpu/drm/i915/i915_debugfs.c | 716 ++++++++- + drivers/gpu/drm/i915/i915_dma.c | 162 +- + drivers/gpu/drm/i915/i915_drv.c | 299 ++-- + drivers/gpu/drm/i915/i915_drv.h | 729 ++++++--- + drivers/gpu/drm/i915/i915_gem.c | 697 ++++----- + drivers/gpu/drm/i915/i915_gem_context.c | 483 ++++-- + drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 63 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 198 +-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 1256 ++++++++++++---- + drivers/gpu/drm/i915/i915_gem_tiling.c | 8 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 616 +++++--- + drivers/gpu/drm/i915/i915_irq.c | 836 +++++++---- + drivers/gpu/drm/i915/i915_params.c | 154 ++ + drivers/gpu/drm/i915/i915_reg.h | 560 ++++--- + drivers/gpu/drm/i915/i915_suspend.c | 40 +- + drivers/gpu/drm/i915/i915_sysfs.c | 71 +- + drivers/gpu/drm/i915/i915_trace.h | 24 +- + drivers/gpu/drm/i915/i915_ums.c | 8 + + drivers/gpu/drm/i915/intel_bios.c | 8 +- + drivers/gpu/drm/i915/intel_bios.h | 174 ++- + drivers/gpu/drm/i915/intel_crt.c | 70 +- + drivers/gpu/drm/i915/intel_ddi.c | 117 +- + drivers/gpu/drm/i915/intel_display.c | 1583 +++++++++++++------- + drivers/gpu/drm/i915/intel_dp.c | 912 +++++------ + drivers/gpu/drm/i915/intel_drv.h | 106 +- + drivers/gpu/drm/i915/intel_dsi.c | 23 +- + drivers/gpu/drm/i915/intel_dvo.c | 6 +- + drivers/gpu/drm/i915/intel_fbdev.c | 371 ++++- + drivers/gpu/drm/i915/intel_hdmi.c | 108 +- + drivers/gpu/drm/i915/intel_lvds.c | 24 +- + drivers/gpu/drm/i915/intel_overlay.c | 40 +- + drivers/gpu/drm/i915/intel_panel.c | 21 +- + drivers/gpu/drm/i915/intel_pm.c | 1202 ++++++++++----- + drivers/gpu/drm/i915/intel_ringbuffer.c | 152 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 42 +- + drivers/gpu/drm/i915/intel_sdvo.c | 78 +- + drivers/gpu/drm/i915/intel_sprite.c | 18 +- + drivers/gpu/drm/i915/intel_tv.c | 21 +- + drivers/gpu/drm/i915/intel_uncore.c | 281 ++-- + drivers/gpu/drm/mgag200/mgag200_mode.c | 26 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 5 +- + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 105 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 65 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 16 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 50 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 25 + + drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 273 ++++ + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 26 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 33 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 8 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 27 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 8 +- + drivers/gpu/drm/msm/mdp/mdp_kms.c | 3 +- + drivers/gpu/drm/msm/msm_drv.c | 139 +- + drivers/gpu/drm/msm/msm_drv.h | 4 + + drivers/gpu/drm/msm/msm_gem_submit.c | 15 +- + drivers/gpu/drm/msm/msm_gpu.c | 85 +- + drivers/gpu/drm/msm/msm_gpu.h | 16 +- + drivers/gpu/drm/nouveau/Makefile | 16 +- + drivers/gpu/drm/nouveau/core/core/namedb.c | 2 +- + drivers/gpu/drm/nouveau/core/core/parent.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/device/base.c | 85 +- + drivers/gpu/drm/nouveau/core/engine/device/gm100.c | 106 ++ + drivers/gpu/drm/nouveau/core/engine/device/nv04.c | 4 +- + drivers/gpu/drm/nouveau/core/engine/device/nv10.c | 16 +- + drivers/gpu/drm/nouveau/core/engine/device/nv20.c | 8 +- + drivers/gpu/drm/nouveau/core/engine/device/nv30.c | 10 +- + drivers/gpu/drm/nouveau/core/engine/device/nv40.c | 32 +- + drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 28 +- + drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 44 +- + drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 20 +- + drivers/gpu/drm/nouveau/core/engine/disp/dport.c | 10 +- + drivers/gpu/drm/nouveau/core/engine/disp/gm107.c | 101 ++ + drivers/gpu/drm/nouveau/core/engine/disp/nv04.c | 12 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 370 ++++- + drivers/gpu/drm/nouveau/core/engine/disp/nv50.h | 54 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv84.c | 191 ++- + drivers/gpu/drm/nouveau/core/engine/disp/nv94.c | 50 +- + drivers/gpu/drm/nouveau/core/engine/disp/nva0.c | 67 +- + drivers/gpu/drm/nouveau/core/engine/disp/nva3.c | 22 +- + drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 361 ++++- + drivers/gpu/drm/nouveau/core/engine/disp/nve0.c | 187 ++- + drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c | 22 +- + drivers/gpu/drm/nouveau/core/engine/disp/priv.h | 10 + + drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c | 3 + + drivers/gpu/drm/nouveau/core/engine/falcon.c | 6 +- + drivers/gpu/drm/nouveau/core/engine/fifo/base.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 509 +++++-- + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 507 +++++-- + .../gpu/drm/nouveau/core/engine/graph/ctxgm107.c | 989 ++++++++++++ + .../gpu/drm/nouveau/core/engine/graph/ctxnv108.c | 1041 ++----------- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.c | 308 ++-- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.h | 170 +++ + .../gpu/drm/nouveau/core/engine/graph/ctxnvc1.c | 270 ++-- + .../core/engine/graph/{ctxnvc3.c => ctxnvc4.c} | 78 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc8.c | 144 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvd7.c | 216 ++- + .../gpu/drm/nouveau/core/engine/graph/ctxnvd9.c | 278 ++-- + .../gpu/drm/nouveau/core/engine/graph/ctxnve4.c | 285 ++-- + .../gpu/drm/nouveau/core/engine/graph/ctxnvf0.c | 782 ++++++++-- + .../gpu/drm/nouveau/core/engine/graph/fuc/com.fuc | 2 +- + .../gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc | 7 +- + .../nouveau/core/engine/graph/fuc/gpcgm107.fuc5 | 42 + + .../nouveau/core/engine/graph/fuc/gpcgm107.fuc5.h | 473 ++++++ + .../nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h | 354 ++--- + .../nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h | 336 ++--- + .../nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h | 396 ++--- + .../nouveau/core/engine/graph/fuc/gpcnve0.fuc.h | 396 ++--- + .../nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h | 396 ++--- + .../nouveau/core/engine/graph/fuc/hubgm107.fuc5 | 40 + + .../nouveau/core/engine/graph/fuc/hubgm107.fuc5.h | 916 +++++++++++ + .../nouveau/core/engine/graph/fuc/hubnv108.fuc5.h | 2 +- + .../nouveau/core/engine/graph/fuc/hubnvc0.fuc.h | 2 +- + .../nouveau/core/engine/graph/fuc/hubnvd7.fuc.h | 2 +- + .../nouveau/core/engine/graph/fuc/hubnve0.fuc.h | 2 +- + .../nouveau/core/engine/graph/fuc/hubnvf0.fuc.h | 2 +- + .../drm/nouveau/core/engine/graph/fuc/macros.fuc | 1 + + drivers/gpu/drm/nouveau/core/engine/graph/gm107.c | 465 ++++++ + drivers/gpu/drm/nouveau/core/engine/graph/nv108.c | 133 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv20.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 45 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 312 ++-- + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h | 214 +-- + drivers/gpu/drm/nouveau/core/engine/graph/nvc1.c | 115 +- + .../nouveau/core/engine/graph/{nvc3.c => nvc4.c} | 86 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvc8.c | 104 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvd7.c | 175 +-- + drivers/gpu/drm/nouveau/core/engine/graph/nvd9.c | 154 +- + drivers/gpu/drm/nouveau/core/engine/graph/nve4.c | 192 +-- + drivers/gpu/drm/nouveau/core/engine/graph/nvf0.c | 136 +- + drivers/gpu/drm/nouveau/core/engine/xtensa.c | 2 +- + drivers/gpu/drm/nouveau/core/include/core/class.h | 12 + + drivers/gpu/drm/nouveau/core/include/core/device.h | 31 + + drivers/gpu/drm/nouveau/core/include/core/namedb.h | 2 +- + .../gpu/drm/nouveau/core/include/engine/device.h | 18 +- + drivers/gpu/drm/nouveau/core/include/engine/disp.h | 19 +- + .../gpu/drm/nouveau/core/include/engine/graph.h | 3 +- + .../drm/nouveau/core/include/subdev/bios/P0260.h | 23 + + .../drm/nouveau/core/include/subdev/bios/conn.h | 1 + + .../drm/nouveau/core/include/subdev/bios/ramcfg.h | 2 +- + .../drm/nouveau/core/include/subdev/bios/therm.h | 7 + + .../gpu/drm/nouveau/core/include/subdev/devinit.h | 2 + + drivers/gpu/drm/nouveau/core/include/subdev/fb.h | 1 + + drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h | 3 +- + drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 1 + + .../gpu/drm/nouveau/core/include/subdev/therm.h | 2 +- + .../gpu/drm/nouveau/core/include/subdev/timer.h | 1 + + drivers/gpu/drm/nouveau/core/os.h | 12 +- + drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c | 8 +- + drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 15 +- + drivers/gpu/drm/nouveau/core/subdev/bios/P0260.c | 109 ++ + drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 55 +- + drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 29 +- + drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 18 +- + drivers/gpu/drm/nouveau/core/subdev/bios/ramcfg.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/bios/therm.c | 11 + + drivers/gpu/drm/nouveau/core/subdev/devinit/base.c | 1 + + .../gpu/drm/nouveau/core/subdev/devinit/fbmem.h | 8 +- + .../gpu/drm/nouveau/core/subdev/devinit/gm107.c | 56 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv05.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv10.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv20.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.h | 3 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nva3.c | 50 + + drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h | 1 + + drivers/gpu/drm/nouveau/core/subdev/fb/gm107.c | 38 + + drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.h | 8 +- + drivers/gpu/drm/nouveau/core/subdev/fb/priv.h | 1 + + drivers/gpu/drm/nouveau/core/subdev/fb/ramgm107.c | 56 + + drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c | 34 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c | 7 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c | 7 +- + .../nouveau/core/subdev/ltcg/{nvc0.c => gf100.c} | 109 +- + drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.h | 21 + + drivers/gpu/drm/nouveau/core/subdev/ltcg/gm107.c | 142 ++ + drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 55 +- + drivers/gpu/drm/nouveau/core/subdev/mxm/base.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/therm/base.c | 14 +- + drivers/gpu/drm/nouveau/core/subdev/therm/fan.c | 25 +- + drivers/gpu/drm/nouveau/core/subdev/therm/fanpwm.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c | 40 +- + drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 2 +- + drivers/gpu/drm/nouveau/core/subdev/timer/gk20a.c | 57 + + drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | 83 +- + drivers/gpu/drm/nouveau/core/subdev/timer/nv04.h | 27 + + drivers/gpu/drm/nouveau/core/subdev/timer/priv.h | 6 + + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 22 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_agp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 88 +- + drivers/gpu/drm/nouveau/nouveau_drm.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 - + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_sysfs.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 35 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 5 + + drivers/gpu/drm/nouveau/nv50_display.c | 17 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 13 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 5 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 34 +- + drivers/gpu/drm/panel/Kconfig | 14 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-ld9040.c | 376 +++++ + drivers/gpu/drm/panel/panel-s6e8aa0.c | 1069 +++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 157 +- + drivers/gpu/drm/qxl/qxl_display.c | 10 +- + drivers/gpu/drm/qxl/qxl_object.c | 2 - + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 7 +- + drivers/gpu/drm/radeon/Makefile | 8 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 20 +- + drivers/gpu/drm/radeon/atombios_dp.c | 268 ++-- + drivers/gpu/drm/radeon/atombios_encoders.c | 82 +- + drivers/gpu/drm/radeon/btc_dpm.c | 4 + + drivers/gpu/drm/radeon/ci_dpm.c | 67 +- + drivers/gpu/drm/radeon/cik.c | 142 +- + drivers/gpu/drm/radeon/cik_sdma.c | 6 +- + drivers/gpu/drm/radeon/cikd.h | 49 + + drivers/gpu/drm/radeon/cypress_dpm.c | 4 + + drivers/gpu/drm/radeon/evergreen.c | 6 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 210 +-- + drivers/gpu/drm/radeon/evergreen_dma.c | 4 +- + drivers/gpu/drm/radeon/kv_dpm.c | 64 +- + drivers/gpu/drm/radeon/ni.c | 8 +- + drivers/gpu/drm/radeon/ni_dma.c | 6 +- + drivers/gpu/drm/radeon/ni_dpm.c | 7 +- + drivers/gpu/drm/radeon/r100.c | 49 +- + drivers/gpu/drm/radeon/r200.c | 20 +- + drivers/gpu/drm/radeon/r300.c | 32 +- + drivers/gpu/drm/radeon/r600.c | 6 +- + drivers/gpu/drm/radeon/r600_cs.c | 110 +- + drivers/gpu/drm/radeon/r600_dma.c | 6 +- + drivers/gpu/drm/radeon/r600_dpm.c | 48 +- + drivers/gpu/drm/radeon/r600_dpm.h | 2 + + drivers/gpu/drm/radeon/radeon.h | 158 +- + drivers/gpu/drm/radeon/radeon_asic.c | 19 + + drivers/gpu/drm/radeon/radeon_asic.h | 14 + + drivers/gpu/drm/radeon/radeon_connectors.c | 19 +- + drivers/gpu/drm/radeon/radeon_cs.c | 163 +- + drivers/gpu/drm/radeon/radeon_device.c | 20 +- + drivers/gpu/drm/radeon/radeon_display.c | 248 +-- + drivers/gpu/drm/radeon/radeon_drv.c | 4 +- + drivers/gpu/drm/radeon/radeon_fence.c | 59 +- + drivers/gpu/drm/radeon/radeon_gart.c | 958 ------------ + drivers/gpu/drm/radeon/radeon_gem.c | 49 +- + drivers/gpu/drm/radeon/radeon_kms.c | 30 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- + drivers/gpu/drm/radeon/radeon_mode.h | 4 + + drivers/gpu/drm/radeon/radeon_object.c | 149 +- + drivers/gpu/drm/radeon/radeon_object.h | 9 +- + drivers/gpu/drm/radeon/radeon_pm.c | 32 +- + drivers/gpu/drm/radeon/radeon_ring.c | 119 +- + drivers/gpu/drm/radeon/radeon_sa.c | 7 +- + drivers/gpu/drm/radeon/radeon_semaphore.c | 14 +- + drivers/gpu/drm/radeon/radeon_test.c | 39 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 13 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 5 +- + drivers/gpu/drm/radeon/radeon_vce.c | 699 +++++++++ + drivers/gpu/drm/radeon/radeon_vm.c | 966 ++++++++++++ + drivers/gpu/drm/radeon/rs780_dpm.c | 7 +- + drivers/gpu/drm/radeon/rv6xx_dpm.c | 7 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 7 +- + drivers/gpu/drm/radeon/si.c | 10 +- + drivers/gpu/drm/radeon/si_dma.c | 4 +- + drivers/gpu/drm/radeon/si_dpm.c | 7 +- + drivers/gpu/drm/radeon/sid.h | 47 + + drivers/gpu/drm/radeon/sumo_dpm.c | 7 +- + drivers/gpu/drm/radeon/trinity_dpm.c | 7 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +- + drivers/gpu/drm/radeon/vce_v1_0.c | 187 +++ + drivers/gpu/drm/radeon/vce_v2_0.c | 181 +++ + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 5 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 16 +- + drivers/gpu/drm/tegra/Makefile | 2 + + drivers/gpu/drm/tegra/bus.c | 2 +- + drivers/gpu/drm/tegra/dc.c | 16 +- + drivers/gpu/drm/tegra/dc.h | 1 + + drivers/gpu/drm/tegra/dpaux.c | 544 +++++++ + drivers/gpu/drm/tegra/dpaux.h | 73 + + drivers/gpu/drm/tegra/drm.c | 19 +- + drivers/gpu/drm/tegra/drm.h | 20 + + drivers/gpu/drm/tegra/dsi.c | 20 +- + drivers/gpu/drm/tegra/dsi.h | 20 +- + drivers/gpu/drm/tegra/gem.c | 25 +- + drivers/gpu/drm/tegra/gem.h | 14 +- + drivers/gpu/drm/tegra/gr2d.c | 14 +- + drivers/gpu/drm/tegra/mipi-phy.c | 20 +- + drivers/gpu/drm/tegra/mipi-phy.h | 20 +- + drivers/gpu/drm/tegra/output.c | 8 + + drivers/gpu/drm/tegra/sor.c | 1092 ++++++++++++++ + drivers/gpu/drm/tegra/sor.h | 278 ++++ + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 8 +- + drivers/gpu/drm/ttm/ttm_bo.c | 29 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 11 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_object.c | 46 + + drivers/gpu/drm/udl/udl_fb.c | 2 +- + drivers/gpu/drm/udl/udl_gem.c | 2 +- + drivers/gpu/drm/udl/udl_modeset.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 148 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 143 +- + drivers/gpu/host1x/syncpt.c | 1 + + drivers/staging/imx-drm/ipuv3-crtc.c | 6 +- + drivers/staging/imx-drm/ipuv3-plane.c | 2 +- + drivers/video/exynos/Kconfig | 7 - + drivers/video/exynos/Makefile | 1 - + fs/dcache.c | 1 + + include/drm/bridge/ptn3460.h | 37 + + include/drm/drmP.h | 243 ++- + include/drm/drm_crtc.h | 225 +-- + include/drm/drm_crtc_helper.h | 6 +- + include/drm/drm_dp_helper.h | 125 ++ + include/drm/drm_fb_helper.h | 6 + + include/drm/drm_gem_cma_helper.h | 2 + + include/drm/drm_mipi_dsi.h | 6 + + include/drm/drm_mm.h | 182 ++- + include/drm/drm_modes.h | 237 +++ + include/drm/drm_plane_helper.h | 49 + + include/drm/drm_vma_manager.h | 6 +- + include/drm/gma_drm.h | 70 +- + include/drm/ttm/ttm_bo_driver.h | 49 +- + include/drm/ttm/ttm_object.h | 4 + + include/drm/ttm/ttm_placement.h | 3 + + include/linux/hdmi.h | 12 + + include/linux/host1x.h | 1 + + include/uapi/drm/drm.h | 17 + + include/uapi/drm/msm_drm.h | 12 + + include/uapi/drm/radeon_drm.h | 20 + + include/uapi/drm/tegra_drm.h | 24 +- + include/uapi/drm/vmwgfx_drm.h | 12 +- + 482 files changed, 37462 insertions(+), 15915 deletions(-) + create mode 100644 Documentation/devicetree/bindings/drm/bridge/ptn3460.txt + create mode 100644 Documentation/devicetree/bindings/drm/i2c/tda998x.txt + create mode 100644 Documentation/devicetree/bindings/panel/lg,ld070wx3-sl01.txt + create mode 100644 Documentation/devicetree/bindings/panel/lg,lh500wx1-sd03.txt + create mode 100644 Documentation/devicetree/bindings/panel/lg,lp129qe.txt + create mode 100644 Documentation/devicetree/bindings/panel/samsung,ld9040.txt + create mode 100644 Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt + create mode 100644 Documentation/devicetree/bindings/video/exynos_dsim.txt + create mode 100644 drivers/gpu/drm/bridge/Kconfig + create mode 100644 drivers/gpu/drm/bridge/Makefile + create mode 100644 drivers/gpu/drm/bridge/ptn3460.c + create mode 100644 drivers/gpu/drm/drm_crtc_internal.h + create mode 100644 drivers/gpu/drm/drm_plane_helper.c + rename drivers/{video => gpu/drm}/exynos/exynos_dp_core.c (83%) + rename drivers/{video => gpu/drm}/exynos/exynos_dp_core.h (97%) + rename drivers/{video => gpu/drm}/exynos/exynos_dp_reg.c (100%) + rename drivers/{video => gpu/drm}/exynos/exynos_dp_reg.h (100%) + create mode 100644 drivers/gpu/drm/exynos/exynos_drm_dpi.c + create mode 100644 drivers/gpu/drm/exynos/exynos_drm_dsi.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_hdmi.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_hdmi.h + create mode 100644 drivers/gpu/drm/exynos/exynos_mixer.h + create mode 100644 drivers/gpu/drm/gma500/blitter.c + create mode 100644 drivers/gpu/drm/gma500/blitter.h + create mode 100644 drivers/gpu/drm/gma500/gem.h + create mode 100644 drivers/gpu/drm/gma500/gma_device.c + create mode 100644 drivers/gpu/drm/gma500/gma_device.h + create mode 100644 drivers/gpu/drm/gma500/mmu.h + create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.c + create mode 100644 drivers/gpu/drm/i915/i915_params.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_audio.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/device/gm100.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/gm107.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/priv.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h + rename drivers/gpu/drm/nouveau/core/engine/graph/{ctxnvc3.c => ctxnvc4.c} (65%) + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcgm107.fuc5 + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcgm107.fuc5.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5 + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/gm107.c + rename drivers/gpu/drm/nouveau/core/engine/graph/{nvc3.c => nvc4.c} (66%) + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/P0260.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/P0260.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/gm107.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/gm107.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramgm107.c + rename drivers/gpu/drm/nouveau/core/subdev/ltcg/{nvc0.c => gf100.c} (66%) + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/ltcg/gm107.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/timer/gk20a.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/timer/nv04.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/timer/priv.h + create mode 100644 drivers/gpu/drm/panel/panel-ld9040.c + create mode 100644 drivers/gpu/drm/panel/panel-s6e8aa0.c + create mode 100644 drivers/gpu/drm/radeon/radeon_vce.c + create mode 100644 drivers/gpu/drm/radeon/radeon_vm.c + create mode 100644 drivers/gpu/drm/radeon/vce_v1_0.c + create mode 100644 drivers/gpu/drm/radeon/vce_v2_0.c + create mode 100644 drivers/gpu/drm/tegra/dpaux.c + create mode 100644 drivers/gpu/drm/tegra/dpaux.h + create mode 100644 drivers/gpu/drm/tegra/sor.c + create mode 100644 drivers/gpu/drm/tegra/sor.h + create mode 100644 include/drm/bridge/ptn3460.h + create mode 100644 include/drm/drm_modes.h + create mode 100644 include/drm/drm_plane_helper.h +Merging drm-intel/for-linux-next (10b6ee4a8781 Skip intel_crt_init for Dell XPS 8700) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/for-next (3d1c1474386e drm/tegra: Use standard GPL v2 license text) +$ git merge drm-tegra/drm/for-next +Merge made by the 'recursive' strategy. +Merging sound/for-next (a4b7f21d7b42 ALSA: hda - Enable beep for ASUS 1015E) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (821d8eed3aed Merge remote-tracking branches 'asoc/fix/tlv320aic23' and 'asoc/fix/warn' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/fsl,ssi.txt | 21 +++--- + sound/soc/codecs/alc5623.c | 3 +- + sound/soc/codecs/alc5632.c | 10 ++- + sound/soc/codecs/cs42l52.c | 2 +- + sound/soc/codecs/cs42l52.h | 2 +- + sound/soc/codecs/cs42xx8.c | 11 ++- + sound/soc/codecs/da732x.c | 3 +- + sound/soc/codecs/max98090.c | 7 ++ + sound/soc/codecs/rt5640.c | 9 +++ + sound/soc/codecs/tlv320aic23-i2c.c | 7 ++ + sound/soc/fsl/fsl_sai.c | 85 +++++++++++++++++++++- + sound/soc/fsl/fsl_sai.h | 15 ++++ + 12 files changed, 150 insertions(+), 25 deletions(-) +Merging modules/modules-next (22c9bcad859d staging: fix up speakup kobject mode) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (fc4324b4597c virtio-blk: base queue-depth on virtqueue ringsize or module param) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (e2c3ecf0ea8e Input: edt-ft5x06 - add a missing condition) +$ git merge input/next +Already up-to-date. +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (bccb5f7c8bdf blk-mq: fix potential stall during CPU unplug with IO pending) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-mq.c | 8 ++++++-- + lib/percpu_counter.c | 2 +- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging device-mapper/for-next (303d4a25d8a2 dm crypt: sort writes) +$ git merge device-mapper/for-next +Auto-merging fs/bio.c +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 427 +++++++++++++++++++++++++------------------------- + fs/bio.c | 3 +- + 2 files changed, 218 insertions(+), 212 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (5491ce3f79ee mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller) +$ git merge mmc/mmc-next +Auto-merging drivers/regulator/Makefile +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/mmc/host/mmci.h +Auto-merging drivers/mmc/host/dw_mmc.c +Removing drivers/mmc/host/dw_mmc-socfpga.c +Auto-merging drivers/mmc/core/host.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/boot/dts/omap5.dtsi +Auto-merging arch/arm/boot/dts/omap4.dtsi +Auto-merging arch/arm/boot/dts/omap3.dtsi +Auto-merging arch/arm/boot/dts/omap2430.dtsi +Auto-merging arch/arm/boot/dts/dra7.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 9 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 55 ++ + .../devicetree/bindings/mmc/sdhci-pxa.txt | 17 +- + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 1 + + .../bindings/regulator/pbias-regulator.txt | 27 + + MAINTAINERS | 1 + + arch/arm/boot/dts/dra7.dtsi | 17 + + arch/arm/boot/dts/omap2430.dtsi | 17 + + arch/arm/boot/dts/omap3-ldp.dts | 23 + + arch/arm/boot/dts/omap3.dtsi | 17 + + arch/arm/boot/dts/omap4.dtsi | 17 + + arch/arm/boot/dts/omap5.dtsi | 17 + + arch/arm/configs/omap2plus_defconfig | 2 + + drivers/mfd/rtsx_pcr.c | 132 +++-- + drivers/mmc/card/block.c | 181 +++--- + drivers/mmc/core/Kconfig | 15 - + drivers/mmc/core/bus.c | 12 +- + drivers/mmc/core/core.c | 87 +-- + drivers/mmc/core/host.c | 18 + + drivers/mmc/core/mmc.c | 65 +-- + drivers/mmc/core/mmc_ops.c | 64 ++- + drivers/mmc/core/sd.c | 23 +- + drivers/mmc/core/slot-gpio.c | 180 ++++-- + drivers/mmc/host/Kconfig | 23 +- + drivers/mmc/host/Makefile | 2 +- + drivers/mmc/host/davinci_mmc.c | 4 +- + drivers/mmc/host/dw_mmc-k3.c | 2 + + drivers/mmc/host/dw_mmc-pltfm.c | 12 +- + drivers/mmc/host/dw_mmc-socfpga.c | 138 ----- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mmc/host/dw_mmc.h | 3 +- + drivers/mmc/host/mmci.c | 54 +- + drivers/mmc/host/mmci.h | 2 + + drivers/mmc/host/omap.c | 93 ++-- + drivers/mmc/host/omap_hsmmc.c | 242 +++++--- + drivers/mmc/host/rtsx_pci_sdmmc.c | 529 +++++++++++++----- + drivers/mmc/host/sdhci-acpi.c | 79 +-- + drivers/mmc/host/sdhci-bcm-kona.c | 39 +- + drivers/mmc/host/sdhci-dove.c | 2 +- + drivers/mmc/host/sdhci-msm.c | 618 +++++++++++++++++++++ + drivers/mmc/host/sdhci-pci.c | 20 + + drivers/mmc/host/sdhci-pxav3.c | 68 +++ + drivers/mmc/host/sdhci-s3c.c | 170 +++--- + drivers/mmc/host/sdhci-spear.c | 199 ++----- + drivers/mmc/host/sdhci.c | 24 +- + drivers/mmc/host/sh_mobile_sdhi.c | 50 +- + drivers/mmc/host/tmio_mmc.c | 30 +- + drivers/mmc/host/tmio_mmc.h | 7 +- + drivers/mmc/host/tmio_mmc_pio.c | 7 +- + drivers/mmc/host/ushc.c | 2 +- + drivers/mmc/host/wmt-sdmmc.c | 4 +- + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/pbias-regulator.c | 255 +++++++++ + include/linux/mfd/rtsx_common.h | 1 + + include/linux/mfd/rtsx_pci.h | 8 +- + include/linux/mmc/core.h | 4 +- + include/linux/mmc/host.h | 13 +- + include/linux/mmc/sdhci-spear.h | 8 - + include/linux/mmc/sdhci.h | 2 + + include/linux/mmc/slot-gpio.h | 6 + + include/linux/platform_data/mmc-msm_sdcc.h | 7 +- + include/linux/platform_data/mmc-mvsdio.h | 6 +- + 63 files changed, 2576 insertions(+), 1166 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-msm.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pbias-regulator.txt + delete mode 100644 drivers/mmc/host/dw_mmc-socfpga.c + create mode 100644 drivers/mmc/host/sdhci-msm.c + create mode 100644 drivers/regulator/pbias-regulator.c +Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (5f0985bb1123 mm/slab.c: cleanup outdated comments and unify variables naming) +$ git merge slab/for-next +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging include/linux/slab.h +Merge made by the 'recursive' strategy. + include/linux/slab.h | 11 ++++ + mm/slab.c | 179 ++++++++++++++++++++++++++++++--------------------- + mm/slub.c | 5 +- + 3 files changed, 119 insertions(+), 76 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (789b5e031528 md/raid5: Fix CPU hotplug callback registration) +$ git merge md/for-next +Already up-to-date. +Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd) +$ git merge mfd/master +Already up-to-date. +Merging mfd-lj/for-mfd-next (2d28ca731b9b mfd: wm5110: Correct default for HEADPHONE_DETECT_1) +$ git merge mfd-lj/for-mfd-next +Already up-to-date. +Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data) +$ git merge battery/master +Already up-to-date. +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (d754589d8044 OMAPDSS: add missing __init for dss_init_ports) +$ git merge omap_dss2/for-next +Resolved 'drivers/video/Kconfig' using previous resolution. +Resolved 'drivers/video/Makefile' using previous resolution. +Removing drivers/video/omap2/Kconfig +Auto-merging drivers/video/fbdev/wmt_ge_rops.c +CONFLICT (rename/delete): drivers/video/fbdev/sgivwfb.c deleted in HEAD and renamed in omap_dss2/for-next. Version omap_dss2/for-next of drivers/video/fbdev/sgivwfb.c left in tree. +Auto-merging drivers/video/fbdev/mmp/Kconfig +Auto-merging drivers/video/fbdev/core/fbmon.c +Auto-merging drivers/video/fbdev/core/fb_ddc.c +Auto-merging drivers/video/fbdev/aty/mach64_cursor.c +Auto-merging drivers/video/Makefile +CONFLICT (content): Merge conflict in drivers/video/Makefile +Auto-merging drivers/video/Kconfig +CONFLICT (content): Merge conflict in drivers/video/Kconfig +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/gpu/drm/exynos/exynos_dp_reg.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/video/fbdev/exynos/exynos_dp_reg.h" in "omap_dss2/for-next" +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/gpu/drm/exynos/exynos_dp_reg.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/video/fbdev/exynos/exynos_dp_reg.c" in "omap_dss2/for-next" +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/gpu/drm/exynos/exynos_dp_core.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/video/fbdev/exynos/exynos_dp_core.h" in "omap_dss2/for-next" +CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/gpu/drm/exynos/exynos_dp_core.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/video/fbdev/exynos/exynos_dp_core.c" in "omap_dss2/for-next" +Auto-merging drivers/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/video/fbdev/exynos/exynos_dp_core.c drivers/video/fbdev/exynos/exynos_dp_core.h drivers/video/fbdev/exynos/exynos_dp_reg.c drivers/video/fbdev/exynos/exynos_dp_reg.h drivers/video/exynos/exynos_dp_core.c drivers/video/exynos/exynos_dp_core.h drivers/video/exynos/exynos_dp_reg.c drivers/video/exynos/exynos_dp_reg.h +drivers/video/exynos/exynos_dp_core.c: needs merge +drivers/video/exynos/exynos_dp_core.h: needs merge +drivers/video/exynos/exynos_dp_reg.c: needs merge +drivers/video/exynos/exynos_dp_reg.h: needs merge +drivers/video/fbdev/exynos/exynos_dp_core.c: needs merge +drivers/video/fbdev/exynos/exynos_dp_core.h: needs merge +drivers/video/fbdev/exynos/exynos_dp_reg.c: needs merge +drivers/video/fbdev/exynos/exynos_dp_reg.h: needs merge +rm 'drivers/video/exynos/exynos_dp_core.c' +rm 'drivers/video/exynos/exynos_dp_core.h' +rm 'drivers/video/exynos/exynos_dp_reg.c' +rm 'drivers/video/exynos/exynos_dp_reg.h' +rm 'drivers/video/fbdev/exynos/exynos_dp_core.c' +rm 'drivers/video/fbdev/exynos/exynos_dp_core.h' +rm 'drivers/video/fbdev/exynos/exynos_dp_reg.c' +rm 'drivers/video/fbdev/exynos/exynos_dp_reg.h' +$ git rm -f drivers/video/fbdev/sgivwfb.c +drivers/video/fbdev/sgivwfb.c: needs merge +rm 'drivers/video/fbdev/sgivwfb.c' +$ git commit -v -a +[master 0dc1085bf9c0] Merge remote-tracking branch 'omap_dss2/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 10 +- + drivers/Makefile | 4 +- + drivers/staging/xgifb/vb_def.h | 2 +- + drivers/staging/xgifb/vb_struct.h | 2 +- + drivers/staging/xgifb/vgatypes.h | 4 +- + drivers/video/Kconfig | 2478 +------------------ + drivers/video/Makefile | 166 +- + drivers/video/console/sticon.c | 2 +- + drivers/video/console/sticore.c | 2 +- + drivers/video/{ => fbdev}/68328fb.c | 0 + drivers/video/fbdev/Kconfig | 2481 ++++++++++++++++++++ + drivers/video/fbdev/Makefile | 153 ++ + drivers/video/{ => fbdev}/acornfb.c | 0 + drivers/video/{ => fbdev}/acornfb.h | 0 + drivers/video/{ => fbdev}/amba-clcd.c | 0 + drivers/video/{ => fbdev}/amifb.c | 0 + drivers/video/{ => fbdev}/arcfb.c | 0 + drivers/video/{ => fbdev}/arkfb.c | 0 + drivers/video/{ => fbdev}/asiliantfb.c | 0 + drivers/video/{ => fbdev}/atafb.c | 0 + drivers/video/{ => fbdev}/atafb.h | 0 + drivers/video/{ => fbdev}/atafb_iplan2p2.c | 0 + drivers/video/{ => fbdev}/atafb_iplan2p4.c | 0 + drivers/video/{ => fbdev}/atafb_iplan2p8.c | 0 + drivers/video/{ => fbdev}/atafb_mfb.c | 0 + drivers/video/{ => fbdev}/atafb_utils.h | 0 + drivers/video/{ => fbdev}/atmel_lcdfb.c | 0 + drivers/video/{ => fbdev}/aty/Makefile | 0 + drivers/video/{ => fbdev}/aty/ati_ids.h | 0 + drivers/video/{ => fbdev}/aty/aty128fb.c | 0 + drivers/video/{ => fbdev}/aty/atyfb.h | 0 + drivers/video/{ => fbdev}/aty/atyfb_base.c | 0 + drivers/video/{ => fbdev}/aty/mach64_accel.c | 0 + drivers/video/{ => fbdev}/aty/mach64_ct.c | 0 + drivers/video/{ => fbdev}/aty/mach64_cursor.c | 2 +- + drivers/video/{ => fbdev}/aty/mach64_gx.c | 0 + drivers/video/{ => fbdev}/aty/radeon_accel.c | 0 + drivers/video/{ => fbdev}/aty/radeon_backlight.c | 0 + drivers/video/{ => fbdev}/aty/radeon_base.c | 0 + drivers/video/{ => fbdev}/aty/radeon_i2c.c | 0 + drivers/video/{ => fbdev}/aty/radeon_monitor.c | 0 + drivers/video/{ => fbdev}/aty/radeon_pm.c | 0 + drivers/video/{ => fbdev}/aty/radeonfb.h | 0 + drivers/video/{ => fbdev}/au1100fb.c | 0 + drivers/video/{ => fbdev}/au1100fb.h | 0 + drivers/video/{ => fbdev}/au1200fb.c | 0 + drivers/video/{ => fbdev}/au1200fb.h | 0 + drivers/video/{ => fbdev}/auo_k1900fb.c | 0 + drivers/video/{ => fbdev}/auo_k1901fb.c | 0 + drivers/video/{ => fbdev}/auo_k190x.c | 0 + drivers/video/{ => fbdev}/auo_k190x.h | 0 + drivers/video/{ => fbdev}/bf537-lq035.c | 0 + drivers/video/{ => fbdev}/bf54x-lq043fb.c | 0 + drivers/video/{ => fbdev}/bfin-lq035q1-fb.c | 0 + drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c | 0 + drivers/video/{ => fbdev}/bfin_adv7393fb.c | 0 + drivers/video/{ => fbdev}/bfin_adv7393fb.h | 0 + drivers/video/{ => fbdev}/broadsheetfb.c | 0 + drivers/video/{ => fbdev}/bt431.h | 0 + drivers/video/{ => fbdev}/bt455.h | 0 + drivers/video/{ => fbdev}/bw2.c | 0 + drivers/video/{ => fbdev}/c2p.h | 0 + drivers/video/{ => fbdev}/c2p_core.h | 0 + drivers/video/{ => fbdev}/c2p_iplan2.c | 0 + drivers/video/{ => fbdev}/c2p_planar.c | 0 + drivers/video/{ => fbdev}/carminefb.c | 0 + drivers/video/{ => fbdev}/carminefb.h | 0 + drivers/video/{ => fbdev}/carminefb_regs.h | 0 + drivers/video/{ => fbdev}/cg14.c | 0 + drivers/video/{ => fbdev}/cg3.c | 0 + drivers/video/{ => fbdev}/cg6.c | 0 + drivers/video/{ => fbdev}/chipsfb.c | 0 + drivers/video/{ => fbdev}/cirrusfb.c | 0 + drivers/video/{ => fbdev}/clps711xfb.c | 0 + drivers/video/{ => fbdev}/cobalt_lcdfb.c | 0 + drivers/video/{ => fbdev}/controlfb.c | 0 + drivers/video/{ => fbdev}/controlfb.h | 0 + drivers/video/fbdev/core/Makefile | 16 + + drivers/video/{ => fbdev/core}/cfbcopyarea.c | 0 + drivers/video/{ => fbdev/core}/cfbfillrect.c | 0 + drivers/video/{ => fbdev/core}/cfbimgblt.c | 0 + drivers/video/{ => fbdev/core}/fb_ddc.c | 2 +- + drivers/video/{ => fbdev/core}/fb_defio.c | 0 + drivers/video/{ => fbdev/core}/fb_draw.h | 0 + drivers/video/{ => fbdev/core}/fb_notify.c | 0 + drivers/video/{ => fbdev/core}/fb_sys_fops.c | 0 + drivers/video/{ => fbdev/core}/fbcmap.c | 0 + drivers/video/{ => fbdev/core}/fbcvt.c | 0 + drivers/video/{ => fbdev/core}/fbmem.c | 0 + drivers/video/{ => fbdev/core}/fbmon.c | 2 +- + drivers/video/{ => fbdev/core}/fbsysfs.c | 0 + drivers/video/{ => fbdev/core}/modedb.c | 0 + drivers/video/{ => fbdev/core}/svgalib.c | 0 + drivers/video/{ => fbdev/core}/syscopyarea.c | 0 + drivers/video/{ => fbdev/core}/sysfillrect.c | 0 + drivers/video/{ => fbdev/core}/sysimgblt.c | 0 + drivers/video/{ => fbdev}/cyber2000fb.c | 0 + drivers/video/{ => fbdev}/cyber2000fb.h | 0 + drivers/video/{ => fbdev}/da8xx-fb.c | 0 + drivers/video/{ => fbdev}/dnfb.c | 0 + drivers/video/{ => fbdev}/edid.h | 0 + drivers/video/{ => fbdev}/efifb.c | 0 + drivers/video/{ => fbdev}/ep93xx-fb.c | 0 + drivers/video/{ => fbdev}/exynos/Kconfig | 0 + drivers/video/{ => fbdev}/exynos/Makefile | 0 + drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_common.c | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_common.h | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h | 0 + .../{ => fbdev}/exynos/exynos_mipi_dsi_regs.h | 0 + drivers/video/{ => fbdev}/exynos/s6e8ax0.c | 0 + drivers/video/{ => fbdev}/fb-puv3.c | 0 + drivers/video/{ => fbdev}/ffb.c | 0 + drivers/video/{ => fbdev}/fm2fb.c | 0 + drivers/video/{ => fbdev}/fsl-diu-fb.c | 0 + drivers/video/{ => fbdev}/g364fb.c | 0 + drivers/video/{ => fbdev}/gbefb.c | 0 + drivers/video/{ => fbdev}/geode/Kconfig | 0 + drivers/video/{ => fbdev}/geode/Makefile | 0 + drivers/video/{ => fbdev}/geode/display_gx.c | 0 + drivers/video/{ => fbdev}/geode/display_gx1.c | 0 + drivers/video/{ => fbdev}/geode/display_gx1.h | 0 + drivers/video/{ => fbdev}/geode/geodefb.h | 0 + drivers/video/{ => fbdev}/geode/gx1fb_core.c | 0 + drivers/video/{ => fbdev}/geode/gxfb.h | 0 + drivers/video/{ => fbdev}/geode/gxfb_core.c | 0 + drivers/video/{ => fbdev}/geode/lxfb.h | 0 + drivers/video/{ => fbdev}/geode/lxfb_core.c | 0 + drivers/video/{ => fbdev}/geode/lxfb_ops.c | 0 + drivers/video/{ => fbdev}/geode/suspend_gx.c | 0 + drivers/video/{ => fbdev}/geode/video_cs5530.c | 0 + drivers/video/{ => fbdev}/geode/video_cs5530.h | 0 + drivers/video/{ => fbdev}/geode/video_gx.c | 0 + drivers/video/{ => fbdev}/goldfishfb.c | 0 + drivers/video/{ => fbdev}/grvga.c | 0 + drivers/video/{ => fbdev}/gxt4500.c | 0 + drivers/video/{ => fbdev}/hecubafb.c | 0 + drivers/video/{ => fbdev}/hgafb.c | 0 + drivers/video/{ => fbdev}/hitfb.c | 0 + drivers/video/{ => fbdev}/hpfb.c | 0 + drivers/video/{ => fbdev}/hyperv_fb.c | 0 + drivers/video/{ => fbdev}/i740_reg.h | 0 + drivers/video/{ => fbdev}/i740fb.c | 0 + drivers/video/{ => fbdev}/i810/Makefile | 0 + drivers/video/{ => fbdev}/i810/i810-i2c.c | 0 + drivers/video/{ => fbdev}/i810/i810.h | 0 + drivers/video/{ => fbdev}/i810/i810_accel.c | 0 + drivers/video/{ => fbdev}/i810/i810_dvt.c | 0 + drivers/video/{ => fbdev}/i810/i810_gtf.c | 0 + drivers/video/{ => fbdev}/i810/i810_main.c | 0 + drivers/video/{ => fbdev}/i810/i810_main.h | 0 + drivers/video/{ => fbdev}/i810/i810_regs.h | 0 + drivers/video/{ => fbdev}/igafb.c | 0 + drivers/video/{ => fbdev}/imsttfb.c | 0 + drivers/video/{ => fbdev}/imxfb.c | 0 + drivers/video/{ => fbdev}/intelfb/Makefile | 0 + drivers/video/{ => fbdev}/intelfb/intelfb.h | 0 + drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c | 0 + drivers/video/{ => fbdev}/intelfb/intelfbdrv.c | 0 + drivers/video/{ => fbdev}/intelfb/intelfbhw.c | 0 + drivers/video/{ => fbdev}/intelfb/intelfbhw.h | 0 + drivers/video/{ => fbdev}/jz4740_fb.c | 0 + drivers/video/{ => fbdev}/kyro/Makefile | 0 + drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c | 0 + drivers/video/{ => fbdev}/kyro/STG4000Interface.h | 0 + .../video/{ => fbdev}/kyro/STG4000OverlayDevice.c | 0 + drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c | 0 + drivers/video/{ => fbdev}/kyro/STG4000Reg.h | 0 + drivers/video/{ => fbdev}/kyro/STG4000VTG.c | 0 + drivers/video/{ => fbdev}/kyro/fbdev.c | 0 + drivers/video/{ => fbdev}/leo.c | 0 + drivers/video/{ => fbdev}/macfb.c | 0 + drivers/video/{ => fbdev}/macmodes.c | 0 + drivers/video/{ => fbdev}/macmodes.h | 0 + drivers/video/{ => fbdev}/matrox/Makefile | 0 + drivers/video/{ => fbdev}/matrox/g450_pll.c | 0 + drivers/video/{ => fbdev}/matrox/g450_pll.h | 0 + drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c | 0 + .../video/{ => fbdev}/matrox/matroxfb_DAC1064.c | 0 + .../video/{ => fbdev}/matrox/matroxfb_DAC1064.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_accel.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_accel.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_base.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_base.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_g450.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_g450.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_maven.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_maven.h | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_misc.c | 0 + drivers/video/{ => fbdev}/matrox/matroxfb_misc.h | 0 + drivers/video/{ => fbdev}/maxinefb.c | 0 + drivers/video/{ => fbdev}/mb862xx/Makefile | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h | 0 + .../video/{ => fbdev}/mb862xx/mb862xxfb_accel.c | 0 + .../video/{ => fbdev}/mb862xx/mb862xxfb_accel.h | 0 + drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c | 0 + drivers/video/{ => fbdev}/mbx/Makefile | 0 + drivers/video/{ => fbdev}/mbx/mbxdebugfs.c | 0 + drivers/video/{ => fbdev}/mbx/mbxfb.c | 0 + drivers/video/{ => fbdev}/mbx/reg_bits.h | 0 + drivers/video/{ => fbdev}/mbx/regs.h | 0 + drivers/video/{ => fbdev}/metronomefb.c | 0 + drivers/video/{ => fbdev}/mmp/Kconfig | 6 +- + drivers/video/{ => fbdev}/mmp/Makefile | 0 + drivers/video/{ => fbdev}/mmp/core.c | 0 + drivers/video/{ => fbdev}/mmp/fb/Kconfig | 0 + drivers/video/{ => fbdev}/mmp/fb/Makefile | 0 + drivers/video/{ => fbdev}/mmp/fb/mmpfb.c | 0 + drivers/video/{ => fbdev}/mmp/fb/mmpfb.h | 0 + drivers/video/{ => fbdev}/mmp/hw/Kconfig | 0 + drivers/video/{ => fbdev}/mmp/hw/Makefile | 0 + drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c | 0 + drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h | 0 + drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c | 0 + drivers/video/{ => fbdev}/mmp/panel/Kconfig | 0 + drivers/video/{ => fbdev}/mmp/panel/Makefile | 0 + .../video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c | 0 + drivers/video/{ => fbdev}/msm/Makefile | 0 + drivers/video/{ => fbdev}/msm/mddi.c | 0 + drivers/video/{ => fbdev}/msm/mddi_client_dummy.c | 0 + .../video/{ => fbdev}/msm/mddi_client_nt35399.c | 0 + .../video/{ => fbdev}/msm/mddi_client_toshiba.c | 0 + drivers/video/{ => fbdev}/msm/mddi_hw.h | 0 + drivers/video/{ => fbdev}/msm/mdp.c | 0 + drivers/video/{ => fbdev}/msm/mdp_csc_table.h | 0 + drivers/video/{ => fbdev}/msm/mdp_hw.h | 0 + drivers/video/{ => fbdev}/msm/mdp_ppp.c | 0 + drivers/video/{ => fbdev}/msm/mdp_scale_tables.c | 0 + drivers/video/{ => fbdev}/msm/mdp_scale_tables.h | 0 + drivers/video/{ => fbdev}/msm/msm_fb.c | 0 + drivers/video/{ => fbdev}/mx3fb.c | 0 + drivers/video/{ => fbdev}/mxsfb.c | 0 + drivers/video/{ => fbdev}/n411.c | 0 + drivers/video/{ => fbdev}/neofb.c | 0 + drivers/video/{ => fbdev}/nuc900fb.c | 0 + drivers/video/{ => fbdev}/nuc900fb.h | 0 + drivers/video/{ => fbdev}/nvidia/Makefile | 0 + drivers/video/{ => fbdev}/nvidia/nv_accel.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_backlight.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_dma.h | 0 + drivers/video/{ => fbdev}/nvidia/nv_hw.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_i2c.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_local.h | 0 + drivers/video/{ => fbdev}/nvidia/nv_of.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_proto.h | 0 + drivers/video/{ => fbdev}/nvidia/nv_setup.c | 0 + drivers/video/{ => fbdev}/nvidia/nv_type.h | 0 + drivers/video/{ => fbdev}/nvidia/nvidia.c | 0 + drivers/video/{ => fbdev}/ocfb.c | 0 + drivers/video/{ => fbdev}/offb.c | 0 + drivers/video/{ => fbdev}/omap/Kconfig | 0 + drivers/video/{ => fbdev}/omap/Makefile | 0 + drivers/video/{ => fbdev}/omap/hwa742.c | 0 + drivers/video/{ => fbdev}/omap/lcd_ams_delta.c | 0 + drivers/video/{ => fbdev}/omap/lcd_h3.c | 0 + drivers/video/{ => fbdev}/omap/lcd_htcherald.c | 0 + drivers/video/{ => fbdev}/omap/lcd_inn1510.c | 0 + drivers/video/{ => fbdev}/omap/lcd_inn1610.c | 0 + drivers/video/{ => fbdev}/omap/lcd_mipid.c | 0 + drivers/video/{ => fbdev}/omap/lcd_osk.c | 0 + drivers/video/{ => fbdev}/omap/lcd_palmte.c | 0 + drivers/video/{ => fbdev}/omap/lcd_palmtt.c | 0 + drivers/video/{ => fbdev}/omap/lcd_palmz71.c | 0 + drivers/video/{ => fbdev}/omap/lcdc.c | 0 + drivers/video/{ => fbdev}/omap/lcdc.h | 0 + drivers/video/{ => fbdev}/omap/omapfb.h | 0 + drivers/video/{ => fbdev}/omap/omapfb_main.c | 0 + drivers/video/{ => fbdev}/omap/sossi.c | 0 + drivers/video/fbdev/omap2/Kconfig | 10 + + drivers/video/{ => fbdev}/omap2/Makefile | 0 + .../video/{ => fbdev}/omap2/displays-new/Kconfig | 0 + .../video/{ => fbdev}/omap2/displays-new/Makefile | 0 + .../omap2/displays-new/connector-analog-tv.c | 0 + .../{ => fbdev}/omap2/displays-new/connector-dvi.c | 0 + .../omap2/displays-new/connector-hdmi.c | 0 + .../omap2/displays-new/encoder-tfp410.c | 0 + .../omap2/displays-new/encoder-tpd12s015.c | 0 + .../{ => fbdev}/omap2/displays-new/panel-dpi.c | 0 + .../{ => fbdev}/omap2/displays-new/panel-dsi-cm.c | 0 + .../omap2/displays-new/panel-lgphilips-lb035q02.c | 0 + .../omap2/displays-new/panel-nec-nl8048hl11.c | 0 + .../omap2/displays-new/panel-sharp-ls037v7dw01.c | 0 + .../omap2/displays-new/panel-sony-acx565akm.c | 0 + .../omap2/displays-new/panel-tpo-td028ttec1.c | 0 + .../omap2/displays-new/panel-tpo-td043mtea1.c | 0 + drivers/video/{ => fbdev}/omap2/dss/Kconfig | 0 + drivers/video/{ => fbdev}/omap2/dss/Makefile | 0 + drivers/video/{ => fbdev}/omap2/dss/apply.c | 0 + drivers/video/{ => fbdev}/omap2/dss/core.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc.h | 0 + drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c | 0 + .../video/{ => fbdev}/omap2/dss/display-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/dss/display.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dpi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dsi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss-of.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss.h | 0 + drivers/video/{ => fbdev}/omap2/dss/dss_features.c | 0 + drivers/video/{ => fbdev}/omap2/dss/dss_features.h | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi.h | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi4.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c | 0 + drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c | 0 + .../video/{ => fbdev}/omap2/dss/manager-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/dss/manager.c | 0 + drivers/video/{ => fbdev}/omap2/dss/output.c | 0 + .../video/{ => fbdev}/omap2/dss/overlay-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/dss/overlay.c | 0 + drivers/video/{ => fbdev}/omap2/dss/rfbi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/sdi.c | 0 + drivers/video/{ => fbdev}/omap2/dss/venc.c | 0 + drivers/video/{ => fbdev}/omap2/dss/venc_panel.c | 0 + drivers/video/{ => fbdev}/omap2/omapfb/Kconfig | 0 + drivers/video/{ => fbdev}/omap2/omapfb/Makefile | 0 + .../video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c | 0 + .../video/{ => fbdev}/omap2/omapfb/omapfb-main.c | 0 + .../video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c | 0 + drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h | 0 + drivers/video/{ => fbdev}/omap2/vrfb.c | 0 + drivers/video/{ => fbdev}/p9100.c | 0 + drivers/video/{ => fbdev}/platinumfb.c | 0 + drivers/video/{ => fbdev}/platinumfb.h | 0 + drivers/video/{ => fbdev}/pm2fb.c | 0 + drivers/video/{ => fbdev}/pm3fb.c | 0 + drivers/video/{ => fbdev}/pmag-aa-fb.c | 0 + drivers/video/{ => fbdev}/pmag-ba-fb.c | 0 + drivers/video/{ => fbdev}/pmagb-b-fb.c | 0 + drivers/video/{ => fbdev}/ps3fb.c | 0 + drivers/video/{ => fbdev}/pvr2fb.c | 0 + drivers/video/{ => fbdev}/pxa168fb.c | 0 + drivers/video/{ => fbdev}/pxa168fb.h | 0 + drivers/video/{ => fbdev}/pxa3xx-gcu.c | 0 + drivers/video/{ => fbdev}/pxa3xx-gcu.h | 0 + drivers/video/{ => fbdev}/pxafb.c | 0 + drivers/video/{ => fbdev}/pxafb.h | 0 + drivers/video/{ => fbdev}/q40fb.c | 0 + drivers/video/{ => fbdev}/riva/Makefile | 0 + drivers/video/{ => fbdev}/riva/fbdev.c | 0 + drivers/video/{ => fbdev}/riva/nv_driver.c | 0 + drivers/video/{ => fbdev}/riva/nv_type.h | 0 + drivers/video/{ => fbdev}/riva/nvreg.h | 0 + drivers/video/{ => fbdev}/riva/riva_hw.c | 0 + drivers/video/{ => fbdev}/riva/riva_hw.h | 0 + drivers/video/{ => fbdev}/riva/riva_tbl.h | 0 + drivers/video/{ => fbdev}/riva/rivafb-i2c.c | 0 + drivers/video/{ => fbdev}/riva/rivafb.h | 0 + drivers/video/{ => fbdev}/s1d13xxxfb.c | 0 + drivers/video/{ => fbdev}/s3c-fb.c | 0 + drivers/video/{ => fbdev}/s3c2410fb.c | 0 + drivers/video/{ => fbdev}/s3c2410fb.h | 0 + drivers/video/{ => fbdev}/s3fb.c | 0 + drivers/video/{ => fbdev}/sa1100fb.c | 0 + drivers/video/{ => fbdev}/sa1100fb.h | 0 + drivers/video/{ => fbdev}/savage/Makefile | 0 + drivers/video/{ => fbdev}/savage/savagefb-i2c.c | 0 + drivers/video/{ => fbdev}/savage/savagefb.h | 0 + drivers/video/{ => fbdev}/savage/savagefb_accel.c | 0 + drivers/video/{ => fbdev}/savage/savagefb_driver.c | 0 + drivers/video/{ => fbdev}/sbuslib.c | 0 + drivers/video/{ => fbdev}/sbuslib.h | 0 + drivers/video/{ => fbdev}/sh7760fb.c | 0 + drivers/video/{ => fbdev}/sh_mipi_dsi.c | 0 + drivers/video/{ => fbdev}/sh_mobile_hdmi.c | 0 + drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c | 0 + drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h | 0 + drivers/video/{ => fbdev}/sh_mobile_meram.c | 0 + drivers/video/{ => fbdev}/simplefb.c | 0 + drivers/video/{ => fbdev}/sis/300vtbl.h | 0 + drivers/video/{ => fbdev}/sis/310vtbl.h | 0 + drivers/video/{ => fbdev}/sis/Makefile | 0 + drivers/video/{ => fbdev}/sis/init.c | 0 + drivers/video/{ => fbdev}/sis/init.h | 0 + drivers/video/{ => fbdev}/sis/init301.c | 0 + drivers/video/{ => fbdev}/sis/init301.h | 0 + drivers/video/{ => fbdev}/sis/initdef.h | 0 + drivers/video/{ => fbdev}/sis/initextlfb.c | 0 + drivers/video/{ => fbdev}/sis/oem300.h | 0 + drivers/video/{ => fbdev}/sis/oem310.h | 0 + drivers/video/{ => fbdev}/sis/sis.h | 0 + drivers/video/{ => fbdev}/sis/sis_accel.c | 0 + drivers/video/{ => fbdev}/sis/sis_accel.h | 0 + drivers/video/{ => fbdev}/sis/sis_main.c | 0 + drivers/video/{ => fbdev}/sis/sis_main.h | 0 + drivers/video/{ => fbdev}/sis/vgatypes.h | 0 + drivers/video/{ => fbdev}/sis/vstruct.h | 0 + drivers/video/{ => fbdev}/skeletonfb.c | 0 + drivers/video/{ => fbdev}/sm501fb.c | 0 + drivers/video/{ => fbdev}/smscufx.c | 0 + drivers/video/{ => fbdev}/ssd1307fb.c | 0 + drivers/video/{ => fbdev}/sstfb.c | 0 + drivers/video/{ => fbdev}/sticore.h | 0 + drivers/video/{ => fbdev}/stifb.c | 0 + drivers/video/{ => fbdev}/sunxvr1000.c | 0 + drivers/video/{ => fbdev}/sunxvr2500.c | 0 + drivers/video/{ => fbdev}/sunxvr500.c | 0 + drivers/video/{ => fbdev}/tcx.c | 0 + drivers/video/{ => fbdev}/tdfxfb.c | 0 + drivers/video/{ => fbdev}/tgafb.c | 0 + drivers/video/{ => fbdev}/tmiofb.c | 0 + drivers/video/{ => fbdev}/tridentfb.c | 0 + drivers/video/{ => fbdev}/udlfb.c | 0 + drivers/video/{ => fbdev}/uvesafb.c | 0 + drivers/video/{ => fbdev}/valkyriefb.c | 0 + drivers/video/{ => fbdev}/valkyriefb.h | 0 + drivers/video/{ => fbdev}/vermilion/Makefile | 0 + drivers/video/{ => fbdev}/vermilion/cr_pll.c | 0 + drivers/video/{ => fbdev}/vermilion/vermilion.c | 0 + drivers/video/{ => fbdev}/vermilion/vermilion.h | 0 + drivers/video/{ => fbdev}/vesafb.c | 0 + drivers/video/{ => fbdev}/vfb.c | 0 + drivers/video/{ => fbdev}/vga16fb.c | 0 + drivers/video/{ => fbdev}/via/Makefile | 0 + drivers/video/{ => fbdev}/via/accel.c | 0 + drivers/video/{ => fbdev}/via/accel.h | 0 + drivers/video/{ => fbdev}/via/chip.h | 0 + drivers/video/{ => fbdev}/via/debug.h | 0 + drivers/video/{ => fbdev}/via/dvi.c | 0 + drivers/video/{ => fbdev}/via/dvi.h | 0 + drivers/video/{ => fbdev}/via/global.c | 0 + drivers/video/{ => fbdev}/via/global.h | 0 + drivers/video/{ => fbdev}/via/hw.c | 0 + drivers/video/{ => fbdev}/via/hw.h | 0 + drivers/video/{ => fbdev}/via/ioctl.c | 0 + drivers/video/{ => fbdev}/via/ioctl.h | 0 + drivers/video/{ => fbdev}/via/lcd.c | 0 + drivers/video/{ => fbdev}/via/lcd.h | 0 + drivers/video/{ => fbdev}/via/share.h | 0 + drivers/video/{ => fbdev}/via/tblDPASetting.c | 0 + drivers/video/{ => fbdev}/via/tblDPASetting.h | 0 + drivers/video/{ => fbdev}/via/via-core.c | 0 + drivers/video/{ => fbdev}/via/via-gpio.c | 0 + drivers/video/{ => fbdev}/via/via_aux.c | 0 + drivers/video/{ => fbdev}/via/via_aux.h | 0 + drivers/video/{ => fbdev}/via/via_aux_ch7301.c | 0 + drivers/video/{ => fbdev}/via/via_aux_edid.c | 0 + drivers/video/{ => fbdev}/via/via_aux_sii164.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1621.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1622.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1625.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1631.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1632.c | 0 + drivers/video/{ => fbdev}/via/via_aux_vt1636.c | 0 + drivers/video/{ => fbdev}/via/via_clock.c | 0 + drivers/video/{ => fbdev}/via/via_clock.h | 0 + drivers/video/{ => fbdev}/via/via_i2c.c | 0 + drivers/video/{ => fbdev}/via/via_modesetting.c | 0 + drivers/video/{ => fbdev}/via/via_modesetting.h | 0 + drivers/video/{ => fbdev}/via/via_utility.c | 0 + drivers/video/{ => fbdev}/via/via_utility.h | 0 + drivers/video/{ => fbdev}/via/viafbdev.c | 0 + drivers/video/{ => fbdev}/via/viafbdev.h | 0 + drivers/video/{ => fbdev}/via/viamode.c | 0 + drivers/video/{ => fbdev}/via/viamode.h | 0 + drivers/video/{ => fbdev}/via/vt1636.c | 0 + drivers/video/{ => fbdev}/via/vt1636.h | 0 + drivers/video/{ => fbdev}/vt8500lcdfb.c | 0 + drivers/video/{ => fbdev}/vt8500lcdfb.h | 0 + drivers/video/{ => fbdev}/vt8623fb.c | 0 + drivers/video/{ => fbdev}/w100fb.c | 0 + drivers/video/{ => fbdev}/w100fb.h | 0 + drivers/video/{ => fbdev}/wm8505fb.c | 0 + drivers/video/{ => fbdev}/wm8505fb_regs.h | 0 + drivers/video/{ => fbdev}/wmt_ge_rops.c | 2 +- + drivers/video/{ => fbdev}/wmt_ge_rops.h | 0 + drivers/video/{ => fbdev}/xen-fbfront.c | 0 + drivers/video/{ => fbdev}/xilinxfb.c | 0 + drivers/video/omap2/Kconfig | 10 - + 482 files changed, 2690 insertions(+), 2664 deletions(-) + rename drivers/video/{ => fbdev}/68328fb.c (100%) + create mode 100644 drivers/video/fbdev/Kconfig + create mode 100644 drivers/video/fbdev/Makefile + rename drivers/video/{ => fbdev}/acornfb.c (100%) + rename drivers/video/{ => fbdev}/acornfb.h (100%) + rename drivers/video/{ => fbdev}/amba-clcd.c (100%) + rename drivers/video/{ => fbdev}/amifb.c (100%) + rename drivers/video/{ => fbdev}/arcfb.c (100%) + rename drivers/video/{ => fbdev}/arkfb.c (100%) + rename drivers/video/{ => fbdev}/asiliantfb.c (100%) + rename drivers/video/{ => fbdev}/atafb.c (100%) + rename drivers/video/{ => fbdev}/atafb.h (100%) + rename drivers/video/{ => fbdev}/atafb_iplan2p2.c (100%) + rename drivers/video/{ => fbdev}/atafb_iplan2p4.c (100%) + rename drivers/video/{ => fbdev}/atafb_iplan2p8.c (100%) + rename drivers/video/{ => fbdev}/atafb_mfb.c (100%) + rename drivers/video/{ => fbdev}/atafb_utils.h (100%) + rename drivers/video/{ => fbdev}/atmel_lcdfb.c (100%) + rename drivers/video/{ => fbdev}/aty/Makefile (100%) + rename drivers/video/{ => fbdev}/aty/ati_ids.h (100%) + rename drivers/video/{ => fbdev}/aty/aty128fb.c (100%) + rename drivers/video/{ => fbdev}/aty/atyfb.h (100%) + rename drivers/video/{ => fbdev}/aty/atyfb_base.c (100%) + rename drivers/video/{ => fbdev}/aty/mach64_accel.c (100%) + rename drivers/video/{ => fbdev}/aty/mach64_ct.c (100%) + rename drivers/video/{ => fbdev}/aty/mach64_cursor.c (99%) + rename drivers/video/{ => fbdev}/aty/mach64_gx.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_accel.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_backlight.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_base.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_i2c.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_monitor.c (100%) + rename drivers/video/{ => fbdev}/aty/radeon_pm.c (100%) + rename drivers/video/{ => fbdev}/aty/radeonfb.h (100%) + rename drivers/video/{ => fbdev}/au1100fb.c (100%) + rename drivers/video/{ => fbdev}/au1100fb.h (100%) + rename drivers/video/{ => fbdev}/au1200fb.c (100%) + rename drivers/video/{ => fbdev}/au1200fb.h (100%) + rename drivers/video/{ => fbdev}/auo_k1900fb.c (100%) + rename drivers/video/{ => fbdev}/auo_k1901fb.c (100%) + rename drivers/video/{ => fbdev}/auo_k190x.c (100%) + rename drivers/video/{ => fbdev}/auo_k190x.h (100%) + rename drivers/video/{ => fbdev}/bf537-lq035.c (100%) + rename drivers/video/{ => fbdev}/bf54x-lq043fb.c (100%) + rename drivers/video/{ => fbdev}/bfin-lq035q1-fb.c (100%) + rename drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c (100%) + rename drivers/video/{ => fbdev}/bfin_adv7393fb.c (100%) + rename drivers/video/{ => fbdev}/bfin_adv7393fb.h (100%) + rename drivers/video/{ => fbdev}/broadsheetfb.c (100%) + rename drivers/video/{ => fbdev}/bt431.h (100%) + rename drivers/video/{ => fbdev}/bt455.h (100%) + rename drivers/video/{ => fbdev}/bw2.c (100%) + rename drivers/video/{ => fbdev}/c2p.h (100%) + rename drivers/video/{ => fbdev}/c2p_core.h (100%) + rename drivers/video/{ => fbdev}/c2p_iplan2.c (100%) + rename drivers/video/{ => fbdev}/c2p_planar.c (100%) + rename drivers/video/{ => fbdev}/carminefb.c (100%) + rename drivers/video/{ => fbdev}/carminefb.h (100%) + rename drivers/video/{ => fbdev}/carminefb_regs.h (100%) + rename drivers/video/{ => fbdev}/cg14.c (100%) + rename drivers/video/{ => fbdev}/cg3.c (100%) + rename drivers/video/{ => fbdev}/cg6.c (100%) + rename drivers/video/{ => fbdev}/chipsfb.c (100%) + rename drivers/video/{ => fbdev}/cirrusfb.c (100%) + rename drivers/video/{ => fbdev}/clps711xfb.c (100%) + rename drivers/video/{ => fbdev}/cobalt_lcdfb.c (100%) + rename drivers/video/{ => fbdev}/controlfb.c (100%) + rename drivers/video/{ => fbdev}/controlfb.h (100%) + create mode 100644 drivers/video/fbdev/core/Makefile + rename drivers/video/{ => fbdev/core}/cfbcopyarea.c (100%) + rename drivers/video/{ => fbdev/core}/cfbfillrect.c (100%) + rename drivers/video/{ => fbdev/core}/cfbimgblt.c (100%) + rename drivers/video/{ => fbdev/core}/fb_ddc.c (99%) + rename drivers/video/{ => fbdev/core}/fb_defio.c (100%) + rename drivers/video/{ => fbdev/core}/fb_draw.h (100%) + rename drivers/video/{ => fbdev/core}/fb_notify.c (100%) + rename drivers/video/{ => fbdev/core}/fb_sys_fops.c (100%) + rename drivers/video/{ => fbdev/core}/fbcmap.c (100%) + rename drivers/video/{ => fbdev/core}/fbcvt.c (100%) + rename drivers/video/{ => fbdev/core}/fbmem.c (100%) + rename drivers/video/{ => fbdev/core}/fbmon.c (99%) + rename drivers/video/{ => fbdev/core}/fbsysfs.c (100%) + rename drivers/video/{ => fbdev/core}/modedb.c (100%) + rename drivers/video/{ => fbdev/core}/svgalib.c (100%) + rename drivers/video/{ => fbdev/core}/syscopyarea.c (100%) + rename drivers/video/{ => fbdev/core}/sysfillrect.c (100%) + rename drivers/video/{ => fbdev/core}/sysimgblt.c (100%) + rename drivers/video/{ => fbdev}/cyber2000fb.c (100%) + rename drivers/video/{ => fbdev}/cyber2000fb.h (100%) + rename drivers/video/{ => fbdev}/da8xx-fb.c (100%) + rename drivers/video/{ => fbdev}/dnfb.c (100%) + rename drivers/video/{ => fbdev}/edid.h (100%) + rename drivers/video/{ => fbdev}/efifb.c (100%) + rename drivers/video/{ => fbdev}/ep93xx-fb.c (100%) + rename drivers/video/{ => fbdev}/exynos/Kconfig (100%) + rename drivers/video/{ => fbdev}/exynos/Makefile (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.c (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.h (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h (100%) + rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_regs.h (100%) + rename drivers/video/{ => fbdev}/exynos/s6e8ax0.c (100%) + rename drivers/video/{ => fbdev}/fb-puv3.c (100%) + rename drivers/video/{ => fbdev}/ffb.c (100%) + rename drivers/video/{ => fbdev}/fm2fb.c (100%) + rename drivers/video/{ => fbdev}/fsl-diu-fb.c (100%) + rename drivers/video/{ => fbdev}/g364fb.c (100%) + rename drivers/video/{ => fbdev}/gbefb.c (100%) + rename drivers/video/{ => fbdev}/geode/Kconfig (100%) + rename drivers/video/{ => fbdev}/geode/Makefile (100%) + rename drivers/video/{ => fbdev}/geode/display_gx.c (100%) + rename drivers/video/{ => fbdev}/geode/display_gx1.c (100%) + rename drivers/video/{ => fbdev}/geode/display_gx1.h (100%) + rename drivers/video/{ => fbdev}/geode/geodefb.h (100%) + rename drivers/video/{ => fbdev}/geode/gx1fb_core.c (100%) + rename drivers/video/{ => fbdev}/geode/gxfb.h (100%) + rename drivers/video/{ => fbdev}/geode/gxfb_core.c (100%) + rename drivers/video/{ => fbdev}/geode/lxfb.h (100%) + rename drivers/video/{ => fbdev}/geode/lxfb_core.c (100%) + rename drivers/video/{ => fbdev}/geode/lxfb_ops.c (100%) + rename drivers/video/{ => fbdev}/geode/suspend_gx.c (100%) + rename drivers/video/{ => fbdev}/geode/video_cs5530.c (100%) + rename drivers/video/{ => fbdev}/geode/video_cs5530.h (100%) + rename drivers/video/{ => fbdev}/geode/video_gx.c (100%) + rename drivers/video/{ => fbdev}/goldfishfb.c (100%) + rename drivers/video/{ => fbdev}/grvga.c (100%) + rename drivers/video/{ => fbdev}/gxt4500.c (100%) + rename drivers/video/{ => fbdev}/hecubafb.c (100%) + rename drivers/video/{ => fbdev}/hgafb.c (100%) + rename drivers/video/{ => fbdev}/hitfb.c (100%) + rename drivers/video/{ => fbdev}/hpfb.c (100%) + rename drivers/video/{ => fbdev}/hyperv_fb.c (100%) + rename drivers/video/{ => fbdev}/i740_reg.h (100%) + rename drivers/video/{ => fbdev}/i740fb.c (100%) + rename drivers/video/{ => fbdev}/i810/Makefile (100%) + rename drivers/video/{ => fbdev}/i810/i810-i2c.c (100%) + rename drivers/video/{ => fbdev}/i810/i810.h (100%) + rename drivers/video/{ => fbdev}/i810/i810_accel.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_dvt.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_gtf.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_main.c (100%) + rename drivers/video/{ => fbdev}/i810/i810_main.h (100%) + rename drivers/video/{ => fbdev}/i810/i810_regs.h (100%) + rename drivers/video/{ => fbdev}/igafb.c (100%) + rename drivers/video/{ => fbdev}/imsttfb.c (100%) + rename drivers/video/{ => fbdev}/imxfb.c (100%) + rename drivers/video/{ => fbdev}/intelfb/Makefile (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfb.h (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfbdrv.c (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfbhw.c (100%) + rename drivers/video/{ => fbdev}/intelfb/intelfbhw.h (100%) + rename drivers/video/{ => fbdev}/jz4740_fb.c (100%) + rename drivers/video/{ => fbdev}/kyro/Makefile (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000Interface.h (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000OverlayDevice.c (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000Reg.h (100%) + rename drivers/video/{ => fbdev}/kyro/STG4000VTG.c (100%) + rename drivers/video/{ => fbdev}/kyro/fbdev.c (100%) + rename drivers/video/{ => fbdev}/leo.c (100%) + rename drivers/video/{ => fbdev}/macfb.c (100%) + rename drivers/video/{ => fbdev}/macmodes.c (100%) + rename drivers/video/{ => fbdev}/macmodes.h (100%) + rename drivers/video/{ => fbdev}/matrox/Makefile (100%) + rename drivers/video/{ => fbdev}/matrox/g450_pll.c (100%) + rename drivers/video/{ => fbdev}/matrox/g450_pll.h (100%) + rename drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_base.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_base.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.h (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.c (100%) + rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.h (100%) + rename drivers/video/{ => fbdev}/maxinefb.c (100%) + rename drivers/video/{ => fbdev}/mb862xx/Makefile (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.c (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.h (100%) + rename drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c (100%) + rename drivers/video/{ => fbdev}/mbx/Makefile (100%) + rename drivers/video/{ => fbdev}/mbx/mbxdebugfs.c (100%) + rename drivers/video/{ => fbdev}/mbx/mbxfb.c (100%) + rename drivers/video/{ => fbdev}/mbx/reg_bits.h (100%) + rename drivers/video/{ => fbdev}/mbx/regs.h (100%) + rename drivers/video/{ => fbdev}/metronomefb.c (100%) + rename drivers/video/{ => fbdev}/mmp/Kconfig (61%) + rename drivers/video/{ => fbdev}/mmp/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/core.c (100%) + rename drivers/video/{ => fbdev}/mmp/fb/Kconfig (100%) + rename drivers/video/{ => fbdev}/mmp/fb/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.c (100%) + rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.h (100%) + rename drivers/video/{ => fbdev}/mmp/hw/Kconfig (100%) + rename drivers/video/{ => fbdev}/mmp/hw/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c (100%) + rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h (100%) + rename drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c (100%) + rename drivers/video/{ => fbdev}/mmp/panel/Kconfig (100%) + rename drivers/video/{ => fbdev}/mmp/panel/Makefile (100%) + rename drivers/video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c (100%) + rename drivers/video/{ => fbdev}/msm/Makefile (100%) + rename drivers/video/{ => fbdev}/msm/mddi.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_client_dummy.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_client_nt35399.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_client_toshiba.c (100%) + rename drivers/video/{ => fbdev}/msm/mddi_hw.h (100%) + rename drivers/video/{ => fbdev}/msm/mdp.c (100%) + rename drivers/video/{ => fbdev}/msm/mdp_csc_table.h (100%) + rename drivers/video/{ => fbdev}/msm/mdp_hw.h (100%) + rename drivers/video/{ => fbdev}/msm/mdp_ppp.c (100%) + rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.c (100%) + rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.h (100%) + rename drivers/video/{ => fbdev}/msm/msm_fb.c (100%) + rename drivers/video/{ => fbdev}/mx3fb.c (100%) + rename drivers/video/{ => fbdev}/mxsfb.c (100%) + rename drivers/video/{ => fbdev}/n411.c (100%) + rename drivers/video/{ => fbdev}/neofb.c (100%) + rename drivers/video/{ => fbdev}/nuc900fb.c (100%) + rename drivers/video/{ => fbdev}/nuc900fb.h (100%) + rename drivers/video/{ => fbdev}/nvidia/Makefile (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_accel.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_backlight.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_dma.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_hw.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_i2c.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_local.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_of.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_proto.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_setup.c (100%) + rename drivers/video/{ => fbdev}/nvidia/nv_type.h (100%) + rename drivers/video/{ => fbdev}/nvidia/nvidia.c (100%) + rename drivers/video/{ => fbdev}/ocfb.c (100%) + rename drivers/video/{ => fbdev}/offb.c (100%) + rename drivers/video/{ => fbdev}/omap/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap/Makefile (100%) + rename drivers/video/{ => fbdev}/omap/hwa742.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_ams_delta.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_h3.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_htcherald.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_inn1510.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_inn1610.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_mipid.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_osk.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_palmte.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_palmtt.c (100%) + rename drivers/video/{ => fbdev}/omap/lcd_palmz71.c (100%) + rename drivers/video/{ => fbdev}/omap/lcdc.c (100%) + rename drivers/video/{ => fbdev}/omap/lcdc.h (100%) + rename drivers/video/{ => fbdev}/omap/omapfb.h (100%) + rename drivers/video/{ => fbdev}/omap/omapfb_main.c (100%) + rename drivers/video/{ => fbdev}/omap/sossi.c (100%) + create mode 100644 drivers/video/fbdev/omap2/Kconfig + rename drivers/video/{ => fbdev}/omap2/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/connector-analog-tv.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/connector-dvi.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/connector-hdmi.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tfp410.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tpd12s015.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dpi.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dsi-cm.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-lgphilips-lb035q02.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-nec-nl8048hl11.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sharp-ls037v7dw01.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sony-acx565akm.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td028ttec1.c (100%) + rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td043mtea1.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap2/dss/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/dss/apply.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/core.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/display-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/display.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dpi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dsi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss-of.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss_features.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/dss_features.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi4.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/manager-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/manager.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/output.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/overlay-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/overlay.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/rfbi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/sdi.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/venc.c (100%) + rename drivers/video/{ => fbdev}/omap2/dss/venc_panel.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/Kconfig (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/Makefile (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-main.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c (100%) + rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h (100%) + rename drivers/video/{ => fbdev}/omap2/vrfb.c (100%) + rename drivers/video/{ => fbdev}/p9100.c (100%) + rename drivers/video/{ => fbdev}/platinumfb.c (100%) + rename drivers/video/{ => fbdev}/platinumfb.h (100%) + rename drivers/video/{ => fbdev}/pm2fb.c (100%) + rename drivers/video/{ => fbdev}/pm3fb.c (100%) + rename drivers/video/{ => fbdev}/pmag-aa-fb.c (100%) + rename drivers/video/{ => fbdev}/pmag-ba-fb.c (100%) + rename drivers/video/{ => fbdev}/pmagb-b-fb.c (100%) + rename drivers/video/{ => fbdev}/ps3fb.c (100%) + rename drivers/video/{ => fbdev}/pvr2fb.c (100%) + rename drivers/video/{ => fbdev}/pxa168fb.c (100%) + rename drivers/video/{ => fbdev}/pxa168fb.h (100%) + rename drivers/video/{ => fbdev}/pxa3xx-gcu.c (100%) + rename drivers/video/{ => fbdev}/pxa3xx-gcu.h (100%) + rename drivers/video/{ => fbdev}/pxafb.c (100%) + rename drivers/video/{ => fbdev}/pxafb.h (100%) + rename drivers/video/{ => fbdev}/q40fb.c (100%) + rename drivers/video/{ => fbdev}/riva/Makefile (100%) + rename drivers/video/{ => fbdev}/riva/fbdev.c (100%) + rename drivers/video/{ => fbdev}/riva/nv_driver.c (100%) + rename drivers/video/{ => fbdev}/riva/nv_type.h (100%) + rename drivers/video/{ => fbdev}/riva/nvreg.h (100%) + rename drivers/video/{ => fbdev}/riva/riva_hw.c (100%) + rename drivers/video/{ => fbdev}/riva/riva_hw.h (100%) + rename drivers/video/{ => fbdev}/riva/riva_tbl.h (100%) + rename drivers/video/{ => fbdev}/riva/rivafb-i2c.c (100%) + rename drivers/video/{ => fbdev}/riva/rivafb.h (100%) + rename drivers/video/{ => fbdev}/s1d13xxxfb.c (100%) + rename drivers/video/{ => fbdev}/s3c-fb.c (100%) + rename drivers/video/{ => fbdev}/s3c2410fb.c (100%) + rename drivers/video/{ => fbdev}/s3c2410fb.h (100%) + rename drivers/video/{ => fbdev}/s3fb.c (100%) + rename drivers/video/{ => fbdev}/sa1100fb.c (100%) + rename drivers/video/{ => fbdev}/sa1100fb.h (100%) + rename drivers/video/{ => fbdev}/savage/Makefile (100%) + rename drivers/video/{ => fbdev}/savage/savagefb-i2c.c (100%) + rename drivers/video/{ => fbdev}/savage/savagefb.h (100%) + rename drivers/video/{ => fbdev}/savage/savagefb_accel.c (100%) + rename drivers/video/{ => fbdev}/savage/savagefb_driver.c (100%) + rename drivers/video/{ => fbdev}/sbuslib.c (100%) + rename drivers/video/{ => fbdev}/sbuslib.h (100%) + rename drivers/video/{ => fbdev}/sh7760fb.c (100%) + rename drivers/video/{ => fbdev}/sh_mipi_dsi.c (100%) + rename drivers/video/{ => fbdev}/sh_mobile_hdmi.c (100%) + rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c (100%) + rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h (100%) + rename drivers/video/{ => fbdev}/sh_mobile_meram.c (100%) + rename drivers/video/{ => fbdev}/simplefb.c (100%) + rename drivers/video/{ => fbdev}/sis/300vtbl.h (100%) + rename drivers/video/{ => fbdev}/sis/310vtbl.h (100%) + rename drivers/video/{ => fbdev}/sis/Makefile (100%) + rename drivers/video/{ => fbdev}/sis/init.c (100%) + rename drivers/video/{ => fbdev}/sis/init.h (100%) + rename drivers/video/{ => fbdev}/sis/init301.c (100%) + rename drivers/video/{ => fbdev}/sis/init301.h (100%) + rename drivers/video/{ => fbdev}/sis/initdef.h (100%) + rename drivers/video/{ => fbdev}/sis/initextlfb.c (100%) + rename drivers/video/{ => fbdev}/sis/oem300.h (100%) + rename drivers/video/{ => fbdev}/sis/oem310.h (100%) + rename drivers/video/{ => fbdev}/sis/sis.h (100%) + rename drivers/video/{ => fbdev}/sis/sis_accel.c (100%) + rename drivers/video/{ => fbdev}/sis/sis_accel.h (100%) + rename drivers/video/{ => fbdev}/sis/sis_main.c (100%) + rename drivers/video/{ => fbdev}/sis/sis_main.h (100%) + rename drivers/video/{ => fbdev}/sis/vgatypes.h (100%) + rename drivers/video/{ => fbdev}/sis/vstruct.h (100%) + rename drivers/video/{ => fbdev}/skeletonfb.c (100%) + rename drivers/video/{ => fbdev}/sm501fb.c (100%) + rename drivers/video/{ => fbdev}/smscufx.c (100%) + rename drivers/video/{ => fbdev}/ssd1307fb.c (100%) + rename drivers/video/{ => fbdev}/sstfb.c (100%) + rename drivers/video/{ => fbdev}/sticore.h (100%) + rename drivers/video/{ => fbdev}/stifb.c (100%) + rename drivers/video/{ => fbdev}/sunxvr1000.c (100%) + rename drivers/video/{ => fbdev}/sunxvr2500.c (100%) + rename drivers/video/{ => fbdev}/sunxvr500.c (100%) + rename drivers/video/{ => fbdev}/tcx.c (100%) + rename drivers/video/{ => fbdev}/tdfxfb.c (100%) + rename drivers/video/{ => fbdev}/tgafb.c (100%) + rename drivers/video/{ => fbdev}/tmiofb.c (100%) + rename drivers/video/{ => fbdev}/tridentfb.c (100%) + rename drivers/video/{ => fbdev}/udlfb.c (100%) + rename drivers/video/{ => fbdev}/uvesafb.c (100%) + rename drivers/video/{ => fbdev}/valkyriefb.c (100%) + rename drivers/video/{ => fbdev}/valkyriefb.h (100%) + rename drivers/video/{ => fbdev}/vermilion/Makefile (100%) + rename drivers/video/{ => fbdev}/vermilion/cr_pll.c (100%) + rename drivers/video/{ => fbdev}/vermilion/vermilion.c (100%) + rename drivers/video/{ => fbdev}/vermilion/vermilion.h (100%) + rename drivers/video/{ => fbdev}/vesafb.c (100%) + rename drivers/video/{ => fbdev}/vfb.c (100%) + rename drivers/video/{ => fbdev}/vga16fb.c (100%) + rename drivers/video/{ => fbdev}/via/Makefile (100%) + rename drivers/video/{ => fbdev}/via/accel.c (100%) + rename drivers/video/{ => fbdev}/via/accel.h (100%) + rename drivers/video/{ => fbdev}/via/chip.h (100%) + rename drivers/video/{ => fbdev}/via/debug.h (100%) + rename drivers/video/{ => fbdev}/via/dvi.c (100%) + rename drivers/video/{ => fbdev}/via/dvi.h (100%) + rename drivers/video/{ => fbdev}/via/global.c (100%) + rename drivers/video/{ => fbdev}/via/global.h (100%) + rename drivers/video/{ => fbdev}/via/hw.c (100%) + rename drivers/video/{ => fbdev}/via/hw.h (100%) + rename drivers/video/{ => fbdev}/via/ioctl.c (100%) + rename drivers/video/{ => fbdev}/via/ioctl.h (100%) + rename drivers/video/{ => fbdev}/via/lcd.c (100%) + rename drivers/video/{ => fbdev}/via/lcd.h (100%) + rename drivers/video/{ => fbdev}/via/share.h (100%) + rename drivers/video/{ => fbdev}/via/tblDPASetting.c (100%) + rename drivers/video/{ => fbdev}/via/tblDPASetting.h (100%) + rename drivers/video/{ => fbdev}/via/via-core.c (100%) + rename drivers/video/{ => fbdev}/via/via-gpio.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux.h (100%) + rename drivers/video/{ => fbdev}/via/via_aux_ch7301.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_edid.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_sii164.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1621.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1622.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1625.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1631.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1632.c (100%) + rename drivers/video/{ => fbdev}/via/via_aux_vt1636.c (100%) + rename drivers/video/{ => fbdev}/via/via_clock.c (100%) + rename drivers/video/{ => fbdev}/via/via_clock.h (100%) + rename drivers/video/{ => fbdev}/via/via_i2c.c (100%) + rename drivers/video/{ => fbdev}/via/via_modesetting.c (100%) + rename drivers/video/{ => fbdev}/via/via_modesetting.h (100%) + rename drivers/video/{ => fbdev}/via/via_utility.c (100%) + rename drivers/video/{ => fbdev}/via/via_utility.h (100%) + rename drivers/video/{ => fbdev}/via/viafbdev.c (100%) + rename drivers/video/{ => fbdev}/via/viafbdev.h (100%) + rename drivers/video/{ => fbdev}/via/viamode.c (100%) + rename drivers/video/{ => fbdev}/via/viamode.h (100%) + rename drivers/video/{ => fbdev}/via/vt1636.c (100%) + rename drivers/video/{ => fbdev}/via/vt1636.h (100%) + rename drivers/video/{ => fbdev}/vt8500lcdfb.c (100%) + rename drivers/video/{ => fbdev}/vt8500lcdfb.h (100%) + rename drivers/video/{ => fbdev}/vt8623fb.c (100%) + rename drivers/video/{ => fbdev}/w100fb.c (100%) + rename drivers/video/{ => fbdev}/w100fb.h (100%) + rename drivers/video/{ => fbdev}/wm8505fb.c (100%) + rename drivers/video/{ => fbdev}/wm8505fb_regs.h (100%) + rename drivers/video/{ => fbdev}/wmt_ge_rops.c (99%) + rename drivers/video/{ => fbdev}/wmt_ge_rops.h (100%) + rename drivers/video/{ => fbdev}/xen-fbfront.c (100%) + rename drivers/video/{ => fbdev}/xilinxfb.c (100%) + delete mode 100644 drivers/video/omap2/Kconfig +$ git am -3 ../patches/0001-video-fbdev-fix-up-fro-removal-of-SGI-Visual-Worksta.patch +Applying: video: fbdev: fix up fro removal of SGI Visual Workstation +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/video/fbdev/Kconfig +M drivers/video/fbdev/Makefile +$ git add -A . +$ git commit -v -a --amend +[master 32f6851ad421] Merge remote-tracking branch 'omap_dss2/for-next' +Merging regulator/for-next (ecf0b537f0dd Merge remote-tracking branches 'regulator/fix/s2m' and 'regulator/fix/s5m8767' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/s2mpa01.c | 12 +++++------- + drivers/regulator/s2mps11.c | 12 +++++------- + drivers/regulator/s5m8767.c | 1 + + 3 files changed, 11 insertions(+), 14 deletions(-) +Merging security/next (f64410ec6654 selinux: correctly label /proc inodes in use before the policy is loaded) +$ git merge security/next +Already up-to-date. +Merging selinux/next (eee3094683fb selinux: correctly label /proc inodes in use before the policy is loaded) +$ git merge selinux/next +Merge made by the 'recursive' strategy. +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (fa62c102a75e watchdog: Fix Elan SC520 dependencies) +$ git merge watchdog/master +Resolved 'drivers/watchdog/Kconfig' using previous resolution. +Resolved 'drivers/watchdog/orion_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/orion_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/orion_wdt.c +Auto-merging drivers/watchdog/Kconfig +CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3705a55e602c] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. +Merging iommu/next (e172b8122254 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and 'x86/vt-d' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (7713ec066ae8 iommu/vt-d: Fix error handling in ANDD processing) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (f1f6630b53e7 MAINTAINERS: Update email address for bhalevy) +$ git merge osd/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + fs/exofs/ore_raid.c | 4 ++-- + fs/exofs/super.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (c800bcd5f53f sparse: fix comment) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/master (e231d54c1239 kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c) +$ git merge audit/master +Resolved 'arch/mips/include/asm/syscall.h' using previous resolution. +Resolved 'arch/mips/kernel/ptrace.c' using previous resolution. +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'init/Kconfig' using previous resolution. +Resolved 'kernel/audit.c' using previous resolution. +Resolved 'kernel/seccomp.c' using previous resolution. +Auto-merging security/integrity/integrity_audit.c +Auto-merging mm/util.c +Auto-merging lib/Makefile +Auto-merging kernel/seccomp.c +CONFLICT (content): Merge conflict in kernel/seccomp.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/auditfilter.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/audit.h +Auto-merging fs/proc/base.c +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c +Auto-merging arch/mips/include/asm/syscall.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/alpha/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9599ae24cb44] Merge remote-tracking branch 'audit/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/syscall.h | 5 +- + arch/ia64/Kconfig | 1 + + arch/mips/include/asm/syscall.h | 7 +- + arch/mips/kernel/ptrace.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/syscall.h | 7 +- + arch/sh/Kconfig | 1 + + arch/sparc/Kconfig | 1 + + arch/um/Kconfig.common | 1 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/syscall.h | 10 ++- + drivers/tty/tty_audit.c | 3 +- + fs/proc/base.c | 36 +--------- + include/asm-generic/syscall.h | 4 +- + include/linux/audit.h | 8 +++ + include/linux/mm.h | 1 + + include/linux/sched.h | 20 +++++- + include/uapi/linux/audit.h | 7 ++ + include/uapi/linux/capability.h | 4 ++ + init/Kconfig | 5 +- + kernel/audit.c | 27 ++++--- + kernel/audit.h | 6 ++ + kernel/auditfilter.c | 29 ++++++-- + kernel/auditsc.c | 133 ++++++++++++++++++++++++++--------- + kernel/seccomp.c | 4 +- + lib/Kconfig | 9 +++ + lib/Makefile | 1 + + lib/audit.c | 15 +++- + lib/compat_audit.c | 50 +++++++++++++ + mm/util.c | 48 +++++++++++++ + security/integrity/integrity_audit.c | 2 +- + security/lsm_audit.c | 11 +-- + 36 files changed, 348 insertions(+), 116 deletions(-) + create mode 100644 lib/compat_audit.c +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (d88cf7d7b424 Merge remote-tracking branch 'robh/for-next' into devicetree/next) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (6f976267da0e of: add missing major vendors) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (577d0b6ca192 Merge remote-tracking branches 'spi/fix/complete' and 'spi/fix/omap2-mcspi' into spi-linus) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-txx9.c +Auto-merging drivers/spi/spi-omap2-mcspi.c +Auto-merging drivers/spi/spi-mpc52xx.c +Auto-merging drivers/spi/spi-mpc52xx-psc.c +Auto-merging drivers/spi/spi-mpc512x-psc.c +Auto-merging drivers/spi/spi-fsl-spi.c +Auto-merging drivers/spi/spi-fsl-espi.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-fsl-espi.c | 3 ++- + drivers/spi/spi-fsl-spi.c | 3 ++- + drivers/spi/spi-mpc512x-psc.c | 3 ++- + drivers/spi/spi-mpc52xx-psc.c | 3 ++- + drivers/spi/spi-mpc52xx.c | 6 ++++-- + drivers/spi/spi-omap2-mcspi.c | 26 +++++++++----------------- + drivers/spi/spi-sh.c | 6 ++++-- + drivers/spi/spi-txx9.c | 3 ++- + 8 files changed, 27 insertions(+), 26 deletions(-) +Merging tip/auto-latest (309ba7457356 Merge branch 'x86/x32') +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/early-quirks.c' using previous resolution. +Auto-merging arch/x86/kernel/early-quirks.c +CONFLICT (content): Merge conflict in arch/x86/kernel/early-quirks.c +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 687c81ff4536] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 5 +- + arch/x86/include/asm/iosf_mbi.h | 33 ++++++ + arch/x86/kernel/early-quirks.c | 211 +++++++++++++++++++++++++++++++++------ + arch/x86/kernel/iosf_mbi.c | 6 ++ + arch/x86/kernel/pci-calgary_64.c | 31 +++--- + include/drm/i915_drm.h | 20 ++++ + 6 files changed, 263 insertions(+), 43 deletions(-) +Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct: silence a static checker warning) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into for-next) +$ git merge edac-amd/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (3862807880ac tracing: Add BUG_ON when stack end location is over written) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (765a3f4fed70 rcu: Provide grace-period piggybacking API) +$ git merge rcu/rcu/next +Already up-to-date. +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (7cbb39d4d4d5 Merge tag 'kvm-3.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) +$ git merge kvm-arm/kvm-arm-next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (7227fc066660 Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (0a25e113b480 Merge branch 'devel/for-linus-3.15' into linux-next) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/xen-acpi-processor.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging percpu/for-next (21ddfd38ee9a percpu: renew the max_contig if we merge the head and previous block) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (c4b75dadde82 Merge branch 'for-3.15' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (d17a5ee12973 Add WMI driver for controlling AlienFX features on some Alienware products) +$ git merge drivers-x86/linux-next +Removing drivers/platform/x86/intel_baytrail.h +Removing drivers/platform/x86/intel_baytrail.c +Merge made by the 'recursive' strategy. + drivers/char/Kconfig | 2 +- + drivers/platform/x86/Kconfig | 22 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/alienware-wmi.c | 557 ++++++++++++++++++++++++++++ + drivers/platform/x86/fujitsu-tablet.c | 65 ++++ + drivers/platform/x86/intel_baytrail.c | 224 ----------- + drivers/platform/x86/intel_baytrail.h | 90 ----- + drivers/platform/x86/panasonic-laptop.c | 11 + + drivers/platform/x86/sony-laptop.c | 539 ++++++++++++++++++++++++--- + drivers/platform/x86/thinkpad_acpi.c | 227 +++++++++--- + drivers/platform/x86/toshiba_acpi.c | 635 +++++++++++++++++++++++++++++--- + 11 files changed, 1893 insertions(+), 481 deletions(-) + create mode 100644 drivers/platform/x86/alienware-wmi.c + delete mode 100644 drivers/platform/x86/intel_baytrail.c + delete mode 100644 drivers/platform/x86/intel_baytrail.h +Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (64ca15fdcaa9 Merge remote-tracking branch 'regmap/fix/nodev' into regmap-linus) +$ git merge regmap/for-next +Auto-merging drivers/base/regmap/regmap.c +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (0016db26c093 leds: clevo-mail: Make probe function __init) +$ git merge leds/for-next +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-gpio.txt | 12 ++ + Documentation/devicetree/bindings/mfd/mc13xxx.txt | 47 +++++ + drivers/leds/Kconfig | 4 +- + drivers/leds/led-core.c | 6 +- + drivers/leds/led-triggers.c | 1 - + drivers/leds/leds-88pm860x.c | 1 - + drivers/leds/leds-adp5520.c | 1 - + drivers/leds/leds-asic3.c | 1 - + drivers/leds/leds-blinkm.c | 3 +- + drivers/leds/leds-clevo-mail.c | 5 +- + drivers/leds/leds-cobalt-qube.c | 1 - + drivers/leds/leds-da903x.c | 1 - + drivers/leds/leds-da9052.c | 1 - + drivers/leds/leds-fsg.c | 1 - + drivers/leds/leds-gpio.c | 6 +- + drivers/leds/leds-hp6xx.c | 1 - + drivers/leds/leds-lm3533.c | 1 - + drivers/leds/leds-lp5521.c | 1 - + drivers/leds/leds-lp5523.c | 1 - + drivers/leds/leds-lp5562.c | 7 +- + drivers/leds/leds-lt3593.c | 1 - + drivers/leds/leds-mc13783.c | 223 ++++++++++++++------- + drivers/leds/leds-netxbig.c | 1 - + drivers/leds/leds-ns2.c | 1 - + drivers/leds/leds-ot200.c | 1 - + drivers/leds/leds-pwm.c | 1 - + drivers/leds/leds-s3c24xx.c | 1 - + drivers/leds/leds-ss4200.c | 4 +- + drivers/leds/leds-wm831x-status.c | 1 - + drivers/leds/leds-wm8350.c | 1 - + drivers/leds/trigger/ledtrig-cpu.c | 24 +++ + include/linux/mfd/mc13xxx.h | 6 + + include/linux/platform_data/leds-s3c24xx.h | 9 +- + 33 files changed, 258 insertions(+), 118 deletions(-) +Merging driver-core/driver-core-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (4b76e14d95f7 phy: ti-pipe3: Add SATA compatible to Documentation binding) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (dda26427bd52 staging: rtl8723au: The 8723 only has two paths) +$ git merge staging/staging-next +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/rtl8723au/Kconfig | 38 + + drivers/staging/rtl8723au/Makefile | 58 + + drivers/staging/rtl8723au/TODO | 13 + + drivers/staging/rtl8723au/core/rtw_ap.c | 2087 ++++ + drivers/staging/rtl8723au/core/rtw_cmd.c | 1876 +++ + drivers/staging/rtl8723au/core/rtw_efuse.c | 716 ++ + drivers/staging/rtl8723au/core/rtw_ieee80211.c | 1861 +++ + drivers/staging/rtl8723au/core/rtw_io.c | 266 + + drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 601 + + drivers/staging/rtl8723au/core/rtw_led.c | 1899 ++++ + drivers/staging/rtl8723au/core/rtw_mlme.c | 2500 ++++ + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 9990 ++++++++++++++++ + drivers/staging/rtl8723au/core/rtw_p2p.c | 4001 +++++++ + drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 689 ++ + drivers/staging/rtl8723au/core/rtw_recv.c | 2471 ++++ + drivers/staging/rtl8723au/core/rtw_security.c | 1652 +++ + drivers/staging/rtl8723au/core/rtw_sreset.c | 255 + + drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 509 + + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 1760 +++ + drivers/staging/rtl8723au/core/rtw_xmit.c | 2460 ++++ + drivers/staging/rtl8723au/hal/Hal8723PwrSeq.c | 80 + + drivers/staging/rtl8723au/hal/Hal8723UHWImg_CE.c | 136 + + .../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 1063 ++ + drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c | 726 ++ + drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c | 188 + + drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c | 259 + + drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 163 + + drivers/staging/rtl8723au/hal/hal_com.c | 881 ++ + drivers/staging/rtl8723au/hal/hal_intf.c | 420 + + drivers/staging/rtl8723au/hal/odm.c | 2090 ++++ + drivers/staging/rtl8723au/hal/odm_HWConfig.c | 481 + + drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c | 162 + + drivers/staging/rtl8723au/hal/odm_debug.c | 24 + + drivers/staging/rtl8723au/hal/odm_interface.c | 236 + + .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 11304 +++++++++++++++++++ + drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 845 ++ + drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 273 + + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 3452 ++++++ + drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 1162 ++ + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 507 + + drivers/staging/rtl8723au/hal/rtl8723a_rxdesc.c | 69 + + drivers/staging/rtl8723au/hal/rtl8723a_sreset.c | 73 + + drivers/staging/rtl8723au/hal/rtl8723a_xmit.c | 52 + + drivers/staging/rtl8723au/hal/rtl8723au_led.c | 113 + + drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 247 + + drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 548 + + drivers/staging/rtl8723au/hal/usb_halinit.c | 1834 +++ + drivers/staging/rtl8723au/hal/usb_ops_linux.c | 848 ++ + drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 230 + + drivers/staging/rtl8723au/include/Hal8723APhyReg.h | 1078 ++ + drivers/staging/rtl8723au/include/Hal8723PwrSeq.h | 150 + + .../staging/rtl8723au/include/Hal8723UHWImg_CE.h | 29 + + .../staging/rtl8723au/include/HalDMOutSrc8723A.h | 64 + + .../staging/rtl8723au/include/HalHWImg8723A_BB.h | 44 + + .../staging/rtl8723au/include/HalHWImg8723A_FW.h | 28 + + .../staging/rtl8723au/include/HalHWImg8723A_MAC.h | 26 + + .../staging/rtl8723au/include/HalHWImg8723A_RF.h | 25 + + drivers/staging/rtl8723au/include/HalPwrSeqCmd.h | 130 + + drivers/staging/rtl8723au/include/HalVerDef.h | 136 + + drivers/staging/rtl8723au/include/cmd_osdep.h | 26 + + drivers/staging/rtl8723au/include/drv_types.h | 360 + + drivers/staging/rtl8723au/include/ethernet.h | 22 + + drivers/staging/rtl8723au/include/hal_com.h | 211 + + drivers/staging/rtl8723au/include/hal_intf.h | 392 + + drivers/staging/rtl8723au/include/ieee80211.h | 603 + + drivers/staging/rtl8723au/include/ioctl_cfg80211.h | 119 + + drivers/staging/rtl8723au/include/mlme_osdep.h | 28 + + drivers/staging/rtl8723au/include/mp_custom_oid.h | 342 + + drivers/staging/rtl8723au/include/odm.h | 1205 ++ + drivers/staging/rtl8723au/include/odm_HWConfig.h | 174 + + .../staging/rtl8723au/include/odm_RegConfig8723A.h | 34 + + .../staging/rtl8723au/include/odm_RegDefine11AC.h | 49 + + .../staging/rtl8723au/include/odm_RegDefine11N.h | 165 + + drivers/staging/rtl8723au/include/odm_debug.h | 139 + + drivers/staging/rtl8723au/include/odm_interface.h | 131 + + drivers/staging/rtl8723au/include/odm_precomp.h | 54 + + drivers/staging/rtl8723au/include/odm_reg.h | 114 + + drivers/staging/rtl8723au/include/odm_types.h | 36 + + drivers/staging/rtl8723au/include/osdep_intf.h | 46 + + drivers/staging/rtl8723au/include/osdep_service.h | 207 + + drivers/staging/rtl8723au/include/recv_osdep.h | 45 + + .../rtl8723au/include/rtl8723a_bt-coexist.h | 1672 +++ + drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 160 + + drivers/staging/rtl8723au/include/rtl8723a_dm.h | 144 + + drivers/staging/rtl8723au/include/rtl8723a_hal.h | 575 + + drivers/staging/rtl8723au/include/rtl8723a_led.h | 30 + + drivers/staging/rtl8723au/include/rtl8723a_pg.h | 98 + + drivers/staging/rtl8723au/include/rtl8723a_recv.h | 70 + + drivers/staging/rtl8723au/include/rtl8723a_rf.h | 58 + + drivers/staging/rtl8723au/include/rtl8723a_spec.h | 2158 ++++ + .../staging/rtl8723au/include/rtl8723a_sreset.h | 25 + + drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 229 + + drivers/staging/rtl8723au/include/rtw_ap.h | 55 + + drivers/staging/rtl8723au/include/rtw_cmd.h | 835 ++ + drivers/staging/rtl8723au/include/rtw_debug.h | 192 + + drivers/staging/rtl8723au/include/rtw_eeprom.h | 135 + + drivers/staging/rtl8723au/include/rtw_efuse.h | 109 + + drivers/staging/rtl8723au/include/rtw_event.h | 114 + + drivers/staging/rtl8723au/include/rtw_ht.h | 43 + + drivers/staging/rtl8723au/include/rtw_io.h | 416 + + drivers/staging/rtl8723au/include/rtw_ioctl.h | 26 + + drivers/staging/rtl8723au/include/rtw_ioctl_set.h | 39 + + drivers/staging/rtl8723au/include/rtw_led.h | 181 + + drivers/staging/rtl8723au/include/rtw_mlme.h | 624 + + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 780 ++ + drivers/staging/rtl8723au/include/rtw_p2p.h | 158 + + drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 265 + + drivers/staging/rtl8723au/include/rtw_qos.h | 26 + + drivers/staging/rtl8723au/include/rtw_recv.h | 318 + + drivers/staging/rtl8723au/include/rtw_rf.h | 113 + + drivers/staging/rtl8723au/include/rtw_security.h | 357 + + drivers/staging/rtl8723au/include/rtw_sreset.h | 56 + + drivers/staging/rtl8723au/include/rtw_version.h | 1 + + drivers/staging/rtl8723au/include/rtw_xmit.h | 407 + + drivers/staging/rtl8723au/include/sta_info.h | 385 + + drivers/staging/rtl8723au/include/usb_hal.h | 20 + + drivers/staging/rtl8723au/include/usb_ops.h | 97 + + drivers/staging/rtl8723au/include/usb_ops_linux.h | 46 + + drivers/staging/rtl8723au/include/usb_osintf.h | 24 + + drivers/staging/rtl8723au/include/usb_vendor_req.h | 31 + + drivers/staging/rtl8723au/include/wifi.h | 707 ++ + drivers/staging/rtl8723au/include/wlan_bssdef.h | 215 + + drivers/staging/rtl8723au/include/xmit_osdep.h | 57 + + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 4532 ++++++++ + drivers/staging/rtl8723au/os_dep/mlme_linux.c | 187 + + drivers/staging/rtl8723au/os_dep/os_intfs.c | 970 ++ + drivers/staging/rtl8723au/os_dep/osdep_service.c | 175 + + drivers/staging/rtl8723au/os_dep/recv_linux.c | 225 + + drivers/staging/rtl8723au/os_dep/usb_intf.c | 833 ++ + drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 283 + + drivers/staging/rtl8723au/os_dep/xmit_linux.c | 195 + + drivers/staging/unisys/Kconfig | 2 +- + drivers/staging/unisys/visorchipset/filexfer.c | 2 +- + .../unisys/visorchipset/visorchipset_main.c | 18 + + 136 files changed, 89854 insertions(+), 2 deletions(-) + create mode 100644 drivers/staging/rtl8723au/Kconfig + create mode 100644 drivers/staging/rtl8723au/Makefile + create mode 100644 drivers/staging/rtl8723au/TODO + create mode 100644 drivers/staging/rtl8723au/core/rtw_ap.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_cmd.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_efuse.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_ieee80211.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_io.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_ioctl_set.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_led.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_mlme.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_mlme_ext.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_p2p.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_pwrctrl.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_recv.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_security.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_sreset.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_sta_mgt.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_wlan_util.c + create mode 100644 drivers/staging/rtl8723au/core/rtw_xmit.c + create mode 100644 drivers/staging/rtl8723au/hal/Hal8723PwrSeq.c + create mode 100644 drivers/staging/rtl8723au/hal/Hal8723UHWImg_CE.c + create mode 100644 drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c + create mode 100644 drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c + create mode 100644 drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c + create mode 100644 drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c + create mode 100644 drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c + create mode 100644 drivers/staging/rtl8723au/hal/hal_com.c + create mode 100644 drivers/staging/rtl8723au/hal/hal_intf.c + create mode 100644 drivers/staging/rtl8723au/hal/odm.c + create mode 100644 drivers/staging/rtl8723au/hal/odm_HWConfig.c + create mode 100644 drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c + create mode 100644 drivers/staging/rtl8723au/hal/odm_debug.c + create mode 100644 drivers/staging/rtl8723au/hal/odm_interface.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_dm.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_rxdesc.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_sreset.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723a_xmit.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723au_led.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723au_recv.c + create mode 100644 drivers/staging/rtl8723au/hal/rtl8723au_xmit.c + create mode 100644 drivers/staging/rtl8723au/hal/usb_halinit.c + create mode 100644 drivers/staging/rtl8723au/hal/usb_ops_linux.c + create mode 100644 drivers/staging/rtl8723au/include/Hal8723APhyCfg.h + create mode 100644 drivers/staging/rtl8723au/include/Hal8723APhyReg.h + create mode 100644 drivers/staging/rtl8723au/include/Hal8723PwrSeq.h + create mode 100644 drivers/staging/rtl8723au/include/Hal8723UHWImg_CE.h + create mode 100644 drivers/staging/rtl8723au/include/HalDMOutSrc8723A.h + create mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_BB.h + create mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_FW.h + create mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_MAC.h + create mode 100644 drivers/staging/rtl8723au/include/HalHWImg8723A_RF.h + create mode 100644 drivers/staging/rtl8723au/include/HalPwrSeqCmd.h + create mode 100644 drivers/staging/rtl8723au/include/HalVerDef.h + create mode 100644 drivers/staging/rtl8723au/include/cmd_osdep.h + create mode 100644 drivers/staging/rtl8723au/include/drv_types.h + create mode 100644 drivers/staging/rtl8723au/include/ethernet.h + create mode 100644 drivers/staging/rtl8723au/include/hal_com.h + create mode 100644 drivers/staging/rtl8723au/include/hal_intf.h + create mode 100644 drivers/staging/rtl8723au/include/ieee80211.h + create mode 100644 drivers/staging/rtl8723au/include/ioctl_cfg80211.h + create mode 100644 drivers/staging/rtl8723au/include/mlme_osdep.h + create mode 100644 drivers/staging/rtl8723au/include/mp_custom_oid.h + create mode 100644 drivers/staging/rtl8723au/include/odm.h + create mode 100644 drivers/staging/rtl8723au/include/odm_HWConfig.h + create mode 100644 drivers/staging/rtl8723au/include/odm_RegConfig8723A.h + create mode 100644 drivers/staging/rtl8723au/include/odm_RegDefine11AC.h + create mode 100644 drivers/staging/rtl8723au/include/odm_RegDefine11N.h + create mode 100644 drivers/staging/rtl8723au/include/odm_debug.h + create mode 100644 drivers/staging/rtl8723au/include/odm_interface.h + create mode 100644 drivers/staging/rtl8723au/include/odm_precomp.h + create mode 100644 drivers/staging/rtl8723au/include/odm_reg.h + create mode 100644 drivers/staging/rtl8723au/include/odm_types.h + create mode 100644 drivers/staging/rtl8723au/include/osdep_intf.h + create mode 100644 drivers/staging/rtl8723au/include/osdep_service.h + create mode 100644 drivers/staging/rtl8723au/include/recv_osdep.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_cmd.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_dm.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_hal.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_led.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_pg.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_recv.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_rf.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_spec.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_sreset.h + create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_xmit.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_ap.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_cmd.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_debug.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_eeprom.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_efuse.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_event.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_ht.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_io.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl_set.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_led.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_mlme.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_mlme_ext.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_p2p.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_pwrctrl.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_qos.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_recv.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_rf.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_security.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_sreset.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_version.h + create mode 100644 drivers/staging/rtl8723au/include/rtw_xmit.h + create mode 100644 drivers/staging/rtl8723au/include/sta_info.h + create mode 100644 drivers/staging/rtl8723au/include/usb_hal.h + create mode 100644 drivers/staging/rtl8723au/include/usb_ops.h + create mode 100644 drivers/staging/rtl8723au/include/usb_ops_linux.h + create mode 100644 drivers/staging/rtl8723au/include/usb_osintf.h + create mode 100644 drivers/staging/rtl8723au/include/usb_vendor_req.h + create mode 100644 drivers/staging/rtl8723au/include/wifi.h + create mode 100644 drivers/staging/rtl8723au/include/wlan_bssdef.h + create mode 100644 drivers/staging/rtl8723au/include/xmit_osdep.h + create mode 100644 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c + create mode 100644 drivers/staging/rtl8723au/os_dep/mlme_linux.c + create mode 100644 drivers/staging/rtl8723au/os_dep/os_intfs.c + create mode 100644 drivers/staging/rtl8723au/os_dep/osdep_service.c + create mode 100644 drivers/staging/rtl8723au/os_dep/recv_linux.c + create mode 100644 drivers/staging/rtl8723au/os_dep/usb_intf.c + create mode 100644 drivers/staging/rtl8723au/os_dep/usb_ops_linux.c + create mode 100644 drivers/staging/rtl8723au/os_dep/xmit_linux.c +Merging char-misc/char-misc-next (b33ce4429938 Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (49957f8e2a43 cgroup: newly created dirs and files should be owned by the creator) +$ git merge cgroup/for-next +Already up-to-date. +Merging scsi/for-next (b2bff6ceb61a [SCSI] sd: Quiesce mode sense error messages) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (17411c8da356 target: Enable READ_STRIP emulation in target_complete_ok_work) +$ git merge target-updates/for-next +Auto-merging drivers/usb/gadget/tcm_usb_gadget.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 828 +++++++++++++++++++++------ + drivers/infiniband/ulp/isert/ib_isert.h | 38 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 11 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 18 +- + drivers/target/iscsi/iscsi_target.c | 33 +- + drivers/target/iscsi/iscsi_target_configfs.c | 14 + + drivers/target/iscsi/iscsi_target_core.h | 5 +- + drivers/target/iscsi/iscsi_target_login.c | 4 +- + drivers/target/iscsi/iscsi_target_tpg.c | 21 + + drivers/target/iscsi/iscsi_target_tpg.h | 1 + + drivers/target/iscsi/iscsi_target_util.c | 4 +- + drivers/target/iscsi/iscsi_target_util.h | 1 + + drivers/target/loopback/tcm_loop.c | 12 +- + drivers/target/sbp/sbp_target.c | 8 +- + drivers/target/target_core_alua.c | 95 ++- + drivers/target/target_core_configfs.c | 4 + + drivers/target/target_core_file.c | 40 +- + drivers/target/target_core_iblock.c | 5 +- + drivers/target/target_core_rd.c | 14 +- + drivers/target/target_core_sbc.c | 178 +++++- + drivers/target/target_core_spc.c | 49 +- + drivers/target/target_core_tmr.c | 18 +- + drivers/target/target_core_transport.c | 94 ++- + drivers/target/tcm_fc/tcm_fc.h | 1 + + drivers/target/tcm_fc/tfc_cmd.c | 5 + + drivers/target/tcm_fc/tfc_conf.c | 1 + + drivers/target/tcm_fc/tfc_sess.c | 3 +- + drivers/usb/gadget/tcm_usb_gadget.c | 8 +- + drivers/vhost/scsi.c | 9 +- + include/target/iscsi/iscsi_transport.h | 2 + + include/target/target_core_backend.h | 2 + + include/target/target_core_base.h | 33 +- + include/target/target_core_fabric.h | 6 +- + 33 files changed, 1181 insertions(+), 384 deletions(-) +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (69c0f2a16ab4 pinctrl: rockchip: handle first half of rk3188-bank0 correctly) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-rockchip.c | 48 +++++++++++++++++++++++++++++++------- + 1 file changed, 40 insertions(+), 8 deletions(-) +Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/da8xx_remoteproc.c | 16 +--------------- + drivers/remoteproc/ste_modem_rproc.c | 4 ++-- + 2 files changed, 3 insertions(+), 17 deletions(-) +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (b22978fc33de gpio: rcar: Add helper variable dev = &pdev->dev) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (68efd7d2fb32 arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (2ae69a460413 pwm: pxa: Constify OF match table) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (d211f177b28e audit: Update kdoc for audit_send_reply and audit_list_rules_send) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (62183dcac539 ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (e44df332f30b clk: shmobile: fix setting paretn clock rate) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (7b878d4b48c4 random: Add arch_has_random[_seed]()) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) +$ git merge arm64-hugepages/for-next/hugepages +Already up-to-date. +Merging aio/master (fa8a53c39f3f aio: v4 ensure access to ctx->ring_pages is correctly serialised for migration) +$ git merge aio/master +Merge made by the 'recursive' strategy. + fs/aio.c | 120 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 67 insertions(+), 53 deletions(-) +Merging llvmlinux/for-next (fbc151c073f4 x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id") +$ git merge llvmlinux/for-next +Auto-merging scripts/Makefile.build +Auto-merging include/linux/mod_devicetable.h +Auto-merging arch/x86/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/dontdiff | 3 +++ + Makefile | 30 +++++++++++++++++++++++++++++- + arch/x86/Makefile | 2 +- + include/asm-generic/cmpxchg-local.h | 3 ++- + include/linux/compiler-clang.h | 12 ++++++++++++ + include/linux/compiler.h | 7 +++++++ + include/linux/mod_devicetable.h | 5 +++++ + scripts/Makefile.build | 12 +++++++++++- + scripts/mkcompile_h | 2 +- + 9 files changed, 71 insertions(+), 5 deletions(-) + create mode 100644 include/linux/compiler-clang.h +Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) +$ git merge powernv-cpuidle/powernv-cpuidle +Already up-to-date. +Merging rd-docs/master (dc5ed40686a4 Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge rd-docs/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..b6db3a06f0fc --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,6 @@ +Importing jdelvare-hwmon based on 3.14 + quilt series is empty +$ git branch -f jdelvare-hwmon/master 455c6fdbd219161bd09b1165f11699d6d73de11c +Importing rd-docs based on origin/master + quilt series is empty +$ git branch -f rd-docs/master dc5ed40686a4da95881c35d913b60f867755cbe2 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6fc32583c665 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140408 |