Brian Behlendorf
|
a62f51b079
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:50 -08:00 |
|
Brian Behlendorf
|
7b32749fba
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 15:34:49 -08:00 |
|
Brian Behlendorf
|
b830b278fe
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-08 15:34:45 -08:00 |
|
Brian Behlendorf
|
20972fcde8
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:45 -08:00 |
|
Brian Behlendorf
|
956e6d28cd
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:42 -08:00 |
|
Brian Behlendorf
|
a16904cfd9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-08 15:34:41 -08:00 |
|
Brian Behlendorf
|
b63cb700b0
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:38 -08:00 |
|
Brian Behlendorf
|
4f0034a816
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-08 15:34:37 -08:00 |
|
Brian Behlendorf
|
76419ed49e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:34 -08:00 |
|
Brian Behlendorf
|
9169e8d111
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-08 15:34:33 -08:00 |
|
Brian Behlendorf
|
811bc9e192
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:30 -08:00 |
|
Brian Behlendorf
|
619a29ce08
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 15:34:29 -08:00 |
|
Brian Behlendorf
|
4aca00c752
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:26 -08:00 |
|
Brian Behlendorf
|
c0b2421b22
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 15:34:25 -08:00 |
|
Brian Behlendorf
|
c8444f6b13
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:22 -08:00 |
|
Brian Behlendorf
|
2907c498fb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-08 15:34:21 -08:00 |
|
Brian Behlendorf
|
6f094d9b7b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:17 -08:00 |
|
Brian Behlendorf
|
4b72f60cbb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-08 15:34:16 -08:00 |
|
Brian Behlendorf
|
b36784f7ba
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-08 15:34:13 -08:00 |
|
Brian Behlendorf
|
223192ae38
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:13 -08:00 |
|
Brian Behlendorf
|
7891024a3f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:10 -08:00 |
|
Brian Behlendorf
|
4eee3f7c91
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-08 15:34:09 -08:00 |
|
Brian Behlendorf
|
9c3afb2757
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-08 15:34:08 -08:00 |
|
Brian Behlendorf
|
713f5f8765
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:03 -08:00 |
|
Brian Behlendorf
|
45a18efaed
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-08 15:34:02 -08:00 |
|
Brian Behlendorf
|
cce2ea20da
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-08 15:34:02 -08:00 |
|
Brian Behlendorf
|
dc1c60c104
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 15:33:56 -08:00 |
|
Brian Behlendorf
|
a3fd7ae523
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:33:56 -08:00 |
|
Brian Behlendorf
|
a1ee58d9b2
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:33:53 -08:00 |
|
Brian Behlendorf
|
0fbc42e618
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-08 15:33:52 -08:00 |
|
Brian Behlendorf
|
9cc5dd1af8
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:33:49 -08:00 |
|
Brian Behlendorf
|
772d0c0f7b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-08 15:33:48 -08:00 |
|
Brian Behlendorf
|
d28738893a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:33:45 -08:00 |
|
Brian Behlendorf
|
9e7fd02c7f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-08 15:33:44 -08:00 |
|
Brian Behlendorf
|
5aafe1c7a4
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:33:41 -08:00 |
|
Brian Behlendorf
|
d9fb077154
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-08 15:33:40 -08:00 |
|
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 |