From: Tony Lindgren <tony@atomide.com>
Date: Wed, 28 Nov 2007 22:06:26 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~142
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88282ad97860951c39585a1e3dd4cf36d898c4f8;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
---

88282ad97860951c39585a1e3dd4cf36d898c4f8
Reading git-diff-tree failed