From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 2 May 2013 20:31:29 +0000 (+0100)
Subject: Merge branch 'cleanup' into for-linus
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~51^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b9f582c5c1db515412cc7efff28f7d1779321f;p=pandora-kernel.git

Merge branch 'cleanup' into for-linus

Conflicts:
	arch/arm/plat-omap/dmtimer.c
---

33b9f582c5c1db515412cc7efff28f7d1779321f
Reading git-diff-tree failed