Merge branch 'mainline' into zfs
commit09279dae3a5c0a42c0b29b3fdc07e19fd5a0d993
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:32:00 +0000 (16 21:32 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:32:00 +0000 (16 21:32 +0200)
treeef7c766b1783d5d92e71be5bd46f2778c23be654
parent0207aa18c9ef27ed10b865f30cea1e3db1adc555
parentd52bd5fc4275185f17b980073b56573328b0ee85
Merge branch 'mainline' into zfs
include/grub/disk.h