From: James Morris <jmorris@namei.org>
Date: Wed, 5 Aug 2009 22:55:03 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.32-rc1~737^2^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=012a5299a29672039f42944a37984558393ef769;p=pandora-kernel.git

Merge branch 'master' into next
---

012a5299a29672039f42944a37984558393ef769
Reading git-diff-tree failed