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

Merge branch 'master' into next
---

d905163c5b23f6d8511971e06081a1b525e8a0bd
Reading git-diff-tree failed