diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 07:33:42 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 07:33:42 +0100 |
| commit | 3394d8977e61613b91b4e4e3268f96feba0a7293 (patch) | |
| tree | 9b21636d73e4d8be64856040bc1a0a674ecd3532 /security/capability.c | |
| parent | Merge tag 'v3.8-rc5' into next/cleanup (diff) | |
| parent | ARM: pxa: Minor naming fixes in spitz.c (diff) | |
| download | linux-3394d8977e61613b91b4e4e3268f96feba0a7293.tar.xz linux-3394d8977e61613b91b4e4e3268f96feba0a7293.zip | |
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>
Diffstat (limited to 'security/capability.c')
0 files changed, 0 insertions, 0 deletions