From: Tony Lindgren <tony@atomide.com>
Date: Wed, 12 Nov 2008 19:16:41 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-davinci1-diff-base~176
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d33dcd3247f9700d7634ac44485a656b002c770b;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/mtd/onenand/omap2.c
---

d33dcd3247f9700d7634ac44485a656b002c770b
Reading git-diff-tree failed