From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 27 Nov 2014 15:05:30 +0000 (+0100)
Subject: Merge branch 'sunxi/dt' into next/dt
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~12^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321081f5f5ad40880d2a92dedd07052ea2a25516;p=pandora-kernel.git

Merge branch 'sunxi/dt' into next/dt

This avoids a boot regression

* sunxi/dt:
  Revert "ARM: dts: sunxi: unify APB1 clock"
  Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks."

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

321081f5f5ad40880d2a92dedd07052ea2a25516
Reading git-diff-tree failed