]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commita7fb16fad69bf05488ece74988331a5b38c35369
tree1667cffde9f215d53dbbbc359dfdfa9f24df6013
parent51b052b0d31666e64cb97d3c620c0baff4792d91
parent594c6fb92446a07a4d12337adeb3e9fb3ec7e203
Merge tag 'sunxi-drivers-for-3.14' of https://github.com/mripard/linux into next/drivers

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>