580057f2d8
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2008-12-18 11:40:22 -08:00
31cd18bef6
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-18 11:40:21 -08:00
de993998b7
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-18 11:40:18 -08:00
c17037eb8d
Revert commit_cb feature
2008-12-18 11:40:12 -08:00
9ea19b6cd2
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:45 -08:00
562e6a49d3
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-18 11:39:44 -08:00
64cc5cb599
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:41 -08:00
a974c42a02
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:39:39 -08:00
aa3215cef4
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:36 -08:00
caac73b67d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:39:34 -08:00
3c4068ddd8
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:31 -08:00
0b5b1b5cc0
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:39:29 -08:00
77111539c9
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:26 -08:00
7b836ab418
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:39:24 -08:00
5d35ca8e32
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:21 -08:00
f63ea3c521
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:39:20 -08:00
d6043e1141
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:16 -08:00
60b7c664e0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:39:15 -08:00
8b46ed9359
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:39:14 -08:00
1e008768d5
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-18 11:39:09 -08:00
944fd8ad8c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:39:07 -08:00
bf57b913fb
Revert commit_cb feature
2008-12-18 11:39:02 -08:00
60e2e5c0a3
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2008-12-18 11:38:16 -08:00
e43153f247
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 11:38:15 -08:00
08be840fe8
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2008-12-18 11:38:12 -08:00
c9b5a02a83
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2008-12-18 11:38:10 -08:00
0beec04424
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2008-12-18 11:38:07 -08:00
ebabd312bd
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-18 11:38:05 -08:00
b5347daa8c
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2008-12-18 11:38:02 -08:00
6200d749d7
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-18 11:38:00 -08:00
43b4d4d2e8
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2008-12-18 11:37:57 -08:00
53e2d81686
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 11:37:55 -08:00
af3b779e50
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2008-12-18 11:37:52 -08:00
26435d0564
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2008-12-18 11:37:50 -08:00
612f7c20d1
Revert commit_cb feature
2008-12-18 11:37:08 -08:00
1c05357f9d
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2008-12-18 11:34:27 -08:00
58645698b4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:34:26 -08:00
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
053a2fffcf
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2008-12-18 11:34:24 -08:00
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
c7dd5e026f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:31 -08:00
74d4f44d1d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-18 11:26:29 -08:00
d2083bda5a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:25 -08:00
262cfab991
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-18 11:26:24 -08:00
fc34e3ec62
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:19 -08:00
0ab2957537
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:26:17 -08:00
7d3aa7252e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:14 -08:00
97e7f7b4ec
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-18 11:26:12 -08:00
632950a719
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:08 -08:00
Brian Behlendorf