Brian Behlendorf
|
84444788d7
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:55 -08:00 |
|
Brian Behlendorf
|
332ec5e7c6
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 15:37:53 -08:00 |
|
Brian Behlendorf
|
05fefd5b0c
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:50 -08:00 |
|
Brian Behlendorf
|
eba895287f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 15:37:48 -08:00 |
|
Brian Behlendorf
|
518f6d6e61
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:45 -08:00 |
|
Brian Behlendorf
|
8fdb9d8344
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 15:37:44 -08:00 |
|
Brian Behlendorf
|
0bd2123925
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:41 -08:00 |
|
Brian Behlendorf
|
81d3bae7ef
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 15:37:39 -08:00 |
|
Brian Behlendorf
|
c1fe78862b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:36 -08:00 |
|
Brian Behlendorf
|
f369d21fa5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 15:37:34 -08:00 |
|
Brian Behlendorf
|
5954de195b
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:31 -08:00 |
|
Brian Behlendorf
|
257fba153b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 15:37:29 -08:00 |
|
Brian Behlendorf
|
cabe60fa27
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:26 -08:00 |
|
Brian Behlendorf
|
cc5923a30c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 15:37:24 -08:00 |
|
Brian Behlendorf
|
0f72a78f5e
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:21 -08:00 |
|
Brian Behlendorf
|
5b96164c7f
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 15:37:20 -08:00 |
|
Brian Behlendorf
|
07944f6097
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:16 -08:00 |
|
Brian Behlendorf
|
b8b2308101
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 15:37:15 -08:00 |
|
Brian Behlendorf
|
41da362cfc
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:11 -08:00 |
|
Brian Behlendorf
|
8048a9220a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 15:37:10 -08:00 |
|
Brian Behlendorf
|
c4b8e48fff
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:07 -08:00 |
|
Brian Behlendorf
|
ef84db99b0
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 15:37:05 -08:00 |
|
Brian Behlendorf
|
e049702169
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:37:02 -08:00 |
|
Brian Behlendorf
|
f320d16e09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 15:37:01 -08:00 |
|
Brian Behlendorf
|
8d8a79961a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 15:37:00 -08:00 |
|
Brian Behlendorf
|
464d9b7ac9
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:54 -08:00 |
|
Brian Behlendorf
|
6c62eeab60
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 15:36:53 -08:00 |
|
Brian Behlendorf
|
7b4a4ef1f3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 15:36:52 -08:00 |
|
Brian Behlendorf
|
b27ed1af4a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:47 -08:00 |
|
Brian Behlendorf
|
25f4c60b2f
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 15:36:45 -08:00 |
|
Brian Behlendorf
|
70abcb3d0d
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:42 -08:00 |
|
Brian Behlendorf
|
82b571eb71
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 15:36:40 -08:00 |
|
Brian Behlendorf
|
6c63293cbb
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:37 -08:00 |
|
Brian Behlendorf
|
dabe11b25c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 15:36:35 -08:00 |
|
Brian Behlendorf
|
60ef5b2d83
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:32 -08:00 |
|
Brian Behlendorf
|
92528d622c
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 15:36:30 -08:00 |
|
Brian Behlendorf
|
f1a787aadf
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:27 -08:00 |
|
Brian Behlendorf
|
9588f7bdd1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 15:36:26 -08:00 |
|
Brian Behlendorf
|
cef4472940
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:22 -08:00 |
|
Brian Behlendorf
|
862eb43e94
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 15:36:21 -08:00 |
|
Brian Behlendorf
|
42e1801037
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:18 -08:00 |
|
Brian Behlendorf
|
a1b23d4bf5
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 15:36:16 -08:00 |
|
Brian Behlendorf
|
27dd5bca77
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 15:36:15 -08:00 |
|
Brian Behlendorf
|
dfddd3290c
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 15:36:14 -08:00 |
|
Brian Behlendorf
|
1f19965f10
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 15:36:14 -08:00 |
|
Brian Behlendorf
|
262c2c49c1
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 15:36:13 -08:00 |
|
Brian Behlendorf
|
088c5451b7
|
Add missing include
|
2008-12-22 15:34:18 -08:00 |
|
Brian Behlendorf
|
9b3b373d4f
|
Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99
|
2008-12-22 15:33:15 -08:00 |
|
Brian Behlendorf
|
81b6976cf7
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-22 15:21:11 -08:00 |
|
Brian Behlendorf
|
53f2b61ce1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:21:10 -08:00 |