From: Olof Johansson <olof@lixom.net>
Date: Mon, 28 Jan 2013 06:33:42 +0000 (-0800)
Subject: Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/cleanup
X-Git-Tag: v3.9-rc1~122^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3394d8977e61613b91b4e4e3268f96feba0a7293;p=pandora-kernel.git

Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/cleanup

A couple of PXA fixes that aren't critical enough for 3.9. 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 <olof@lixom.net>
---

3394d8977e61613b91b4e4e3268f96feba0a7293
Reading git-diff-tree failed