Brian Behlendorf
|
67095edeaf
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 16:44:24 -08:00 |
|
Brian Behlendorf
|
75fd0ac353
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:44:17 -08:00 |
|
Brian Behlendorf
|
c61d06e903
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 16:44:13 -08:00 |
|
Brian Behlendorf
|
e9365e2338
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:44:06 -08:00 |
|
Brian Behlendorf
|
81e1e75f9f
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 16:44:01 -08:00 |
|
Brian Behlendorf
|
c27a2516c2
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:43:55 -08:00 |
|
Brian Behlendorf
|
5c10e449be
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 16:43:50 -08:00 |
|
Brian Behlendorf
|
f799177730
|
Add all sources for libzfs userspace funcationality
|
2008-12-17 16:39:45 -08:00 |
|
Brian Behlendorf
|
1e87784b62
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:23:55 -08:00 |
|
Brian Behlendorf
|
b6bfd6cdde
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 16:23:51 -08:00 |
|
Brian Behlendorf
|
5374254fa5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:23:44 -08:00 |
|
Brian Behlendorf
|
6b56d62c64
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 16:23:41 -08:00 |
|
Brian Behlendorf
|
f9057ec5fb
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:23:33 -08:00 |
|
Brian Behlendorf
|
7a650448ed
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 16:23:30 -08:00 |
|
Brian Behlendorf
|
63794de23c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:23:24 -08:00 |
|
Brian Behlendorf
|
dd942458fd
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 16:23:22 -08:00 |
|
Brian Behlendorf
|
5158a5ebb8
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:23:16 -08:00 |
|
Brian Behlendorf
|
2d2164ab80
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 16:23:13 -08:00 |
|
Brian Behlendorf
|
1affdfbc53
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:23:07 -08:00 |
|
Brian Behlendorf
|
1a4e50e0ad
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 16:23:05 -08:00 |
|
Brian Behlendorf
|
818c2d9b0f
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:58 -08:00 |
|
Brian Behlendorf
|
a3dcd82537
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 16:22:55 -08:00 |
|
Brian Behlendorf
|
0ee02d68e8
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:48 -08:00 |
|
Brian Behlendorf
|
0510a287a6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 16:22:44 -08:00 |
|
Brian Behlendorf
|
5303bd2529
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:38 -08:00 |
|
Brian Behlendorf
|
e253951a7d
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 16:22:34 -08:00 |
|
Brian Behlendorf
|
0ecc4098f5
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:28 -08:00 |
|
Brian Behlendorf
|
4a42b6b4a6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 16:22:24 -08:00 |
|
Brian Behlendorf
|
50b40bf715
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:18 -08:00 |
|
Brian Behlendorf
|
7944353976
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 16:22:14 -08:00 |
|
Brian Behlendorf
|
d8a7e60bda
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:22:08 -08:00 |
|
Brian Behlendorf
|
d1b938301b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 16:22:05 -08:00 |
|
Brian Behlendorf
|
abe5fe302a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 16:22:03 -08:00 |
|
Brian Behlendorf
|
48c9c66032
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:55 -08:00 |
|
Brian Behlendorf
|
ff4d8d7323
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 16:21:53 -08:00 |
|
Brian Behlendorf
|
9b81f9448f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 16:21:51 -08:00 |
|
Brian Behlendorf
|
9196d77597
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:41 -08:00 |
|
Brian Behlendorf
|
908d676952
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 16:21:37 -08:00 |
|
Brian Behlendorf
|
fc262c75d0
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:32 -08:00 |
|
Brian Behlendorf
|
153ab3eab4
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 16:21:29 -08:00 |
|
Brian Behlendorf
|
f1caa738b7
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:22 -08:00 |
|
Brian Behlendorf
|
9f0699cc55
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 16:21:18 -08:00 |
|
Brian Behlendorf
|
271f863698
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:11 -08:00 |
|
Brian Behlendorf
|
eb5fa23261
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 16:21:07 -08:00 |
|
Brian Behlendorf
|
6c64fc1aee
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:21:00 -08:00 |
|
Brian Behlendorf
|
cf03a9cd90
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 16:20:57 -08:00 |
|
Brian Behlendorf
|
ad3355b72d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:20:50 -08:00 |
|
Brian Behlendorf
|
1dbd9da54c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 16:20:47 -08:00 |
|
Brian Behlendorf
|
599e4757d3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:20:40 -08:00 |
|
Brian Behlendorf
|
5f95fd146d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 16:20:35 -08:00 |