Merge branch 'master' into for-linus
authorChris Metcalf <cmetcalf@tilera.com>
Tue, 6 Jul 2010 17:45:24 +0000 (13:45 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Tue, 6 Jul 2010 17:45:24 +0000 (13:45 -0400)

Trivial merge