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)
commit82d9a64fc70b9e411f3d45d8ce125ee84c2e2859
tree49908bde082ed435aaccce8365e17006dce6b5e6
parent11e457b50ae642beb9639a5e9f20b3969f7ababe
parentbf6a1aa978ff7a1e85077f85c52ef7324136e01c
Merge branch 'memdisk-cd'