From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Mar 2011 01:07:14 +0000 (-0800)
Subject: Merge branch 'devel-cleanup' into omap-for-linus
X-Git-Tag: v2.6.39-rc1~432^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12d7d4e0ed8fecf7f74c89483b55b300be6e5901;p=pandora-kernel.git

Merge branch 'devel-cleanup' into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/timer-gp.c
---

12d7d4e0ed8fecf7f74c89483b55b300be6e5901
Reading git-diff-tree failed