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
Loading
Please register or sign in to comment