From: Tony Lindgren <tony@atomide.com>
Date: Thu, 11 Dec 2008 01:30:44 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-omap1~75
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5fa89e33d1aebec609a09c0fe8dc733ea19126a1;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
---

5fa89e33d1aebec609a09c0fe8dc733ea19126a1