From: Tony Lindgren <tony@atomide.com>
Date: Mon, 9 Feb 2009 21:05:28 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=70ff4a1aafd2378c9e3ff153135ba6d0bde45215

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/mach-omap2/irq.c
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dma.c
---

70ff4a1aafd2378c9e3ff153135ba6d0bde45215