From: Tony Lindgren <tony@atomide.com>
Date: Fri, 31 Oct 2008 22:12:35 +0000 (-0700)
Subject: Manually merge patch 4b1135a277f4b38f60b9c9f28adae467feb07856
X-Git-Tag: v2.6.28-davinci1-diff-base~201
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a357644ac7eb3fd7177036a0dd9a3b2839184c00;p=pandora-kernel.git

Manually merge patch 4b1135a277f4b38f60b9c9f28adae467feb07856

Looks like automerge hosed it somehow.

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

Reading git-diff-tree failed