Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non...
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 08:01:51 +0000 (00:01 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 08:01:51 +0000 (00:01 -0800)
commit2054271bb008de0bcf0bdc5d6041613f616420f2
tree24e638944597399d28c0432a5f6a323d3181c8a6
parent12480c2e53d355223cf6884ed1f56e6ac9b7c21f
parent8757e168190a6ed2cd4aa23fc59bf86b0091b596
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