| commit | c51cdd9b2441a16332ec57fc7cb4d9ac6b927437 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Jan 27 22:35:11 2013 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sun Jan 27 22:35:11 2013 -0800 |
| tree | 97faec60ae9f03e3090714b75a8e78baf79b3c71 | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 [diff] | |
| parent | eea6e39b916dd282c7fa4629be8934b5ad60e62b [diff] |
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 <olof@lixom.net>