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

Simple merge
Simple merge