From: Tony Lindgren <tony@atomide.com>
Date: Mon, 23 Feb 2009 18:07:09 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.29-omap1~68
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a19ce1c6a029c0ef00059129ce4b8c64a2925c6;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/mach-omap2/clock.c
---

1a19ce1c6a029c0ef00059129ce4b8c64a2925c6
Reading git-diff-tree failed