From: Tony Lindgren <tony@atomide.com>
Date: Tue, 4 Aug 2009 14:45:13 +0000 (+0300)
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~44
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec0f68576e307feac766366f0db7e2cfb89b2f65;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	drivers/leds/Kconfig
	drivers/leds/Makefile
---

ec0f68576e307feac766366f0db7e2cfb89b2f65
Reading git-diff-tree failed