From: Olof Johansson <olof@lixom.net>
Date: Fri, 27 Apr 2012 16:31:02 +0000 (-0700)
Subject: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dadb3660a3ad162ac6e76be7262c72f48177f1aa;p=linux-beck.git

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
---

dadb3660a3ad162ac6e76be7262c72f48177f1aa