]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8c4cd7 945f82f)
Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 27 Jan 2012 07:15:11 +0000 (23:15 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 27 Jan 2012 07:15:11 +0000 (23:15 -0800)
* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
  ARM: imx: iomux-v1.h: Fix build error due to __init annotation


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG