Brian Behlendorf
|
a97ae2184f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:24:15 -07:00 |
|
Brian Behlendorf
|
4f1f00b7d0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-20 14:24:13 -07:00 |
|
Brian Behlendorf
|
5bb01dd310
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:24:02 -07:00 |
|
Brian Behlendorf
|
a4c59faac5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-20 14:23:59 -07:00 |
|
Brian Behlendorf
|
08d4cd5514
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:23:45 -07:00 |
|
Brian Behlendorf
|
82549b1466
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-20 14:23:40 -07:00 |
|
Brian Behlendorf
|
8e3f59d062
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:23:29 -07:00 |
|
Brian Behlendorf
|
c9a81ade25
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-20 14:23:26 -07:00 |
|
Brian Behlendorf
|
e041e263c8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:23:14 -07:00 |
|
Brian Behlendorf
|
5ebd3d9067
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-20 14:23:07 -07:00 |
|
Brian Behlendorf
|
0139706e8c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:22:55 -07:00 |
|
Brian Behlendorf
|
896eb6779d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-20 14:22:52 -07:00 |
|
Brian Behlendorf
|
b966a8e57b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:22:41 -07:00 |
|
Brian Behlendorf
|
fc55e01d78
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-20 14:22:37 -07:00 |
|
Brian Behlendorf
|
e6dc9a7843
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:22:24 -07:00 |
|
Brian Behlendorf
|
11978efb62
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-20 14:22:21 -07:00 |
|
Brian Behlendorf
|
e1fc193990
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-20 14:22:20 -07:00 |
|
Brian Behlendorf
|
8b67760124
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:21:56 -07:00 |
|
Brian Behlendorf
|
ed4bc356a2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-20 14:21:54 -07:00 |
|
Brian Behlendorf
|
1072e031f6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-20 14:21:53 -07:00 |
|
Brian Behlendorf
|
8454e6c4b3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:21:34 -07:00 |
|
Brian Behlendorf
|
2462ebe0f0
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-20 14:21:32 -07:00 |
|
Brian Behlendorf
|
4c208ff0c8
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:21:22 -07:00 |
|
Brian Behlendorf
|
b7e4515745
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-20 14:21:18 -07:00 |
|
Brian Behlendorf
|
c29c4be2cb
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:21:08 -07:00 |
|
Brian Behlendorf
|
c1f19ee7d0
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-20 14:21:05 -07:00 |
|
Brian Behlendorf
|
08e7aaad24
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-20 14:20:55 -07:00 |
|
Brian Behlendorf
|
a68971a7c4
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-20 14:20:52 -07:00 |
|
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 |