]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 27 Apr 2012 16:31:02 +0000 (09:31 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 27 Apr 2012 16:31:02 +0000 (09:31 -0700)
commit0ee3ac1e907027e2f04e4675b251e7b8ff8a60f2
tree9298fc01b98d5f56afb1494ddedddcc753f2e2b4
parentda205598b0ca717a0c443d3ad7e610c09439bd1e
parent3dbe64d2d71f56018745b460badca72766fb741f
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