]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:47:03 +0000 (15:47 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:47:34 +0000 (15:47 -0700)
commit1a9df23a401ec9ac4231421f094f26438dcbeef0
tree9bd8f05bb6343b9dcfd61223012d20d2ffd60ac4
parent66173665367f3b329e47566e82bf01607aa32dc4
parent5b5bbc20fdddd7dd5a2c5b9fa85dfb3b5695616d
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: OMAP2+: display: Create omap_vout device inside omap_display_init
  ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init
  ARM: OMAP2+: display: Create omapdrm device inside omap_display_init
  ARM: OMAP2+: drm: Don't build device for DMM
  RX-51: Add support for OMAP3 ROM Random Number Generator
  ARM: OMAP3: RX-51: ARM errata 430973 workaround
  ARM: OMAP3: Add secure function omap_smc3() which calling instruction smc #1

Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap-secure.h