Merge branch 'memdisk-cd'
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 20 Mar 2009 23:31:11 +0000 (16:31 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 20 Mar 2009 23:31:11 +0000 (16:31 -0700)

Trivial merge