From: Olof Johansson Date: Mon, 26 Nov 2012 07:49:00 +0000 (-0800) Subject: Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical X-Git-Tag: v3.8-rc1~146^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6cc96ddb7eed3a5a368d13ef6f79ab7c48dfbfcc;p=linux.git 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 --- 6cc96ddb7eed3a5a368d13ef6f79ab7c48dfbfcc