projects / linux-flexiantxendom0-3.2.10.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 709baa6 61b8008)
Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 21:05:52 +0000 (21:05 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 21:05:52 +0000 (21:05 +0000)
commit38abdcd0d0689aaca94e740ac67a952c7918caef
tree83051487c15c3a062eb4dbff16c13e517c309a78tree | snapshot
parent709baa67c676a187a63c0f0f40efceb3fb1eef72commit | diff
parent61b80086a525c8a6081257ae40da5dee2bcaee16commit | diff
Merge branch 'for-armsoc' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2

Conflicts:
arch/arm/mach-tegra/common.c
arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-omap2/pm24xx.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/common.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/devices-common.c diff1 | diff2 | blob | history
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)