Commit Graph

9785 Commits

Author SHA1 Message Date
Brian Behlendorf 00fafb5c53 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-01-20 15:45:52 -08:00
Brian Behlendorf 6a89150864 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-01-20 15:45:50 -08:00
Brian Behlendorf 1294061f7d Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-01-20 15:45:50 -08:00
Brian Behlendorf 25a9c48ccc Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-01-20 15:45:49 -08:00
Brian Behlendorf 41b62d6b5d Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-20 15:45:48 -08:00
Brian Behlendorf 022d01e0d4 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-20 15:45:47 -08:00
Brian Behlendorf 87718a9290 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-20 15:45:46 -08:00
Brian Behlendorf 4710ede86a Add GIT to master 2009-01-20 15:43:44 -08:00
Brian Behlendorf 26d0de9a92 Update Makefiles for recent script updates 2009-01-20 15:43:21 -08:00
Brian Behlendorf 5e05320a82 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-01-20 15:39:27 -08:00
Brian Behlendorf 600b245251 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-20 15:39:25 -08:00
Brian Behlendorf 67afbe7870 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-20 15:39:22 -08:00
Brian Behlendorf ed7650ebb1 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-20 15:39:21 -08:00
Brian Behlendorf 14df4747f0 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-20 15:39:17 -08:00
Brian Behlendorf 7553978911 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-20 15:39:16 -08:00
Brian Behlendorf f1bc2ec1a2 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-20 15:39:13 -08:00
Brian Behlendorf 1fd96e8633 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-20 15:39:11 -08:00
Brian Behlendorf e66c93f818 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-20 15:39:08 -08:00
Brian Behlendorf f146db30ba Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-20 15:39:06 -08:00
Brian Behlendorf e0e9873bcf Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-20 15:39:03 -08:00
Brian Behlendorf 2cd4129a46 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-20 15:39:01 -08:00
Brian Behlendorf 04a25f4633 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:58 -08:00
Brian Behlendorf 9c21689864 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-20 15:38:56 -08:00
Brian Behlendorf 9c2f31e506 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:53 -08:00
Brian Behlendorf 524478d361 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-20 15:38:51 -08:00
Brian Behlendorf b89f77dd51 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:48 -08:00
Brian Behlendorf f3d317cff7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-20 15:38:47 -08:00
Brian Behlendorf 86945b7a91 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:43 -08:00
Brian Behlendorf 025a8df637 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-20 15:38:42 -08:00
Brian Behlendorf 9db54caf37 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:39 -08:00
Brian Behlendorf 0d1a62e01f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-20 15:38:37 -08:00
Brian Behlendorf 9cf77023b8 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:34 -08:00
Brian Behlendorf 5e42b813ba Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-20 15:38:32 -08:00
Brian Behlendorf 6276bac6fd Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:29 -08:00
Brian Behlendorf 9b532dc6f8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-20 15:38:28 -08:00
Brian Behlendorf 27ec051dd8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-20 15:38:27 -08:00
Brian Behlendorf 6aa154fc06 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:22 -08:00
Brian Behlendorf c4ff7b9e7c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-20 15:38:20 -08:00
Brian Behlendorf 106f128f71 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-20 15:38:19 -08:00
Brian Behlendorf e610d8c49d Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:14 -08:00
Brian Behlendorf cb32a13a57 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-20 15:38:12 -08:00
Brian Behlendorf 7e345f37a8 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:09 -08:00
Brian Behlendorf a51ab26479 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-20 15:38:07 -08:00
Brian Behlendorf 4368a1849e Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-20 15:38:04 -08:00
Brian Behlendorf 3a4dfc0f90 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-20 15:38:03 -08:00
Brian Behlendorf 0183a2f11a Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-20 15:37:59 -08:00
Brian Behlendorf 0e6376aa5c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-20 15:37:58 -08:00
Brian Behlendorf cc1d4584c2 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-20 15:37:55 -08:00
Brian Behlendorf 6d7ca5459f Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-20 15:37:53 -08:00
Brian Behlendorf 5061c7df33 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-20 15:37:50 -08:00