From: Tony Lindgren <tony@atomide.com>
Date: Tue, 27 May 2008 19:52:26 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61acc9535af017fa98ce33ecda025251a99a2d48;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/plat-omap/clock.c
	include/asm-arm/arch-omap/clock.h
---

61acc9535af017fa98ce33ecda025251a99a2d48
Reading git-diff-tree failed