git://git.camperquake.de / zfs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 716895b ae26d04)
Merge branch 'dracut'
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 22 Mar 2011 19:13:04 +0000 (12:13 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 22 Mar 2011 19:13:04 +0000 (12:13 -0700)
1  2 
cmd/mount_zfs/Makefile.in patch | diff1 | diff2 | blob | history
cmd/mount_zfs/mount_zfs.c patch | diff1 | diff2 | blob | history
lib/libzfs/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc cmd/mount_zfs/Makefile.in
Simple merge
diff --cc cmd/mount_zfs/mount_zfs.c
Simple merge
diff --cc lib/libzfs/Makefile.in
Simple merge
ZFS development branch