Merge tag 'v3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorChris Metcalf <cmetcalf@tilera.com>
Tue, 2 Aug 2011 20:14:02 +0000 (16:14 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Tue, 2 Aug 2011 20:14:02 +0000 (16:14 -0400)

Trivial merge