Merge branch 'x86-platform-next' into x86-platform
authorMatthew Garrett <mjg@redhat.com>
Mon, 28 Mar 2011 10:47:38 +0000 (06:47 -0400)
committerMatthew Garrett <mjg@redhat.com>
Mon, 28 Mar 2011 10:47:38 +0000 (06:47 -0400)

Trivial merge