Commit Graph

14 Commits

Author SHA1 Message Date
Brian Behlendorf c1a800e4c5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:19 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf fe0cad8ba9 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-12 08:59:38 -08:00
Brian Behlendorf bc1ce928f6 Add makefiles 2008-12-12 08:57:54 -08:00
Brian Behlendorf 9752c0ae90 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 08:53:28 -08:00
Brian Behlendorf 9e66117d33 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 08:52:13 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf f5290f405c Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-11 15:19:18 -08:00
Brian Behlendorf fc5f5929e7 move zpios to the correct dirs 2008-12-11 15:17:33 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -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 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -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