]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge