From: Olof Johansson <olof@lixom.net>
Date: Fri, 27 Dec 2013 21:24:15 +0000 (-0800)
Subject: Merge tag 'sunxi-drivers-for-3.14' of https://github.com/mripard/linux into next... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a7fb16fad69bf05488ece74988331a5b38c35369;p=deliverable%2Flinux.git

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>
---

a7fb16fad69bf05488ece74988331a5b38c35369