Commit Graph

11347 Commits

Author SHA1 Message Date
Brian Behlendorf
a52c5d7160 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-02-04 16:33:10 -08:00
Brian Behlendorf
5fc909c0f0 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-02-04 16:33:08 -08:00
Brian Behlendorf
ebf6e01ebc Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-02-04 16:33:04 -08:00
Brian Behlendorf
92bb70ba6d Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-02-04 16:32:56 -08:00
Brian Behlendorf
812bee04c5 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-02-04 16:32:52 -08:00
Brian Behlendorf
7be4e1889b Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-02-04 16:32:45 -08:00
Brian Behlendorf
ad809fdb1a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-02-04 16:32:42 -08:00
Brian Behlendorf
9662f7a914 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-02-04 16:32:34 -08:00
Brian Behlendorf
d3845e7089 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-02-04 16:32:32 -08:00
Brian Behlendorf
a07e06b4ea Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-04 16:32:24 -08:00
Brian Behlendorf
69f4668270 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-04 16:32:20 -08:00
Brian Behlendorf
0e285e17b9 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-02-04 16:32:14 -08:00
Brian Behlendorf
ef7bd6bdd5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-04 16:32:11 -08:00
Brian Behlendorf
e83f7c1927 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-02-04 16:32:05 -08:00
Brian Behlendorf
7a16be7088 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-04 16:32:01 -08:00
Brian Behlendorf
8282bf3d08 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-02-04 16:31:54 -08:00
Brian Behlendorf
daed355e0b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-02-04 16:31:52 -08:00
Brian Behlendorf
e352890ec9 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-02-04 16:31:46 -08:00
Brian Behlendorf
0a7abf5972 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-04 16:31:43 -08:00
Brian Behlendorf
e0deb8f920 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-02-04 16:31:36 -08:00
Brian Behlendorf
58a374f815 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-02-04 16:31:33 -08:00
Brian Behlendorf
e90efdd310 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-02-04 16:31:27 -08:00
Brian Behlendorf
c6315831f8 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-04 16:31:24 -08:00
Brian Behlendorf
6db150cf02 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-02-04 16:31:18 -08:00
Brian Behlendorf
65cba8ed58 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-04 16:31:14 -08:00
Brian Behlendorf
d348df753f Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-02-04 16:31:10 -08:00
Brian Behlendorf
babb8a5b66 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-02-04 16:31:06 -08:00
Brian Behlendorf
3bb6130629 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-02-04 16:31:05 -08:00
Brian Behlendorf
236399b1af Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-02-04 16:30:53 -08:00
Brian Behlendorf
da60adbf86 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-02-04 16:30:50 -08:00
Brian Behlendorf
2aaf656fe2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-04 16:30:48 -08:00
Brian Behlendorf
d941dc3a04 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-02-04 16:30:37 -08:00
Brian Behlendorf
697048027f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-02-04 16:30:35 -08:00
Brian Behlendorf
e83fdee73d Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-02-04 16:30:28 -08:00
Brian Behlendorf
ccd50bc9a9 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-02-04 16:30:25 -08:00
Brian Behlendorf
8e17c5b3ab Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-02-04 16:30:20 -08:00
Brian Behlendorf
776566753b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-04 16:30:16 -08:00
Brian Behlendorf
4d4cef0d0e Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-02-04 16:30:09 -08:00
Brian Behlendorf
cc37ae09a0 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-02-04 16:30:05 -08:00
Brian Behlendorf
9eabf9e068 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-02-04 16:29:58 -08:00
Brian Behlendorf
066ba042e8 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-02-04 16:29:54 -08:00
Brian Behlendorf
27acff8387 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-02-04 16:29:47 -08:00
Brian Behlendorf
bca4172725 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-02-04 16:29:43 -08:00
Brian Behlendorf
4ebe58bf55 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-04 16:29:36 -08:00
Brian Behlendorf
1cc865f9b4 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-04 16:29:32 -08:00
Brian Behlendorf
83ed5b4c5d Update TODO 2009-02-04 16:25:09 -08:00
Brian Behlendorf
8ed0baaefc Merge commit 'refs/top-bases/top' into top 2009-02-04 15:21:42 -08:00
Brian Behlendorf
2e09d52d30 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-04 15:21:41 -08:00
Brian Behlendorf
9dac8c005d Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-02-04 15:21:39 -08:00
Brian Behlendorf
895c8b9629 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-04 15:21:38 -08:00