4 Commits

Author	SHA1	Message	Date
Brian Behlendorf	bf200630f9	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch ... Conflicts: module/zfs/rrwlock.c module/zfs/spa_boot.c module/zfs/zfs_replay.c	2009-03-11 11:12:24 -07:00
Ricardo M. Correia	af45030850	Added 'gcc-ident-pragmas' branch.	2009-03-11 10:59:45 -07:00
Brian Behlendorf	aca9d98817	Fix conflict	2008-12-11 11:34:16 -08:00
Brian Behlendorf	172bb4bd5e	Move the world out of /zfs/ and seperate out module build tree	2008-12-11 11:08:09 -08:00