projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b914c9 eea6e39)
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/cleanup
authorOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 06:33:42 +0000 (22:33 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 06:33:42 +0000 (22:33 -0800)
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>
1  2 
arch/arm/mach-pxa/palmtreo.c patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/spitz.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-pxa/palmtreo.c
Simple merge
diff --cc arch/arm/mach-pxa/spitz.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git