Brian Behlendorf
|
92f0c544a0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:02:23 -07:00 |
|
Brian Behlendorf
|
4676ae36b5
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-02 14:02:22 -07:00 |
|
Brian Behlendorf
|
4a2292f73c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:02:16 -07:00 |
|
Brian Behlendorf
|
8a3c507e6f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-02 14:02:14 -07:00 |
|
Brian Behlendorf
|
55a626e27e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:02:09 -07:00 |
|
Brian Behlendorf
|
18b4e0cc97
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-02 14:02:08 -07:00 |
|
Brian Behlendorf
|
7fde40534c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:02:02 -07:00 |
|
Brian Behlendorf
|
630ee6d753
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-02 14:02:00 -07:00 |
|
Brian Behlendorf
|
3ae7729c1e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:01:55 -07:00 |
|
Brian Behlendorf
|
4ced1b2940
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-02 14:01:53 -07:00 |
|
Brian Behlendorf
|
3c80f8922b
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:01:48 -07:00 |
|
Brian Behlendorf
|
7e4b3ab96f
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-02 14:01:46 -07:00 |
|
Brian Behlendorf
|
8096193a4d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:01:41 -07:00 |
|
Brian Behlendorf
|
bdc02b09ec
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-02 14:01:39 -07:00 |
|
Brian Behlendorf
|
443f6dd325
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:01:34 -07:00 |
|
Brian Behlendorf
|
026c46347f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-02 14:01:33 -07:00 |
|
Brian Behlendorf
|
2ae5ffedda
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:01:28 -07:00 |
|
Brian Behlendorf
|
c3e23b404e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-02 14:01:26 -07:00 |
|
Brian Behlendorf
|
48cb5099e2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-02 14:01:25 -07:00 |
|
Brian Behlendorf
|
8c3bd2eb6c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:01:16 -07:00 |
|
Brian Behlendorf
|
d067ffa8b5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-02 14:01:14 -07:00 |
|
Brian Behlendorf
|
813923c2e6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-02 14:01:13 -07:00 |
|
Brian Behlendorf
|
788f4dc5ce
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:01:04 -07:00 |
|
Brian Behlendorf
|
1e1db6f88a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-02 14:01:02 -07:00 |
|
Brian Behlendorf
|
fd2dc8ce19
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:00:57 -07:00 |
|
Brian Behlendorf
|
99dbc034b2
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-02 14:00:55 -07:00 |
|
Brian Behlendorf
|
52bb1e62b1
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:00:50 -07:00 |
|
Brian Behlendorf
|
1234dde584
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-02 14:00:48 -07:00 |
|
Brian Behlendorf
|
7179536d61
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:00:43 -07:00 |
|
Brian Behlendorf
|
0bf1e6efe6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-02 14:00:41 -07:00 |
|
Brian Behlendorf
|
4df1e355a3
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:00:36 -07:00 |
|
Brian Behlendorf
|
f8b5124242
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-02 14:00:34 -07:00 |
|
Brian Behlendorf
|
43d7f19c91
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:00:29 -07:00 |
|
Brian Behlendorf
|
39f03ed018
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-02 14:00:27 -07:00 |
|
Brian Behlendorf
|
f9eec0f01f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-02 14:00:22 -07:00 |
|
Brian Behlendorf
|
fa19ab6742
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-02 14:00:20 -07:00 |
|
Brian Behlendorf
|
6187d3100e
|
Update ChangeLog
|
2009-07-02 13:56:29 -07:00 |
|
Brian Behlendorf
|
147cf2a952
|
Update zfs-module rependencies to require spl-modules
|
2009-07-02 13:29:33 -07:00 |
|
Brian Behlendorf
|
22940e5248
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-02 10:52:38 -07:00 |
|
Brian Behlendorf
|
0ebc2edb0b
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-02 10:52:37 -07:00 |
|
Brian Behlendorf
|
10d3423457
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-02 10:52:31 -07:00 |
|
Brian Behlendorf
|
38fe67bd26
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-02 10:52:29 -07:00 |
|
Brian Behlendorf
|
0fe70d3928
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-02 10:52:24 -07:00 |
|
Brian Behlendorf
|
1fde6b6a13
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-02 10:52:22 -07:00 |
|
Brian Behlendorf
|
1373b978d2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-02 10:52:17 -07:00 |
|
Brian Behlendorf
|
43a9ed8954
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-02 10:52:15 -07:00 |
|
Brian Behlendorf
|
e061b6dc51
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-02 10:52:10 -07:00 |
|
Brian Behlendorf
|
a04973fad0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-02 10:52:08 -07:00 |
|
Brian Behlendorf
|
c1dd4b2d96
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-02 10:52:02 -07:00 |
|
Brian Behlendorf
|
1191de4458
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-02 10:52:00 -07:00 |