From: James Morris <jmorris@namei.org>
Date: Wed, 5 Nov 2008 23:12:34 +0000 (+0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.29-rc1~588^2^2~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e21e696edb498c7f7eed42ba3096f6bbe13927b6;p=pandora-kernel.git

Merge branch 'master' into next
---

e21e696edb498c7f7eed42ba3096f6bbe13927b6
Reading git-diff-tree failed