From: Tony Lindgren <tony@atomide.com>
Date: Sun, 18 Jan 2009 12:08:53 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.29-omap1~124
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45e5c5ffd32ade5a21a5e87b4040072590ec3ae1;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/leds/Makefile
---

45e5c5ffd32ade5a21a5e87b4040072590ec3ae1
Reading git-diff-tree failed