| commit | 6cc96ddb7eed3a5a368d13ef6f79ab7c48dfbfcc | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Nov 25 23:49:00 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sun Nov 25 23:49:00 2012 -0800 |
| tree | 55c634a3b44660d8e1ce4907bc1ea55602416e57 | |
| parent | 2054271bb008de0bcf0bdc5d6041613f616420f2 [diff] | |
| parent | d90cb69ddd032854b633c4069ba3493651cb8ebc [diff] |
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