Merge branch 'master' into for-linus
authorChris Metcalf <cmetcalf@tilera.com>
Fri, 25 Jun 2010 18:38:16 +0000 (14:38 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Fri, 25 Jun 2010 18:38:16 +0000 (14:38 -0400)

Trivial merge