Brian Behlendorf
|
e3c7ad3e4a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:33:37 -08:00 |
|
Brian Behlendorf
|
b2a8517e24
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-08 15:33:36 -08:00 |
|
Brian Behlendorf
|
67a6646d93
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:33:33 -08:00 |
|
Brian Behlendorf
|
9bbf055276
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-08 15:33:32 -08:00 |
|
Brian Behlendorf
|
912f4f1e1d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 15:33:31 -08:00 |
|
Brian Behlendorf
|
a5b90e4746
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 15:33:31 -08:00 |
|
Brian Behlendorf
|
5c0eea852f
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 15:33:30 -08:00 |
|
Brian Behlendorf
|
bb55a4f104
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-08 15:33:30 -08:00 |
|
Brian Behlendorf
|
7b4a040002
|
Correct missing void in prototype
|
2008-12-08 15:31:41 -08:00 |
|
Brian Behlendorf
|
0ef6712826
|
Add missing #include <va_list.h>
|
2008-12-08 15:29:59 -08:00 |
|
Brian Behlendorf
|
a39b27b7af
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:18:28 -08:00 |
|
Brian Behlendorf
|
65250ad4f0
|
Add missing headers
|
2008-12-08 15:16:22 -08:00 |
|
Brian Behlendorf
|
b472df7814
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:08:02 -08:00 |
|
Brian Behlendorf
|
2f6187c243
|
Add libumem to makefile, remove spl.h dependency
|
2008-12-08 15:06:20 -08:00 |
|
Brian Behlendorf
|
725d82bac9
|
Add several missing headers, more to follow as needed
|
2008-12-08 15:00:32 -08:00 |
|
Brian Behlendorf
|
3427620cbc
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:38 -08:00 |
|
Brian Behlendorf
|
02844b68e9
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 13:51:37 -08:00 |
|
Brian Behlendorf
|
ae10d58b2b
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:34 -08:00 |
|
Brian Behlendorf
|
2f8ab90c7a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-08 13:51:33 -08:00 |
|
Brian Behlendorf
|
d381d86b95
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:30 -08:00 |
|
Brian Behlendorf
|
88b1bc623f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-08 13:51:29 -08:00 |
|
Brian Behlendorf
|
aea4fb516c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:25 -08:00 |
|
Brian Behlendorf
|
103cfdc0e1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-08 13:51:24 -08:00 |
|
Brian Behlendorf
|
d9a80ed7bf
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-08 13:51:21 -08:00 |
|
Brian Behlendorf
|
56f796a485
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:21 -08:00 |
|
Brian Behlendorf
|
4f9297ebca
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 13:51:17 -08:00 |
|
Brian Behlendorf
|
1f6a45ece1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:17 -08:00 |
|
Brian Behlendorf
|
d947c3f1a2
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 13:51:13 -08:00 |
|
Brian Behlendorf
|
95170e5f71
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:13 -08:00 |
|
Brian Behlendorf
|
a6568f74ab
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:10 -08:00 |
|
Brian Behlendorf
|
89695f2450
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-08 13:51:09 -08:00 |
|
Brian Behlendorf
|
3862710260
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:06 -08:00 |
|
Brian Behlendorf
|
fb6e888e75
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-08 13:51:05 -08:00 |
|
Brian Behlendorf
|
0777cfeffd
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:51:02 -08:00 |
|
Brian Behlendorf
|
c4e8654425
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-08 13:51:01 -08:00 |
|
Brian Behlendorf
|
340c5e2a36
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-08 13:50:58 -08:00 |
|
Brian Behlendorf
|
c34a9cf66d
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:50:58 -08:00 |
|
Brian Behlendorf
|
ffdcab83c5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-08 13:50:57 -08:00 |
|
Brian Behlendorf
|
7f2aea91f6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:50:52 -08:00 |
|
Brian Behlendorf
|
61d601df17
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-08 13:50:51 -08:00 |
|
Brian Behlendorf
|
ae6a37c7eb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-08 13:50:51 -08:00 |
|
Brian Behlendorf
|
ffe582a9d3
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 13:50:45 -08:00 |
|
Brian Behlendorf
|
3964102889
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:50:45 -08:00 |
|
Brian Behlendorf
|
b2e9021c7b
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:50:42 -08:00 |
|
Brian Behlendorf
|
d22f5eeeed
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-08 13:50:41 -08:00 |
|
Brian Behlendorf
|
5f556a2cf5
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:50:38 -08:00 |
|
Brian Behlendorf
|
06ff99cfa3
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-08 13:50:37 -08:00 |
|
Brian Behlendorf
|
40ad9412d3
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-08 13:50:34 -08:00 |
|
Brian Behlendorf
|
dad1d28a2b
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-08 13:50:33 -08:00 |
|
Brian Behlendorf
|
a4012234f6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-08 13:50:30 -08:00 |