| commit | dadb3660a3ad162ac6e76be7262c72f48177f1aa | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Apr 27 09:31:02 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Apr 27 09:31:02 2012 -0700 |
| tree | 9298fc01b98d5f56afb1494ddedddcc753f2e2b4 | |
| parent | b7b617c527224acd862274fc58ff16dd34ab6466 [diff] | |
| parent | ef7c7c693b4b05a293678fd40ed1511bc94d6f61 [diff] |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes * 'fixes' of git://github.com/hzhuang1/linux: ARM: PXA2xx: MFP: fix potential direction bug ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUT arm/sa1100: fix sa1100-rtc memory resource ARM: pxa: fix gpio wakeup setting