Merge branch 'x86-platform-next' into x86-platform
authorMatthew Garrett <mjg@redhat.com>
Sun, 29 May 2011 18:27:13 +0000 (14:27 -0400)
committerMatthew Garrett <mjg@redhat.com>
Sun, 29 May 2011 18:27:13 +0000 (14:27 -0400)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge