Merge branch 'mainline' into zfs
commit8881ac9b93c739287a0bba6baa326b3199ff55f8
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 10:22:01 +0000 (16 12:22 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 10:22:01 +0000 (16 12:22 +0200)
tree29d1f7c5ee4a9d74e0563aa0d01db2b22a25438d
parent3992b6aa404179de310916405255adbf156d7654
parentf350a22eab7b5433afbf3f59b44c1e860b6441d3
Merge branch 'mainline' into zfs
include/grub/disk.h