]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 4 Dec 2008 22:41:57 +0000 (14:41 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 4 Dec 2008 22:41:57 +0000 (14:41 -0800)
1  2 
zfs/lib/libuutil/uu_misc.c
zfs/lib/libzfs/libzfs_mount.c

Simple merge
Simple merge