]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
Merge remote-tracking branch 'github/master'
authorHarald Hoyer <harald@redhat.com>
Mon, 18 May 2015 11:28:00 +0000 (13:28 +0200)
committerHarald Hoyer <harald@redhat.com>
Mon, 18 May 2015 11:28:00 +0000 (13:28 +0200)
1  2 
dracut-functions.sh
modules.d/90crypt/crypt-lib.sh

Simple merge
Simple merge