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
|
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 |
|
Brian Behlendorf
|
e8bee86183
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:18 -08:00 |
|
Brian Behlendorf
|
10bef218eb
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-20 14:18:16 -08:00 |
|
Brian Behlendorf
|
1d11a64fc3
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:13 -08:00 |
|
Brian Behlendorf
|
5d1737a48f
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-20 14:18:12 -08:00 |
|
Brian Behlendorf
|
3ecd579f27
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:09 -08:00 |
|
Brian Behlendorf
|
5c881f51f8
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-20 14:18:07 -08:00 |
|
Brian Behlendorf
|
a7a8a81e12
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:18:04 -08:00 |
|
Brian Behlendorf
|
6a82044ee4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-20 14:18:02 -08:00 |
|
Brian Behlendorf
|
2d61525b54
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:59 -08:00 |
|
Brian Behlendorf
|
f12452222f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-20 14:17:58 -08:00 |
|
Brian Behlendorf
|
0bbf8d9325
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:54 -08:00 |
|
Brian Behlendorf
|
c9fe1e4762
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-20 14:17:53 -08:00 |
|
Brian Behlendorf
|
e87fb12847
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:50 -08:00 |
|
Brian Behlendorf
|
3055d18a24
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-20 14:17:48 -08:00 |
|
Brian Behlendorf
|
4de9c053d1
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:45 -08:00 |
|
Brian Behlendorf
|
5ba7ea6d74
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 14:17:44 -08:00 |
|
Brian Behlendorf
|
00dfb4f9c6
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 14:17:43 -08:00 |
|
Brian Behlendorf
|
d3d5d8f6b6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:38 -08:00 |
|
Brian Behlendorf
|
521f8f2000
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 14:17:37 -08:00 |
|
Brian Behlendorf
|
e460c5ccf7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 14:17:36 -08:00 |
|
Brian Behlendorf
|
51b252e8dd
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:30 -08:00 |
|
Brian Behlendorf
|
8a42ea01cd
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-20 14:17:29 -08:00 |
|
Brian Behlendorf
|
e79bbb085f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:26 -08:00 |
|
Brian Behlendorf
|
a642b97bdc
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-20 14:17:24 -08:00 |
|
Brian Behlendorf
|
e986d805a6
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:21 -08:00 |
|
Brian Behlendorf
|
a9963a06c1
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-20 14:17:20 -08:00 |
|
Brian Behlendorf
|
315642158c
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:16 -08:00 |
|
Brian Behlendorf
|
8f1613a9b0
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-20 14:17:15 -08:00 |
|
Brian Behlendorf
|
8604e25eb8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:12 -08:00 |
|
Brian Behlendorf
|
01fec1f587
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-20 14:17:10 -08:00 |
|
Brian Behlendorf
|
52449369f6
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:07 -08:00 |
|
Brian Behlendorf
|
5e4988706a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-20 14:17:06 -08:00 |
|
Brian Behlendorf
|
bd11623ed8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-20 14:17:03 -08:00 |
|
Brian Behlendorf
|
4fdef89579
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-20 14:17:01 -08:00 |