From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 Nov 2012 08:01:51 +0000 (-0800)
Subject: Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2054271bb008de0bcf0bdc5d6041613f616420f2;p=linux.git

Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical

From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa: fix pxa25x gpio wakeup setting
  + Linux 3.7-rc6
---

2054271bb008de0bcf0bdc5d6041613f616420f2