remarkable-linux/arch/arm/mach-shmobile
Dave Airlie 8337486a8f Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next
Commit "drm/rcar-du: Use struct videomode in platform data" touches board code
in arch/arm/mach-shmobile. There is, to the best of my knowledge, no risk of
conflict for v3.18. Simon, are you fine with getting those changes merged
through Dave's tree (and could you confirm that no conflict should occur) ?

Simon acked the merge:
Acked-by: Simon Horman <horms+renesas@verge.net.au>

* 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev:
  drm/rcar-du: Add OF support
  drm/rcar-du: Use struct videomode in platform data
  video: Add DT bindings for the R-Car Display Unit
  video: Add THC63LVDM83D DT bindings documentation
  video: Add ADV7123 DT bindings documentation
  video: Add DT binding documentation for VGA connector
  devicetree: Add vendor prefix "thine" to vendor-prefixes.txt
  devicetree: Add vendor prefix "mitsubishi" to vendor-prefixes.txt
  drm/shmob: Update copyright notice
  drm/rcar-du: Update copyright notice
2014-09-18 21:53:47 +10:00
..
include/mach Second Round of Renesas ARM Based SoC Updates for v3.17 2014-07-12 09:44:52 -07:00
board-ape6evm-reference.c ARM: shmobile: Move r8a73a4.h 2014-06-25 16:47:51 +09:00
board-ape6evm.c ARM: SoC cleanups for 3.17 2014-08-08 11:00:26 -07:00
board-armadillo800eva-reference.c ARM: SoC board changes for 3.17 2014-08-08 11:16:17 -07:00
board-armadillo800eva.c ARM: SoC board changes for 3.17 2014-08-08 11:16:17 -07:00
board-bockw-reference.c ARM: shmobile: Move r8a7778.h 2014-06-25 16:48:02 +09:00
board-bockw.c ARM: SoC cleanups for 3.17 2014-08-08 11:00:26 -07:00
board-genmai-reference.c ARM: shmobile: Move r7s72100.h 2014-06-25 16:47:43 +09:00
board-genmai.c ARM: SoC cleanups for 3.17 2014-08-08 11:00:26 -07:00
board-koelsch-reference.c drm/rcar-du: Use struct videomode in platform data 2014-09-15 11:55:47 +03:00
board-koelsch.c drm/rcar-du: Use struct videomode in platform data 2014-09-15 11:55:47 +03:00
board-kzm9g-reference.c ARM: shmobile: Move sh73a0.h 2014-06-25 16:49:37 +09:00
board-kzm9g.c ARM: SoC cleanups for 3.17 2014-08-08 11:00:26 -07:00
board-lager-reference.c drm/rcar-du: Use struct videomode in platform data 2014-09-15 11:55:47 +03:00
board-lager.c drm/rcar-du: Use struct videomode in platform data 2014-09-15 11:55:47 +03:00
board-mackerel.c ARM: SoC cleanups for 3.17 2014-08-08 11:00:26 -07:00
board-marzen-reference.c ARM: shmobile: Move r8a7779.h 2014-06-25 16:52:39 +09:00
board-marzen.c drm/rcar-du: Use struct videomode in platform data 2014-09-15 11:55:47 +03:00
clock-r7s72100.c ARM: shmobile: Move r7s72100.h 2014-06-25 16:47:43 +09:00
clock-r8a73a4.c ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
clock-r8a7740.c ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
clock-r8a7778.c ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
clock-r8a7779.c ARM: shmobile: Move r8a7779.h 2014-06-25 16:52:39 +09:00
clock-r8a7790.c Renesas ARM Based SoC Clock Fixes For v3.17 2014-08-27 15:14:05 -07:00
clock-r8a7791.c Renesas ARM Based SoC Clock Fixes For v3.17 2014-08-27 15:14:05 -07:00
clock-sh73a0.c Renesas ARM Based SoC Clock Fixes For v3.17 2014-08-27 15:14:05 -07:00
clock-sh7372.c
clock.c
clock.h
common.h Renesas ARM Based SoC Updates for v3.17 2014-07-07 22:07:14 -07:00
console.c
cpufreq.c ARM: shmobile: Remove opps table check for cpufreq 2014-07-09 10:48:58 +02:00
cpuidle.c
dma-register.h
entry-intc.S
headsmp-scu.S
headsmp.S ARM: SoC platform changes for 3.17 2014-08-08 11:14:29 -07:00
intc-sh73a0.c ARM: shmobile: Move sh73a0.h 2014-06-25 16:49:37 +09:00
intc-sh7372.c
intc.h
irqs.h
Kconfig sh: intc: Confine SH_INTC to platforms that need it 2014-08-22 12:28:16 +09:00
Makefile Second Round of Renesas ARM Based SoC Updates for v3.17 2014-07-12 09:44:52 -07:00
Makefile.boot
platsmp-apmu.c ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND 2014-07-06 16:31:56 +02:00
platsmp-scu.c
platsmp.c
pm-r8a7740.c
pm-r8a7779.c ARM: shmobile: Move r8a7779.h 2014-06-25 16:52:39 +09:00
pm-r8a7790.c Second Round of Renesas ARM Based SoC Updates for v3.17 2014-07-12 09:44:52 -07:00
pm-r8a7791.c ARM: shmobile: Allow r8a7791 to build non-SMP APMU code 2014-06-26 16:01:34 +09:00
pm-rcar.c
pm-rcar.h
pm-rmobile.c
pm-rmobile.h
pm-sh73a0.c
pm-sh7372.c ARM: shmobile: Move sh7372.h 2014-06-25 16:50:00 +09:00
r7s72100.h ARM: shmobile: Move r7s72100.h 2014-06-25 16:47:43 +09:00
r8a73a4.h ARM: shmobile: Move r8a73a4.h 2014-06-25 16:47:51 +09:00
r8a7740.h ARM: shmobile: Move r8a7740.h 2014-06-25 16:47:57 +09:00
r8a7778.h ARM: shmobile: Move r8a7778.h 2014-06-25 16:48:02 +09:00
r8a7779.h ARM: shmobile: Move r8a7779.h 2014-06-25 16:52:39 +09:00
r8a7790.h ARM: shmobile: Move r8a7790.h 2014-06-25 16:49:10 +09:00
r8a7791.h ARM: shmobile: Move r8a7791.h 2014-06-25 16:53:34 +09:00
rcar-gen2.h
setup-emev2.c
setup-r7s72100.c ARM: SoC cleanups for 3.17 2014-08-08 11:00:26 -07:00
setup-r8a73a4.c ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
setup-r8a7740.c ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
setup-r8a7778.c ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
setup-r8a7779.c ARM: SoC platform changes for 3.17 2014-08-08 11:14:29 -07:00
setup-r8a7790.c ARM: SoC platform changes for 3.17 2014-08-08 11:14:29 -07:00
setup-r8a7791.c ARM: SoC platform changes for 3.17 2014-08-08 11:14:29 -07:00
setup-rcar-gen2.c ARM: shmobile: rcar-gen2: update call to dma_contiguous_reserve_area 2014-06-23 09:15:58 +09:00
setup-sh73a0.c ARM: SoC device-tree changes for 3.17 2014-08-08 11:16:58 -07:00
setup-sh7372.c ARM: shmobile: Move sh7372.h 2014-06-25 16:50:00 +09:00
sh-gpio.h
sh73a0.h ARM: shmobile: Move sh73a0.h 2014-06-25 16:49:37 +09:00
sh7372.h ARM: shmobile: Move sh7372.h 2014-06-25 16:50:00 +09:00
sleep-sh7372.S
smp-emev2.c
smp-r8a7779.c ARM: shmobile: Move r8a7779.h 2014-06-25 16:52:39 +09:00
smp-r8a7790.c Second Round of Renesas ARM Based SoC Updates for v3.17 2014-07-12 09:44:52 -07:00
smp-r8a7791.c ARM: shmobile: Allow r8a7791 to build non-SMP APMU code 2014-06-26 16:01:34 +09:00
smp-sh73a0.c ARM: shmobile: Move sh73a0.h 2014-06-25 16:49:37 +09:00
suspend.c
timer.c