From: Olof Johansson <olof@lixom.net>
Date: Thu, 8 Mar 2012 17:36:57 +0000 (-0800)
Subject: Merge branch 'rtc' of git://github.com/hzhuang1/linux into next/drivers
X-Git-Tag: firefly_0821_release~3680^2~3234^2~8
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2c76744b1b7850770712788a874f479d8033dc72;p=firefly-linux-kernel-4.4.55.git

Merge branch 'rtc' of git://github.com/hzhuang1/linux into next/drivers

* 'rtc' of git://github.com/hzhuang1/linux:
  rtc: sa1100: add OF support
---

2c76744b1b7850770712788a874f479d8033dc72