From: Olof Johansson Date: Mon, 28 Jan 2013 06:35:11 +0000 (-0800) Subject: Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non... X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=c51cdd9b2441a16332ec57fc7cb4d9ac6b927437;p=linux-edison.git Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical Non-critical fixes for PXA, from Haojian Zhuang. * 'armsoc/fix' of git://github.com/hzhuang1/linux: ARM: pxa: Minor naming fixes in spitz.c ARM: PXA3xx: program the CSMSADRCFG register ARM: palmtreo: fix #ifdefs for leds-gpio device ARM: palmtreo: fix lcd initilialization on treo680 Signed-off-by: Olof Johansson --- c51cdd9b2441a16332ec57fc7cb4d9ac6b927437