diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-11-27 16:05:30 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-27 16:05:30 +0100 |
| commit | 321081f5f5ad40880d2a92dedd07052ea2a25516 (patch) | |
| tree | e920c138ed83f3fc2aae43a074db6b88f09b89a9 /include/linux | |
| parent | Merge tag 'socfpga_dts_updates_for_v3.19' of git://git.rocketboards.org/linux-socfpga-next into next/dt (diff) | |
| parent | Revert "ARM: dts: sunxi: unify APB1 clock" (diff) | |
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>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions