Merge branch 'x86-platform-next' into x86-platform
authorMatthew Garrett <mjg@redhat.com>
Mon, 17 May 2010 16:11:21 +0000 (12:11 -0400)
committerMatthew Garrett <mjg@redhat.com>
Mon, 17 May 2010 16:11:21 +0000 (12:11 -0400)

Trivial merge