]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51b052b 594c6fb)
Merge tag 'sunxi-drivers-for-3.14' of https://github.com/mripard/linux into next...
authorOlof Johansson <olof@lixom.net>
Fri, 27 Dec 2013 21:24:15 +0000 (13:24 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 27 Dec 2013 21:24:15 +0000 (13:24 -0800)
From Maxime Ripard:
Allwinner SoC additions for 3.14

Two drivers are merged through for 3.14:
  - The A10/A20 RTC driver
  - The A31 reset controller IP

* tag 'sunxi-drivers-for-3.14' of https://github.com/mripard/linux:
  ARM: sun4i/sun7i: RTC driver
  ARM: sun4i/sun7i: DT documentation for RTC driver
  reset: Add Allwinner SoCs Reset Controller Driver

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge
Andy's Linux Kernel repo