Commit Graph

243 Commits

Author SHA1 Message Date
Brian Behlendorf e7d9beb361 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 09:27:41 -08:00
Brian Behlendorf 233dda723f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 09:26:58 -08:00
Brian Behlendorf d52676f52b Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:26:35 -08:00
Brian Behlendorf c60d76734b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 09:25:57 -08:00
Brian Behlendorf b608990fea Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:25:52 -08:00
Brian Behlendorf ecf38d314e Resolve conflict 2008-12-22 09:25:04 -08:00
Brian Behlendorf b58e34e0d8 Update makefiles 2008-12-22 09:22:39 -08:00
Brian Behlendorf f583bf4e89 Refresh autogen products 2008-12-22 09:14:09 -08:00
Brian Behlendorf bca95f1cde Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 09:13:31 -08:00
Brian Behlendorf d1ff9a15ca Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 09:13:13 -08:00
Brian Behlendorf 894c412b86 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:12:50 -08:00
Brian Behlendorf 4aeafba548 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 09:12:11 -08:00
Brian Behlendorf 7b9d830da2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:12:06 -08:00
Brian Behlendorf e959b03a8e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 09:11:54 -08:00
Brian Behlendorf 98810ac9fb Update zpool Makefile 2008-12-22 09:10:00 -08:00
Brian Behlendorf 3d2e368e7a Refresh autogen products 2008-12-19 16:12:00 -08:00
Brian Behlendorf 3da25300e3 Refresh autogen products 2008-12-18 14:02:22 -08:00
Brian Behlendorf d918e8e97d Refresh autogen products 2008-12-16 09:12:43 -08:00
Brian Behlendorf b7374fc81b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 09:06:51 -08:00
Brian Behlendorf bf01b1ccdf Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 09:06:12 -08:00
Brian Behlendorf 151ee60cbf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 09:05:02 -08:00
Brian Behlendorf 589a6c72d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 09:03:27 -08:00
Brian Behlendorf 4504aa575b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-16 09:03:17 -08:00
Brian Behlendorf 3ba34afff8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 09:02:49 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf bffca6c378 Refresh autogen products 2008-12-15 16:58:02 -08:00
Brian Behlendorf 52de958498 Refresh autogen products 2008-12-12 12:17:51 -08:00
Brian Behlendorf 7297c6d959 Refresh autogen products 2008-12-12 10:31:54 -08:00
Brian Behlendorf 609680b177 Refresh autogen products 2008-12-12 10:20:55 -08:00
Brian Behlendorf 3b4adb0abd Add all autogen products 2008-12-12 09:25:06 -08:00
Brian Behlendorf 06c36a4115 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 08:53:24 -08:00
Brian Behlendorf 370d47306c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 08:53:03 -08:00
Brian Behlendorf 579ce8f9b7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 08:52:28 -08:00
Brian Behlendorf 690e4461e6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 08:52:24 -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 645c51287f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 11:37:35 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -08:00
Brian Behlendorf 1b0348e335 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 11:35:29 -08:00
Brian Behlendorf a9ec92e894 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-11 11:35:19 -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