From: Tony Lindgren <tony@atomide.com>
Date: Wed, 10 Sep 2008 17:27:10 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~231
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8c026a9a7d66735621b06bfcafb57ab5a4274630;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/mach-omap1/mcbsp.c
	arch/arm/mach-omap2/mcbsp.c
	arch/arm/plat-omap/include/mach/mcbsp.h
	arch/arm/plat-omap/mcbsp.c
---

8c026a9a7d66735621b06bfcafb57ab5a4274630