Merge branch 'master' into for-linus
authorChris Metcalf <cmetcalf@tilera.com>
Wed, 24 Nov 2010 18:30:28 +0000 (13:30 -0500)
committerChris Metcalf <cmetcalf@tilera.com>
Wed, 24 Nov 2010 18:30:28 +0000 (13:30 -0500)

Trivial merge