From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 29 May 2009 19:03:43 +0000 (+0100)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: v2.6.31-rc1~344^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=949abd84cd54ff864efca9df822d1e02a56694ec;p=pandora-kernel.git

Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap-2.6 into devel

Conflicts:
	arch/arm/Makefile
---

949abd84cd54ff864efca9df822d1e02a56694ec
Reading git-diff-tree failed