Merge branch 'rockchip/boards' into next/boards
authorKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 14:02:04 +0000 (07:02 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 14:02:04 +0000 (07:02 -0700)
commit60cd8b09f1e26dec0e866085f110d1d665d53cec
tree7b16d53ca5d759c0419254fd2eb9d7d1c8dff61a
parent163556896d2fea757e0f87b44b537ff7d5b57807
parent6bcf60f8d557f15c85faf82ccbfc38cf986c45cc
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