Brian Behlendorf
|
fee4b2b73a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:31 -08:00 |
|
Brian Behlendorf
|
4fc74e2b6c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 09:25:30 -08:00 |
|
Brian Behlendorf
|
84c5585dac
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:27 -08:00 |
|
Brian Behlendorf
|
6b581058c0
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 09:25:26 -08:00 |
|
Brian Behlendorf
|
ad376e4a51
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:23 -08:00 |
|
Brian Behlendorf
|
7fdd9f5ef6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 09:25:22 -08:00 |
|
Brian Behlendorf
|
776b57ea0f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 09:25:21 -08:00 |
|
Brian Behlendorf
|
0e4a47b613
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:16 -08:00 |
|
Brian Behlendorf
|
2f6a15b788
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 09:25:15 -08:00 |
|
Brian Behlendorf
|
cb9167fcda
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 09:25:14 -08:00 |
|
Brian Behlendorf
|
0d03493b90
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:09 -08:00 |
|
Brian Behlendorf
|
886b642c46
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 09:25:07 -08:00 |
|
Brian Behlendorf
|
d57825d313
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:04 -08:00 |
|
Brian Behlendorf
|
ef35fb0311
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 09:25:03 -08:00 |
|
Brian Behlendorf
|
1abc1b0d95
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:25:00 -08:00 |
|
Brian Behlendorf
|
96cec6e130
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 09:24:59 -08:00 |
|
Brian Behlendorf
|
a94112891d
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:24:56 -08:00 |
|
Brian Behlendorf
|
8fd2f18808
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 09:24:55 -08:00 |
|
Brian Behlendorf
|
c2ff393a26
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:24:51 -08:00 |
|
Brian Behlendorf
|
e047c7ffef
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 09:24:50 -08:00 |
|
Brian Behlendorf
|
f36b6a412a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:24:47 -08:00 |
|
Brian Behlendorf
|
d54c215cc6
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 09:24:46 -08:00 |
|
Brian Behlendorf
|
aefe272f78
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:24:43 -08:00 |
|
Brian Behlendorf
|
5ef0ea7c42
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 09:24:39 -08:00 |
|
Brian Behlendorf
|
640c2f8d7e
|
Add missing includes to zfs cmd Makefile.am
|
2008-12-17 09:22:40 -08:00 |
|
Brian Behlendorf
|
43230b8114
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 17:00:26 -08:00 |
|
Brian Behlendorf
|
fbabbcbf1b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 17:00:25 -08:00 |
|
Brian Behlendorf
|
ed36f90405
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 17:00:21 -08:00 |
|
Brian Behlendorf
|
7632b2a438
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 17:00:21 -08:00 |
|
Brian Behlendorf
|
aa5091c4e5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-16 17:00:17 -08:00 |
|
Brian Behlendorf
|
31c66ae5a2
|
Resolve conflict
|
2008-12-16 17:00:12 -08:00 |
|
Brian Behlendorf
|
03aa57c237
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:59:09 -08:00 |
|
Brian Behlendorf
|
55899e4342
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 16:59:07 -08:00 |
|
Brian Behlendorf
|
6ae48398f0
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:59:01 -08:00 |
|
Brian Behlendorf
|
ebd6812d99
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 16:58:58 -08:00 |
|
Brian Behlendorf
|
56674ef92b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:58:53 -08:00 |
|
Brian Behlendorf
|
ada3eb423d
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-16 16:58:51 -08:00 |
|
Brian Behlendorf
|
00d60143fb
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:58:46 -08:00 |
|
Brian Behlendorf
|
d454c1df1a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-16 16:58:43 -08:00 |
|
Brian Behlendorf
|
5707be6320
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:58:37 -08:00 |
|
Brian Behlendorf
|
00eaef9f0b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-16 16:58:36 -08:00 |
|
Brian Behlendorf
|
46fca57480
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:58:30 -08:00 |
|
Brian Behlendorf
|
4b20a8e329
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:58:28 -08:00 |
|
Brian Behlendorf
|
7fb2446f28
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:58:21 -08:00 |
|
Brian Behlendorf
|
9ad3a7d67c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 16:58:18 -08:00 |
|
Brian Behlendorf
|
5490978017
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:58:12 -08:00 |
|
Brian Behlendorf
|
9cb99b798e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 16:58:10 -08:00 |
|
Brian Behlendorf
|
31c303b05d
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:58:04 -08:00 |
|
Brian Behlendorf
|
b30800cd95
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 16:58:03 -08:00 |
|
Brian Behlendorf
|
9159fad57e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 16:58:02 -08:00 |