From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 13:08:10 +0000 (+0100)
Subject: Merge branch 'dt/gic' into next/dt
X-Git-Tag: v3.2-rc1~89^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08cab72f91c8b28ffabfd143119bccdd4a115ad7;p=pandora-kernel.git

Merge branch 'dt/gic' into next/dt

Conflicts:
	arch/arm/include/asm/localtimer.h
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-omap2/board-generic.c
---

08cab72f91c8b28ffabfd143119bccdd4a115ad7
Reading git-diff-tree failed