Brian Behlendorf
|
2e227a6bc5
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:09:33 -08:00 |
|
Brian Behlendorf
|
b400203d0e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-02 13:09:31 -08:00 |
|
Brian Behlendorf
|
5c9d5665d0
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:09:25 -08:00 |
|
Brian Behlendorf
|
b7e4120957
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-02 13:09:23 -08:00 |
|
Brian Behlendorf
|
bf187005a1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:09:18 -08:00 |
|
Brian Behlendorf
|
fd833385a1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-02 13:09:16 -08:00 |
|
Brian Behlendorf
|
998c8f4eb6
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:09:10 -08:00 |
|
Brian Behlendorf
|
6101f4eff7
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-11-02 13:09:08 -08:00 |
|
Brian Behlendorf
|
7f55b21402
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:09:03 -08:00 |
|
Brian Behlendorf
|
a92e09ddc8
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-11-02 13:09:01 -08:00 |
|
Brian Behlendorf
|
76ba93a6a2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:08:55 -08:00 |
|
Brian Behlendorf
|
d900c14eb8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-11-02 13:08:53 -08:00 |
|
Brian Behlendorf
|
8e67f06afd
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-02 13:08:53 -08:00 |
|
Brian Behlendorf
|
81ee212289
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:08:43 -08:00 |
|
Brian Behlendorf
|
fe37c84773
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-11-02 13:08:41 -08:00 |
|
Brian Behlendorf
|
e3e3a5fc70
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-02 13:08:40 -08:00 |
|
Brian Behlendorf
|
1eb76a730e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:08:30 -08:00 |
|
Brian Behlendorf
|
0a7eca5fc7
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-11-02 13:08:28 -08:00 |
|
Brian Behlendorf
|
63cf6659a6
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:08:23 -08:00 |
|
Brian Behlendorf
|
950bbe60ca
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-11-02 13:08:21 -08:00 |
|
Brian Behlendorf
|
fb469b7e77
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:08:15 -08:00 |
|
Brian Behlendorf
|
a472010844
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-11-02 13:08:14 -08:00 |
|
Brian Behlendorf
|
3282cf9748
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-11-02 13:08:08 -08:00 |
|
Brian Behlendorf
|
eb8d5024c4
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-11-02 13:08:06 -08:00 |
|
Brian Behlendorf
|
1911adb241
|
Prep for 0.4.6 tag, updated META, ChangeLog, and TODO.
|
2009-11-02 13:03:59 -08:00 |
|
Brian Behlendorf
|
84fc60b884
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-11-02 09:25:41 -08:00 |
|
Brian Behlendorf
|
77446e653c
|
Add performance results for v0.4.6 on 1/4 scale test system.
|
2009-11-02 09:20:44 -08:00 |
|
Brian Behlendorf
|
308d9739af
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:04:30 -07:00 |
|
Brian Behlendorf
|
5b1aee0c36
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-10-27 15:04:28 -07:00 |
|
Brian Behlendorf
|
c0105c3b4c
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:04:22 -07:00 |
|
Brian Behlendorf
|
c3344b66bd
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-10-27 15:04:21 -07:00 |
|
Brian Behlendorf
|
d2bbaf0ffb
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:04:15 -07:00 |
|
Brian Behlendorf
|
d624508c99
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-10-27 15:04:13 -07:00 |
|
Brian Behlendorf
|
633f7e4741
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:04:08 -07:00 |
|
Brian Behlendorf
|
86b691881a
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-10-27 15:04:06 -07:00 |
|
Brian Behlendorf
|
2e7a8be785
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:04:00 -07:00 |
|
Brian Behlendorf
|
64a466be15
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-10-27 15:03:59 -07:00 |
|
Brian Behlendorf
|
d34af681ee
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:03:53 -07:00 |
|
Brian Behlendorf
|
98e0ea6e3e
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-10-27 15:03:51 -07:00 |
|
Brian Behlendorf
|
22c51d6136
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:03:46 -07:00 |
|
Brian Behlendorf
|
8cfd186d87
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-10-27 15:03:44 -07:00 |
|
Brian Behlendorf
|
c13dfeaef8
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:03:38 -07:00 |
|
Brian Behlendorf
|
8e13193161
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-10-27 15:03:36 -07:00 |
|
Brian Behlendorf
|
a2fc401278
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:03:31 -07:00 |
|
Brian Behlendorf
|
a8d302ff83
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-10-27 15:03:29 -07:00 |
|
Brian Behlendorf
|
d7fb4ab7fe
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:03:23 -07:00 |
|
Brian Behlendorf
|
d60568eb41
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-10-27 15:03:22 -07:00 |
|
Brian Behlendorf
|
6f111fc3e6
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:03:16 -07:00 |
|
Brian Behlendorf
|
d509ff0e40
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-10-27 15:03:14 -07:00 |
|
Brian Behlendorf
|
969fde4ae5
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-10-27 15:03:09 -07:00 |