| commit | 3394d8977e61613b91b4e4e3268f96feba0a7293 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Jan 27 22:33:42 2013 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sun Jan 27 22:33:42 2013 -0800 |
| tree | 9b21636d73e4d8be64856040bc1a0a674ecd3532 | |
| parent | 6b914c998787d65022e80d6262dfd0edef58cadb [diff] | |
| parent | eea6e39b916dd282c7fa4629be8934b5ad60e62b [diff] |
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>