]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commit6cc96ddb7eed3a5a368d13ef6f79ab7c48dfbfcc
tree55c634a3b44660d8e1ce4907bc1ea55602416e57
parent2054271bb008de0bcf0bdc5d6041613f616420f2
parentd90cb69ddd032854b633c4069ba3493651cb8ebc
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical

From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa: add dummy SA1100 rtc clock in pxa25x