Brian Behlendorf
|
cb305cfef6
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:20:38 -07:00 |
|
Brian Behlendorf
|
56b172f7d9
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-20 14:20:35 -07:00 |
|
Brian Behlendorf
|
666ec09796
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:20:25 -07:00 |
|
Brian Behlendorf
|
a1bfcb158a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-20 14:20:22 -07:00 |
|
Brian Behlendorf
|
c9b1db4167
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:20:12 -07:00 |
|
Brian Behlendorf
|
3c04cc3943
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-20 14:20:09 -07:00 |
|
Brian Behlendorf
|
a7da34e996
|
Prep for zfs-0.4.3 tag
|
2009-03-20 14:11:49 -07:00 |
|
Brian Behlendorf
|
96acda4bf2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-20 13:26:40 -07:00 |
|
Brian Behlendorf
|
cc5ce72296
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-20 13:26:38 -07:00 |
|
Brian Behlendorf
|
f47473638b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-20 13:26:36 -07:00 |
|
Brian Behlendorf
|
9806b5c02b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-20 13:26:18 -07:00 |
|
Brian Behlendorf
|
6bf1e782f4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-20 13:26:16 -07:00 |
|
Brian Behlendorf
|
9bee47e648
|
Export additional txg_* symbols.
|
2009-03-20 13:17:23 -07:00 |
|
Brian Behlendorf
|
c7c7fdb42d
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:33:54 -07:00 |
|
Brian Behlendorf
|
17a6ec3550
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-20 09:33:52 -07:00 |
|
Brian Behlendorf
|
ea68067dda
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:33:42 -07:00 |
|
Brian Behlendorf
|
d24362e80b
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-20 09:33:38 -07:00 |
|
Brian Behlendorf
|
193772d9da
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:33:27 -07:00 |
|
Brian Behlendorf
|
acc8592301
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-20 09:33:24 -07:00 |
|
Brian Behlendorf
|
bacd999e24
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:33:15 -07:00 |
|
Brian Behlendorf
|
b28e2714bb
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-20 09:33:13 -07:00 |
|
Brian Behlendorf
|
7bd29ad7c7
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:33:04 -07:00 |
|
Brian Behlendorf
|
fa58082158
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-20 09:33:01 -07:00 |
|
Brian Behlendorf
|
f78ca5c2ab
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:32:52 -07:00 |
|
Brian Behlendorf
|
0826ebc008
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-20 09:32:50 -07:00 |
|
Brian Behlendorf
|
37628ebd6b
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:32:35 -07:00 |
|
Brian Behlendorf
|
77d833f35d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-20 09:32:33 -07:00 |
|
Brian Behlendorf
|
bc1f2b397b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:32:24 -07:00 |
|
Brian Behlendorf
|
c146703cee
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-20 09:32:19 -07:00 |
|
Brian Behlendorf
|
91157cb5bd
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:32:07 -07:00 |
|
Brian Behlendorf
|
577bba8cb4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-20 09:32:05 -07:00 |
|
Brian Behlendorf
|
abdee45efa
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:31:56 -07:00 |
|
Brian Behlendorf
|
c103950c83
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-20 09:31:53 -07:00 |
|
Brian Behlendorf
|
dc47907612
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:31:40 -07:00 |
|
Brian Behlendorf
|
625246e433
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-20 09:31:37 -07:00 |
|
Brian Behlendorf
|
005f633689
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:31:27 -07:00 |
|
Brian Behlendorf
|
fe14e8358c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-20 09:31:25 -07:00 |
|
Brian Behlendorf
|
8f44809fd0
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-20 09:31:22 -07:00 |
|
Brian Behlendorf
|
4b94528a3b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:31:05 -07:00 |
|
Brian Behlendorf
|
7c478996ea
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-20 09:31:03 -07:00 |
|
Brian Behlendorf
|
dddcb5433e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-20 09:31:02 -07:00 |
|
Brian Behlendorf
|
3d1e6e9131
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:30:45 -07:00 |
|
Brian Behlendorf
|
363c8403f9
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-20 09:30:40 -07:00 |
|
Brian Behlendorf
|
9a86bf70ea
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:30:31 -07:00 |
|
Brian Behlendorf
|
b6c72e1597
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-20 09:30:27 -07:00 |
|
Brian Behlendorf
|
2d6fe60277
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:30:18 -07:00 |
|
Brian Behlendorf
|
dd585763ef
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-20 09:30:16 -07:00 |
|
Brian Behlendorf
|
8ff5c50043
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:30:05 -07:00 |
|
Brian Behlendorf
|
daab277117
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-20 09:30:03 -07:00 |
|
Brian Behlendorf
|
ce163049ed
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-20 09:29:54 -07:00 |