]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
Merge tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 12:15:34 +0000 (14:15 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 12:15:34 +0000 (14:15 +0200)
commitb99cfa66e118ef5535f18228a373a6e2d8fa4275
tree2fd64e3ec2d5a886b2036d521591c8db9b570cb4
parent3fdef7e3bc6da0519eb1d76fa528ca088e12530e
parentb1db66b818a4cb1a654ae51a5ca32a09d1ccd825
Merge tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "Initial support for Rockchip RK3288 SoCs" from Heiko Stuebner:

* tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: Build dtbs for Rockchip boards
  ARM: dts: add rk3288 evaluation board
  ARM: dts: rockchip: add core rk3288 dtsi
  ARM: rockchip: enable support for RK3288 SoCs
  ARM: Kconfig: set default gpio number for rockchip SoCs
  ARM: rockchip: add debug uart used by rk3288
  ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll options
  dt-bindings: arm: add cortex-a12 and cortex-a17 cpu compatible properties

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/Makefile