Brian Behlendorf
|
99ad5e52ef
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:54:25 -08:00 |
|
Brian Behlendorf
|
6d0683f22e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-02-18 14:54:19 -08:00 |
|
Brian Behlendorf
|
2ac0eff920
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:54:12 -08:00 |
|
Brian Behlendorf
|
57d3734135
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-02-18 14:54:11 -08:00 |
|
Brian Behlendorf
|
16476018d0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:54:04 -08:00 |
|
Brian Behlendorf
|
9c5d177bb3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-02-18 14:54:02 -08:00 |
|
Brian Behlendorf
|
c3e27a7e5a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-02-18 14:54:01 -08:00 |
|
Brian Behlendorf
|
21b0d0ace4
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:53:51 -08:00 |
|
Brian Behlendorf
|
d2578f1221
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-02-18 14:53:49 -08:00 |
|
Brian Behlendorf
|
6416e088cd
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 14:53:47 -08:00 |
|
Brian Behlendorf
|
5f5feac42e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:53:29 -08:00 |
|
Brian Behlendorf
|
68d91c8fa1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-02-18 14:53:27 -08:00 |
|
Brian Behlendorf
|
e6898928d3
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:53:21 -08:00 |
|
Brian Behlendorf
|
ad125c7af8
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-02-18 14:53:19 -08:00 |
|
Brian Behlendorf
|
744478bc4c
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:53:13 -08:00 |
|
Brian Behlendorf
|
3409f1d3d5
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-02-18 14:53:11 -08:00 |
|
Brian Behlendorf
|
542eaa3116
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:53:01 -08:00 |
|
Brian Behlendorf
|
4a0317fb32
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-02-18 14:52:51 -08:00 |
|
Brian Behlendorf
|
a483b03679
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:52:45 -08:00 |
|
Brian Behlendorf
|
801a15f2ee
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-02-18 14:52:43 -08:00 |
|
Brian Behlendorf
|
9b0077f4c8
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:52:36 -08:00 |
|
Brian Behlendorf
|
51961ce753
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-02-18 14:52:34 -08:00 |
|
Brian Behlendorf
|
15f320aa1a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:52:28 -08:00 |
|
Brian Behlendorf
|
886edde92f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-02-18 14:52:25 -08:00 |
|
Brian Behlendorf
|
cb9f181060
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 14:52:24 -08:00 |
|
Brian Behlendorf
|
9fbff500ce
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-02-18 14:52:23 -08:00 |
|
Brian Behlendorf
|
ec336d2216
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-02-18 14:52:22 -08:00 |
|
Brian Behlendorf
|
930c6e053c
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-02-18 14:52:21 -08:00 |
|
Brian Behlendorf
|
eb3d5e7051
|
Local try should be in this patch
|
2009-02-18 14:47:06 -08:00 |
|
Brian Behlendorf
|
dbca14abe5
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:38:48 -08:00 |
|
Brian Behlendorf
|
3bef977501
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-02-18 14:38:45 -08:00 |
|
Brian Behlendorf
|
aaf256d571
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:38:36 -08:00 |
|
Brian Behlendorf
|
7b8eca908f
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:
cmd/zpool/zpool_main.c
|
2009-02-18 14:38:20 -08:00 |
|
Brian Behlendorf
|
970df2160d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:37:34 -08:00 |
|
Brian Behlendorf
|
bf75e042f9
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-02-18 14:37:31 -08:00 |
|
Brian Behlendorf
|
5117794279
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:37:21 -08:00 |
|
Brian Behlendorf
|
181fd4addc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-02-18 14:37:16 -08:00 |
|
Brian Behlendorf
|
f334fc506f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:37:04 -08:00 |
|
Brian Behlendorf
|
b3d7657ea0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-02-18 14:37:01 -08:00 |
|
Brian Behlendorf
|
76927c3ce8
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:36:51 -08:00 |
|
Brian Behlendorf
|
437bc77985
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-02-18 14:36:49 -08:00 |
|
Brian Behlendorf
|
0e4236a51f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:36:38 -08:00 |
|
Brian Behlendorf
|
d6821ba8eb
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-02-18 14:36:31 -08:00 |
|
Brian Behlendorf
|
d7dbba1c15
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:36:19 -08:00 |
|
Brian Behlendorf
|
be3ffc5f9e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-02-18 14:36:16 -08:00 |
|
Brian Behlendorf
|
c24af94ee8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:36:07 -08:00 |
|
Brian Behlendorf
|
ba8fc98d00
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-02-18 14:36:04 -08:00 |
|
Brian Behlendorf
|
e9f1ac37de
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:35:51 -08:00 |
|
Brian Behlendorf
|
3d4185ed1d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-02-18 14:35:43 -08:00 |
|
Brian Behlendorf
|
6b4e501028
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-02-18 14:35:34 -08:00 |