From: Tony Lindgren <tony@atomide.com>
Date: Tue, 8 Jul 2008 08:00:13 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~72
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7786cd7a00ae0b18923185789380a88052f4eee7;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/plat-omap/dma.c
---

7786cd7a00ae0b18923185789380a88052f4eee7