Commit Graph

24 Commits

Author SHA1 Message Date
Brian Behlendorf
1c5ae9851b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-07 15:51:51 -08:00
Brian Behlendorf
2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf
4b9683dcf7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 15:44:35 -08:00
Brian Behlendorf
760d78b9f8 Move default include paths after custom include paths so local stuff gets picked up first 2009-01-05 15:42:56 -08:00
Brian Behlendorf
c95e9a8ce0 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 11:49:27 -08:00
Brian Behlendorf
5a0a9cc451 Update makefiles 2008-12-23 11:47:33 -08:00
Brian Behlendorf
cdc7d2613e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-11 15:24:07 -08:00
Brian Behlendorf
6cc6f50a02 Move to new home 2008-12-11 15:21:20 -08:00
Brian Behlendorf
515c1981f2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:59:39 -08:00
Brian Behlendorf
a3c66a6b89 Resolve conflict 2008-12-11 14:58:34 -08:00
Brian Behlendorf
593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf
8f8a7e587a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:26:10 -08:00
Brian Behlendorf
3bd537afcc Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-11 14:25:35 -08:00
Brian Behlendorf
503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf
82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf
a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf
c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf
94e1055395 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:04:54 -08:00
Brian Behlendorf
44ffa43709 Resolve conflict 2008-12-11 14:01:47 -08:00
Brian Behlendorf
98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf
5bb8f9ec25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
Brian Behlendorf
aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf
4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -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