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: Ubuntu-5.10.0-12.13~21863^2~8
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2c76744b1b7850770712788a874f479d8033dc72;p=mirror_ubuntu-hirsute-kernel.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