From: Tony Lindgren <tony@atomide.com>
Date: Sun, 10 Jul 2011 18:48:26 +0000 (-0700)
Subject: Merge branch 'cleanup-part-2' into devel-board
X-Git-Tag: v3.1-rc1~150^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ad920556f32a5a127397ca461d1a1faaf22c4e0;p=pandora-kernel.git

Merge branch 'cleanup-part-2' into devel-board

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
---

1ad920556f32a5a127397ca461d1a1faaf22c4e0
Reading git-diff-tree failed