]> git.ipfire.org Git - thirdparty/grub.git/commit
Merge branch 'master' into andrey/ext4_inline_data andrey/ext4_inline_data
authorAndrei Borzenkov <arvidjaar@gmail.com>
Mon, 11 Jul 2016 04:23:13 +0000 (07:23 +0300)
committerAndrei Borzenkov <arvidjaar@gmail.com>
Mon, 11 Jul 2016 04:23:13 +0000 (07:23 +0300)
commite897f83635a9a8cc6824ae8c9b473f6773389224
tree8d98ba6f4c2687f9d2ee9bc50ecb908ffeffe1ce
parentd4af83fc600d02dcfedae457353efbce8726b8d9
parentb524fa27f56381bb0efa4944e36f50265113aee5
Merge branch 'master' into andrey/ext4_inline_data

Conflicts:
grub-core/fs/ext2.c
grub-core/fs/ext2.c