From: Olof Johansson Date: Mon, 28 Jan 2013 06:36:59 +0000 (-0800) Subject: Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4b3c3be024cc4a9f0cfdc97a068e6dd46da12e74;p=linux-beck.git Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards A couple of board updates for PXA, from Haojian Zhuang. * 'armsoc/board' of git://github.com/hzhuang1/linux: ARM: pxa: pxa27x.c: add dummy SA1100 rtc clock ARM: palmtreo: replace #if defined with IF_ENABLED ARM: palmtreo: add docg4 device initialization Signed-off-by: Olof Johansson --- 4b3c3be024cc4a9f0cfdc97a068e6dd46da12e74