From: Tony Lindgren <tony@atomide.com>
Date: Mon, 19 May 2008 19:02:14 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~83
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f4eb51b909144550048b7922ebd1904a54005394;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock34xx.h
	arch/arm/plat-omap/dma.c
---

f4eb51b909144550048b7922ebd1904a54005394