Merge branch 'rtc' of git://github.com/hzhuang1/linux into next/drivers
authorOlof Johansson <olof@lixom.net>
Thu, 8 Mar 2012 17:36:57 +0000 (09:36 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 8 Mar 2012 17:36:57 +0000 (09:36 -0800)
* 'rtc' of git://github.com/hzhuang1/linux:
  rtc: sa1100: add OF support


Trivial merge