Merge branch 'master' into for-linus
authorChris Metcalf <cmetcalf@tilera.com>
Fri, 13 Aug 2010 23:59:15 +0000 (19:59 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Fri, 13 Aug 2010 23:59:15 +0000 (19:59 -0400)

Trivial merge