Brian Behlendorf
|
5ae7f2d447
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:35:25 -08:00 |
|
Brian Behlendorf
|
705e9ac15e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:35:22 -08:00 |
|
Brian Behlendorf
|
c2b0eb3275
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-13 15:35:21 -08:00 |
|
Brian Behlendorf
|
7cf0be8842
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:35:17 -08:00 |
|
Brian Behlendorf
|
2d0ee71f94
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-13 15:35:15 -08:00 |
|
Brian Behlendorf
|
82f0fdbdcb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:35:12 -08:00 |
|
Brian Behlendorf
|
d4b1a9ab68
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-13 15:35:11 -08:00 |
|
Brian Behlendorf
|
1f64111eb2
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:35:07 -08:00 |
|
Brian Behlendorf
|
b0064d448c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 15:35:06 -08:00 |
|
Brian Behlendorf
|
b6cf7f74c5
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:35:02 -08:00 |
|
Brian Behlendorf
|
95db697cc4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 15:35:01 -08:00 |
|
Brian Behlendorf
|
2de007e0f7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:57 -08:00 |
|
Brian Behlendorf
|
12e5cfca38
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 15:34:56 -08:00 |
|
Brian Behlendorf
|
c9935430aa
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:53 -08:00 |
|
Brian Behlendorf
|
392993d32a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 15:34:51 -08:00 |
|
Brian Behlendorf
|
df4ea7e1bc
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:48 -08:00 |
|
Brian Behlendorf
|
d92517e2a1
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
9cccf52448
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
4aad396e5a
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:40 -08:00 |
|
Brian Behlendorf
|
43ac9f83e1
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 15:34:39 -08:00 |
|
Brian Behlendorf
|
c3335290e2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:34:38 -08:00 |
|
Brian Behlendorf
|
7dace9aec8
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:32 -08:00 |
|
Brian Behlendorf
|
abe3184aeb
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-13 15:34:31 -08:00 |
|
Brian Behlendorf
|
52d58d2616
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:28 -08:00 |
|
Brian Behlendorf
|
eb1e020720
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-13 15:34:26 -08:00 |
|
Brian Behlendorf
|
d051add069
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:23 -08:00 |
|
Brian Behlendorf
|
46e156cec9
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-13 15:34:21 -08:00 |
|
Brian Behlendorf
|
1d1e8cadd7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:18 -08:00 |
|
Brian Behlendorf
|
eae91b2624
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-13 15:34:16 -08:00 |
|
Brian Behlendorf
|
42f63625dd
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:13 -08:00 |
|
Brian Behlendorf
|
4317840a97
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 15:34:11 -08:00 |
|
Brian Behlendorf
|
2e99d850d2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:08 -08:00 |
|
Brian Behlendorf
|
39e3c78729
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-13 15:34:07 -08:00 |
|
Brian Behlendorf
|
38f7defc95
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:04 -08:00 |
|
Brian Behlendorf
|
93b6e66d9b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
32baeb1712
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
0d6b81fcca
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:34:00 -08:00 |
|
Brian Behlendorf
|
3f5fdfbf8b
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
43cd437415
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
94944fab96
|
Fix proper list node initialization
|
2009-01-13 15:31:58 -08:00 |
|
Brian Behlendorf
|
fb8de2434e
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:08:47 -08:00 |
|
Brian Behlendorf
|
d0fe66ebf8
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 15:08:46 -08:00 |
|
Brian Behlendorf
|
1b1ca89e8b
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:08:43 -08:00 |
|
Brian Behlendorf
|
0441373057
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-13 15:08:41 -08:00 |
|
Brian Behlendorf
|
cd693b7cf7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:08:38 -08:00 |
|
Brian Behlendorf
|
0a00f818d5
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-13 15:08:37 -08:00 |
|
Brian Behlendorf
|
63873d080e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:08:33 -08:00 |
|
Brian Behlendorf
|
5ddcc115b3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:08:32 -08:00 |
|
Brian Behlendorf
|
0a39cb494c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:08:28 -08:00 |
|
Brian Behlendorf
|
8f996d3e34
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-13 15:08:27 -08:00 |