From: James Morris <jmorris@namei.org>
Date: Sun, 28 Nov 2010 21:27:07 +0000 (+1100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.38-rc1~429^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d6d75684d869406e5bb2ac5d3ed9454f52d0cab;p=pandora-kernel.git

Merge branch 'master' into next
---

1d6d75684d869406e5bb2ac5d3ed9454f52d0cab
Reading git-diff-tree failed