From: Tony Lindgren <tony@atomide.com>
Date: Tue, 9 Sep 2008 15:24:26 +0000 (-0700)
Subject: Revert some merge-errors
X-Git-Tag: v2.6.27-omap1~238
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e65dbd68c5d91bca29d057501ba1aeb83fd954;p=pandora-kernel.git

Revert some merge-errors

As pointed out by Russell King.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed