Brian Behlendorf
|
24f7e6dc1c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:34 -08:00 |
|
Brian Behlendorf
|
7e800d8125
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 10:37:33 -08:00 |
|
Brian Behlendorf
|
8ab8b43b5b
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:30 -08:00 |
|
Brian Behlendorf
|
1bfbc7e5ba
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 10:37:28 -08:00 |
|
Brian Behlendorf
|
fc4520ef6b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:25 -08:00 |
|
Brian Behlendorf
|
7e1406dd6c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 10:37:24 -08:00 |
|
Brian Behlendorf
|
3b9583ccca
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:21 -08:00 |
|
Brian Behlendorf
|
edaabab594
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 10:37:19 -08:00 |
|
Brian Behlendorf
|
e94d1d3d98
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:16 -08:00 |
|
Brian Behlendorf
|
8126ebe55f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 10:37:14 -08:00 |
|
Brian Behlendorf
|
0054f831be
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:11 -08:00 |
|
Brian Behlendorf
|
8ad9104988
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 10:37:10 -08:00 |
|
Brian Behlendorf
|
136e3c09b8
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:06 -08:00 |
|
Brian Behlendorf
|
5169758856
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 10:37:05 -08:00 |
|
Brian Behlendorf
|
97cd0e7932
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:02 -08:00 |
|
Brian Behlendorf
|
c6e93310af
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 10:37:00 -08:00 |
|
Brian Behlendorf
|
1491547e84
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:57 -08:00 |
|
Brian Behlendorf
|
ba2c349faf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 10:36:56 -08:00 |
|
Brian Behlendorf
|
e0141c82aa
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 10:36:55 -08:00 |
|
Brian Behlendorf
|
ea558c6b98
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:50 -08:00 |
|
Brian Behlendorf
|
6a981c09a5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 10:36:49 -08:00 |
|
Brian Behlendorf
|
bdbd91fe46
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:36:48 -08:00 |
|
Brian Behlendorf
|
28cbf5a51a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:43 -08:00 |
|
Brian Behlendorf
|
3771facf90
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 10:36:41 -08:00 |
|
Brian Behlendorf
|
651983c99c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:38 -08:00 |
|
Brian Behlendorf
|
e8bf0a8581
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 10:36:36 -08:00 |
|
Brian Behlendorf
|
f66e32bc89
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:33 -08:00 |
|
Brian Behlendorf
|
11147f632c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 10:36:32 -08:00 |
|
Brian Behlendorf
|
b3e6fc2c24
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:29 -08:00 |
|
Brian Behlendorf
|
b5039d2e57
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 10:36:27 -08:00 |
|
Brian Behlendorf
|
29c3af38e1
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:24 -08:00 |
|
Brian Behlendorf
|
f7d9583ab8
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 10:36:23 -08:00 |
|
Brian Behlendorf
|
90cd990731
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:20 -08:00 |
|
Brian Behlendorf
|
7db566250e
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 10:36:18 -08:00 |
|
Brian Behlendorf
|
9c47372b96
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:15 -08:00 |
|
Brian Behlendorf
|
cb4b423572
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 10:36:13 -08:00 |
|
Brian Behlendorf
|
5f0a629790
|
Add enable_extended_FILE_stdio #define
|
2008-12-22 10:34:22 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
b120822fdd
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:52 -08:00 |
|
Brian Behlendorf
|
0e44aed872
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 10:24:50 -08:00 |
|
Brian Behlendorf
|
10364eab16
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:47 -08:00 |
|
Brian Behlendorf
|
7ac1e43fdf
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 10:24:46 -08:00 |
|
Brian Behlendorf
|
251bbe1acd
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:42 -08:00 |
|
Brian Behlendorf
|
00371ba18c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 10:24:41 -08:00 |
|
Brian Behlendorf
|
4eeb9dd691
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:38 -08:00 |
|
Brian Behlendorf
|
124da899c2
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 10:24:36 -08:00 |
|
Brian Behlendorf
|
2e7140a4bd
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:33 -08:00 |
|
Brian Behlendorf
|
01734c0d7f
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 10:24:32 -08:00 |
|
Brian Behlendorf
|
35a1cd6d56
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:24:29 -08:00 |
|
Brian Behlendorf
|
372c7d1868
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 10:24:27 -08:00 |