Brian Behlendorf
|
554ad1f247
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:56 -08:00 |
|
Brian Behlendorf
|
90a92de620
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-16 14:34:55 -08:00 |
|
Brian Behlendorf
|
1a42b0eef5
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:52 -08:00 |
|
Brian Behlendorf
|
e213f59844
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 14:34:51 -08:00 |
|
Brian Behlendorf
|
ff379b5e27
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:48 -08:00 |
|
Brian Behlendorf
|
b17ad01f98
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 14:34:47 -08:00 |
|
Brian Behlendorf
|
4a162c766b
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:44 -08:00 |
|
Brian Behlendorf
|
5840198e26
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 14:34:43 -08:00 |
|
Brian Behlendorf
|
8439d752d3
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:39 -08:00 |
|
Brian Behlendorf
|
08cc9efc28
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 14:34:38 -08:00 |
|
Brian Behlendorf
|
27028d0a77
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 14:34:38 -08:00 |
|
Brian Behlendorf
|
6c377ad4c2
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:33 -08:00 |
|
Brian Behlendorf
|
754b3cb0e8
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-16 14:34:32 -08:00 |
|
Brian Behlendorf
|
a4c93e56cc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 14:34:31 -08:00 |
|
Brian Behlendorf
|
a3814f175d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:26 -08:00 |
|
Brian Behlendorf
|
3686ad7c68
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-16 14:34:25 -08:00 |
|
Brian Behlendorf
|
289f71f642
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:22 -08:00 |
|
Brian Behlendorf
|
125e9815df
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-16 14:34:21 -08:00 |
|
Brian Behlendorf
|
51a30ee7d0
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:18 -08:00 |
|
Brian Behlendorf
|
bb20fd94fc
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 14:34:17 -08:00 |
|
Brian Behlendorf
|
b6a59061ae
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:14 -08:00 |
|
Brian Behlendorf
|
6f794f49bd
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 14:34:13 -08:00 |
|
Brian Behlendorf
|
b292703aaa
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:10 -08:00 |
|
Brian Behlendorf
|
0c4636f3f2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-16 14:34:08 -08:00 |
|
Brian Behlendorf
|
a34d2ee906
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:05 -08:00 |
|
Brian Behlendorf
|
f6faaef095
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-16 14:34:04 -08:00 |
|
Brian Behlendorf
|
047a942f42
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:01 -08:00 |
|
Brian Behlendorf
|
da53d2067f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-16 14:34:00 -08:00 |
|
Brian Behlendorf
|
804830a231
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 14:33:59 -08:00 |
|
Brian Behlendorf
|
79bc1b23ed
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 14:33:59 -08:00 |
|
Brian Behlendorf
|
fb3d1c555a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-16 14:33:58 -08:00 |
|
Brian Behlendorf
|
a8a0f9ea2a
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 14:33:58 -08:00 |
|
Brian Behlendorf
|
53c0cdbc42
|
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
|
2008-12-16 14:29:35 -08:00 |
|
Brian Behlendorf
|
2c2372389a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:24:23 -08:00 |
|
Brian Behlendorf
|
7df95c2f31
|
Add missing header
|
2008-12-16 14:22:31 -08:00 |
|
Brian Behlendorf
|
e583bf8b9e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:19:55 -08:00 |
|
Brian Behlendorf
|
f6207ec73a
|
Add missing headers
|
2008-12-16 14:17:29 -08:00 |
|
Brian Behlendorf
|
52a453edaa
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:12:48 -08:00 |
|
Brian Behlendorf
|
9df591c9d3
|
Add sys/mount.h header
|
2008-12-16 14:10:43 -08:00 |
|
Brian Behlendorf
|
554defd465
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:07:00 -08:00 |
|
Brian Behlendorf
|
12cb53ce52
|
Make SHARENFS condition with ZPL
|
2008-12-16 14:05:09 -08:00 |
|
Brian Behlendorf
|
53bb8a832c
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:31:47 -08:00 |
|
Brian Behlendorf
|
a07043191d
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 13:31:46 -08:00 |
|
Brian Behlendorf
|
9780b535d5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:31:43 -08:00 |
|
Brian Behlendorf
|
ac3a2f3476
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 13:31:42 -08:00 |
|
Brian Behlendorf
|
9417788e1b
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:31:39 -08:00 |
|
Brian Behlendorf
|
312c5695d4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-16 13:31:38 -08:00 |
|
Brian Behlendorf
|
5a49bf9bfb
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:31:35 -08:00 |
|
Brian Behlendorf
|
9af5c86c0c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 13:31:33 -08:00 |
|
Brian Behlendorf
|
5c1daa0b29
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:31:30 -08:00 |