From: Chris Metcalf <cmetcalf@tilera.com>
Date: Fri, 25 Jun 2010 18:38:16 +0000 (-0400)
Subject: Merge branch 'master' into for-linus
X-Git-Tag: v2.6.36-rc1~483^2~15
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=9c78965ca18594fe0a34a1a1b13781b10f85e4bc;p=~andy%2Flinux

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

9c78965ca18594fe0a34a1a1b13781b10f85e4bc