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)
commit2c76744b1b7850770712788a874f479d8033dc72
treee86b20141a28e20534c37d757ff9f7663609794c
parent990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d
parent8bec2e9e2efa8660c88077b2f1524b7a36eda714
Merge branch 'rtc' of git://github.com/hzhuang1/linux into next/drivers

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