granicus.if.org Git - zfs/commit

]> granicus.if.org Git - zfs/commit

projects / zfs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6203c7e b453b61)

author	Brian Behlendorf <behlendorf1@llnl.gov>
	Thu, 11 Dec 2008 19:25:09 +0000 (11:25 -0800)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Thu, 11 Dec 2008 19:25:09 +0000 (11:25 -0800)
commit	8f8ac4288fe078dda0a576d64c1199b89261e55a
tree	af9cdc6fc0dec1af1b21d0d8a1890811515bbee5	tree \| snapshot
parent	6203c7e50f813ce655c6f39144e947b4966bc8ee	commit \| diff
parent	b453b61272db34cd097f8636f57033785b00d932	commit \| diff

Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype

lib/libzfs/libzfs_mount.c	diff1 \|	diff2 \|	blob \| history
lib/libzpool/kernel.c	diff1 \|	diff2 \|	blob \| history
module/zfs/include/sys/spa.h	diff1 \|	diff2 \|	blob \| history
module/zfs/include/sys/zfs_znode.h	diff1 \|	diff2 \|	blob \| history
module/zfs/spa_history.c	diff1 \|	diff2 \|	blob \| history
module/zfs/spa_misc.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.