From: Kevin Hilman <khilman@linaro.org>
Date: Fri, 18 Oct 2013 14:02:04 +0000 (-0700)
Subject: Merge branch 'rockchip/boards' into next/boards
X-Git-Tag: v3.13-rc1~158^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=60cd8b09f1e26dec0e866085f110d1d665d53cec;p=linux.git

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
---

60cd8b09f1e26dec0e866085f110d1d665d53cec