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-omap1~181
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d33dcd3247f9700d7634ac44485a656b002c770b;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

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

d33dcd3247f9700d7634ac44485a656b002c770b