Brian Behlendorf
|
f146db30ba
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-20 15:39:06 -08:00 |
|
Brian Behlendorf
|
e0e9873bcf
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:39:03 -08:00 |
|
Brian Behlendorf
|
2cd4129a46
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-20 15:39:01 -08:00 |
|
Brian Behlendorf
|
04a25f4633
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:58 -08:00 |
|
Brian Behlendorf
|
9c21689864
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-20 15:38:56 -08:00 |
|
Brian Behlendorf
|
9c2f31e506
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:53 -08:00 |
|
Brian Behlendorf
|
524478d361
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-20 15:38:51 -08:00 |
|
Brian Behlendorf
|
b89f77dd51
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:48 -08:00 |
|
Brian Behlendorf
|
f3d317cff7
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-20 15:38:47 -08:00 |
|
Brian Behlendorf
|
86945b7a91
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:43 -08:00 |
|
Brian Behlendorf
|
025a8df637
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-20 15:38:42 -08:00 |
|
Brian Behlendorf
|
9db54caf37
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:39 -08:00 |
|
Brian Behlendorf
|
0d1a62e01f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-20 15:38:37 -08:00 |
|
Brian Behlendorf
|
9cf77023b8
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:34 -08:00 |
|
Brian Behlendorf
|
5e42b813ba
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-20 15:38:32 -08:00 |
|
Brian Behlendorf
|
6276bac6fd
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:29 -08:00 |
|
Brian Behlendorf
|
9b532dc6f8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 15:38:28 -08:00 |
|
Brian Behlendorf
|
27ec051dd8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 15:38:27 -08:00 |
|
Brian Behlendorf
|
6aa154fc06
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:22 -08:00 |
|
Brian Behlendorf
|
c4ff7b9e7c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 15:38:20 -08:00 |
|
Brian Behlendorf
|
106f128f71
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 15:38:19 -08:00 |
|
Brian Behlendorf
|
e610d8c49d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:14 -08:00 |
|
Brian Behlendorf
|
cb32a13a57
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-20 15:38:12 -08:00 |
|
Brian Behlendorf
|
7e345f37a8
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:09 -08:00 |
|
Brian Behlendorf
|
a51ab26479
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-20 15:38:07 -08:00 |
|
Brian Behlendorf
|
4368a1849e
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:38:04 -08:00 |
|
Brian Behlendorf
|
3a4dfc0f90
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-20 15:38:03 -08:00 |
|
Brian Behlendorf
|
0183a2f11a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:37:59 -08:00 |
|
Brian Behlendorf
|
0e6376aa5c
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-20 15:37:58 -08:00 |
|
Brian Behlendorf
|
cc1d4584c2
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:37:55 -08:00 |
|
Brian Behlendorf
|
6d7ca5459f
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-20 15:37:53 -08:00 |
|
Brian Behlendorf
|
5061c7df33
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:37:50 -08:00 |
|
Brian Behlendorf
|
61a1602529
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-20 15:37:48 -08:00 |
|
Brian Behlendorf
|
bc5d2102c6
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:37:45 -08:00 |
|
Brian Behlendorf
|
c02db5c580
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-20 15:37:43 -08:00 |
|
Brian Behlendorf
|
8e976f7fcf
|
Moving GIT to master for easier reference
|
2009-01-20 15:35:40 -08:00 |
|
Brian Behlendorf
|
af43246767
|
Minor script cleanup
|
2009-01-20 15:34:38 -08:00 |
|
Brian Behlendorf
|
e125a95615
|
Minor script cleanup
|
2009-01-20 15:34:02 -08:00 |
|
Brian Behlendorf
|
89a729a932
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:34:07 -08:00 |
|
Brian Behlendorf
|
eb205c6e62
|
Update zpios to use zpool-create -d arg, and zpios-start/stop
|
2009-01-20 14:32:02 -08:00 |
|
Brian Behlendorf
|
a7f82bb7de
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:41 -08:00 |
|
Brian Behlendorf
|
5cb9a87a7c
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-20 14:18:40 -08:00 |
|
Brian Behlendorf
|
0d628511bc
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:37 -08:00 |
|
Brian Behlendorf
|
34fbd61708
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-20 14:18:35 -08:00 |
|
Brian Behlendorf
|
e9155cc46e
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:32 -08:00 |
|
Brian Behlendorf
|
72a988b98c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-20 14:18:31 -08:00 |
|
Brian Behlendorf
|
da8543e4ea
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:27 -08:00 |
|
Brian Behlendorf
|
a67594e629
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-20 14:18:26 -08:00 |
|
Brian Behlendorf
|
065247617b
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:23 -08:00 |
|
Brian Behlendorf
|
5fb57391c8
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-20 14:18:21 -08:00 |