]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7b617c ef7c7c6)
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)
* '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


Trivial merge
Ubuntu combined Linux kernel mirror