Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non...
authorOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 07:49:00 +0000 (23:49 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 07:49:00 +0000 (23:49 -0800)
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa: add dummy SA1100 rtc clock in pxa25x


Trivial merge