From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 9 Mar 2013 15:49:32 +0000 (+0000)
Subject: Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~51^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73a09d212ec65b7068a283e6034fa05649d3d075;p=pandora-kernel.git

Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable

Conflicts:
	arch/arm/include/asm/cputype.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

73a09d212ec65b7068a283e6034fa05649d3d075
Reading git-diff-tree failed