From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 21 Mar 2012 14:27:34 +0000 (+0000)
Subject: Merge branch 'tegra/cleanups' into next/timer
X-Git-Tag: v3.4-rc1~90^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cbe23e3a432e3d09a849adb197c8fcc09e7391d;p=pandora-kernel.git

Merge branch 'tegra/cleanups' into next/timer

Conflicts:
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-vexpress/core.h

The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

2cbe23e3a432e3d09a849adb197c8fcc09e7391d
Reading git-diff-tree failed