From: Alex Elder <aelder@sgi.com>
Date: Fri, 4 Jun 2010 18:22:30 +0000 (-0500)
Subject: Merge branch 'master' into for-linus
X-Git-Tag: v2.6.35-rc2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5;p=pandora-kernel.git

Merge branch 'master' into for-linus
---

1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5
Reading git-diff-tree failed