Merge branch 'master' into for-linus
authorChris Metcalf <cmetcalf@tilera.com>
Thu, 14 Oct 2010 15:57:29 +0000 (11:57 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Thu, 14 Oct 2010 15:57:29 +0000 (11:57 -0400)

Trivial merge