]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:17:02 +0000 (21:17 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:17:02 +0000 (21:17 -0800)
commit87b22f773f5953f11ad4d41749b5c1780eb09dcc
tree7613ef6b6f1cc9b85154cc023e5e0815e99f1905
parentfb47e7f2561008769fe3afd7558c7e613d2a528a
parent0b35a45bde561d67ffd83b352764b48f936f46bb
Merge branch 'fixes' into for-next

Conflicts:
arch/arm/kernel/setup.c
arch/arm/Kconfig
arch/arm/kernel/perf_event.c
arch/arm/kernel/setup.c
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/Makefile
drivers/mmc/host/omap_hsmmc.c