]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12480c2 8757e16)
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)
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa: fix pxa25x gpio wakeup setting
  + Linux 3.7-rc6


Trivial merge