From: Tony Lindgren <tony@atomide.com>
Date: Tue, 22 Jan 2008 19:56:40 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~49
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f730397f4c203e29df4becc31e580ca8fb21c5d5;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/Kconfig
---

f730397f4c203e29df4becc31e580ca8fb21c5d5
Reading git-diff-tree failed