diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-10-18 07:02:04 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-10-18 07:02:04 -0700 |
commit | 60cd8b09f1e26dec0e866085f110d1d665d53cec (patch) | |
tree | 7b16d53ca5d759c0419254fd2eb9d7d1c8dff61a /arch/arm/mach-omap2/board-rx51-peripherals.c | |
parent | 163556896d2fea757e0f87b44b537ff7d5b57807 (diff) | |
parent | 6bcf60f8d557f15c85faf82ccbfc38cf986c45cc (diff) | |
download | blackbird-op-linux-60cd8b09f1e26dec0e866085f110d1d665d53cec.tar.gz blackbird-op-linux-60cd8b09f1e26dec0e866085f110d1d665d53cec.zip |
Merge branch 'rockchip/boards' into next/boards
From Heiko Stübner:
Support for the RK3188 SoC, basic RK3188 based Radxa Rock board
and RK3066a based BQ Curie2 tablet.
* rockchip/boards:
ARM: rockchip: add support for rk3188 and Radxa Rock board
ARM: rockchip: add dts for bqcurie2 tablet
ARM: rockchip: enable arm-global-timer
ARM: rockchip: move shared dt properties to common source file
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
0 files changed, 0 insertions, 0 deletions