From: Tony Lindgren <tony@atomide.com>
Date: Wed, 23 Apr 2008 23:26:05 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~207
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c310c979c4159067685faf37a96ecb0f4d7c0300;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/i2c/chips/isp1301_omap.c
---

c310c979c4159067685faf37a96ecb0f4d7c0300
Reading git-diff-tree failed