Merge tag 'v3.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorChris Metcalf <cmetcalf@tilera.com>
Fri, 10 Jun 2011 17:12:02 +0000 (13:12 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Fri, 10 Jun 2011 17:12:02 +0000 (13:12 -0400)

Trivial merge