From: Tony Lindgren <tony@atomide.com>
Date: Mon, 25 May 2009 18:25:48 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~124
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88080796fc86c3c41259609dbef90e012ccbc14;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	drivers/video/omap/dispc.c
---

b88080796fc86c3c41259609dbef90e012ccbc14
Reading git-diff-tree failed